From: Markus Brunner <super.firetwister@gmail.com>
Date: Thu, 27 Mar 2008 09:46:25 +0000 (+0100)
Subject: ppc4xx: PPC405EP Set EMAC noise filter bits
X-Git-Tag: v1.3.3-rc1~119^2~11
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=f766cdf89b3a2a7634b8c5869f606150e332036c;p=u-boot

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>
---

diff --git a/cpu/ppc4xx/cpu_init.c b/cpu/ppc4xx/cpu_init.c
index b35f1f0896..42eabfe568 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();