How to merge the diff file in the git repositry

From

Vvamsi <vamsineelam@gmail.com>

Date

Apr 23, 2012, 01:38 UTC

Message-ID

<1335145132814-7490516.post@n2.nabble.com>

hii ,

i have a diff file.how to add these modifications to the git repositry

diff --git a/board/Maxim/maximasp_eek/board_init.S

b/board/Maxim/maximasp_eek/board_init.S

index ec57078..bd55877 100644

--- a/board/Maxim/maximasp_eek/board_init.S

+++ b/board/Maxim/maximasp_eek/board_init.S

@@ -13,7 +13,7 @@

#define ENABLE_DLL

 

#define GCR_SETUP      /* Modify GCR register */

-#define GCR_UBP                /* UCI bypass */

+#undef  GCR_UBP                /* UCI bypass */

#undef  GCR_PBEN       /* Enable pass bridge */

#undef  GCR_PBFB       /* Enable burst in pass bridge */

#undef  GCR_ADK                /* Use ADK bridge */

diff --git a/include/configs/maximasp-eek.h b/include/configs/maximasp-eek.h
index 897f4ab..c9e3965 100644

--- a/include/configs/maximasp-eek.h

+++ b/include/configs/maximasp-eek.h

@@ -23,13 +23,13 @@

#define __CONFIG_H

 

#define CONFIG_SYS_USE_DDR     /* Use DDR instead of PSRAM */

-#define CONFIG_SYS_SYNC_MEM    /* Synchronous memory */

+//#define CONFIG_SYS_SYNC_MEM  /* Synchronous memory */

 

/*

  * CPU Clock - 16x crystal (20 MHz -> 320 MHz, 24 MHz -> 384 MHz)

  */

-//#define CONFIG_SYS_CPU_CLOCK         384000000

-#define CONFIG_SYS_CPU_CLOCK           320000000

+#define CONFIG_SYS_CPU_CLOCK           384000000

+//#define CONFIG_SYS_CPU_CLOCK         320000000

 
/*

  * Physical Memory Map

regards

Git newbie

--
View this message in context: http://git.661346.n2.nabble.com/How-to-merge-the-diff-file-in-the-git-repositry-tp7490516p7490516.html
Sent from the git mailing list archive at Nabble.com.