diff options
| author | wdenk <wdenk> | 2004-03-14 22:25:36 +0000 |
|---|---|---|
| committer | wdenk <wdenk> | 2004-03-14 22:25:36 +0000 |
| commit | 42dfe7a1844cbad7114038aaf03828acb7a84414 (patch) | |
| tree | d33893d34d2a97aa23257703733dbc9d86d48278 /cpu/ppc4xx | |
| parent | 855a496fe9ba431772f1ff1aef21a5c001288bb0 (diff) | |
| download | u-boot-imx-42dfe7a1844cbad7114038aaf03828acb7a84414.zip u-boot-imx-42dfe7a1844cbad7114038aaf03828acb7a84414.tar.gz u-boot-imx-42dfe7a1844cbad7114038aaf03828acb7a84414.tar.bz2 | |
Code cleanup; make several boards compile & link.
Diffstat (limited to 'cpu/ppc4xx')
| -rw-r--r-- | cpu/ppc4xx/405gp_pci.c | 2 | ||||
| -rw-r--r-- | cpu/ppc4xx/cpu.c | 10 | ||||
| -rw-r--r-- | cpu/ppc4xx/serial.c | 6 | ||||
| -rw-r--r-- | cpu/ppc4xx/speed.c | 2 |
4 files changed, 10 insertions, 10 deletions
diff --git a/cpu/ppc4xx/405gp_pci.c b/cpu/ppc4xx/405gp_pci.c index c9e2e9c..ff9215f 100644 --- a/cpu/ppc4xx/405gp_pci.c +++ b/cpu/ppc4xx/405gp_pci.c @@ -364,7 +364,7 @@ void pci_405gp_setup_vga(struct pci_controller *hose, pci_dev_t dev, */ static struct pci_config_table pci_405gp_config_table[] = { /*if VendID is 0 it terminates the table search (ie Walnut)*/ -#if CFG_PCI_SUBSYS_VENDORID +#ifdef CFG_PCI_SUBSYS_VENDORID {CFG_PCI_SUBSYS_VENDORID, PCI_ANY_ID, PCI_CLASS_BRIDGE_HOST, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID, pci_405gp_setup_bridge}, #endif diff --git a/cpu/ppc4xx/cpu.c b/cpu/ppc4xx/cpu.c index df19605..cdb5039 100644 --- a/cpu/ppc4xx/cpu.c +++ b/cpu/ppc4xx/cpu.c @@ -70,17 +70,17 @@ int checkcpu (void) get_sys_info(&sys_info); -#if CONFIG_405GP +#ifdef CONFIG_405GP puts ("IBM PowerPC 405GP"); if (pvr == PVR_405GPR_RB) { putc('r'); } puts (" Rev. "); #endif -#if CONFIG_405CR +#ifdef CONFIG_405CR puts ("IBM PowerPC 405CR Rev. "); #endif -#if CONFIG_405EP +#ifdef CONFIG_405EP puts ("IBM PowerPC 405EP Rev. "); #endif switch (pvr) { @@ -89,7 +89,7 @@ int checkcpu (void) putc('B'); break; case PVR_405GP_RC: -#if CONFIG_405CR +#ifdef CONFIG_405CR case PVR_405CR_RC: #endif putc('C'); @@ -97,7 +97,7 @@ int checkcpu (void) case PVR_405GP_RD: putc('D'); break; -#if CONFIG_405GP +#ifdef CONFIG_405GP case PVR_405GP_RE: putc('E'); break; diff --git a/cpu/ppc4xx/serial.c b/cpu/ppc4xx/serial.c index 2c77338..41402cc 100644 --- a/cpu/ppc4xx/serial.c +++ b/cpu/ppc4xx/serial.c @@ -48,7 +48,7 @@ #include <watchdog.h> #include "vecnum.h" -#if CONFIG_SERIAL_SOFTWARE_FIFO +#ifdef CONFIG_SERIAL_SOFTWARE_FIFO #include <malloc.h> #endif @@ -351,7 +351,7 @@ int serial_tstc () /*#define asyncRxBufferport1 ACTING_UART0_BASE+0x00 */ -#if CONFIG_SERIAL_SOFTWARE_FIFO +#ifdef CONFIG_SERIAL_SOFTWARE_FIFO /*-----------------------------------------------------------------------------+ | Fifo +-----------------------------------------------------------------------------*/ @@ -637,7 +637,7 @@ int serial_tstc () } -#if CONFIG_SERIAL_SOFTWARE_FIFO +#ifdef CONFIG_SERIAL_SOFTWARE_FIFO void serial_isr (void *arg) { diff --git a/cpu/ppc4xx/speed.c b/cpu/ppc4xx/speed.c index 7172fe3..f8f88ff 100644 --- a/cpu/ppc4xx/speed.c +++ b/cpu/ppc4xx/speed.c @@ -247,7 +247,7 @@ void get_sys_info (sys_info_t * sysInfo) unsigned long temp1; unsigned long lfdiv; unsigned long m; - unsigned long prbdv0; + unsigned long prbdv0; /* Extract configured divisors */ mfsdr( sdr_sdstp0,strp0 ); |