summaryrefslogtreecommitdiff
path: root/arch/arm/cpu
diff options
context:
space:
mode:
authorBo Shen <voice.shen@atmel.com>2013-03-07 21:23:22 +0000
committerAndreas Bießmann <andreas.devel@googlemail.com>2013-03-12 13:02:13 +0100
commitfc14fbace4b295ffb22aa90d2791365f1dd6bb15 (patch)
treefaee3f98fbe470905ad361fb5cab3b97714f1a8b /arch/arm/cpu
parent0c58cfa9dd84176a26a64be258a554a38ce654e2 (diff)
downloadu-boot-imx-fc14fbace4b295ffb22aa90d2791365f1dd6bb15.zip
u-boot-imx-fc14fbace4b295ffb22aa90d2791365f1dd6bb15.tar.gz
u-boot-imx-fc14fbace4b295ffb22aa90d2791365f1dd6bb15.tar.bz2
ARM: at91sam9x5: Using CPU string directly
As the CPU name is not configurable, using CPU string directly Signed-off-by: Bo Shen <voice.shen@atmel.com> Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
Diffstat (limited to 'arch/arm/cpu')
-rw-r--r--arch/arm/cpu/arm926ejs/at91/at91sam9x5_devices.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/arch/arm/cpu/arm926ejs/at91/at91sam9x5_devices.c b/arch/arm/cpu/arm926ejs/at91/at91sam9x5_devices.c
index 0448c0b..29e8aa4 100644
--- a/arch/arm/cpu/arm926ejs/at91/at91sam9x5_devices.c
+++ b/arch/arm/cpu/arm926ejs/at91/at91sam9x5_devices.c
@@ -61,20 +61,20 @@ char *get_cpu_name()
if (cpu_is_at91sam9x5()) {
switch (extension_id) {
case ARCH_EXID_AT91SAM9G15:
- return CONFIG_SYS_AT91_G15_CPU_NAME;
+ return "AT91SAM9G15";
case ARCH_EXID_AT91SAM9G25:
- return CONFIG_SYS_AT91_G25_CPU_NAME;
+ return "AT91SAM9G25";
case ARCH_EXID_AT91SAM9G35:
- return CONFIG_SYS_AT91_G35_CPU_NAME;
+ return "AT91SAM9G35";
case ARCH_EXID_AT91SAM9X25:
- return CONFIG_SYS_AT91_X25_CPU_NAME;
+ return "AT91SAM9X25";
case ARCH_EXID_AT91SAM9X35:
- return CONFIG_SYS_AT91_X35_CPU_NAME;
+ return "AT91SAM9X35";
default:
- return CONFIG_SYS_AT91_UNKNOWN_CPU;
+ return "Unknown CPU type";
}
} else {
- return CONFIG_SYS_AT91_UNKNOWN_CPU;
+ return "Unknown CPU type";
}
}