leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ARM: at91sam9x5: Using CPU string directly

Browse Source 
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>
This commit is contained in:
Bo Shen 2013-03-07 21:23:22 +00:00 committed by Andreas Bießmann
parent 0c58cfa9dd
commit fc14fbace4
2 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
arch/arm/cpu/arm926ejs/at91/at91sam9x5_devices.c
View File

@ -61,20 +61,20 @@ char *get_cpu_name()
if (cpu_is_at91sam9x5()) { if (cpu_is_at91sam9x5()) {
switch (extension_id) { switch (extension_id) {
case ARCH_EXID_AT91SAM9G15: case ARCH_EXID_AT91SAM9G15:
return CONFIG_SYS_AT91_G15_CPU_NAME; return "AT91SAM9G15";
case ARCH_EXID_AT91SAM9G25: case ARCH_EXID_AT91SAM9G25:
return CONFIG_SYS_AT91_G25_CPU_NAME; return "AT91SAM9G25";
case ARCH_EXID_AT91SAM9G35: case ARCH_EXID_AT91SAM9G35:
return CONFIG_SYS_AT91_G35_CPU_NAME; return "AT91SAM9G35";
case ARCH_EXID_AT91SAM9X25: case ARCH_EXID_AT91SAM9X25:
return CONFIG_SYS_AT91_X25_CPU_NAME; return "AT91SAM9X25";
case ARCH_EXID_AT91SAM9X35: case ARCH_EXID_AT91SAM9X35:
return CONFIG_SYS_AT91_X35_CPU_NAME; return "AT91SAM9X35";
default: default:
return CONFIG_SYS_AT91_UNKNOWN_CPU; return "Unknown CPU type";
} }
} else { } else {
return CONFIG_SYS_AT91_UNKNOWN_CPU; return "Unknown CPU type";
} }
} }

6
arch/arm/include/asm/arch-at91/at91sam9x5.h
View File

@ -140,12 +140,6 @@
/* /*
* Cpu Name * Cpu Name
*/ */
#define CONFIG_SYS_AT91_G15_CPU_NAME "AT91SAM9G15"
#define CONFIG_SYS_AT91_G25_CPU_NAME "AT91SAM9G25"
#define CONFIG_SYS_AT91_G35_CPU_NAME "AT91SAM9G35"
#define CONFIG_SYS_AT91_X25_CPU_NAME "AT91SAM9X25"
#define CONFIG_SYS_AT91_X35_CPU_NAME "AT91SAM9X35"
#define CONFIG_SYS_AT91_UNKNOWN_CPU "Unknown CPU type"
#define ATMEL_CPU_NAME get_cpu_name() #define ATMEL_CPU_NAME get_cpu_name()
/* /*