{"thread":{"id":"30306","subject":"How to merge the diff file in the git repositry","startedAt":"2012-04-23T01:38:52Z","lastAt":"2012-04-24T02:25:20Z","messageCount":2,"participants":["vamsi","Neal Kreitzinger"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"189845","messageId":"1335145132814-7490516.post@n2.nabble.com","threadId":"30306","inReplyTo":null,"subject":"How to merge the diff file in the git repositry","fromName":"vamsi","fromEmail":"vamsineelam@gmail.com","sentAt":"2012-04-23T01:38:52Z","receivedAt":"2012-04-23T01:38:52Z","isPatch":false,"sender":{"key":"vamsineelam@gmail.com","avatar":null},"body":"hii ,\n\ni have a diff file.how to add these modifications to the git repositry\n\n\n\ndiff --git a/board/Maxim/maximasp_eek/board_init.S\n\nb/board/Maxim/maximasp_eek/board_init.S\n\nindex ec57078..bd55877 100644\n\n--- a/board/Maxim/maximasp_eek/board_init.S\n\n+++ b/board/Maxim/maximasp_eek/board_init.S\n\n@@ -13,7 +13,7 @@\n\n#define ENABLE_DLL\n\n \n\n#define GCR_SETUP      /* Modify GCR register */\n\n-#define GCR_UBP                /* UCI bypass */\n\n+#undef  GCR_UBP                /* UCI bypass */\n\n#undef  GCR_PBEN       /* Enable pass bridge */\n\n#undef  GCR_PBFB       /* Enable burst in pass bridge */\n\n#undef  GCR_ADK                /* Use ADK bridge */\n\ndiff --git a/include/configs/maximasp-eek.h b/include/configs/maximasp-eek.h\nindex 897f4ab..c9e3965 100644\n\n--- a/include/configs/maximasp-eek.h\n\n+++ b/include/configs/maximasp-eek.h\n\n@@ -23,13 +23,13 @@\n\n#define __CONFIG_H\n\n \n\n#define CONFIG_SYS_USE_DDR     /* Use DDR instead of PSRAM */\n\n-#define CONFIG_SYS_SYNC_MEM    /* Synchronous memory */\n\n+//#define CONFIG_SYS_SYNC_MEM  /* Synchronous memory */\n\n \n\n/*\n\n  * CPU Clock - 16x crystal (20 MHz -> 320 MHz, 24 MHz -> 384 MHz)\n\n  */\n\n-//#define CONFIG_SYS_CPU_CLOCK         384000000\n\n-#define CONFIG_SYS_CPU_CLOCK           320000000\n\n+#define CONFIG_SYS_CPU_CLOCK           384000000\n\n+//#define CONFIG_SYS_CPU_CLOCK         320000000\n\n \n/*\n\n  * Physical Memory Map\n\nregards\n\nGit newbie\n\n--\nView this message in context: http://git.661346.n2.nabble.com/How-to-merge-the-diff-file-in-the-git-repositry-tp7490516p7490516.html\nSent from the git mailing list archive at Nabble.com.\n"},{"id":"189928","messageId":"4F960F10.8020804@gmail.com","threadId":"30306","inReplyTo":"1335145132814-7490516.post@n2.nabble.com","subject":"Re: How to merge the diff file in the git repositry","fromName":"Neal Kreitzinger","fromEmail":"nkreitzinger@gmail.com","sentAt":"2012-04-24T02:25:20Z","receivedAt":"2012-04-24T02:25:20Z","isPatch":false,"sender":{"key":"nkreitzinger@gmail.com","avatar":null},"body":"On 4/22/2012 8:38 PM, vamsi wrote:\n> hii ,\n>\n> i have a diff file.how to add these modifications to the git repositry\n>\n>\n>\n> diff --git a/board/Maxim/maximasp_eek/board_init.S\n>\n> b/board/Maxim/maximasp_eek/board_init.S\n>\n> index ec57078..bd55877 100644\n>\n> --- a/board/Maxim/maximasp_eek/board_init.S\n>\n> +++ b/board/Maxim/maximasp_eek/board_init.S\n>\n> @@ -13,7 +13,7 @@\n>\n> #define ENABLE_DLL\n>\n>\n>\n> #define GCR_SETUP      /* Modify GCR register */\n>\n> -#define GCR_UBP                /* UCI bypass */\n>\n> +#undef  GCR_UBP                /* UCI bypass */\n>\n> #undef  GCR_PBEN       /* Enable pass bridge */\n>\n> #undef  GCR_PBFB       /* Enable burst in pass bridge */\n>\n> #undef  GCR_ADK                /* Use ADK bridge */\n>\n> diff --git a/include/configs/maximasp-eek.h b/include/configs/maximasp-eek.h\n> index 897f4ab..c9e3965 100644\n>\n> --- a/include/configs/maximasp-eek.h\n>\n> +++ b/include/configs/maximasp-eek.h\n>\n> @@ -23,13 +23,13 @@\n>\n> #define __CONFIG_H\n>\n>\n>\n> #define CONFIG_SYS_USE_DDR     /* Use DDR instead of PSRAM */\n>\n> -#define CONFIG_SYS_SYNC_MEM    /* Synchronous memory */\n>\n> +//#define CONFIG_SYS_SYNC_MEM  /* Synchronous memory */\n>\n>\n>\n> /*\n>\n>    * CPU Clock - 16x crystal (20 MHz ->  320 MHz, 24 MHz ->  384 MHz)\n>\n>    */\n>\n> -//#define CONFIG_SYS_CPU_CLOCK         384000000\n>\n> -#define CONFIG_SYS_CPU_CLOCK           320000000\n>\n> +#define CONFIG_SYS_CPU_CLOCK           384000000\n>\n> +//#define CONFIG_SYS_CPU_CLOCK         320000000\n>\n>\n> /*\n>\n>    * Physical Memory Map\n>\n> regards\n>\n> Git newbie\n>\n> --\n> View this message in context: http://git.661346.n2.nabble.com/How-to-merge-the-diff-file-in-the-git-repositry-tp7490516p7490516.html\n> Sent from the git mailing list archive at Nabble.com.\n\nDoes the git-apply manpage tell you what you need?\n\nv/r,\nneal\n"}]}