From: Dirk Eibach Date: Fri, 25 Jul 2014 08:10:23 +0000 (+0200) Subject: ppc: Make ppc4xx ready for CONFIG_SYS_GENERIC_BOARD X-Git-Tag: v2014.10-rc1~39^2~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d29437aa7709a0bb77c8eec47b151267721db8ff;p=platform%2Fkernel%2Fu-boot.git ppc: Make ppc4xx ready for CONFIG_SYS_GENERIC_BOARD The generic board infrastructure assumes that gd is set by arch code. Signed-off-by: Dirk Eibach Signed-off-by: Stefan Roese --- diff --git a/arch/powerpc/cpu/ppc4xx/cpu_init.c b/arch/powerpc/cpu/ppc4xx/cpu_init.c index d465dcd..0b27d29 100644 --- a/arch/powerpc/cpu/ppc4xx/cpu_init.c +++ b/arch/powerpc/cpu/ppc4xx/cpu_init.c @@ -12,9 +12,7 @@ #include #include -#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); } /*