diff options
| author | Gerlando Falauto <gerlando.falauto@keymile.com> | 2012-10-10 22:13:07 +0000 |
|---|---|---|
| committer | Kim Phillips <kim.phillips@freescale.com> | 2012-10-23 15:23:25 -0500 |
| commit | 8afad91f15880d34c7456159209b26918977c400 (patch) | |
| tree | 749f2c7110d4c56dea8a31946add84e118d8d7b9 | |
| parent | 4b5282de99291c31e0afe4b44e805395fadd7c8f (diff) | |
| download | u-boot-imx-8afad91f15880d34c7456159209b26918977c400.zip u-boot-imx-8afad91f15880d34c7456159209b26918977c400.tar.gz u-boot-imx-8afad91f15880d34c7456159209b26918977c400.tar.bz2 | |
cleanup: introduce CONFIG_MPC830x
Introduce a new configuration token CONFIG_MPC830x to be shared among
mpc8308 and mpc8309. Define it for existing 8308 boards, and refactor
existing common code so to make future introduction of 8309 simpler.
Signed-off-by: Gerlando Falauto <gerlando.falauto@keymile.com>
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
| -rw-r--r-- | arch/powerpc/cpu/mpc83xx/speed.c | 3 | ||||
| -rw-r--r-- | arch/powerpc/include/asm/immap_83xx.h | 4 | ||||
| -rw-r--r-- | include/configs/MPC8308RDB.h | 1 | ||||
| -rw-r--r-- | include/configs/mpc8308_p1m.h | 1 | ||||
| -rw-r--r-- | include/mpc83xx.h | 2 |
5 files changed, 8 insertions, 3 deletions
diff --git a/arch/powerpc/cpu/mpc83xx/speed.c b/arch/powerpc/cpu/mpc83xx/speed.c index 3383568..4ad3ec3 100644 --- a/arch/powerpc/cpu/mpc83xx/speed.c +++ b/arch/powerpc/cpu/mpc83xx/speed.c @@ -185,7 +185,10 @@ int get_clocks(void) /* unkown SCCR_TSEC1CM value */ return -2; } +#endif +#if defined(CONFIG_MPC830x) || defined(CONFIG_MPC831x) || \ + defined(CONFIG_MPC834x) || defined(CONFIG_MPC837x) switch ((sccr & SCCR_USBDRCM) >> SCCR_USBDRCM_SHIFT) { case 0: usbdr_clk = 0; diff --git a/arch/powerpc/include/asm/immap_83xx.h b/arch/powerpc/include/asm/immap_83xx.h index 2ba502a..b7d4c59 100644 --- a/arch/powerpc/include/asm/immap_83xx.h +++ b/arch/powerpc/include/asm/immap_83xx.h @@ -73,8 +73,8 @@ typedef struct sysconf83xx { u32 obir; /* Output Buffer Impedance Register */ u8 res8[0xC]; u32 pecr1; /* PCI Express control register 1 */ -#ifdef CONFIG_MPC8308 - u32 sdhccr; /* eSDHC Control Registers for MPC8308 */ +#if defined(CONFIG_MPC830x) + u32 sdhccr; /* eSDHC Control Registers for MPC830x */ #else u32 pecr2; /* PCI Express control register 2 */ #endif diff --git a/include/configs/MPC8308RDB.h b/include/configs/MPC8308RDB.h index a1fbece..95a1885 100644 --- a/include/configs/MPC8308RDB.h +++ b/include/configs/MPC8308RDB.h @@ -30,6 +30,7 @@ */ #define CONFIG_E300 1 /* E300 family */ #define CONFIG_MPC83xx 1 /* MPC83xx family */ +#define CONFIG_MPC830x 1 /* MPC830x family */ #define CONFIG_MPC8308 1 /* MPC8308 CPU specific */ #define CONFIG_MPC8308RDB 1 /* MPC8308RDB board specific */ diff --git a/include/configs/mpc8308_p1m.h b/include/configs/mpc8308_p1m.h index 035a1b6..aa681f0 100644 --- a/include/configs/mpc8308_p1m.h +++ b/include/configs/mpc8308_p1m.h @@ -30,6 +30,7 @@ */ #define CONFIG_E300 1 /* E300 family */ #define CONFIG_MPC83xx 1 /* MPC83xx family */ +#define CONFIG_MPC830x 1 /* MPC830x family */ #define CONFIG_MPC8308 1 /* MPC8308 CPU specific */ #define CONFIG_MPC8308_P1M 1 /* mpc8308_p1m board specific */ diff --git a/include/mpc83xx.h b/include/mpc83xx.h index a78f1a2..7a19740 100644 --- a/include/mpc83xx.h +++ b/include/mpc83xx.h @@ -969,7 +969,7 @@ */ #define CSCONFIG_EN 0x80000000 #define CSCONFIG_AP 0x00800000 -#if defined(CONFIG_MPC8308) || defined(CONFIG_MPC831x) +#if defined(CONFIG_MPC830x) || defined(CONFIG_MPC831x) #define CSCONFIG_ODT_RD_NEVER 0x00000000 #define CSCONFIG_ODT_RD_ONLY_CURRENT 0x00100000 #define CSCONFIG_ODT_RD_ONLY_OTHER_CS 0x00200000 |