minix/u-boot
1
0
Fork 0
mirror of https://github.com/Stichting-MINIX-Research-Foundation/u-boot.git synced 2025-09-09 20:18:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

ppc4xx: Coding style cleanup

Browse Source 
Signed-off-by: Stefan Roese <sr@denx.de>
This commit is contained in:
Stefan Roese 2007-10-02 11:44:46 +02:00
parent 87c1833a39
commit 738815c0cc
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cpu/ppc4xx/4xx_enet.c
View File

@ -410,7 +410,7 @@ static int ppc_4xx_eth_init (struct eth_device *dev, bd_t * bis)
#endif #endif
#endif #endif
#if defined(CONFIG_440EPX) || defined(CONFIG_440GRX) || \ #if defined(CONFIG_440EPX) || defined(CONFIG_440GRX) || \
defined(CONFIG_440SPE) || defined(CONFIG_440SP) defined(CONFIG_440SP) || defined(CONFIG_440SPE)
unsigned long mfr; unsigned long mfr;
#endif #endif
@ -502,8 +502,8 @@ static int ppc_4xx_eth_init (struct eth_device *dev, bd_t * bis)
__asm__ volatile ("eieio"); __asm__ volatile ("eieio");
/* reset emac so we have access to the phy */ /* reset emac so we have access to the phy */
#if defined(CONFIG_440SPE) || defined(CONFIG_440EPX) || defined(CONFIG_440GRX) || \ #if defined(CONFIG_440EPX) || defined(CONFIG_440GRX) || \
defined(CONFIG_440SP) defined(CONFIG_440SP) || defined(CONFIG_440SPE)
/* provide clocks for EMAC internal loopback */ /* provide clocks for EMAC internal loopback */
mfsdr (sdr_mfr, mfr); mfsdr (sdr_mfr, mfr);
mfr |= SDR0_MFR_ETH_CLK_SEL_V(devnum); mfr |= SDR0_MFR_ETH_CLK_SEL_V(devnum);
@ -521,8 +521,8 @@ static int ppc_4xx_eth_init (struct eth_device *dev, bd_t * bis)
if (failsafe <= 0) if (failsafe <= 0)
printf("\nProblem resetting EMAC!\n"); printf("\nProblem resetting EMAC!\n");
#if defined(CONFIG_440SPE) || defined(CONFIG_440EPX) || defined(CONFIG_440GRX) || \ #if defined(CONFIG_440EPX) || defined(CONFIG_440GRX) || \
defined(CONFIG_440SP) defined(CONFIG_440SP) || defined(CONFIG_440SPE)
/* remove clocks for EMAC internal loopback */ /* remove clocks for EMAC internal loopback */
mfsdr (sdr_mfr, mfr); mfsdr (sdr_mfr, mfr);
mfr &= ~SDR0_MFR_ETH_CLK_SEL_V(devnum); mfr &= ~SDR0_MFR_ETH_CLK_SEL_V(devnum);
@ -924,8 +924,8 @@ static int ppc_4xx_eth_init (struct eth_device *dev, bd_t * bis)
/* set speed */ /* set speed */
if (speed == _1000BASET) { if (speed == _1000BASET) {
#if defined(CONFIG_440SP) || defined(CONFIG_440SPE) || \ #if defined(CONFIG_440EPX) || defined(CONFIG_440GRX) || \
defined(CONFIG_440EPX) || defined(CONFIG_440GRX) defined(CONFIG_440SP) || defined(CONFIG_440SPE)
unsigned long pfc1; unsigned long pfc1;
mfsdr (sdr_pfc1, pfc1); mfsdr (sdr_pfc1, pfc1);