[U-Boot] [PATCH 1/1] arm: fix some arch_number definition

[Jean-Christophe PLAGNIOL-VILLARD]

Hi,
	all affected board maintainers
	I've found in the current u-boot code some errors on the machine id
	could take a look on your board

nb: e-mail forwaded following

Best Regards,
J.

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj at jcrosoft.com>

diff --git a/board/apollon/apollon.c b/board/apollon/apollon.c
index 8964eba..47df84a 100644
--- a/board/apollon/apollon.c
+++ b/board/apollon/apollon.c
@@ -66,7 +66,7 @@ int board_init(void)
 {
 	gpmc_init();		/* in SRAM or SDRM, finish GPMC */
 
-	gd->bd->bi_arch_number = 919;
+	gd->bd->bi_arch_number = MACH_TYPE_OMAP_APOLLON;
 	/* adress of boot parameters */
 	gd->bd->bi_boot_params = (OMAP2420_SDRC_CS0 + 0x100);
 
diff --git a/board/armadillo/armadillo.c b/board/armadillo/armadillo.c
index ca5bd1d..e9be758 100644
--- a/board/armadillo/armadillo.c
+++ b/board/armadillo/armadillo.c
@@ -42,8 +42,7 @@ int board_init (void)
 	/* Activate LED flasher */
 	IO_LEDFLSH = 0x40;
 
-	/* arch number MACH_TYPE_ARMADILLO - not official*/
-	gd->bd->bi_arch_number = 83;
+	gd->bd->bi_arch_number = MACH_TYPE_ARMADILLO;
 
 	/* location of boot parameters */
 	gd->bd->bi_boot_params = 0xc0000100;
diff --git a/board/cm4008/cm4008.c b/board/cm4008/cm4008.c
index d34737c..0744905 100644
--- a/board/cm4008/cm4008.c
+++ b/board/cm4008/cm4008.c
@@ -78,7 +78,7 @@ int board_late_init (void)
 int board_init (void)
 {
 	/* arch number of CM4008 */
-	gd->bd->bi_arch_number = 624;
+	gd->bd->bi_arch_number = MACH_TYPE_CM4008;
 
 	/* adress of boot parameters */
 	gd->bd->bi_boot_params = 0x00000100;
diff --git a/board/cm41xx/cm41xx.c b/board/cm41xx/cm41xx.c
index 02d05af..c4136f8 100644
--- a/board/cm41xx/cm41xx.c
+++ b/board/cm41xx/cm41xx.c
@@ -78,7 +78,7 @@ int board_late_init (void)
 int board_init (void)
 {
 	/* arch number of CM41xx */
-	gd->bd->bi_arch_number = 672;
+	gd->bd->bi_arch_number = MACH_TYPE_CM41XX;
 
 	/* adress of boot parameters */
 	gd->bd->bi_boot_params = 0x00000100;
diff --git a/board/cmc_pu2/cmc_pu2.c b/board/cmc_pu2/cmc_pu2.c
index 3ad756d..205bd3a 100644
--- a/board/cmc_pu2/cmc_pu2.c
+++ b/board/cmc_pu2/cmc_pu2.c
@@ -96,12 +96,7 @@ int board_init (void)
 	piob->PIO_PER = AT91C_PIO_PB3 | AT91C_PIO_PB4 |
 			AT91C_PIO_PB5 | AT91C_PIO_PB6;
 
-	/*
-	 * arch number of CMC_PU2-Board. MACH_TYPE_CMC_PU2 is not supported in
-	 * the linuxarm kernel, yet.
-	 */
-	/* gd->bd->bi_arch_number = MACH_TYPE_CMC_PU2; */
-	gd->bd->bi_arch_number = 251;
+	gd->bd->bi_arch_number = MACH_TYPE_CMC_PU2;
 	/* adress of boot parameters */
 	gd->bd->bi_boot_params = PHYS_SDRAM + 0x100;
 
diff --git a/board/imx31_phycore/imx31_phycore.c b/board/imx31_phycore/imx31_phycore.c
index ae93444..4b72d57 100644
--- a/board/imx31_phycore/imx31_phycore.c
+++ b/board/imx31_phycore/imx31_phycore.c
@@ -60,7 +60,7 @@ int board_init (void)
 	mx31_gpio_mux(MUX_CSPI2_MOSI__I2C2_SCL);
 	mx31_gpio_mux(MUX_CSPI2_MISO__I2C2_SDA);
 
-	gd->bd->bi_arch_number = 447;		/* board id for linux */
+	gd->bd->bi_arch_number = MACH_TYPE_MX31ADS;	/* board id for linux */
 	gd->bd->bi_boot_params = (0x80000100);	/* adress of boot parameters */
 
 	return 0;
diff --git a/board/ns9750dev/ns9750dev.c b/board/ns9750dev/ns9750dev.c
index fc46244..b8f377b 100644
--- a/board/ns9750dev/ns9750dev.c
+++ b/board/ns9750dev/ns9750dev.c
@@ -68,7 +68,7 @@ int board_init( void )
 #warning Please register your machine at http://www.arm.linux.org.uk/developer/machines/?action=new
 	/* arch number of OMAP 1510-Board */
 	/* to be changed for OMAP 1610 Board */
-	gd->bd->bi_arch_number = 234;
+	gd->bd->bi_arch_number = MACH_TYPE_NS9750;
 
 	/* adress of boot parameters */
 	gd->bd->bi_boot_params = 0x10000100;
diff --git a/board/samsung/smdk6400/smdk6400.c b/board/samsung/smdk6400/smdk6400.c
index bd2e45a..f24d70f 100644
--- a/board/samsung/smdk6400/smdk6400.c
+++ b/board/samsung/smdk6400/smdk6400.c
@@ -71,7 +71,7 @@ int board_init(void)
 	/* Enable WAIT */
 	SROM_BW_REG |= 4 | 8 | 1;
 
-	gd->bd->bi_arch_number = MACH_TYPE;
+	gd->bd->bi_arch_number = MACH_TYPE_SMDK6400;
 	gd->bd->bi_boot_params = PHYS_SDRAM_1 + 0x100;
 
 	return 0;
diff --git a/board/trizepsiv/conxs.c b/board/trizepsiv/conxs.c
index 7c6c855..e118f63 100644
--- a/board/trizepsiv/conxs.c
+++ b/board/trizepsiv/conxs.c
@@ -98,7 +98,7 @@ int board_init (void)
 	/* so we do _nothing_ here */
 
 	/* arch number of ConXS Board */
-	gd->bd->bi_arch_number = 776;
+	gd->bd->bi_arch_number = MACH_TYPE_TRIZEPS4;
 
 	/* adress of boot parameters */
 	gd->bd->bi_boot_params = 0xa000003c;
diff --git a/board/xaeniax/xaeniax.c b/board/xaeniax/xaeniax.c
index 9baa457..03721a2 100644
--- a/board/xaeniax/xaeniax.c
+++ b/board/xaeniax/xaeniax.c
@@ -42,7 +42,7 @@ int board_init (void)
 	/* so we do _nothing_ here */
 
 	/* arch number of xaeniax */
-	gd->bd->bi_arch_number = 585;
+	gd->bd->bi_arch_number = MACH_TYPE_XAENIAX;
 
 	/* adress of boot parameters */
 	gd->bd->bi_boot_params = 0xa0000100;
diff --git a/include/configs/smdk6400.h b/include/configs/smdk6400.h
index 1784cc6..22cdf94 100644
--- a/include/configs/smdk6400.h
+++ b/include/configs/smdk6400.h
@@ -55,11 +55,6 @@
 #define CONFIG_CMDLINE_TAG
 #define CONFIG_INITRD_TAG
 
-/*
- * Architecture magic and machine type
- */
-#define MACH_TYPE		1270
-
 #define CONFIG_DISPLAY_CPUINFO
 #define CONFIG_DISPLAY_BOARDINFO
 
-- 
1.5.6.5