[PATCH 6/6] arm: move config ARCH_TEXT_BASE and BOARDINFO to mach Kconfig

[Jean-Christophe PLAGNIOL-VILLARD]

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj at jcrosoft.com>
---
 arch/arm/Kconfig                 |   41 --------------------------------------
 arch/arm/mach-at91/Kconfig       |   13 ++++++++++++
 arch/arm/mach-at91rm9200/Kconfig |    6 +++++
 arch/arm/mach-imx/Kconfig        |   26 ++++++++++++++++++++++++
 arch/arm/mach-netx/Kconfig       |    7 ++++++
 arch/arm/mach-s3c24xx/Kconfig    |    9 ++++++++
 6 files changed, 61 insertions(+), 41 deletions(-)

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index bac808d..df80de4 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1,47 +1,6 @@
 #
 #
 #
-config ARCH_TEXT_BASE
-	hex
-	default 0x08f00000 if MACH_MX1ADS
-	default 0x08f80000 if MACH_SCB9328
-	default 0x81f00000 if MACH_NXDB500
-	default 0x21e00000 if MACH_ECO920
-	default 0xa0000000 if MACH_PCM038
-	default 0xc0000000 if MACH_IMX21ADS
-	default 0xa0000000 if MACH_IMX27ADS
-	default 0x87f00000 if MACH_PCM037
-	default 0x23f00000 if MACH_AT91SAM9260_EK
-	default 0x23f00000 if MACH_AT91SAM9263_EK
-	default 0x23f00000 if MACH_PM9263
-	default 0x87f00000 if MACH_FREESCALE_MX35_3STACK
-	default 0x31fc0000 if MACH_A9M2410
-	default 0x87f00000 if MACH_FREESCALE_MX25_3STACK
-	default 0x87f00000 if MACH_PCM043
-	default 0xa7f00000 if MACH_PCA100
-	default 0x31fc0000 if MACH_A9M2440
-	default 0x23f00000 if MACH_MMCCPU
-	default 0xa0000000 if MACH_EUKREA_CPUIMX27
-
-config BOARDINFO
-	default "Synertronixx scb9328" if MACH_SCB9328
-	default "Hilscher Netx nxdb500" if MACH_NXDB500
-	default "Phytec phyCORE-i.MX27" if MACH_PCM038
-	default "Freescale i.MX21 ADS" if MACH_IMX21ADS
-	default "Freescale i.MX27 ADS" if MACH_IMX27ADS
-	default "Phytec phyCORE-i.MX31" if MACH_PCM037
-	default "Atmel 91SAM9260-EK" if MACH_AT91SAM9260_EK
-	default "Atmel at91sam9263-ek" if MACH_AT91SAM9263_EK
-	default "Digi A9M2440" if MACH_A9M2440
-	default "Ronetix PM9263" if MACH_PM9263
-	default "Freescale MX35 3Stack" if MACH_FREESCALE_MX35_3STACK
-	default "Freescale MX25 3Stack" if MACH_FREESCALE_MX25_3STACK
-	default "Phytec phyCORE-i.MX35" if MACH_PCM043
-	default "Digi A9M2410" if MACH_A9M2410
-	default "Phytec phyCard-i.MX27" if MACH_PCA100
-	default "Bucyrus MMC-CPU" if MACH_MMCCPU
-	default "Eukrea CPUIMX27" if MACH_EUKREA_CPUIMX27
-
 config BOARD_LINKER_SCRIPT
 	bool
 	default n
diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig
index b0e6407..547d2d2 100644
--- a/arch/arm/mach-at91/Kconfig
+++ b/arch/arm/mach-at91/Kconfig
@@ -1,6 +1,19 @@
 if ARCH_AT91
 
+config ARCH_TEXT_BASE
+	hex
+	default 0x23f00000 if MACH_AT91SAM9260_EK
+	default 0x23f00000 if MACH_AT91SAM9263_EK
+	default 0x23f00000 if MACH_MMCCPU
+	default 0x23f00000 if MACH_PM9263
+
+config BOARDINFO
+
 comment "Atmel AT91 System-on-Chip"
+	default "Atmel 91SAM9260-EK" if MACH_AT91SAM9260_EK
+	default "Atmel at91sam9263-ek" if MACH_AT91SAM9263_EK
+	default "Bucyrus MMC-CPU" if MACH_MMCCPU
+	default "Ronetix PM9263" if MACH_PM9263
 
 choice
 	prompt "Atmel AT91 Processor"
diff --git a/arch/arm/mach-at91rm9200/Kconfig b/arch/arm/mach-at91rm9200/Kconfig
index 32b6105..7e90179 100644
--- a/arch/arm/mach-at91rm9200/Kconfig
+++ b/arch/arm/mach-at91rm9200/Kconfig
@@ -1,5 +1,11 @@
 if ARCH_AT91RM9200
 
+config ARCH_TEXT_BASE
+	hex
+	default 0x21e00000 if MACH_ECO920
+
+config BOARDINFO
+
 comment "Atmel AT91RM9200 System-on-Chip"
 
 choice
diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
index dd259e4..1092606 100644
--- a/arch/arm/mach-imx/Kconfig
+++ b/arch/arm/mach-imx/Kconfig
@@ -1,5 +1,31 @@
 if ARCH_MXC
 
+config ARCH_TEXT_BASE
+	hex
+	default 0xa0000000 if MACH_EUKREA_CPUIMX27
+	default 0x08f00000 if MACH_MX1ADS
+	default 0xc0000000 if MACH_IMX21ADS
+	default 0xa0000000 if MACH_IMX27ADS
+	default 0x87f00000 if MACH_FREESCALE_MX25_3STACK
+	default 0x87f00000 if MACH_FREESCALE_MX35_3STACK
+	default 0xa7f00000 if MACH_PCA100
+	default 0xa0000000 if MACH_PCM038
+	default 0x87f00000 if MACH_PCM037
+	default 0x87f00000 if MACH_PCM043
+	default 0x08f80000 if MACH_SCB9328
+
+config BOARDINFO
+	default "Eukrea CPUIMX27" if MACH_EUKREA_CPUIMX27
+	default "Freescale i.MX21 ADS" if MACH_IMX21ADS
+	default "Freescale i.MX27 ADS" if MACH_IMX27ADS
+	default "Freescale MX35 3Stack" if MACH_FREESCALE_MX35_3STACK
+	default "Freescale MX25 3Stack" if MACH_FREESCALE_MX25_3STACK
+	default "Phytec phyCard-i.MX27" if MACH_PCA100
+	default "Phytec phyCORE-i.MX27" if MACH_PCM038
+	default "Phytec phyCORE-i.MX31" if MACH_PCM037
+	default "Phytec phyCORE-i.MX35" if MACH_PCM043
+	default "Synertronixx scb9328" if MACH_SCB9328
+
 config ARCH_HAS_FEC_IMX
 	bool
 
diff --git a/arch/arm/mach-netx/Kconfig b/arch/arm/mach-netx/Kconfig
index a62c3bc..8e83417 100644
--- a/arch/arm/mach-netx/Kconfig
+++ b/arch/arm/mach-netx/Kconfig
@@ -1,5 +1,12 @@
 if ARCH_NETX
 
+config ARCH_TEXT_BASE
+	hex
+	default 0x81f00000 if MACH_NXDB500
+
+config BOARDINFO
+	default "Hilscher Netx nxdb500" if MACH_NXDB500
+
 config NETX_SDRAM_CTRL
 	hex
 	default 0x010D0001 if MACH_NXDKN
diff --git a/arch/arm/mach-s3c24xx/Kconfig b/arch/arm/mach-s3c24xx/Kconfig
index f41a450..2f2d7cd 100644
--- a/arch/arm/mach-s3c24xx/Kconfig
+++ b/arch/arm/mach-s3c24xx/Kconfig
@@ -1,5 +1,14 @@
 if ARCH_S3C24xx
 
+config ARCH_TEXT_BASE
+	hex
+	default 0x31fc0000 if MACH_A9M2410
+	default 0x31fc0000 if MACH_A9M2440
+
+config BOARDINFO
+	default "Digi A9M2440" if MACH_A9M2440
+	default "Digi A9M2410" if MACH_A9M2410
+
 config CPU_S3C2410
 	bool
 
-- 
1.6.5