[ARM] Remove CONFIG_ARCH_NUMBER from Kconfig system. Putting too many

      values into kconfig which are not user configurable at all only
      encourages people to put even more stuff in there. This is not
      good because people tend to have board patches lying around and
      these patches won't apply regularly if they all change the same
      file (arch/arm/Kconfig)
      Instead, introduce a function armlinux_set_architecture() which
      everyone can call during board setup.
      Similarly introduce armlinux_set_bootparams() for the boot
      parameter pointer.

6 files changed, 24 insertions, 3 deletions

diff --git a/board/eco920/eco920.c b/board/eco920/eco920.c
index ff065461c0..7bc625f7df 100644
--- a/board/eco920/eco920.c
+++ b/board/eco920/eco920.c
@@ -27,14 +27,12 @@
 #include <dm9161.h>
 #include <miiphy.h>
 #include <splash.h>
+#include <asm/armlinux.h>
 #include <s1d13706fb.h>
 #include <net.h>
 #include <cfi_flash.h>
 #include <init.h>
 
-DECLARE_GLOBAL_DATA_PTR;
-
-/* ------------------------------------------------------------------------- */
 /*
  * Miscelaneous platform dependent initialisations
  */
@@ -73,6 +71,9 @@ static int devices_init (void)
 	register_device(&sdram_dev);
 	register_device(&at91_ath_dev);
 
+	armlinux_set_bootparams((void *)(PHYS_SDRAM + 0x100));
+	armlinux_set_architecture(MACH_TYPE_ECO920);
+
 	return 0;
 }
 
diff --git a/board/imx27ads/imx27ads.c b/board/imx27ads/imx27ads.c
index bf20ea042a..53905a11dc 100644
--- a/board/imx27ads/imx27ads.c
+++ b/board/imx27ads/imx27ads.c
@@ -24,6 +24,7 @@
 #include <init.h>
 #include <environment.h>
 #include <asm/arch/imx-regs.h>
+#include <asm/armlinux.h>
 #include <asm/io.h>
 #include <fec.h>
 #include <asm/arch/gpio.h>
@@ -136,6 +137,9 @@ static int pcm038_devices_init(void)
 	dev_add_partition(&cfi_dev, 0x20000, 0x20000, PARTITION_FIXED, "env");
 	dev_protect(&cfi_dev, 0x20000, 0, 1);
 
+	armlinux_set_bootparams((void *)0xa0000100);
+	armlinux_set_architecture(MACH_TYPE_MX27ADS);
+
 	return 0;
 }
 
diff --git a/board/netx/netx.c b/board/netx/netx.c
index fa7d96420b..b422ff8a2b 100644
--- a/board/netx/netx.c
+++ b/board/netx/netx.c
@@ -25,6 +25,7 @@
 #include <environment.h>
 #include <asm/arch/netx-regs.h>
 #include <partition.h>
+#include <asm/armlinux.h>
 #include <fs.h>
 #include <fcntl.h>
 #include <asm/arch/netx-eth.h>
@@ -81,6 +82,9 @@ static int netx_devices_init(void) {
 	/* Do not overwrite primary env for now */
 	dev_add_partition(&cfi_dev, 0xc0000, 0x80000, PARTITION_FIXED, "env"); 
 
+	armlinux_set_bootparams((void *)0x80000100);
+	armlinux_set_architecture(MACH_TYPE_NXDB500);
+
 	return 0;
 }
 
diff --git a/board/pcm037/pcm037.c b/board/pcm037/pcm037.c
index 8f39e42d63..9a94869f71 100644
--- a/board/pcm037/pcm037.c
+++ b/board/pcm037/pcm037.c
@@ -27,6 +27,7 @@
 #include <driver.h>
 #include <environment.h>
 #include <asm/arch/imx-regs.h>
+#include <asm/armlinux.h>
 #include <asm/arch/gpio.h>
 #include <asm/io.h>
 #include <partition.h>
@@ -123,6 +124,9 @@ static int imx31_devices_init(void)
 
 	register_device(&sdram_dev);
 
+	armlinux_set_bootparams((void *)0x08000100);
+	armlinux_set_architecture(1147);
+
 	return 0;
 }
 
diff --git a/board/pcm038/pcm038.c b/board/pcm038/pcm038.c
index 6befc08cd6..392997c34f 100644
--- a/board/pcm038/pcm038.c
+++ b/board/pcm038/pcm038.c
@@ -26,6 +26,7 @@
 #include <asm/arch/imx-regs.h>
 #include <fec.h>
 #include <asm/arch/gpio.h>
+#include <asm/armlinux.h>
 #include <partition.h>
 #include <fs.h>
 #include <fcntl.h>
@@ -100,6 +101,9 @@ static int pcm038_devices_init(void)
 	dev_add_partition(&cfi_dev, 0x20000, 0x20000, PARTITION_FIXED, "env");
 	dev_protect(&cfi_dev, 0x20000, 0, 1);
 
+	armlinux_set_bootparams((void *)0xa0000100);
+	armlinux_set_architecture(MACH_TYPE_PCM038);
+
 	return 0;
 }
 
diff --git a/board/scb9328/scb9328.c b/board/scb9328/scb9328.c
index 022e476ce7..df0e4f6a55 100644
--- a/board/scb9328/scb9328.c
+++ b/board/scb9328/scb9328.c
@@ -24,6 +24,7 @@
 #include <init.h>
 #include <environment.h>
 #include <asm/arch/imx-regs.h>
+#include <asm/armlinux.h>
 #include <asm/arch/gpio.h>
 #include <asm/io.h>
 #include <partition.h>
@@ -95,6 +96,9 @@ static int scb9328_devices_init(void) {
 	dev_add_partition(&cfi_dev, 0x40000, 0x20000, PARTITION_FIXED, "env");
 	dev_protect(&cfi_dev, 0x20000, 0, 1);
 
+	armlinux_set_bootparams((void *)0x08000100);
+	armlinux_set_architecture(MACH_TYPE_SCB9328);
+
 	return 0;
 }