diff options
| author | Wolfgang Denk <wd@denx.de> | 2011-02-02 21:57:19 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-02-02 21:57:19 +0100 |
| commit | be9db564de898240034151c48cf9e0d03ece3f35 (patch) | |
| tree | f87b02a573c61fdab3f190de09e6b0c8061f446b /arch/arm/cpu/armv7/mx5/soc.c | |
| parent | 89ffa8dbb5bd0552f5f3399f4430a4c97f4d50d4 (diff) | |
| parent | 9e40808c3fe0237a8d49f10394d3a8e4e29540a6 (diff) | |
| download | blackbird-obmc-uboot-be9db564de898240034151c48cf9e0d03ece3f35.tar.gz blackbird-obmc-uboot-be9db564de898240034151c48cf9e0d03ece3f35.zip | |
Merge branch 'master' of /home/wd/git/u-boot/custodians
Diffstat (limited to 'arch/arm/cpu/armv7/mx5/soc.c')
| -rw-r--r-- | arch/arm/cpu/armv7/mx5/soc.c | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/arch/arm/cpu/armv7/mx5/soc.c b/arch/arm/cpu/armv7/mx5/soc.c index 290011923e..09500b3b9f 100644 --- a/arch/arm/cpu/armv7/mx5/soc.c +++ b/arch/arm/cpu/armv7/mx5/soc.c @@ -33,17 +33,20 @@ #include <fsl_esdhc.h> #endif -#if defined(CONFIG_MX51) -#define CPU_TYPE 0x51000 -#else +#if !(defined(CONFIG_MX51) || defined(CONFIG_MX53)) #error "CPU_TYPE not defined" #endif u32 get_cpu_rev(void) { - int system_rev = CPU_TYPE; +#ifdef CONFIG_MX51 + int system_rev = 0x51000; +#else + int system_rev = 0x53000; +#endif int reg = __raw_readl(ROM_SI_REV); +#if defined(CONFIG_MX51) switch (reg) { case 0x02: system_rev |= CHIP_REV_1_1; @@ -57,11 +60,20 @@ u32 get_cpu_rev(void) case 0x20: system_rev |= CHIP_REV_3_0; break; - return system_rev; default: system_rev |= CHIP_REV_1_0; break; } +#else + switch (reg) { + case 0x20: + system_rev |= CHIP_REV_2_0; + break; + default: + system_rev |= CHIP_REV_1_0; + break; + } +#endif return system_rev; } |
