diff options
author | Tom Rini <trini@konsulko.com> | 2015-05-04 17:50:20 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2015-05-04 17:50:20 -0400 |
commit | 622da1c36aee9c39075f2109848228a5737925c0 (patch) | |
tree | e08cd8d033fd09e415d603bab26691d776365adb /arch/arm/cpu/armv7/sunxi/cpu_info.c | |
parent | 281239ad9dc2a695a53ab34dda44cdbe31c69122 (diff) | |
parent | fd01ae1384a67c354eb53fc8a4c1e0d519014ae8 (diff) |
Merge branch 'master' of git://git.denx.de/u-boot-sunxi
Diffstat (limited to 'arch/arm/cpu/armv7/sunxi/cpu_info.c')
-rw-r--r-- | arch/arm/cpu/armv7/sunxi/cpu_info.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/cpu/armv7/sunxi/cpu_info.c b/arch/arm/cpu/armv7/sunxi/cpu_info.c index b6cb9dea64..30ec4ac4f0 100644 --- a/arch/arm/cpu/armv7/sunxi/cpu_info.c +++ b/arch/arm/cpu/armv7/sunxi/cpu_info.c @@ -64,8 +64,10 @@ int print_cpuinfo(void) } #elif defined CONFIG_MACH_SUN7I puts("CPU: Allwinner A20 (SUN7I)\n"); -#elif defined CONFIG_MACH_SUN8I +#elif defined CONFIG_MACH_SUN8I_A23 puts("CPU: Allwinner A23 (SUN8I)\n"); +#elif defined CONFIG_MACH_SUN8I_A33 + puts("CPU: Allwinner A33 (SUN8I)\n"); #else #warning Please update cpu_info.c with correct CPU information puts("CPU: SUNXI Family\n"); @@ -76,7 +78,7 @@ int print_cpuinfo(void) int sunxi_get_sid(unsigned int *sid) { -#if defined CONFIG_MACH_SUN6I || defined CONFIG_MACH_SUN8I +#if defined CONFIG_MACH_SUN6I || defined CONFIG_MACH_SUN8I_A23 #ifdef CONFIG_AXP221_POWER return axp221_get_sid(sid); #else |