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 <aehrlich@taskit.de>
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
diff --git a/include/configs/afeb9260.h b/include/configs/afeb9260.h
index 9f8c567..24484fd 100644
--- a/include/configs/afeb9260.h
+++ b/include/configs/afeb9260.h
@@ -29,7 +29,7 @@
#define CONFIG_AT91_LEGACY
/* ARM asynchronous clock */
-#define AT91_MAIN_CLOCK 18429952 /* from 18.432 MHz crystal */
+#define CONFIG_SYS_AT91_MAIN_CLOCK 18429952 /* from 18.432 MHz crystal */
#define CONFIG_SYS_HZ 1000
#define CONFIG_AT91SAM9260 1 /* It's an Atmel AT91SAM9260 SoC*/
diff --git a/include/configs/at91cap9adk.h b/include/configs/at91cap9adk.h
index 9da5846..44c2870 100644
--- a/include/configs/at91cap9adk.h
+++ b/include/configs/at91cap9adk.h
@@ -30,7 +30,7 @@
#define CONFIG_AT91_LEGACY
/* ARM asynchronous clock */
-#define AT91_MAIN_CLOCK 12000000 /* 12 MHz crystal */
+#define CONFIG_SYS_AT91_MAIN_CLOCK 12000000 /* 12 MHz crystal */
#define CONFIG_SYS_HZ 1000
#define CONFIG_ARM926EJS 1 /* This is an ARM926EJS Core */
diff --git a/include/configs/at91sam9260ek.h b/include/configs/at91sam9260ek.h
index ff1e5b3..b89242b 100644
--- a/include/configs/at91sam9260ek.h
+++ b/include/configs/at91sam9260ek.h
@@ -30,7 +30,7 @@
#define CONFIG_AT91_LEGACY
/* ARM asynchronous clock */
-#define AT91_MAIN_CLOCK 18432000 /* 18.432 MHz crystal */
+#define CONFIG_SYS_AT91_MAIN_CLOCK 18432000 /* 18.432 MHz crystal */
#define CONFIG_SYS_HZ 1000
#define CONFIG_ARM926EJS 1 /* This is an ARM926EJS Core */
diff --git a/include/configs/at91sam9261ek.h b/include/configs/at91sam9261ek.h
index 63b55d2..df8181b 100644
--- a/include/configs/at91sam9261ek.h
+++ b/include/configs/at91sam9261ek.h
@@ -30,7 +30,7 @@
#define CONFIG_AT91_LEGACY
/* ARM asynchronous clock */
-#define AT91_MAIN_CLOCK 18432000 /* 18.432 MHz crystal */
+#define CONFIG_SYS_AT91_MAIN_CLOCK 18432000 /* 18.432 MHz crystal */
#define CONFIG_SYS_HZ 1000
#define CONFIG_ARM926EJS 1 /* This is an ARM926EJS Core */
diff --git a/include/configs/at91sam9263ek.h b/include/configs/at91sam9263ek.h
index 5a46d6a..5cafa1e 100644
--- a/include/configs/at91sam9263ek.h
+++ b/include/configs/at91sam9263ek.h
@@ -28,7 +28,7 @@
#define __CONFIG_H
/* ARM asynchronous clock */
-#define AT91_MAIN_CLOCK 16367660 /* 16.367 MHz crystal */
+#define CONFIG_SYS_AT91_MAIN_CLOCK 16367660 /* 16.367 MHz crystal */
#define CONFIG_SYS_HZ 1000
#define CONFIG_ARM926EJS 1 /* This is an ARM926EJS Core */
diff --git a/include/configs/at91sam9m10g45ek.h b/include/configs/at91sam9m10g45ek.h
index ce21831..44c5496 100644
--- a/include/configs/at91sam9m10g45ek.h
+++ b/include/configs/at91sam9m10g45ek.h
@@ -30,7 +30,7 @@
#define CONFIG_AT91_LEGACY
/* ARM asynchronous clock */
-#define AT91_MAIN_CLOCK 12000000 /* from 12 MHz crystal */
+#define CONFIG_SYS_AT91_MAIN_CLOCK 12000000 /* from 12 MHz crystal */
#define CONFIG_SYS_HZ 1000
#define CONFIG_ARM926EJS 1 /* This is an ARM926EJS Core */
diff --git a/include/configs/at91sam9rlek.h b/include/configs/at91sam9rlek.h
index 95f3d6c..e8fcd66 100644
--- a/include/configs/at91sam9rlek.h
+++ b/include/configs/at91sam9rlek.h
@@ -30,7 +30,7 @@
#define CONFIG_AT91_LEGACY
/* ARM asynchronous clock */
-#define AT91_MAIN_CLOCK 12000000 /* 12 MHz crystal */
+#define CONFIG_SYS_AT91_MAIN_CLOCK 12000000 /* 12 MHz crystal */
#define CONFIG_SYS_HZ 1000
#define CONFIG_ARM926EJS 1 /* This is an ARM926EJS Core */
diff --git a/include/configs/cpu9260.h b/include/configs/cpu9260.h
index 38f34c2..fb6f79a 100644
--- a/include/configs/cpu9260.h
+++ b/include/configs/cpu9260.h
@@ -35,7 +35,7 @@
#define CONFIG_DISPLAY_CPUINFO 1
-#define AT91_MAIN_CLOCK 18432000
+#define CONFIG_SYS_AT91_MAIN_CLOCK 18432000
#define CONFIG_SYS_HZ 1000
#define CONFIG_ARM926EJS 1
diff --git a/include/configs/pm9261.h b/include/configs/pm9261.h
index 8ee132b..47bb8c0 100644
--- a/include/configs/pm9261.h
+++ b/include/configs/pm9261.h
@@ -31,14 +31,14 @@
#define CONFIG_AT91_LEGACY
/* ARM asynchronous clock */
-#define AT91_CPU_NAME "AT91SAM9261"
+#define CONFIG_SYS_AT91_CPU_NAME "AT91SAM9261"
#define CONFIG_DISPLAY_BOARDINFO
#define MASTER_PLL_DIV 15
#define MASTER_PLL_MUL 162
#define MAIN_PLL_DIV 2
-#define AT91_MAIN_CLOCK 18432000
+#define CONFIG_SYS_AT91_MAIN_CLOCK 18432000
#define CONFIG_SYS_HZ 1000
diff --git a/include/configs/pm9263.h b/include/configs/pm9263.h
index a6fdcaa..807dba8 100644
--- a/include/configs/pm9263.h
+++ b/include/configs/pm9263.h
@@ -37,7 +37,7 @@
#define MASTER_PLL_DIV 6
#define MASTER_PLL_MUL 65
#define MAIN_PLL_DIV 2 /* 2 or 4 */
-#define AT91_MAIN_CLOCK 18432000
+#define CONFIG_SYS_AT91_MAIN_CLOCK 18432000
#define CONFIG_SYS_HZ 1000
diff --git a/include/configs/sbc35_a9g20.h b/include/configs/sbc35_a9g20.h
index 1f2ff9e..b9f27cc 100644
--- a/include/configs/sbc35_a9g20.h
+++ b/include/configs/sbc35_a9g20.h
@@ -41,7 +41,7 @@
#endif
/* ARM asynchronous clock */
-#define AT91_MAIN_CLOCK 12000000 /* 12.000 MHz crystal */
+#define CONFIG_SYS_AT91_MAIN_CLOCK 12000000 /* 12.000 MHz crystal */
#define CONFIG_SYS_HZ 1000
#define CONFIG_ARM926EJS 1 /* This is an ARM926EJS Core */
diff --git a/include/configs/tny_a9260.h b/include/configs/tny_a9260.h
index a159a40..5af2af3 100644
--- a/include/configs/tny_a9260.h
+++ b/include/configs/tny_a9260.h
@@ -51,7 +51,7 @@
#endif
/* ARM asynchronous clock */
-#define AT91_MAIN_CLOCK 12000000 /* 12 MHz crystal */
+#define CONFIG_SYS_AT91_MAIN_CLOCK 12000000 /* 12 MHz crystal */
#define CONFIG_SYS_HZ 1000
#define CONFIG_ARM926EJS 1 /* This is an ARM926EJS Core */