[U-Boot] [PATCH] at91: move cpu name define to arm/arch/ cpu header
Jean-Christophe PLAGNIOL-VILLARD
plagnioj at jcrosoft.com
Fri May 22 18:08:17 CEST 2009
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj at jcrosoft.com>
---
include/asm-arm/arch-at91/at91cap9.h | 5 +++++
include/asm-arm/arch-at91/at91sam9260.h | 9 +++++++++
include/asm-arm/arch-at91/at91sam9261.h | 4 ++++
include/asm-arm/arch-at91/at91sam9263.h | 4 ++++
include/asm-arm/arch-at91/at91sam9rl.h | 5 +++++
include/configs/at91cap9adk.h | 1 -
include/configs/at91sam9260ek.h | 2 --
include/configs/at91sam9261ek.h | 1 -
include/configs/at91sam9263ek.h | 1 -
include/configs/at91sam9rlek.h | 1 -
include/configs/pm9263.h | 2 --
11 files changed, 27 insertions(+), 8 deletions(-)
diff --git a/include/asm-arm/arch-at91/at91cap9.h b/include/asm-arm/arch-at91/at91cap9.h
index 0b52228..b128ac5 100644
--- a/include/asm-arm/arch-at91/at91cap9.h
+++ b/include/asm-arm/arch-at91/at91cap9.h
@@ -134,4 +134,9 @@
#define CONFIG_DRAM_BASE AT91_CHIPSELECT_6
+/*
+ * Cpu Name
+ */
+#define AT91_CPU_NAME "AT91CAP9"
+
#endif
diff --git a/include/asm-arm/arch-at91/at91sam9260.h b/include/asm-arm/arch-at91/at91sam9260.h
index 920a7f3..707d7bc 100644
--- a/include/asm-arm/arch-at91/at91sam9260.h
+++ b/include/asm-arm/arch-at91/at91sam9260.h
@@ -121,4 +121,13 @@
#define AT91SAM9XE_FLASH_BASE 0x00200000 /* Internal FLASH base address */
#define AT91SAM9XE_SRAM_BASE 0x00300000 /* Internal SRAM base address */
+/*
+ * Cpu Name
+ */
+#if defined(CONFIG_AT91SAM9260)
+#define AT91_CPU_NAME "AT91SAM9260"
+#if defined(CONFIG_AT91SAM9G20)
+#define 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 752d81d..b303e07 100644
--- a/include/asm-arm/arch-at91/at91sam9261.h
+++ b/include/asm-arm/arch-at91/at91sam9261.h
@@ -101,5 +101,9 @@
#define AT91SAM9261_UHP_BASE 0x00500000 /* USB Host controller */
#define AT91SAM9261_LCDC_BASE 0x00600000 /* LDC controller */
+/*
+ * Cpu Name
+ */
+#define AT91_CPU_NAME "AT91SAM9261"
#endif
diff --git a/include/asm-arm/arch-at91/at91sam9263.h b/include/asm-arm/arch-at91/at91sam9263.h
index 07b265f..966a683 100644
--- a/include/asm-arm/arch-at91/at91sam9263.h
+++ b/include/asm-arm/arch-at91/at91sam9263.h
@@ -124,5 +124,9 @@
#define AT91SAM9263_DMAC_BASE 0x00800000 /* DMA Controller */
#define AT91SAM9263_UHP_BASE 0x00a00000 /* USB Host controller */
+/*
+ * Cpu Name
+ */
+#define AT91_CPU_NAME "AT91SAM9263"
#endif
diff --git a/include/asm-arm/arch-at91/at91sam9rl.h b/include/asm-arm/arch-at91/at91sam9rl.h
index 215bbc8..4dd8037 100644
--- a/include/asm-arm/arch-at91/at91sam9rl.h
+++ b/include/asm-arm/arch-at91/at91sam9rl.h
@@ -112,4 +112,9 @@
#define AT91SAM9RL_LCDC_BASE 0x00500000 /* LCD Controller */
#define AT91SAM9RL_UDPHS_BASE 0x00600000 /* USB Device HS controller */
+/*
+ * Cpu Name
+ */
+#define AT91_CPU_NAME "AT91SAM9RL"
+
#endif
diff --git a/include/configs/at91cap9adk.h b/include/configs/at91cap9adk.h
index b2e6d7d..526cd60 100644
--- a/include/configs/at91cap9adk.h
+++ b/include/configs/at91cap9adk.h
@@ -28,7 +28,6 @@
#define __CONFIG_H
/* ARM asynchronous clock */
-#define AT91_CPU_NAME "AT91CAP9"
#define AT91_MAIN_CLOCK 12000000 /* 12 MHz crystal */
#define CONFIG_SYS_HZ 1000
diff --git a/include/configs/at91sam9260ek.h b/include/configs/at91sam9260ek.h
index e46c9d6..1828c63 100644
--- a/include/configs/at91sam9260ek.h
+++ b/include/configs/at91sam9260ek.h
@@ -34,10 +34,8 @@
#define CONFIG_ARM926EJS 1 /* This is an ARM926EJS Core */
#ifdef CONFIG_AT91SAM9G20EK
-#define AT91_CPU_NAME "AT91SAM9G20"
#define CONFIG_AT91SAM9G20 1 /* It's an Atmel AT91SAM9G20 SoC*/
#else
-#define AT91_CPU_NAME "AT91SAM9260"
#define CONFIG_AT91SAM9260 1 /* It's an Atmel AT91SAM9260 SoC*/
#endif
diff --git a/include/configs/at91sam9261ek.h b/include/configs/at91sam9261ek.h
index fdaa71c..b84e361 100644
--- a/include/configs/at91sam9261ek.h
+++ b/include/configs/at91sam9261ek.h
@@ -28,7 +28,6 @@
#define __CONFIG_H
/* ARM asynchronous clock */
-#define AT91_CPU_NAME "AT91SAM9261"
#define AT91_MAIN_CLOCK 18432000 /* 18.432 MHz crystal */
#define CONFIG_SYS_HZ 1000
diff --git a/include/configs/at91sam9263ek.h b/include/configs/at91sam9263ek.h
index d03ecee..c212d11 100644
--- a/include/configs/at91sam9263ek.h
+++ b/include/configs/at91sam9263ek.h
@@ -28,7 +28,6 @@
#define __CONFIG_H
/* ARM asynchronous clock */
-#define AT91_CPU_NAME "AT91SAM9263"
#define AT91_MAIN_CLOCK 16367660 /* 16.367 MHz crystal */
#define CONFIG_SYS_HZ 1000
diff --git a/include/configs/at91sam9rlek.h b/include/configs/at91sam9rlek.h
index 846d165..c466823 100644
--- a/include/configs/at91sam9rlek.h
+++ b/include/configs/at91sam9rlek.h
@@ -28,7 +28,6 @@
#define __CONFIG_H
/* ARM asynchronous clock */
-#define AT91_CPU_NAME "AT91SAM9RL"
#define AT91_MAIN_CLOCK 12000000 /* 12 MHz crystal */
#define CONFIG_SYS_HZ 1000
diff --git a/include/configs/pm9263.h b/include/configs/pm9263.h
index 0db17b3..d60c417 100644
--- a/include/configs/pm9263.h
+++ b/include/configs/pm9263.h
@@ -29,8 +29,6 @@
#define __CONFIG_H
/* ARM asynchronous clock */
-#define AT91_CPU_NAME "AT91SAM9263"
-
#define CONFIG_DISPLAY_BOARDINFO
#define MASTER_PLL_DIV 15
--
1.6.2.4
More information about the U-Boot
mailing list