diff options
author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-07-28 10:12:45 +0200 |
---|---|---|
committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-07-28 10:12:45 +0200 |
commit | 740f41d3cbefe2068247852220226c2c3b287249 (patch) | |
tree | a8afb3f0e3f0b7d4574cbbfd2e8d780db6b4ae08 /arch/arm/cpu/armv7/sunxi/cpu_info.c | |
parent | f2c8d7f591e28d3437155c7a6eae8c8d9e3fe552 (diff) | |
parent | 7c48b015100eeff0e1bbb766394f7beca23afb48 (diff) | |
download | u-boot-740f41d3cbefe2068247852220226c2c3b287249.tar.gz u-boot-740f41d3cbefe2068247852220226c2c3b287249.tar.xz u-boot-740f41d3cbefe2068247852220226c2c3b287249.zip |
Merge branch 'u-boot-sunxi/master' into 'u-boot-arm/master'
Diffstat (limited to 'arch/arm/cpu/armv7/sunxi/cpu_info.c')
-rw-r--r-- | arch/arm/cpu/armv7/sunxi/cpu_info.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/arch/arm/cpu/armv7/sunxi/cpu_info.c b/arch/arm/cpu/armv7/sunxi/cpu_info.c index b4c3d5c6dd..5cf35acc1e 100644 --- a/arch/arm/cpu/armv7/sunxi/cpu_info.c +++ b/arch/arm/cpu/armv7/sunxi/cpu_info.c @@ -13,7 +13,22 @@ #ifdef CONFIG_DISPLAY_CPUINFO int print_cpuinfo(void) { +#ifdef CONFIG_SUN4I + puts("CPU: Allwinner A10 (SUN4I)\n"); +#elif defined CONFIG_SUN5I + u32 val = readl(SUNXI_SID_BASE + 0x08); + switch ((val >> 12) & 0xf) { + case 0: puts("CPU: Allwinner A12 (SUN5I)\n"); break; + case 3: puts("CPU: Allwinner A13 (SUN5I)\n"); break; + case 7: puts("CPU: Allwinner A10s (SUN5I)\n"); break; + default: puts("CPU: Allwinner A1X (SUN5I)\n"); + } +#elif defined CONFIG_SUN7I puts("CPU: Allwinner A20 (SUN7I)\n"); +#else +#warning Please update cpu_info.c with correct CPU information + puts("CPU: SUNXI Family\n"); +#endif return 0; } #endif |