From 7c966a8bdfdab80cafbfed035d7ae6ea6f58f756 Mon Sep 17 00:00:00 2001 From: Achim Ehrlich Date: Wed, 24 Feb 2010 10:29:16 +0100 Subject: ARM change name of defines for AT91 arm926ejs Configuration defines should be preceeded with CONFIG_SYS_. Renamed some at91 specific defines to conform to this naming convention: AT91_CPU_NAME to CONFIG_SYS_AT91_CPU_NAME AT91_MAIN_CLOCK to CONFIG_SYS_AT91_MAIN_CLOCK Signed-off-by: Achim Ehrlich --- include/asm-arm/arch-at91/at91cap9.h | 2 +- include/asm-arm/arch-at91/at91rm9200.h | 2 +- include/asm-arm/arch-at91/at91sam9260.h | 4 ++-- include/asm-arm/arch-at91/at91sam9261.h | 2 +- include/asm-arm/arch-at91/at91sam9263.h | 2 +- include/asm-arm/arch-at91/at91sam9g45.h | 2 +- include/asm-arm/arch-at91/at91sam9rl.h | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) (limited to 'include/asm-arm/arch-at91') diff --git a/include/asm-arm/arch-at91/at91cap9.h b/include/asm-arm/arch-at91/at91cap9.h index 658124b..5af6fdc 100644 --- a/include/asm-arm/arch-at91/at91cap9.h +++ b/include/asm-arm/arch-at91/at91cap9.h @@ -145,6 +145,6 @@ /* * Cpu Name */ -#define AT91_CPU_NAME "AT91CAP9" +#define CONFIG_SYS_AT91_CPU_NAME "AT91CAP9" #endif diff --git a/include/asm-arm/arch-at91/at91rm9200.h b/include/asm-arm/arch-at91/at91rm9200.h index 990f5a6..1bee6f2 100644 --- a/include/asm-arm/arch-at91/at91rm9200.h +++ b/include/asm-arm/arch-at91/at91rm9200.h @@ -130,6 +130,6 @@ #define AT91_PMX_CA_NCS7 0x00002000 #define AT91_PMX_CA_D16_31 0xFFFF0000 -#define AT91_CPU_NAME "AT91RM9200" +#define CONFIG_SYS_AT91_CPU_NAME "AT91RM9200" #endif diff --git a/include/asm-arm/arch-at91/at91sam9260.h b/include/asm-arm/arch-at91/at91sam9260.h index 7ca6078..a60a081 100644 --- a/include/asm-arm/arch-at91/at91sam9260.h +++ b/include/asm-arm/arch-at91/at91sam9260.h @@ -139,9 +139,9 @@ * Cpu Name */ #if defined(CONFIG_AT91SAM9260) -#define AT91_CPU_NAME "AT91SAM9260" +#define CONFIG_SYS_AT91_CPU_NAME "AT91SAM9260" #elif defined(CONFIG_AT91SAM9G20) -#define AT91_CPU_NAME "AT91SAM9G20" +#define CONFIG_SYS_AT91_CPU_NAME "AT91SAM9G20" #endif #endif diff --git a/include/asm-arm/arch-at91/at91sam9261.h b/include/asm-arm/arch-at91/at91sam9261.h index 1d8cab6..2952292 100644 --- a/include/asm-arm/arch-at91/at91sam9261.h +++ b/include/asm-arm/arch-at91/at91sam9261.h @@ -114,6 +114,6 @@ /* * Cpu Name */ -#define AT91_CPU_NAME "AT91SAM9261" +#define CONFIG_SYS_AT91_CPU_NAME "AT91SAM9261" #endif diff --git a/include/asm-arm/arch-at91/at91sam9263.h b/include/asm-arm/arch-at91/at91sam9263.h index b26b7b4..c177bd0 100644 --- a/include/asm-arm/arch-at91/at91sam9263.h +++ b/include/asm-arm/arch-at91/at91sam9263.h @@ -147,6 +147,6 @@ /* * Cpu Name */ -#define AT91_CPU_NAME "AT91SAM9263" +#define CONFIG_SYS_AT91_CPU_NAME "AT91SAM9263" #endif diff --git a/include/asm-arm/arch-at91/at91sam9g45.h b/include/asm-arm/arch-at91/at91sam9g45.h index 99c03f7..445f4b2 100644 --- a/include/asm-arm/arch-at91/at91sam9g45.h +++ b/include/asm-arm/arch-at91/at91sam9g45.h @@ -147,6 +147,6 @@ /* * Cpu Name */ -#define AT91_CPU_NAME "AT91SAM9G45" +#define CONFIG_SYS_AT91_CPU_NAME "AT91SAM9G45" #endif diff --git a/include/asm-arm/arch-at91/at91sam9rl.h b/include/asm-arm/arch-at91/at91sam9rl.h index 12054f6..8eb0d4f 100644 --- a/include/asm-arm/arch-at91/at91sam9rl.h +++ b/include/asm-arm/arch-at91/at91sam9rl.h @@ -125,6 +125,6 @@ /* * Cpu Name */ -#define AT91_CPU_NAME "AT91SAM9RL" +#define CONFIG_SYS_AT91_CPU_NAME "AT91SAM9RL" #endif -- cgit v1.1