Index: u-boot/board/assabet/assabet.c
===================================================================
RCS file: /cvsroot/u-boot/u-boot/board/assabet/assabet.c,v
retrieving revision 1.1
diff -u -r1.1 assabet.c
--- u-boot/board/assabet/assabet.c	15 Apr 2004 23:23:39 -0000	1.1
+++ u-boot/board/assabet/assabet.c	21 Aug 2004 19:51:45 -0000
@@ -101,7 +101,7 @@
 {
 	DECLARE_GLOBAL_DATA_PTR;
 
-	gd->bd->bi_arch_number = 25;	/* Intel Assabet Board */
+	gd->bd->bi_arch_number = MACH_TYPE_ASSABET;
 	gd->bd->bi_boot_params = 0xc0000100;
 
 	neponset_init();
Index: u-boot/board/at91rm9200dk/at91rm9200dk.c
===================================================================
RCS file: /cvsroot/u-boot/u-boot/board/at91rm9200dk/at91rm9200dk.c,v
retrieving revision 1.5
diff -u -r1.5 at91rm9200dk.c
--- u-boot/board/at91rm9200dk/at91rm9200dk.c	10 Jul 2004 21:45:48 -0000	1.5
+++ u-boot/board/at91rm9200dk/at91rm9200dk.c	21 Aug 2004 19:51:45 -0000
@@ -45,7 +45,7 @@
 	/* so we do _nothing_ here */
 
 	/* arch number of AT91RM9200DK-Board */
-	gd->bd->bi_arch_number = 251;
+	gd->bd->bi_arch_number = MACH_TYPE_AT91RM9200;
 	/* adress of boot parameters */
 	gd->bd->bi_boot_params = PHYS_SDRAM + 0x100;
 
Index: u-boot/board/cerf250/cerf250.c
===================================================================
RCS file: /cvsroot/u-boot/u-boot/board/cerf250/cerf250.c,v
retrieving revision 1.1
diff -u -r1.1 cerf250.c
--- u-boot/board/cerf250/cerf250.c	10 Jul 2004 23:11:11 -0000	1.1
+++ u-boot/board/cerf250/cerf250.c	21 Aug 2004 19:51:45 -0000
@@ -42,7 +42,7 @@
 	/* so we do _nothing_ here */
 
 	/* arch number of cerf PXA Board */
-	gd->bd->bi_arch_number = 139;
+	gd->bd->bi_arch_number = MACH_TYPE_PXA_CERF;
 
 	/* adress of boot parameters */
 	gd->bd->bi_boot_params = 0xa0000100;
Index: u-boot/board/csb226/csb226.c
===================================================================
RCS file: /cvsroot/u-boot/u-boot/board/csb226/csb226.c,v
retrieving revision 1.6
diff -u -r1.6 csb226.c
--- u-boot/board/csb226/csb226.c	27 Jun 2003 21:31:57 -0000	1.6
+++ u-boot/board/csb226/csb226.c	21 Aug 2004 19:51:45 -0000
@@ -71,7 +71,7 @@
 	/* so we do _nothing_ here */
 
 	/* arch number of CSB226 board */
-	gd->bd->bi_arch_number = 216;
+	gd->bd->bi_arch_number = MACH_TYPE_CSB226;
 
 	/* adress of boot parameters */
 	gd->bd->bi_boot_params = 0xa0000100;
Index: u-boot/board/ep7312/ep7312.c
===================================================================
RCS file: /cvsroot/u-boot/u-boot/board/ep7312/ep7312.c,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 ep7312.c
--- u-boot/board/ep7312/ep7312.c	9 Sep 2002 08:35:37 -0000	1.1.1.1
+++ u-boot/board/ep7312/ep7312.c	21 Aug 2004 19:51:45 -0000
@@ -40,7 +40,7 @@
 	IO_LEDFLSH = 0x40;
 
 	/* arch number MACH_TYPE_EDB7312 */
-	gd->bd->bi_arch_number = 131;
+	gd->bd->bi_arch_number = MACH_TYPE_EDB7312;
 
 	/* location of boot parameters */
 	gd->bd->bi_boot_params = 0xc0020100;
Index: u-boot/board/gcplus/gcplus.c
===================================================================
RCS file: /cvsroot/u-boot/u-boot/board/gcplus/gcplus.c,v
retrieving revision 1.1
diff -u -r1.1 gcplus.c
--- u-boot/board/gcplus/gcplus.c	14 Mar 2004 18:23:59 -0000	1.1
+++ u-boot/board/gcplus/gcplus.c	21 Aug 2004 19:51:45 -0000
@@ -37,7 +37,7 @@
 {
 	DECLARE_GLOBAL_DATA_PTR;
 
-	gd->bd->bi_arch_number = 29;	/* ADS GraphicsClientPlus Board */
+	gd->bd->bi_arch_number = MACH_TYPE_GRAPHICSCLIENT;
 
 	gd->bd->bi_boot_params = 0xc000003c; /* Weird address? */
 
Index: u-boot/board/integratorap/integratorap.c
===================================================================
RCS file: /cvsroot/u-boot/u-boot/board/integratorap/integratorap.c,v
retrieving revision 1.3
diff -u -r1.3 integratorap.c
--- u-boot/board/integratorap/integratorap.c	11 Jul 2004 18:10:31 -0000	1.3
+++ u-boot/board/integratorap/integratorap.c	21 Aug 2004 19:51:46 -0000
@@ -68,7 +68,7 @@
 	DECLARE_GLOBAL_DATA_PTR;
 
 	/* arch number of Integrator Board */
-	gd->bd->bi_arch_number = 21;
+	gd->bd->bi_arch_number = MACH_TYPE_INTEGRATOR;
 
 	/* adress of boot parameters */
 	gd->bd->bi_boot_params = 0x00000100;
Index: u-boot/board/integratorcp/integratorcp.c
===================================================================
RCS file: /cvsroot/u-boot/u-boot/board/integratorcp/integratorcp.c,v
retrieving revision 1.3
diff -u -r1.3 integratorcp.c
--- u-boot/board/integratorcp/integratorcp.c	11 Jul 2004 18:10:31 -0000	1.3
+++ u-boot/board/integratorcp/integratorcp.c	21 Aug 2004 19:51:46 -0000
@@ -64,7 +64,7 @@
 	DECLARE_GLOBAL_DATA_PTR;
 
 	/* arch number of Integrator Board */
-	gd->bd->bi_arch_number = 275;
+	gd->bd->bi_arch_number = MACH_TYPE_CINTEGRATOR;
 
 	/* adress of boot parameters */
 	gd->bd->bi_boot_params = 0x00000100;
Index: u-boot/board/ixdp425/ixdp425.c
===================================================================
RCS file: /cvsroot/u-boot/u-boot/board/ixdp425/ixdp425.c,v
retrieving revision 1.2
diff -u -r1.2 ixdp425.c
--- u-boot/board/ixdp425/ixdp425.c	20 Jan 2004 23:12:30 -0000	1.2
+++ u-boot/board/ixdp425/ixdp425.c	21 Aug 2004 19:51:46 -0000
@@ -54,7 +54,7 @@
 	DECLARE_GLOBAL_DATA_PTR;
 
 	/* arch number of IXDP */
-	gd->bd->bi_arch_number = 245;
+	gd->bd->bi_arch_number = MACH_TYPE_IXDP425;
 
 	/* adress of boot parameters */
 	gd->bd->bi_boot_params = 0x00000100;
Index: u-boot/board/lart/lart.c
===================================================================
RCS file: /cvsroot/u-boot/u-boot/board/lart/lart.c,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 lart.c
--- u-boot/board/lart/lart.c	9 Sep 2002 08:35:37 -0000	1.1.1.1
+++ u-boot/board/lart/lart.c	21 Aug 2004 19:51:46 -0000
@@ -39,7 +39,7 @@
 	/* so we do _nothing_ here */
 
 	/* arch number of LART-Board */
-	gd->bd->bi_arch_number = 27;
+	gd->bd->bi_arch_number = MACH_TYPE_LART;
 
 	/* adress of boot parameters */
 	gd->bd->bi_boot_params = 0xc0000100;
Index: u-boot/board/lubbock/lubbock.c
===================================================================
RCS file: /cvsroot/u-boot/u-boot/board/lubbock/lubbock.c,v
retrieving revision 1.4
diff -u -r1.4 lubbock.c
--- u-boot/board/lubbock/lubbock.c	20 Jan 2004 23:12:30 -0000	1.4
+++ u-boot/board/lubbock/lubbock.c	21 Aug 2004 19:51:46 -0000
@@ -42,7 +42,7 @@
 	/* so we do _nothing_ here */
 
 	/* arch number of Lubbock-Board */
-	gd->bd->bi_arch_number = 89;
+	gd->bd->bi_arch_number = MACH_TYPE_LUBBOCK;
 
 	/* adress of boot parameters */
 	gd->bd->bi_boot_params = 0xa0000100;
Index: u-boot/board/mpl/vcma9/vcma9.c
===================================================================
RCS file: /cvsroot/u-boot/u-boot/board/mpl/vcma9/vcma9.c,v
retrieving revision 1.10
diff -u -r1.10 vcma9.c
--- u-boot/board/mpl/vcma9/vcma9.c	7 Dec 2003 18:32:37 -0000	1.10
+++ u-boot/board/mpl/vcma9/vcma9.c	21 Aug 2004 19:51:47 -0000
@@ -119,7 +119,7 @@
 	serial_init();
 
 	/* arch number of VCMA9-Board */
-	gd->bd->bi_arch_number = 227;
+	gd->bd->bi_arch_number = MACH_TYPE_MPL_VCMA9;
 
 	/* adress of boot parameters */
 	gd->bd->bi_boot_params = 0x30000100;
Index: u-boot/board/mx1ads/mx1ads.c
===================================================================
RCS file: /cvsroot/u-boot/u-boot/board/mx1ads/mx1ads.c,v
retrieving revision 1.3
diff -u -r1.3 mx1ads.c
--- u-boot/board/mx1ads/mx1ads.c	1 Aug 2004 22:48:17 -0000	1.3
+++ u-boot/board/mx1ads/mx1ads.c	21 Aug 2004 19:51:47 -0000
@@ -114,7 +114,7 @@
 
 	SetAsynchMode();
 
-	gd->bd->bi_arch_number = 160;	/* Arch number of MX1ADS Board 		*/
+	gd->bd->bi_arch_number = MACH_TYPE_MX1ADS;
 
 	gd->bd->bi_boot_params = 0x08000100;	/* adress of boot parameters	*/
 
Index: u-boot/board/mx1fs2/mx1fs2.c
===================================================================
RCS file: /cvsroot/u-boot/u-boot/board/mx1fs2/mx1fs2.c,v
retrieving revision 1.1
diff -u -r1.1 mx1fs2.c
--- u-boot/board/mx1fs2/mx1fs2.c	1 Aug 2004 22:48:17 -0000	1.1
+++ u-boot/board/mx1fs2/mx1fs2.c	21 Aug 2004 19:51:47 -0000
@@ -81,7 +81,7 @@
 {
 	DECLARE_GLOBAL_DATA_PTR;
 
-	gd->bd->bi_arch_number = 470;
+	gd->bd->bi_arch_number = MACH_TYPE_MX1FS2;
 	gd->bd->bi_boot_params = 0x08000100;
 serial_init();
 	logo_init();
Index: u-boot/board/omap1510inn/omap1510innovator.c
===================================================================
RCS file: /cvsroot/u-boot/u-boot/board/omap1510inn/omap1510innovator.c,v
retrieving revision 1.1
diff -u -r1.1 omap1510innovator.c
--- u-boot/board/omap1510inn/omap1510innovator.c	15 Jul 2003 20:04:06 -0000	1.1
+++ u-boot/board/omap1510inn/omap1510innovator.c	21 Aug 2004 19:51:47 -0000
@@ -50,7 +50,7 @@
 	DECLARE_GLOBAL_DATA_PTR;
 
 	/* arch number of OMAP 1510-Board */
-	gd->bd->bi_arch_number = 234;
+	gd->bd->bi_arch_number = MACH_TYPE_OMAP_INNOVATOR;
 
 	/* adress of boot parameters */
 	gd->bd->bi_boot_params = 0x10000100;
Index: u-boot/board/omap1610inn/omap1610innovator.c
===================================================================
RCS file: /cvsroot/u-boot/u-boot/board/omap1610inn/omap1610innovator.c,v
retrieving revision 1.6
diff -u -r1.6 omap1610innovator.c
--- u-boot/board/omap1610inn/omap1610innovator.c	11 Jul 2004 22:19:27 -0000	1.6
+++ u-boot/board/omap1610inn/omap1610innovator.c	21 Aug 2004 19:51:47 -0000
@@ -32,7 +32,6 @@
  */
 
 #include <common.h>
-#include <asm/mach-types.h>
 #if defined(CONFIG_OMAP1610)
 #include <./configs/omap1510.h>
 #endif
Index: u-boot/board/omap5912osk/omap5912osk.c
===================================================================
RCS file: /cvsroot/u-boot/u-boot/board/omap5912osk/omap5912osk.c,v
retrieving revision 1.1
diff -u -r1.1 omap5912osk.c
--- u-boot/board/omap5912osk/omap5912osk.c	8 Jun 2004 00:22:44 -0000	1.1
+++ u-boot/board/omap5912osk/omap5912osk.c	21 Aug 2004 19:51:48 -0000
@@ -60,9 +60,7 @@
 {
 	DECLARE_GLOBAL_DATA_PTR;
 
-	/* 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_OMAP_OSK;
 
 	/* adress of boot parameters */
 	gd->bd->bi_boot_params = 0x10000100;
Index: u-boot/board/omap730p2/omap730p2.c
===================================================================
RCS file: /cvsroot/u-boot/u-boot/board/omap730p2/omap730p2.c,v
retrieving revision 1.3
diff -u -r1.3 omap730p2.c
--- u-boot/board/omap730p2/omap730p2.c	1 Jul 2004 16:30:45 -0000	1.3
+++ u-boot/board/omap730p2/omap730p2.c	21 Aug 2004 19:51:48 -0000
@@ -87,7 +87,7 @@
 	DECLARE_GLOBAL_DATA_PTR;
 
 	/* arch number of OMAP 730 P2 Board - Same as the Innovator! */
-	gd->bd->bi_arch_number = 491;
+	gd->bd->bi_arch_number = MACH_TYPE_OMAP_PERSEUS2;
 
 	/* adress of boot parameters */
 	gd->bd->bi_boot_params = 0x10000100;
Index: u-boot/board/scb9328/scb9328.c
===================================================================
RCS file: /cvsroot/u-boot/u-boot/board/scb9328/scb9328.c,v
retrieving revision 1.1
diff -u -r1.1 scb9328.c
--- u-boot/board/scb9328/scb9328.c	1 Aug 2004 22:48:18 -0000	1.1
+++ u-boot/board/scb9328/scb9328.c	21 Aug 2004 19:51:48 -0000
@@ -29,7 +29,7 @@
 int board_init( void ){
   DECLARE_GLOBAL_DATA_PTR;
 
-  gd->bd->bi_arch_number = 508;
+  gd->bd->bi_arch_number = MACH_TYPE_SCB9328;
   gd->bd->bi_boot_params = 0x08000100;
 
   return 0;
Index: u-boot/board/shannon/shannon.c
===================================================================
RCS file: /cvsroot/u-boot/u-boot/board/shannon/shannon.c,v
retrieving revision 1.3
diff -u -r1.3 shannon.c
--- u-boot/board/shannon/shannon.c	18 Sep 2003 09:21:35 -0000	1.3
+++ u-boot/board/shannon/shannon.c	21 Aug 2004 19:51:48 -0000
@@ -63,7 +63,7 @@
 #endif /* CONFIG_INFERNO */
 
 	/* arch number for shannon */
-	gd->bd->bi_arch_number = 97;
+	gd->bd->bi_arch_number = MACH_TYPE_SHANNON;
 
 	/* adress of boot parameters */
 	gd->bd->bi_boot_params = 0xc0000100;
Index: u-boot/board/smdk2400/smdk2400.c
===================================================================
RCS file: /cvsroot/u-boot/u-boot/board/smdk2400/smdk2400.c,v
retrieving revision 1.2
diff -u -r1.2 smdk2400.c
--- u-boot/board/smdk2400/smdk2400.c	19 Jun 2003 23:01:52 -0000	1.2
+++ u-boot/board/smdk2400/smdk2400.c	21 Aug 2004 19:51:48 -0000
@@ -77,7 +77,7 @@
 	gpio->OPENCR = 0x0;
 
 	/* arch number of SAMSUNG-Board to MACH_TYPE_SMDK2400 */
-	gd->bd->bi_arch_number = 145;
+	gd->bd->bi_arch_number = MACH_TYPE_SMDK2400;
 
 	/* adress of boot parameters */
 	gd->bd->bi_boot_params = 0x0C000100;
Index: u-boot/board/smdk2410/smdk2410.c
===================================================================
RCS file: /cvsroot/u-boot/u-boot/board/smdk2410/smdk2410.c,v
retrieving revision 1.2
diff -u -r1.2 smdk2410.c
--- u-boot/board/smdk2410/smdk2410.c	19 Jun 2003 23:01:52 -0000	1.2
+++ u-boot/board/smdk2410/smdk2410.c	21 Aug 2004 19:51:48 -0000
@@ -104,7 +104,7 @@
 	gpio->GPHUP = 0x000007FF;
 
 	/* arch number of SMDK2410-Board */
-	gd->bd->bi_arch_number = 193;
+	gd->bd->bi_arch_number = MACH_TYPE_SMDK2410;
 
 	/* adress of boot parameters */
 	gd->bd->bi_boot_params = 0x30000100;
Index: u-boot/board/versatile/versatile.c
===================================================================
RCS file: /cvsroot/u-boot/u-boot/board/versatile/versatile.c,v
retrieving revision 1.3
diff -u -r1.3 versatile.c
--- u-boot/board/versatile/versatile.c	11 Jul 2004 18:10:31 -0000	1.3
+++ u-boot/board/versatile/versatile.c	21 Aug 2004 19:51:49 -0000
@@ -74,7 +74,7 @@
 	   (VERSATILE_TIMCLK << VERSATILE_TIMER3_EnSel) | (VERSATILE_TIMCLK << VERSATILE_TIMER4_EnSel));
 
 	/* arch number of Versatile Board */
-	gd->bd->bi_arch_number = 387;
+	gd->bd->bi_arch_number = MACH_TYPE_VERSATILE_PB;
 
 	/* adress of boot parameters */
 	gd->bd->bi_boot_params = 0x00000100;
Index: u-boot/board/wepep250/wepep250.c
===================================================================
RCS file: /cvsroot/u-boot/u-boot/board/wepep250/wepep250.c,v
retrieving revision 1.3
diff -u -r1.3 wepep250.c
--- u-boot/board/wepep250/wepep250.c	6 Dec 2003 19:49:24 -0000	1.3
+++ u-boot/board/wepep250/wepep250.c	21 Aug 2004 19:51:49 -0000
@@ -26,7 +26,7 @@
 int board_init( void ){
   DECLARE_GLOBAL_DATA_PTR;
 
-  gd->bd->bi_arch_number = 288;
+  gd->bd->bi_arch_number = MACH_TYPE_WEP_EP250;
   gd->bd->bi_boot_params = 0xa0000000;
 /*
  * Setup GPIO stuff to get serial working
Index: u-boot/board/xm250/xm250.c
===================================================================
RCS file: /cvsroot/u-boot/u-boot/board/xm250/xm250.c,v
retrieving revision 1.1
diff -u -r1.1 xm250.c
--- u-boot/board/xm250/xm250.c	23 Mar 2004 20:18:27 -0000	1.1
+++ u-boot/board/xm250/xm250.c	21 Aug 2004 19:51:49 -0000
@@ -63,7 +63,7 @@
 {
 	DECLARE_GLOBAL_DATA_PTR;
 	/* arch number of MicroSys XM250 */
-	gd->bd->bi_arch_number = 444;
+	gd->bd->bi_arch_number = MACH_TYPE_XM250;
 
 	/* adress of boot parameters */
 	gd->bd->bi_boot_params = 0xa0000100;
Index: u-boot/board/xsengine/xsengine.c
===================================================================
RCS file: /cvsroot/u-boot/u-boot/board/xsengine/xsengine.c,v
retrieving revision 1.1
diff -u -r1.1 xsengine.c
--- u-boot/board/xsengine/xsengine.c	9 Jun 2004 15:37:24 -0000	1.1
+++ u-boot/board/xsengine/xsengine.c	21 Aug 2004 19:51:49 -0000
@@ -39,7 +39,7 @@
 	/* so we do _nothing_ here */
 
 	/* arch number */
-	gd->bd->bi_arch_number = 532;
+	gd->bd->bi_arch_number = MACH_TYPE_XSENGINE;
 
 	/* adress of boot parameters */
 	gd->bd->bi_boot_params = 0xa0000100;
Index: u-boot/include/common.h
===================================================================
RCS file: /cvsroot/u-boot/u-boot/include/common.h,v
retrieving revision 1.45
diff -u -r1.45 common.h
--- u-boot/include/common.h	1 Aug 2004 22:48:21 -0000	1.45
+++ u-boot/include/common.h	21 Aug 2004 19:51:49 -0000
@@ -209,6 +209,7 @@
 void	setenv	     (char *, char *);
 #endif /* CONFIG_PPC */
 #ifdef CONFIG_ARM
+# include <asm/mach-types.h>
 # include <asm/setup.h>
 # include <asm/u-boot-arm.h>	/* ARM version to be fixed! */
 #endif /* CONFIG_ARM */