diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2011-09-22 11:36:32 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2011-09-27 11:51:58 +0200 |
| commit | a97e68d6dd61bcb46af9cc3fef974e1273b7b263 (patch) | |
| tree | 2fc8d1cd0caa533de1922aefa6af853e5747ec1d | |
| parent | 14da1c7e65e98ee92bcc99ce6cd16049e3a545dc (diff) | |
| download | barebox-a97e68d6dd61bcb46af9cc3fef974e1273b7b263.tar.gz barebox-a97e68d6dd61bcb46af9cc3fef974e1273b7b263.tar.xz | |
ppc mpc5200: remove various board specific register setup from generic code
The boards can do this themselves, no need for ifdef orgies.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| -rw-r--r-- | arch/ppc/boards/pcm030/config.h | 2 | ||||
| -rw-r--r-- | arch/ppc/mach-mpc5xxx/cpu_init.c | 21 |
2 files changed, 0 insertions, 23 deletions
diff --git a/arch/ppc/boards/pcm030/config.h b/arch/ppc/boards/pcm030/config.h index e8064d2ff4..508e017161 100644 --- a/arch/ppc/boards/pcm030/config.h +++ b/arch/ppc/boards/pcm030/config.h @@ -36,8 +36,6 @@ #define CFG_HID0_INIT HID0_ICE | HID0_ICFI #define CFG_HID0_FINAL HID0_ICE -#define CFG_CS_BURST 0x00000000 -#define CFG_CS_DEADCYCLE 0x33333333 #define CFG_BOOTMAPSZ (8 << 20) /* Initial Memory map for Linux */ diff --git a/arch/ppc/mach-mpc5xxx/cpu_init.c b/arch/ppc/mach-mpc5xxx/cpu_init.c index 785cb2ce7d..a6c270b3ef 100644 --- a/arch/ppc/mach-mpc5xxx/cpu_init.c +++ b/arch/ppc/mach-mpc5xxx/cpu_init.c @@ -34,22 +34,6 @@ int cpu_init(void) { unsigned long addecr = (1 << 25); /* Boot_CS */ -#if defined(CFG_CS_BURST) - *(vu_long *)MPC5XXX_CS_BURST = CFG_CS_BURST; -#endif -#if defined(CFG_CS_DEADCYCLE) - *(vu_long *)MPC5XXX_CS_DEADCYCLE = CFG_CS_DEADCYCLE; -#endif - - /* Enable chip selects */ - *(vu_long *)MPC5XXX_ADDECR = addecr; - *(vu_long *)MPC5XXX_CS_CTRL = (1 << 24); - - /* Setup pin multiplexing */ -#if defined(CFG_GPS_PORT_CONFIG) - *(vu_long *)MPC5XXX_GPS_PORT_CONFIG = CFG_GPS_PORT_CONFIG; -#endif - /* enable timebase */ *(vu_long *)(MPC5XXX_XLBARB + 0x40) |= (1 << 13); @@ -61,11 +45,6 @@ int cpu_init(void) *(vu_long *)MPC5XXX_XLBARB_MPRIEN = 0xff; *(vu_long *)MPC5XXX_XLBARB_MPRIVAL = 0x11111111; -# if defined(CFG_XLB_PIPELINING) - /* Enable piplining */ - *(vu_long *)(MPC5XXX_XLBARB + 0x40) &= ~(1 << 31); -# endif - /* mask all interrupts */ *(vu_long *)MPC5XXX_ICTL_PER_MASK = 0xffffff00; |