aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwdenk <wdenk>2004-10-10 18:41:04 +0000
committerwdenk <wdenk>2004-10-10 18:41:04 +0000
commit731215ebde3b85f114f7a45eece3c155ba49a2c0 (patch)
tree5e99a2b6ba94dddc854d6fa805a2e0174e26a521
parentb65085130aed33584d95502c20317ad4379c1ca6 (diff)
downloadu-boot-linaro-stable-731215ebde3b85f114f7a45eece3c155ba49a2c0.tar.gz
Patch by George G. Davis, 24 Aug 2004:
- update ARM boards to use constants from mach-types.h
-rw-r--r--CHANGELOG3
-rw-r--r--board/assabet/assabet.c2
-rw-r--r--board/at91rm9200dk/at91rm9200dk.c2
-rw-r--r--board/cerf250/cerf250.c2
-rw-r--r--board/cradle/cradle.c2
-rw-r--r--board/csb226/csb226.c2
-rw-r--r--board/dave/B2/B2.c2
-rw-r--r--board/dnp1110/dnp1110.c2
-rw-r--r--board/ep7312/ep7312.c2
-rw-r--r--board/gcplus/gcplus.c2
-rw-r--r--board/impa7/impa7.c2
-rw-r--r--board/integratorap/integratorap.c2
-rw-r--r--board/integratorcp/integratorcp.c2
-rw-r--r--board/ixdp425/ixdp425.c2
-rw-r--r--board/lart/lart.c2
-rw-r--r--board/lubbock/lubbock.c2
-rw-r--r--board/mpl/vcma9/vcma9.c2
-rw-r--r--board/mx1ads/mx1ads.c2
-rw-r--r--board/mx1fs2/mx1fs2.c2
-rw-r--r--board/ns9750dev/ns9750dev.c2
-rw-r--r--board/omap1510inn/omap1510innovator.c2
-rw-r--r--board/omap1610inn/omap1610innovator.c1
-rw-r--r--board/omap5912osk/omap5912osk.c4
-rw-r--r--board/omap730p2/omap730p2.c2
-rw-r--r--board/scb9328/scb9328.c2
-rw-r--r--board/shannon/shannon.c2
-rw-r--r--board/smdk2400/smdk2400.c2
-rw-r--r--board/smdk2410/smdk2410.c2
-rw-r--r--board/sx1/sx1.c2
-rw-r--r--board/trab/trab.c7
-rw-r--r--board/versatile/versatile.c2
-rw-r--r--board/wepep250/wepep250.c2
-rw-r--r--board/xm250/xm250.c2
-rw-r--r--board/xsengine/xsengine.c2
-rw-r--r--include/asm-arm/mach-types.h773
-rw-r--r--include/common.h1
36 files changed, 807 insertions, 42 deletions
diff --git a/CHANGELOG b/CHANGELOG
index db8cc8b61..89375c91b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,9 @@
Changes since U-Boot 1.1.1:
======================================================================
+* Patch by George G. Davis, 24 Aug 2004:
+ - update ARM boards to use constants from mach-types.h
+
* Patch by Gary Jennejohn, 04 Oct 2004:
- fix I2C on at91rm9200
- add support for Ricoh RS5C372A RTC
diff --git a/board/assabet/assabet.c b/board/assabet/assabet.c
index 0958c3389..d3ccbb536 100644
--- a/board/assabet/assabet.c
+++ b/board/assabet/assabet.c
@@ -101,7 +101,7 @@ board_init(void)
{
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();
diff --git a/board/at91rm9200dk/at91rm9200dk.c b/board/at91rm9200dk/at91rm9200dk.c
index 606ea4881..2cb60b0fa 100644
--- a/board/at91rm9200dk/at91rm9200dk.c
+++ b/board/at91rm9200dk/at91rm9200dk.c
@@ -45,7 +45,7 @@ int board_init (void)
/* 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;
diff --git a/board/cerf250/cerf250.c b/board/cerf250/cerf250.c
index 63745b4fd..cc1bc16f6 100644
--- a/board/cerf250/cerf250.c
+++ b/board/cerf250/cerf250.c
@@ -42,7 +42,7 @@ int board_init (void)
/* 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;
diff --git a/board/cradle/cradle.c b/board/cradle/cradle.c
index f5c99b15f..6f65f3275 100644
--- a/board/cradle/cradle.c
+++ b/board/cradle/cradle.c
@@ -186,7 +186,7 @@ board_init (void)
led_code (0xf, YELLOW);
/* arch number of HHP Cradle */
- gd->bd->bi_arch_number = 174;
+ gd->bd->bi_arch_number = MACH_TYPE_HHP_CRADLE;
/* adress of boot parameters */
gd->bd->bi_boot_params = 0xa0000100;
diff --git a/board/csb226/csb226.c b/board/csb226/csb226.c
index bf9b4f840..c99a71557 100644
--- a/board/csb226/csb226.c
+++ b/board/csb226/csb226.c
@@ -71,7 +71,7 @@ int board_init (void)
/* 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;
diff --git a/board/dave/B2/B2.c b/board/dave/B2/B2.c
index a6ab91791..29676b800 100644
--- a/board/dave/B2/B2.c
+++ b/board/dave/B2/B2.c
@@ -109,7 +109,7 @@ int board_init (void)
PDATF = temp;
/* arch number MACH_TYPE_MBA44B0 */
- gd->bd->bi_arch_number = 178;
+ gd->bd->bi_arch_number = MACH_TYPE_S3C44B0;
/* location of boot parameters */
gd->bd->bi_boot_params = 0x0c000100;
diff --git a/board/dnp1110/dnp1110.c b/board/dnp1110/dnp1110.c
index 4a2b44e0e..24c3e00c7 100644
--- a/board/dnp1110/dnp1110.c
+++ b/board/dnp1110/dnp1110.c
@@ -39,7 +39,7 @@ int board_init (void)
/* so we do _nothing_ here */
/* arch number of DNP1110-Board */
- gd->bd->bi_arch_number = 255;
+ gd->bd->bi_arch_number = MACH_TYPE_DNP1110;
/* flash vpp on */
PPDR |= 0x80; /* assumes LCD controller is off */
diff --git a/board/ep7312/ep7312.c b/board/ep7312/ep7312.c
index 4f9e5aca8..11eab234b 100644
--- a/board/ep7312/ep7312.c
+++ b/board/ep7312/ep7312.c
@@ -40,7 +40,7 @@ int board_init (void)
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;
diff --git a/board/gcplus/gcplus.c b/board/gcplus/gcplus.c
index 06b6098a3..261e894f4 100644
--- a/board/gcplus/gcplus.c
+++ b/board/gcplus/gcplus.c
@@ -37,7 +37,7 @@ board_init(void)
{
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? */
diff --git a/board/impa7/impa7.c b/board/impa7/impa7.c
index 12eb0db04..e49692328 100644
--- a/board/impa7/impa7.c
+++ b/board/impa7/impa7.c
@@ -40,7 +40,7 @@ int board_init (void)
IO_LEDFLSH = 0x40;
/* arch number of EP7111 */
- gd->bd->bi_arch_number = 50;
+ gd->bd->bi_arch_number = MACH_TYPE_EDB7211;
/* location of boot parameters for EP7111 */
gd->bd->bi_boot_params = 0xc0020100;
diff --git a/board/integratorap/integratorap.c b/board/integratorap/integratorap.c
index 3ab74f06b..fb83c82c1 100644
--- a/board/integratorap/integratorap.c
+++ b/board/integratorap/integratorap.c
@@ -68,7 +68,7 @@ int board_init (void)
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;
diff --git a/board/integratorcp/integratorcp.c b/board/integratorcp/integratorcp.c
index 8da869c48..6fe8f05ba 100644
--- a/board/integratorcp/integratorcp.c
+++ b/board/integratorcp/integratorcp.c
@@ -64,7 +64,7 @@ int board_init (void)
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;
diff --git a/board/ixdp425/ixdp425.c b/board/ixdp425/ixdp425.c
index 1b34f9602..09e5fdfc0 100644
--- a/board/ixdp425/ixdp425.c
+++ b/board/ixdp425/ixdp425.c
@@ -54,7 +54,7 @@ board_init (void)
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;
diff --git a/board/lart/lart.c b/board/lart/lart.c
index 20f22ea0a..66b730dba 100644
--- a/board/lart/lart.c
+++ b/board/lart/lart.c
@@ -39,7 +39,7 @@ int board_init (void)
/* 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;
diff --git a/board/lubbock/lubbock.c b/board/lubbock/lubbock.c
index 353c72246..e618ab96a 100644
--- a/board/lubbock/lubbock.c
+++ b/board/lubbock/lubbock.c
@@ -42,7 +42,7 @@ int board_init (void)
/* 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;
diff --git a/board/mpl/vcma9/vcma9.c b/board/mpl/vcma9/vcma9.c
index db9855343..ffdba5d99 100644
--- a/board/mpl/vcma9/vcma9.c
+++ b/board/mpl/vcma9/vcma9.c
@@ -119,7 +119,7 @@ int board_init(void)
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;
diff --git a/board/mx1ads/mx1ads.c b/board/mx1ads/mx1ads.c
index 661fbab0a..332f0a2be 100644
--- a/board/mx1ads/mx1ads.c
+++ b/board/mx1ads/mx1ads.c
@@ -114,7 +114,7 @@ int board_init (void) {
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 */
diff --git a/board/mx1fs2/mx1fs2.c b/board/mx1fs2/mx1fs2.c
index f51085a97..9e7a06c0d 100644
--- a/board/mx1fs2/mx1fs2.c
+++ b/board/mx1fs2/mx1fs2.c
@@ -81,7 +81,7 @@ board_init(void)
{
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();
diff --git a/board/ns9750dev/ns9750dev.c b/board/ns9750dev/ns9750dev.c
index 0ea89a5d8..ea00d5af2 100644
--- a/board/ns9750dev/ns9750dev.c
+++ b/board/ns9750dev/ns9750dev.c
@@ -65,7 +65,7 @@ int board_init( void )
/* Active BBUS modules */
*get_bbus_reg_addr( NS9750_BBUS_MASTER_RESET ) = 0;
-#warning TODO check numbers
+#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;
diff --git a/board/omap1510inn/omap1510innovator.c b/board/omap1510inn/omap1510innovator.c
index eba010a80..f037f42d4 100644
--- a/board/omap1510inn/omap1510innovator.c
+++ b/board/omap1510inn/omap1510innovator.c
@@ -50,7 +50,7 @@ int board_init (void)
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;
diff --git a/board/omap1610inn/omap1610innovator.c b/board/omap1610inn/omap1610innovator.c
index 57f1e8961..78425181e 100644
--- a/board/omap1610inn/omap1610innovator.c
+++ b/board/omap1610inn/omap1610innovator.c
@@ -32,7 +32,6 @@
*/
#include <common.h>
-#include <asm/mach-types.h>
#if defined(CONFIG_OMAP1610)
#include <./configs/omap1510.h>
#endif
diff --git a/board/omap5912osk/omap5912osk.c b/board/omap5912osk/omap5912osk.c
index 27457a198..1faa084f9 100644
--- a/board/omap5912osk/omap5912osk.c
+++ b/board/omap5912osk/omap5912osk.c
@@ -60,9 +60,7 @@ int board_init (void)
{
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;
diff --git a/board/omap730p2/omap730p2.c b/board/omap730p2/omap730p2.c
index 870cb912f..256c6a665 100644
--- a/board/omap730p2/omap730p2.c
+++ b/board/omap730p2/omap730p2.c
@@ -87,7 +87,7 @@ int board_init (void)
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;
diff --git a/board/scb9328/scb9328.c b/board/scb9328/scb9328.c
index a1fe0aefe..3ed8753e2 100644
--- a/board/scb9328/scb9328.c
+++ b/board/scb9328/scb9328.c
@@ -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;
diff --git a/board/shannon/shannon.c b/board/shannon/shannon.c
index c090bde4a..0d9f146d5 100644
--- a/board/shannon/shannon.c
+++ b/board/shannon/shannon.c
@@ -63,7 +63,7 @@ int board_init (void)
#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;
diff --git a/board/smdk2400/smdk2400.c b/board/smdk2400/smdk2400.c
index 2d6be31be..cb7021843 100644
--- a/board/smdk2400/smdk2400.c
+++ b/board/smdk2400/smdk2400.c
@@ -77,7 +77,7 @@ int board_init (void)
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;
diff --git a/board/smdk2410/smdk2410.c b/board/smdk2410/smdk2410.c
index 207cd448f..9623aeff3 100644
--- a/board/smdk2410/smdk2410.c
+++ b/board/smdk2410/smdk2410.c
@@ -104,7 +104,7 @@ int board_init (void)
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;
diff --git a/board/sx1/sx1.c b/board/sx1/sx1.c
index c14a385b1..e45f6ae4f 100644
--- a/board/sx1/sx1.c
+++ b/board/sx1/sx1.c
@@ -46,7 +46,7 @@ int board_init (void)
DECLARE_GLOBAL_DATA_PTR;
/* arch number of SX1 Board */
- gd->bd->bi_arch_number = 241;
+ gd->bd->bi_arch_number = MACH_TYPE_SX1;
/* adress of boot parameters */
gd->bd->bi_boot_params = 0x10000100;
diff --git a/board/trab/trab.c b/board/trab/trab.c
index fb57f5bcf..e8dfd2ceb 100644
--- a/board/trab/trab.c
+++ b/board/trab/trab.c
@@ -57,7 +57,7 @@ static void udelay_no_timer (int usec)
int i;
int delay = usec * 3;
- for (i = 0; i < delay; i ++) gd->bd->bi_arch_number = 145;
+ for (i = 0; i < delay; i ++) gd->bd->bi_arch_number = MACH_TYPE_TRAB;
}
#endif /* CONFIG_MODEM_SUPPORT */
@@ -109,10 +109,7 @@ int board_init ()
gpio->MISCCR = 0x40;
gpio->PFCON |= (2<<12);
- /* arch number of SAMSUNG-Board */
- /* MACH_TYPE_SMDK2400 */
- /* XXX this isn't really correct, but keep it for now */
- gd->bd->bi_arch_number = 145;
+ gd->bd->bi_arch_number = MACH_TYPE_TRAB;
/* adress of boot parameters */
gd->bd->bi_boot_params = 0x0c000100;
diff --git a/board/versatile/versatile.c b/board/versatile/versatile.c
index 17701dc9c..027402709 100644
--- a/board/versatile/versatile.c
+++ b/board/versatile/versatile.c
@@ -74,7 +74,7 @@ int board_init (void)
(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;
diff --git a/board/wepep250/wepep250.c b/board/wepep250/wepep250.c
index 581818316..56cb855af 100644
--- a/board/wepep250/wepep250.c
+++ b/board/wepep250/wepep250.c
@@ -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
diff --git a/board/xm250/xm250.c b/board/xm250/xm250.c
index 2a4348dac..ef5e9da0e 100644
--- a/board/xm250/xm250.c
+++ b/board/xm250/xm250.c
@@ -63,7 +63,7 @@ board_init (void)
{
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;
diff --git a/board/xsengine/xsengine.c b/board/xsengine/xsengine.c
index c33b6f04b..a9919dbaa 100644
--- a/board/xsengine/xsengine.c
+++ b/board/xsengine/xsengine.c
@@ -39,7 +39,7 @@ int board_init (void)
/* 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;
diff --git a/include/asm-arm/mach-types.h b/include/asm-arm/mach-types.h
index 6a51e75f0..e48211592 100644
--- a/include/asm-arm/mach-types.h
+++ b/include/asm-arm/mach-types.h
@@ -1,5 +1,5 @@
/*
- * This was automagically generated from arch/arm/tools/mach-types!
+ * This was automagically generated from mach-types!
* Do NOT edit
*/
@@ -565,6 +565,65 @@ extern unsigned int __machine_arch_type;
#define MACH_TYPE_SATURN 552
#define MACH_TYPE_ARGONPLUSEVB 553
#define MACH_TYPE_SCMA11EVB 554
+#define MACH_TYPE_SMDK2800 555
+#define MACH_TYPE_MTWILSON 556
+#define MACH_TYPE_ZITI 557
+#define MACH_TYPE_GRANDFATHER 558
+#define MACH_TYPE_TENGINE 559
+#define MACH_TYPE_S3C2460 560
+#define MACH_TYPE_PDM 561
+#define MACH_TYPE_H4700 562
+#define MACH_TYPE_H6300 563
+#define MACH_TYPE_RZ1700 564
+#define MACH_TYPE_A716 565
+#define MACH_TYPE_ESTK2440A 566
+#define MACH_TYPE_ATWIXP425 567
+#define MACH_TYPE_CSB336 568
+#define MACH_TYPE_RIRM2 569
+#define MACH_TYPE_CX23518 570
+#define MACH_TYPE_CX2351X 571
+#define MACH_TYPE_COMPUTIME 572
+#define MACH_TYPE_IZARUS 573
+#define MACH_TYPE_RTS 574
+#define MACH_TYPE_SE5100 575
+#define MACH_TYPE_S3C2510 576
+#define MACH_TYPE_CSB437TL 577
+#define MACH_TYPE_SLAUSON 578
+#define MACH_TYPE_PEARLRIVER 579
+#define MACH_TYPE_TDC_P210 580
+#define MACH_TYPE_SG580 581
+#define MACH_TYPE_WRSBCARM7 582
+#define MACH_TYPE_IPD 583
+#define MACH_TYPE_PXA_DNP2110 584
+#define MACH_TYPE_XAENIAX 585
+#define MACH_TYPE_SOMN4250 586
+#define MACH_TYPE_PLEB2 587
+#define MACH_TYPE_CWL 588
+#define MACH_TYPE_GD 589
+#define MACH_TYPE_CHAFFEE 590
+#define MACH_TYPE_RMS101 591
+#define MACH_TYPE_RX3715 592
+#define MACH_TYPE_SWIFT 593
+#define MACH_TYPE_ROVERP7 594
+#define MACH_TYPE_PR818S 595
+#define MACH_TYPE_TRXPRO 596
+#define MACH_TYPE_NSLU2 597
+#define MACH_TYPE_E400 598
+#define MACH_TYPE_TRAB 599
+#define MACH_TYPE_CMC_PU2 600
+#define MACH_TYPE_FULCRUM 601
+#define MACH_TYPE_NETGATE42X 602
+#define MACH_TYPE_STR710 603
+#define MACH_TYPE_IXDPG425 604
+#define MACH_TYPE_TOMTOMGO 605
+#define MACH_TYPE_VERSATILE_AB 606
+#define MACH_TYPE_EDB9307 607
+#define MACH_TYPE_SG565 608
+#define MACH_TYPE_LPD79524 609
+#define MACH_TYPE_LPD79525 610
+#define MACH_TYPE_RMS100 611
+#define MACH_TYPE_KB9200 612
+#define MACH_TYPE_SX1 613
#ifdef CONFIG_ARCH_EBSA110
# ifdef machine_arch_type
@@ -6669,9 +6728,9 @@ extern unsigned int __machine_arch_type;
# else
# define machine_arch_type MACH_TYPE_MONTAJADE
# endif
-# define machine_is_montajade() (machine_arch_type == MACH_TYPE_MONTAJADE)
+# define machine_is_montejade() (machine_arch_type == MACH_TYPE_MONTAJADE)
#else
-# define machine_is_montajade() (0)
+# define machine_is_montejade() (0)
#endif
#ifdef CONFIG_MACH_SG560
@@ -7178,6 +7237,714 @@ extern unsigned int __machine_arch_type;
# define machine_is_scma11evb() (0)
#endif
+#ifdef CONFIG_MACH_SMDK2800
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_SMDK2800
+# endif
+# define machine_is_smdk2800() (machine_arch_type == MACH_TYPE_SMDK2800)
+#else
+# define machine_is_smdk2800() (0)
+#endif
+
+#ifdef CONFIG_MACH_MTWILSON
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_MTWILSON
+# endif
+# define machine_is_mtwilson() (machine_arch_type == MACH_TYPE_MTWILSON)
+#else
+# define machine_is_mtwilson() (0)
+#endif
+
+#ifdef CONFIG_MACH_ZITI
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_ZITI
+# endif
+# define machine_is_ziti() (machine_arch_type == MACH_TYPE_ZITI)
+#else
+# define machine_is_ziti() (0)
+#endif
+
+#ifdef CONFIG_MACH_GRANDFATHER
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_GRANDFATHER
+# endif
+# define machine_is_grandfather() (machine_arch_type == MACH_TYPE_GRANDFATHER)
+#else
+# define machine_is_grandfather() (0)
+#endif
+
+#ifdef CONFIG_MACH_TENGINE
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_TENGINE
+# endif
+# define machine_is_tengine() (machine_arch_type == MACH_TYPE_TENGINE)
+#else
+# define machine_is_tengine() (0)
+#endif
+
+#ifdef CONFIG_MACH_S3C2460
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_S3C2460
+# endif
+# define machine_is_s3c2460() (machine_arch_type == MACH_TYPE_S3C2460)
+#else
+# define machine_is_s3c2460() (0)
+#endif
+
+#ifdef CONFIG_MACH_PDM
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_PDM
+# endif
+# define machine_is_pdm() (machine_arch_type == MACH_TYPE_PDM)
+#else
+# define machine_is_pdm() (0)
+#endif
+
+#ifdef CONFIG_MACH_H4700
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_H4700
+# endif
+# define machine_is_h4700() (machine_arch_type == MACH_TYPE_H4700)
+#else
+# define machine_is_h4700() (0)
+#endif
+
+#ifdef CONFIG_MACH_H6300
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_H6300
+# endif
+# define machine_is_h6300() (machine_arch_type == MACH_TYPE_H6300)
+#else
+# define machine_is_h6300() (0)
+#endif
+
+#ifdef CONFIG_MACH_RZ1700
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_RZ1700
+# endif
+# define machine_is_rz1700() (machine_arch_type == MACH_TYPE_RZ1700)
+#else
+# define machine_is_rz1700() (0)
+#endif
+
+#ifdef CONFIG_MACH_A716
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_A716
+# endif
+# define machine_is_a716() (machine_arch_type == MACH_TYPE_A716)
+#else
+# define machine_is_a716() (0)
+#endif
+
+#ifdef CONFIG_MACH_ESTK2440A
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_ESTK2440A
+# endif
+# define machine_is_estk2440a() (machine_arch_type == MACH_TYPE_ESTK2440A)
+#else
+# define machine_is_estk2440a() (0)
+#endif
+
+#ifdef CONFIG_MACH_ATWIXP425
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_ATWIXP425
+# endif
+# define machine_is_atwixp425() (machine_arch_type == MACH_TYPE_ATWIXP425)
+#else
+# define machine_is_atwixp425() (0)
+#endif
+
+#ifdef CONFIG_MACH_CSB336
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_CSB336
+# endif
+# define machine_is_csb336() (machine_arch_type == MACH_TYPE_CSB336)
+#else
+# define machine_is_csb336() (0)
+#endif
+
+#ifdef CONFIG_MACH_RIRM2
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_RIRM2
+# endif
+# define machine_is_rirm2() (machine_arch_type == MACH_TYPE_RIRM2)
+#else
+# define machine_is_rirm2() (0)
+#endif
+
+#ifdef CONFIG_MACH_CX23518
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_CX23518
+# endif
+# define machine_is_cx23518() (machine_arch_type == MACH_TYPE_CX23518)
+#else
+# define machine_is_cx23518() (0)
+#endif
+
+#ifdef CONFIG_MACH_CX2351X
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_CX2351X
+# endif
+# define machine_is_cx2351x() (machine_arch_type == MACH_TYPE_CX2351X)
+#else
+# define machine_is_cx2351x() (0)
+#endif
+
+#ifdef CONFIG_MACH_COMPUTIME
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_COMPUTIME
+# endif
+# define machine_is_computime() (machine_arch_type == MACH_TYPE_COMPUTIME)
+#else
+# define machine_is_computime() (0)
+#endif
+
+#ifdef CONFIG_MACH_IZARUS
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_IZARUS
+# endif
+# define machine_is_izarus() (machine_arch_type == MACH_TYPE_IZARUS)
+#else
+# define machine_is_izarus() (0)
+#endif
+
+#ifdef CONFIG_MACH_RTS
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_RTS
+# endif
+# define machine_is_pxa_rts() (machine_arch_type == MACH_TYPE_RTS)
+#else
+# define machine_is_pxa_rts() (0)
+#endif
+
+#ifdef CONFIG_MACH_SE5100
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_SE5100
+# endif
+# define machine_is_se5100() (machine_arch_type == MACH_TYPE_SE5100)
+#else
+# define machine_is_se5100() (0)
+#endif
+
+#ifdef CONFIG_MACH_S3C2510
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_S3C2510
+# endif
+# define machine_is_s3c2510() (machine_arch_type == MACH_TYPE_S3C2510)
+#else
+# define machine_is_s3c2510() (0)
+#endif
+
+#ifdef CONFIG_MACH_CSB437TL
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_CSB437TL
+# endif
+# define machine_is_csb437tl() (machine_arch_type == MACH_TYPE_CSB437TL)
+#else
+# define machine_is_csb437tl() (0)
+#endif
+
+#ifdef CONFIG_MACH_SLAUSON
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_SLAUSON
+# endif
+# define machine_is_slauson() (machine_arch_type == MACH_TYPE_SLAUSON)
+#else
+# define machine_is_slauson() (0)
+#endif
+
+#ifdef CONFIG_MACH_PEARLRIVER
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_PEARLRIVER
+# endif
+# define machine_is_pearlriver() (machine_arch_type == MACH_TYPE_PEARLRIVER)
+#else
+# define machine_is_pearlriver() (0)
+#endif
+
+#ifdef CONFIG_MACH_TDC_P210
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_TDC_P210
+# endif
+# define machine_is_tdc_p210() (machine_arch_type == MACH_TYPE_TDC_P210)
+#else
+# define machine_is_tdc_p210() (0)
+#endif
+
+#ifdef CONFIG_MACH_SG580
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_SG580
+# endif
+# define machine_is_sg580() (machine_arch_type == MACH_TYPE_SG580)
+#else
+# define machine_is_sg580() (0)
+#endif
+
+#ifdef CONFIG_MACH_WRSBCARM7
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_WRSBCARM7
+# endif
+# define machine_is_wrsbcarm7() (machine_arch_type == MACH_TYPE_WRSBCARM7)
+#else
+# define machine_is_wrsbcarm7() (0)
+#endif
+
+#ifdef CONFIG_MACH_IPD
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_IPD
+# endif
+# define machine_is_ipd() (machine_arch_type == MACH_TYPE_IPD)
+#else
+# define machine_is_ipd() (0)
+#endif
+
+#ifdef CONFIG_MACH_PXA_DNP2110
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_PXA_DNP2110
+# endif
+# define machine_is_pxa_dnp2110() (machine_arch_type == MACH_TYPE_PXA_DNP2110)
+#else
+# define machine_is_pxa_dnp2110() (0)
+#endif
+
+#ifdef CONFIG_MACH_XAENIAX
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_XAENIAX
+# endif
+# define machine_is_xaeniax() (machine_arch_type == MACH_TYPE_XAENIAX)
+#else
+# define machine_is_xaeniax() (0)
+#endif
+
+#ifdef CONFIG_MACH_SOMN4250
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_SOMN4250
+# endif
+# define machine_is_somn4250() (machine_arch_type == MACH_TYPE_SOMN4250)
+#else
+# define machine_is_somn4250() (0)
+#endif
+
+#ifdef CONFIG_MACH_PLEB2
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_PLEB2
+# endif
+# define machine_is_pleb2() (machine_arch_type == MACH_TYPE_PLEB2)
+#else
+# define machine_is_pleb2() (0)
+#endif
+
+#ifdef CONFIG_MACH_CWL
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_CWL
+# endif
+# define machine_is_cwl() (machine_arch_type == MACH_TYPE_CWL)
+#else
+# define machine_is_cwl() (0)
+#endif
+
+#ifdef CONFIG_MACH_GD
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_GD
+# endif
+# define machine_is_gd() (machine_arch_type == MACH_TYPE_GD)
+#else
+# define machine_is_gd() (0)
+#endif
+
+#ifdef CONFIG_MACH_CHAFFEE
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_CHAFFEE
+# endif
+# define machine_is_chaffee() (machine_arch_type == MACH_TYPE_CHAFFEE)
+#else
+# define machine_is_chaffee() (0)
+#endif
+
+#ifdef CONFIG_MACH_RMS101
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_RMS101
+# endif
+# define machine_is_rms101() (machine_arch_type == MACH_TYPE_RMS101)
+#else
+# define machine_is_rms101() (0)
+#endif
+
+#ifdef CONFIG_MACH_RX3715
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_RX3715
+# endif
+# define machine_is_rx3715() (machine_arch_type == MACH_TYPE_RX3715)
+#else
+# define machine_is_rx3715() (0)
+#endif
+
+#ifdef CONFIG_MACH_SWIFT
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_SWIFT
+# endif
+# define machine_is_swift() (machine_arch_type == MACH_TYPE_SWIFT)
+#else
+# define machine_is_swift() (0)
+#endif
+
+#ifdef CONFIG_MACH_ROVERP7
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_ROVERP7
+# endif
+# define machine_is_roverp7() (machine_arch_type == MACH_TYPE_ROVERP7)
+#else
+# define machine_is_roverp7() (0)
+#endif
+
+#ifdef CONFIG_MACH_PR818S
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_PR818S
+# endif
+# define machine_is_pr818s() (machine_arch_type == MACH_TYPE_PR818S)
+#else
+# define machine_is_pr818s() (0)
+#endif
+
+#ifdef CONFIG_MACH_TRXPRO
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_TRXPRO
+# endif
+# define machine_is_trxpro() (machine_arch_type == MACH_TYPE_TRXPRO)
+#else
+# define machine_is_trxpro() (0)
+#endif
+
+#ifdef CONFIG_MACH_NSLU2
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_NSLU2
+# endif
+# define machine_is_nslu2() (machine_arch_type == MACH_TYPE_NSLU2)
+#else
+# define machine_is_nslu2() (0)
+#endif
+
+#ifdef CONFIG_MACH_E400
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_E400
+# endif
+# define machine_is_e400() (machine_arch_type == MACH_TYPE_E400)
+#else
+# define machine_is_e400() (0)
+#endif
+
+#ifdef CONFIG_MACH_TRAB
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_TRAB
+# endif
+# define machine_is_trab() (machine_arch_type == MACH_TYPE_TRAB)
+#else
+# define machine_is_trab() (0)
+#endif
+
+#ifdef CONFIG_MACH_CMC_PU2
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_CMC_PU2
+# endif
+# define machine_is_cmc_pu2() (machine_arch_type == MACH_TYPE_CMC_PU2)
+#else
+# define machine_is_cmc_pu2() (0)
+#endif
+
+#ifdef CONFIG_MACH_FULCRUM
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_FULCRUM
+# endif
+# define machine_is_fulcrum() (machine_arch_type == MACH_TYPE_FULCRUM)
+#else
+# define machine_is_fulcrum() (0)
+#endif
+
+#ifdef CONFIG_MACH_NETGATE42X
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_NETGATE42X
+# endif
+# define machine_is_netgate42x() (machine_arch_type == MACH_TYPE_NETGATE42X)
+#else
+# define machine_is_netgate42x() (0)
+#endif
+
+#ifdef CONFIG_MACH_STR710
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_STR710
+# endif
+# define machine_is_str710() (machine_arch_type == MACH_TYPE_STR710)
+#else
+# define machine_is_str710() (0)
+#endif
+
+#ifdef CONFIG_MACH_IXDPG425
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_IXDPG425
+# endif
+# define machine_is_ixdpg425() (machine_arch_type == MACH_TYPE_IXDPG425)
+#else
+# define machine_is_ixdpg425() (0)
+#endif
+
+#ifdef CONFIG_MACH_TOMTOMGO
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_TOMTOMGO
+# endif
+# define machine_is_tomtomgo() (machine_arch_type == MACH_TYPE_TOMTOMGO)
+#else
+# define machine_is_tomtomgo() (0)
+#endif
+
+#ifdef CONFIG_MACH_VERSATILE_AB
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_VERSATILE_AB
+# endif
+# define machine_is_versatile_ab() (machine_arch_type == MACH_TYPE_VERSATILE_AB)
+#else
+# define machine_is_versatile_ab() (0)
+#endif
+
+#ifdef CONFIG_MACH_EDB9307
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_EDB9307
+# endif
+# define machine_is_edb9307() (machine_arch_type == MACH_TYPE_EDB9307)
+#else
+# define machine_is_edb9307() (0)
+#endif
+
+#ifdef CONFIG_MACH_SG565
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_SG565
+# endif
+# define machine_is_sg565() (machine_arch_type == MACH_TYPE_SG565)
+#else
+# define machine_is_sg565() (0)
+#endif
+
+#ifdef CONFIG_MACH_LPD79524
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_LPD79524
+# endif
+# define machine_is_lpd79524() (machine_arch_type == MACH_TYPE_LPD79524)
+#else
+# define machine_is_lpd79524() (0)
+#endif
+
+#ifdef CONFIG_MACH_LPD79525
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_LPD79525
+# endif
+# define machine_is_lpd79525() (machine_arch_type == MACH_TYPE_LPD79525)
+#else
+# define machine_is_lpd79525() (0)
+#endif
+
+#ifdef CONFIG_MACH_RMS100
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_RMS100
+# endif
+# define machine_is_rms100() (machine_arch_type == MACH_TYPE_RMS100)
+#else
+# define machine_is_rms100() (0)
+#endif
+
+#ifdef CONFIG_MACH_KB9200
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_KB9200
+# endif
+# define machine_is_kb9200() (machine_arch_type == MACH_TYPE_KB9200)
+#else
+# define machine_is_kb9200() (0)
+#endif
+
+#ifdef CONFIG_MACH_SX1
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_SX1
+# endif
+# define machine_is_sx1() (machine_arch_type == MACH_TYPE_SX1)
+#else
+# define machine_is_sx1() (0)
+#endif
+
/*
* These have not yet been registered
*/
diff --git a/include/common.h b/include/common.h
index 48e38b965..353a15ac5 100644
--- a/include/common.h
+++ b/include/common.h
@@ -209,6 +209,7 @@ void inline setenv (char *, char *);
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 */