diff options
| author | Tom Rini <trini@ti.com> | 2014-07-28 17:48:48 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-07-28 17:48:48 -0400 |
| commit | 302e609fe653baf1ae3a7573d2f4eafd86ab696b (patch) | |
| tree | 34f837f6c14a8817ef3b79ea37e3fa5b43cb9f81 /arch | |
| parent | d5f8a6ddd41dee0de17888f8b5334fe1b636c4ca (diff) | |
| parent | d9f923ffcb60be6817cff37c76e21faede8d2819 (diff) | |
| download | u-boot-imx-302e609fe653baf1ae3a7573d2f4eafd86ab696b.zip u-boot-imx-302e609fe653baf1ae3a7573d2f4eafd86ab696b.tar.gz u-boot-imx-302e609fe653baf1ae3a7573d2f4eafd86ab696b.tar.bz2 | |
Merge git://www.denx.de/git/u-boot-ppc4xx
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/powerpc/cpu/ppc4xx/cpu_init.c | 4 |
1 files changed, 2 insertions, 2 deletions
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 <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); } /* |