Merge git://www.denx.de/git/u-boot-ppc4xx

diff --git a/arch/powerpc/cpu/ppc4xx/cpu_init.c b/arch/powerpc/cpu/ppc4xx/cpu_init.c
index d465dcda8b123ae563fadafcccaf77059815f54c..0b27d2912d1ac44789e87b8bd96495840a08d18a 100644 (file)
--- a/arch/powerpc/cpu/ppc4xx/cpu_init.c
+++ b/arch/powerpc/cpu/ppc4xx/cpu_init.c
@@ -12,9 +12,7 @@
 #include <asm/ppc4xx-gpio.h>
 #include <asm/ppc4xx.h>
 
-#if defined(CONFIG_405GP)  || defined(CONFIG_405EP)
 DECLARE_GLOBAL_DATA_PTR;
-#endif
 
 #ifndef CONFIG_SYS_PLL_RECONFIG
 #define CONFIG_SYS_PLL_RECONFIG        0
@@ -451,6 +449,8 @@ cpu_init_f (void)
        mtdcr(PLB4A1_ACR, (mfdcr(PLB4A1_ACR) & ~PLB4Ax_ACR_RDP_MASK) |
              PLB4Ax_ACR_RDP_4DEEP);
 #endif /* CONFIG_440SP/SPE || CONFIG_460EX/GT || CONFIG_405EX */
+
+       gd = (gd_t *)(CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_GBL_DATA_OFFSET);
 }
 
 /*

diff --git a/include/configs/controlcenterd.h b/include/configs/controlcenterd.h
index ec3145f430c549ee0438a409c71874520ea68ae4..7eaaf69951b2ce153960bd4abac0f7a9e890074c 100644 (file)
--- a/include/configs/controlcenterd.h
+++ b/include/configs/controlcenterd.h
@@ -45,6 +45,8 @@
 #define CONFIG_CONTROLCENTERD
 #define CONFIG_MP                      /* support multiple processors */
 
+#define CONFIG_SYS_GENERIC_BOARD
+
 #define CONFIG_SYS_NO_FLASH
 #define CONFIG_ENABLE_36BIT_PHYS
 #define CONFIG_FSL_LAW                 /* Use common FSL init code */

diff --git a/include/configs/dlvision-10g.h b/include/configs/dlvision-10g.h
index 6153a40e06198cc7fcac99fd2c906d6f1c08dbd0..d9bd564880ef3c9f68a593d6ecbfda920e6946a4 100644 (file)
--- a/include/configs/dlvision-10g.h
+++ b/include/configs/dlvision-10g.h
@@ -24,6 +24,7 @@
 #define CONFIG_BOARD_EARLY_INIT_R
 #define CONFIG_MISC_INIT_R
 #define CONFIG_LAST_STAGE_INIT
+#define CONFIG_SYS_GENERIC_BOARD
 
 #define CONFIG_SYS_CLK_FREQ    33333333 /* external frequency to pll   */
 

diff --git a/include/configs/dlvision.h b/include/configs/dlvision.h
index 1e86c556abe42b21c45867e533e07cca33379138..af0d60249ac28cf28741146add2b35ae20f21c04 100644 (file)
--- a/include/configs/dlvision.h
+++ b/include/configs/dlvision.h
@@ -22,6 +22,7 @@
 
 #define CONFIG_BOARD_EARLY_INIT_F      /* call board_early_init_f */
 #define CONFIG_MISC_INIT_R             /* call misc_init_r */
+#define CONFIG_SYS_GENERIC_BOARD
 
 #define CONFIG_SYS_CLK_FREQ    33333333 /* external frequency to pll   */
 

diff --git a/include/configs/gdppc440etx.h b/include/configs/gdppc440etx.h
index 6810b3befc3a2574e57a6bd51ba8b0cd3604b296..12fd75d743e8d127ade4a95c25f87da33a350b54 100644 (file)
--- a/include/configs/gdppc440etx.h
+++ b/include/configs/gdppc440etx.h
@@ -32,6 +32,7 @@
 
 #define CONFIG_BOARD_EARLY_INIT_F      1       /* call board_early_init_f*/
 #define CONFIG_MISC_INIT_R             1       /* call misc_init_r()     */
+#define CONFIG_SYS_GENERIC_BOARD
 
 #undef CONFIG_ZERO_BOOTDELAY_CHECK     /* ignore keypress on bootdelay==0 */
 #define CONFIG_AUTOBOOT_KEYED          /* use key strings to stop autoboot */

diff --git a/include/configs/intip.h b/include/configs/intip.h
index b56b3aa340bc6d98f15b05054ac12acf730c30be..928eb5b9dbd06c2a0ddd678fd9c1edf35fb2696c 100644 (file)
--- a/include/configs/intip.h
+++ b/include/configs/intip.h
@@ -45,6 +45,7 @@
 #define CONFIG_BOARD_EARLY_INIT_F      1       /* Call board_early_init_f */
 #define CONFIG_BOARD_EARLY_INIT_R      1       /* Call board_early_init_r */
 #define CONFIG_MISC_INIT_R             1       /* Call misc_init_r */
+#define CONFIG_SYS_GENERIC_BOARD
 #define CONFIG_BOARD_TYPES             1       /* support board types */
 #define CONFIG_FIT
 #define CFG_ALT_MEMTEST

diff --git a/include/configs/io.h b/include/configs/io.h
index 8e32c25803e4d3cf2e5f3d24914619dda9ba6132..d4ae0adfdac97ece64da3f6780f7db5443c5ea24 100644 (file)
--- a/include/configs/io.h
+++ b/include/configs/io.h
@@ -24,6 +24,7 @@
 #define CONFIG_BOARD_EARLY_INIT_R
 #define CONFIG_MISC_INIT_R
 #define CONFIG_LAST_STAGE_INIT
+#define CONFIG_SYS_GENERIC_BOARD
 
 #define CONFIG_SYS_CLK_FREQ    33333333 /* external frequency to pll   */
 

diff --git a/include/configs/io64.h b/include/configs/io64.h
index 6915b2071c03652ea136cb2fd1cbf3ba01db0826..2a9ff376ef16bf883f1adfeba96a067b93bb61a8 100644 (file)
--- a/include/configs/io64.h
+++ b/include/configs/io64.h
@@ -43,6 +43,7 @@
 #define CONFIG_BOARD_EARLY_INIT_R
 #define CONFIG_MISC_INIT_R
 #define CONFIG_LAST_STAGE_INIT
+#define CONFIG_SYS_GENERIC_BOARD
 
 #undef CONFIG_ZERO_BOOTDELAY_CHECK     /* ignore keypress on bootdelay==0 */
 #define CONFIG_AUTOBOOT_KEYED          /* use key strings to stop autoboot */

diff --git a/include/configs/iocon.h b/include/configs/iocon.h
index ae05bcbfbf433c1893260840c35ceac879f8f33d..38d473de4298503ba5fe53d7a36a5ffefaa2b618 100644 (file)
--- a/include/configs/iocon.h
+++ b/include/configs/iocon.h
@@ -23,6 +23,7 @@
 #define CONFIG_BOARD_EARLY_INIT_F
 #define CONFIG_BOARD_EARLY_INIT_R
 #define CONFIG_LAST_STAGE_INIT
+#define CONFIG_SYS_GENERIC_BOARD
 
 #define CONFIG_SYS_CLK_FREQ    33333333 /* external frequency to pll   */
 

diff --git a/include/configs/neo.h b/include/configs/neo.h
index 4937730ee30e59c36b753a7c32f9de5dcdb03c4b..09300ca8ed65ee003652c00e0faf25aff99cf373 100644 (file)
--- a/include/configs/neo.h
+++ b/include/configs/neo.h
@@ -25,6 +25,7 @@
 #define CONFIG_BOARD_EARLY_INIT_R
 #define CONFIG_MISC_INIT_R
 #define CONFIG_LAST_STAGE_INIT
+#define CONFIG_SYS_GENERIC_BOARD
 
 #define CONFIG_SYS_CLK_FREQ    33333333 /* external frequency to pll   */