summaryrefslogtreecommitdiff
path: root/cpu/ppc4xx
diff options
context:
space:
mode:
authorMarkus Brunner <super.firetwister@gmail.com>2008-03-27 10:46:25 +0100
committerStefan Roese <sr@denx.de>2008-03-27 10:47:28 +0100
commitf766cdf89b3a2a7634b8c5869f606150e332036c (patch)
tree3c57648e83d13e7efce4d210e6d2be9ceda569bc /cpu/ppc4xx
parentf66e2c8b25c04b79e5fb385bc8989c2de7f63991 (diff)
downloadu-boot-imx-f766cdf89b3a2a7634b8c5869f606150e332036c.zip
u-boot-imx-f766cdf89b3a2a7634b8c5869f606150e332036c.tar.gz
u-boot-imx-f766cdf89b3a2a7634b8c5869f606150e332036c.tar.bz2
ppc4xx: PPC405EP Set EMAC noise filter bits
This bug was introduced with commit aee747f19b460a0e9da20ff21e90fdaac1cec359 which enabled CFG_4xx_GPIO_TABLE for PPC405 and unintentionally disabled the setting of the emac noise filter bits for PPC405EP when CFG_4xx_GPIO_TABLE is set. Signed-off-by: Markus Brunner <super.firetwister@gmail.com> Signed-off-by: Stefan Roese <sr@denx.de>
Diffstat (limited to 'cpu/ppc4xx')
-rw-r--r--cpu/ppc4xx/cpu_init.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/cpu/ppc4xx/cpu_init.c b/cpu/ppc4xx/cpu_init.c
index b35f1f0..42eabfe 100644
--- a/cpu/ppc4xx/cpu_init.c
+++ b/cpu/ppc4xx/cpu_init.c
@@ -233,6 +233,7 @@ cpu_init_f (void)
#if defined (CFG_GPIO0_TCR)
out32(GPIO0_TCR, CFG_GPIO0_TCR); /* enable output driver for outputs */
#endif
+#endif /* CONFIG_405EP ... && !CFG_4xx_GPIO_TABLE */
#if defined (CONFIG_405EP)
/*
@@ -245,7 +246,6 @@ cpu_init_f (void)
*/
mtdcr(cpc0_pci, mfdcr(cpc0_pci) | CPC0_PCI_HOST_CFG_EN | CPC0_PCI_ARBIT_EN);
#endif /* CONFIG_405EP */
-#endif /* CONFIG_405EP */
#if defined(CFG_4xx_GPIO_TABLE)
gpio_set_chip_configuration();