diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-10-05 14:37:25 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-10-05 14:37:25 +0200 |
| commit | db682a0b59b2e97b24275214f1837197a73fdb03 (patch) | |
| tree | 6e5f5c445023a71f78c8f166358339c3b72085f4 /arch/powerpc/cpu/ppc4xx/cpu_init.c | |
| parent | bbf2abc0f5a5be0b8081ae8587fa90b376160444 (diff) | |
| parent | 709d9481e99f9f42625a48d0517a8877382995a3 (diff) | |
| download | talos-obmc-uboot-db682a0b59b2e97b24275214f1837197a73fdb03.tar.gz talos-obmc-uboot-db682a0b59b2e97b24275214f1837197a73fdb03.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx
Diffstat (limited to 'arch/powerpc/cpu/ppc4xx/cpu_init.c')
| -rw-r--r-- | arch/powerpc/cpu/ppc4xx/cpu_init.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/powerpc/cpu/ppc4xx/cpu_init.c b/arch/powerpc/cpu/ppc4xx/cpu_init.c index d54b30e26f..2a727b1df3 100644 --- a/arch/powerpc/cpu/ppc4xx/cpu_init.c +++ b/arch/powerpc/cpu/ppc4xx/cpu_init.c @@ -237,7 +237,8 @@ cpu_init_f (void) reconfigure_pll(CONFIG_SYS_PLL_RECONFIG); -#if (defined(CONFIG_405EP) || defined (CONFIG_405EX)) && !defined(CONFIG_SYS_4xx_GPIO_TABLE) +#if (defined(CONFIG_405EP) || defined (CONFIG_405EX)) && \ + !defined(CONFIG_APM821XX) &&!defined(CONFIG_SYS_4xx_GPIO_TABLE) /* * GPIO0 setup (select GPIO or alternate function) */ @@ -393,7 +394,7 @@ cpu_init_f (void) #if defined(CONFIG_405EX) || \ defined(CONFIG_440SP) || defined(CONFIG_440SPE) || \ defined(CONFIG_460EX) || defined(CONFIG_460GT) || \ - defined(CONFIG_460SX) + defined(CONFIG_460SX) || defined(CONFIG_APM821XX) /* * Set PLB4 arbiter (Segment 0 and 1) to 4 deep pipeline read */ |
