summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--MAINTAINERS12
-rw-r--r--Makefile3
-rw-r--r--arch/arm/cpu/arm1136/mx31/generic.c11
-rw-r--r--arch/arm/cpu/arm1136/mx31/timer.c23
-rw-r--r--arch/arm/cpu/arm1136/mx35/generic.c2
-rw-r--r--arch/arm/cpu/arm926ejs/armada100/cpu.c2
-rw-r--r--arch/arm/cpu/arm926ejs/armada100/dram.c1
-rw-r--r--arch/arm/cpu/arm926ejs/armada100/timer.c1
-rw-r--r--arch/arm/cpu/arm926ejs/davinci/et1011c.c6
-rw-r--r--arch/arm/cpu/arm926ejs/davinci/lowlevel_init.S8
-rw-r--r--arch/arm/cpu/arm926ejs/davinci/psc.c4
-rw-r--r--arch/arm/cpu/arm926ejs/kirkwood/asm-offsets.s0
-rw-r--r--arch/arm/cpu/arm926ejs/kirkwood/cpu.c2
-rw-r--r--arch/arm/cpu/arm926ejs/kirkwood/dram.c2
-rw-r--r--arch/arm/cpu/arm926ejs/kirkwood/mpp.c2
-rw-r--r--arch/arm/cpu/arm926ejs/kirkwood/timer.c1
-rw-r--r--arch/arm/cpu/arm926ejs/mx25/generic.c110
-rw-r--r--arch/arm/cpu/arm926ejs/mx25/reset.c2
-rw-r--r--arch/arm/cpu/arm926ejs/mx25/timer.c16
-rw-r--r--arch/arm/cpu/arm926ejs/mx27/reset.c2
-rw-r--r--arch/arm/cpu/arm926ejs/mx27/timer.c14
-rw-r--r--arch/arm/cpu/arm926ejs/orion5x/cpu.c3
-rw-r--r--arch/arm/cpu/arm926ejs/orion5x/dram.c2
-rw-r--r--arch/arm/cpu/arm926ejs/orion5x/timer.c2
-rw-r--r--arch/arm/cpu/arm926ejs/pantheon/cpu.c13
-rw-r--r--arch/arm/cpu/arm926ejs/pantheon/dram.c1
-rw-r--r--arch/arm/cpu/arm926ejs/pantheon/timer.c1
-rw-r--r--arch/arm/cpu/armv7/am33xx/Makefile48
-rw-r--r--arch/arm/cpu/armv7/am33xx/board.c66
-rw-r--r--arch/arm/cpu/armv7/am33xx/clock.c273
-rw-r--r--arch/arm/cpu/armv7/am33xx/ddr.c147
-rw-r--r--arch/arm/cpu/armv7/am33xx/emif4.c201
-rw-r--r--arch/arm/cpu/armv7/am33xx/lowlevel_init.S72
-rw-r--r--arch/arm/cpu/armv7/am33xx/sys_info.c130
-rw-r--r--arch/arm/cpu/armv7/highbank/Makefile (renamed from arch/arm/cpu/arm926ejs/davinci/config.mk)34
-rw-r--r--arch/arm/cpu/armv7/highbank/timer.c123
-rw-r--r--arch/arm/cpu/armv7/mx5/soc.c10
-rw-r--r--arch/arm/cpu/armv7/omap-common/Makefile2
-rw-r--r--arch/arm/cpu/armv7/omap-common/gpio.c7
-rw-r--r--arch/arm/cpu/armv7/omap-common/spl.c12
-rw-r--r--arch/arm/cpu/armv7/omap3/board.c6
-rw-r--r--arch/arm/cpu/armv7/omap4/board.c24
-rw-r--r--arch/arm/cpu/armv7/omap4/omap4_mux_data.h7
-rw-r--r--arch/arm/cpu/armv7/tegra2/ap20.c5
-rw-r--r--arch/arm/cpu/armv7/tegra2/clock.c825
-rw-r--r--arch/arm/cpu/armv7/tegra2/pinmux.c528
-rw-r--r--arch/arm/include/asm/arch-am33xx/clock.h24
-rw-r--r--arch/arm/include/asm/arch-am33xx/clocks_am33xx.h55
-rw-r--r--arch/arm/include/asm/arch-am33xx/cpu.h218
-rw-r--r--arch/arm/include/asm/arch-am33xx/ddr_defs.h264
-rw-r--r--arch/arm/include/asm/arch-am33xx/hardware.h81
-rw-r--r--arch/arm/include/asm/arch-am33xx/sys_proto.h39
-rw-r--r--arch/arm/include/asm/arch-armada100/armada100.h120
-rw-r--r--arch/arm/include/asm/arch-armada100/config.h1
-rw-r--r--arch/arm/include/asm/arch-armada100/cpu.h125
-rw-r--r--arch/arm/include/asm/arch-armada100/mfp.h6
-rw-r--r--arch/arm/include/asm/arch-armada100/spi.h95
-rw-r--r--arch/arm/include/asm/arch-davinci/emac_defs.h4
-rw-r--r--arch/arm/include/asm/arch-davinci/hardware.h3
-rw-r--r--arch/arm/include/asm/arch-kirkwood/config.h1
-rw-r--r--arch/arm/include/asm/arch-kirkwood/kirkwood.h6
-rw-r--r--arch/arm/include/asm/arch-mx31/imx-regs.h35
-rw-r--r--arch/arm/include/asm/arch-mx31/sys_proto.h35
-rw-r--r--arch/arm/include/asm/arch-mx5/sys_proto.h8
-rw-r--r--arch/arm/include/asm/arch-omap3/cpu.h46
-rw-r--r--arch/arm/include/asm/arch-omap3/dma.h77
-rw-r--r--arch/arm/include/asm/arch-omap3/omap3.h3
-rw-r--r--arch/arm/include/asm/arch-omap3/sys_proto.h1
-rw-r--r--arch/arm/include/asm/arch-omap4/omap4.h16
-rw-r--r--arch/arm/include/asm/arch-omap4/sys_proto.h1
-rw-r--r--arch/arm/include/asm/arch-orion5x/orion5x.h6
-rw-r--r--arch/arm/include/asm/arch-pantheon/config.h20
-rw-r--r--arch/arm/include/asm/arch-pantheon/cpu.h12
-rw-r--r--arch/arm/include/asm/arch-pantheon/mfp.h12
-rw-r--r--arch/arm/include/asm/arch-pantheon/pantheon.h14
-rw-r--r--arch/arm/include/asm/arch-tegra2/clk_rst.h84
-rw-r--r--arch/arm/include/asm/arch-tegra2/clock.h149
-rw-r--r--arch/arm/include/asm/arch-tegra2/pinmux.h444
-rw-r--r--arch/arm/include/asm/mach-types.h32674
-rw-r--r--arch/arm/include/asm/omap_common.h1
-rw-r--r--arch/arm/lib/board.c1
-rw-r--r--board/Marvell/aspenite/aspenite.c1
-rw-r--r--board/Marvell/dkb/dkb.c43
-rw-r--r--board/Marvell/dreamplug/Makefile54
-rw-r--r--board/Marvell/dreamplug/dreamplug.c151
-rw-r--r--board/Marvell/dreamplug/dreamplug.h42
-rw-r--r--board/Marvell/dreamplug/kwbimage.cfg163
-rw-r--r--board/Marvell/gplugd/gplugd.c13
-rw-r--r--board/Marvell/guruplug/guruplug.c1
-rw-r--r--board/Marvell/mv88f6281gtw_ge/mv88f6281gtw_ge.c1
-rw-r--r--board/Marvell/openrd/openrd.c1
-rw-r--r--board/Marvell/rd6281a/rd6281a.c1
-rw-r--r--board/Marvell/sheevaplug/sheevaplug.c1
-rw-r--r--board/davedenx/qong/qong.c107
-rw-r--r--board/davinci/da8xxevm/da830evm.c63
-rw-r--r--board/davinci/da8xxevm/da850evm.c23
-rw-r--r--board/efikamx/efikamx.c51
-rw-r--r--board/freescale/mx31ads/mx31ads.c16
-rw-r--r--board/freescale/mx31pdk/mx31pdk.c14
-rw-r--r--board/freescale/mx35pdk/mx35pdk.c18
-rw-r--r--board/freescale/mx51evk/mx51evk.c47
-rw-r--r--board/freescale/mx53evk/mx53evk.c17
-rw-r--r--board/highbank/Makefile49
-rw-r--r--board/highbank/highbank.c57
-rw-r--r--board/imx31_phycore/imx31_phycore.c41
-rw-r--r--board/karo/tx25/tx25.c2
-rw-r--r--board/keymile/km_arm/km_arm.c1
-rw-r--r--board/logicpd/imx27lite/imx27lite.c6
-rw-r--r--board/logicpd/imx31_litekit/imx31_litekit.c30
-rw-r--r--board/logicpd/zoom2/debug_board.c1
-rw-r--r--board/logicpd/zoom2/zoom2.c1
-rw-r--r--board/nvidia/common/board.c243
-rw-r--r--board/nvidia/common/board.h4
-rw-r--r--board/nvidia/harmony/harmony.c26
-rw-r--r--board/nvidia/seaboard/seaboard.c35
-rw-r--r--board/overo/overo.c14
-rw-r--r--board/overo/overo.h8
-rw-r--r--board/samsung/goni/goni.c4
-rw-r--r--board/ti/am335x/Makefile43
-rw-r--r--board/ti/am335x/common_def.h24
-rw-r--r--board/ti/am335x/evm.c48
-rw-r--r--board/ti/am335x/mux.c278
-rw-r--r--board/ti/beagle/beagle.c6
-rw-r--r--board/ti/panda/panda.c17
-rw-r--r--board/ti/panda/panda_mux_data.h14
-rw-r--r--board/timll/devkit8000/devkit8000.c2
-rw-r--r--board/ttcontrol/vision2/vision2.c33
-rw-r--r--boards.cfg6
-rw-r--r--common/Makefile1
-rw-r--r--common/cmd_ide.c6
-rw-r--r--common/cmd_log.c2
-rw-r--r--doc/README.SPL1
-rw-r--r--doc/README.omap318
-rw-r--r--drivers/dma/Makefile1
-rw-r--r--drivers/dma/omap3_dma.c180
-rw-r--r--drivers/gpio/kw_gpio.c1
-rw-r--r--drivers/gpio/mvmfp.c7
-rw-r--r--drivers/i2c/mxc_i2c.c31
-rw-r--r--drivers/misc/Makefile6
-rw-r--r--drivers/misc/fsl_pmic.c235
-rw-r--r--drivers/misc/pmic_core.c147
-rw-r--r--drivers/misc/pmic_fsl.c66
-rw-r--r--drivers/misc/pmic_i2c.c92
-rw-r--r--drivers/misc/pmic_max8998.c43
-rw-r--r--drivers/misc/pmic_spi.c109
-rw-r--r--drivers/mmc/omap_hsmmc.c4
-rw-r--r--drivers/mmc/tegra2_mmc.c94
-rw-r--r--drivers/mmc/tegra2_mmc.h1
-rw-r--r--drivers/net/davinci_emac.c209
-rw-r--r--drivers/net/mvgbe.c2
-rw-r--r--drivers/rtc/mc13783-rtc.c20
-rw-r--r--drivers/serial/ns16550.c7
-rw-r--r--drivers/serial/serial.c9
-rw-r--r--drivers/spi/Makefile1
-rw-r--r--drivers/spi/armada100_spi.c228
-rw-r--r--drivers/spi/kirkwood_spi.c5
-rw-r--r--drivers/usb/host/ehci-kirkwood.c1
-rw-r--r--include/configs/am335x_evm.h122
-rw-r--r--include/configs/da830evm.h5
-rw-r--r--include/configs/da850evm.h2
-rw-r--r--include/configs/davinci_dm365evm.h4
-rw-r--r--include/configs/davinci_dm6467evm.h1
-rw-r--r--include/configs/davinci_dvevm.h4
-rw-r--r--include/configs/davinci_schmoogie.h1
-rw-r--r--include/configs/davinci_sffsdr.h1
-rw-r--r--include/configs/davinci_sonata.h1
-rw-r--r--include/configs/devkit8000.h8
-rw-r--r--include/configs/dkb.h1
-rw-r--r--include/configs/dreamplug.h151
-rw-r--r--include/configs/ea20.h1
-rw-r--r--include/configs/edminiv2.h1
-rw-r--r--include/configs/efikamx.h5
-rw-r--r--include/configs/gplugd.h19
-rw-r--r--include/configs/hawkboard.h1
-rw-r--r--include/configs/highbank.h113
-rw-r--r--include/configs/imx31_litekit.h9
-rw-r--r--include/configs/mx31ads.h8
-rw-r--r--include/configs/mx31pdk.h6
-rw-r--r--include/configs/mx35pdk.h5
-rw-r--r--include/configs/mx51evk.h6
-rw-r--r--include/configs/mx53evk.h5
-rw-r--r--include/configs/omap3_beagle.h4
-rw-r--r--include/configs/omap3_overo.h5
-rw-r--r--include/configs/omap4_common.h20
-rw-r--r--include/configs/omap4_panda.h3
-rw-r--r--include/configs/qong.h5
-rw-r--r--include/configs/s5p_goni.h4
-rw-r--r--include/configs/vision2.h22
-rw-r--r--include/fsl_pmic.h5
-rw-r--r--include/max8998_pmic.h84
-rw-r--r--include/pmic.h71
-rw-r--r--post/post.c129
-rw-r--r--spl/Makefile1
193 files changed, 9498 insertions, 32130 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index f5168b0..576fea8 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -70,6 +70,10 @@ Conn Clark <clark@esteem.com>
ESTEEM192E MPC8xx
+Jason Cooper <u-boot@lakedaemon.net>
+
+ dreamplug ARM926EJS (Kirkwood SoC)
+
Joe D'Abbraccio <ljd015@freescale.com>
MPC837xERDB MPC837x
@@ -215,6 +219,10 @@ Wolfgang Grandegger <wg@denx.de>
IPHASE4539 MPC8260
SCM MPC8260
+Rob Herring <rob.herring@calxeda.com>
+
+ highbank highbank
+
Klaus Heydeck <heydeck@kieback-peter.de>
KUP4K MPC855
@@ -734,6 +742,10 @@ Nagendra T S <nagendra@mistralsolutions.com>
am3517_crane ARM ARMV7 (AM35x SoC)
+Chandan Nath <chandan.nath@ti.com>
+
+ am335x_evm ARM ARMV7 (AM33xx Soc)
+
Kyungmin Park <kyungmin.park@samsung.com>
apollon ARM1136EJS
diff --git a/Makefile b/Makefile
index 684cdb6..9ef33f9 100644
--- a/Makefile
+++ b/Makefile
@@ -289,6 +289,9 @@ LIBS += lib/libfdt/libfdt.o
LIBS += api/libapi.o
LIBS += post/libpost.o
+ifeq ($(SOC),am33xx)
+LIBS += $(CPUDIR)/omap-common/libomap-common.o
+endif
ifeq ($(SOC),omap3)
LIBS += $(CPUDIR)/omap-common/libomap-common.o
endif
diff --git a/arch/arm/cpu/arm1136/mx31/generic.c b/arch/arm/cpu/arm1136/mx31/generic.c
index 5524b23..78df7b9 100644
--- a/arch/arm/cpu/arm1136/mx31/generic.c
+++ b/arch/arm/cpu/arm1136/mx31/generic.c
@@ -25,6 +25,7 @@
#include <asm/arch/imx-regs.h>
#include <asm/arch/clock.h>
#include <asm/io.h>
+#include <asm/arch/sys_proto.h>
static u32 mx31_decode_pll(u32 reg, u32 infreq)
{
@@ -140,6 +141,16 @@ void mx31_set_pad(enum iomux_pins pin, u32 config)
}
+void mxc_setup_weimcs(int cs, const struct mxc_weimcs *weimcs)
+{
+ struct mx31_weim *weim = (struct mx31_weim *) WEIM_BASE;
+ struct mx31_weim_cscr *cscr = &weim->cscr[cs];
+
+ writel(weimcs->upper, &cscr->upper);
+ writel(weimcs->lower, &cscr->lower);
+ writel(weimcs->additional, &cscr->additional);
+}
+
struct mx3_cpu_type mx31_cpu_type[] = {
{ .srev = 0x00, .v = 0x10 },
{ .srev = 0x10, .v = 0x11 },
diff --git a/arch/arm/cpu/arm1136/mx31/timer.c b/arch/arm/cpu/arm1136/mx31/timer.c
index 717a2b7..f494440 100644
--- a/arch/arm/cpu/arm1136/mx31/timer.c
+++ b/arch/arm/cpu/arm1136/mx31/timer.c
@@ -43,7 +43,11 @@
DECLARE_GLOBAL_DATA_PTR;
-/* "time" is measured in 1 / CONFIG_SYS_HZ seconds, "tick" is internal timer period */
+/*
+ * "time" is measured in 1 / CONFIG_SYS_HZ seconds,
+ * "tick" is internal timer period
+ */
+
#ifdef CONFIG_MX31_TIMER_HIGH_PRECISION
/* ~0.4% error - measured with stop-watch on 100s boot-delay */
static inline unsigned long long tick_to_time(unsigned long long tick)
@@ -68,7 +72,8 @@ static inline unsigned long long us_to_tick(unsigned long long us)
}
#else
/* ~2% error */
-#define TICK_PER_TIME ((CONFIG_MX31_CLK32 + CONFIG_SYS_HZ / 2) / CONFIG_SYS_HZ)
+#define TICK_PER_TIME ((CONFIG_MX31_CLK32 + CONFIG_SYS_HZ / 2) \
+ / CONFIG_SYS_HZ)
#define US_PER_TICK (1000000 / CONFIG_MX31_CLK32)
static inline unsigned long long tick_to_time(unsigned long long tick)
@@ -91,7 +96,7 @@ static inline unsigned long long us_to_tick(unsigned long long us)
#endif
/* The 32768Hz 32-bit timer overruns in 131072 seconds */
-int timer_init (void)
+int timer_init(void)
{
int i;
@@ -106,7 +111,7 @@ int timer_init (void)
return 0;
}
-unsigned long long get_ticks (void)
+unsigned long long get_ticks(void)
{
ulong now = GPTCNT; /* current tick value */
@@ -119,7 +124,7 @@ unsigned long long get_ticks (void)
return gd->tbl;
}
-ulong get_timer_masked (void)
+ulong get_timer_masked(void)
{
/*
* get_ticks() returns a long long (64 bit), it wraps in
@@ -130,13 +135,13 @@ ulong get_timer_masked (void)
return tick_to_time(get_ticks());
}
-ulong get_timer (ulong base)
+ulong get_timer(ulong base)
{
- return get_timer_masked () - base;
+ return get_timer_masked() - base;
}
/* delay x useconds AND preserve advance timestamp value */
-void __udelay (unsigned long usec)
+void __udelay(unsigned long usec)
{
unsigned long long tmp;
ulong tmo;
@@ -148,7 +153,7 @@ void __udelay (unsigned long usec)
/*NOP*/;
}
-void reset_cpu (ulong addr)
+void reset_cpu(ulong addr)
{
struct wdog_regs *wdog = (struct wdog_regs *)WDOG_BASE;
wdog->wcr = WDOG_ENABLE;
diff --git a/arch/arm/cpu/arm1136/mx35/generic.c b/arch/arm/cpu/arm1136/mx35/generic.c
index fcfaba5..1b9809b 100644
--- a/arch/arm/cpu/arm1136/mx35/generic.c
+++ b/arch/arm/cpu/arm1136/mx35/generic.c
@@ -240,7 +240,7 @@ unsigned int mxc_get_main_clock(enum mxc_main_clocks clk)
}
break;
case IPG_CLK:
- ret_val = get_ipg_clk();;
+ ret_val = get_ipg_clk();
break;
case IPG_PER_CLK:
ret_val = get_ipg_per_clk();
diff --git a/arch/arm/cpu/arm926ejs/armada100/cpu.c b/arch/arm/cpu/arm926ejs/armada100/cpu.c
index c21938e..14121a0 100644
--- a/arch/arm/cpu/arm926ejs/armada100/cpu.c
+++ b/arch/arm/cpu/arm926ejs/armada100/cpu.c
@@ -24,8 +24,8 @@
*/
#include <common.h>
+#include <asm/arch/cpu.h>
#include <asm/arch/armada100.h>
-#include <asm/io.h>
#define UARTCLK14745KHZ (APBC_APBCLK | APBC_FNCLK | APBC_FNCLKSEL(1))
#define SET_MRVL_ID (1<<8)
diff --git a/arch/arm/cpu/arm926ejs/armada100/dram.c b/arch/arm/cpu/arm926ejs/armada100/dram.c
index eacec23..8609004 100644
--- a/arch/arm/cpu/arm926ejs/armada100/dram.c
+++ b/arch/arm/cpu/arm926ejs/armada100/dram.c
@@ -24,6 +24,7 @@
*/
#include <common.h>
+#include <asm/io.h>
#include <asm/arch/armada100.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/arm/cpu/arm926ejs/armada100/timer.c b/arch/arm/cpu/arm926ejs/armada100/timer.c
index 82a6d7b..fbade4b 100644
--- a/arch/arm/cpu/arm926ejs/armada100/timer.c
+++ b/arch/arm/cpu/arm926ejs/armada100/timer.c
@@ -24,6 +24,7 @@
*/
#include <common.h>
+#include <asm/arch/cpu.h>
#include <asm/arch/armada100.h>
/*
diff --git a/arch/arm/cpu/arm926ejs/davinci/et1011c.c b/arch/arm/cpu/arm926ejs/davinci/et1011c.c
index da07345..df35e44 100644
--- a/arch/arm/cpu/arm926ejs/davinci/et1011c.c
+++ b/arch/arm/cpu/arm926ejs/davinci/et1011c.c
@@ -39,11 +39,9 @@ int et1011c_get_link_speed(int phy_addr)
u_int16_t data;
if (davinci_eth_phy_read(phy_addr, MII_STATUS_REG, &data) && (data & 0x04)) {
- davinci_eth_phy_read(EMAC_MDIO_PHY_NUM,
- MII_PHY_CONFIG_REG, &data);
+ davinci_eth_phy_read(phy_addr, MII_PHY_CONFIG_REG, &data);
/* Enable 125MHz clock sourced from PHY */
- davinci_eth_phy_write(EMAC_MDIO_PHY_NUM,
- MII_PHY_CONFIG_REG,
+ davinci_eth_phy_write(phy_addr, MII_PHY_CONFIG_REG,
data | PHY_SYS_CLK_EN);
return (1);
}
diff --git a/arch/arm/cpu/arm926ejs/davinci/lowlevel_init.S b/arch/arm/cpu/arm926ejs/davinci/lowlevel_init.S
index 0a4b2cf..7a169b1 100644
--- a/arch/arm/cpu/arm926ejs/davinci/lowlevel_init.S
+++ b/arch/arm/cpu/arm926ejs/davinci/lowlevel_init.S
@@ -45,6 +45,8 @@
#include <config.h>
+#define MDSTAT_STATE 0x3f
+
.globl lowlevel_init
lowlevel_init:
@@ -268,7 +270,7 @@ checkStatClkStop:
checkDDRStatClkStop:
ldr r6, MDSTAT_DDR2
ldr r7, [r6]
- and r7, r7, $0x1f
+ and r7, r7, $MDSTAT_STATE
cmp r7, $0x03
bne checkDDRStatClkStop
@@ -343,7 +345,7 @@ checkStatClkStop2:
checkDDRStatClkStop2:
ldr r6, MDSTAT_DDR2
ldr r7, [r6]
- and r7, r7, $0x1f
+ and r7, r7, $MDSTAT_STATE
cmp r7, $0x01
bne checkDDRStatClkStop2
@@ -374,7 +376,7 @@ checkStatClkEn2:
checkDDRStatClkEn2:
ldr r6, MDSTAT_DDR2
ldr r7, [r6]
- and r7, r7, $0x1f
+ and r7, r7, $MDSTAT_STATE
cmp r7, $0x03
bne checkDDRStatClkEn2
diff --git a/arch/arm/cpu/arm926ejs/davinci/psc.c b/arch/arm/cpu/arm926ejs/davinci/psc.c
index 8273a7f..707fa47 100644
--- a/arch/arm/cpu/arm926ejs/davinci/psc.c
+++ b/arch/arm/cpu/arm926ejs/davinci/psc.c
@@ -83,7 +83,7 @@ void lpsc_on(unsigned int id)
while (readl(ptstat) & 0x01)
continue;
- if ((readl(mdstat) & 0x1f) == 0x03)
+ if ((readl(mdstat) & PSC_MDSTAT_STATE) == 0x03)
return; /* Already on and enabled */
writel(readl(mdctl) | 0x03, mdctl);
@@ -114,7 +114,7 @@ void lpsc_on(unsigned int id)
while (readl(ptstat) & 0x01)
continue;
- while ((readl(mdstat) & 0x1f) != 0x03)
+ while ((readl(mdstat) & PSC_MDSTAT_STATE) != 0x03)
continue;
}
diff --git a/arch/arm/cpu/arm926ejs/kirkwood/asm-offsets.s b/arch/arm/cpu/arm926ejs/kirkwood/asm-offsets.s
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/arch/arm/cpu/arm926ejs/kirkwood/asm-offsets.s
diff --git a/arch/arm/cpu/arm926ejs/kirkwood/cpu.c b/arch/arm/cpu/arm926ejs/kirkwood/cpu.c
index b4a4c04..8f04ddb 100644
--- a/arch/arm/cpu/arm926ejs/kirkwood/cpu.c
+++ b/arch/arm/cpu/arm926ejs/kirkwood/cpu.c
@@ -26,6 +26,8 @@
#include <netdev.h>
#include <asm/cache.h>
#include <u-boot/md5.h>
+#include <asm/io.h>
+#include <asm/arch/cpu.h>
#include <asm/arch/kirkwood.h>
#include <hush.h>
diff --git a/arch/arm/cpu/arm926ejs/kirkwood/dram.c b/arch/arm/cpu/arm926ejs/kirkwood/dram.c
index 2441554..181b3e7 100644
--- a/arch/arm/cpu/arm926ejs/kirkwood/dram.c
+++ b/arch/arm/cpu/arm926ejs/kirkwood/dram.c
@@ -24,6 +24,8 @@
#include <config.h>
#include <common.h>
+#include <asm/io.h>
+#include <asm/arch/cpu.h>
#include <asm/arch/kirkwood.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/arm/cpu/arm926ejs/kirkwood/mpp.c b/arch/arm/cpu/arm926ejs/kirkwood/mpp.c
index b2f0ad5..3da6c98 100644
--- a/arch/arm/cpu/arm926ejs/kirkwood/mpp.c
+++ b/arch/arm/cpu/arm926ejs/kirkwood/mpp.c
@@ -10,6 +10,8 @@
*/
#include <common.h>
+#include <asm/io.h>
+#include <asm/arch/cpu.h>
#include <asm/arch/kirkwood.h>
#include <asm/arch/mpp.h>
diff --git a/arch/arm/cpu/arm926ejs/kirkwood/timer.c b/arch/arm/cpu/arm926ejs/kirkwood/timer.c
index b4f6cf8..a98f54c 100644
--- a/arch/arm/cpu/arm926ejs/kirkwood/timer.c
+++ b/arch/arm/cpu/arm926ejs/kirkwood/timer.c
@@ -22,6 +22,7 @@
*/
#include <common.h>
+#include <asm/io.h>
#include <asm/arch/kirkwood.h>
#define UBOOT_CNTR 0 /* counter to use for uboot timer */
diff --git a/arch/arm/cpu/arm926ejs/mx25/generic.c b/arch/arm/cpu/arm926ejs/mx25/generic.c
index 8e60a26..c045a0b 100644
--- a/arch/arm/cpu/arm926ejs/mx25/generic.c
+++ b/arch/arm/cpu/arm926ejs/mx25/generic.c
@@ -39,7 +39,7 @@
* f = 2 * f_ref * --------------------
* pd + 1
*/
-static unsigned int imx_decode_pll (unsigned int pll, unsigned int f_ref)
+static unsigned int imx_decode_pll(unsigned int pll, unsigned int f_ref)
{
unsigned int mfi = (pll >> CCM_PLL_MFI_SHIFT)
& CCM_PLL_MFI_MASK;
@@ -52,57 +52,57 @@ static unsigned int imx_decode_pll (unsigned int pll, unsigned int f_ref)
mfi = mfi <= 5 ? 5 : mfi;
- return lldiv (2 * (u64) f_ref * (mfi * (mfd + 1) + mfn),
+ return lldiv(2 * (u64) f_ref * (mfi * (mfd + 1) + mfn),
(mfd + 1) * (pd + 1));
}
-static ulong imx_get_mpllclk (void)
+static ulong imx_get_mpllclk(void)
{
struct ccm_regs *ccm = (struct ccm_regs *)IMX_CCM_BASE;
ulong fref = 24000000;
- return imx_decode_pll (readl (&ccm->mpctl), fref);
+ return imx_decode_pll(readl(&ccm->mpctl), fref);
}
-ulong imx_get_armclk (void)
+ulong imx_get_armclk(void)
{
struct ccm_regs *ccm = (struct ccm_regs *)IMX_CCM_BASE;
- ulong cctl = readl (&ccm->cctl);
- ulong fref = imx_get_mpllclk ();
+ ulong cctl = readl(&ccm->cctl);
+ ulong fref = imx_get_mpllclk();
ulong div;
if (cctl & CCM_CCTL_ARM_SRC)
- fref = lldiv ((fref * 3), 4);
+ fref = lldiv((fref * 3), 4);
div = ((cctl >> CCM_CCTL_ARM_DIV_SHIFT)
& CCM_CCTL_ARM_DIV_MASK) + 1;
- return lldiv (fref, div);
+ return lldiv(fref, div);
}
-ulong imx_get_ahbclk (void)
+ulong imx_get_ahbclk(void)
{
struct ccm_regs *ccm = (struct ccm_regs *)IMX_CCM_BASE;
- ulong cctl = readl (&ccm->cctl);
- ulong fref = imx_get_armclk ();
+ ulong cctl = readl(&ccm->cctl);
+ ulong fref = imx_get_armclk();
ulong div;
div = ((cctl >> CCM_CCTL_AHB_DIV_SHIFT)
& CCM_CCTL_AHB_DIV_MASK) + 1;
- return lldiv (fref, div);
+ return lldiv(fref, div);
}
-ulong imx_get_perclk (int clk)
+ulong imx_get_perclk(int clk)
{
struct ccm_regs *ccm = (struct ccm_regs *)IMX_CCM_BASE;
- ulong fref = imx_get_ahbclk ();
+ ulong fref = imx_get_ahbclk();
ulong div;
- div = readl (&ccm->pcdr[CCM_PERCLK_REG (clk)]);
- div = ((div >> CCM_PERCLK_SHIFT (clk)) & CCM_PERCLK_MASK) + 1;
+ div = readl(&ccm->pcdr[CCM_PERCLK_REG(clk)]);
+ div = ((div >> CCM_PERCLK_SHIFT(clk)) & CCM_PERCLK_MASK) + 1;
- return lldiv (fref, div);
+ return lldiv(fref, div);
}
u32 get_cpu_rev(void)
@@ -153,7 +153,7 @@ static char *get_reset_cause(void)
}
-int print_cpuinfo (void)
+int print_cpuinfo(void)
{
char buf[32];
u32 cpurev = get_cpu_rev();
@@ -161,22 +161,22 @@ int print_cpuinfo (void)
printf("CPU: Freescale i.MX25 rev%d.%d%s at %s MHz\n",
(cpurev & 0xF0) >> 4, (cpurev & 0x0F),
((cpurev & 0x8000) ? " unknown" : ""),
- strmhz (buf, imx_get_armclk ()));
+ strmhz(buf, imx_get_armclk()));
printf("Reset cause: %s\n\n", get_reset_cause());
return 0;
}
#endif
-int cpu_eth_init (bd_t * bis)
+int cpu_eth_init(bd_t *bis)
{
#if defined(CONFIG_FEC_MXC)
struct ccm_regs *ccm = (struct ccm_regs *)IMX_CCM_BASE;
ulong val;
- val = readl (&ccm->cgr0);
+ val = readl(&ccm->cgr0);
val |= (1 << 23);
- writel (val, &ccm->cgr0);
- return fecmxc_initialize (bis);
+ writel(val, &ccm->cgr0);
+ return fecmxc_initialize(bis);
#else
return 0;
#endif
@@ -186,10 +186,10 @@ int cpu_eth_init (bd_t * bis)
* Initializes on-chip MMC controllers.
* to override, implement board_mmc_init()
*/
-int cpu_mmc_init (bd_t * bis)
+int cpu_mmc_init(bd_t *bis)
{
#ifdef CONFIG_MXC_MMC
- return mxc_mmc_init (bis);
+ return mxc_mmc_init(bis);
#else
return 0;
#endif
@@ -206,7 +206,7 @@ void mx25_uart1_init_pins(void)
muxctl = (struct iomuxc_mux_ctl *)IMX_IOPADMUX_BASE;
padctl = (struct iomuxc_pad_ctl *)IMX_IOPADCTL_BASE;
- muxmode0 = MX25_PIN_MUX_MODE (0);
+ muxmode0 = MX25_PIN_MUX_MODE(0);
/*
* set up input pins with hysteresis and 100K pull-ups
*/
@@ -227,25 +227,25 @@ void mx25_uart1_init_pins(void)
/* UART1 */
/* rxd */
- writel (muxmode0, &muxctl->pad_uart1_rxd);
- writel (inpadctl, &padctl->pad_uart1_rxd);
+ writel(muxmode0, &muxctl->pad_uart1_rxd);
+ writel(inpadctl, &padctl->pad_uart1_rxd);
/* txd */
- writel (muxmode0, &muxctl->pad_uart1_txd);
- writel (outpadctl, &padctl->pad_uart1_txd);
+ writel(muxmode0, &muxctl->pad_uart1_txd);
+ writel(outpadctl, &padctl->pad_uart1_txd);
/* rts */
- writel (muxmode0, &muxctl->pad_uart1_rts);
- writel (outpadctl, &padctl->pad_uart1_rts);
+ writel(muxmode0, &muxctl->pad_uart1_rts);
+ writel(outpadctl, &padctl->pad_uart1_rts);
/* cts */
- writel (muxmode0, &muxctl->pad_uart1_cts);
- writel (inpadctl, &padctl->pad_uart1_cts);
+ writel(muxmode0, &muxctl->pad_uart1_cts);
+ writel(inpadctl, &padctl->pad_uart1_cts);
}
#endif /* CONFIG_MXC_UART */
#ifdef CONFIG_FEC_MXC
-void mx25_fec_init_pins (void)
+void mx25_fec_init_pins(void)
{
struct iomuxc_mux_ctl *muxctl;
struct iomuxc_pad_ctl *padctl;
@@ -256,7 +256,7 @@ void mx25_fec_init_pins (void)
muxctl = (struct iomuxc_mux_ctl *)IMX_IOPADMUX_BASE;
padctl = (struct iomuxc_pad_ctl *)IMX_IOPADCTL_BASE;
- muxmode0 = MX25_PIN_MUX_MODE (0);
+ muxmode0 = MX25_PIN_MUX_MODE(0);
inpadctl_100kpd = MX25_PIN_PAD_CTL_HYS
| MX25_PIN_PAD_CTL_PKE
| MX25_PIN_PAD_CTL_PUE | MX25_PIN_PAD_CTL_100K_PD;
@@ -275,40 +275,40 @@ void mx25_fec_init_pins (void)
outpadctl = MX25_PIN_PAD_CTL_PUE | MX25_PIN_PAD_CTL_100K_PD;
/* FEC_TX_CLK */
- writel (muxmode0, &muxctl->pad_fec_tx_clk);
- writel (inpadctl_100kpd, &padctl->pad_fec_tx_clk);
+ writel(muxmode0, &muxctl->pad_fec_tx_clk);
+ writel(inpadctl_100kpd, &padctl->pad_fec_tx_clk);
/* FEC_RX_DV */
- writel (muxmode0, &muxctl->pad_fec_rx_dv);
- writel (inpadctl_100kpd, &padctl->pad_fec_rx_dv);
+ writel(muxmode0, &muxctl->pad_fec_rx_dv);
+ writel(inpadctl_100kpd, &padctl->pad_fec_rx_dv);
/* FEC_RDATA0 */
- writel (muxmode0, &muxctl->pad_fec_rdata0);
- writel (inpadctl_100kpd, &padctl->pad_fec_rdata0);
+ writel(muxmode0, &muxctl->pad_fec_rdata0);
+ writel(inpadctl_100kpd, &padctl->pad_fec_rdata0);
/* FEC_TDATA0 */
- writel (muxmode0, &muxctl->pad_fec_tdata0);
- writel (outpadctl, &padctl->pad_fec_tdata0);
+ writel(muxmode0, &muxctl->pad_fec_tdata0);
+ writel(outpadctl, &padctl->pad_fec_tdata0);
/* FEC_TX_EN */
- writel (muxmode0, &muxctl->pad_fec_tx_en);
- writel (outpadctl, &padctl->pad_fec_tx_en);
+ writel(muxmode0, &muxctl->pad_fec_tx_en);
+ writel(outpadctl, &padctl->pad_fec_tx_en);
/* FEC_MDC */
- writel (muxmode0, &muxctl->pad_fec_mdc);
- writel (outpadctl, &padctl->pad_fec_mdc);
+ writel(muxmode0, &muxctl->pad_fec_mdc);
+ writel(outpadctl, &padctl->pad_fec_mdc);
/* FEC_MDIO */
- writel (muxmode0, &muxctl->pad_fec_mdio);
- writel (inpadctl_22kpu, &padctl->pad_fec_mdio);
+ writel(muxmode0, &muxctl->pad_fec_mdio);
+ writel(inpadctl_22kpu, &padctl->pad_fec_mdio);
/* FEC_RDATA1 */
- writel (muxmode0, &muxctl->pad_fec_rdata1);
- writel (inpadctl_100kpd, &padctl->pad_fec_rdata1);
+ writel(muxmode0, &muxctl->pad_fec_rdata1);
+ writel(inpadctl_100kpd, &padctl->pad_fec_rdata1);
/* FEC_TDATA1 */
- writel (muxmode0, &muxctl->pad_fec_tdata1);
- writel (outpadctl, &padctl->pad_fec_tdata1);
+ writel(muxmode0, &muxctl->pad_fec_tdata1);
+ writel(outpadctl, &padctl->pad_fec_tdata1);
}
diff --git a/arch/arm/cpu/arm926ejs/mx25/reset.c b/arch/arm/cpu/arm926ejs/mx25/reset.c
index 1a43683..e6f1056 100644
--- a/arch/arm/cpu/arm926ejs/mx25/reset.c
+++ b/arch/arm/cpu/arm926ejs/mx25/reset.c
@@ -39,7 +39,7 @@
/*
* Reset the cpu by setting up the watchdog timer and let it time out
*/
-void reset_cpu (ulong ignored)
+void reset_cpu(ulong ignored)
{
struct wdog_regs *regs = (struct wdog_regs *)IMX_WDT_BASE;
/* Disable watchdog and set Time-Out field to 0 */
diff --git a/arch/arm/cpu/arm926ejs/mx25/timer.c b/arch/arm/cpu/arm926ejs/mx25/timer.c
index 5eb2747..1cfd02b 100644
--- a/arch/arm/cpu/arm926ejs/mx25/timer.c
+++ b/arch/arm/cpu/arm926ejs/mx25/timer.c
@@ -15,7 +15,7 @@
*
* (C) Copyright 2009 DENX Software Engineering
* Author: John Rigby <jrigby@gmail.com>
- * Add support for MX25
+ * Add support for MX25
*
* See file CREDITS for list of people who contributed to this
* project.
@@ -43,8 +43,8 @@
DECLARE_GLOBAL_DATA_PTR;
-#define timestamp gd->tbl
-#define lastinc gd->lastinc
+#define timestamp (gd->tbl)
+#define lastinc (gd->lastinc)
/*
* "time" is measured in 1 / CONFIG_SYS_HZ seconds,
@@ -121,7 +121,7 @@ int timer_init(void)
return 0;
}
-unsigned long long get_ticks (void)
+unsigned long long get_ticks(void)
{
struct gpt_regs *gpt = (struct gpt_regs *)IMX_GPT1_BASE;
ulong now = readl(&gpt->counter); /* current tick value */
@@ -140,7 +140,7 @@ unsigned long long get_ticks (void)
return timestamp;
}
-ulong get_timer_masked (void)
+ulong get_timer_masked(void)
{
/*
* get_ticks() returns a long long (64 bit), it wraps in
@@ -151,13 +151,13 @@ ulong get_timer_masked (void)
return tick_to_time(get_ticks());
}
-ulong get_timer (ulong base)
+ulong get_timer(ulong base)
{
- return get_timer_masked () - base;
+ return get_timer_masked() - base;
}
/* delay x useconds AND preserve advance timstamp value */
-void __udelay (unsigned long usec)
+void __udelay(unsigned long usec)
{
unsigned long long tmp;
ulong tmo;
diff --git a/arch/arm/cpu/arm926ejs/mx27/reset.c b/arch/arm/cpu/arm926ejs/mx27/reset.c
index 6c54eaf..cc0a33e 100644
--- a/arch/arm/cpu/arm926ejs/mx27/reset.c
+++ b/arch/arm/cpu/arm926ejs/mx27/reset.c
@@ -39,7 +39,7 @@
/*
* Reset the cpu by setting up the watchdog timer and let it time out
*/
-void reset_cpu (ulong ignored)
+void reset_cpu(ulong ignored)
{
struct wdog_regs *regs = (struct wdog_regs *)IMX_WDT_BASE;
/* Disable watchdog and set Time-Out field to 0 */
diff --git a/arch/arm/cpu/arm926ejs/mx27/timer.c b/arch/arm/cpu/arm926ejs/mx27/timer.c
index df76d16..5af9359 100644
--- a/arch/arm/cpu/arm926ejs/mx27/timer.c
+++ b/arch/arm/cpu/arm926ejs/mx27/timer.c
@@ -45,8 +45,8 @@
DECLARE_GLOBAL_DATA_PTR;
-#define timestamp gd->tbl
-#define lastinc gd->lastinc
+#define timestamp (gd->tbl)
+#define lastinc (gd->lastinc)
/*
* "time" is measured in 1 / CONFIG_SYS_HZ seconds,
@@ -124,7 +124,7 @@ int timer_init(void)
return 0;
}
-unsigned long long get_ticks (void)
+unsigned long long get_ticks(void)
{
struct gpt_regs *regs = (struct gpt_regs *)IMX_TIM1_BASE;
ulong now = readl(&regs->gpt_tcn); /* current tick value */
@@ -143,7 +143,7 @@ unsigned long long get_ticks (void)
return timestamp;
}
-ulong get_timer_masked (void)
+ulong get_timer_masked(void)
{
/*
* get_ticks() returns a long long (64 bit), it wraps in
@@ -154,13 +154,13 @@ ulong get_timer_masked (void)
return tick_to_time(get_ticks());
}
-ulong get_timer (ulong base)
+ulong get_timer(ulong base)
{
- return get_timer_masked () - base;
+ return get_timer_masked() - base;
}
/* delay x useconds AND preserve advance timstamp value */
-void __udelay (unsigned long usec)
+void __udelay(unsigned long usec)
{
unsigned long long tmp;
ulong tmo;
diff --git a/arch/arm/cpu/arm926ejs/orion5x/cpu.c b/arch/arm/cpu/arm926ejs/orion5x/cpu.c
index 05bd45c..792b11d 100644
--- a/arch/arm/cpu/arm926ejs/orion5x/cpu.c
+++ b/arch/arm/cpu/arm926ejs/orion5x/cpu.c
@@ -28,8 +28,9 @@
#include <common.h>
#include <netdev.h>
#include <asm/cache.h>
+#include <asm/io.h>
#include <u-boot/md5.h>
-#include <asm/arch/orion5x.h>
+#include <asm/arch/cpu.h>
#include <hush.h>
#define BUFLEN 16
diff --git a/arch/arm/cpu/arm926ejs/orion5x/dram.c b/arch/arm/cpu/arm926ejs/orion5x/dram.c
index 5cc31a9..c0f7ef1 100644
--- a/arch/arm/cpu/arm926ejs/orion5x/dram.c
+++ b/arch/arm/cpu/arm926ejs/orion5x/dram.c
@@ -27,7 +27,7 @@
#include <common.h>
#include <config.h>
-#include <asm/arch/orion5x.h>
+#include <asm/arch/cpu.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/arm/cpu/arm926ejs/orion5x/timer.c b/arch/arm/cpu/arm926ejs/orion5x/timer.c
index 17df68f..e39ecc2 100644
--- a/arch/arm/cpu/arm926ejs/orion5x/timer.c
+++ b/arch/arm/cpu/arm926ejs/orion5x/timer.c
@@ -25,7 +25,7 @@
*/
#include <common.h>
-#include <asm/arch/orion5x.h>
+#include <asm/io.h>
#define UBOOT_CNTR 0 /* counter to use for uboot timer */
diff --git a/arch/arm/cpu/arm926ejs/pantheon/cpu.c b/arch/arm/cpu/arm926ejs/pantheon/cpu.c
index 8b2eafa..db9b348 100644
--- a/arch/arm/cpu/arm926ejs/pantheon/cpu.c
+++ b/arch/arm/cpu/arm926ejs/pantheon/cpu.c
@@ -23,8 +23,8 @@
*/
#include <common.h>
+#include <asm/arch/cpu.h>
#include <asm/arch/pantheon.h>
-#include <asm/io.h>
#define UARTCLK14745KHZ (APBC_APBCLK | APBC_FNCLK | APBC_FNCLKSEL(1))
#define SET_MRVL_ID (1<<8)
@@ -42,6 +42,9 @@ int arch_cpu_init(void)
struct panthmpmu_registers *mpmu =
(struct panthmpmu_registers*) PANTHEON_MPMU_BASE;
+ struct panthapmu_registers *apmu =
+ (struct panthapmu_registers *) PANTHEON_APMU_BASE;
+
/* set SEL_MRVL_ID bit in PANTHEON_CPU_CONF register */
val = readl(&cpuregs->cpu_conf);
val = val | SET_MRVL_ID;
@@ -65,6 +68,14 @@ int arch_cpu_init(void)
writel(APBC_FNCLK | APBC_APBCLK, &apbclkres->twsi);
#endif
+#ifdef CONFIG_MV_SDHCI
+ /* Enable mmc clock */
+ writel(APMU_PERI_CLK | APMU_AXI_CLK | APMU_PERI_RST | APMU_AXI_RST,
+ &apmu->sd1);
+ writel(APMU_PERI_CLK | APMU_AXI_CLK | APMU_PERI_RST | APMU_AXI_RST,
+ &apmu->sd3);
+#endif
+
icache_enable();
return 0;
diff --git a/arch/arm/cpu/arm926ejs/pantheon/dram.c b/arch/arm/cpu/arm926ejs/pantheon/dram.c
index bbca7ee..a3d719e 100644
--- a/arch/arm/cpu/arm926ejs/pantheon/dram.c
+++ b/arch/arm/cpu/arm926ejs/pantheon/dram.c
@@ -23,6 +23,7 @@
*/
#include <common.h>
+#include <asm/io.h>
#include <asm/arch/pantheon.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/arm/cpu/arm926ejs/pantheon/timer.c b/arch/arm/cpu/arm926ejs/pantheon/timer.c
index c71162a..17045b1 100644
--- a/arch/arm/cpu/arm926ejs/pantheon/timer.c
+++ b/arch/arm/cpu/arm926ejs/pantheon/timer.c
@@ -23,6 +23,7 @@
*/
#include <common.h>
+#include <asm/arch/cpu.h>
#include <asm/arch/pantheon.h>
/*
diff --git a/arch/arm/cpu/armv7/am33xx/Makefile b/arch/arm/cpu/armv7/am33xx/Makefile
new file mode 100644
index 0000000..6beafbb
--- /dev/null
+++ b/arch/arm/cpu/armv7/am33xx/Makefile
@@ -0,0 +1,48 @@
+#
+# Copyright (C) 2011, Texas Instruments, Incorporated - http://www.ti.com/
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2 of
+# the License, or (at your option) any later version.
+#
+# This program is distributed "as is" WITHOUT ANY WARRANTY of any
+# kind, whether express or implied; without even the implied warranty
+# of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+
+include $(TOPDIR)/config.mk
+
+LIB = $(obj)lib$(SOC).o
+
+SOBJS := lowlevel_init.o
+
+COBJS += clock.o
+COBJS += sys_info.o
+COBJS += ddr.o
+COBJS += emif4.o
+COBJS += board.o
+
+SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
+OBJS := $(addprefix $(obj),$(COBJS) $(COBJS-y) $(SOBJS))
+
+all: $(obj).depend $(LIB)
+
+$(LIB): $(OBJS)
+ $(call cmd_link_o_target, $(OBJS))
+
+clean:
+ rm -f $(SOBJS) $(OBJS)
+
+distclean: clean
+ rm -f $(LIB) core *.bak .depend
+
+#########################################################################
+
+# defines $(obj).depend target
+include $(SRCTREE)/rules.mk
+
+sinclude $(obj).depend
+
+#########################################################################
diff --git a/arch/arm/cpu/armv7/am33xx/board.c b/arch/arm/cpu/armv7/am33xx/board.c
new file mode 100644
index 0000000..2d6d359
--- /dev/null
+++ b/arch/arm/cpu/armv7/am33xx/board.c
@@ -0,0 +1,66 @@
+/*
+ * board.c
+ *
+ * Common board functions for AM33XX based boards
+ *
+ * Copyright (C) 2011, Texas Instruments, Incorporated - http://www.ti.com/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR /PURPOSE. See the
+ * GNU General Public License for more details.
+ */
+
+#include <common.h>
+#include <asm/arch/cpu.h>
+#include <asm/arch/hardware.h>
+#include <asm/arch/ddr_defs.h>
+#include <asm/arch/clock.h>
+#include <asm/io.h>
+
+DECLARE_GLOBAL_DATA_PTR;
+
+struct wd_timer *wdtimer = (struct wd_timer *)WDT_BASE;
+struct timer_reg *timerreg = (struct timer_reg *)DM_TIMER2_BASE;
+
+/*
+ * early system init of muxing and clocks.
+ */
+void s_init(u32 in_ddr)
+{
+ /* WDT1 is already running when the bootloader gets control
+ * Disable it to avoid "random" resets
+ */
+ writel(0xAAAA, &wdtimer->wdtwspr);
+ while (readl(&wdtimer->wdtwwps) != 0x0)
+ ;
+ writel(0x5555, &wdtimer->wdtwspr);
+ while (readl(&wdtimer->wdtwwps) != 0x0)
+ ;
+
+ /* Setup the PLLs and the clocks for the peripherals */
+#ifdef CONFIG_SETUP_PLL
+ pll_init();
+#endif
+ if (!in_ddr)
+ config_ddr();
+}
+
+/* Initialize timer */
+void init_timer(void)
+{
+ /* Reset the Timer */
+ writel(0x2, (&timerreg->tsicrreg));
+
+ /* Wait until the reset is done */
+ while (readl(&timerreg->tiocpcfgreg) & 1)
+ ;
+
+ /* Start the Timer */
+ writel(0x1, (&timerreg->tclrreg));
+}
diff --git a/arch/arm/cpu/armv7/am33xx/clock.c b/arch/arm/cpu/armv7/am33xx/clock.c
new file mode 100644
index 0000000..4ca6c45
--- /dev/null
+++ b/arch/arm/cpu/armv7/am33xx/clock.c
@@ -0,0 +1,273 @@
+/*
+ * clock.c
+ *
+ * clocks for AM33XX based boards
+ *
+ * Copyright (C) 2011, Texas Instruments, Incorporated - http://www.ti.com/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR /PURPOSE. See the
+ * GNU General Public License for more details.
+ */
+
+#include <common.h>
+#include <asm/arch/cpu.h>
+#include <asm/arch/clock.h>
+#include <asm/arch/hardware.h>
+#include <asm/io.h>
+
+#define PRCM_MOD_EN 0x2
+#define PRCM_FORCE_WAKEUP 0x2
+
+#define PRCM_EMIF_CLK_ACTIVITY BIT(2)
+#define PRCM_L3_GCLK_ACTIVITY BIT(4)
+
+#define PLL_BYPASS_MODE 0x4
+#define ST_MN_BYPASS 0x00000100
+#define ST_DPLL_CLK 0x00000001
+#define CLK_SEL_MASK 0x7ffff
+#define CLK_DIV_MASK 0x1f
+#define CLK_DIV2_MASK 0x7f
+#define CLK_SEL_SHIFT 0x8
+#define CLK_MODE_SEL 0x7
+#define CLK_MODE_MASK 0xfffffff8
+#define CLK_DIV_SEL 0xFFFFFFE0
+
+
+const struct cm_perpll *cmper = (struct cm_perpll *)CM_PER;
+const struct cm_wkuppll *cmwkup = (struct cm_wkuppll *)CM_WKUP;
+const struct cm_dpll *cmdpll = (struct cm_dpll *)CM_DPLL;
+
+static void enable_interface_clocks(void)
+{
+ /* Enable all the Interconnect Modules */
+ writel(PRCM_MOD_EN, &cmper->l3clkctrl);
+ while (readl(&cmper->l3clkctrl) != PRCM_MOD_EN)
+ ;
+
+ writel(PRCM_MOD_EN, &cmper->l4lsclkctrl);
+ while (readl(&cmper->l4lsclkctrl) != PRCM_MOD_EN)
+ ;
+
+ writel(PRCM_MOD_EN, &cmper->l4fwclkctrl);
+ while (readl(&cmper->l4fwclkctrl) != PRCM_MOD_EN)
+ ;
+
+ writel(PRCM_MOD_EN, &cmwkup->wkl4wkclkctrl);
+ while (readl(&cmwkup->wkl4wkclkctrl) != PRCM_MOD_EN)
+ ;
+
+ writel(PRCM_MOD_EN, &cmper->l3instrclkctrl);
+ while (readl(&cmper->l3instrclkctrl) != PRCM_MOD_EN)
+ ;
+
+ writel(PRCM_MOD_EN, &cmper->l4hsclkctrl);
+ while (readl(&cmper->l4hsclkctrl) != PRCM_MOD_EN)
+ ;
+}
+
+/*
+ * Force power domain wake up transition
+ * Ensure that the corresponding interface clock is active before
+ * using the peripheral
+ */
+static void power_domain_wkup_transition(void)
+{
+ writel(PRCM_FORCE_WAKEUP, &cmper->l3clkstctrl);
+ writel(PRCM_FORCE_WAKEUP, &cmper->l4lsclkstctrl);
+ writel(PRCM_FORCE_WAKEUP, &cmwkup->wkclkstctrl);
+ writel(PRCM_FORCE_WAKEUP, &cmper->l4fwclkstctrl);
+ writel(PRCM_FORCE_WAKEUP, &cmper->l3sclkstctrl);
+}
+
+/*
+ * Enable the peripheral clock for required peripherals
+ */
+static void enable_per_clocks(void)
+{
+ /* Enable the control module though RBL would have done it*/
+ writel(PRCM_MOD_EN, &cmwkup->wkctrlclkctrl);
+ while (readl(&cmwkup->wkctrlclkctrl) != PRCM_MOD_EN)
+ ;
+
+ /* Enable the module clock */
+ writel(PRCM_MOD_EN, &cmper->timer2clkctrl);
+ while (readl(&cmper->timer2clkctrl) != PRCM_MOD_EN)
+ ;
+
+ /* UART0 */
+ writel(PRCM_MOD_EN, &cmwkup->wkup_uart0ctrl);
+ while (readl(&cmwkup->wkup_uart0ctrl) != PRCM_MOD_EN)
+ ;
+}
+
+static void mpu_pll_config(void)
+{
+ u32 clkmode, clksel, div_m2;
+
+ clkmode = readl(&cmwkup->clkmoddpllmpu);
+ clksel = readl(&cmwkup->clkseldpllmpu);
+ div_m2 = readl(&cmwkup->divm2dpllmpu);
+
+ /* Set the PLL to bypass Mode */
+ writel(PLL_BYPASS_MODE, &cmwkup->clkmoddpllmpu);
+ while (readl(&cmwkup->idlestdpllmpu) != ST_MN_BYPASS)
+ ;
+
+ clksel = clksel & (~CLK_SEL_MASK);
+ clksel = clksel | ((MPUPLL_M << CLK_SEL_SHIFT) | MPUPLL_N);
+ writel(clksel, &cmwkup->clkseldpllmpu);
+
+ div_m2 = div_m2 & ~CLK_DIV_MASK;
+ div_m2 = div_m2 | MPUPLL_M2;
+ writel(div_m2, &cmwkup->divm2dpllmpu);
+
+ clkmode = clkmode | CLK_MODE_SEL;
+ writel(clkmode, &cmwkup->clkmoddpllmpu);
+
+ while (readl(&cmwkup->idlestdpllmpu) != ST_DPLL_CLK)
+ ;
+}
+
+static void core_pll_config(void)
+{
+ u32 clkmode, clksel, div_m4, div_m5, div_m6;
+
+ clkmode = readl(&cmwkup->clkmoddpllcore);
+ clksel = readl(&cmwkup->clkseldpllcore);
+ div_m4 = readl(&cmwkup->divm4dpllcore);
+ div_m5 = readl(&cmwkup->divm5dpllcore);
+ div_m6 = readl(&cmwkup->divm6dpllcore);
+
+ /* Set the PLL to bypass Mode */
+ writel(PLL_BYPASS_MODE, &cmwkup->clkmoddpllcore);
+
+ while (readl(&cmwkup->idlestdpllcore) != ST_MN_BYPASS)
+ ;
+
+ clksel = clksel & (~CLK_SEL_MASK);
+ clksel = clksel | ((COREPLL_M << CLK_SEL_SHIFT) | COREPLL_N);
+ writel(clksel, &cmwkup->clkseldpllcore);
+
+ div_m4 = div_m4 & ~CLK_DIV_MASK;
+ div_m4 = div_m4 | COREPLL_M4;
+ writel(div_m4, &cmwkup->divm4dpllcore);
+
+ div_m5 = div_m5 & ~CLK_DIV_MASK;
+ div_m5 = div_m5 | COREPLL_M5;
+ writel(div_m5, &cmwkup->divm5dpllcore);
+
+ div_m6 = div_m6 & ~CLK_DIV_MASK;
+ div_m6 = div_m6 | COREPLL_M6;
+ writel(div_m6, &cmwkup->divm6dpllcore);
+
+ clkmode = clkmode | CLK_MODE_SEL;
+ writel(clkmode, &cmwkup->clkmoddpllcore);
+
+ while (readl(&cmwkup->idlestdpllcore) != ST_DPLL_CLK)
+ ;
+}
+
+static void per_pll_config(void)
+{
+ u32 clkmode, clksel, div_m2;
+
+ clkmode = readl(&cmwkup->clkmoddpllper);
+ clksel = readl(&cmwkup->clkseldpllper);
+ div_m2 = readl(&cmwkup->divm2dpllper);
+
+ /* Set the PLL to bypass Mode */
+ writel(PLL_BYPASS_MODE, &cmwkup->clkmoddpllper);
+
+ while (readl(&cmwkup->idlestdpllper) != ST_MN_BYPASS)
+ ;
+
+ clksel = clksel & (~CLK_SEL_MASK);
+ clksel = clksel | ((PERPLL_M << CLK_SEL_SHIFT) | PERPLL_N);
+ writel(clksel, &cmwkup->clkseldpllper);
+
+ div_m2 = div_m2 & ~CLK_DIV2_MASK;
+ div_m2 = div_m2 | PERPLL_M2;
+ writel(div_m2, &cmwkup->divm2dpllper);
+
+ clkmode = clkmode | CLK_MODE_SEL;
+ writel(clkmode, &cmwkup->clkmoddpllper);
+
+ while (readl(&cmwkup->idlestdpllper) != ST_DPLL_CLK)
+ ;
+}
+
+static void ddr_pll_config(void)
+{
+ u32 clkmode, clksel, div_m2;
+
+ clkmode = readl(&cmwkup->clkmoddpllddr);
+ clksel = readl(&cmwkup->clkseldpllddr);
+ div_m2 = readl(&cmwkup->divm2dpllddr);
+
+ /* Set the PLL to bypass Mode */
+ clkmode = (clkmode & CLK_MODE_MASK) | PLL_BYPASS_MODE;
+ writel(clkmode, &cmwkup->clkmoddpllddr);
+
+ /* Wait till bypass mode is enabled */
+ while ((readl(&cmwkup->idlestdpllddr) & ST_MN_BYPASS)
+ != ST_MN_BYPASS)
+ ;
+
+ clksel = clksel & (~CLK_SEL_MASK);
+ clksel = clksel | ((DDRPLL_M << CLK_SEL_SHIFT) | DDRPLL_N);
+ writel(clksel, &cmwkup->clkseldpllddr);
+
+ div_m2 = div_m2 & CLK_DIV_SEL;
+ div_m2 = div_m2 | DDRPLL_M2;
+ writel(div_m2, &cmwkup->divm2dpllddr);
+
+ clkmode = (clkmode & CLK_MODE_MASK) | CLK_MODE_SEL;
+ writel(clkmode, &cmwkup->clkmoddpllddr);
+
+ /* Wait till dpll is locked */
+ while ((readl(&cmwkup->idlestdpllddr) & ST_DPLL_CLK) != ST_DPLL_CLK)
+ ;
+}
+
+void enable_emif_clocks(void)
+{
+ /* Enable the EMIF_FW Functional clock */
+ writel(PRCM_MOD_EN, &cmper->emiffwclkctrl);
+ /* Enable EMIF0 Clock */
+ writel(PRCM_MOD_EN, &cmper->emifclkctrl);
+ /* Poll for emif_gclk & L3_G clock are active */
+ while ((readl(&cmper->l3clkstctrl) & (PRCM_EMIF_CLK_ACTIVITY |
+ PRCM_L3_GCLK_ACTIVITY)) != (PRCM_EMIF_CLK_ACTIVITY |
+ PRCM_L3_GCLK_ACTIVITY))
+ ;
+ /* Poll if module is functional */
+ while ((readl(&cmper->emifclkctrl)) != PRCM_MOD_EN)
+ ;
+}
+
+/*
+ * Configure the PLL/PRCM for necessary peripherals
+ */
+void pll_init()
+{
+ mpu_pll_config();
+ core_pll_config();
+ per_pll_config();
+ ddr_pll_config();
+
+ /* Enable the required interconnect clocks */
+ enable_interface_clocks();
+
+ /* Power domain wake up transition */
+ power_domain_wkup_transition();
+
+ /* Enable the required peripherals */
+ enable_per_clocks();
+}
diff --git a/arch/arm/cpu/armv7/am33xx/ddr.c b/arch/arm/cpu/armv7/am33xx/ddr.c
new file mode 100644
index 0000000..ed982c1
--- /dev/null
+++ b/arch/arm/cpu/armv7/am33xx/ddr.c
@@ -0,0 +1,147 @@
+/*
+ * DDR Configuration for AM33xx devices.
+ *
+ * Copyright (C) 2011 Texas Instruments Incorporated -
+http://www.ti.com/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed .as is. WITHOUT ANY WARRANTY of any
+ * kind, whether express or implied; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ */
+
+#include <asm/arch/cpu.h>
+#include <asm/arch/ddr_defs.h>
+#include <asm/io.h>
+
+/**
+ * Base address for EMIF instances
+ */
+static struct emif_regs *emif_reg = {
+ (struct emif_regs *)EMIF4_0_CFG_BASE};
+
+/**
+ * Base address for DDR instance
+ */
+static struct ddr_regs *ddr_reg[2] = {
+ (struct ddr_regs *)DDR_PHY_BASE_ADDR,
+ (struct ddr_regs *)DDR_PHY_BASE_ADDR2};
+
+/**
+ * Base address for ddr io control instances
+ */
+static struct ddr_cmdtctrl *ioctrl_reg = {
+ (struct ddr_cmdtctrl *)DDR_CONTROL_BASE_ADDR};
+
+/**
+ * As a convention, all functions here return 0 on success
+ * -1 on failure.
+ */
+
+/**
+ * Configure SDRAM
+ */
+int config_sdram(struct sdram_config *cfg)
+{
+ writel(cfg->sdrcr, &emif_reg->sdrcr);
+ writel(cfg->sdrcr2, &emif_reg->sdrcr2);
+ writel(cfg->refresh, &emif_reg->sdrrcr);
+ writel(cfg->refresh_sh, &emif_reg->sdrrcsr);
+
+ return 0;
+}
+
+/**
+ * Set SDRAM timings
+ */
+int set_sdram_timings(struct sdram_timing *t)
+{
+ writel(t->time1, &emif_reg->sdrtim1);
+ writel(t->time1_sh, &emif_reg->sdrtim1sr);
+ writel(t->time2, &emif_reg->sdrtim2);
+ writel(t->time2_sh, &emif_reg->sdrtim2sr);
+ writel(t->time3, &emif_reg->sdrtim3);
+ writel(t->time3_sh, &emif_reg->sdrtim3sr);
+
+ return 0;
+}
+
+/**
+ * Configure DDR PHY
+ */
+int config_ddr_phy(struct ddr_phy_control *p)
+{
+ writel(p->reg, &emif_reg->ddrphycr);
+ writel(p->reg_sh, &emif_reg->ddrphycsr);
+
+ return 0;
+}
+
+/**
+ * Configure DDR CMD control registers
+ */
+int config_cmd_ctrl(struct cmd_control *cmd)
+{
+ writel(cmd->cmd0csratio, &ddr_reg[0]->cm0csratio);
+ writel(cmd->cmd0csforce, &ddr_reg[0]->cm0csforce);
+ writel(cmd->cmd0csdelay, &ddr_reg[0]->cm0csdelay);
+ writel(cmd->cmd0dldiff, &ddr_reg[0]->cm0dldiff);
+ writel(cmd->cmd0iclkout, &ddr_reg[0]->cm0iclkout);
+
+ writel(cmd->cmd1csratio, &ddr_reg[0]->cm1csratio);
+ writel(cmd->cmd1csforce, &ddr_reg[0]->cm1csforce);
+ writel(cmd->cmd1csdelay, &ddr_reg[0]->cm1csdelay);
+ writel(cmd->cmd1dldiff, &ddr_reg[0]->cm1dldiff);
+ writel(cmd->cmd1iclkout, &ddr_reg[0]->cm1iclkout);
+
+ writel(cmd->cmd2csratio, &ddr_reg[0]->cm2csratio);
+ writel(cmd->cmd2csforce, &ddr_reg[0]->cm2csforce);
+ writel(cmd->cmd2csdelay, &ddr_reg[0]->cm2csdelay);
+ writel(cmd->cmd2dldiff, &ddr_reg[0]->cm2dldiff);
+ writel(cmd->cmd2iclkout, &ddr_reg[0]->cm2iclkout);
+
+ return 0;
+}
+
+/**
+ * Configure DDR DATA registers
+ */
+int config_ddr_data(int macrono, struct ddr_data *data)
+{
+ writel(data->datardsratio0, &ddr_reg[macrono]->dt0rdsratio0);
+ writel(data->datardsratio1, &ddr_reg[macrono]->dt0rdsratio1);
+
+ writel(data->datawdsratio0, &ddr_reg[macrono]->dt0wdsratio0);
+ writel(data->datawdsratio1, &ddr_reg[macrono]->dt0wdsratio1);
+
+ writel(data->datawiratio0, &ddr_reg[macrono]->dt0wiratio0);
+ writel(data->datawiratio1, &ddr_reg[macrono]->dt0wiratio1);
+ writel(data->datagiratio0, &ddr_reg[macrono]->dt0giratio0);
+ writel(data->datagiratio1, &ddr_reg[macrono]->dt0giratio1);
+
+ writel(data->datafwsratio0, &ddr_reg[macrono]->dt0fwsratio0);
+ writel(data->datafwsratio1, &ddr_reg[macrono]->dt0fwsratio1);
+
+ writel(data->datawrsratio0, &ddr_reg[macrono]->dt0wrsratio0);
+ writel(data->datawrsratio1, &ddr_reg[macrono]->dt0wrsratio1);
+
+ writel(data->datadldiff0, &ddr_reg[macrono]->dt0dldiff0);
+
+ return 0;
+}
+
+int config_io_ctrl(struct ddr_ioctrl *ioctrl)
+{
+ writel(ioctrl->cmd1ctl, &ioctrl_reg->cm0ioctl);
+ writel(ioctrl->cmd2ctl, &ioctrl_reg->cm1ioctl);
+ writel(ioctrl->cmd3ctl, &ioctrl_reg->cm2ioctl);
+ writel(ioctrl->data1ctl, &ioctrl_reg->dt0ioctl);
+ writel(ioctrl->data2ctl, &ioctrl_reg->dt1ioctl);
+
+ return 0;
+}
diff --git a/arch/arm/cpu/armv7/am33xx/emif4.c b/arch/arm/cpu/armv7/am33xx/emif4.c
new file mode 100644
index 0000000..1318365
--- /dev/null
+++ b/arch/arm/cpu/armv7/am33xx/emif4.c
@@ -0,0 +1,201 @@
+/*
+ * emif4.c
+ *
+ * AM33XX emif4 configuration file
+ *
+ * Copyright (C) 2011, Texas Instruments, Incorporated - http://www.ti.com/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR /PURPOSE. See the
+ * GNU General Public License for more details.
+ */
+
+#include <common.h>
+#include <asm/arch/cpu.h>
+#include <asm/arch/ddr_defs.h>
+#include <asm/arch/hardware.h>
+#include <asm/arch/clock.h>
+#include <asm/io.h>
+
+DECLARE_GLOBAL_DATA_PTR;
+
+struct ddr_regs *ddrregs = (struct ddr_regs *)DDR_PHY_BASE_ADDR;
+struct vtp_reg *vtpreg = (struct vtp_reg *)VTP0_CTRL_ADDR;
+struct ddr_ctrl *ddrctrl = (struct ddr_ctrl *)DDR_CTRL_ADDR;
+
+
+int dram_init(void)
+{
+ /* dram_init must store complete ramsize in gd->ram_size */
+ gd->ram_size = get_ram_size(
+ (void *)CONFIG_SYS_SDRAM_BASE,
+ CONFIG_MAX_RAM_BANK_SIZE);
+ return 0;
+}
+
+void dram_init_banksize(void)
+{
+ gd->bd->bi_dram[0].start = CONFIG_SYS_SDRAM_BASE;
+ gd->bd->bi_dram[0].size = gd->ram_size;
+}
+
+
+#ifdef CONFIG_AM335X_CONFIG_DDR
+static void data_macro_config(int dataMacroNum)
+{
+ struct ddr_data data;
+
+ data.datardsratio0 = ((DDR2_RD_DQS<<30)|(DDR2_RD_DQS<<20)
+ |(DDR2_RD_DQS<<10)|(DDR2_RD_DQS<<0));
+ data.datardsratio1 = DDR2_RD_DQS>>2;
+ data.datawdsratio0 = ((DDR2_WR_DQS<<30)|(DDR2_WR_DQS<<20)
+ |(DDR2_WR_DQS<<10)|(DDR2_WR_DQS<<0));
+ data.datawdsratio1 = DDR2_WR_DQS>>2;
+ data.datawiratio0 = ((DDR2_PHY_WRLVL<<30)|(DDR2_PHY_WRLVL<<20)
+ |(DDR2_PHY_WRLVL<<10)|(DDR2_PHY_WRLVL<<0));
+ data.datawiratio1 = DDR2_PHY_WRLVL>>2;
+ data.datagiratio0 = ((DDR2_PHY_GATELVL<<30)|(DDR2_PHY_GATELVL<<20)
+ |(DDR2_PHY_GATELVL<<10)|(DDR2_PHY_GATELVL<<0));
+ data.datagiratio1 = DDR2_PHY_GATELVL>>2;
+ data.datafwsratio0 = ((DDR2_PHY_FIFO_WE<<30)|(DDR2_PHY_FIFO_WE<<20)
+ |(DDR2_PHY_FIFO_WE<<10)|(DDR2_PHY_FIFO_WE<<0));
+ data.datafwsratio1 = DDR2_PHY_FIFO_WE>>2;
+ data.datawrsratio0 = ((DDR2_PHY_WR_DATA<<30)|(DDR2_PHY_WR_DATA<<20)
+ |(DDR2_PHY_WR_DATA<<10)|(DDR2_PHY_WR_DATA<<0));
+ data.datawrsratio1 = DDR2_PHY_WR_DATA>>2;
+ data.datadldiff0 = PHY_DLL_LOCK_DIFF;
+
+ config_ddr_data(dataMacroNum, &data);
+}
+
+static void cmd_macro_config(void)
+{
+ struct cmd_control cmd;
+
+ cmd.cmd0csratio = DDR2_RATIO;
+ cmd.cmd0csforce = CMD_FORCE;
+ cmd.cmd0csdelay = CMD_DELAY;
+ cmd.cmd0dldiff = DDR2_DLL_LOCK_DIFF;
+ cmd.cmd0iclkout = DDR2_INVERT_CLKOUT;
+
+ cmd.cmd1csratio = DDR2_RATIO;
+ cmd.cmd1csforce = CMD_FORCE;
+ cmd.cmd1csdelay = CMD_DELAY;
+ cmd.cmd1dldiff = DDR2_DLL_LOCK_DIFF;
+ cmd.cmd1iclkout = DDR2_INVERT_CLKOUT;
+
+ cmd.cmd2csratio = DDR2_RATIO;
+ cmd.cmd2csforce = CMD_FORCE;
+ cmd.cmd2csdelay = CMD_DELAY;
+ cmd.cmd2dldiff = DDR2_DLL_LOCK_DIFF;
+ cmd.cmd2iclkout = DDR2_INVERT_CLKOUT;
+
+ config_cmd_ctrl(&cmd);
+
+}
+
+static void config_vtp(void)
+{
+ writel(readl(&vtpreg->vtp0ctrlreg) | VTP_CTRL_ENABLE,
+ &vtpreg->vtp0ctrlreg);
+ writel(readl(&vtpreg->vtp0ctrlreg) & (~VTP_CTRL_START_EN),
+ &vtpreg->vtp0ctrlreg);
+ writel(readl(&vtpreg->vtp0ctrlreg) | VTP_CTRL_START_EN,
+ &vtpreg->vtp0ctrlreg);
+
+ /* Poll for READY */
+ while ((readl(&vtpreg->vtp0ctrlreg) & VTP_CTRL_READY) !=
+ VTP_CTRL_READY)
+ ;
+}
+
+static void config_emif_ddr2(void)
+{
+ int i;
+ int ret;
+ struct sdram_config cfg;
+ struct sdram_timing tmg;
+ struct ddr_phy_control phyc;
+
+ /*Program EMIF0 CFG Registers*/
+ phyc.reg = EMIF_READ_LATENCY;
+ phyc.reg_sh = EMIF_READ_LATENCY;
+ phyc.reg2 = EMIF_READ_LATENCY;
+
+ tmg.time1 = EMIF_TIM1;
+ tmg.time1_sh = EMIF_TIM1;
+ tmg.time2 = EMIF_TIM2;
+ tmg.time2_sh = EMIF_TIM2;
+ tmg.time3 = EMIF_TIM3;
+ tmg.time3_sh = EMIF_TIM3;
+
+ cfg.sdrcr = EMIF_SDCFG;
+ cfg.sdrcr2 = EMIF_SDCFG;
+ cfg.refresh = 0x00004650;
+ cfg.refresh_sh = 0x00004650;
+
+ /* Program EMIF instance */
+ ret = config_ddr_phy(&phyc);
+ if (ret < 0)
+ printf("Couldn't configure phyc\n");
+
+ ret = config_sdram(&cfg);
+ if (ret < 0)
+ printf("Couldn't configure SDRAM\n");
+
+ ret = set_sdram_timings(&tmg);
+ if (ret < 0)
+ printf("Couldn't configure timings\n");
+
+ /* Delay */
+ for (i = 0; i < 5000; i++)
+ ;
+
+ cfg.refresh = EMIF_SDREF;
+ cfg.refresh_sh = EMIF_SDREF;
+ cfg.sdrcr = EMIF_SDCFG;
+ cfg.sdrcr2 = EMIF_SDCFG;
+
+ ret = config_sdram(&cfg);
+ if (ret < 0)
+ printf("Couldn't configure SDRAM\n");
+}
+
+void config_ddr(void)
+{
+ int data_macro_0 = 0;
+ int data_macro_1 = 1;
+ struct ddr_ioctrl ioctrl;
+
+ enable_emif_clocks();
+
+ config_vtp();
+
+ cmd_macro_config();
+
+ data_macro_config(data_macro_0);
+ data_macro_config(data_macro_1);
+
+ writel(PHY_RANK0_DELAY, &ddrregs->dt0rdelays0);
+ writel(PHY_RANK0_DELAY, &ddrregs->dt1rdelays0);
+
+ ioctrl.cmd1ctl = DDR_IOCTRL_VALUE;
+ ioctrl.cmd2ctl = DDR_IOCTRL_VALUE;
+ ioctrl.cmd3ctl = DDR_IOCTRL_VALUE;
+ ioctrl.data1ctl = DDR_IOCTRL_VALUE;
+ ioctrl.data2ctl = DDR_IOCTRL_VALUE;
+
+ config_io_ctrl(&ioctrl);
+
+ writel(readl(&ddrctrl->ddrioctrl) & 0xefffffff, &ddrctrl->ddrioctrl);
+ writel(readl(&ddrctrl->ddrckectrl) | 0x00000001, &ddrctrl->ddrckectrl);
+
+ config_emif_ddr2();
+}
+#endif
diff --git a/arch/arm/cpu/armv7/am33xx/lowlevel_init.S b/arch/arm/cpu/armv7/am33xx/lowlevel_init.S
new file mode 100644
index 0000000..17c962f
--- /dev/null
+++ b/arch/arm/cpu/armv7/am33xx/lowlevel_init.S
@@ -0,0 +1,72 @@
+/*
+ * lowlevel_init.S
+ *
+ * AM33XX low level initialization.
+ *
+ * Copyright (C) 2011, Texas Instruments, Incorporated - http://www.ti.com/
+ *
+ * Initial Code by:
+ * Mansoor Ahamed <mansoor.ahamed@ti.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed "as is" WITHOUT ANY WARRANTY of any
+ * kind, whether express or implied; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ */
+
+#include <config.h>
+#include <asm/arch/hardware.h>
+
+_mark1:
+ .word mark1
+_lowlevel_init1:
+ .word lowlevel_init
+_s_init_start:
+ .word s_init_start
+
+_TEXT_BASE:
+ .word CONFIG_SYS_TEXT_BASE /* sdram load addr from config.mk */
+
+/*****************************************************************************
+ * lowlevel_init: - Platform low level init.
+ ****************************************************************************/
+.globl lowlevel_init
+lowlevel_init:
+
+ /* The link register is saved in ip by start.S */
+ mov r6, ip
+ /* check if we are already running from RAM */
+ ldr r2, _lowlevel_init1
+ ldr r3, _TEXT_BASE
+ sub r4, r2, r3
+ sub r0, pc, r4
+ ldr sp, SRAM_STACK
+mark1:
+ ldr r5, _mark1
+ sub r5, r5, r2 /* bytes between mark1 and lowlevel_init */
+ sub r0, r0, r5 /* r0 <- _start w.r.t current place of execution */
+ mov r10, #0x0 /* r10 has in_ddr used by s_init() */
+
+ ands r0, r0, #0xC0000000
+ /* MSB 2 bits <> 0 then we are in ocmc or DDR */
+ cmp r0, #0x80000000
+ bne s_init_start
+ mov r10, #0x01
+ b s_init_start
+
+s_init_start:
+ mov r0, r10 /* passing in_ddr in r0 */
+ bl s_init
+ /* back to arch calling code */
+ mov pc, r6
+ /* the literal pools origin */
+ .ltorg
+
+SRAM_STACK:
+ /* Place stack at the top */
+ .word LOW_LEVEL_SRAM_STACK
diff --git a/arch/arm/cpu/armv7/am33xx/sys_info.c b/arch/arm/cpu/armv7/am33xx/sys_info.c
new file mode 100644
index 0000000..507b618
--- /dev/null
+++ b/arch/arm/cpu/armv7/am33xx/sys_info.c
@@ -0,0 +1,130 @@
+/*
+ * sys_info.c
+ *
+ * System information functions
+ *
+ * Copyright (C) 2011, Texas Instruments, Incorporated - http://www.ti.com/
+ *
+ * Derived from Beagle Board and 3430 SDP code by
+ * Richard Woodruff <r-woodruff2@ti.com>
+ * Syed Mohammed Khasim <khasim@ti.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR /PURPOSE. See the
+ * GNU General Public License for more details.
+ */
+
+#include <common.h>
+#include <asm/io.h>
+#include <asm/arch/sys_proto.h>
+#include <asm/arch/cpu.h>
+#include <asm/arch/clock.h>
+
+struct ctrl_stat *cstat = (struct ctrl_stat *)CTRL_BASE;
+
+/**
+ * get_cpu_rev(void) - extract rev info
+ */
+u32 get_cpu_rev(void)
+{
+ u32 id;
+ u32 rev;
+
+ id = readl(DEVICE_ID);
+ rev = (id >> 28) & 0xff;
+
+ return rev;
+}
+
+/**
+ * get_cpu_type(void) - extract cpu info
+ */
+u32 get_cpu_type(void)
+{
+ u32 id = 0;
+ u32 partnum;
+
+ id = readl(DEVICE_ID);
+ partnum = (id >> 12) & 0xffff;
+
+ return partnum;
+}
+
+/**
+ * get_board_rev() - setup to pass kernel board revision information
+ * returns:(bit[0-3] sub version, higher bit[7-4] is higher version)
+ */
+u32 get_board_rev(void)
+{
+ return BOARD_REV_ID;
+}
+
+/**
+ * get_device_type(): tell if GP/HS/EMU/TST
+ */
+u32 get_device_type(void)
+{
+ int mode;
+ mode = readl(&cstat->statusreg) & (DEVICE_MASK);
+ return mode >>= 8;
+}
+
+/**
+ * get_sysboot_value(void) - return SYS_BOOT[4:0]
+ */
+u32 get_sysboot_value(void)
+{
+ int mode;
+ mode = readl(&cstat->statusreg) & (SYSBOOT_MASK);
+ return mode;
+}
+
+#ifdef CONFIG_DISPLAY_CPUINFO
+/**
+ * Print CPU information
+ */
+int print_cpuinfo(void)
+{
+ char *cpu_s, *sec_s;
+ int arm_freq, ddr_freq;
+
+ switch (get_cpu_type()) {
+ case AM335X:
+ cpu_s = "AM335X";
+ break;
+ default:
+ cpu_s = "Unknown cpu type";
+ break;
+ }
+
+ switch (get_device_type()) {
+ case TST_DEVICE:
+ sec_s = "TST";
+ break;
+ case EMU_DEVICE:
+ sec_s = "EMU";
+ break;
+ case HS_DEVICE:
+ sec_s = "HS";
+ break;
+ case GP_DEVICE:
+ sec_s = "GP";
+ break;
+ default:
+ sec_s = "?";
+ }
+
+ printf("AM%s-%s rev %d\n",
+ cpu_s, sec_s, get_cpu_rev());
+
+ /* TODO: Print ARM and DDR frequencies */
+
+ return 0;
+}
+#endif /* CONFIG_DISPLAY_CPUINFO */
diff --git a/arch/arm/cpu/arm926ejs/davinci/config.mk b/arch/arm/cpu/armv7/highbank/Makefile
index 565adda..76faeb0 100644
--- a/arch/arm/cpu/arm926ejs/davinci/config.mk
+++ b/arch/arm/cpu/armv7/highbank/Makefile
@@ -1,6 +1,6 @@
#
-# (C) Copyright 2002
-# Gary Jennejohn, DENX Software Engineering, <gj@denx.de>
+# (C) Copyright 2000-2006
+# Wolfgang Denk, DENX Software Engineering, wd@denx.de.
#
# See file CREDITS for list of people who contributed to this
# project.
@@ -21,12 +21,26 @@
# MA 02111-1307 USA
#
-PLATFORM_RELFLAGS += -fno-common -ffixed-r8 -msoft-float
+include $(TOPDIR)/config.mk
-PLATFORM_CPPFLAGS += -march=armv5te
-# =========================================================================
-#
-# Supply options according to compiler version
-#
-# =========================================================================
-PLATFORM_RELFLAGS +=$(call cc-option,-mshort-load-bytes,$(call cc-option,-malignment-traps,))
+LIB = $(obj)lib$(SOC).o
+
+COBJS := timer.o
+SOBJS :=
+
+SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
+OBJS := $(addprefix $(obj),$(COBJS) $(SOBJS))
+
+all: $(obj).depend $(LIB)
+
+$(LIB): $(OBJS)
+ $(call cmd_link_o_target, $(OBJS))
+
+#########################################################################
+
+# defines $(obj).depend target
+include $(SRCTREE)/rules.mk
+
+sinclude $(obj).depend
+
+#########################################################################
diff --git a/arch/arm/cpu/armv7/highbank/timer.c b/arch/arm/cpu/armv7/highbank/timer.c
new file mode 100644
index 0000000..d8a0288
--- /dev/null
+++ b/arch/arm/cpu/armv7/highbank/timer.c
@@ -0,0 +1,123 @@
+/*
+ * Copyright 2010-2011 Calxeda, Inc.
+ *
+ * Based on arm926ejs/mx27/timer.c
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <common.h>
+#include <div64.h>
+#include <linux/types.h> /* for size_t */
+#include <linux/stddef.h> /* for NULL */
+#include <asm/io.h>
+#include <asm/arch-armv7/systimer.h>
+
+#undef SYSTIMER_BASE
+#define SYSTIMER_BASE 0xFFF34000 /* Timer 0 and 1 base */
+#define SYSTIMER_RATE 150000000
+
+static ulong timestamp;
+static ulong lastinc;
+static struct systimer *systimer_base = (struct systimer *)SYSTIMER_BASE;
+
+/*
+ * Start the timer
+ */
+int timer_init(void)
+{
+ /*
+ * Setup timer0
+ */
+ writel(SYSTIMER_RELOAD, &systimer_base->timer0load);
+ writel(SYSTIMER_RELOAD, &systimer_base->timer0value);
+ writel(SYSTIMER_EN | SYSTIMER_32BIT, &systimer_base->timer0control);
+
+ reset_timer_masked();
+
+ return 0;
+
+}
+
+#define TICK_PER_TIME ((SYSTIMER_RATE + CONFIG_SYS_HZ / 2) / CONFIG_SYS_HZ)
+#define NS_PER_TICK (1000000000 / SYSTIMER_RATE)
+
+static inline unsigned long long tick_to_time(unsigned long long tick)
+{
+ do_div(tick, TICK_PER_TIME);
+ return tick;
+}
+
+static inline unsigned long long time_to_tick(unsigned long long time)
+{
+ return time * TICK_PER_TIME;
+}
+
+static inline unsigned long long us_to_tick(unsigned long long us)
+{
+ unsigned long long tick = us << 16;
+ tick += NS_PER_TICK - 1;
+ do_div(tick, NS_PER_TICK);
+ return tick >> 16;
+}
+
+unsigned long long get_ticks(void)
+{
+ ulong now = ~readl(&systimer_base->timer0value);
+
+ if (now >= lastinc) /* normal mode (non roll) */
+ /* move stamp forward with absolut diff ticks */
+ timestamp += (now - lastinc);
+ else /* we have rollover of incrementer */
+ timestamp += (0xFFFFFFFF - lastinc) + now;
+ lastinc = now;
+ return timestamp;
+}
+
+/*
+ * Delay x useconds AND preserve advance timstamp value
+ * assumes timer is ticking at 1 msec
+ */
+void __udelay(ulong usec)
+{
+ unsigned long long tmp;
+ ulong tmo;
+
+ tmo = us_to_tick(usec);
+ tmp = get_ticks() + tmo; /* get current timestamp */
+
+ while (get_ticks() < tmp) /* loop till event */
+ /*NOP*/;
+}
+
+ulong get_timer(ulong base)
+{
+ return get_timer_masked() - base;
+}
+
+void reset_timer_masked(void)
+{
+ lastinc = ~readl(&systimer_base->timer0value);
+ timestamp = 0;
+}
+
+void reset_timer(void)
+{
+ reset_timer_masked();
+}
+
+ulong get_timer_masked(void)
+{
+ return tick_to_time(get_ticks());
+}
diff --git a/arch/arm/cpu/armv7/mx5/soc.c b/arch/arm/cpu/armv7/mx5/soc.c
index c6106d5..cf12ba8 100644
--- a/arch/arm/cpu/armv7/mx5/soc.c
+++ b/arch/arm/cpu/armv7/mx5/soc.c
@@ -26,6 +26,8 @@
#include <common.h>
#include <asm/arch/imx-regs.h>
#include <asm/arch/clock.h>
+#include <asm/arch/sys_proto.h>
+
#include <asm/errno.h>
#include <asm/io.h>
@@ -117,14 +119,6 @@ int print_cpuinfo(void)
}
#endif
-/*
- * Initializes on-chip ethernet controllers.
- * to override, implement board_eth_init()
- */
-#if defined(CONFIG_FEC_MXC)
-extern int fecmxc_initialize(bd_t *bis);
-#endif
-
int cpu_eth_init(bd_t *bis)
{
int rc = -ENODEV;
diff --git a/arch/arm/cpu/armv7/omap-common/Makefile b/arch/arm/cpu/armv7/omap-common/Makefile
index 0b96b47..1dee81f 100644
--- a/arch/arm/cpu/armv7/omap-common/Makefile
+++ b/arch/arm/cpu/armv7/omap-common/Makefile
@@ -29,7 +29,9 @@ SOBJS := reset.o
COBJS := timer.o
COBJS += utils.o
+ifdef CONFIG_OMAP
COBJS += gpio.o
+endif
ifdef CONFIG_SPL_BUILD
COBJS += spl.o
diff --git a/arch/arm/cpu/armv7/omap-common/gpio.c b/arch/arm/cpu/armv7/omap-common/gpio.c
index e62c6f4..75a02da 100644
--- a/arch/arm/cpu/armv7/omap-common/gpio.c
+++ b/arch/arm/cpu/armv7/omap-common/gpio.c
@@ -237,11 +237,4 @@ int gpio_request(int gpio, const char *label)
*/
void gpio_free(unsigned gpio)
{
- const struct gpio_bank *bank;
-
- if (check_gpio(gpio) < 0)
- return;
- bank = get_gpio_bank(gpio);
-
- _set_gpio_direction(bank, get_gpio_index(gpio), 1);
}
diff --git a/arch/arm/cpu/armv7/omap-common/spl.c b/arch/arm/cpu/armv7/omap-common/spl.c
index 01fd58a..d37ca0f 100644
--- a/arch/arm/cpu/armv7/omap-common/spl.c
+++ b/arch/arm/cpu/armv7/omap-common/spl.c
@@ -34,6 +34,7 @@
#include <asm/arch/mmc_host_def.h>
#include <i2c.h>
#include <image.h>
+#include <malloc.h>
DECLARE_GLOBAL_DATA_PTR;
@@ -105,6 +106,9 @@ void board_init_r(gd_t *id, ulong dummy)
u32 boot_device;
debug(">>spl:board_init_r()\n");
+ mem_malloc_init(CONFIG_SYS_SPL_MALLOC_START,
+ CONFIG_SYS_SPL_MALLOC_SIZE);
+
timer_init();
i2c_init(CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE);
@@ -160,3 +164,11 @@ void preloader_console_init(void)
omap_rev_string(rev_string_buffer);
printf("Texas Instruments %s\n", rev_string_buffer);
}
+
+void __omap_rev_string(char *str)
+{
+ sprintf(str, "Revision detection unimplemented");
+}
+
+void omap_rev_string(char *str)
+ __attribute__((weak, alias("__omap_rev_string")));
diff --git a/arch/arm/cpu/armv7/omap3/board.c b/arch/arm/cpu/armv7/omap3/board.c
index 1b3ef69..a9fdb4f 100644
--- a/arch/arm/cpu/armv7/omap3/board.c
+++ b/arch/arm/cpu/armv7/omap3/board.c
@@ -450,9 +450,3 @@ void enable_caches(void)
dcache_enable();
}
#endif
-
-void omap_rev_string(char *omap_rev_string)
-{
- sprintf(omap_rev_string, "OMAP3, sorry revision detection" \
- " unimplemented");
-}
diff --git a/arch/arm/cpu/armv7/omap4/board.c b/arch/arm/cpu/armv7/omap4/board.c
index 8584fdd..2497e3e 100644
--- a/arch/arm/cpu/armv7/omap4/board.c
+++ b/arch/arm/cpu/armv7/omap4/board.c
@@ -152,9 +152,11 @@ static void set_muxconf_regs_essential(void)
sizeof(wkup_padconf_array_essential) /
sizeof(struct pad_conf_entry));
- /* gpio_wk7 is used for controlling TPS on 4460 */
if (omap_revision() >= OMAP4460_ES1_0)
- writew(M3, CONTROL_WKUP_PAD1_FREF_CLK4_REQ);
+ do_set_mux(CONTROL_PADCONF_WKUP,
+ wkup_padconf_array_essential_4460,
+ sizeof(wkup_padconf_array_essential_4460) /
+ sizeof(struct pad_conf_entry));
}
static void set_mux_conf_regs(void)
@@ -200,13 +202,13 @@ static void init_omap4_revision(void)
break;
case MIDR_CORTEX_A9_R1P2:
switch (readl(CONTROL_ID_CODE)) {
- case OMAP4_CONTROL_ID_CODE_ES2_0:
+ case OMAP4430_CONTROL_ID_CODE_ES2_0:
*omap4_revision = OMAP4430_ES2_0;
break;
- case OMAP4_CONTROL_ID_CODE_ES2_1:
+ case OMAP4430_CONTROL_ID_CODE_ES2_1:
*omap4_revision = OMAP4430_ES2_1;
break;
- case OMAP4_CONTROL_ID_CODE_ES2_2:
+ case OMAP4430_CONTROL_ID_CODE_ES2_2:
*omap4_revision = OMAP4430_ES2_2;
break;
default:
@@ -218,7 +220,17 @@ static void init_omap4_revision(void)
*omap4_revision = OMAP4430_ES2_3;
break;
case MIDR_CORTEX_A9_R2P10:
- *omap4_revision = OMAP4460_ES1_0;
+ switch (readl(CONTROL_ID_CODE)) {
+ case OMAP4460_CONTROL_ID_CODE_ES1_0:
+ *omap4_revision = OMAP4460_ES1_0;
+ break;
+ case OMAP4460_CONTROL_ID_CODE_ES1_1:
+ *omap4_revision = OMAP4460_ES1_1;
+ break;
+ default:
+ *omap4_revision = OMAP4460_ES1_0;
+ break;
+ }
break;
default:
*omap4_revision = OMAP4430_SILICON_ID_INVALID;
diff --git a/arch/arm/cpu/armv7/omap4/omap4_mux_data.h b/arch/arm/cpu/armv7/omap4/omap4_mux_data.h
index 00c52f8..b940391 100644
--- a/arch/arm/cpu/armv7/omap4/omap4_mux_data.h
+++ b/arch/arm/cpu/armv7/omap4/omap4_mux_data.h
@@ -73,4 +73,11 @@ const struct pad_conf_entry wkup_padconf_array_essential[] = {
};
+const struct pad_conf_entry wkup_padconf_array_essential_4460[] = {
+
+{PAD1_FREF_CLK4_REQ, (M3)}, /* gpio_wk7, TPS */
+
+};
+
+
#endif /* _OMAP4_MUX_DATA_H_ */
diff --git a/arch/arm/cpu/armv7/tegra2/ap20.c b/arch/arm/cpu/armv7/tegra2/ap20.c
index dc5f984..5cb4b1b 100644
--- a/arch/arm/cpu/armv7/tegra2/ap20.c
+++ b/arch/arm/cpu/armv7/tegra2/ap20.c
@@ -36,7 +36,7 @@ u32 s_first_boot = 1;
void init_pllx(void)
{
struct clk_rst_ctlr *clkrst = (struct clk_rst_ctlr *)NV_PA_CLK_RST_BASE;
- struct clk_pll *pll = &clkrst->crc_pll[CLOCK_PLL_ID_XCPU];
+ struct clk_pll *pll = &clkrst->crc_pll[CLOCK_ID_XCPU];
u32 reg;
/* If PLLX is already enabled, just return */
@@ -189,7 +189,6 @@ static void reset_A9_cpu(int reset)
static void clock_enable_coresight(int enable)
{
- struct clk_rst_ctlr *clkrst = (struct clk_rst_ctlr *)NV_PA_CLK_RST_BASE;
u32 rst, src;
clock_set_enable(PERIPH_ID_CORESIGHT, enable);
@@ -203,7 +202,7 @@ static void clock_enable_coresight(int enable)
* (bits 7:0), so 00000001b == 1.5 (n+1 + .5)
*/
src = CLK_DIVIDER(NVBL_PLLP_KHZ, 144000);
- writel(src, &clkrst->crc_clk_src_csite);
+ clock_ll_set_source_divisor(PERIPH_ID_CSI, 0, src);
/* Unlock the CPU CoreSight interfaces */
rst = 0xC5ACCE55;
diff --git a/arch/arm/cpu/armv7/tegra2/clock.c b/arch/arm/cpu/armv7/tegra2/clock.c
index 0aaed7d..03ac1e3 100644
--- a/arch/arm/cpu/armv7/tegra2/clock.c
+++ b/arch/arm/cpu/armv7/tegra2/clock.c
@@ -27,6 +27,371 @@
#include <asm/arch/timer.h>
#include <asm/arch/tegra2.h>
#include <common.h>
+#include <div64.h>
+
+/*
+ * This is our record of the current clock rate of each clock. We don't
+ * fill all of these in since we are only really interested in clocks which
+ * we use as parents.
+ */
+static unsigned pll_rate[CLOCK_ID_COUNT];
+
+/*
+ * The oscillator frequency is fixed to one of four set values. Based on this
+ * the other clocks are set up appropriately.
+ */
+static unsigned osc_freq[CLOCK_OSC_FREQ_COUNT] = {
+ 13000000,
+ 19200000,
+ 12000000,
+ 26000000,
+};
+
+/*
+ * Clock types that we can use as a source. The Tegra2 has muxes for the
+ * peripheral clocks, and in most cases there are four options for the clock
+ * source. This gives us a clock 'type' and exploits what commonality exists
+ * in the device.
+ *
+ * Letters are obvious, except for T which means CLK_M, and S which means the
+ * clock derived from 32KHz. Beware that CLK_M (also called OSC in the
+ * datasheet) and PLL_M are different things. The former is the basic
+ * clock supplied to the SOC from an external oscillator. The latter is the
+ * memory clock PLL.
+ *
+ * See definitions in clock_id in the header file.
+ */
+enum clock_type_id {
+ CLOCK_TYPE_AXPT, /* PLL_A, PLL_X, PLL_P, CLK_M */
+ CLOCK_TYPE_MCPA, /* and so on */
+ CLOCK_TYPE_MCPT,
+ CLOCK_TYPE_PCM,
+ CLOCK_TYPE_PCMT,
+ CLOCK_TYPE_PCXTS,
+ CLOCK_TYPE_PDCT,
+
+ CLOCK_TYPE_COUNT,
+ CLOCK_TYPE_NONE = -1, /* invalid clock type */
+};
+
+/* return 1 if a peripheral ID is in range */
+#define clock_type_id_isvalid(id) ((id) >= 0 && \
+ (id) < CLOCK_TYPE_COUNT)
+
+char pllp_valid = 1; /* PLLP is set up correctly */
+
+enum {
+ CLOCK_MAX_MUX = 4 /* number of source options for each clock */
+};
+
+/*
+ * Clock source mux for each clock type. This just converts our enum into
+ * a list of mux sources for use by the code. Note that CLOCK_TYPE_PCXTS
+ * is special as it has 5 sources. Since it also has a different number of
+ * bits in its register for the source, we just handle it with a special
+ * case in the code.
+ */
+#define CLK(x) CLOCK_ID_ ## x
+static enum clock_id clock_source[CLOCK_TYPE_COUNT][CLOCK_MAX_MUX] = {
+ { CLK(AUDIO), CLK(XCPU), CLK(PERIPH), CLK(OSC) },
+ { CLK(MEMORY), CLK(CGENERAL), CLK(PERIPH), CLK(AUDIO) },
+ { CLK(MEMORY), CLK(CGENERAL), CLK(PERIPH), CLK(OSC) },
+ { CLK(PERIPH), CLK(CGENERAL), CLK(MEMORY), CLK(NONE) },
+ { CLK(PERIPH), CLK(CGENERAL), CLK(MEMORY), CLK(OSC) },
+ { CLK(PERIPH), CLK(CGENERAL), CLK(XCPU), CLK(OSC) },
+ { CLK(PERIPH), CLK(DISPLAY), CLK(CGENERAL), CLK(OSC) },
+};
+
+/*
+ * Clock peripheral IDs which sadly don't match up with PERIPH_ID. This is
+ * not in the header file since it is for purely internal use - we want
+ * callers to use the PERIPH_ID for all access to peripheral clocks to avoid
+ * confusion bewteen PERIPH_ID_... and PERIPHC_...
+ *
+ * We don't call this CLOCK_PERIPH_ID or PERIPH_CLOCK_ID as it would just be
+ * confusing.
+ *
+ * Note to SOC vendors: perhaps define a unified numbering for peripherals and
+ * use it for reset, clock enable, clock source/divider and even pinmuxing
+ * if you can.
+ */
+enum periphc_internal_id {
+ /* 0x00 */
+ PERIPHC_I2S1,
+ PERIPHC_I2S2,
+ PERIPHC_SPDIF_OUT,
+ PERIPHC_SPDIF_IN,
+ PERIPHC_PWM,
+ PERIPHC_SPI1,
+ PERIPHC_SPI2,
+ PERIPHC_SPI3,
+
+ /* 0x08 */
+ PERIPHC_XIO,
+ PERIPHC_I2C1,
+ PERIPHC_DVC_I2C,
+ PERIPHC_TWC,
+ PERIPHC_0c,
+ PERIPHC_10, /* PERIPHC_SPI1, what is this really? */
+ PERIPHC_DISP1,
+ PERIPHC_DISP2,
+
+ /* 0x10 */
+ PERIPHC_CVE,
+ PERIPHC_IDE0,
+ PERIPHC_VI,
+ PERIPHC_1c,
+ PERIPHC_SDMMC1,
+ PERIPHC_SDMMC2,
+ PERIPHC_G3D,
+ PERIPHC_G2D,
+
+ /* 0x18 */
+ PERIPHC_NDFLASH,
+ PERIPHC_SDMMC4,
+ PERIPHC_VFIR,
+ PERIPHC_EPP,
+ PERIPHC_MPE,
+ PERIPHC_MIPI,
+ PERIPHC_UART1,
+ PERIPHC_UART2,
+
+ /* 0x20 */
+ PERIPHC_HOST1X,
+ PERIPHC_21,
+ PERIPHC_TVO,
+ PERIPHC_HDMI,
+ PERIPHC_24,
+ PERIPHC_TVDAC,
+ PERIPHC_I2C2,
+ PERIPHC_EMC,
+
+ /* 0x28 */
+ PERIPHC_UART3,
+ PERIPHC_29,
+ PERIPHC_VI_SENSOR,
+ PERIPHC_2b,
+ PERIPHC_2c,
+ PERIPHC_SPI4,
+ PERIPHC_I2C3,
+ PERIPHC_SDMMC3,
+
+ /* 0x30 */
+ PERIPHC_UART4,
+ PERIPHC_UART5,
+ PERIPHC_VDE,
+ PERIPHC_OWR,
+ PERIPHC_NOR,
+ PERIPHC_CSITE,
+
+ PERIPHC_COUNT,
+
+ PERIPHC_NONE = -1,
+};
+
+/* return 1 if a periphc_internal_id is in range */
+#define periphc_internal_id_isvalid(id) ((id) >= 0 && \
+ (id) < PERIPHC_COUNT)
+
+/*
+ * Clock type for each peripheral clock source. We put the name in each
+ * record just so it is easy to match things up
+ */
+#define TYPE(name, type) type
+static enum clock_type_id clock_periph_type[PERIPHC_COUNT] = {
+ /* 0x00 */
+ TYPE(PERIPHC_I2S1, CLOCK_TYPE_AXPT),
+ TYPE(PERIPHC_I2S2, CLOCK_TYPE_AXPT),
+ TYPE(PERIPHC_SPDIF_OUT, CLOCK_TYPE_AXPT),
+ TYPE(PERIPHC_SPDIF_IN, CLOCK_TYPE_PCM),
+ TYPE(PERIPHC_PWM, CLOCK_TYPE_PCXTS),
+ TYPE(PERIPHC_SPI1, CLOCK_TYPE_PCMT),
+ TYPE(PERIPHC_SPI22, CLOCK_TYPE_PCMT),
+ TYPE(PERIPHC_SPI3, CLOCK_TYPE_PCMT),
+
+ /* 0x08 */
+ TYPE(PERIPHC_XIO, CLOCK_TYPE_PCMT),
+ TYPE(PERIPHC_I2C1, CLOCK_TYPE_PCMT),
+ TYPE(PERIPHC_DVC_I2C, CLOCK_TYPE_PCMT),
+ TYPE(PERIPHC_TWC, CLOCK_TYPE_PCMT),
+ TYPE(PERIPHC_NONE, CLOCK_TYPE_NONE),
+ TYPE(PERIPHC_SPI1, CLOCK_TYPE_PCMT),
+ TYPE(PERIPHC_DISP1, CLOCK_TYPE_PDCT),
+ TYPE(PERIPHC_DISP2, CLOCK_TYPE_PDCT),
+
+ /* 0x10 */
+ TYPE(PERIPHC_CVE, CLOCK_TYPE_PDCT),
+ TYPE(PERIPHC_IDE0, CLOCK_TYPE_PCMT),
+ TYPE(PERIPHC_VI, CLOCK_TYPE_MCPA),
+ TYPE(PERIPHC_NONE, CLOCK_TYPE_NONE),
+ TYPE(PERIPHC_SDMMC1, CLOCK_TYPE_PCMT),
+ TYPE(PERIPHC_SDMMC2, CLOCK_TYPE_PCMT),
+ TYPE(PERIPHC_G3D, CLOCK_TYPE_MCPA),
+ TYPE(PERIPHC_G2D, CLOCK_TYPE_MCPA),
+
+ /* 0x18 */
+ TYPE(PERIPHC_NDFLASH, CLOCK_TYPE_PCMT),
+ TYPE(PERIPHC_SDMMC4, CLOCK_TYPE_PCMT),
+ TYPE(PERIPHC_VFIR, CLOCK_TYPE_PCMT),
+ TYPE(PERIPHC_EPP, CLOCK_TYPE_MCPA),
+ TYPE(PERIPHC_MPE, CLOCK_TYPE_MCPA),
+ TYPE(PERIPHC_MIPI, CLOCK_TYPE_PCMT),
+ TYPE(PERIPHC_UART1, CLOCK_TYPE_PCMT),
+ TYPE(PERIPHC_UART2, CLOCK_TYPE_PCMT),
+
+ /* 0x20 */
+ TYPE(PERIPHC_HOST1X, CLOCK_TYPE_MCPA),
+ TYPE(PERIPHC_NONE, CLOCK_TYPE_NONE),
+ TYPE(PERIPHC_TVO, CLOCK_TYPE_PDCT),
+ TYPE(PERIPHC_HDMI, CLOCK_TYPE_PDCT),
+ TYPE(PERIPHC_NONE, CLOCK_TYPE_NONE),
+ TYPE(PERIPHC_TVDAC, CLOCK_TYPE_PDCT),
+ TYPE(PERIPHC_I2C2, CLOCK_TYPE_PCMT),
+ TYPE(PERIPHC_EMC, CLOCK_TYPE_MCPT),
+
+ /* 0x28 */
+ TYPE(PERIPHC_UART3, CLOCK_TYPE_PCMT),
+ TYPE(PERIPHC_NONE, CLOCK_TYPE_NONE),
+ TYPE(PERIPHC_VI, CLOCK_TYPE_MCPA),
+ TYPE(PERIPHC_NONE, CLOCK_TYPE_NONE),
+ TYPE(PERIPHC_NONE, CLOCK_TYPE_NONE),
+ TYPE(PERIPHC_SPI4, CLOCK_TYPE_PCMT),
+ TYPE(PERIPHC_I2C3, CLOCK_TYPE_PCMT),
+ TYPE(PERIPHC_SDMMC3, CLOCK_TYPE_PCMT),
+
+ /* 0x30 */
+ TYPE(PERIPHC_UART4, CLOCK_TYPE_PCMT),
+ TYPE(PERIPHC_UART5, CLOCK_TYPE_PCMT),
+ TYPE(PERIPHC_VDE, CLOCK_TYPE_PCMT),
+ TYPE(PERIPHC_OWR, CLOCK_TYPE_PCMT),
+ TYPE(PERIPHC_NOR, CLOCK_TYPE_PCMT),
+ TYPE(PERIPHC_CSITE, CLOCK_TYPE_PCMT),
+};
+
+/*
+ * This array translates a periph_id to a periphc_internal_id
+ *
+ * Not present/matched up:
+ * uint vi_sensor; _VI_SENSOR_0, 0x1A8
+ * SPDIF - which is both 0x08 and 0x0c
+ *
+ */
+#define NONE(name) (-1)
+#define OFFSET(name, value) PERIPHC_ ## name
+static s8 periph_id_to_internal_id[PERIPH_ID_COUNT] = {
+ /* Low word: 31:0 */
+ NONE(CPU),
+ NONE(RESERVED1),
+ NONE(RESERVED2),
+ NONE(AC97),
+ NONE(RTC),
+ NONE(TMR),
+ PERIPHC_UART1,
+ PERIPHC_UART2, /* and vfir 0x68 */
+
+ /* 0x08 */
+ NONE(GPIO),
+ PERIPHC_SDMMC2,
+ NONE(SPDIF), /* 0x08 and 0x0c, unclear which to use */
+ PERIPHC_I2S1,
+ PERIPHC_I2C1,
+ PERIPHC_NDFLASH,
+ PERIPHC_SDMMC1,
+ PERIPHC_SDMMC4,
+
+ /* 0x10 */
+ PERIPHC_TWC,
+ PERIPHC_PWM,
+ PERIPHC_I2S2,
+ PERIPHC_EPP,
+ PERIPHC_VI,
+ PERIPHC_G2D,
+ NONE(USBD),
+ NONE(ISP),
+
+ /* 0x18 */
+ PERIPHC_G3D,
+ PERIPHC_IDE0,
+ PERIPHC_DISP2,
+ PERIPHC_DISP1,
+ PERIPHC_HOST1X,
+ NONE(VCP),
+ NONE(RESERVED30),
+ NONE(CACHE2),
+
+ /* Middle word: 63:32 */
+ NONE(MEM),
+ NONE(AHBDMA),
+ NONE(APBDMA),
+ NONE(RESERVED35),
+ NONE(KBC),
+ NONE(STAT_MON),
+ NONE(PMC),
+ NONE(FUSE),
+
+ /* 0x28 */
+ NONE(KFUSE),
+ NONE(SBC1), /* SBC1, 0x34, is this SPI1? */
+ PERIPHC_NOR,
+ PERIPHC_SPI1,
+ PERIPHC_SPI2,
+ PERIPHC_XIO,
+ PERIPHC_SPI3,
+ PERIPHC_DVC_I2C,
+
+ /* 0x30 */
+ NONE(DSI),
+ PERIPHC_TVO, /* also CVE 0x40 */
+ PERIPHC_MIPI,
+ PERIPHC_HDMI,
+ PERIPHC_CSITE,
+ PERIPHC_TVDAC,
+ PERIPHC_I2C2,
+ PERIPHC_UART3,
+
+ /* 0x38 */
+ NONE(RESERVED56),
+ PERIPHC_EMC,
+ NONE(USB2),
+ NONE(USB3),
+ PERIPHC_MPE,
+ PERIPHC_VDE,
+ NONE(BSEA),
+ NONE(BSEV),
+
+ /* Upper word 95:64 */
+ NONE(SPEEDO),
+ PERIPHC_UART4,
+ PERIPHC_UART5,
+ PERIPHC_I2C3,
+ PERIPHC_SPI4,
+ PERIPHC_SDMMC3,
+ NONE(PCIE),
+ PERIPHC_OWR,
+
+ /* 0x48 */
+ NONE(AFI),
+ NONE(CORESIGHT),
+ NONE(RESERVED74),
+ NONE(AVPUCQ),
+ NONE(RESERVED76),
+ NONE(RESERVED77),
+ NONE(RESERVED78),
+ NONE(RESERVED79),
+
+ /* 0x50 */
+ NONE(RESERVED80),
+ NONE(RESERVED81),
+ NONE(RESERVED82),
+ NONE(RESERVED83),
+ NONE(IRAMA),
+ NONE(IRAMB),
+ NONE(IRAMC),
+ NONE(IRAMD),
+
+ /* 0x58 */
+ NONE(CRAM2),
+};
/*
* Get the oscillator frequency, from the corresponding hardware configuration
@@ -42,16 +407,21 @@ enum clock_osc_freq clock_get_osc_freq(void)
return (reg & OSC_FREQ_MASK) >> OSC_FREQ_SHIFT;
}
-unsigned long clock_start_pll(enum clock_pll_id clkid, u32 divm, u32 divn,
- u32 divp, u32 cpcon, u32 lfcon)
+/* Returns a pointer to the registers of the given pll */
+static struct clk_pll *get_pll(enum clock_id clkid)
{
struct clk_rst_ctlr *clkrst =
(struct clk_rst_ctlr *)NV_PA_CLK_RST_BASE;
- u32 data;
- struct clk_pll *pll;
- assert(clock_pll_id_isvalid(clkid));
- pll = &clkrst->crc_pll[clkid];
+ assert(clock_id_isvalid(clkid));
+ return &clkrst->crc_pll[clkid];
+}
+
+unsigned long clock_start_pll(enum clock_id clkid, u32 divm, u32 divn,
+ u32 divp, u32 cpcon, u32 lfcon)
+{
+ struct clk_pll *pll = get_pll(clkid);
+ u32 data;
/*
* We cheat by treating all PLL (except PLLU) in the same fashion.
@@ -66,7 +436,7 @@ unsigned long clock_start_pll(enum clock_pll_id clkid, u32 divm, u32 divn,
data = (divm << PLL_DIVM_SHIFT) | (divn << PLL_DIVN_SHIFT) |
(0 << PLL_BYPASS_SHIFT) | (1 << PLL_ENABLE_SHIFT);
- if (clkid == CLOCK_PLL_ID_USB)
+ if (clkid == CLOCK_ID_USB)
data |= divp << PLLU_VCO_FREQ_SHIFT;
else
data |= divp << PLL_DIVP_SHIFT;
@@ -76,6 +446,294 @@ unsigned long clock_start_pll(enum clock_pll_id clkid, u32 divm, u32 divn,
return timer_get_us() + CLOCK_PLL_STABLE_DELAY_US;
}
+/* return 1 if a peripheral ID is in range and valid */
+static int clock_periph_id_isvalid(enum periph_id id)
+{
+ if (id < PERIPH_ID_FIRST || id >= PERIPH_ID_COUNT)
+ printf("Peripheral id %d out of range\n", id);
+ else {
+ switch (id) {
+ case PERIPH_ID_RESERVED1:
+ case PERIPH_ID_RESERVED2:
+ case PERIPH_ID_RESERVED30:
+ case PERIPH_ID_RESERVED35:
+ case PERIPH_ID_RESERVED56:
+ case PERIPH_ID_RESERVED74:
+ case PERIPH_ID_RESERVED76:
+ case PERIPH_ID_RESERVED77:
+ case PERIPH_ID_RESERVED78:
+ case PERIPH_ID_RESERVED79:
+ case PERIPH_ID_RESERVED80:
+ case PERIPH_ID_RESERVED81:
+ case PERIPH_ID_RESERVED82:
+ case PERIPH_ID_RESERVED83:
+ printf("Peripheral id %d is reserved\n", id);
+ break;
+ default:
+ return 1;
+ }
+ }
+ return 0;
+}
+
+/* Returns a pointer to the clock source register for a peripheral */
+static u32 *get_periph_source_reg(enum periph_id periph_id)
+{
+ struct clk_rst_ctlr *clkrst =
+ (struct clk_rst_ctlr *)NV_PA_CLK_RST_BASE;
+ enum periphc_internal_id internal_id;
+
+ assert(clock_periph_id_isvalid(periph_id));
+ internal_id = periph_id_to_internal_id[periph_id];
+ assert(internal_id != -1);
+ return &clkrst->crc_clk_src[internal_id];
+}
+
+void clock_ll_set_source_divisor(enum periph_id periph_id, unsigned source,
+ unsigned divisor)
+{
+ u32 *reg = get_periph_source_reg(periph_id);
+ u32 value;
+
+ value = readl(reg);
+
+ value &= ~OUT_CLK_SOURCE_MASK;
+ value |= source << OUT_CLK_SOURCE_SHIFT;
+
+ value &= ~OUT_CLK_DIVISOR_MASK;
+ value |= divisor << OUT_CLK_DIVISOR_SHIFT;
+
+ writel(value, reg);
+}
+
+void clock_ll_set_source(enum periph_id periph_id, unsigned source)
+{
+ u32 *reg = get_periph_source_reg(periph_id);
+
+ clrsetbits_le32(reg, OUT_CLK_SOURCE_MASK,
+ source << OUT_CLK_SOURCE_SHIFT);
+}
+
+/**
+ * Given the parent's rate and the required rate for the children, this works
+ * out the peripheral clock divider to use, in 7.1 binary format.
+ *
+ * @param parent_rate clock rate of parent clock in Hz
+ * @param rate required clock rate for this clock
+ * @return divider which should be used
+ */
+static int clk_div7_1_get_divider(unsigned long parent_rate,
+ unsigned long rate)
+{
+ u64 divider = parent_rate * 2;
+
+ divider += rate - 1;
+ do_div(divider, rate);
+
+ if ((s64)divider - 2 < 0)
+ return 0;
+
+ if ((s64)divider - 2 > 255)
+ return -1;
+
+ return divider - 2;
+}
+
+/**
+ * Given the parent's rate and the divider in 7.1 format, this works out the
+ * resulting peripheral clock rate.
+ *
+ * @param parent_rate clock rate of parent clock in Hz
+ * @param divider which should be used in 7.1 format
+ * @return effective clock rate of peripheral
+ */
+static unsigned long get_rate_from_divider(unsigned long parent_rate,
+ int divider)
+{
+ u64 rate;
+
+ rate = (u64)parent_rate * 2;
+ do_div(rate, divider + 2);
+ return rate;
+}
+
+unsigned long clock_get_periph_rate(enum periph_id periph_id,
+ enum clock_id parent)
+{
+ u32 *reg = get_periph_source_reg(periph_id);
+
+ return get_rate_from_divider(pll_rate[parent],
+ (readl(reg) & OUT_CLK_DIVISOR_MASK) >> OUT_CLK_DIVISOR_SHIFT);
+}
+
+/**
+ * Find the best available 7.1 format divisor given a parent clock rate and
+ * required child clock rate. This function assumes that a second-stage
+ * divisor is available which can divide by powers of 2 from 1 to 256.
+ *
+ * @param parent_rate clock rate of parent clock in Hz
+ * @param rate required clock rate for this clock
+ * @param extra_div value for the second-stage divisor (not set if this
+ * function returns -1.
+ * @return divider which should be used, or -1 if nothing is valid
+ *
+ */
+static int find_best_divider(unsigned long parent_rate, unsigned long rate,
+ int *extra_div)
+{
+ int shift;
+ int best_divider = -1;
+ int best_error = rate;
+
+ /* try dividers from 1 to 256 and find closest match */
+ for (shift = 0; shift <= 8 && best_error > 0; shift++) {
+ unsigned divided_parent = parent_rate >> shift;
+ int divider = clk_div7_1_get_divider(divided_parent, rate);
+ unsigned effective_rate = get_rate_from_divider(divided_parent,
+ divider);
+ int error = rate - effective_rate;
+
+ /* Given a valid divider, look for the lowest error */
+ if (divider != -1 && error < best_error) {
+ best_error = error;
+ *extra_div = 1 << shift;
+ best_divider = divider;
+ }
+ }
+
+ /* return what we found - *extra_div will already be set */
+ return best_divider;
+}
+
+/**
+ * Given a peripheral ID and the required source clock, this returns which
+ * value should be programmed into the source mux for that peripheral.
+ *
+ * There is special code here to handle the one source type with 5 sources.
+ *
+ * @param periph_id peripheral to start
+ * @param source PLL id of required parent clock
+ * @param mux_bits Set to number of bits in mux register: 2 or 4
+ * @return mux value (0-4, or -1 if not found)
+ */
+static int get_periph_clock_source(enum periph_id periph_id,
+ enum clock_id parent, int *mux_bits)
+{
+ enum clock_type_id type;
+ enum periphc_internal_id internal_id;
+ int mux;
+
+ assert(clock_periph_id_isvalid(periph_id));
+
+ internal_id = periph_id_to_internal_id[periph_id];
+ assert(periphc_internal_id_isvalid(internal_id));
+
+ type = clock_periph_type[internal_id];
+ assert(clock_type_id_isvalid(type));
+
+ /* Special case here for the clock with a 4-bit source mux */
+ if (type == CLOCK_TYPE_PCXTS)
+ *mux_bits = 4;
+ else
+ *mux_bits = 2;
+
+ for (mux = 0; mux < CLOCK_MAX_MUX; mux++)
+ if (clock_source[type][mux] == parent)
+ return mux;
+
+ /*
+ * Not found: it might be looking for the 'S' in CLOCK_TYPE_PCXTS
+ * which is not in our table. If not, then they are asking for a
+ * source which this peripheral can't access through its mux.
+ */
+ assert(type == CLOCK_TYPE_PCXTS);
+ assert(parent == CLOCK_ID_SFROM32KHZ);
+ if (type == CLOCK_TYPE_PCXTS && parent == CLOCK_ID_SFROM32KHZ)
+ return 4; /* mux value for this clock */
+
+ /* if we get here, either us or the caller has made a mistake */
+ printf("Caller requested bad clock: periph=%d, parent=%d\n", periph_id,
+ parent);
+ return -1;
+}
+
+/**
+ * Adjust peripheral PLL to use the given divider and source.
+ *
+ * @param periph_id peripheral to adjust
+ * @param parent Required parent clock (for source mux)
+ * @param divider Required divider in 7.1 format
+ * @return 0 if ok, -1 on error (requesting a parent clock which is not valid
+ * for this peripheral)
+ */
+static int adjust_periph_pll(enum periph_id periph_id,
+ enum clock_id parent, unsigned divider)
+{
+ u32 *reg = get_periph_source_reg(periph_id);
+ unsigned source;
+ int mux_bits;
+
+ clrsetbits_le32(reg, OUT_CLK_DIVISOR_MASK,
+ divider << OUT_CLK_DIVISOR_SHIFT);
+ udelay(1);
+
+ /* work out the source clock and set it */
+ source = get_periph_clock_source(periph_id, parent, &mux_bits);
+ if (source < 0)
+ return -1;
+ if (mux_bits == 4) {
+ clrsetbits_le32(reg, OUT_CLK_SOURCE4_MASK,
+ source << OUT_CLK_SOURCE4_SHIFT);
+ } else {
+ clrsetbits_le32(reg, OUT_CLK_SOURCE_MASK,
+ source << OUT_CLK_SOURCE_SHIFT);
+ }
+ udelay(2);
+ return 0;
+}
+
+unsigned clock_adjust_periph_pll_div(enum periph_id periph_id,
+ enum clock_id parent, unsigned rate, int *extra_div)
+{
+ unsigned effective_rate;
+ int divider;
+
+ if (extra_div)
+ divider = find_best_divider(pll_rate[parent], rate, extra_div);
+ else
+ divider = clk_div7_1_get_divider(pll_rate[parent], rate);
+ assert(divider >= 0);
+ if (adjust_periph_pll(periph_id, parent, divider))
+ return -1U;
+ debug("periph %d, rate=%d, reg=%p = %x\n", periph_id, rate,
+ get_periph_source_reg(periph_id),
+ readl(get_periph_source_reg(periph_id)));
+
+ /* Check what we ended up with. This shouldn't matter though */
+ effective_rate = clock_get_periph_rate(periph_id, parent);
+ if (extra_div)
+ effective_rate /= *extra_div;
+ if (rate != effective_rate)
+ debug("Requested clock rate %u not honored (got %u)\n",
+ rate, effective_rate);
+ return effective_rate;
+}
+
+unsigned clock_start_periph_pll(enum periph_id periph_id,
+ enum clock_id parent, unsigned rate)
+{
+ unsigned effective_rate;
+
+ reset_set_enable(periph_id, 1);
+ clock_enable(periph_id);
+
+ effective_rate = clock_adjust_periph_pll_div(periph_id, parent, rate,
+ NULL);
+
+ reset_set_enable(periph_id, 0);
+ return effective_rate;
+}
+
void clock_set_enable(enum periph_id periph_id, int enable)
{
struct clk_rst_ctlr *clkrst =
@@ -148,3 +806,156 @@ void reset_cmplx_set_enable(int cpu, int which, int reset)
else
writel(mask, &clkrst->crc_cpu_cmplx_clr);
}
+
+unsigned clock_get_rate(enum clock_id clkid)
+{
+ struct clk_pll *pll;
+ u32 base;
+ u32 divm;
+ u64 parent_rate;
+ u64 rate;
+
+ parent_rate = osc_freq[clock_get_osc_freq()];
+ if (clkid == CLOCK_ID_OSC)
+ return parent_rate;
+
+ pll = get_pll(clkid);
+ base = readl(&pll->pll_base);
+
+ /* Oh for bf_unpack()... */
+ rate = parent_rate * ((base & PLL_DIVN_MASK) >> PLL_DIVN_SHIFT);
+ divm = (base & PLL_DIVM_MASK) >> PLL_DIVM_SHIFT;
+ if (clkid == CLOCK_ID_USB)
+ divm <<= (base & PLLU_VCO_FREQ_MASK) >> PLLU_VCO_FREQ_SHIFT;
+ else
+ divm <<= (base & PLL_DIVP_MASK) >> PLL_DIVP_SHIFT;
+ do_div(rate, divm);
+ return rate;
+}
+
+/**
+ * Set the output frequency you want for each PLL clock.
+ * PLL output frequencies are programmed by setting their N, M and P values.
+ * The governing equations are:
+ * VCO = (Fi / m) * n, Fo = VCO / (2^p)
+ * where Fo is the output frequency from the PLL.
+ * Example: Set the output frequency to 216Mhz(Fo) with 12Mhz OSC(Fi)
+ * 216Mhz = ((12Mhz / m) * n) / (2^p) so n=432,m=12,p=1
+ * Please see Tegra TRM section 5.3 to get the detail for PLL Programming
+ *
+ * @param n PLL feedback divider(DIVN)
+ * @param m PLL input divider(DIVN)
+ * @param p post divider(DIVP)
+ * @param cpcon base PLL charge pump(CPCON)
+ * @return 0 if ok, -1 on error (the requested PLL is incorrect and cannot
+ * be overriden), 1 if PLL is already correct
+ */
+static int clock_set_rate(enum clock_id clkid, u32 n, u32 m, u32 p, u32 cpcon)
+{
+ u32 base_reg;
+ u32 misc_reg;
+ struct clk_pll *pll;
+
+ pll = get_pll(clkid);
+
+ base_reg = readl(&pll->pll_base);
+
+ /* Set BYPASS, m, n and p to PLL_BASE */
+ base_reg &= ~PLL_DIVM_MASK;
+ base_reg |= m << PLL_DIVM_SHIFT;
+
+ base_reg &= ~PLL_DIVN_MASK;
+ base_reg |= n << PLL_DIVN_SHIFT;
+
+ base_reg &= ~PLL_DIVP_MASK;
+ base_reg |= p << PLL_DIVP_SHIFT;
+
+ if (clkid == CLOCK_ID_PERIPH) {
+ /*
+ * If the PLL is already set up, check that it is correct
+ * and record this info for clock_verify() to check.
+ */
+ if (base_reg & PLL_BASE_OVRRIDE_MASK) {
+ base_reg |= PLL_ENABLE_MASK;
+ if (base_reg != readl(&pll->pll_base))
+ pllp_valid = 0;
+ return pllp_valid ? 1 : -1;
+ }
+ base_reg |= PLL_BASE_OVRRIDE_MASK;
+ }
+
+ base_reg |= PLL_BYPASS_MASK;
+ writel(base_reg, &pll->pll_base);
+
+ /* Set cpcon to PLL_MISC */
+ misc_reg = readl(&pll->pll_misc);
+ misc_reg &= ~PLL_CPCON_MASK;
+ misc_reg |= cpcon << PLL_CPCON_SHIFT;
+ writel(misc_reg, &pll->pll_misc);
+
+ /* Enable PLL */
+ base_reg |= PLL_ENABLE_MASK;
+ writel(base_reg, &pll->pll_base);
+
+ /* Disable BYPASS */
+ base_reg &= ~PLL_BYPASS_MASK;
+ writel(base_reg, &pll->pll_base);
+
+ return 0;
+}
+
+int clock_verify(void)
+{
+ struct clk_pll *pll = get_pll(CLOCK_ID_PERIPH);
+ u32 reg = readl(&pll->pll_base);
+
+ if (!pllp_valid) {
+ printf("Warning: PLLP %x is not correct\n", reg);
+ return -1;
+ }
+ debug("PLLX %x is correct\n", reg);
+ return 0;
+}
+
+void clock_early_init(void)
+{
+ /*
+ * PLLP output frequency set to 216MHz
+ * PLLC output frequency set to 600Mhz
+ *
+ * TODO: Can we calculate these values instead of hard-coding?
+ */
+ switch (clock_get_osc_freq()) {
+ case CLOCK_OSC_FREQ_12_0: /* OSC is 12Mhz */
+ clock_set_rate(CLOCK_ID_PERIPH, 432, 12, 1, 8);
+ clock_set_rate(CLOCK_ID_CGENERAL, 600, 12, 0, 8);
+ break;
+
+ case CLOCK_OSC_FREQ_26_0: /* OSC is 26Mhz */
+ clock_set_rate(CLOCK_ID_PERIPH, 432, 26, 1, 8);
+ clock_set_rate(CLOCK_ID_CGENERAL, 600, 26, 0, 8);
+ break;
+
+ case CLOCK_OSC_FREQ_13_0:
+ case CLOCK_OSC_FREQ_19_2:
+ default:
+ /*
+ * These are not supported. It is too early to print a
+ * message and the UART likely won't work anyway due to the
+ * oscillator being wrong.
+ */
+ break;
+ }
+}
+
+void clock_init(void)
+{
+ pll_rate[CLOCK_ID_MEMORY] = clock_get_rate(CLOCK_ID_MEMORY);
+ pll_rate[CLOCK_ID_PERIPH] = clock_get_rate(CLOCK_ID_PERIPH);
+ pll_rate[CLOCK_ID_CGENERAL] = clock_get_rate(CLOCK_ID_CGENERAL);
+ pll_rate[CLOCK_ID_OSC] = clock_get_rate(CLOCK_ID_OSC);
+ pll_rate[CLOCK_ID_SFROM32KHZ] = 32768;
+ debug("Osc = %d\n", pll_rate[CLOCK_ID_OSC]);
+ debug("PLLM = %d\n", pll_rate[CLOCK_ID_MEMORY]);
+ debug("PLLP = %d\n", pll_rate[CLOCK_ID_PERIPH]);
+}
diff --git a/arch/arm/cpu/armv7/tegra2/pinmux.c b/arch/arm/cpu/armv7/tegra2/pinmux.c
index 5594ab8..b053f90 100644
--- a/arch/arm/cpu/armv7/tegra2/pinmux.c
+++ b/arch/arm/cpu/armv7/tegra2/pinmux.c
@@ -27,9 +27,463 @@
#include <common.h>
-void pinmux_set_tristate(enum pmux_pin pin, int enable)
+/*
+ * This defines the order of the pin mux control bits in the registers. For
+ * some reason there is no correspendence between the tristate, pin mux and
+ * pullup/pulldown registers.
+ */
+enum pmux_ctlid {
+ /* 0: APB_MISC_PP_PIN_MUX_CTL_A_0 */
+ MUXCTL_UAA,
+ MUXCTL_UAB,
+ MUXCTL_UAC,
+ MUXCTL_UAD,
+ MUXCTL_UDA,
+ MUXCTL_RESERVED5,
+ MUXCTL_ATE,
+ MUXCTL_RM,
+
+ MUXCTL_ATB,
+ MUXCTL_RESERVED9,
+ MUXCTL_ATD,
+ MUXCTL_ATC,
+ MUXCTL_ATA,
+ MUXCTL_KBCF,
+ MUXCTL_KBCE,
+ MUXCTL_SDMMC1,
+
+ /* 16: APB_MISC_PP_PIN_MUX_CTL_B_0 */
+ MUXCTL_GMA,
+ MUXCTL_GMC,
+ MUXCTL_HDINT,
+ MUXCTL_SLXA,
+ MUXCTL_OWC,
+ MUXCTL_SLXC,
+ MUXCTL_SLXD,
+ MUXCTL_SLXK,
+
+ MUXCTL_UCA,
+ MUXCTL_UCB,
+ MUXCTL_DTA,
+ MUXCTL_DTB,
+ MUXCTL_RESERVED28,
+ MUXCTL_DTC,
+ MUXCTL_DTD,
+ MUXCTL_DTE,
+
+ /* 32: APB_MISC_PP_PIN_MUX_CTL_C_0 */
+ MUXCTL_DDC,
+ MUXCTL_CDEV1,
+ MUXCTL_CDEV2,
+ MUXCTL_CSUS,
+ MUXCTL_I2CP,
+ MUXCTL_KBCA,
+ MUXCTL_KBCB,
+ MUXCTL_KBCC,
+
+ MUXCTL_IRTX,
+ MUXCTL_IRRX,
+ MUXCTL_DAP1,
+ MUXCTL_DAP2,
+ MUXCTL_DAP3,
+ MUXCTL_DAP4,
+ MUXCTL_GMB,
+ MUXCTL_GMD,
+
+ /* 48: APB_MISC_PP_PIN_MUX_CTL_D_0 */
+ MUXCTL_GME,
+ MUXCTL_GPV,
+ MUXCTL_GPU,
+ MUXCTL_SPDO,
+ MUXCTL_SPDI,
+ MUXCTL_SDB,
+ MUXCTL_SDC,
+ MUXCTL_SDD,
+
+ MUXCTL_SPIH,
+ MUXCTL_SPIG,
+ MUXCTL_SPIF,
+ MUXCTL_SPIE,
+ MUXCTL_SPID,
+ MUXCTL_SPIC,
+ MUXCTL_SPIB,
+ MUXCTL_SPIA,
+
+ /* 64: APB_MISC_PP_PIN_MUX_CTL_E_0 */
+ MUXCTL_LPW0,
+ MUXCTL_LPW1,
+ MUXCTL_LPW2,
+ MUXCTL_LSDI,
+ MUXCTL_LSDA,
+ MUXCTL_LSPI,
+ MUXCTL_LCSN,
+ MUXCTL_LDC,
+
+ MUXCTL_LSCK,
+ MUXCTL_LSC0,
+ MUXCTL_LSC1,
+ MUXCTL_LHS,
+ MUXCTL_LVS,
+ MUXCTL_LM0,
+ MUXCTL_LM1,
+ MUXCTL_LVP0,
+
+ /* 80: APB_MISC_PP_PIN_MUX_CTL_F_0 */
+ MUXCTL_LD0,
+ MUXCTL_LD1,
+ MUXCTL_LD2,
+ MUXCTL_LD3,
+ MUXCTL_LD4,
+ MUXCTL_LD5,
+ MUXCTL_LD6,
+ MUXCTL_LD7,
+
+ MUXCTL_LD8,
+ MUXCTL_LD9,
+ MUXCTL_LD10,
+ MUXCTL_LD11,
+ MUXCTL_LD12,
+ MUXCTL_LD13,
+ MUXCTL_LD14,
+ MUXCTL_LD15,
+
+ /* 96: APB_MISC_PP_PIN_MUX_CTL_G_0 */
+ MUXCTL_LD16,
+ MUXCTL_LD17,
+ MUXCTL_LHP1,
+ MUXCTL_LHP2,
+ MUXCTL_LVP1,
+ MUXCTL_LHP0,
+ MUXCTL_RESERVED102,
+ MUXCTL_LPP,
+
+ MUXCTL_LDI,
+ MUXCTL_PMC,
+ MUXCTL_CRTP,
+ MUXCTL_PTA,
+ MUXCTL_RESERVED108,
+ MUXCTL_KBCD,
+ MUXCTL_GPU7,
+ MUXCTL_DTF,
+
+ MUXCTL_NONE = -1,
+};
+
+/*
+ * And this defines the order of the pullup/pulldown controls which are again
+ * in a different order
+ */
+enum pmux_pullid {
+ /* 0: APB_MISC_PP_PULLUPDOWN_REG_A_0 */
+ PUCTL_ATA,
+ PUCTL_ATB,
+ PUCTL_ATC,
+ PUCTL_ATD,
+ PUCTL_ATE,
+ PUCTL_DAP1,
+ PUCTL_DAP2,
+ PUCTL_DAP3,
+
+ PUCTL_DAP4,
+ PUCTL_DTA,
+ PUCTL_DTB,
+ PUCTL_DTC,
+ PUCTL_DTD,
+ PUCTL_DTE,
+ PUCTL_DTF,
+ PUCTL_GPV,
+
+ /* 16: APB_MISC_PP_PULLUPDOWN_REG_B_0 */
+ PUCTL_RM,
+ PUCTL_I2CP,
+ PUCTL_PTA,
+ PUCTL_GPU7,
+ PUCTL_KBCA,
+ PUCTL_KBCB,
+ PUCTL_KBCC,
+ PUCTL_KBCD,
+
+ PUCTL_SPDI,
+ PUCTL_SPDO,
+ PUCTL_GPSLXAU,
+ PUCTL_CRTP,
+ PUCTL_SLXC,
+ PUCTL_SLXD,
+ PUCTL_SLXK,
+
+ /* 32: APB_MISC_PP_PULLUPDOWN_REG_C_0 */
+ PUCTL_CDEV1,
+ PUCTL_CDEV2,
+ PUCTL_SPIA,
+ PUCTL_SPIB,
+ PUCTL_SPIC,
+ PUCTL_SPID,
+ PUCTL_SPIE,
+ PUCTL_SPIF,
+
+ PUCTL_SPIG,
+ PUCTL_SPIH,
+ PUCTL_IRTX,
+ PUCTL_IRRX,
+ PUCTL_GME,
+ PUCTL_RESERVED45,
+ PUCTL_XM2D,
+ PUCTL_XM2C,
+
+ /* 48: APB_MISC_PP_PULLUPDOWN_REG_D_0 */
+ PUCTL_UAA,
+ PUCTL_UAB,
+ PUCTL_UAC,
+ PUCTL_UAD,
+ PUCTL_UCA,
+ PUCTL_UCB,
+ PUCTL_LD17,
+ PUCTL_LD19_18,
+
+ PUCTL_LD21_20,
+ PUCTL_LD23_22,
+ PUCTL_LS,
+ PUCTL_LC,
+ PUCTL_CSUS,
+ PUCTL_DDRC,
+ PUCTL_SDC,
+ PUCTL_SDD,
+
+ /* 64: APB_MISC_PP_PULLUPDOWN_REG_E_0 */
+ PUCTL_KBCF,
+ PUCTL_KBCE,
+ PUCTL_PMCA,
+ PUCTL_PMCB,
+ PUCTL_PMCC,
+ PUCTL_PMCD,
+ PUCTL_PMCE,
+ PUCTL_CK32,
+
+ PUCTL_UDA,
+ PUCTL_SDMMC1,
+ PUCTL_GMA,
+ PUCTL_GMB,
+ PUCTL_GMC,
+ PUCTL_GMD,
+ PUCTL_DDC,
+ PUCTL_OWC,
+
+ PUCTL_NONE = -1
+};
+
+struct tegra_pingroup_desc {
+ const char *name;
+ enum pmux_func funcs[4];
+ enum pmux_func func_safe;
+ enum pmux_vddio vddio;
+ enum pmux_ctlid ctl_id;
+ enum pmux_pullid pull_id;
+};
+
+
+/* Converts a pmux_pingrp number to a tristate register: 0=A, 1=B, 2=C, 3=D */
+#define TRISTATE_REG(pmux_pingrp) ((pmux_pingrp) >> 5)
+
+/* Mask value for a tristate (within TRISTATE_REG(id)) */
+#define TRISTATE_MASK(pmux_pingrp) (1 << ((pmux_pingrp) & 0x1f))
+
+/* Converts a PUCTL id to a pull register: 0=A, 1=B...4=E */
+#define PULL_REG(pmux_pullid) ((pmux_pullid) >> 4)
+
+/* Converts a PUCTL id to a shift position */
+#define PULL_SHIFT(pmux_pullid) ((pmux_pullid << 1) & 0x1f)
+
+/* Converts a MUXCTL id to a ctl register: 0=A, 1=B...6=G */
+#define MUXCTL_REG(pmux_ctlid) ((pmux_ctlid) >> 4)
+
+/* Converts a MUXCTL id to a shift position */
+#define MUXCTL_SHIFT(pmux_ctlid) ((pmux_ctlid << 1) & 0x1f)
+
+/* Convenient macro for defining pin group properties */
+#define PINALL(pg_name, vdd, f0, f1, f2, f3, f_safe, mux, pupd) \
+ { \
+ .vddio = PMUX_VDDIO_ ## vdd, \
+ .funcs = { \
+ PMUX_FUNC_ ## f0, \
+ PMUX_FUNC_ ## f1, \
+ PMUX_FUNC_ ## f2, \
+ PMUX_FUNC_ ## f3, \
+ }, \
+ .func_safe = PMUX_FUNC_ ## f_safe, \
+ .ctl_id = mux, \
+ .pull_id = pupd \
+ }
+
+/* A normal pin group where the mux name and pull-up name match */
+#define PIN(pg_name, vdd, f0, f1, f2, f3, f_safe) \
+ PINALL(pg_name, vdd, f0, f1, f2, f3, f_safe, \
+ MUXCTL_ ## pg_name, PUCTL_ ## pg_name)
+
+/* A pin group where the pull-up name doesn't have a 1-1 mapping */
+#define PINP(pg_name, vdd, f0, f1, f2, f3, f_safe, pupd) \
+ PINALL(pg_name, vdd, f0, f1, f2, f3, f_safe, \
+ MUXCTL_ ## pg_name, PUCTL_ ## pupd)
+
+/* A pin group number which is not used */
+#define PIN_RESERVED \
+ PIN(NONE, NONE, NONE, NONE, NONE, NONE, NONE)
+
+const struct tegra_pingroup_desc tegra_soc_pingroups[PINGRP_COUNT] = {
+ PIN(ATA, NAND, IDE, NAND, GMI, RSVD, IDE),
+ PIN(ATB, NAND, IDE, NAND, GMI, SDIO4, IDE),
+ PIN(ATC, NAND, IDE, NAND, GMI, SDIO4, IDE),
+ PIN(ATD, NAND, IDE, NAND, GMI, SDIO4, IDE),
+ PIN(CDEV1, AUDIO, OSC, PLLA_OUT, PLLM_OUT1, AUDIO_SYNC, OSC),
+ PIN(CDEV2, AUDIO, OSC, AHB_CLK, APB_CLK, PLLP_OUT4, OSC),
+ PIN(CSUS, VI, PLLC_OUT1, PLLP_OUT2, PLLP_OUT3, VI_SENSOR_CLK,
+ PLLC_OUT1),
+ PIN(DAP1, AUDIO, DAP1, RSVD, GMI, SDIO2, DAP1),
+
+ PIN(DAP2, AUDIO, DAP2, TWC, RSVD, GMI, DAP2),
+ PIN(DAP3, BB, DAP3, RSVD, RSVD, RSVD, DAP3),
+ PIN(DAP4, UART, DAP4, RSVD, GMI, RSVD, DAP4),
+ PIN(DTA, VI, RSVD, SDIO2, VI, RSVD, RSVD4),
+ PIN(DTB, VI, RSVD, RSVD, VI, SPI1, RSVD1),
+ PIN(DTC, VI, RSVD, RSVD, VI, RSVD, RSVD1),
+ PIN(DTD, VI, RSVD, SDIO2, VI, RSVD, RSVD1),
+ PIN(DTE, VI, RSVD, RSVD, VI, SPI1, RSVD1),
+
+ PINP(GPU, UART, PWM, UARTA, GMI, RSVD, RSVD4,
+ GPSLXAU),
+ PIN(GPV, SD, PCIE, RSVD, RSVD, RSVD, PCIE),
+ PIN(I2CP, SYS, I2C, RSVD, RSVD, RSVD, RSVD4),
+ PIN(IRTX, UART, UARTA, UARTB, GMI, SPI4, UARTB),
+ PIN(IRRX, UART, UARTA, UARTB, GMI, SPI4, UARTB),
+ PIN(KBCB, SYS, KBC, NAND, SDIO2, MIO, KBC),
+ PIN(KBCA, SYS, KBC, NAND, SDIO2, EMC_TEST0_DLL, KBC),
+ PINP(PMC, SYS, PWR_ON, PWR_INTR, RSVD, RSVD, PWR_ON, NONE),
+
+ PIN(PTA, NAND, I2C2, HDMI, GMI, RSVD, RSVD4),
+ PIN(RM, UART, I2C, RSVD, RSVD, RSVD, RSVD4),
+ PIN(KBCE, SYS, KBC, NAND, OWR, RSVD, KBC),
+ PIN(KBCF, SYS, KBC, NAND, TRACE, MIO, KBC),
+ PIN(GMA, NAND, UARTE, SPI3, GMI, SDIO4, SPI3),
+ PIN(GMC, NAND, UARTD, SPI4, GMI, SFLASH, SPI4),
+ PIN(SDMMC1, BB, SDIO1, RSVD, UARTE, UARTA, RSVD2),
+ PIN(OWC, SYS, OWR, RSVD, RSVD, RSVD, OWR),
+
+ PIN(GME, NAND, RSVD, DAP5, GMI, SDIO4, GMI),
+ PIN(SDC, SD, PWM, TWC, SDIO3, SPI3, TWC),
+ PIN(SDD, SD, UARTA, PWM, SDIO3, SPI3, PWM),
+ PIN_RESERVED,
+ PINP(SLXA, SD, PCIE, SPI4, SDIO3, SPI2, PCIE, CRTP),
+ PIN(SLXC, SD, SPDIF, SPI4, SDIO3, SPI2, SPI4),
+ PIN(SLXD, SD, SPDIF, SPI4, SDIO3, SPI2, SPI4),
+ PIN(SLXK, SD, PCIE, SPI4, SDIO3, SPI2, PCIE),
+
+ PIN(SPDI, AUDIO, SPDIF, RSVD, I2C, SDIO2, RSVD2),
+ PIN(SPDO, AUDIO, SPDIF, RSVD, I2C, SDIO2, RSVD2),
+ PIN(SPIA, AUDIO, SPI1, SPI2, SPI3, GMI, GMI),
+ PIN(SPIB, AUDIO, SPI1, SPI2, SPI3, GMI, GMI),
+ PIN(SPIC, AUDIO, SPI1, SPI2, SPI3, GMI, GMI),
+ PIN(SPID, AUDIO, SPI2, SPI1, SPI2_ALT, GMI, GMI),
+ PIN(SPIE, AUDIO, SPI2, SPI1, SPI2_ALT, GMI, GMI),
+ PIN(SPIF, AUDIO, SPI3, SPI1, SPI2, RSVD, RSVD4),
+
+ PIN(SPIG, AUDIO, SPI3, SPI2, SPI2_ALT, I2C, SPI2_ALT),
+ PIN(SPIH, AUDIO, SPI3, SPI2, SPI2_ALT, I2C, SPI2_ALT),
+ PIN(UAA, BB, SPI3, MIPI_HS, UARTA, ULPI, MIPI_HS),
+ PIN(UAB, BB, SPI2, MIPI_HS, UARTA, ULPI, MIPI_HS),
+ PIN(UAC, BB, OWR, RSVD, RSVD, RSVD, RSVD4),
+ PIN(UAD, UART, IRDA, SPDIF, UARTA, SPI4, SPDIF),
+ PIN(UCA, UART, UARTC, RSVD, GMI, RSVD, RSVD4),
+ PIN(UCB, UART, UARTC, PWM, GMI, RSVD, RSVD4),
+
+ PIN_RESERVED,
+ PIN(ATE, NAND, IDE, NAND, GMI, RSVD, IDE),
+ PIN(KBCC, SYS, KBC, NAND, TRACE, EMC_TEST1_DLL, KBC),
+ PIN_RESERVED,
+ PIN_RESERVED,
+ PIN(GMB, NAND, IDE, NAND, GMI, GMI_INT, GMI),
+ PIN(GMD, NAND, RSVD, NAND, GMI, SFLASH, GMI),
+ PIN(DDC, LCD, I2C2, RSVD, RSVD, RSVD, RSVD4),
+
+ /* 64 */
+ PINP(LD0, LCD, DISPA, DISPB, XIO, RSVD, RSVD4, LD17),
+ PINP(LD1, LCD, DISPA, DISPB, XIO, RSVD, RSVD4, LD17),
+ PINP(LD2, LCD, DISPA, DISPB, XIO, RSVD, RSVD4, LD17),
+ PINP(LD3, LCD, DISPA, DISPB, XIO, RSVD, RSVD4, LD17),
+ PINP(LD4, LCD, DISPA, DISPB, XIO, RSVD, RSVD4, LD17),
+ PINP(LD5, LCD, DISPA, DISPB, XIO, RSVD, RSVD4, LD17),
+ PINP(LD6, LCD, DISPA, DISPB, XIO, RSVD, RSVD4, LD17),
+ PINP(LD7, LCD, DISPA, DISPB, XIO, RSVD, RSVD4, LD17),
+
+ PINP(LD8, LCD, DISPA, DISPB, XIO, RSVD, RSVD4, LD17),
+ PINP(LD9, LCD, DISPA, DISPB, XIO, RSVD, RSVD4, LD17),
+ PINP(LD10, LCD, DISPA, DISPB, XIO, RSVD, RSVD4, LD17),
+ PINP(LD11, LCD, DISPA, DISPB, XIO, RSVD, RSVD4, LD17),
+ PINP(LD12, LCD, DISPA, DISPB, XIO, RSVD, RSVD4, LD17),
+ PINP(LD13, LCD, DISPA, DISPB, XIO, RSVD, RSVD4, LD17),
+ PINP(LD14, LCD, DISPA, DISPB, XIO, RSVD, RSVD4, LD17),
+ PINP(LD15, LCD, DISPA, DISPB, XIO, RSVD, RSVD4, LD17),
+
+ PINP(LD16, LCD, DISPA, DISPB, XIO, RSVD, RSVD4, LD17),
+ PINP(LD17, LCD, DISPA, DISPB, RSVD, RSVD, RSVD4, LD17),
+ PINP(LHP0, LCD, DISPA, DISPB, RSVD, RSVD, RSVD4, LD21_20),
+ PINP(LHP1, LCD, DISPA, DISPB, RSVD, RSVD, RSVD4, LD19_18),
+ PINP(LHP2, LCD, DISPA, DISPB, RSVD, RSVD, RSVD4, LD19_18),
+ PINP(LVP0, LCD, DISPA, DISPB, RSVD, RSVD, RSVD4, LC),
+ PINP(LVP1, LCD, DISPA, DISPB, RSVD, RSVD, RSVD4, LD21_20),
+ PINP(HDINT, LCD, HDMI, RSVD, RSVD, RSVD, HDMI , LC),
+
+ PINP(LM0, LCD, DISPA, DISPB, SPI3, RSVD, RSVD4, LC),
+ PINP(LM1, LCD, DISPA, DISPB, RSVD, CRT, RSVD3, LC),
+ PINP(LVS, LCD, DISPA, DISPB, XIO, RSVD, RSVD4, LC),
+ PINP(LSC0, LCD, DISPA, DISPB, XIO, RSVD, RSVD4, LC),
+ PINP(LSC1, LCD, DISPA, DISPB, SPI3, HDMI, DISPA, LS),
+ PINP(LSCK, LCD, DISPA, DISPB, SPI3, HDMI, DISPA, LS),
+ PINP(LDC, LCD, DISPA, DISPB, RSVD, RSVD, RSVD4, LS),
+ PINP(LCSN, LCD, DISPA, DISPB, SPI3, RSVD, RSVD4, LS),
+
+ /* 96 */
+ PINP(LSPI, LCD, DISPA, DISPB, XIO, HDMI, DISPA, LC),
+ PINP(LSDA, LCD, DISPA, DISPB, SPI3, HDMI, DISPA, LS),
+ PINP(LSDI, LCD, DISPA, DISPB, SPI3, RSVD, DISPA, LS),
+ PINP(LPW0, LCD, DISPA, DISPB, SPI3, HDMI, DISPA, LS),
+ PINP(LPW1, LCD, DISPA, DISPB, RSVD, RSVD, RSVD4, LS),
+ PINP(LPW2, LCD, DISPA, DISPB, SPI3, HDMI, DISPA, LS),
+ PINP(LDI, LCD, DISPA, DISPB, RSVD, RSVD, RSVD4, LD23_22),
+ PINP(LHS, LCD, DISPA, DISPB, XIO, RSVD, RSVD4, LC),
+
+ PINP(LPP, LCD, DISPA, DISPB, RSVD, RSVD, RSVD4, LD23_22),
+ PIN_RESERVED,
+ PIN(KBCD, SYS, KBC, NAND, SDIO2, MIO, KBC),
+ PIN(GPU7, SYS, RTCK, RSVD, RSVD, RSVD, RTCK),
+ PIN(DTF, VI, I2C3, RSVD, VI, RSVD, RSVD4),
+ PIN(UDA, BB, SPI1, RSVD, UARTD, ULPI, RSVD2),
+ PIN(CRTP, LCD, CRT, RSVD, RSVD, RSVD, RSVD),
+ PINP(SDB, SD, UARTA, PWM, SDIO3, SPI2, PWM, NONE),
+
+ /* these pin groups only have pullup and pull down control */
+ PINALL(CK32, SYS, RSVD, RSVD, RSVD, RSVD, RSVD, MUXCTL_NONE,
+ PUCTL_NONE),
+ PINALL(DDRC, DDR, RSVD, RSVD, RSVD, RSVD, RSVD, MUXCTL_NONE,
+ PUCTL_NONE),
+ PINALL(PMCA, SYS, RSVD, RSVD, RSVD, RSVD, RSVD, MUXCTL_NONE,
+ PUCTL_NONE),
+ PINALL(PMCB, SYS, RSVD, RSVD, RSVD, RSVD, RSVD, MUXCTL_NONE,
+ PUCTL_NONE),
+ PINALL(PMCC, SYS, RSVD, RSVD, RSVD, RSVD, RSVD, MUXCTL_NONE,
+ PUCTL_NONE),
+ PINALL(PMCD, SYS, RSVD, RSVD, RSVD, RSVD, RSVD, MUXCTL_NONE,
+ PUCTL_NONE),
+ PINALL(PMCE, SYS, RSVD, RSVD, RSVD, RSVD, RSVD, MUXCTL_NONE,
+ PUCTL_NONE),
+ PINALL(XM2C, DDR, RSVD, RSVD, RSVD, RSVD, RSVD, MUXCTL_NONE,
+ PUCTL_NONE),
+ PINALL(XM2D, DDR, RSVD, RSVD, RSVD, RSVD, RSVD, MUXCTL_NONE,
+ PUCTL_NONE),
+};
+
+void pinmux_set_tristate(enum pmux_pingrp pin, int enable)
{
- struct pmux_tri_ctlr *pmt = (struct pmux_tri_ctlr *)NV_PA_APB_MISC_BASE;
+ struct pmux_tri_ctlr *pmt =
+ (struct pmux_tri_ctlr *)NV_PA_APB_MISC_BASE;
u32 *tri = &pmt->pmt_tri[TRISTATE_REG(pin)];
u32 reg;
@@ -41,12 +495,78 @@ void pinmux_set_tristate(enum pmux_pin pin, int enable)
writel(reg, tri);
}
-void pinmux_tristate_enable(enum pmux_pin pin)
+void pinmux_tristate_enable(enum pmux_pingrp pin)
{
pinmux_set_tristate(pin, 1);
}
-void pinmux_tristate_disable(enum pmux_pin pin)
+void pinmux_tristate_disable(enum pmux_pingrp pin)
{
pinmux_set_tristate(pin, 0);
}
+
+void pinmux_set_pullupdown(enum pmux_pingrp pin, enum pmux_pull pupd)
+{
+ struct pmux_tri_ctlr *pmt =
+ (struct pmux_tri_ctlr *)NV_PA_APB_MISC_BASE;
+ enum pmux_pullid pull_id = tegra_soc_pingroups[pin].pull_id;
+ u32 *pull = &pmt->pmt_pull[PULL_REG(pull_id)];
+ u32 mask_bit;
+ u32 reg;
+ mask_bit = PULL_SHIFT(pull_id);
+
+ reg = readl(pull);
+ reg &= ~(0x3 << mask_bit);
+ reg |= pupd << mask_bit;
+ writel(reg, pull);
+}
+
+void pinmux_set_func(enum pmux_pingrp pin, enum pmux_func func)
+{
+ struct pmux_tri_ctlr *pmt =
+ (struct pmux_tri_ctlr *)NV_PA_APB_MISC_BASE;
+ enum pmux_ctlid mux_id = tegra_soc_pingroups[pin].ctl_id;
+ u32 *muxctl = &pmt->pmt_ctl[MUXCTL_REG(mux_id)];
+ u32 mask_bit;
+ int i, mux = -1;
+ u32 reg;
+
+ assert(pmux_func_isvalid(func));
+
+ /* Handle special values */
+ if (func >= PMUX_FUNC_RSVD1) {
+ mux = (func - PMUX_FUNC_RSVD1) & 0x3;
+ } else {
+ /* Search for the appropriate function */
+ for (i = 0; i < 4; i++) {
+ if (tegra_soc_pingroups[pin].funcs[i] == func) {
+ mux = i;
+ break;
+ }
+ }
+ }
+ assert(mux != -1);
+
+ mask_bit = MUXCTL_SHIFT(mux_id);
+ reg = readl(muxctl);
+ reg &= ~(0x3 << mask_bit);
+ reg |= mux << mask_bit;
+ writel(reg, muxctl);
+}
+
+void pinmux_config_pingroup(struct pingroup_config *config)
+{
+ enum pmux_pingrp pin = config->pingroup;
+
+ pinmux_set_func(pin, config->func);
+ pinmux_set_pullupdown(pin, config->pull);
+ pinmux_set_tristate(pin, config->tristate);
+}
+
+void pinmux_config_table(struct pingroup_config *config, int len)
+{
+ int i;
+
+ for (i = 0; i < len; i++)
+ pinmux_config_pingroup(&config[i]);
+}
diff --git a/arch/arm/include/asm/arch-am33xx/clock.h b/arch/arm/include/asm/arch-am33xx/clock.h
new file mode 100644
index 0000000..872ff82
--- /dev/null
+++ b/arch/arm/include/asm/arch-am33xx/clock.h
@@ -0,0 +1,24 @@
+/*
+ * clock.h
+ *
+ * clock header
+ *
+ * Copyright (C) 2011, Texas Instruments, Incorporated - http://www.ti.com/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR /PURPOSE. See the
+ * GNU General Public License for more details.
+ */
+
+#ifndef _CLOCKS_H_
+#define _CLOCKS_H_
+
+#include <asm/arch/clocks_am33xx.h>
+
+#endif
diff --git a/arch/arm/include/asm/arch-am33xx/clocks_am33xx.h b/arch/arm/include/asm/arch-am33xx/clocks_am33xx.h
new file mode 100644
index 0000000..abc5b6b
--- /dev/null
+++ b/arch/arm/include/asm/arch-am33xx/clocks_am33xx.h
@@ -0,0 +1,55 @@
+/*
+ * clocks_am33xx.h
+ *
+ * AM33xx clock define
+ *
+ * Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR /PURPOSE. See the
+ * GNU General Public License for more details.
+ */
+
+#ifndef _CLOCKS_AM33XX_H_
+#define _CLOCKS_AM33XX_H_
+
+#define OSC 24
+
+/* MAIN PLL Fdll = 550 MHZ, */
+#define MPUPLL_M 550
+#define MPUPLL_N 23
+#define MPUPLL_M2 1
+
+/* Core PLL Fdll = 1 GHZ, */
+#define COREPLL_M 1000
+#define COREPLL_N 23
+
+#define COREPLL_M4 10 /* CORE_CLKOUTM4 = 200 MHZ */
+#define COREPLL_M5 8 /* CORE_CLKOUTM5 = 250 MHZ */
+#define COREPLL_M6 4 /* CORE_CLKOUTM6 = 500 MHZ */
+
+/*
+ * USB PHY clock is 960 MHZ. Since, this comes directly from Fdll, Fdll
+ * frequency needs to be set to 960 MHZ. Hence,
+ * For clkout = 192 MHZ, Fdll = 960 MHZ, divider values are given below
+ */
+#define PERPLL_M 960
+#define PERPLL_N 23
+#define PERPLL_M2 5
+
+/* DDR Freq is 266 MHZ for now */
+/* Set Fdll = 400 MHZ , Fdll = M * 2 * CLKINP/ N + 1; clkout = Fdll /(2 * M2) */
+#define DDRPLL_M 266
+#define DDRPLL_N 23
+#define DDRPLL_M2 1
+
+extern void pll_init(void);
+extern void enable_emif_clocks(void);
+
+#endif /* endif _CLOCKS_AM33XX_H_ */
diff --git a/arch/arm/include/asm/arch-am33xx/cpu.h b/arch/arm/include/asm/arch-am33xx/cpu.h
new file mode 100644
index 0000000..ad9156e
--- /dev/null
+++ b/arch/arm/include/asm/arch-am33xx/cpu.h
@@ -0,0 +1,218 @@
+/*
+ * cpu.h
+ *
+ * AM33xx specific header file
+ *
+ * Copyright (C) 2011, Texas Instruments, Incorporated - http://www.ti.com/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR /PURPOSE. See the
+ * GNU General Public License for more details.
+ */
+
+#ifndef _AM33XX_CPU_H
+#define _AM33XX_CPU_H
+
+#if !(defined(__KERNEL_STRICT_NAMES) || defined(__ASSEMBLY__))
+#include <asm/types.h>
+#endif /* !(__KERNEL_STRICT_NAMES || __ASSEMBLY__) */
+
+#include <asm/arch/hardware.h>
+
+#define BIT(x) (1 << x)
+#define CL_BIT(x) (0 << x)
+
+/* Timer register bits */
+#define TCLR_ST BIT(0) /* Start=1 Stop=0 */
+#define TCLR_AR BIT(1) /* Auto reload */
+#define TCLR_PRE BIT(5) /* Pre-scaler enable */
+#define TCLR_PTV_SHIFT (2) /* Pre-scaler shift value */
+#define TCLR_PRE_DISABLE CL_BIT(5) /* Pre-scalar disable */
+
+/* device type */
+#define DEVICE_MASK (BIT(8) | BIT(9) | BIT(10))
+#define TST_DEVICE 0x0
+#define EMU_DEVICE 0x1
+#define HS_DEVICE 0x2
+#define GP_DEVICE 0x3
+
+/* cpu-id for AM33XX family */
+#define AM335X 0xB944
+#define DEVICE_ID 0x44E10600
+
+/* This gives the status of the boot mode pins on the evm */
+#define SYSBOOT_MASK (BIT(0) | BIT(1) | BIT(2)\
+ | BIT(3) | BIT(4))
+
+/* Reset control */
+#ifdef CONFIG_AM335X
+#define PRM_RSTCTRL 0x44E00F00
+#endif
+#define PRM_RSTCTRL_RESET 0x01
+
+#ifndef __KERNEL_STRICT_NAMES
+#ifndef __ASSEMBLY__
+/* Encapsulating core pll registers */
+struct cm_wkuppll {
+ unsigned int wkclkstctrl; /* offset 0x00 */
+ unsigned int wkctrlclkctrl; /* offset 0x04 */
+ unsigned int resv1[1];
+ unsigned int wkl4wkclkctrl; /* offset 0x0c */
+ unsigned int resv2[4];
+ unsigned int idlestdpllmpu; /* offset 0x20 */
+ unsigned int resv3[2];
+ unsigned int clkseldpllmpu; /* offset 0x2c */
+ unsigned int resv4[1];
+ unsigned int idlestdpllddr; /* offset 0x34 */
+ unsigned int resv5[2];
+ unsigned int clkseldpllddr; /* offset 0x40 */
+ unsigned int resv6[4];
+ unsigned int clkseldplldisp; /* offset 0x54 */
+ unsigned int resv7[1];
+ unsigned int idlestdpllcore; /* offset 0x5c */
+ unsigned int resv8[2];
+ unsigned int clkseldpllcore; /* offset 0x68 */
+ unsigned int resv9[1];
+ unsigned int idlestdpllper; /* offset 0x70 */
+ unsigned int resv10[3];
+ unsigned int divm4dpllcore; /* offset 0x80 */
+ unsigned int divm5dpllcore; /* offset 0x84 */
+ unsigned int clkmoddpllmpu; /* offset 0x88 */
+ unsigned int clkmoddpllper; /* offset 0x8c */
+ unsigned int clkmoddpllcore; /* offset 0x90 */
+ unsigned int clkmoddpllddr; /* offset 0x94 */
+ unsigned int clkmoddplldisp; /* offset 0x98 */
+ unsigned int clkseldpllper; /* offset 0x9c */
+ unsigned int divm2dpllddr; /* offset 0xA0 */
+ unsigned int divm2dplldisp; /* offset 0xA4 */
+ unsigned int divm2dpllmpu; /* offset 0xA8 */
+ unsigned int divm2dpllper; /* offset 0xAC */
+ unsigned int resv11[1];
+ unsigned int wkup_uart0ctrl; /* offset 0xB4 */
+ unsigned int resv12[8];
+ unsigned int divm6dpllcore; /* offset 0xD8 */
+};
+
+/**
+ * Encapsulating peripheral functional clocks
+ * pll registers
+ */
+struct cm_perpll {
+ unsigned int l4lsclkstctrl; /* offset 0x00 */
+ unsigned int l3sclkstctrl; /* offset 0x04 */
+ unsigned int l4fwclkstctrl; /* offset 0x08 */
+ unsigned int l3clkstctrl; /* offset 0x0c */
+ unsigned int resv1[6];
+ unsigned int emifclkctrl; /* offset 0x28 */
+ unsigned int ocmcramclkctrl; /* offset 0x2c */
+ unsigned int resv2[12];
+ unsigned int l4lsclkctrl; /* offset 0x60 */
+ unsigned int l4fwclkctrl; /* offset 0x64 */
+ unsigned int resv3[6];
+ unsigned int timer2clkctrl; /* offset 0x80 */
+ unsigned int resv4[19];
+ unsigned int emiffwclkctrl; /* offset 0xD0 */
+ unsigned int resv5[2];
+ unsigned int l3instrclkctrl; /* offset 0xDC */
+ unsigned int l3clkctrl; /* Offset 0xE0 */
+ unsigned int resv6[14];
+ unsigned int l4hsclkstctrl; /* offset 0x11C */
+ unsigned int l4hsclkctrl; /* offset 0x120 */
+};
+
+/* Encapsulating Display pll registers */
+struct cm_dpll {
+ unsigned int resv1[2];
+ unsigned int clktimer2clk; /* offset 0x08 */
+};
+
+/* Watchdog timer registers */
+struct wd_timer {
+ unsigned int resv1[4];
+ unsigned int wdtwdsc; /* offset 0x010 */
+ unsigned int wdtwdst; /* offset 0x014 */
+ unsigned int wdtwisr; /* offset 0x018 */
+ unsigned int wdtwier; /* offset 0x01C */
+ unsigned int wdtwwer; /* offset 0x020 */
+ unsigned int wdtwclr; /* offset 0x024 */
+ unsigned int wdtwcrr; /* offset 0x028 */
+ unsigned int wdtwldr; /* offset 0x02C */
+ unsigned int wdtwtgr; /* offset 0x030 */
+ unsigned int wdtwwps; /* offset 0x034 */
+ unsigned int resv2[3];
+ unsigned int wdtwdly; /* offset 0x044 */
+ unsigned int wdtwspr; /* offset 0x048 */
+ unsigned int resv3[1];
+ unsigned int wdtwqeoi; /* offset 0x050 */
+ unsigned int wdtwqstar; /* offset 0x054 */
+ unsigned int wdtwqsta; /* offset 0x058 */
+ unsigned int wdtwqens; /* offset 0x05C */
+ unsigned int wdtwqenc; /* offset 0x060 */
+ unsigned int resv4[39];
+ unsigned int wdt_unfr; /* offset 0x100 */
+};
+
+/* Timer Registers */
+struct timer_reg {
+ unsigned int resv1[4];
+ unsigned int tiocpcfgreg; /* offset 0x10 */
+ unsigned int resv2[9];
+ unsigned int tclrreg; /* offset 0x38 */
+ unsigned int tcrrreg; /* offset 0x3C */
+ unsigned int tldrreg; /* offset 0x40 */
+ unsigned int resv3[4];
+ unsigned int tsicrreg; /* offset 0x54 */
+};
+
+/* Timer 32 bit registers */
+struct gptimer {
+ unsigned int tidr; /* offset 0x00 */
+ unsigned int res1[0xc];
+ unsigned int tiocp_cfg; /* offset 0x10 */
+ unsigned int res2[0xc];
+ unsigned int tier; /* offset 0x20 */
+ unsigned int tistatr; /* offset 0x24 */
+ unsigned int tistat; /* offset 0x28 */
+ unsigned int tisr; /* offset 0x2c */
+ unsigned int tcicr; /* offset 0x30 */
+ unsigned int twer; /* offset 0x34 */
+ unsigned int tclr; /* offset 0x38 */
+ unsigned int tcrr; /* offset 0x3c */
+ unsigned int tldr; /* offset 0x40 */
+ unsigned int ttgr; /* offset 0x44 */
+ unsigned int twpc; /* offset 0x48 */
+ unsigned int tmar; /* offset 0x4c */
+ unsigned int tcar1; /* offset 0x50 */
+ unsigned int tscir; /* offset 0x54 */
+ unsigned int tcar2; /* offset 0x58 */
+};
+
+/* UART Registers */
+struct uart_sys {
+ unsigned int resv1[21];
+ unsigned int uartsyscfg; /* offset 0x54 */
+ unsigned int uartsyssts; /* offset 0x58 */
+};
+
+/* VTP Registers */
+struct vtp_reg {
+ unsigned int vtp0ctrlreg;
+};
+
+/* Control Status Register */
+struct ctrl_stat {
+ unsigned int resv1[16];
+ unsigned int statusreg; /* ofset 0x40 */
+};
+
+void init_timer(void);
+#endif /* __ASSEMBLY__ */
+#endif /* __KERNEL_STRICT_NAMES */
+
+#endif /* _AM33XX_CPU_H */
diff --git a/arch/arm/include/asm/arch-am33xx/ddr_defs.h b/arch/arm/include/asm/arch-am33xx/ddr_defs.h
new file mode 100644
index 0000000..9638b4c
--- /dev/null
+++ b/arch/arm/include/asm/arch-am33xx/ddr_defs.h
@@ -0,0 +1,264 @@
+/*
+ * ddr_defs.h
+ *
+ * ddr specific header
+ *
+ * Copyright (C) 2011, Texas Instruments, Incorporated - http://www.ti.com/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR /PURPOSE. See the
+ * GNU General Public License for more details.
+ */
+
+#ifndef _DDR_DEFS_H
+#define _DDR_DEFS_H
+
+#include <asm/arch/hardware.h>
+
+/* AM335X EMIF Register values */
+#define EMIF_SDMGT 0x80000000
+#define EMIF_SDRAM 0x00004650
+#define EMIF_PHYCFG 0x2
+#define DDR_PHY_RESET (0x1 << 10)
+#define DDR_FUNCTIONAL_MODE_EN 0x1
+#define DDR_PHY_READY (0x1 << 2)
+#define VTP_CTRL_READY (0x1 << 5)
+#define VTP_CTRL_ENABLE (0x1 << 6)
+#define VTP_CTRL_LOCK_EN (0x1 << 4)
+#define VTP_CTRL_START_EN (0x1)
+#define DDR2_RATIO 0x80
+#define CMD_FORCE 0x00
+#define CMD_DELAY 0x00
+
+#define EMIF_READ_LATENCY 0x04
+#define EMIF_TIM1 0x0666B3D6
+#define EMIF_TIM2 0x143731DA
+#define EMIF_TIM3 0x00000347
+#define EMIF_SDCFG 0x43805332
+#define EMIF_SDREF 0x0000081a
+#define DDR2_DLL_LOCK_DIFF 0x0
+#define DDR2_RD_DQS 0x12
+#define DDR2_PHY_FIFO_WE 0x80
+
+#define DDR2_INVERT_CLKOUT 0x00
+#define DDR2_WR_DQS 0x00
+#define DDR2_PHY_WRLVL 0x00
+#define DDR2_PHY_GATELVL 0x00
+#define DDR2_PHY_WR_DATA 0x40
+#define PHY_RANK0_DELAY 0x01
+#define PHY_DLL_LOCK_DIFF 0x0
+#define DDR_IOCTRL_VALUE 0x18B
+
+/**
+ * This structure represents the EMIF registers on AM33XX devices.
+ */
+struct emif_regs {
+ unsigned int sdrrev; /* offset 0x00 */
+ unsigned int sdrstat; /* offset 0x04 */
+ unsigned int sdrcr; /* offset 0x08 */
+ unsigned int sdrcr2; /* offset 0x0C */
+ unsigned int sdrrcr; /* offset 0x10 */
+ unsigned int sdrrcsr; /* offset 0x14 */
+ unsigned int sdrtim1; /* offset 0x18 */
+ unsigned int sdrtim1sr; /* offset 0x1C */
+ unsigned int sdrtim2; /* offset 0x20 */
+ unsigned int sdrtim2sr; /* offset 0x24 */
+ unsigned int sdrtim3; /* offset 0x28 */
+ unsigned int sdrtim3sr; /* offset 0x2C */
+ unsigned int res1[2];
+ unsigned int sdrmcr; /* offset 0x38 */
+ unsigned int sdrmcsr; /* offset 0x3C */
+ unsigned int res2[8];
+ unsigned int sdritr; /* offset 0x60 */
+ unsigned int res3[20];
+ unsigned int ddrphycr; /* offset 0xE4 */
+ unsigned int ddrphycsr; /* offset 0xE8 */
+ unsigned int ddrphycr2; /* offset 0xEC */
+};
+
+/**
+ * Encapsulates DDR PHY control and corresponding shadow registers.
+ */
+struct ddr_phy_control {
+ unsigned long reg;
+ unsigned long reg_sh;
+ unsigned long reg2;
+};
+
+/**
+ * Encapsulates SDRAM timing and corresponding shadow registers.
+ */
+struct sdram_timing {
+ unsigned long time1;
+ unsigned long time1_sh;
+ unsigned long time2;
+ unsigned long time2_sh;
+ unsigned long time3;
+ unsigned long time3_sh;
+};
+
+/**
+ * Encapsulates SDRAM configuration.
+ * (Includes refresh control registers) */
+struct sdram_config {
+ unsigned long sdrcr;
+ unsigned long sdrcr2;
+ unsigned long refresh;
+ unsigned long refresh_sh;
+};
+
+/**
+ * Configure SDRAM
+ */
+int config_sdram(struct sdram_config *cfg);
+
+/**
+ * Set SDRAM timings
+ */
+int set_sdram_timings(struct sdram_timing *val);
+
+/**
+ * Configure DDR PHY
+ */
+int config_ddr_phy(struct ddr_phy_control *cfg);
+
+/**
+ * This structure represents the DDR registers on AM33XX devices.
+ */
+struct ddr_regs {
+ unsigned int resv0[7];
+ unsigned int cm0csratio; /* offset 0x01C */
+ unsigned int cm0csforce; /* offset 0x020 */
+ unsigned int cm0csdelay; /* offset 0x024 */
+ unsigned int cm0dldiff; /* offset 0x028 */
+ unsigned int cm0iclkout; /* offset 0x02C */
+ unsigned int resv1[8];
+ unsigned int cm1csratio; /* offset 0x050 */
+ unsigned int cm1csforce; /* offset 0x054 */
+ unsigned int cm1csdelay; /* offset 0x058 */
+ unsigned int cm1dldiff; /* offset 0x05C */
+ unsigned int cm1iclkout; /* offset 0x060 */
+ unsigned int resv2[8];
+ unsigned int cm2csratio; /* offset 0x084 */
+ unsigned int cm2csforce; /* offset 0x088 */
+ unsigned int cm2csdelay; /* offset 0x08C */
+ unsigned int cm2dldiff; /* offset 0x090 */
+ unsigned int cm2iclkout; /* offset 0x094 */
+ unsigned int resv3[12];
+ unsigned int dt0rdsratio0; /* offset 0x0C8 */
+ unsigned int dt0rdsratio1; /* offset 0x0CC */
+ unsigned int resv4[3];
+ unsigned int dt0wdsratio0; /* offset 0x0DC */
+ unsigned int dt0wdsratio1; /* offset 0x0E0 */
+ unsigned int resv5[3];
+ unsigned int dt0wiratio0; /* offset 0x0F0 */
+ unsigned int dt0wiratio1; /* offset 0x0F4 */
+ unsigned int dt0giratio0; /* offset 0x0FC */
+ unsigned int dt0giratio1; /* offset 0x100 */
+ unsigned int resv6[2];
+ unsigned int dt0fwsratio0; /* offset 0x108 */
+ unsigned int dt0fwsratio1; /* offset 0x10C */
+ unsigned int resv7[5];
+ unsigned int dt0wrsratio0; /* offset 0x120 */
+ unsigned int dt0wrsratio1; /* offset 0x124 */
+ unsigned int resv8[3];
+ unsigned int dt0rdelays0; /* offset 0x134 */
+ unsigned int dt0dldiff0; /* offset 0x138 */
+ unsigned int resv9[39];
+ unsigned int dt1rdelays0; /* offset 0x1D8 */
+};
+
+/**
+ * Encapsulates DDR CMD control registers.
+ */
+struct cmd_control {
+ unsigned long cmd0csratio;
+ unsigned long cmd0csforce;
+ unsigned long cmd0csdelay;
+ unsigned long cmd0dldiff;
+ unsigned long cmd0iclkout;
+ unsigned long cmd1csratio;
+ unsigned long cmd1csforce;
+ unsigned long cmd1csdelay;
+ unsigned long cmd1dldiff;
+ unsigned long cmd1iclkout;
+ unsigned long cmd2csratio;
+ unsigned long cmd2csforce;
+ unsigned long cmd2csdelay;
+ unsigned long cmd2dldiff;
+ unsigned long cmd2iclkout;
+};
+
+/**
+ * Encapsulates DDR DATA registers.
+ */
+struct ddr_data {
+ unsigned long datardsratio0;
+ unsigned long datardsratio1;
+ unsigned long datawdsratio0;
+ unsigned long datawdsratio1;
+ unsigned long datawiratio0;
+ unsigned long datawiratio1;
+ unsigned long datagiratio0;
+ unsigned long datagiratio1;
+ unsigned long datafwsratio0;
+ unsigned long datafwsratio1;
+ unsigned long datawrsratio0;
+ unsigned long datawrsratio1;
+ unsigned long datadldiff0;
+};
+
+/**
+ * Configure DDR CMD control registers
+ */
+int config_cmd_ctrl(struct cmd_control *cmd);
+
+/**
+ * Configure DDR DATA registers
+ */
+int config_ddr_data(int data_macrono, struct ddr_data *data);
+
+/**
+ * This structure represents the DDR io control on AM33XX devices.
+ */
+struct ddr_cmdtctrl {
+ unsigned int resv1[1];
+ unsigned int cm0ioctl;
+ unsigned int cm1ioctl;
+ unsigned int cm2ioctl;
+ unsigned int resv2[12];
+ unsigned int dt0ioctl;
+ unsigned int dt1ioctl;
+};
+
+/**
+ * Encapsulates DDR CMD & DATA io control registers.
+ */
+struct ddr_ioctrl {
+ unsigned long cmd1ctl;
+ unsigned long cmd2ctl;
+ unsigned long cmd3ctl;
+ unsigned long data1ctl;
+ unsigned long data2ctl;
+};
+
+/**
+ * Configure DDR io control registers
+ */
+int config_io_ctrl(struct ddr_ioctrl *ioctrl);
+
+struct ddr_ctrl {
+ unsigned int ddrioctrl;
+ unsigned int resv1[325];
+ unsigned int ddrckectrl;
+};
+
+void config_ddr(void);
+
+#endif /* _DDR_DEFS_H */
diff --git a/arch/arm/include/asm/arch-am33xx/hardware.h b/arch/arm/include/asm/arch-am33xx/hardware.h
new file mode 100644
index 0000000..0ec22eb
--- /dev/null
+++ b/arch/arm/include/asm/arch-am33xx/hardware.h
@@ -0,0 +1,81 @@
+/*
+ * hardware.h
+ *
+ * hardware specific header
+ *
+ * Copyright (C) 2011, Texas Instruments, Incorporated - http://www.ti.com/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR /PURPOSE. See the
+ * GNU General Public License for more details.
+ */
+
+#ifndef __AM33XX_HARDWARE_H
+#define __AM33XX_HARDWARE_H
+
+/* Module base addresses */
+#define LOW_LEVEL_SRAM_STACK 0x4030B7FC
+#define UART0_BASE 0x44E09000
+
+/* DM Timer base addresses */
+#define DM_TIMER0_BASE 0x4802C000
+#define DM_TIMER1_BASE 0x4802E000
+#define DM_TIMER2_BASE 0x48040000
+#define DM_TIMER3_BASE 0x48042000
+#define DM_TIMER4_BASE 0x48044000
+#define DM_TIMER5_BASE 0x48046000
+#define DM_TIMER6_BASE 0x48048000
+#define DM_TIMER7_BASE 0x4804A000
+
+/* GPIO Base address */
+#define GPIO0_BASE 0x48032000
+#define GPIO1_BASE 0x4804C000
+#define GPIO2_BASE 0x481AC000
+
+/* BCH Error Location Module */
+#define ELM_BASE 0x48080000
+
+/* Watchdog Timer */
+#define WDT_BASE 0x44E35000
+
+/* Control Module Base Address */
+#define CTRL_BASE 0x44E10000
+
+/* PRCM Base Address */
+#define PRCM_BASE 0x44E00000
+
+/* EMIF Base address */
+#define EMIF4_0_CFG_BASE 0x4C000000
+#define EMIF4_1_CFG_BASE 0x4D000000
+#define DMM_BASE 0x4E000000
+
+/* PLL related registers */
+#define CM_PER 0x44E00000
+#define CM_WKUP 0x44E00400
+#define CM_DPLL 0x44E00500
+#define CM_DEVICE 0x44E00700
+#define CM_CEFUSE 0x44E00A00
+#define PRM_DEVICE 0x44E00F00
+
+/* VTP Base address */
+#define VTP0_CTRL_ADDR 0x44E10E0C
+
+/* DDR Base address */
+#define DDR_CTRL_ADDR 0x44E10E04
+#define DDR_CONTROL_BASE_ADDR 0x44E11404
+#define DDR_PHY_BASE_ADDR 0x44E12000
+#define DDR_PHY_BASE_ADDR2 0x44E120A4
+
+/* UART */
+#define DEFAULT_UART_BASE UART0_BASE
+
+#define DDRPHY_0_CONFIG_BASE (CTRL_BASE + 0x1400)
+#define DDRPHY_CONFIG_BASE DDRPHY_0_CONFIG_BASE
+
+#endif /* __AM33XX_HARDWARE_H */
diff --git a/arch/arm/include/asm/arch-am33xx/sys_proto.h b/arch/arm/include/asm/arch-am33xx/sys_proto.h
new file mode 100644
index 0000000..1e265c6
--- /dev/null
+++ b/arch/arm/include/asm/arch-am33xx/sys_proto.h
@@ -0,0 +1,39 @@
+/*
+ * sys_proto.h
+ *
+ * System information header
+ *
+ * Copyright (C) 2011, Texas Instruments, Incorporated - http://www.ti.com/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR /PURPOSE. See the
+ * GNU General Public License for more details.
+ */
+
+#ifndef _SYS_PROTO_H_
+#define _SYS_PROTO_H_
+
+#define BOARD_REV_ID 0x0
+struct {
+ u32 board_type_v1;
+ u32 board_type_v2;
+ u32 mtype;
+ char *board_string;
+ char *nand_string;
+} board_sysinfo;
+
+u32 get_cpu_rev(void);
+u32 get_sysboot_value(void);
+
+#ifdef CONFIG_DISPLAY_CPUINFO
+int print_cpuinfo(void);
+#endif
+
+u32 get_device_type(void);
+#endif
diff --git a/arch/arm/include/asm/arch-armada100/armada100.h b/arch/arm/include/asm/arch-armada100/armada100.h
index c449d4e..0ed3a8e 100644
--- a/arch/arm/include/asm/arch-armada100/armada100.h
+++ b/arch/arm/include/asm/arch-armada100/armada100.h
@@ -26,13 +26,7 @@
#ifndef _ASM_ARCH_ARMADA100_H
#define _ASM_ARCH_ARMADA100_H
-#ifndef __ASSEMBLY__
-#include <asm/types.h>
-#include <asm/io.h>
-#endif /* __ASSEMBLY__ */
-
#if defined (CONFIG_ARMADA100)
-#include <asm/arch/cpu.h>
/* Common APB clock register bit definitions */
#define APBC_APBCLK (1<<0) /* APB Bus Clock Enable */
@@ -45,6 +39,10 @@
#define FE_CLK_RST 0x1
#define FE_CLK_ENA 0x8
+/* SSP2 Clock Control */
+#define SSP2_APBCLK 0x01
+#define SSP2_FNCLK 0x02
+
/* Register Base Addresses */
#define ARMD1_DRAM_BASE 0xB0000000
#define ARMD1_FEC_BASE 0xC0800000
@@ -65,115 +63,5 @@
#define ARMD1_APMU_BASE 0xD4282800
#define ARMD1_CPU_BASE 0xD4282C00
-/*
- * Main Power Management (MPMU) Registers
- * Refer Datasheet Appendix A.8
- */
-struct armd1mpmu_registers {
- u8 pad0[0x08 - 0x00];
- u32 fccr; /*0x0008*/
- u32 pocr; /*0x000c*/
- u32 posr; /*0x0010*/
- u32 succr; /*0x0014*/
- u8 pad1[0x030 - 0x014 - 4];
- u32 gpcr; /*0x0030*/
- u8 pad2[0x200 - 0x030 - 4];
- u32 wdtpcr; /*0x0200*/
- u8 pad3[0x1000 - 0x200 - 4];
- u32 apcr; /*0x1000*/
- u32 apsr; /*0x1004*/
- u8 pad4[0x1020 - 0x1004 - 4];
- u32 aprr; /*0x1020*/
- u32 acgr; /*0x1024*/
- u32 arsr; /*0x1028*/
-};
-
-/*
- * Application Subsystem Power Management
- * Refer Datasheet Appendix A.9
- */
-struct armd1apmu_registers {
- u32 pcr; /* 0x000 */
- u32 ccr; /* 0x004 */
- u32 pad1;
- u32 ccsr; /* 0x00C */
- u32 fc_timer; /* 0x010 */
- u32 pad2;
- u32 ideal_cfg; /* 0x018 */
- u8 pad3[0x04C - 0x018 - 4];
- u32 lcdcrc; /* 0x04C */
- u32 cciccrc; /* 0x050 */
- u32 sd1crc; /* 0x054 */
- u32 sd2crc; /* 0x058 */
- u32 usbcrc; /* 0x05C */
- u32 nfccrc; /* 0x060 */
- u32 dmacrc; /* 0x064 */
- u32 pad4;
- u32 buscrc; /* 0x06C */
- u8 pad5[0x07C - 0x06C - 4];
- u32 wake_clr; /* 0x07C */
- u8 pad6[0x090 - 0x07C - 4];
- u32 core_status; /* 0x090 */
- u32 rfsc; /* 0x094 */
- u32 imr; /* 0x098 */
- u32 irwc; /* 0x09C */
- u32 isr; /* 0x0A0 */
- u8 pad7[0x0B0 - 0x0A0 - 4];
- u32 mhst; /* 0x0B0 */
- u32 msr; /* 0x0B4 */
- u8 pad8[0x0C0 - 0x0B4 - 4];
- u32 msst; /* 0x0C0 */
- u32 pllss; /* 0x0C4 */
- u32 smb; /* 0x0C8 */
- u32 gccrc; /* 0x0CC */
- u8 pad9[0x0D4 - 0x0CC - 4];
- u32 smccrc; /* 0x0D4 */
- u32 pad10;
- u32 xdcrc; /* 0x0DC */
- u32 sd3crc; /* 0x0E0 */
- u32 sd4crc; /* 0x0E4 */
- u8 pad11[0x0F0 - 0x0E4 - 4];
- u32 cfcrc; /* 0x0F0 */
- u32 mspcrc; /* 0x0F4 */
- u32 cmucrc; /* 0x0F8 */
- u32 fecrc; /* 0x0FC */
- u32 pciecrc; /* 0x100 */
- u32 epdcrc; /* 0x104 */
-};
-
-/*
- * APB1 Clock Reset/Control Registers
- * Refer Datasheet Appendix A.10
- */
-struct armd1apb1_registers {
- u32 uart1; /*0x000*/
- u32 uart2; /*0x004*/
- u32 gpio; /*0x008*/
- u32 pwm1; /*0x00c*/
- u32 pwm2; /*0x010*/
- u32 pwm3; /*0x014*/
- u32 pwm4; /*0x018*/
- u8 pad0[0x028 - 0x018 - 4];
- u32 rtc; /*0x028*/
- u32 twsi0; /*0x02c*/
- u32 kpc; /*0x030*/
- u32 timers; /*0x034*/
- u8 pad1[0x03c - 0x034 - 4];
- u32 aib; /*0x03c*/
- u32 sw_jtag; /*0x040*/
- u32 timer1; /*0x044*/
- u32 onewire; /*0x048*/
- u8 pad2[0x050 - 0x048 - 4];
- u32 asfar; /*0x050 AIB Secure First Access Reg*/
- u32 assar; /*0x054 AIB Secure Second Access Reg*/
- u8 pad3[0x06c - 0x054 - 4];
- u32 twsi1; /*0x06c*/
- u32 uart3; /*0x070*/
- u8 pad4[0x07c - 0x070 - 4];
- u32 timer2; /*0x07C*/
- u8 pad5[0x084 - 0x07c - 4];
- u32 ac97; /*0x084*/
-};
-
#endif /* CONFIG_ARMADA100 */
#endif /* _ASM_ARCH_ARMADA100_H */
diff --git a/arch/arm/include/asm/arch-armada100/config.h b/arch/arm/include/asm/arch-armada100/config.h
index 1126b38..d2094e5 100644
--- a/arch/arm/include/asm/arch-armada100/config.h
+++ b/arch/arm/include/asm/arch-armada100/config.h
@@ -31,6 +31,7 @@
#ifndef _ARMD1_CONFIG_H
#define _ARMD1_CONFIG_H
+#include <asm/arch/armada100.h>
#define CONFIG_ARM926EJS 1 /* Basic Architecture */
#define CONFIG_SYS_TCLK (14745600) /* NS16550 clk config */
diff --git a/arch/arm/include/asm/arch-armada100/cpu.h b/arch/arm/include/asm/arch-armada100/cpu.h
index 0518a6a..da42773 100644
--- a/arch/arm/include/asm/arch-armada100/cpu.h
+++ b/arch/arm/include/asm/arch-armada100/cpu.h
@@ -29,6 +29,131 @@
#include <asm/system.h>
/*
+ * Main Power Management (MPMU) Registers
+ * Refer Datasheet Appendix A.8
+ */
+struct armd1mpmu_registers {
+ u8 pad0[0x08 - 0x00];
+ u32 fccr; /*0x0008*/
+ u32 pocr; /*0x000c*/
+ u32 posr; /*0x0010*/
+ u32 succr; /*0x0014*/
+ u8 pad1[0x030 - 0x014 - 4];
+ u32 gpcr; /*0x0030*/
+ u8 pad2[0x200 - 0x030 - 4];
+ u32 wdtpcr; /*0x0200*/
+ u8 pad3[0x1000 - 0x200 - 4];
+ u32 apcr; /*0x1000*/
+ u32 apsr; /*0x1004*/
+ u8 pad4[0x1020 - 0x1004 - 4];
+ u32 aprr; /*0x1020*/
+ u32 acgr; /*0x1024*/
+ u32 arsr; /*0x1028*/
+};
+
+/*
+ * Application Subsystem Power Management
+ * Refer Datasheet Appendix A.9
+ */
+struct armd1apmu_registers {
+ u32 pcr; /* 0x000 */
+ u32 ccr; /* 0x004 */
+ u32 pad1;
+ u32 ccsr; /* 0x00C */
+ u32 fc_timer; /* 0x010 */
+ u32 pad2;
+ u32 ideal_cfg; /* 0x018 */
+ u8 pad3[0x04C - 0x018 - 4];
+ u32 lcdcrc; /* 0x04C */
+ u32 cciccrc; /* 0x050 */
+ u32 sd1crc; /* 0x054 */
+ u32 sd2crc; /* 0x058 */
+ u32 usbcrc; /* 0x05C */
+ u32 nfccrc; /* 0x060 */
+ u32 dmacrc; /* 0x064 */
+ u32 pad4;
+ u32 buscrc; /* 0x06C */
+ u8 pad5[0x07C - 0x06C - 4];
+ u32 wake_clr; /* 0x07C */
+ u8 pad6[0x090 - 0x07C - 4];
+ u32 core_status; /* 0x090 */
+ u32 rfsc; /* 0x094 */
+ u32 imr; /* 0x098 */
+ u32 irwc; /* 0x09C */
+ u32 isr; /* 0x0A0 */
+ u8 pad7[0x0B0 - 0x0A0 - 4];
+ u32 mhst; /* 0x0B0 */
+ u32 msr; /* 0x0B4 */
+ u8 pad8[0x0C0 - 0x0B4 - 4];
+ u32 msst; /* 0x0C0 */
+ u32 pllss; /* 0x0C4 */
+ u32 smb; /* 0x0C8 */
+ u32 gccrc; /* 0x0CC */
+ u8 pad9[0x0D4 - 0x0CC - 4];
+ u32 smccrc; /* 0x0D4 */
+ u32 pad10;
+ u32 xdcrc; /* 0x0DC */
+ u32 sd3crc; /* 0x0E0 */
+ u32 sd4crc; /* 0x0E4 */
+ u8 pad11[0x0F0 - 0x0E4 - 4];
+ u32 cfcrc; /* 0x0F0 */
+ u32 mspcrc; /* 0x0F4 */
+ u32 cmucrc; /* 0x0F8 */
+ u32 fecrc; /* 0x0FC */
+ u32 pciecrc; /* 0x100 */
+ u32 epdcrc; /* 0x104 */
+};
+
+/*
+ * APB1 Clock Reset/Control Registers
+ * Refer Datasheet Appendix A.10
+ */
+struct armd1apb1_registers {
+ u32 uart1; /*0x000*/
+ u32 uart2; /*0x004*/
+ u32 gpio; /*0x008*/
+ u32 pwm1; /*0x00c*/
+ u32 pwm2; /*0x010*/
+ u32 pwm3; /*0x014*/
+ u32 pwm4; /*0x018*/
+ u8 pad0[0x028 - 0x018 - 4];
+ u32 rtc; /*0x028*/
+ u32 twsi0; /*0x02c*/
+ u32 kpc; /*0x030*/
+ u32 timers; /*0x034*/
+ u8 pad1[0x03c - 0x034 - 4];
+ u32 aib; /*0x03c*/
+ u32 sw_jtag; /*0x040*/
+ u32 timer1; /*0x044*/
+ u32 onewire; /*0x048*/
+ u8 pad2[0x050 - 0x048 - 4];
+ u32 asfar; /*0x050 AIB Secure First Access Reg*/
+ u32 assar; /*0x054 AIB Secure Second Access Reg*/
+ u8 pad3[0x06c - 0x054 - 4];
+ u32 twsi1; /*0x06c*/
+ u32 uart3; /*0x070*/
+ u8 pad4[0x07c - 0x070 - 4];
+ u32 timer2; /*0x07C*/
+ u8 pad5[0x084 - 0x07c - 4];
+ u32 ac97; /*0x084*/
+};
+
+/*
+* APB2 Clock Reset/Control Registers
+* Refer Datasheet Appendix A.11
+*/
+struct armd1apb2_registers {
+ u32 pad1[0x01C - 0x000];
+ u32 ssp1_clkrst; /* 0x01C */
+ u32 ssp2_clkrst; /* 0x020 */
+ u32 pad2[0x04C - 0x020 - 4];
+ u32 ssp3_clkrst; /* 0x04C */
+ u32 pad3[0x058 - 0x04C - 4];
+ u32 ssp4_clkrst; /* 0x058 */
+ u32 ssp5_clkrst; /* 0x05C */
+};
+
+/*
* CPU Interface Registers
* Refer Datasheet Appendix A.2
*/
diff --git a/arch/arm/include/asm/arch-armada100/mfp.h b/arch/arm/include/asm/arch-armada100/mfp.h
index da76b58..d48251a 100644
--- a/arch/arm/include/asm/arch-armada100/mfp.h
+++ b/arch/arm/include/asm/arch-armada100/mfp.h
@@ -83,6 +83,12 @@
#define MFP101_ETH_MDIO (MFP_REG(0x194) | MFP_AF5 | MFP_DRIVE_MEDIUM)
#define MFP103_ETH_RXDV (MFP_REG(0x19C) | MFP_AF5 | MFP_DRIVE_MEDIUM)
+/* SPI */
+#define MFP107_SSP2_RXD (MFP_REG(0x1AC) | MFP_AF4 | MFP_DRIVE_MEDIUM)
+#define MFP108_SSP2_TXD (MFP_REG(0x1B0) | MFP_AF4 | MFP_DRIVE_MEDIUM)
+#define MFP110_SSP2_CS (MFP_REG(0x1B8) | MFP_AF0 | MFP_DRIVE_MEDIUM)
+#define MFP111_SSP2_CLK (MFP_REG(0x1BC) | MFP_AF4 | MFP_DRIVE_MEDIUM)
+
/* More macros can be defined here... */
#define MFP_PIN_MAX 117
diff --git a/arch/arm/include/asm/arch-armada100/spi.h b/arch/arm/include/asm/arch-armada100/spi.h
new file mode 100644
index 0000000..58f0d8f
--- /dev/null
+++ b/arch/arm/include/asm/arch-armada100/spi.h
@@ -0,0 +1,95 @@
+/*
+ * (C) Copyright 2011
+ * eInfochips Ltd. <www.einfochips.com>
+ * Written-by: Ajay Bhargav <ajay.bhargav@einfochips.com>
+ *
+ * (C) Copyright 2010
+ * Marvell Semiconductor <www.marvell.com>
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301 USA
+ */
+
+#ifndef __ARMADA100_SPI_H_
+#define __ARMADA100_SPI_H_
+
+#include <asm/arch/armada100.h>
+
+#define CAT_BASE_ADDR(x) ARMD1_SSP ## x ## _BASE
+#define SSP_REG_BASE(x) CAT_BASE_ADDR(x)
+
+/*
+ * SSP Serial Port Registers
+ * refer Appendix A.26
+ */
+struct ssp_reg {
+ u32 sscr0; /* SSP Control Register 0 - 0x000 */
+ u32 sscr1; /* SSP Control Register 1 - 0x004 */
+ u32 sssr; /* SSP Status Register - 0x008 */
+ u32 ssitr; /* SSP Interrupt Test Register - 0x00C */
+ u32 ssdr; /* SSP Data Register - 0x010 */
+ u32 pad1[5];
+ u32 ssto; /* SSP Timeout Register - 0x028 */
+ u32 sspsp; /* SSP Programmable Serial Protocol Register - 0x02C */
+ u32 sstsa; /* SSP TX Timeslot Active Register - 0x030 */
+ u32 ssrsa; /* SSP RX Timeslot Active Register - 0x034 */
+ u32 sstss; /* SSP Timeslot Status Register - 0x038 */
+};
+
+#define DEFAULT_WORD_LEN 8
+#define SSP_FLUSH_NUM 0x2000
+#define RX_THRESH_DEF 8
+#define TX_THRESH_DEF 8
+#define TIMEOUT_DEF 1000
+
+#define SSCR1_RIE (1 << 0) /* Receive FIFO Interrupt Enable */
+#define SSCR1_TIE (1 << 1) /* Transmit FIFO Interrupt Enable */
+#define SSCR1_LBM (1 << 2) /* Loop-Back Mode */
+#define SSCR1_SPO (1 << 3) /* Motorola SPI SSPSCLK polarity
+ setting */
+#define SSCR1_SPH (1 << 4) /* Motorola SPI SSPSCLK phase setting */
+#define SSCR1_MWDS (1 << 5) /* Microwire Transmit Data Size */
+#define SSCR1_TFT 0x03c0 /* Transmit FIFO Threshold (mask) */
+#define SSCR1_RFT 0x3c00 /* Receive FIFO Threshold (mask) */
+
+#define SSCR1_TXTRESH(x) ((x - 1) << 6) /* level [1..16] */
+#define SSCR1_RXTRESH(x) ((x - 1) << 10) /* level [1..16] */
+#define SSCR1_TINTE (1 << 19) /* Receiver Time-out
+ Interrupt enable */
+
+#define SSCR0_DSS 0x0f /* Data Size Select (mask) */
+#define SSCR0_DATASIZE(x) (x - 1) /* Data Size Select [4..16] */
+#define SSCR0_FRF 0x30 /* FRame Format (mask) */
+#define SSCR0_MOTO (0x0 << 4) /* Motorola's Serial
+ Peripheral Interface */
+#define SSCR0_TI (0x1 << 4) /* TI's Synchronous
+ Serial Protocol (SSP) */
+#define SSCR0_NATIONAL (0x2 << 4) /* National Microwire */
+#define SSCR0_ECS (1 << 6) /* External clock select */
+#define SSCR0_SSE (1 << 7) /* Synchronous Serial Port
+ Enable */
+
+#define SSSR_TNF (1 << 2) /* Transmit FIFO Not Full */
+#define SSSR_RNE (1 << 3) /* Receive FIFO Not Empty */
+#define SSSR_BSY (1 << 4) /* SSP Busy */
+#define SSSR_TFS (1 << 5) /* Transmit FIFO Service Request */
+#define SSSR_RFS (1 << 6) /* Receive FIFO Service Request */
+#define SSSR_ROR (1 << 7) /* Receive FIFO Overrun */
+#define SSSR_TINT (1 << 19) /* Receiver Time-out Interrupt */
+
+#endif /* __ARMADA100_SPI_H_ */
diff --git a/arch/arm/include/asm/arch-davinci/emac_defs.h b/arch/arm/include/asm/arch-davinci/emac_defs.h
index 294a9a8..ea52888 100644
--- a/arch/arm/include/asm/arch-davinci/emac_defs.h
+++ b/arch/arm/include/asm/arch-davinci/emac_defs.h
@@ -84,10 +84,6 @@
#define EMAC_MDIO_CLOCK_FREQ 2000000 /* 2.0 MHz */
#endif
-/* PHY mask - set only those phy number bits where phy is/can be connected */
-#define EMAC_MDIO_PHY_NUM CONFIG_EMAC_MDIO_PHY_NUM
-#define EMAC_MDIO_PHY_MASK (1 << EMAC_MDIO_PHY_NUM)
-
/* Ethernet Min/Max packet size */
#define EMAC_MIN_ETHERNET_PKT_SIZE 60
#define EMAC_MAX_ETHERNET_PKT_SIZE 1518
diff --git a/arch/arm/include/asm/arch-davinci/hardware.h b/arch/arm/include/asm/arch-davinci/hardware.h
index b6a3209..431e87b 100644
--- a/arch/arm/include/asm/arch-davinci/hardware.h
+++ b/arch/arm/include/asm/arch-davinci/hardware.h
@@ -260,6 +260,7 @@ typedef volatile unsigned int * dv_reg_p;
#define DAVINCI_LPSC_UART2 (DAVINCI_LPSC_PSC1_BASE + 13)
#define DAVINCI_LPSC_LCDC (DAVINCI_LPSC_PSC1_BASE + 16)
#define DAVINCI_LPSC_ePWM (DAVINCI_LPSC_PSC1_BASE + 17)
+#define DAVINCI_LPSC_MMCSD1 (DAVINCI_LPSC_PSC1_BASE + 18)
#define DAVINCI_LPSC_eCAP (DAVINCI_LPSC_PSC1_BASE + 20)
#define DAVINCI_LPSC_L3_CBA_RAM (DAVINCI_LPSC_PSC1_BASE + 31)
@@ -356,6 +357,8 @@ struct davinci_psc_regs {
#endif /* CONFIG_SOC_DA8XX */
+#define PSC_MDSTAT_STATE 0x3f
+
#ifndef CONFIG_SOC_DA8XX
/* Miscellania... */
diff --git a/arch/arm/include/asm/arch-kirkwood/config.h b/arch/arm/include/asm/arch-kirkwood/config.h
index b393b1a..f17f82d 100644
--- a/arch/arm/include/asm/arch-kirkwood/config.h
+++ b/arch/arm/include/asm/arch-kirkwood/config.h
@@ -39,6 +39,7 @@
#error "SOC Name not defined"
#endif /* CONFIG_KW88F6281 */
+#include <asm/arch/kirkwood.h>
#define CONFIG_ARM926EJS 1 /* Basic Architecture */
#define CONFIG_MD5 /* get_random_hex on krikwood needs MD5 support */
diff --git a/arch/arm/include/asm/arch-kirkwood/kirkwood.h b/arch/arm/include/asm/arch-kirkwood/kirkwood.h
index 3c843a0..0035ed5 100644
--- a/arch/arm/include/asm/arch-kirkwood/kirkwood.h
+++ b/arch/arm/include/asm/arch-kirkwood/kirkwood.h
@@ -27,13 +27,7 @@
#ifndef _ASM_ARCH_KIRKWOOD_H
#define _ASM_ARCH_KIRKWOOD_H
-#ifndef __ASSEMBLY__
-#include <asm/types.h>
-#include <asm/io.h>
-#endif /* __ASSEMBLY__ */
-
#if defined (CONFIG_FEROCEON_88FR131) || defined (CONFIG_SHEEVA_88SV131)
-#include <asm/arch/cpu.h>
/* SOC specific definations */
#define INTREG_BASE 0xd0000000
diff --git a/arch/arm/include/asm/arch-mx31/imx-regs.h b/arch/arm/include/asm/arch-mx31/imx-regs.h
index f263e6bc..552c821 100644
--- a/arch/arm/include/asm/arch-mx31/imx-regs.h
+++ b/arch/arm/include/asm/arch-mx31/imx-regs.h
@@ -472,6 +472,18 @@ enum iomux_pins {
#define CCM_RCSR_NF16B (1 << 31)
#define CCM_RCSR_NFMS (1 << 30)
+/* WEIM CS control registers */
+struct mx31_weim_cscr {
+ u32 upper;
+ u32 lower;
+ u32 additional;
+ u32 reserved;
+};
+
+struct mx31_weim {
+ struct mx31_weim_cscr cscr[6];
+};
+
#endif
#define __REG(x) (*((volatile u32 *)(x)))
@@ -550,10 +562,27 @@ enum iomux_pins {
#define ESDCTL_BL(x) ((x) << 7)
#define ESDCTL_PRCT(x) ((x) << 0)
+/* 13 fields of the upper CS control register */
+#define CSCR_U(sp, wp, bcd, bcs, psz, pme, sync, dol, \
+ cnc, wsc, ew, wws, edc) \
+ ((sp) << 31 | (wp) << 30 | (bcd) << 28 | (psz) << 22 | (pme) << 21 |\
+ (sync) << 20 | (dol) << 16 | (cnc) << 14 | (wsc) << 8 | (ew) << 7 |\
+ (wws) << 4 | (edc) << 0)
+/* 12 fields of the lower CS control register */
+#define CSCR_L(oea, oen, ebwa, ebwn, \
+ csa, ebc, dsz, csn, psr, cre, wrap, csen) \
+ ((oea) << 28 | (oen) << 24 | (ebwa) << 20 | (ebwn) << 16 |\
+ (csa) << 12 | (ebc) << 11 | (dsz) << 8 | (csn) << 4 |\
+ (psr) << 3 | (cre) << 2 | (wrap) << 1 | (csen) << 0)
+/* 14 fields of the additional CS control register */
+#define CSCR_A(ebra, ebrn, rwa, rwn, mum, lah, lbn, lba, dww, dct, \
+ wwu, age, cnc2, fce) \
+ ((ebra) << 28 | (ebrn) << 24 | (rwa) << 20 | (rwn) << 16 |\
+ (mum) << 15 | (lah) << 13 | (lbn) << 10 | (lba) << 8 |\
+ (dww) << 6 | (dct) << 4 | (wwu) << 3 |\
+ (age) << 2 | (cnc2) << 1 | (fce) << 0)
+
#define WEIM_BASE 0xb8002000
-#define CSCR_U(x) (WEIM_BASE + (x) * 0x10)
-#define CSCR_L(x) (WEIM_BASE + 4 + (x) * 0x10)
-#define CSCR_A(x) (WEIM_BASE + 8 + (x) * 0x10)
#define IOMUXC_BASE 0x43FAC000
#define IOMUXC_GPR (IOMUXC_BASE + 0x8)
diff --git a/arch/arm/include/asm/arch-mx31/sys_proto.h b/arch/arm/include/asm/arch-mx31/sys_proto.h
new file mode 100644
index 0000000..7600303
--- /dev/null
+++ b/arch/arm/include/asm/arch-mx31/sys_proto.h
@@ -0,0 +1,35 @@
+/*
+ * (C) Copyright 2011
+ * Helmut Raiger, HALE electronic GmbH, helmut.raiger@hale.at
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+#ifndef _SYS_PROTO_H_
+#define _SYS_PROTO_H_
+
+struct mxc_weimcs {
+ u32 upper;
+ u32 lower;
+ u32 additional;
+};
+
+void mxc_setup_weimcs(int cs, const struct mxc_weimcs *weimcs);
+
+#endif
diff --git a/arch/arm/include/asm/arch-mx5/sys_proto.h b/arch/arm/include/asm/arch-mx5/sys_proto.h
index ce63675..13d12ee 100644
--- a/arch/arm/include/asm/arch-mx5/sys_proto.h
+++ b/arch/arm/include/asm/arch-mx5/sys_proto.h
@@ -28,4 +28,12 @@ u32 get_cpu_rev(void);
#define is_soc_rev(rev) ((get_cpu_rev() & 0xFF) - rev)
void sdelay(unsigned long);
void set_chipselect_size(int const);
+
+/*
+ * Initializes on-chip ethernet controllers.
+ * to override, implement board_eth_init()
+ */
+
+int fecmxc_initialize(bd_t *bis);
+
#endif
diff --git a/arch/arm/include/asm/arch-omap3/cpu.h b/arch/arm/include/asm/arch-omap3/cpu.h
index 08a725d..84308e0 100644
--- a/arch/arm/include/asm/arch-omap3/cpu.h
+++ b/arch/arm/include/asm/arch-omap3/cpu.h
@@ -218,6 +218,7 @@ struct sdrc {
/* EMIF4 */
typedef struct emif4 {
+ unsigned int emif_mod_id_rev;
unsigned int sdram_sts;
unsigned int sdram_config;
unsigned int res1;
@@ -282,6 +283,51 @@ typedef struct emif4 {
#define SMART_IDLE (0x2 << 3)
#define REF_ON_IDLE (0x1 << 6)
+/* DMA */
+#ifndef __KERNEL_STRICT_NAMES
+#ifndef __ASSEMBLY__
+struct dma4_chan {
+ u32 ccr;
+ u32 clnk_ctrl;
+ u32 cicr;
+ u32 csr;
+ u32 csdp;
+ u32 cen;
+ u32 cfn;
+ u32 cssa;
+ u32 cdsa;
+ u32 csel;
+ u32 csfl;
+ u32 cdel;
+ u32 cdfl;
+ u32 csac;
+ u32 cdac;
+ u32 ccen;
+ u32 ccfn;
+ u32 color;
+};
+
+struct dma4 {
+ u32 revision;
+ u8 res1[0x4];
+ u32 irqstatus_l[0x4];
+ u32 irqenable_l[0x4];
+ u32 sysstatus;
+ u32 ocp_sysconfig;
+ u8 res2[0x34];
+ u32 caps_0;
+ u8 res3[0x4];
+ u32 caps_2;
+ u32 caps_3;
+ u32 caps_4;
+ u32 gcr;
+ u8 res4[0x4];
+ struct dma4_chan chan[32];
+};
+
+#endif /*__ASSEMBLY__ */
+#endif /* __KERNEL_STRICT_NAMES */
+
/* timer regs offsets (32 bit regs) */
#ifndef __KERNEL_STRICT_NAMES
diff --git a/arch/arm/include/asm/arch-omap3/dma.h b/arch/arm/include/asm/arch-omap3/dma.h
new file mode 100644
index 0000000..ba5e057
--- /dev/null
+++ b/arch/arm/include/asm/arch-omap3/dma.h
@@ -0,0 +1,77 @@
+#ifndef __SDMA_H
+#define __SDMA_H
+
+/* Copyright (C) 2011
+ * Corscience GmbH & Co. KG - Simon Schwarz <schwarz@corscience.de>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+/* Functions */
+void omap3_dma_init(void);
+int omap3_dma_conf_transfer(uint32_t chan, uint32_t *src, uint32_t *dst,
+ uint32_t sze);
+int omap3_dma_start_transfer(uint32_t chan);
+int omap3_dma_wait_for_transfer(uint32_t chan);
+int omap3_dma_conf_chan(uint32_t chan, struct dma4_chan *config);
+int omap3_dma_get_conf_chan(uint32_t chan, struct dma4_chan *config);
+
+/* Register settings */
+#define CSDP_DATA_TYPE_8BIT 0x0
+#define CSDP_DATA_TYPE_16BIT 0x1
+#define CSDP_DATA_TYPE_32BIT 0x2
+#define CSDP_SRC_BURST_SINGLE (0x0 << 7)
+#define CSDP_SRC_BURST_EN_16BYTES (0x1 << 7)
+#define CSDP_SRC_BURST_EN_32BYTES (0x2 << 7)
+#define CSDP_SRC_BURST_EN_64BYTES (0x3 << 7)
+#define CSDP_DST_BURST_SINGLE (0x0 << 14)
+#define CSDP_DST_BURST_EN_16BYTES (0x1 << 14)
+#define CSDP_DST_BURST_EN_32BYTES (0x2 << 14)
+#define CSDP_DST_BURST_EN_64BYTES (0x3 << 14)
+#define CSDP_DST_ENDIAN_LOCK_ADAPT (0x0 << 18)
+#define CSDP_DST_ENDIAN_LOCK_LOCK (0x1 << 18)
+#define CSDP_DST_ENDIAN_LITTLE (0x0 << 19)
+#define CSDP_DST_ENDIAN_BIG (0x1 << 19)
+#define CSDP_SRC_ENDIAN_LOCK_ADAPT (0x0 << 20)
+#define CSDP_SRC_ENDIAN_LOCK_LOCK (0x1 << 20)
+#define CSDP_SRC_ENDIAN_LITTLE (0x0 << 21)
+#define CSDP_SRC_ENDIAN_BIG (0x1 << 21)
+
+#define CCR_READ_PRIORITY_LOW (0x0 << 6)
+#define CCR_READ_PRIORITY_HIGH (0x1 << 6)
+#define CCR_ENABLE_DISABLED (0x0 << 7)
+#define CCR_ENABLE_ENABLE (0x1 << 7)
+#define CCR_SRC_AMODE_CONSTANT (0x0 << 12)
+#define CCR_SRC_AMODE_POST_INC (0x1 << 12)
+#define CCR_SRC_AMODE_SINGLE_IDX (0x2 << 12)
+#define CCR_SRC_AMODE_DOUBLE_IDX (0x3 << 12)
+#define CCR_DST_AMODE_CONSTANT (0x0 << 14)
+#define CCR_DST_AMODE_POST_INC (0x1 << 14)
+#define CCR_DST_AMODE_SINGLE_IDX (0x2 << 14)
+#define CCR_DST_AMODE_SOUBLE_IDX (0x3 << 14)
+
+#define CCR_RD_ACTIVE_MASK (1 << 9)
+#define CCR_WR_ACTIVE_MASK (1 << 10)
+
+#define CSR_TRANS_ERR (1 << 8)
+#define CSR_SUPERVISOR_ERR (1 << 10)
+#define CSR_MISALIGNED_ADRS_ERR (1 << 11)
+
+/* others */
+#define CHAN_NR_MIN 0
+#define CHAN_NR_MAX 31
+
+#endif /* __SDMA_H */
diff --git a/arch/arm/include/asm/arch-omap3/omap3.h b/arch/arm/include/asm/arch-omap3/omap3.h
index c787408..02eb865 100644
--- a/arch/arm/include/asm/arch-omap3/omap3.h
+++ b/arch/arm/include/asm/arch-omap3/omap3.h
@@ -47,6 +47,9 @@
#define OMAP34XX_L4_PER 0x49000000
#define OMAP34XX_L4_IO_BASE OMAP34XX_CORE_L4_IO_BASE
+/* DMA4/SDMA */
+#define OMAP34XX_DMA4_BASE 0x48056000
+
/* CONTROL */
#define OMAP34XX_CTRL_BASE (OMAP34XX_L4_IO_BASE + 0x2000)
diff --git a/arch/arm/include/asm/arch-omap3/sys_proto.h b/arch/arm/include/asm/arch-omap3/sys_proto.h
index 7b60051..995e7cb 100644
--- a/arch/arm/include/asm/arch-omap3/sys_proto.h
+++ b/arch/arm/include/asm/arch-omap3/sys_proto.h
@@ -71,5 +71,4 @@ void power_init_r(void);
void dieid_num_r(void);
void do_omap3_emu_romcode_call(u32 service_id, u32 parameters);
void omap3_gp_romcode_call(u32 service_id, u32 parameter);
-void omap_rev_string(char *omap_rev_string);
#endif
diff --git a/arch/arm/include/asm/arch-omap4/omap4.h b/arch/arm/include/asm/arch-omap4/omap4.h
index fc9c555..61ebb3d 100644
--- a/arch/arm/include/asm/arch-omap4/omap4.h
+++ b/arch/arm/include/asm/arch-omap4/omap4.h
@@ -57,11 +57,16 @@
/* CONTROL_ID_CODE */
#define CONTROL_ID_CODE 0x4A002204
-#define OMAP4_CONTROL_ID_CODE_ES1_0 0x0B85202F
-#define OMAP4_CONTROL_ID_CODE_ES2_0 0x1B85202F
-#define OMAP4_CONTROL_ID_CODE_ES2_1 0x3B95C02F
-#define OMAP4_CONTROL_ID_CODE_ES2_2 0x4B95C02F
-#define OMAP4_CONTROL_ID_CODE_ES2_3 0x6B95C02F
+/* 4430 */
+#define OMAP4430_CONTROL_ID_CODE_ES1_0 0x0B85202F
+#define OMAP4430_CONTROL_ID_CODE_ES2_0 0x1B85202F
+#define OMAP4430_CONTROL_ID_CODE_ES2_1 0x3B95C02F
+#define OMAP4430_CONTROL_ID_CODE_ES2_2 0x4B95C02F
+#define OMAP4430_CONTROL_ID_CODE_ES2_3 0x6B95C02F
+
+/* 4460 */
+#define OMAP4460_CONTROL_ID_CODE_ES1_0 0x0B94E02F
+#define OMAP4460_CONTROL_ID_CODE_ES1_1 0x2B94E02F
/* UART */
#define UART1_BASE (OMAP44XX_L4_PER_BASE + 0x6a000)
@@ -191,6 +196,7 @@ struct control_lpddr2io_regs {
#define OMAP4430_ES2_2 0x44300220
#define OMAP4430_ES2_3 0x44300230
#define OMAP4460_ES1_0 0x44600100
+#define OMAP4460_ES1_1 0x44600110
/* ROM code defines */
/* Boot device */
diff --git a/arch/arm/include/asm/arch-omap4/sys_proto.h b/arch/arm/include/asm/arch-omap4/sys_proto.h
index a81f8e5..1aacbb1 100644
--- a/arch/arm/include/asm/arch-omap4/sys_proto.h
+++ b/arch/arm/include/asm/arch-omap4/sys_proto.h
@@ -43,7 +43,6 @@ void sr32(void *, u32, u32, u32);
u32 wait_on_value(u32, u32, void *, u32);
void sdelay(unsigned long);
void set_pl310_ctrl_reg(u32 val);
-void omap_rev_string(char *omap4_rev_string);
void setup_clocks_for_console(void);
void prcm_init(void);
void bypass_dpll(u32 *const base);
diff --git a/arch/arm/include/asm/arch-orion5x/orion5x.h b/arch/arm/include/asm/arch-orion5x/orion5x.h
index 9aeef88..18225b9 100644
--- a/arch/arm/include/asm/arch-orion5x/orion5x.h
+++ b/arch/arm/include/asm/arch-orion5x/orion5x.h
@@ -30,13 +30,7 @@
#ifndef _ASM_ARCH_ORION5X_H
#define _ASM_ARCH_ORION5X_H
-#ifndef __ASSEMBLY__
-#include <asm/types.h>
-#include <asm/io.h>
-#endif /* __ASSEMBLY__ */
-
#if defined(CONFIG_FEROCEON)
-#include <asm/arch/cpu.h>
/* SOC specific definations */
#define ORION5X_REGISTER(x) (ORION5X_REGS_PHY_BASE + x)
diff --git a/arch/arm/include/asm/arch-pantheon/config.h b/arch/arm/include/asm/arch-pantheon/config.h
index 5658592..d10583d 100644
--- a/arch/arm/include/asm/arch-pantheon/config.h
+++ b/arch/arm/include/asm/arch-pantheon/config.h
@@ -25,6 +25,8 @@
#ifndef _PANTHEON_CONFIG_H
#define _PANTHEON_CONFIG_H
+#include <asm/arch/pantheon.h>
+
#define CONFIG_ARM926EJS 1 /* Basic Architecture */
#define CONFIG_SYS_TCLK (14745600) /* NS16550 clk config */
@@ -45,4 +47,22 @@
#define CONFIG_SYS_I2C_SLAVE 0xfe
#endif
+/*
+ * MMC definition
+ */
+#ifdef CONFIG_CMD_MMC
+#define CONFIG_CMD_FAT 1
+#define CONFIG_MMC 1
+#define CONFIG_GENERIC_MMC 1
+#define CONFIG_SDHCI 1
+#define CONFIG_MMC_SDHCI_IO_ACCESSORS 1
+#define CONFIG_SYS_MMC_MAX_BLK_COUNT 0x1000
+#define CONFIG_MMC_SDMA 1
+#define CONFIG_MV_SDHCI 1
+#define CONFIG_DOS_PARTITION 1
+#define CONFIG_EFI_PARTITION 1
+#define CONFIG_SYS_MMC_NUM 2
+#define CONFIG_SYS_MMC_BASE {0xD4280000, 0xd4281000}
+#endif
+
#endif /* _PANTHEON_CONFIG_H */
diff --git a/arch/arm/include/asm/arch-pantheon/cpu.h b/arch/arm/include/asm/arch-pantheon/cpu.h
index 60955c5..94e8371 100644
--- a/arch/arm/include/asm/arch-pantheon/cpu.h
+++ b/arch/arm/include/asm/arch-pantheon/cpu.h
@@ -43,6 +43,17 @@ struct panthmpmu_registers {
};
/*
+ * Application Power Management (APMU) Registers
+ * Refer Register Datasheet 9.2
+ */
+struct panthapmu_registers {
+ u8 pad0[0x0054];
+ u32 sd1; /*0x0054*/
+ u8 pad1[0x00e0 - 0x054 - 4];
+ u32 sd3; /*0x00e0*/
+};
+
+/*
* APB Clock Reset/Control Registers
* Refer Register Datasheet 6.14
*/
@@ -77,5 +88,6 @@ struct panthcpu_registers {
*/
u32 panth_sdram_base(int);
u32 panth_sdram_size(int);
+int mv_sdh_init(u32 regbase, u32 max_clk, u32 min_clk, u32 quirks);
#endif /* _PANTHEON_CPU_H */
diff --git a/arch/arm/include/asm/arch-pantheon/mfp.h b/arch/arm/include/asm/arch-pantheon/mfp.h
index e939196..b868ab8 100644
--- a/arch/arm/include/asm/arch-pantheon/mfp.h
+++ b/arch/arm/include/asm/arch-pantheon/mfp.h
@@ -38,6 +38,18 @@
#define MFP54_CI2C_SDA (MFP_REG(0x1b4) | MFP_AF2 | MFP_DRIVE_MEDIUM)
/* More macros can be defined here... */
+#define MFP_MMC1_DAT7 (MFP_REG(0x84) | MFP_AF0 | MFP_DRIVE_MEDIUM)
+#define MFP_MMC1_DAT6 (MFP_REG(0x88) | MFP_AF0 | MFP_DRIVE_MEDIUM)
+#define MFP_MMC1_DAT5 (MFP_REG(0x8c) | MFP_AF0 | MFP_DRIVE_MEDIUM)
+#define MFP_MMC1_DAT4 (MFP_REG(0x90) | MFP_AF0 | MFP_DRIVE_MEDIUM)
+#define MFP_MMC1_DAT3 (MFP_REG(0x94) | MFP_AF0 | MFP_DRIVE_FAST)
+#define MFP_MMC1_DAT2 (MFP_REG(0x98) | MFP_AF0 | MFP_DRIVE_FAST)
+#define MFP_MMC1_DAT1 (MFP_REG(0x9c) | MFP_AF0 | MFP_DRIVE_FAST)
+#define MFP_MMC1_DAT0 (MFP_REG(0xa0) | MFP_AF0 | MFP_DRIVE_FAST)
+#define MFP_MMC1_CMD (MFP_REG(0xa4) | MFP_AF0 | MFP_DRIVE_FAST)
+#define MFP_MMC1_CLK (MFP_REG(0xa8) | MFP_AF0 | MFP_DRIVE_FAST)
+#define MFP_MMC1_CD (MFP_REG(0xac) | MFP_AF0 | MFP_DRIVE_MEDIUM)
+#define MFP_MMC1_WP (MFP_REG(0xb0) | MFP_AF0 | MFP_DRIVE_MEDIUM)
#define MFP_PIN_MAX 117
#endif
diff --git a/arch/arm/include/asm/arch-pantheon/pantheon.h b/arch/arm/include/asm/arch-pantheon/pantheon.h
index e4ed087..d5e9ba0 100644
--- a/arch/arm/include/asm/arch-pantheon/pantheon.h
+++ b/arch/arm/include/asm/arch-pantheon/pantheon.h
@@ -25,13 +25,6 @@
#ifndef _PANTHEON_H
#define _PANTHEON_H
-#ifndef __ASSEMBLY__
-#include <asm/types.h>
-#include <asm/io.h>
-#endif /* __ASSEMBLY__ */
-
-#include <asm/arch/cpu.h>
-
/* Common APB clock register bit definitions */
#define APBC_APBCLK (1<<0) /* APB Bus Clock Enable */
#define APBC_FNCLK (1<<1) /* Functional Clock Enable */
@@ -39,6 +32,12 @@
/* Functional Clock Selection Mask */
#define APBC_FNCLKSEL(x) (((x) & 0xf) << 4)
+/* Common APMU register bit definitions */
+#define APMU_PERI_CLK (1<<4) /* Peripheral Clock Enable */
+#define APMU_AXI_CLK (1<<3) /* AXI Clock Enable*/
+#define APMU_PERI_RST (1<<1) /* Peripheral Reset */
+#define APMU_AXI_RST (1<<0) /* AXI Reset */
+
/* Register Base Addresses */
#define PANTHEON_DRAM_BASE 0xB0000000
#define PANTHEON_TIMER_BASE 0xD4014000
@@ -49,6 +48,7 @@
#define PANTHEON_GPIO_BASE 0xD4019000
#define PANTHEON_MFPR_BASE 0xD401E000
#define PANTHEON_MPMU_BASE 0xD4050000
+#define PANTHEON_APMU_BASE 0xD4282800
#define PANTHEON_CPU_BASE 0xD4282C00
#endif /* _PANTHEON_H */
diff --git a/arch/arm/include/asm/arch-tegra2/clk_rst.h b/arch/arm/include/asm/arch-tegra2/clk_rst.h
index bd9d9ad..0b6e004 100644
--- a/arch/arm/include/asm/arch-tegra2/clk_rst.h
+++ b/arch/arm/include/asm/arch-tegra2/clk_rst.h
@@ -43,9 +43,12 @@ struct clk_pll_simple {
* structure for which we use clk_pll_simple. The reason for this non-
* othogonal setup is not stated.
*/
-#define TEGRA_CLK_PLLS 6
-#define TEGRA_CLK_SIMPLE_PLLS 3 /* Number of simple PLLs */
-#define TEGRA_CLK_REGS 3 /* Number of clock enable registers */
+enum {
+ TEGRA_CLK_PLLS = 6, /* Number of normal PLLs */
+ TEGRA_CLK_SIMPLE_PLLS = 3, /* Number of simple PLLs */
+ TEGRA_CLK_REGS = 3, /* Number of clock enable registers */
+ TEGRA_CLK_SOURCES = 64, /* Number of peripheral clock sources */
+};
/* Clock/Reset Controller (CLK_RST_CONTROLLER_) regs */
struct clk_rst_ctlr {
@@ -79,65 +82,10 @@ struct clk_rst_ctlr {
uint crc_reserved10; /* _reserved_10, 0xF8 */
uint crc_reserved11; /* _reserved_11, 0xFC */
- uint crc_clk_src_i2s1; /*_I2S1_0, 0x100 */
- uint crc_clk_src_i2s2; /*_I2S2_0, 0x104 */
- uint crc_clk_src_spdif_out; /*_SPDIF_OUT_0, 0x108 */
- uint crc_clk_src_spdif_in; /*_SPDIF_IN_0, 0x10C */
- uint crc_clk_src_pwm; /*_PWM_0, 0x110 */
- uint crc_clk_src_spi1; /*_SPI1_0, 0x114 */
- uint crc_clk_src_sbc2; /*_SBC2_0, 0x118 */
- uint crc_clk_src_sbc3; /*_SBC3_0, 0x11C */
- uint crc_clk_src_xio; /*_XIO_0, 0x120 */
- uint crc_clk_src_i2c1; /*_I2C1_0, 0x124 */
- uint crc_clk_src_dvc_i2c; /*_DVC_I2C_0, 0x128 */
- uint crc_clk_src_twc; /*_TWC_0, 0x12C */
- uint crc_reserved12; /* 0x130 */
- uint crc_clk_src_sbc1; /*_SBC1_0, 0x134 */
- uint crc_clk_src_disp1; /*_DISP1_0, 0x138 */
- uint crc_clk_src_disp2; /*_DISP2_0, 0x13C */
- uint crc_clk_src_cve; /*_CVE_0, 0x140 */
- uint crc_clk_src_ide; /*_IDE_0, 0x144 */
- uint crc_clk_src_vi; /*_VI_0, 0x148 */
- uint crc_reserved13; /* 0x14C */
- uint crc_clk_src_sdmmc1; /*_SDMMC1_0, 0x150 */
- uint crc_clk_src_sdmmc2; /*_SDMMC2_0, 0x154 */
- uint crc_clk_src_g3d; /*_G3D_0, 0x158 */
- uint crc_clk_src_g2d; /*_G2D_0, 0x15C */
- uint crc_clk_src_ndflash; /*_NDFLASH_0, 0x160 */
- uint crc_clk_src_sdmmc4; /*_SDMMC4_0, 0x164 */
- uint crc_clk_src_vfir; /*_VFIR_0, 0x168 */
- uint crc_clk_src_epp; /*_EPP_0, 0x16C */
- uint crc_clk_src_mp3; /*_MPE_0, 0x170 */
- uint crc_clk_src_mipi; /*_MIPI_0, 0x174 */
- uint crc_clk_src_uarta; /*_UARTA_0, 0x178 */
- uint crc_clk_src_uartb; /*_UARTB_0, 0x17C */
- uint crc_clk_src_host1x; /*_HOST1X_0, 0x180 */
- uint crc_reserved14; /* 0x184 */
- uint crc_clk_src_tvo; /*_TVO_0, 0x188 */
- uint crc_clk_src_hdmi; /*_HDMI_0, 0x18C */
- uint crc_reserved15; /* 0x190 */
- uint crc_clk_src_tvdac; /*_TVDAC_0, 0x194 */
- uint crc_clk_src_i2c2; /*_I2C2_0, 0x198 */
- uint crc_clk_src_emc; /*_EMC_0, 0x19C */
- uint crc_clk_src_uartc; /*_UARTC_0, 0x1A0 */
- uint crc_reserved16; /* 0x1A4 */
- uint crc_clk_src_vi_sensor; /*_VI_SENSOR_0, 0x1A8 */
- uint crc_reserved17; /* 0x1AC */
- uint crc_reserved18; /* 0x1B0 */
- uint crc_clk_src_sbc4; /*_SBC4_0, 0x1B4 */
- uint crc_clk_src_i2c3; /*_I2C3_0, 0x1B8 */
- uint crc_clk_src_sdmmc3; /*_SDMMC3_0, 0x1BC */
- uint crc_clk_src_uartd; /*_UARTD_0, 0x1C0 */
- uint crc_clk_src_uarte; /*_UARTE_0, 0x1C4 */
- uint crc_clk_src_vde; /*_VDE_0, 0x1C8 */
- uint crc_clk_src_owr; /*_OWR_0, 0x1CC */
- uint crc_clk_src_nor; /*_NOR_0, 0x1D0 */
- uint crc_clk_src_csite; /*_CSITE_0, 0x1D4 */
- uint crc_reserved19[9]; /* 0x1D8-1F8 */
- uint crc_clk_src_osc; /*_OSC_0, 0x1FC */
+ uint crc_clk_src[TEGRA_CLK_SOURCES]; /*_I2S1_0... 0x100-1fc */
uint crc_reserved20[80]; /* 0x200-33C */
- uint crc_cpu_cmplx_set; /* _CPU_CMPLX_SET_0, 0x340 */
- uint crc_cpu_cmplx_clr; /* _CPU_CMPLX_CLR_0, 0x344 */
+ uint crc_cpu_cmplx_set; /* _CPU_CMPLX_SET_0, 0x340 */
+ uint crc_cpu_cmplx_clr; /* _CPU_CMPLX_CLR_0, 0x344 */
};
/* CLK_RST_CONTROLLER_CLK_CPU_CMPLX_0 */
@@ -156,10 +104,13 @@ struct clk_rst_ctlr {
#define PLL_BASE_OVRRIDE_MASK (1U << 28)
#define PLL_DIVP_SHIFT 20
+#define PLL_DIVP_MASK (7U << PLL_DIVP_SHIFT)
#define PLL_DIVN_SHIFT 8
+#define PLL_DIVN_MASK (0x3ffU << PLL_DIVN_SHIFT)
#define PLL_DIVM_SHIFT 0
+#define PLL_DIVM_MASK (0x1f << PLL_DIVM_SHIFT)
/* CLK_RST_CONTROLLER_PLLx_MISC_0 */
#define PLL_CPCON_SHIFT 8
@@ -168,9 +119,20 @@ struct clk_rst_ctlr {
#define PLL_LFCON_SHIFT 4
#define PLLU_VCO_FREQ_SHIFT 20
+#define PLLU_VCO_FREQ_MASK (1U << PLLU_VCO_FREQ_SHIFT)
/* CLK_RST_CONTROLLER_OSC_CTRL_0 */
#define OSC_FREQ_SHIFT 30
#define OSC_FREQ_MASK (3U << OSC_FREQ_SHIFT)
+/* CLK_RST_CONTROLLER_CLK_SOURCE_x_OUT_0 */
+#define OUT_CLK_DIVISOR_SHIFT 0
+#define OUT_CLK_DIVISOR_MASK (255 << OUT_CLK_DIVISOR_SHIFT)
+
+#define OUT_CLK_SOURCE_SHIFT 30
+#define OUT_CLK_SOURCE_MASK (3U << OUT_CLK_SOURCE_SHIFT)
+
+#define OUT_CLK_SOURCE4_SHIFT 28
+#define OUT_CLK_SOURCE4_MASK (15U << OUT_CLK_SOURCE4_SHIFT)
+
#endif /* CLK_RST_H */
diff --git a/arch/arm/include/asm/arch-tegra2/clock.h b/arch/arm/include/asm/arch-tegra2/clock.h
index d01aec8..49e9904 100644
--- a/arch/arm/include/asm/arch-tegra2/clock.h
+++ b/arch/arm/include/asm/arch-tegra2/clock.h
@@ -22,7 +22,7 @@
/* Tegra2 clock control functions */
#ifndef _CLOCK_H
-
+#define _CLOCK_H
/* Set of oscillator frequencies supported in the internal API. */
enum clock_osc_freq {
@@ -36,22 +36,27 @@ enum clock_osc_freq {
};
/* The PLLs supported by the hardware */
-enum clock_pll_id {
- CLOCK_PLL_ID_FIRST,
- CLOCK_PLL_ID_CGENERAL = CLOCK_PLL_ID_FIRST,
- CLOCK_PLL_ID_MEMORY,
- CLOCK_PLL_ID_PERIPH,
- CLOCK_PLL_ID_AUDIO,
- CLOCK_PLL_ID_USB,
- CLOCK_PLL_ID_DISPLAY,
+enum clock_id {
+ CLOCK_ID_FIRST,
+ CLOCK_ID_CGENERAL = CLOCK_ID_FIRST,
+ CLOCK_ID_MEMORY,
+ CLOCK_ID_PERIPH,
+ CLOCK_ID_AUDIO,
+ CLOCK_ID_USB,
+ CLOCK_ID_DISPLAY,
/* now the simple ones */
- CLOCK_PLL_ID_FIRST_SIMPLE,
- CLOCK_PLL_ID_XCPU = CLOCK_PLL_ID_FIRST_SIMPLE,
- CLOCK_PLL_ID_EPCI,
- CLOCK_PLL_ID_SFROM32KHZ,
+ CLOCK_ID_FIRST_SIMPLE,
+ CLOCK_ID_XCPU = CLOCK_ID_FIRST_SIMPLE,
+ CLOCK_ID_EPCI,
+ CLOCK_ID_SFROM32KHZ,
+
+ /* These are the base clocks (inputs to the Tegra SOC) */
+ CLOCK_ID_32KHZ,
+ CLOCK_ID_OSC,
- CLOCK_PLL_ID_COUNT,
+ CLOCK_ID_COUNT, /* number of clocks */
+ CLOCK_ID_NONE = -1,
};
/* The clocks supported by the hardware */
@@ -80,7 +85,7 @@ enum periph_id {
/* 16 */
PERIPH_ID_TWC,
- PERIPH_ID_PWC,
+ PERIPH_ID_PWM,
PERIPH_ID_I2S2,
PERIPH_ID_EPP,
PERIPH_ID_VI,
@@ -181,12 +186,7 @@ enum periph_id {
#define PERIPH_MASK(id) (1 << ((id) & 0x1f))
/* return 1 if a PLL ID is in range */
-#define clock_pll_id_isvalid(id) ((id) >= CLOCK_PLL_ID_FIRST && \
- (id) < CLOCK_PLL_ID_COUNT)
-
-/* return 1 if a peripheral ID is in range */
-#define clock_periph_id_isvalid(id) ((id) >= PERIPH_ID_FIRST && \
- (id) < PERIPH_ID_COUNT)
+#define clock_id_isvalid(id) ((id) >= CLOCK_ID_FIRST && (id) < CLOCK_ID_COUNT)
/* PLL stabilization delay in usec */
#define CLOCK_PLL_STABLE_DELAY_US 300
@@ -194,7 +194,7 @@ enum periph_id {
/* return the current oscillator clock frequency */
enum clock_osc_freq clock_get_osc_freq(void);
-/*
+/**
* Start PLL using the provided configuration parameters.
*
* @param id clock id
@@ -206,7 +206,7 @@ enum clock_osc_freq clock_get_osc_freq(void);
*
* @returns monotonic time in us that the PLL will be stable
*/
-unsigned long clock_start_pll(enum clock_pll_id id, u32 divm, u32 divn,
+unsigned long clock_start_pll(enum clock_id id, u32 divm, u32 divn,
u32 divp, u32 cpcon, u32 lfcon);
/*
@@ -217,6 +217,13 @@ unsigned long clock_start_pll(enum clock_pll_id id, u32 divm, u32 divn,
void clock_enable(enum periph_id clkid);
/*
+ * Disable a clock
+ *
+ * @param id clock id
+ */
+void clock_disable(enum periph_id clkid);
+
+/*
* Set whether a clock is enabled or disabled.
*
* @param id clock id
@@ -224,7 +231,7 @@ void clock_enable(enum periph_id clkid);
*/
void clock_set_enable(enum periph_id clkid, int enable);
-/*
+/**
* Reset a peripheral. This puts it in reset, waits for a delay, then takes
* it out of reset and waits for th delay again.
*
@@ -233,7 +240,7 @@ void clock_set_enable(enum periph_id clkid, int enable);
*/
void reset_periph(enum periph_id periph_id, int us_delay);
-/*
+/**
* Put a peripheral into or out of reset.
*
* @param periph_id peripheral to reset
@@ -251,7 +258,7 @@ enum crc_reset_id {
crc_rst_debug = 1 << 4,
};
-/*
+/**
* Put parts of the CPU complex into or out of reset.\
*
* @param cpu cpu number (0 or 1 on Tegra2)
@@ -260,4 +267,94 @@ enum crc_reset_id {
*/
void reset_cmplx_set_enable(int cpu, int which, int reset);
+/**
+ * Set the source for a peripheral clock. This plus the divisor sets the
+ * clock rate. You need to look up the datasheet to see the meaning of the
+ * source parameter as it changes for each peripheral.
+ *
+ * Warning: This function is only for use pre-relocation. Please use
+ * clock_start_periph_pll() instead.
+ *
+ * @param periph_id peripheral to adjust
+ * @param source source clock (0, 1, 2 or 3)
+ */
+void clock_ll_set_source(enum periph_id periph_id, unsigned source);
+
+/**
+ * Set the source and divisor for a peripheral clock. This sets the
+ * clock rate. You need to look up the datasheet to see the meaning of the
+ * source parameter as it changes for each peripheral.
+ *
+ * Warning: This function is only for use pre-relocation. Please use
+ * clock_start_periph_pll() instead.
+ *
+ * @param periph_id peripheral to adjust
+ * @param source source clock (0, 1, 2 or 3)
+ * @param divisor divisor value to use
+ */
+void clock_ll_set_source_divisor(enum periph_id periph_id, unsigned source,
+ unsigned divisor);
+
+/**
+ * Start a peripheral PLL clock at the given rate. This also resets the
+ * peripheral.
+ *
+ * @param periph_id peripheral to start
+ * @param parent PLL id of required parent clock
+ * @param rate Required clock rate in Hz
+ * @return rate selected in Hz, or -1U if something went wrong
+ */
+unsigned clock_start_periph_pll(enum periph_id periph_id,
+ enum clock_id parent, unsigned rate);
+
+/**
+ * Returns the rate of a peripheral clock in Hz. Since the caller almost
+ * certainly knows the parent clock (having just set it) we require that
+ * this be passed in so we don't need to work it out.
+ *
+ * @param periph_id peripheral to start
+ * @param parent PLL id of parent clock (used to calculate rate, you
+ * must know this!)
+ * @return clock rate of peripheral in Hz
+ */
+unsigned long clock_get_periph_rate(enum periph_id periph_id,
+ enum clock_id parent);
+
+/**
+ * Adjust peripheral PLL clock to the given rate. This does not reset the
+ * peripheral. If a second stage divisor is not available, pass NULL for
+ * extra_div. If it is available, then this parameter will return the
+ * divisor selected (which will be a power of 2 from 1 to 256).
+ *
+ * @param periph_id peripheral to start
+ * @param parent PLL id of required parent clock
+ * @param rate Required clock rate in Hz
+ * @param extra_div value for the second-stage divisor (NULL if one is
+ not available)
+ * @return rate selected in Hz, or -1U if something went wrong
+ */
+unsigned clock_adjust_periph_pll_div(enum periph_id periph_id,
+ enum clock_id parent, unsigned rate, int *extra_div);
+
+/**
+ * Returns the clock rate of a specified clock, in Hz.
+ *
+ * @param parent PLL id of clock to check
+ * @return rate of clock in Hz
+ */
+unsigned clock_get_rate(enum clock_id clkid);
+
+/*
+ * Checks that clocks are valid and prints a warning if not
+ *
+ * @return 0 if ok, -1 on error
+ */
+int clock_verify(void);
+
+/* Initialize the clocks */
+void clock_init(void);
+
+/* Initialize the PLLs */
+void clock_early_init(void);
+
#endif
diff --git a/arch/arm/include/asm/arch-tegra2/pinmux.h b/arch/arm/include/asm/arch-tegra2/pinmux.h
index b8a4753..469d742 100644
--- a/arch/arm/include/asm/arch-tegra2/pinmux.h
+++ b/arch/arm/include/asm/arch-tegra2/pinmux.h
@@ -24,173 +24,331 @@
#ifndef _PINMUX_H_
#define _PINMUX_H_
-/* Pins which we can set to tristate or normal */
-enum pmux_pin {
+/*
+ * Pin groups which we adjust. There are three basic attributes of each pin
+ * group which use this enum:
+ *
+ * - function
+ * - pullup / pulldown
+ * - tristate or normal
+ */
+enum pmux_pingrp {
/* APB_MISC_PP_TRISTATE_REG_A_0 */
- PIN_ATA,
- PIN_ATB,
- PIN_ATC,
- PIN_ATD,
- PIN_CDEV1,
- PIN_CDEV2,
- PIN_CSUS,
- PIN_DAP1,
-
- PIN_DAP2,
- PIN_DAP3,
- PIN_DAP4,
- PIN_DTA,
- PIN_DTB,
- PIN_DTC,
- PIN_DTD,
- PIN_DTE,
-
- PIN_GPU,
- PIN_GPV,
- PIN_I2CP,
- PIN_IRTX,
- PIN_IRRX,
- PIN_KBCB,
- PIN_KBCA,
- PIN_PMC,
-
- PIN_PTA,
- PIN_RM,
- PIN_KBCE,
- PIN_KBCF,
- PIN_GMA,
- PIN_GMC,
- PIN_SDMMC1,
- PIN_OWC,
+ PINGRP_ATA,
+ PINGRP_ATB,
+ PINGRP_ATC,
+ PINGRP_ATD,
+ PINGRP_CDEV1,
+ PINGRP_CDEV2,
+ PINGRP_CSUS,
+ PINGRP_DAP1,
+
+ PINGRP_DAP2,
+ PINGRP_DAP3,
+ PINGRP_DAP4,
+ PINGRP_DTA,
+ PINGRP_DTB,
+ PINGRP_DTC,
+ PINGRP_DTD,
+ PINGRP_DTE,
+
+ PINGRP_GPU,
+ PINGRP_GPV,
+ PINGRP_I2CP,
+ PINGRP_IRTX,
+ PINGRP_IRRX,
+ PINGRP_KBCB,
+ PINGRP_KBCA,
+ PINGRP_PMC,
+
+ PINGRP_PTA,
+ PINGRP_RM,
+ PINGRP_KBCE,
+ PINGRP_KBCF,
+ PINGRP_GMA,
+ PINGRP_GMC,
+ PINGRP_SDMMC1,
+ PINGRP_OWC,
/* 32: APB_MISC_PP_TRISTATE_REG_B_0 */
- PIN_GME,
- PIN_SDC,
- PIN_SDD,
- PIN_RESERVED0,
- PIN_SLXA,
- PIN_SLXC,
- PIN_SLXD,
- PIN_SLXK,
-
- PIN_SPDI,
- PIN_SPDO,
- PIN_SPIA,
- PIN_SPIB,
- PIN_SPIC,
- PIN_SPID,
- PIN_SPIE,
- PIN_SPIF,
-
- PIN_SPIG,
- PIN_SPIH,
- PIN_UAA,
- PIN_UAB,
- PIN_UAC,
- PIN_UAD,
- PIN_UCA,
- PIN_UCB,
-
- PIN_RESERVED1,
- PIN_ATE,
- PIN_KBCC,
- PIN_RESERVED2,
- PIN_RESERVED3,
- PIN_GMB,
- PIN_GMD,
- PIN_DDC,
+ PINGRP_GME,
+ PINGRP_SDC,
+ PINGRP_SDD,
+ PINGRP_RESERVED0,
+ PINGRP_SLXA,
+ PINGRP_SLXC,
+ PINGRP_SLXD,
+ PINGRP_SLXK,
+
+ PINGRP_SPDI,
+ PINGRP_SPDO,
+ PINGRP_SPIA,
+ PINGRP_SPIB,
+ PINGRP_SPIC,
+ PINGRP_SPID,
+ PINGRP_SPIE,
+ PINGRP_SPIF,
+
+ PINGRP_SPIG,
+ PINGRP_SPIH,
+ PINGRP_UAA,
+ PINGRP_UAB,
+ PINGRP_UAC,
+ PINGRP_UAD,
+ PINGRP_UCA,
+ PINGRP_UCB,
+
+ PINGRP_RESERVED1,
+ PINGRP_ATE,
+ PINGRP_KBCC,
+ PINGRP_RESERVED2,
+ PINGRP_RESERVED3,
+ PINGRP_GMB,
+ PINGRP_GMD,
+ PINGRP_DDC,
/* 64: APB_MISC_PP_TRISTATE_REG_C_0 */
- PIN_LD0,
- PIN_LD1,
- PIN_LD2,
- PIN_LD3,
- PIN_LD4,
- PIN_LD5,
- PIN_LD6,
- PIN_LD7,
-
- PIN_LD8,
- PIN_LD9,
- PIN_LD10,
- PIN_LD11,
- PIN_LD12,
- PIN_LD13,
- PIN_LD14,
- PIN_LD15,
-
- PIN_LD16,
- PIN_LD17,
- PIN_LHP0,
- PIN_LHP1,
- PIN_LHP2,
- PIN_LVP0,
- PIN_LVP1,
- PIN_HDINT,
-
- PIN_LM0,
- PIN_LM1,
- PIN_LVS,
- PIN_LSC0,
- PIN_LSC1,
- PIN_LSCK,
- PIN_LDC,
- PIN_LCSN,
+ PINGRP_LD0,
+ PINGRP_LD1,
+ PINGRP_LD2,
+ PINGRP_LD3,
+ PINGRP_LD4,
+ PINGRP_LD5,
+ PINGRP_LD6,
+ PINGRP_LD7,
+
+ PINGRP_LD8,
+ PINGRP_LD9,
+ PINGRP_LD10,
+ PINGRP_LD11,
+ PINGRP_LD12,
+ PINGRP_LD13,
+ PINGRP_LD14,
+ PINGRP_LD15,
+
+ PINGRP_LD16,
+ PINGRP_LD17,
+ PINGRP_LHP0,
+ PINGRP_LHP1,
+ PINGRP_LHP2,
+ PINGRP_LVP0,
+ PINGRP_LVP1,
+ PINGRP_HDINT,
+
+ PINGRP_LM0,
+ PINGRP_LM1,
+ PINGRP_LVS,
+ PINGRP_LSC0,
+ PINGRP_LSC1,
+ PINGRP_LSCK,
+ PINGRP_LDC,
+ PINGRP_LCSN,
/* 96: APB_MISC_PP_TRISTATE_REG_D_0 */
- PIN_LSPI,
- PIN_LSDA,
- PIN_LSDI,
- PIN_LPW0,
- PIN_LPW1,
- PIN_LPW2,
- PIN_LDI,
- PIN_LHS,
-
- PIN_LPP,
- PIN_RESERVED4,
- PIN_KBCD,
- PIN_GPU7,
- PIN_DTF,
- PIN_UDA,
- PIN_CRTP,
- PIN_SDB,
+ PINGRP_LSPI,
+ PINGRP_LSDA,
+ PINGRP_LSDI,
+ PINGRP_LPW0,
+ PINGRP_LPW1,
+ PINGRP_LPW2,
+ PINGRP_LDI,
+ PINGRP_LHS,
+
+ PINGRP_LPP,
+ PINGRP_RESERVED4,
+ PINGRP_KBCD,
+ PINGRP_GPU7,
+ PINGRP_DTF,
+ PINGRP_UDA,
+ PINGRP_CRTP,
+ PINGRP_SDB,
+
+ /* these pin groups only have pullup and pull down control */
+ PINGRP_FIRST_NO_MUX,
+ PINGRP_CK32 = PINGRP_FIRST_NO_MUX,
+ PINGRP_DDRC,
+ PINGRP_PMCA,
+ PINGRP_PMCB,
+ PINGRP_PMCC,
+ PINGRP_PMCD,
+ PINGRP_PMCE,
+ PINGRP_XM2C,
+ PINGRP_XM2D,
+
+ PINGRP_COUNT,
};
+/*
+ * Functions which can be assigned to each of the pin groups. The values here
+ * bear no relation to the values programmed into pinmux registers and are
+ * purely a convenience. The translation is done through a table search.
+ */
+enum pmux_func {
+ PMUX_FUNC_AHB_CLK,
+ PMUX_FUNC_APB_CLK,
+ PMUX_FUNC_AUDIO_SYNC,
+ PMUX_FUNC_CRT,
+ PMUX_FUNC_DAP1,
+ PMUX_FUNC_DAP2,
+ PMUX_FUNC_DAP3,
+ PMUX_FUNC_DAP4,
+ PMUX_FUNC_DAP5,
+ PMUX_FUNC_DISPA,
+ PMUX_FUNC_DISPB,
+ PMUX_FUNC_EMC_TEST0_DLL,
+ PMUX_FUNC_EMC_TEST1_DLL,
+ PMUX_FUNC_GMI,
+ PMUX_FUNC_GMI_INT,
+ PMUX_FUNC_HDMI,
+ PMUX_FUNC_I2C,
+ PMUX_FUNC_I2C2,
+ PMUX_FUNC_I2C3,
+ PMUX_FUNC_IDE,
+ PMUX_FUNC_IRDA,
+ PMUX_FUNC_KBC,
+ PMUX_FUNC_MIO,
+ PMUX_FUNC_MIPI_HS,
+ PMUX_FUNC_NAND,
+ PMUX_FUNC_OSC,
+ PMUX_FUNC_OWR,
+ PMUX_FUNC_PCIE,
+ PMUX_FUNC_PLLA_OUT,
+ PMUX_FUNC_PLLC_OUT1,
+ PMUX_FUNC_PLLM_OUT1,
+ PMUX_FUNC_PLLP_OUT2,
+ PMUX_FUNC_PLLP_OUT3,
+ PMUX_FUNC_PLLP_OUT4,
+ PMUX_FUNC_PWM,
+ PMUX_FUNC_PWR_INTR,
+ PMUX_FUNC_PWR_ON,
+ PMUX_FUNC_RTCK,
+ PMUX_FUNC_SDIO1,
+ PMUX_FUNC_SDIO2,
+ PMUX_FUNC_SDIO3,
+ PMUX_FUNC_SDIO4,
+ PMUX_FUNC_SFLASH,
+ PMUX_FUNC_SPDIF,
+ PMUX_FUNC_SPI1,
+ PMUX_FUNC_SPI2,
+ PMUX_FUNC_SPI2_ALT,
+ PMUX_FUNC_SPI3,
+ PMUX_FUNC_SPI4,
+ PMUX_FUNC_TRACE,
+ PMUX_FUNC_TWC,
+ PMUX_FUNC_UARTA,
+ PMUX_FUNC_UARTB,
+ PMUX_FUNC_UARTC,
+ PMUX_FUNC_UARTD,
+ PMUX_FUNC_UARTE,
+ PMUX_FUNC_ULPI,
+ PMUX_FUNC_VI,
+ PMUX_FUNC_VI_SENSOR_CLK,
+ PMUX_FUNC_XIO,
+ PMUX_FUNC_SAFE,
+
+ /* These don't have a name, but can be used in the table */
+ PMUX_FUNC_RSVD1,
+ PMUX_FUNC_RSVD2,
+ PMUX_FUNC_RSVD3,
+ PMUX_FUNC_RSVD4,
+ PMUX_FUNC_RSVD, /* Not valid and should not be used */
-#define TEGRA_TRISTATE_REGS 4
+ PMUX_FUNC_COUNT,
+
+ PMUX_FUNC_NONE = -1,
+};
+
+/* return 1 if a pmux_func is in range */
+#define pmux_func_isvalid(func) ((func) >= 0 && (func) < PMUX_FUNC_COUNT && \
+ (func) != PMUX_FUNC_RSVD)
+
+/* The pullup/pulldown state of a pin group */
+enum pmux_pull {
+ PMUX_PULL_NORMAL = 0,
+ PMUX_PULL_DOWN,
+ PMUX_PULL_UP,
+};
+
+/* Defines whether a pin group is tristated or in normal operation */
+enum pmux_tristate {
+ PMUX_TRI_NORMAL = 0,
+ PMUX_TRI_TRISTATE = 1,
+};
+
+/* Available power domains used by pin groups */
+enum pmux_vddio {
+ PMUX_VDDIO_BB = 0,
+ PMUX_VDDIO_LCD,
+ PMUX_VDDIO_VI,
+ PMUX_VDDIO_UART,
+ PMUX_VDDIO_DDR,
+ PMUX_VDDIO_NAND,
+ PMUX_VDDIO_SYS,
+ PMUX_VDDIO_AUDIO,
+ PMUX_VDDIO_SD,
+
+ PMUX_VDDIO_NONE
+};
+
+enum {
+ PMUX_TRISTATE_REGS = 4,
+ PMUX_MUX_REGS = 7,
+ PMUX_PULL_REGS = 5,
+};
/* APB MISC Pin Mux and Tristate (APB_MISC_PP_) registers */
struct pmux_tri_ctlr {
uint pmt_reserved0; /* ABP_MISC_PP_ reserved offset 00 */
uint pmt_reserved1; /* ABP_MISC_PP_ reserved offset 04 */
- uint pmt_strap_opt_a; /* _STRAPPING_OPT_A_0, offset 08 */
+ uint pmt_strap_opt_a; /* _STRAPPING_OPT_A_0, offset 08 */
uint pmt_reserved2; /* ABP_MISC_PP_ reserved offset 0C */
uint pmt_reserved3; /* ABP_MISC_PP_ reserved offset 10 */
- uint pmt_tri[TEGRA_TRISTATE_REGS]; /* _TRI_STATE_REG_A/B/C/D_0 14-20 */
- uint pmt_cfg_ctl; /* _CONFIG_CTL_0, offset 24 */
+ uint pmt_tri[PMUX_TRISTATE_REGS];/* _TRI_STATE_REG_A/B/C/D_0 14-20 */
+ uint pmt_cfg_ctl; /* _CONFIG_CTL_0, offset 24 */
uint pmt_reserved[22]; /* ABP_MISC_PP_ reserved offs 28-7C */
- uint pmt_ctl_a; /* _PIN_MUX_CTL_A_0, offset 80 */
- uint pmt_ctl_b; /* _PIN_MUX_CTL_B_0, offset 84 */
- uint pmt_ctl_c; /* _PIN_MUX_CTL_C_0, offset 88 */
- uint pmt_ctl_d; /* _PIN_MUX_CTL_D_0, offset 8C */
- uint pmt_ctl_e; /* _PIN_MUX_CTL_E_0, offset 90 */
- uint pmt_ctl_f; /* _PIN_MUX_CTL_F_0, offset 94 */
- uint pmt_ctl_g; /* _PIN_MUX_CTL_G_0, offset 98 */
+ uint pmt_ctl[PMUX_MUX_REGS]; /* _PIN_MUX_CTL_A-G_0, offset 80 */
+ uint pmt_reserved4; /* ABP_MISC_PP_ reserved offset 9c */
+ uint pmt_pull[PMUX_PULL_REGS]; /* APB_MISC_PP_PULLUPDOWN_REG_A-E */
};
-/* Converts a pin number to a tristate register: 0=A, 1=B, 2=C, 3=D */
-#define TRISTATE_REG(id) ((id) >> 5)
+/*
+ * This defines the configuration for a pin, including the function assigned,
+ * pull up/down settings and tristate settings. Having set up one of these
+ * you can call pinmux_config_pingroup() to configure a pin in one step. Also
+ * available is pinmux_config_table() to configure a list of pins.
+ */
+struct pingroup_config {
+ enum pmux_pingrp pingroup; /* pin group PINGRP_... */
+ enum pmux_func func; /* function to assign FUNC_... */
+ enum pmux_pull pull; /* pull up/down/normal PMUX_PULL_...*/
+ enum pmux_tristate tristate; /* tristate or normal PMUX_TRI_... */
+};
+
+/* Set a pin group to tristate */
+void pinmux_tristate_enable(enum pmux_pingrp pin);
+
+/* Set a pin group to normal (non tristate) */
+void pinmux_tristate_disable(enum pmux_pingrp pin);
-/* Mask value for a tristate (within TRISTATE_REG(id)) */
-#define TRISTATE_MASK(id) (1 << ((id) & 0x1f))
+/* Set the pull up/down feature for a pin group */
+void pinmux_set_pullupdown(enum pmux_pingrp pin, enum pmux_pull pupd);
-/* Set a pin to tristate */
-void pinmux_tristate_enable(enum pmux_pin pin);
+/* Set the mux function for a pin group */
+void pinmux_set_func(enum pmux_pingrp pin, enum pmux_func func);
-/* Set a pin to normal (non tristate) */
-void pinmux_tristate_disable(enum pmux_pin pin);
+/* Set the complete configuration for a pin group */
+void pinmux_config_pingroup(struct pingroup_config *config);
+
+void pinmux_set_tristate(enum pmux_pingrp pin, int enable);
+
+/**
+ * Configuure a list of pin groups
+ *
+ * @param config List of config items
+ * @param len Number of config items in list
+ */
+void pinmux_config_table(struct pingroup_config *config, int len);
#endif /* PINMUX_H */
diff --git a/arch/arm/include/asm/mach-types.h b/arch/arm/include/asm/mach-types.h
index a1fd03a..2549051 100644
--- a/arch/arm/include/asm/mach-types.h
+++ b/arch/arm/include/asm/mach-types.h
@@ -14,2810 +14,463 @@ extern unsigned int __machine_arch_type;
/* see arch/arm/kernel/arch.c for a description of these */
#define MACH_TYPE_EBSA110 0
#define MACH_TYPE_RISCPC 1
-#define MACH_TYPE_NEXUSPCI 3
#define MACH_TYPE_EBSA285 4
#define MACH_TYPE_NETWINDER 5
#define MACH_TYPE_CATS 6
-#define MACH_TYPE_TBOX 7
-#define MACH_TYPE_CO285 8
-#define MACH_TYPE_CLPS7110 9
-#define MACH_TYPE_ARCHIMEDES 10
-#define MACH_TYPE_A5K 11
-#define MACH_TYPE_ETOILE 12
-#define MACH_TYPE_LACIE_NAS 13
-#define MACH_TYPE_CLPS7500 14
#define MACH_TYPE_SHARK 15
#define MACH_TYPE_BRUTUS 16
#define MACH_TYPE_PERSONAL_SERVER 17
-#define MACH_TYPE_ITSY 18
#define MACH_TYPE_L7200 19
#define MACH_TYPE_PLEB 20
#define MACH_TYPE_INTEGRATOR 21
#define MACH_TYPE_H3600 22
-#define MACH_TYPE_IXP1200 23
#define MACH_TYPE_P720T 24
#define MACH_TYPE_ASSABET 25
-#define MACH_TYPE_VICTOR 26
#define MACH_TYPE_LART 27
-#define MACH_TYPE_RANGER 28
#define MACH_TYPE_GRAPHICSCLIENT 29
#define MACH_TYPE_XP860 30
#define MACH_TYPE_CERF 31
#define MACH_TYPE_NANOENGINE 32
-#define MACH_TYPE_FPIC 33
-#define MACH_TYPE_EXTENEX1 34
-#define MACH_TYPE_SHERMAN 35
-#define MACH_TYPE_ACCELENT_SA 36
-#define MACH_TYPE_ACCELENT_L7200 37
-#define MACH_TYPE_NETPORT 38
-#define MACH_TYPE_PANGOLIN 39
-#define MACH_TYPE_YOPY 40
-#define MACH_TYPE_COOLIDGE 41
-#define MACH_TYPE_HUW_WEBPANEL 42
-#define MACH_TYPE_SPOTME 43
-#define MACH_TYPE_FREEBIRD 44
-#define MACH_TYPE_TI925 45
-#define MACH_TYPE_RISCSTATION 46
-#define MACH_TYPE_CAVY 47
#define MACH_TYPE_JORNADA720 48
-#define MACH_TYPE_OMNIMETER 49
#define MACH_TYPE_EDB7211 50
-#define MACH_TYPE_CITYGO 51
#define MACH_TYPE_PFS168 52
-#define MACH_TYPE_SPOT 53
#define MACH_TYPE_FLEXANET 54
-#define MACH_TYPE_WEBPAL 55
-#define MACH_TYPE_LINPDA 56
-#define MACH_TYPE_ANAKIN 57
-#define MACH_TYPE_MVI 58
-#define MACH_TYPE_JUPITER 59
-#define MACH_TYPE_PSIONW 60
-#define MACH_TYPE_ALN 61
-#define MACH_TYPE_CAMELOT 62
-#define MACH_TYPE_GDS2200 63
-#define MACH_TYPE_PSION_SERIES7 64
-#define MACH_TYPE_XFILE 65
-#define MACH_TYPE_ACCELENT_EP9312 66
-#define MACH_TYPE_IC200 67
-#define MACH_TYPE_CREDITLART 68
-#define MACH_TYPE_HTM 69
-#define MACH_TYPE_IQ80310 70
-#define MACH_TYPE_FREEBOT 71
-#define MACH_TYPE_ENTEL 72
-#define MACH_TYPE_ENP3510 73
-#define MACH_TYPE_TRIZEPS 74
-#define MACH_TYPE_NESA 75
-#define MACH_TYPE_VENUS 76
-#define MACH_TYPE_TARDIS 77
-#define MACH_TYPE_MERCURY 78
-#define MACH_TYPE_EMPEG 79
-#define MACH_TYPE_I80200FCC 80
-#define MACH_TYPE_ITT_CPB 81
-#define MACH_TYPE_SVC 82
-#define MACH_TYPE_ALPHA2 84
-#define MACH_TYPE_ALPHA1 85
-#define MACH_TYPE_NETARM 86
#define MACH_TYPE_SIMPAD 87
-#define MACH_TYPE_PDA1 88
#define MACH_TYPE_LUBBOCK 89
-#define MACH_TYPE_ANIKO 90
#define MACH_TYPE_CLEP7212 91
-#define MACH_TYPE_CS89712 92
-#define MACH_TYPE_WEARARM 93
-#define MACH_TYPE_POSSIO_PX 94
-#define MACH_TYPE_SIDEARM 95
-#define MACH_TYPE_STORK 96
#define MACH_TYPE_SHANNON 97
-#define MACH_TYPE_ACE 98
-#define MACH_TYPE_BALLYARM 99
-#define MACH_TYPE_SIMPUTER 100
-#define MACH_TYPE_NEXTERM 101
-#define MACH_TYPE_SA1100_ELF 102
-#define MACH_TYPE_GATOR 103
-#define MACH_TYPE_GRANITE 104
#define MACH_TYPE_CONSUS 105
#define MACH_TYPE_AAED2000 106
#define MACH_TYPE_CDB89712 107
#define MACH_TYPE_GRAPHICSMASTER 108
#define MACH_TYPE_ADSBITSY 109
#define MACH_TYPE_PXA_IDP 110
-#define MACH_TYPE_PLCE 111
#define MACH_TYPE_PT_SYSTEM3 112
-#define MACH_TYPE_MEDALB 113
-#define MACH_TYPE_EAGLE 114
-#define MACH_TYPE_DSC21 115
-#define MACH_TYPE_DSC24 116
-#define MACH_TYPE_TI5472 117
#define MACH_TYPE_AUTCPU12 118
-#define MACH_TYPE_UENGINE 119
-#define MACH_TYPE_BLUESTEM 120
-#define MACH_TYPE_XINGU8 121
-#define MACH_TYPE_BUSHSTB 122
-#define MACH_TYPE_EPSILON1 123
-#define MACH_TYPE_BALLOON 124
-#define MACH_TYPE_PUPPY 125
-#define MACH_TYPE_ELROY 126
-#define MACH_TYPE_GMS720 127
-#define MACH_TYPE_S24X 128
-#define MACH_TYPE_JTEL_CLEP7312 129
-#define MACH_TYPE_CX821XX 130
-#define MACH_TYPE_EDB7312 131
-#define MACH_TYPE_BSA1110 132
-#define MACH_TYPE_POWERPIN 133
-#define MACH_TYPE_OPENARM 134
-#define MACH_TYPE_WHITECHAPEL 135
#define MACH_TYPE_H3100 136
-#define MACH_TYPE_H3800 137
-#define MACH_TYPE_BLUE_V1 138
-#define MACH_TYPE_PXA_CERF 139
-#define MACH_TYPE_ARM7TEVB 140
-#define MACH_TYPE_D7400 141
-#define MACH_TYPE_PIRANHA 142
-#define MACH_TYPE_SBCAMELOT 143
-#define MACH_TYPE_KINGS 144
-#define MACH_TYPE_SMDK2400 145
#define MACH_TYPE_COLLIE 146
-#define MACH_TYPE_IDR 147
#define MACH_TYPE_BADGE4 148
-#define MACH_TYPE_WEBNET 149
-#define MACH_TYPE_D7300 150
-#define MACH_TYPE_CEP 151
#define MACH_TYPE_FORTUNET 152
-#define MACH_TYPE_VC547X 153
-#define MACH_TYPE_FILEWALKER 154
-#define MACH_TYPE_NETGATEWAY 155
-#define MACH_TYPE_SYMBOL2800 156
-#define MACH_TYPE_SUNS 157
-#define MACH_TYPE_FRODO 158
-#define MACH_TYPE_MACH_TYTE_MS301 159
#define MACH_TYPE_MX1ADS 160
#define MACH_TYPE_H7201 161
#define MACH_TYPE_H7202 162
-#define MACH_TYPE_AMICO 163
-#define MACH_TYPE_IAM 164
-#define MACH_TYPE_TT530 165
-#define MACH_TYPE_SAM2400 166
-#define MACH_TYPE_JORNADA56X 167
-#define MACH_TYPE_ACTIVE 168
#define MACH_TYPE_IQ80321 169
-#define MACH_TYPE_WID 170
-#define MACH_TYPE_SABINAL 171
-#define MACH_TYPE_IXP425_MATACUMBE 172
-#define MACH_TYPE_MINIPRINT 173
-#define MACH_TYPE_ADM510X 174
-#define MACH_TYPE_SVS200 175
-#define MACH_TYPE_ATG_TCU 176
-#define MACH_TYPE_JORNADA820 177
-#define MACH_TYPE_S3C44B0 178
-#define MACH_TYPE_MARGIS2 179
#define MACH_TYPE_KS8695 180
-#define MACH_TYPE_BRH 181
-#define MACH_TYPE_S3C2410 182
-#define MACH_TYPE_POSSIO_PX30 183
-#define MACH_TYPE_S3C2800 184
-#define MACH_TYPE_FLEETWOOD 185
-#define MACH_TYPE_OMAHA 186
-#define MACH_TYPE_TA7 187
-#define MACH_TYPE_NOVA 188
-#define MACH_TYPE_HMK 189
-#define MACH_TYPE_KARO 190
-#define MACH_TYPE_FESTER 191
-#define MACH_TYPE_GPI 192
#define MACH_TYPE_SMDK2410 193
-#define MACH_TYPE_I519 194
-#define MACH_TYPE_NEXIO 195
-#define MACH_TYPE_BITBOX 196
-#define MACH_TYPE_G200 197
-#define MACH_TYPE_GILL 198
-#define MACH_TYPE_PXA_MERCURY 199
#define MACH_TYPE_CEIVA 200
-#define MACH_TYPE_FRET 201
-#define MACH_TYPE_EMAILPHONE 202
-#define MACH_TYPE_H3900 203
-#define MACH_TYPE_PXA1 204
-#define MACH_TYPE_KOAN369 205
-#define MACH_TYPE_COGENT 206
-#define MACH_TYPE_ESL_SIMPUTER 207
-#define MACH_TYPE_ESL_SIMPUTER_CLR 208
-#define MACH_TYPE_ESL_SIMPUTER_BW 209
-#define MACH_TYPE_HHP_CRADLE 210
-#define MACH_TYPE_HE500 211
-#define MACH_TYPE_INHANDELF2 212
-#define MACH_TYPE_INHANDFTIP 213
-#define MACH_TYPE_DNP1110 214
-#define MACH_TYPE_PNP1110 215
-#define MACH_TYPE_CSB226 216
-#define MACH_TYPE_ARNOLD 217
#define MACH_TYPE_VOICEBLUE 218
-#define MACH_TYPE_JZ8028 219
#define MACH_TYPE_H5400 220
-#define MACH_TYPE_FORTE 221
-#define MACH_TYPE_ACAM 222
-#define MACH_TYPE_ABOX 223
-#define MACH_TYPE_ATMEL 224
-#define MACH_TYPE_SITSANG 225
-#define MACH_TYPE_CPU1110LCDNET 226
-#define MACH_TYPE_MPL_VCMA9 227
-#define MACH_TYPE_OPUS_A1 228
-#define MACH_TYPE_DAYTONA 229
-#define MACH_TYPE_KILLBEAR 230
-#define MACH_TYPE_YOHO 231
-#define MACH_TYPE_JASPER 232
-#define MACH_TYPE_DSC25 233
#define MACH_TYPE_OMAP_INNOVATOR 234
-#define MACH_TYPE_RAMSES 235
-#define MACH_TYPE_S28X 236
-#define MACH_TYPE_MPORT3 237
-#define MACH_TYPE_PXA_EAGLE250 238
-#define MACH_TYPE_PDB 239
-#define MACH_TYPE_BLUE_2G 240
-#define MACH_TYPE_BLUEARCH 241
#define MACH_TYPE_IXDP2400 242
#define MACH_TYPE_IXDP2800 243
-#define MACH_TYPE_EXPLORER 244
#define MACH_TYPE_IXDP425 245
-#define MACH_TYPE_CHIMP 246
-#define MACH_TYPE_STORK_NEST 247
-#define MACH_TYPE_STORK_EGG 248
-#define MACH_TYPE_WISMO 249
-#define MACH_TYPE_EZLINX 250
-#define MACH_TYPE_AT91RM9200 251
-#define MACH_TYPE_ADTECH_ORION 252
-#define MACH_TYPE_NEPTUNE 253
#define MACH_TYPE_HACKKIT 254
-#define MACH_TYPE_PXA_WINS30 255
-#define MACH_TYPE_LAVINNA 256
-#define MACH_TYPE_PXA_UENGINE 257
-#define MACH_TYPE_INNOKOM 258
-#define MACH_TYPE_BMS 259
#define MACH_TYPE_IXCDP1100 260
-#define MACH_TYPE_PRPMC1100 261
#define MACH_TYPE_AT91RM9200DK 262
-#define MACH_TYPE_ARMSTICK 263
-#define MACH_TYPE_ARMONIE 264
-#define MACH_TYPE_MPORT1 265
-#define MACH_TYPE_S3C5410 266
-#define MACH_TYPE_ZCP320A 267
-#define MACH_TYPE_I_BOX 268
-#define MACH_TYPE_STLC1502 269
-#define MACH_TYPE_SIREN 270
-#define MACH_TYPE_GREENLAKE 271
-#define MACH_TYPE_ARGUS 272
-#define MACH_TYPE_COMBADGE 273
-#define MACH_TYPE_ROKEPXA 274
#define MACH_TYPE_CINTEGRATOR 275
-#define MACH_TYPE_GUIDEA07 276
-#define MACH_TYPE_TAT257 277
-#define MACH_TYPE_IGP2425 278
-#define MACH_TYPE_BLUEGRAMMA 279
-#define MACH_TYPE_IPOD 280
-#define MACH_TYPE_ADSBITSYX 281
-#define MACH_TYPE_TRIZEPS2 282
#define MACH_TYPE_VIPER 283
-#define MACH_TYPE_ADSBITSYPLUS 284
-#define MACH_TYPE_ADSAGC 285
-#define MACH_TYPE_STP7312 286
-#define MACH_TYPE_NX_PHNX 287
-#define MACH_TYPE_WEP_EP250 288
-#define MACH_TYPE_INHANDELF3 289
#define MACH_TYPE_ADI_COYOTE 290
-#define MACH_TYPE_IYONIX 291
-#define MACH_TYPE_DAMICAM_SA1110 292
-#define MACH_TYPE_MEG03 293
-#define MACH_TYPE_PXA_WHITECHAPEL 294
-#define MACH_TYPE_NWSC 295
-#define MACH_TYPE_NWLARM 296
-#define MACH_TYPE_IXP425_MGUARD 297
-#define MACH_TYPE_PXA_NETDCU4 298
#define MACH_TYPE_IXDP2401 299
#define MACH_TYPE_IXDP2801 300
-#define MACH_TYPE_ZODIAC 301
-#define MACH_TYPE_ARMMODUL 302
-#define MACH_TYPE_KETOP 303
-#define MACH_TYPE_AV7200 304
-#define MACH_TYPE_ARCH_TI925 305
-#define MACH_TYPE_ACQ200 306
-#define MACH_TYPE_PT_DAFIT 307
-#define MACH_TYPE_IHBA 308
-#define MACH_TYPE_QUINQUE 309
-#define MACH_TYPE_NIMBRAONE 310
-#define MACH_TYPE_NIMBRA29X 311
-#define MACH_TYPE_NIMBRA210 312
-#define MACH_TYPE_HHP_D95XX 313
-#define MACH_TYPE_LABARM 314
-#define MACH_TYPE_M825XX 315
-#define MACH_TYPE_M7100 316
-#define MACH_TYPE_NIPC2 317
-#define MACH_TYPE_FU7202 318
-#define MACH_TYPE_ADSAGX 319
-#define MACH_TYPE_PXA_POOH 320
-#define MACH_TYPE_BANDON 321
-#define MACH_TYPE_PCM7210 322
-#define MACH_TYPE_NMS9200 323
-#define MACH_TYPE_LOGODL 324
-#define MACH_TYPE_M7140 325
-#define MACH_TYPE_KOREBOT 326
#define MACH_TYPE_IQ31244 327
-#define MACH_TYPE_KOAN393 328
-#define MACH_TYPE_INHANDFTIP3 329
-#define MACH_TYPE_GONZO 330
#define MACH_TYPE_BAST 331
-#define MACH_TYPE_SCANPASS 332
-#define MACH_TYPE_EP7312_POOH 333
-#define MACH_TYPE_TA7S 334
-#define MACH_TYPE_TA7V 335
-#define MACH_TYPE_ICARUS 336
-#define MACH_TYPE_H1900 337
-#define MACH_TYPE_GEMINI 338
-#define MACH_TYPE_AXIM 339
-#define MACH_TYPE_AUDIOTRON 340
-#define MACH_TYPE_H2200 341
-#define MACH_TYPE_LOOX600 342
-#define MACH_TYPE_NIOP 343
-#define MACH_TYPE_DM310 344
-#define MACH_TYPE_SEEDPXA_C2 345
-#define MACH_TYPE_IXP4XX_MGUARD_PCI 346
#define MACH_TYPE_H1940 347
-#define MACH_TYPE_SCORPIO 348
-#define MACH_TYPE_VIVA 349
-#define MACH_TYPE_PXA_XCARD 350
-#define MACH_TYPE_CSB335 351
-#define MACH_TYPE_IXRD425 352
-#define MACH_TYPE_IQ80315 353
-#define MACH_TYPE_NMP7312 354
-#define MACH_TYPE_CX861XX 355
#define MACH_TYPE_ENP2611 356
-#define MACH_TYPE_XDA 357
-#define MACH_TYPE_CSIR_IMS 358
-#define MACH_TYPE_IXP421_DNAEETH 359
-#define MACH_TYPE_POCKETSERV9200 360
-#define MACH_TYPE_TOTO 361
#define MACH_TYPE_S3C2440 362
-#define MACH_TYPE_KS8695P 363
-#define MACH_TYPE_SE4000 364
-#define MACH_TYPE_QUADRICEPS 365
-#define MACH_TYPE_BRONCO 366
-#define MACH_TYPE_ESL_WIRELESS_TAB 367
-#define MACH_TYPE_ESL_SOFCOMP 368
-#define MACH_TYPE_S5C7375 369
-#define MACH_TYPE_SPEARHEAD 370
-#define MACH_TYPE_PANTERA 371
-#define MACH_TYPE_PRAYOGLITE 372
#define MACH_TYPE_GUMSTIX 373
-#define MACH_TYPE_RCUBE 374
-#define MACH_TYPE_REA_OLV 375
-#define MACH_TYPE_PXA_IPHONE 376
-#define MACH_TYPE_S3C3410 377
-#define MACH_TYPE_ESPD_4510B 378
-#define MACH_TYPE_MP1X 379
-#define MACH_TYPE_AT91RM9200TB 380
-#define MACH_TYPE_ADSVGX 381
#define MACH_TYPE_OMAP_H2 382
-#define MACH_TYPE_PELEE 383
#define MACH_TYPE_E740 384
#define MACH_TYPE_IQ80331 385
#define MACH_TYPE_VERSATILE_PB 387
#define MACH_TYPE_KEV7A400 388
#define MACH_TYPE_LPD7A400 389
#define MACH_TYPE_LPD7A404 390
-#define MACH_TYPE_FUJITSU_CAMELOT 391
-#define MACH_TYPE_JANUS2M 392
-#define MACH_TYPE_EMBTF 393
-#define MACH_TYPE_HPM 394
-#define MACH_TYPE_SMDK2410TK 395
-#define MACH_TYPE_SMDK2410AJ 396
-#define MACH_TYPE_STREETRACER 397
-#define MACH_TYPE_EFRAME 398
#define MACH_TYPE_CSB337 399
-#define MACH_TYPE_PXA_LARK 400
-#define MACH_TYPE_PNP2110 401
-#define MACH_TYPE_TCC72X 402
-#define MACH_TYPE_ALTAIR 403
-#define MACH_TYPE_KC3 404
-#define MACH_TYPE_SINTEFTD 405
#define MACH_TYPE_MAINSTONE 406
-#define MACH_TYPE_ADAY4X 407
-#define MACH_TYPE_LITE300 408
-#define MACH_TYPE_S5C7376 409
-#define MACH_TYPE_MT02 410
-#define MACH_TYPE_MPORT3S 411
-#define MACH_TYPE_RA_ALPHA 412
#define MACH_TYPE_XCEP 413
#define MACH_TYPE_ARCOM_VULCAN 414
-#define MACH_TYPE_STARGATE 415
-#define MACH_TYPE_ARMADILLOJ 416
-#define MACH_TYPE_ELROY_JACK 417
-#define MACH_TYPE_BACKEND 418
-#define MACH_TYPE_S5LINBOX 419
#define MACH_TYPE_NOMADIK 420
-#define MACH_TYPE_IA_CPU_9200 421
-#define MACH_TYPE_AT91_BJA1 422
#define MACH_TYPE_CORGI 423
#define MACH_TYPE_POODLE 424
-#define MACH_TYPE_TEN 425
-#define MACH_TYPE_ROVERP5P 426
-#define MACH_TYPE_SC2700 427
-#define MACH_TYPE_EX_EAGLE 428
-#define MACH_TYPE_NX_PXA12 429
-#define MACH_TYPE_NX_PXA5 430
-#define MACH_TYPE_BLACKBOARD2 431
-#define MACH_TYPE_I819 432
-#define MACH_TYPE_IXMB995E 433
-#define MACH_TYPE_SKYRIDER 434
-#define MACH_TYPE_SKYHAWK 435
-#define MACH_TYPE_ENTERPRISE 436
-#define MACH_TYPE_DEP2410 437
#define MACH_TYPE_ARMCORE 438
-#define MACH_TYPE_HOBBIT 439
-#define MACH_TYPE_H7210 440
-#define MACH_TYPE_PXA_NETDCU5 441
-#define MACH_TYPE_ACC 442
-#define MACH_TYPE_ESL_SARVA 443
-#define MACH_TYPE_XM250 444
-#define MACH_TYPE_T6TC1XB 445
-#define MACH_TYPE_ESS710 446
#define MACH_TYPE_MX31ADS 447
#define MACH_TYPE_HIMALAYA 448
-#define MACH_TYPE_BOLFENK 449
-#define MACH_TYPE_AT91RM9200KR 450
#define MACH_TYPE_EDB9312 451
#define MACH_TYPE_OMAP_GENERIC 452
-#define MACH_TYPE_AXIMX3 453
-#define MACH_TYPE_EB67XDIP 454
-#define MACH_TYPE_WEBTXS 455
-#define MACH_TYPE_HAWK 456
-#define MACH_TYPE_CCAT91SBC001 457
-#define MACH_TYPE_EXPRESSO 458
-#define MACH_TYPE_H4000 459
-#define MACH_TYPE_DINO 460
-#define MACH_TYPE_ML675K 461
#define MACH_TYPE_EDB9301 462
#define MACH_TYPE_EDB9315 463
-#define MACH_TYPE_RECIVA_TT 464
-#define MACH_TYPE_CSTCB01 465
-#define MACH_TYPE_CSTCB1 466
-#define MACH_TYPE_SHADWELL 467
-#define MACH_TYPE_GOEPEL263 468
-#define MACH_TYPE_ACQ100 469
-#define MACH_TYPE_MX1FS2 470
-#define MACH_TYPE_HIPTOP_G1 471
-#define MACH_TYPE_SPARKY 472
-#define MACH_TYPE_NS9750 473
-#define MACH_TYPE_PHOENIX 474
#define MACH_TYPE_VR1000 475
-#define MACH_TYPE_DEISTERPXA 476
-#define MACH_TYPE_BCM1160 477
-#define MACH_TYPE_PCM022 478
-#define MACH_TYPE_ADSGCX 479
-#define MACH_TYPE_DREADNAUGHT 480
-#define MACH_TYPE_DM320 481
-#define MACH_TYPE_MARKOV 482
-#define MACH_TYPE_COS7A400 483
-#define MACH_TYPE_MILANO 484
-#define MACH_TYPE_UE9328 485
-#define MACH_TYPE_UEX255 486
-#define MACH_TYPE_UE2410 487
-#define MACH_TYPE_A620 488
-#define MACH_TYPE_OCELOT 489
-#define MACH_TYPE_CHEETAH 490
#define MACH_TYPE_OMAP_PERSEUS2 491
-#define MACH_TYPE_ZVUE 492
-#define MACH_TYPE_ROVERP1 493
-#define MACH_TYPE_ASIDIAL2 494
-#define MACH_TYPE_S3C24A0 495
#define MACH_TYPE_E800 496
#define MACH_TYPE_E750 497
-#define MACH_TYPE_S3C5500 498
-#define MACH_TYPE_SMDK5500 499
-#define MACH_TYPE_SIGNALSYNC 500
-#define MACH_TYPE_NBC 501
-#define MACH_TYPE_KODIAK 502
-#define MACH_TYPE_NETBOOKPRO 503
-#define MACH_TYPE_HW90200 504
-#define MACH_TYPE_CONDOR 505
-#define MACH_TYPE_CUP 506
-#define MACH_TYPE_KITE 507
#define MACH_TYPE_SCB9328 508
#define MACH_TYPE_OMAP_H3 509
#define MACH_TYPE_OMAP_H4 510
-#define MACH_TYPE_N10 511
-#define MACH_TYPE_MONTAJADE 512
-#define MACH_TYPE_SG560 513
-#define MACH_TYPE_DP1000 514
#define MACH_TYPE_OMAP_OSK 515
-#define MACH_TYPE_RG100V3 516
-#define MACH_TYPE_MX2ADS 517
-#define MACH_TYPE_PXA_KILO 518
-#define MACH_TYPE_IXP4XX_EAGLE 519
#define MACH_TYPE_TOSA 520
-#define MACH_TYPE_MB2520F 521
-#define MACH_TYPE_EMC1000 522
-#define MACH_TYPE_TIDSC25 523
-#define MACH_TYPE_AKCPMXL 524
-#define MACH_TYPE_AV3XX 525
#define MACH_TYPE_AVILA 526
-#define MACH_TYPE_PXA_MPM10 527
-#define MACH_TYPE_PXA_KYANITE 528
-#define MACH_TYPE_SGOLD 529
-#define MACH_TYPE_OSCAR 530
-#define MACH_TYPE_EPXA4USB2 531
-#define MACH_TYPE_XSENGINE 532
-#define MACH_TYPE_IP600 533
-#define MACH_TYPE_MCAN2 534
-#define MACH_TYPE_DDI_BLUERIDGE 535
-#define MACH_TYPE_SKYMINDER 536
-#define MACH_TYPE_LPD79520 537
#define MACH_TYPE_EDB9302 538
-#define MACH_TYPE_HW90340 539
-#define MACH_TYPE_CIP_BOX 540
-#define MACH_TYPE_IVPN 541
-#define MACH_TYPE_RSOC2 542
#define MACH_TYPE_HUSKY 543
-#define MACH_TYPE_BOXER 544
#define MACH_TYPE_SHEPHERD 545
-#define MACH_TYPE_AML42800AA 546
-#define MACH_TYPE_LPC2294 548
-#define MACH_TYPE_SWITCHGRASS 549
-#define MACH_TYPE_ENS_CMU 550
-#define MACH_TYPE_MM6_SDB 551
-#define MACH_TYPE_SATURN 552
-#define MACH_TYPE_I30030EVB 553
-#define MACH_TYPE_MXC27530EVB 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_CORNWALLIS 588
-#define MACH_TYPE_GURNEY_DRV 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
-#define MACH_TYPE_HMS39C7092 614
-#define MACH_TYPE_ARMADILLO 615
-#define MACH_TYPE_IPCU 616
-#define MACH_TYPE_LOOX720 617
#define MACH_TYPE_IXDP465 618
#define MACH_TYPE_IXDP2351 619
-#define MACH_TYPE_ADSVIX 620
-#define MACH_TYPE_DM270 621
-#define MACH_TYPE_SOCLTPLUS 622
-#define MACH_TYPE_ECIA 623
-#define MACH_TYPE_CM4008 624
-#define MACH_TYPE_P2001 625
-#define MACH_TYPE_TWISTER 626
-#define MACH_TYPE_MUDSHARK 627
-#define MACH_TYPE_HB2 628
#define MACH_TYPE_IQ80332 629
-#define MACH_TYPE_SENDT 630
-#define MACH_TYPE_MX2JAZZ 631
-#define MACH_TYPE_MULTIIO 632
-#define MACH_TYPE_HRDISPLAY 633
-#define MACH_TYPE_MXC27530ADS 634
-#define MACH_TYPE_TRIZEPS3 635
-#define MACH_TYPE_ZEFEERDZA 636
-#define MACH_TYPE_ZEFEERDZB 637
-#define MACH_TYPE_ZEFEERDZG 638
-#define MACH_TYPE_ZEFEERDZN 639
-#define MACH_TYPE_ZEFEERDZQ 640
#define MACH_TYPE_GTWX5715 641
-#define MACH_TYPE_ASTRO_JACK 643
-#define MACH_TYPE_TIP03 644
-#define MACH_TYPE_A9200EC 645
-#define MACH_TYPE_PNX0105 646
-#define MACH_TYPE_ADCPOECPU 647
#define MACH_TYPE_CSB637 648
-#define MACH_TYPE_MB9200 650
-#define MACH_TYPE_KULUN 651
-#define MACH_TYPE_SNAPPER 652
-#define MACH_TYPE_OPTIMA 653
-#define MACH_TYPE_DLHSBC 654
-#define MACH_TYPE_X30 655
#define MACH_TYPE_N30 656
-#define MACH_TYPE_MANGA_KS8695 657
-#define MACH_TYPE_AJAX 658
#define MACH_TYPE_NEC_MP900 659
-#define MACH_TYPE_VVTK1000 661
#define MACH_TYPE_KAFA 662
-#define MACH_TYPE_VVTK3000 663
-#define MACH_TYPE_PIMX1 664
-#define MACH_TYPE_OLLIE 665
-#define MACH_TYPE_SKYMAX 666
-#define MACH_TYPE_JAZZ 667
-#define MACH_TYPE_TEL_T3 668
-#define MACH_TYPE_AISINO_FCR255 669
-#define MACH_TYPE_BTWEB 670
-#define MACH_TYPE_DBG_LH79520 671
-#define MACH_TYPE_CM41XX 672
#define MACH_TYPE_TS72XX 673
-#define MACH_TYPE_NGGPXA 674
-#define MACH_TYPE_CSB535 675
-#define MACH_TYPE_CSB536 676
-#define MACH_TYPE_PXA_TRAKPOD 677
-#define MACH_TYPE_PRAXIS 678
-#define MACH_TYPE_LH75411 679
#define MACH_TYPE_OTOM 680
#define MACH_TYPE_NEXCODER_2440 681
-#define MACH_TYPE_LOOX410 682
-#define MACH_TYPE_WESTLAKE 683
-#define MACH_TYPE_NSB 684
-#define MACH_TYPE_ESL_SARVA_STN 685
-#define MACH_TYPE_ESL_SARVA_TFT 686
-#define MACH_TYPE_ESL_SARVA_IAD 687
-#define MACH_TYPE_ESL_SARVA_ACC 688
-#define MACH_TYPE_TYPHOON 689
-#define MACH_TYPE_CNAV 690
-#define MACH_TYPE_A730 691
-#define MACH_TYPE_NETSTAR 692
-#define MACH_TYPE_PHASEFALE_SUPERCON 693
-#define MACH_TYPE_SHIVA1100 694
-#define MACH_TYPE_ETEXSC 695
-#define MACH_TYPE_IXDPG465 696
-#define MACH_TYPE_A9M2410 697
-#define MACH_TYPE_A9M2440 698
-#define MACH_TYPE_A9M9750 699
-#define MACH_TYPE_A9M9360 700
-#define MACH_TYPE_UNC90 701
#define MACH_TYPE_ECO920 702
-#define MACH_TYPE_SATVIEW 703
#define MACH_TYPE_ROADRUNNER 704
#define MACH_TYPE_AT91RM9200EK 705
-#define MACH_TYPE_GP32 706
-#define MACH_TYPE_GEM 707
-#define MACH_TYPE_I858 708
-#define MACH_TYPE_HX2750 709
-#define MACH_TYPE_MXC91131EVB 710
-#define MACH_TYPE_P700 711
-#define MACH_TYPE_CPE 712
#define MACH_TYPE_SPITZ 713
-#define MACH_TYPE_NIMBRA340 714
-#define MACH_TYPE_LPC22XX 715
-#define MACH_TYPE_COMET3 716
-#define MACH_TYPE_COMET4 717
-#define MACH_TYPE_CSB625 718
-#define MACH_TYPE_FORTUNET2 719
-#define MACH_TYPE_S5H2200 720
-#define MACH_TYPE_OPTORM920 721
-#define MACH_TYPE_ADSBITSYXB 722
#define MACH_TYPE_ADSSPHERE 723
-#define MACH_TYPE_ADSPORTAL 724
-#define MACH_TYPE_LN2410SBC 725
-#define MACH_TYPE_CB3RUFC 726
-#define MACH_TYPE_MP2USB 727
-#define MACH_TYPE_NTNP425C 728
#define MACH_TYPE_COLIBRI 729
-#define MACH_TYPE_PCM7220 730
#define MACH_TYPE_GATEWAY7001 731
#define MACH_TYPE_PCM027 732
-#define MACH_TYPE_CMPXA 733
#define MACH_TYPE_ANUBIS 734
-#define MACH_TYPE_ITE8152 735
-#define MACH_TYPE_LPC3XXX 736
-#define MACH_TYPE_PUPPETEER 737
-#define MACH_TYPE_E570 739
-#define MACH_TYPE_X50 740
-#define MACH_TYPE_RECON 741
-#define MACH_TYPE_XBOARDGP8 742
-#define MACH_TYPE_FPIC2 743
#define MACH_TYPE_AKITA 744
-#define MACH_TYPE_A81 745
-#define MACH_TYPE_SVM_SC25X 746
-#define MACH_TYPE_VADATECH020 747
-#define MACH_TYPE_TLI 748
-#define MACH_TYPE_EDB9315LC 749
-#define MACH_TYPE_PASSEC 750
-#define MACH_TYPE_DS_TIGER 751
-#define MACH_TYPE_E310 752
#define MACH_TYPE_E330 753
-#define MACH_TYPE_RT3000 754
#define MACH_TYPE_NOKIA770 755
-#define MACH_TYPE_PNX0106 756
-#define MACH_TYPE_HX21XX 757
-#define MACH_TYPE_FARADAY 758
-#define MACH_TYPE_SBC9312 759
-#define MACH_TYPE_BATMAN 760
-#define MACH_TYPE_JPD201 761
-#define MACH_TYPE_MIPSA 762
-#define MACH_TYPE_KACOM 763
-#define MACH_TYPE_SWARCOCPU 764
-#define MACH_TYPE_SWARCODSL 765
-#define MACH_TYPE_BLUEANGEL 766
-#define MACH_TYPE_HAIRYGRAMA 767
-#define MACH_TYPE_BANFF 768
#define MACH_TYPE_CARMEVA 769
-#define MACH_TYPE_SAM255 770
-#define MACH_TYPE_PPM10 771
#define MACH_TYPE_EDB9315A 772
-#define MACH_TYPE_SUNSET 773
#define MACH_TYPE_STARGATE2 774
#define MACH_TYPE_INTELMOTE2 775
#define MACH_TYPE_TRIZEPS4 776
-#define MACH_TYPE_MAINSTONE2 777
-#define MACH_TYPE_EZ_IXP42X 778
-#define MACH_TYPE_TAPWAVE_ZODIAC 779
-#define MACH_TYPE_UNIVERSALMETER 780
-#define MACH_TYPE_HICOARM9 781
#define MACH_TYPE_PNX4008 782
-#define MACH_TYPE_KWS6000 783
-#define MACH_TYPE_PORTUX920T 784
-#define MACH_TYPE_EZ_X5 785
-#define MACH_TYPE_OMAP_RUDOLPH 786
#define MACH_TYPE_CPUAT91 787
-#define MACH_TYPE_REA9200 788
-#define MACH_TYPE_ACTS_PUNE_SA1110 789
-#define MACH_TYPE_IXP425 790
-#define MACH_TYPE_I30030ADS 791
-#define MACH_TYPE_PERCH 792
-#define MACH_TYPE_EIS05R1 793
-#define MACH_TYPE_PEPPERPAD 794
-#define MACH_TYPE_SB3010 795
-#define MACH_TYPE_RM9200 796
-#define MACH_TYPE_DMA03 797
-#define MACH_TYPE_ROAD_S101 798
#define MACH_TYPE_IQ81340SC 799
-#define MACH_TYPE_IQ_NEXTGEN_B 800
#define MACH_TYPE_IQ81340MC 801
-#define MACH_TYPE_IQ_NEXTGEN_D 802
-#define MACH_TYPE_IQ_NEXTGEN_E 803
-#define MACH_TYPE_MALLOW_AT91 804
-#define MACH_TYPE_CYBERTRACKER_I 805
-#define MACH_TYPE_GESBC931X 806
-#define MACH_TYPE_CENTIPAD 807
-#define MACH_TYPE_ARMSOC 808
-#define MACH_TYPE_SE4200 809
-#define MACH_TYPE_EMS197A 810
#define MACH_TYPE_MICRO9 811
#define MACH_TYPE_MICRO9L 812
-#define MACH_TYPE_UC5471DSP 813
-#define MACH_TYPE_SJ5471ENG 814
-#define MACH_TYPE_CMPXA26X 815
-#define MACH_TYPE_NC 816
#define MACH_TYPE_OMAP_PALMTE 817
-#define MACH_TYPE_AJAX52X 818
-#define MACH_TYPE_SIRIUSTAR 819
-#define MACH_TYPE_IODATA_HDLG 820
-#define MACH_TYPE_AT91RM9200UTL 821
-#define MACH_TYPE_BIOSAFE 822
-#define MACH_TYPE_MP1000 823
-#define MACH_TYPE_PARSY 824
-#define MACH_TYPE_CCXP 825
-#define MACH_TYPE_OMAP_GSAMPLE 826
#define MACH_TYPE_REALVIEW_EB 827
-#define MACH_TYPE_SAMOA 828
-#define MACH_TYPE_PALMT3 829
-#define MACH_TYPE_I878 830
#define MACH_TYPE_BORZOI 831
-#define MACH_TYPE_GECKO 832
-#define MACH_TYPE_DS101 833
-#define MACH_TYPE_OMAP_PALMTT2 834
#define MACH_TYPE_PALMLD 835
-#define MACH_TYPE_CC9C 836
-#define MACH_TYPE_SBC1670 837
#define MACH_TYPE_IXDP28X5 838
#define MACH_TYPE_OMAP_PALMTT 839
-#define MACH_TYPE_ML696K 840
#define MACH_TYPE_ARCOM_ZEUS 841
#define MACH_TYPE_OSIRIS 842
-#define MACH_TYPE_MAESTRO 843
#define MACH_TYPE_PALMTE2 844
-#define MACH_TYPE_IXBBM 845
#define MACH_TYPE_MX27ADS 846
-#define MACH_TYPE_AX8004 847
#define MACH_TYPE_AT91SAM9261EK 848
#define MACH_TYPE_LOFT 849
-#define MACH_TYPE_MAGPIE 850
#define MACH_TYPE_MX21ADS 851
-#define MACH_TYPE_MB87M3400 852
-#define MACH_TYPE_MGUARD_DELTA 853
-#define MACH_TYPE_DAVINCI_DVDP 854
-#define MACH_TYPE_HTCUNIVERSAL 855
-#define MACH_TYPE_TPAD 856
-#define MACH_TYPE_ROVERP3 857
-#define MACH_TYPE_JORNADA928 858
-#define MACH_TYPE_MV88FXX81 859
-#define MACH_TYPE_STMP36XX 860
-#define MACH_TYPE_SXNI79524 861
#define MACH_TYPE_AMS_DELTA 862
-#define MACH_TYPE_URANIUM 863
-#define MACH_TYPE_UCON 864
#define MACH_TYPE_NAS100D 865
-#define MACH_TYPE_L083_1000 866
-#define MACH_TYPE_EZX 867
-#define MACH_TYPE_PNX5220 868
-#define MACH_TYPE_BUTTE 869
-#define MACH_TYPE_SRM2 870
-#define MACH_TYPE_DSBR 871
-#define MACH_TYPE_CRYSTALBALL 872
-#define MACH_TYPE_TINYPXA27X 873
-#define MACH_TYPE_HERBIE 874
#define MACH_TYPE_MAGICIAN 875
-#define MACH_TYPE_CM4002 876
-#define MACH_TYPE_B4 877
-#define MACH_TYPE_MAUI 878
-#define MACH_TYPE_CYBERTRACKER_G 879
#define MACH_TYPE_NXDKN 880
-#define MACH_TYPE_MIO8390 881
-#define MACH_TYPE_OMI_BOARD 882
-#define MACH_TYPE_MX21CIV 883
-#define MACH_TYPE_MAHI_CDAC 884
#define MACH_TYPE_PALMTX 885
#define MACH_TYPE_S3C2413 887
-#define MACH_TYPE_SAMSYS_EP0 888
-#define MACH_TYPE_WG302V1 889
#define MACH_TYPE_WG302V2 890
-#define MACH_TYPE_EB42X 891
-#define MACH_TYPE_IQ331ES 892
-#define MACH_TYPE_COSYDSP 893
-#define MACH_TYPE_UPLAT7D 894
-#define MACH_TYPE_PTDAVINCI 895
-#define MACH_TYPE_MBUS 896
-#define MACH_TYPE_NADIA2VB 897
-#define MACH_TYPE_R1000 898
-#define MACH_TYPE_HW90250 899
#define MACH_TYPE_OMAP_2430SDP 900
#define MACH_TYPE_DAVINCI_EVM 901
-#define MACH_TYPE_OMAP_TORNADO 902
-#define MACH_TYPE_OLOCREEK 903
#define MACH_TYPE_PALMZ72 904
#define MACH_TYPE_NXDB500 905
-#define MACH_TYPE_APF9328 906
-#define MACH_TYPE_OMAP_WIPOQ 907
-#define MACH_TYPE_OMAP_TWIP 908
-#define MACH_TYPE_TREO650 909
-#define MACH_TYPE_ACUMEN 910
-#define MACH_TYPE_XP100 911
-#define MACH_TYPE_FS2410 912
-#define MACH_TYPE_PXA270_CERF 913
-#define MACH_TYPE_SQ2FTLPALM 914
-#define MACH_TYPE_BSEMSERVER 915
-#define MACH_TYPE_NETCLIENT 916
#define MACH_TYPE_PALMT5 917
#define MACH_TYPE_PALMTC 918
#define MACH_TYPE_OMAP_APOLLON 919
-#define MACH_TYPE_MXC30030EVB 920
-#define MACH_TYPE_REA_2D 921
-#define MACH_TYPE_TI3E524 922
#define MACH_TYPE_ATEB9200 923
-#define MACH_TYPE_AUCKLAND 924
-#define MACH_TYPE_AK3320M 925
-#define MACH_TYPE_DURAMAX 926
#define MACH_TYPE_N35 927
-#define MACH_TYPE_PRONGHORN 928
-#define MACH_TYPE_FUNDY 929
#define MACH_TYPE_LOGICPD_PXA270 930
-#define MACH_TYPE_CPU777 931
-#define MACH_TYPE_SIMICON9201 932
-#define MACH_TYPE_LEAP2_HPM 933
-#define MACH_TYPE_CM922TXA10 934
-#define MACH_TYPE_PXA 935
-#define MACH_TYPE_SANDGATE2 936
-#define MACH_TYPE_SANDGATE2G 937
-#define MACH_TYPE_SANDGATE2P 938
-#define MACH_TYPE_FRED_JACK 939
-#define MACH_TYPE_TTG_COLOR1 940
#define MACH_TYPE_NXEB500HMI 941
-#define MACH_TYPE_NETDCU8 942
-#define MACH_TYPE_NG_FVX538 944
-#define MACH_TYPE_NG_FVS338 945
-#define MACH_TYPE_PNX4103 946
-#define MACH_TYPE_HESDB 947
-#define MACH_TYPE_XSILO 948
#define MACH_TYPE_ESPRESSO 949
-#define MACH_TYPE_EMLC 950
-#define MACH_TYPE_SISTERON 951
#define MACH_TYPE_RX1950 952
-#define MACH_TYPE_TSC_VENUS 953
-#define MACH_TYPE_DS101J 954
-#define MACH_TYPE_MXC30030ADS 955
-#define MACH_TYPE_FUJITSU_WIMAXSOC 956
-#define MACH_TYPE_DUALPCMODEM 957
#define MACH_TYPE_GESBC9312 958
-#define MACH_TYPE_HTCAPACHE 959
-#define MACH_TYPE_IXDP435 960
-#define MACH_TYPE_CATPROVT100 961
-#define MACH_TYPE_PICOTUX1XX 962
#define MACH_TYPE_PICOTUX2XX 963
#define MACH_TYPE_DSMG600 964
-#define MACH_TYPE_EMPC2 965
-#define MACH_TYPE_VENTURA 966
-#define MACH_TYPE_PHIDGET_SBC 967
-#define MACH_TYPE_IJ3K 968
-#define MACH_TYPE_PISGAH 969
#define MACH_TYPE_OMAP_FSAMPLE 970
-#define MACH_TYPE_SG720 971
-#define MACH_TYPE_REDFOX 972
-#define MACH_TYPE_MYSH_EP9315_1 973
-#define MACH_TYPE_TPF106 974
-#define MACH_TYPE_AT91RM9200KG 975
-#define MACH_TYPE_SLEDB 976
-#define MACH_TYPE_ONTRACK 977
-#define MACH_TYPE_PM1200 978
-#define MACH_TYPE_ESS24XXX 979
-#define MACH_TYPE_COREMP7 980
-#define MACH_TYPE_NEXCODER_6446 981
-#define MACH_TYPE_STVC8380 982
-#define MACH_TYPE_TEKLYNX 983
-#define MACH_TYPE_CARBONADO 984
-#define MACH_TYPE_SYSMOS_MP730 985
#define MACH_TYPE_SNAPPER_CL15 986
-#define MACH_TYPE_PGIGIM 987
-#define MACH_TYPE_PTX9160P2 988
-#define MACH_TYPE_DCORE1 989
-#define MACH_TYPE_VICTORPXA 990
-#define MACH_TYPE_MX2DTB 991
-#define MACH_TYPE_PXA_IREX_ER0100 992
#define MACH_TYPE_OMAP_PALMZ71 993
-#define MACH_TYPE_BARTEC_DEG 994
-#define MACH_TYPE_HW50251 995
-#define MACH_TYPE_IBOX 996
-#define MACH_TYPE_ATLASLH7A404 997
-#define MACH_TYPE_PT2026 998
-#define MACH_TYPE_HTCALPINE 999
-#define MACH_TYPE_BARTEC_VTU 1000
-#define MACH_TYPE_VCOREII 1001
-#define MACH_TYPE_PDNB3 1002
-#define MACH_TYPE_HTCBEETLES 1003
-#define MACH_TYPE_S3C6400 1004
-#define MACH_TYPE_S3C2443 1005
-#define MACH_TYPE_OMAP_LDK 1006
-#define MACH_TYPE_SMDK2460 1007
-#define MACH_TYPE_SMDK2440 1008
#define MACH_TYPE_SMDK2412 1009
-#define MACH_TYPE_WEBBOX 1010
-#define MACH_TYPE_CWWNDP 1011
-#define MACH_TYPE_DRAGON 1012
-#define MACH_TYPE_OPENDO_CPU_BOARD 1013
-#define MACH_TYPE_CCM2200 1014
-#define MACH_TYPE_ETWARM 1015
-#define MACH_TYPE_M93030 1016
-#define MACH_TYPE_CC7U 1017
-#define MACH_TYPE_MTT_RANGER 1018
-#define MACH_TYPE_NEXUS 1019
-#define MACH_TYPE_DESMAN 1020
-#define MACH_TYPE_BKDE303 1021
#define MACH_TYPE_SMDK2413 1022
-#define MACH_TYPE_AML_M7200 1023
#define MACH_TYPE_AML_M5900 1024
-#define MACH_TYPE_SG640 1025
-#define MACH_TYPE_EDG79524 1026
-#define MACH_TYPE_AI2410 1027
-#define MACH_TYPE_IXP465 1028
#define MACH_TYPE_BALLOON3 1029
-#define MACH_TYPE_HEINS 1030
-#define MACH_TYPE_MPLUSEVA 1031
-#define MACH_TYPE_RT042 1032
-#define MACH_TYPE_CWIEM 1033
-#define MACH_TYPE_CM_X270 1034
-#define MACH_TYPE_CM_X255 1035
-#define MACH_TYPE_ESH_AT91 1036
-#define MACH_TYPE_SANDGATE3 1037
-#define MACH_TYPE_PRIMO 1038
-#define MACH_TYPE_GEMSTONE 1039
-#define MACH_TYPE_PRONGHORNMETRO 1040
-#define MACH_TYPE_SIDEWINDER 1041
-#define MACH_TYPE_PICOMOD1 1042
-#define MACH_TYPE_SG590 1043
-#define MACH_TYPE_AKAI9307 1044
-#define MACH_TYPE_FONTAINE 1045
-#define MACH_TYPE_WOMBAT 1046
-#define MACH_TYPE_ACQ300 1047
-#define MACH_TYPE_MOD_270 1048
-#define MACH_TYPE_VC0820 1049
-#define MACH_TYPE_ANI_AIM 1050
-#define MACH_TYPE_JELLYFISH 1051
-#define MACH_TYPE_AMANITA 1052
-#define MACH_TYPE_VLINK 1053
-#define MACH_TYPE_DEXFLEX 1054
-#define MACH_TYPE_EIGEN_TTQ 1055
-#define MACH_TYPE_ARCOM_TITAN 1056
-#define MACH_TYPE_TABLA 1057
-#define MACH_TYPE_MDIRAC3 1058
-#define MACH_TYPE_MRHFBP2 1059
-#define MACH_TYPE_AT91RM9200RB 1060
-#define MACH_TYPE_ANI_APM 1061
-#define MACH_TYPE_ELLA1 1062
-#define MACH_TYPE_INHAND_PXA27X 1063
-#define MACH_TYPE_INHAND_PXA25X 1064
-#define MACH_TYPE_EMPOS_XM 1065
-#define MACH_TYPE_EMPOS 1066
-#define MACH_TYPE_EMPOS_TINY 1067
-#define MACH_TYPE_EMPOS_SM 1068
-#define MACH_TYPE_EGRET 1069
-#define MACH_TYPE_OSTRICH 1070
-#define MACH_TYPE_N50 1071
#define MACH_TYPE_ECBAT91 1072
-#define MACH_TYPE_STAREAST 1073
-#define MACH_TYPE_DSPG_DW 1074
#define MACH_TYPE_ONEARM 1075
-#define MACH_TYPE_MRG110_6 1076
-#define MACH_TYPE_WRT300NV2 1077
-#define MACH_TYPE_XM_BULVERDE 1078
-#define MACH_TYPE_MSM6100 1079
-#define MACH_TYPE_ETI_B1 1080
-#define MACH_TYPE_ZILOG_ZA9L 1081
-#define MACH_TYPE_BIT2440 1082
-#define MACH_TYPE_NBI 1083
#define MACH_TYPE_SMDK2443 1084
-#define MACH_TYPE_VDAVINCI 1085
-#define MACH_TYPE_ATC6 1086
-#define MACH_TYPE_MULTMDW 1087
-#define MACH_TYPE_MBA2440 1088
-#define MACH_TYPE_ECSD 1089
-#define MACH_TYPE_PALMZ31 1090
#define MACH_TYPE_FSG 1091
-#define MACH_TYPE_RAZOR101 1092
-#define MACH_TYPE_OPERA_TDM 1093
-#define MACH_TYPE_COMCERTO 1094
-#define MACH_TYPE_TB0319 1095
-#define MACH_TYPE_KWS8000 1096
-#define MACH_TYPE_B2 1097
-#define MACH_TYPE_LCL54 1098
#define MACH_TYPE_AT91SAM9260EK 1099
#define MACH_TYPE_GLANTANK 1100
#define MACH_TYPE_N2100 1101
-#define MACH_TYPE_N4100 1102
-#define MACH_TYPE_VERTICAL_RSC4 1103
-#define MACH_TYPE_SG8100 1104
-#define MACH_TYPE_IM42XX 1105
-#define MACH_TYPE_FTXX 1106
-#define MACH_TYPE_LWFUSION 1107
#define MACH_TYPE_QT2410 1108
#define MACH_TYPE_KIXRP435 1109
-#define MACH_TYPE_CCW9C 1110
-#define MACH_TYPE_DABHS 1111
-#define MACH_TYPE_GZMX 1112
-#define MACH_TYPE_IPNW100AP 1113
#define MACH_TYPE_CC9P9360DEV 1114
-#define MACH_TYPE_CC9P9750DEV 1115
-#define MACH_TYPE_CC9P9360VAL 1116
-#define MACH_TYPE_CC9P9750VAL 1117
-#define MACH_TYPE_NX70V 1118
-#define MACH_TYPE_AT91RM9200DF 1119
-#define MACH_TYPE_SE_PILOT2 1120
-#define MACH_TYPE_MTCN_T800 1121
-#define MACH_TYPE_VCMX212 1122
-#define MACH_TYPE_LYNX 1123
-#define MACH_TYPE_AT91SAM9260ID 1124
-#define MACH_TYPE_HW86052 1125
-#define MACH_TYPE_PILZ_PMI3 1126
#define MACH_TYPE_EDB9302A 1127
#define MACH_TYPE_EDB9307A 1128
-#define MACH_TYPE_CT_DFS 1129
-#define MACH_TYPE_PILZ_PMI4 1130
-#define MACH_TYPE_XCEEDNP_IXP 1131
-#define MACH_TYPE_SMDK2442B 1132
-#define MACH_TYPE_XNODE 1133
-#define MACH_TYPE_AIDX270 1134
-#define MACH_TYPE_REMA 1135
-#define MACH_TYPE_BPS1000 1136
-#define MACH_TYPE_HW90350 1137
#define MACH_TYPE_OMAP_3430SDP 1138
-#define MACH_TYPE_BLUETOUCH 1139
#define MACH_TYPE_VSTMS 1140
-#define MACH_TYPE_XSBASE270 1141
-#define MACH_TYPE_AT91SAM9260EK_CN 1142
-#define MACH_TYPE_ADSTURBOXB 1143
-#define MACH_TYPE_OTI4110 1144
-#define MACH_TYPE_HME_PXA 1145
-#define MACH_TYPE_DEISTERDCA 1146
-#define MACH_TYPE_CES_SSEM2 1147
-#define MACH_TYPE_CES_MTR 1148
-#define MACH_TYPE_TDS_AVNG_SBC 1149
-#define MACH_TYPE_EVEREST 1150
-#define MACH_TYPE_PNX4010 1151
-#define MACH_TYPE_OXNAS 1152
-#define MACH_TYPE_FIORI 1153
-#define MACH_TYPE_ML1200 1154
-#define MACH_TYPE_PECOS 1155
-#define MACH_TYPE_NB2XXX 1156
-#define MACH_TYPE_HW6900 1157
-#define MACH_TYPE_CDCS_QUOLL 1158
-#define MACH_TYPE_QUICKSILVER 1159
-#define MACH_TYPE_UPLAT926 1160
-#define MACH_TYPE_DEP2410_THOMAS 1161
-#define MACH_TYPE_DTK2410 1162
-#define MACH_TYPE_CHILI 1163
-#define MACH_TYPE_DEMETER 1164
-#define MACH_TYPE_DIONYSUS 1165
-#define MACH_TYPE_AS352X 1166
-#define MACH_TYPE_SERVICE 1167
-#define MACH_TYPE_CS_E9301 1168
#define MACH_TYPE_MICRO9M 1169
-#define MACH_TYPE_IA_MOSPCK 1170
-#define MACH_TYPE_QL201B 1171
-#define MACH_TYPE_BBM 1174
-#define MACH_TYPE_EXXX 1175
-#define MACH_TYPE_WMA11B 1176
-#define MACH_TYPE_PELCO_ATLAS 1177
-#define MACH_TYPE_G500 1178
#define MACH_TYPE_BUG 1179
-#define MACH_TYPE_MX33ADS 1180
-#define MACH_TYPE_CHUB 1181
-#define MACH_TYPE_NEO1973_GTA01 1182
-#define MACH_TYPE_W90N740 1183
-#define MACH_TYPE_MEDALLION_SA2410 1184
-#define MACH_TYPE_IA_CPU_9200_2 1185
-#define MACH_TYPE_DIMMRM9200 1186
-#define MACH_TYPE_PM9261 1187
-#define MACH_TYPE_ML7304 1189
-#define MACH_TYPE_UCP250 1190
-#define MACH_TYPE_INTBOARD 1191
-#define MACH_TYPE_GULFSTREAM 1192
-#define MACH_TYPE_LABQUEST 1193
-#define MACH_TYPE_VCMX313 1194
-#define MACH_TYPE_URG200 1195
-#define MACH_TYPE_CPUX255LCDNET 1196
-#define MACH_TYPE_NETDCU9 1197
-#define MACH_TYPE_NETDCU10 1198
-#define MACH_TYPE_DSPG_DGA 1199
-#define MACH_TYPE_DSPG_DVW 1200
-#define MACH_TYPE_SOLOS 1201
#define MACH_TYPE_AT91SAM9263EK 1202
-#define MACH_TYPE_OSSTBOX 1203
-#define MACH_TYPE_KBAT9261 1204
-#define MACH_TYPE_CT1100 1205
-#define MACH_TYPE_AKCPPXA 1206
-#define MACH_TYPE_OCHAYA1020 1207
-#define MACH_TYPE_HITRACK 1208
-#define MACH_TYPE_SYME1 1209
-#define MACH_TYPE_SYHL1 1210
-#define MACH_TYPE_EMPCA400 1211
#define MACH_TYPE_EM7210 1212
-#define MACH_TYPE_HTCHERMES 1213
-#define MACH_TYPE_ETI_C1 1214
-#define MACH_TYPE_AC100 1216
-#define MACH_TYPE_SNEETCH 1217
-#define MACH_TYPE_STUDENTMATE 1218
-#define MACH_TYPE_ZIR2410 1219
-#define MACH_TYPE_ZIR2413 1220
-#define MACH_TYPE_DLONIP3 1221
-#define MACH_TYPE_INSTREAM 1222
-#define MACH_TYPE_AMBARELLA 1223
-#define MACH_TYPE_NEVIS 1224
-#define MACH_TYPE_HTC_TRINITY 1225
-#define MACH_TYPE_QL202B 1226
#define MACH_TYPE_VPAC270 1227
-#define MACH_TYPE_RD129 1228
-#define MACH_TYPE_HTCWIZARD 1229
#define MACH_TYPE_TREO680 1230
-#define MACH_TYPE_TECON_TMEZON 1231
#define MACH_TYPE_ZYLONITE 1233
-#define MACH_TYPE_GENE1270 1234
-#define MACH_TYPE_ZIR2412 1235
#define MACH_TYPE_MX31LITE 1236
-#define MACH_TYPE_T700WX 1237
-#define MACH_TYPE_VF100 1238
-#define MACH_TYPE_NSB2 1239
-#define MACH_TYPE_NXHMI_BB 1240
-#define MACH_TYPE_NXHMI_RE 1241
-#define MACH_TYPE_N4100PRO 1242
-#define MACH_TYPE_SAM9260 1243
-#define MACH_TYPE_OMAP_TREO600 1244
-#define MACH_TYPE_INDY2410 1245
-#define MACH_TYPE_NELT_A 1246
-#define MACH_TYPE_N311 1248
-#define MACH_TYPE_AT91SAM9260VGK 1249
-#define MACH_TYPE_AT91LEPPE 1250
-#define MACH_TYPE_AT91LEPCCN 1251
-#define MACH_TYPE_APC7100 1252
-#define MACH_TYPE_STARGAZER 1253
-#define MACH_TYPE_SONATA 1254
-#define MACH_TYPE_SCHMOOGIE 1255
-#define MACH_TYPE_AZTOOL 1256
#define MACH_TYPE_MIOA701 1257
-#define MACH_TYPE_SXNI9260 1258
-#define MACH_TYPE_MXC27520EVB 1259
#define MACH_TYPE_ARMADILLO5X0 1260
-#define MACH_TYPE_MB9260 1261
-#define MACH_TYPE_MB9263 1262
-#define MACH_TYPE_IPAC9302 1263
#define MACH_TYPE_CC9P9360JS 1264
-#define MACH_TYPE_GALLIUM 1265
-#define MACH_TYPE_MSC2410 1266
-#define MACH_TYPE_GHI270 1267
-#define MACH_TYPE_DAVINCI_LEONARDO 1268
-#define MACH_TYPE_OIAB 1269
#define MACH_TYPE_SMDK6400 1270
#define MACH_TYPE_NOKIA_N800 1271
-#define MACH_TYPE_GREENPHONE 1272
-#define MACH_TYPE_COMPEXWP18 1273
-#define MACH_TYPE_XMATE 1274
-#define MACH_TYPE_ENERGIZER 1275
-#define MACH_TYPE_IME1 1276
-#define MACH_TYPE_SWEDATMS 1277
-#define MACH_TYPE_NTNP435C 1278
-#define MACH_TYPE_SPECTRO2 1279
-#define MACH_TYPE_H6039 1280
#define MACH_TYPE_EP80219 1281
-#define MACH_TYPE_SAMOA_II 1282
-#define MACH_TYPE_CWMXL 1283
-#define MACH_TYPE_AS9200 1284
-#define MACH_TYPE_SFX1149 1285
-#define MACH_TYPE_NAVI010 1286
-#define MACH_TYPE_MULTMDP 1287
-#define MACH_TYPE_SCB9520 1288
-#define MACH_TYPE_HTCATHENA 1289
-#define MACH_TYPE_XP179 1290
-#define MACH_TYPE_H4300 1291
#define MACH_TYPE_GORAMO_MLR 1292
-#define MACH_TYPE_MXC30020EVB 1293
-#define MACH_TYPE_ADSBITSYG5 1294
-#define MACH_TYPE_ADSPORTALPLUS 1295
-#define MACH_TYPE_MMSP2PLUS 1296
#define MACH_TYPE_EM_X270 1297
-#define MACH_TYPE_TPP302 1298
-#define MACH_TYPE_TPM104 1299
-#define MACH_TYPE_TPM102 1300
-#define MACH_TYPE_TPM109 1301
-#define MACH_TYPE_FBXO1 1302
-#define MACH_TYPE_HXD8 1303
#define MACH_TYPE_NEO1973_GTA02 1304
-#define MACH_TYPE_EMTEST 1305
-#define MACH_TYPE_AD6900 1306
-#define MACH_TYPE_EUROPA 1307
-#define MACH_TYPE_METROCONNECT 1308
-#define MACH_TYPE_EZ_S2410 1309
-#define MACH_TYPE_EZ_S2440 1310
-#define MACH_TYPE_EZ_EP9312 1311
-#define MACH_TYPE_EZ_EP9315 1312
-#define MACH_TYPE_EZ_X7 1313
-#define MACH_TYPE_GODOTDB 1314
-#define MACH_TYPE_MISTRAL 1315
-#define MACH_TYPE_MSM 1316
-#define MACH_TYPE_CT5910 1317
-#define MACH_TYPE_CT5912 1318
-#define MACH_TYPE_HYNET_INE 1319
-#define MACH_TYPE_HYNET_APP 1320
-#define MACH_TYPE_MSM7200 1321
-#define MACH_TYPE_MSM7600 1322
-#define MACH_TYPE_CEB255 1323
-#define MACH_TYPE_CIEL 1324
-#define MACH_TYPE_SLM5650 1325
#define MACH_TYPE_AT91SAM9RLEK 1326
-#define MACH_TYPE_COMTECH_ROUTER 1327
-#define MACH_TYPE_SBC2410X 1328
-#define MACH_TYPE_AT4X0BD 1329
-#define MACH_TYPE_CBIFR 1330
-#define MACH_TYPE_ARCOM_QUANTUM 1331
-#define MACH_TYPE_MATRIX520 1332
-#define MACH_TYPE_MATRIX510 1333
-#define MACH_TYPE_MATRIX500 1334
-#define MACH_TYPE_M501 1335
-#define MACH_TYPE_AAEON1270 1336
-#define MACH_TYPE_MATRIX500EV 1337
-#define MACH_TYPE_PAC500 1338
-#define MACH_TYPE_PNX8181 1339
#define MACH_TYPE_COLIBRI320 1340
-#define MACH_TYPE_AZTOOLBB 1341
-#define MACH_TYPE_AZTOOLG2 1342
-#define MACH_TYPE_DVLHOST 1343
-#define MACH_TYPE_ZIR9200 1344
-#define MACH_TYPE_ZIR9260 1345
-#define MACH_TYPE_COCOPAH 1346
-#define MACH_TYPE_NDS 1347
-#define MACH_TYPE_ROSENCRANTZ 1348
-#define MACH_TYPE_FTTX_ODSC 1349
-#define MACH_TYPE_CLASSE_R6904 1350
#define MACH_TYPE_CAM60 1351
-#define MACH_TYPE_MXC30031ADS 1352
-#define MACH_TYPE_DATACALL 1353
#define MACH_TYPE_AT91EB01 1354
-#define MACH_TYPE_RTY 1355
-#define MACH_TYPE_DWL2100 1356
-#define MACH_TYPE_VINSI 1357
#define MACH_TYPE_DB88F5281 1358
#define MACH_TYPE_CSB726 1359
-#define MACH_TYPE_TIK27 1360
-#define MACH_TYPE_MX_UC7420 1361
-#define MACH_TYPE_RIRM3 1362
-#define MACH_TYPE_PELCO_ODYSSEY 1363
-#define MACH_TYPE_ADX_ABOX 1365
-#define MACH_TYPE_ADX_TPID 1366
-#define MACH_TYPE_MINICHECK 1367
-#define MACH_TYPE_IDAM 1368
-#define MACH_TYPE_MARIO_MX 1369
-#define MACH_TYPE_VI1888 1370
-#define MACH_TYPE_ZR4230 1371
-#define MACH_TYPE_T1_IX_BLUE 1372
-#define MACH_TYPE_SYHQ2 1373
-#define MACH_TYPE_COMPUTIME_R3 1374
-#define MACH_TYPE_ORATIS 1375
-#define MACH_TYPE_MIKKO 1376
-#define MACH_TYPE_HOLON 1377
-#define MACH_TYPE_OLIP8 1378
-#define MACH_TYPE_GHI270HG 1379
#define MACH_TYPE_DAVINCI_DM6467_EVM 1380
#define MACH_TYPE_DAVINCI_DM355_EVM 1381
-#define MACH_TYPE_BLACKRIVER 1383
-#define MACH_TYPE_SANDGATEWP 1384
-#define MACH_TYPE_CDOTBWSG 1385
-#define MACH_TYPE_QUARK963 1386
-#define MACH_TYPE_CSB735 1387
#define MACH_TYPE_LITTLETON 1388
-#define MACH_TYPE_MIO_P550 1389
-#define MACH_TYPE_MOTION2440 1390
-#define MACH_TYPE_IMM500 1391
-#define MACH_TYPE_HOMEMATIC 1392
-#define MACH_TYPE_ERMINE 1393
-#define MACH_TYPE_KB9202B 1394
-#define MACH_TYPE_HS1XX 1395
-#define MACH_TYPE_STUDENTMATE2440 1396
-#define MACH_TYPE_ARVOO_L1_Z1 1397
-#define MACH_TYPE_DEP2410K 1398
-#define MACH_TYPE_XXSVIDEO 1399
-#define MACH_TYPE_IM4004 1400
-#define MACH_TYPE_OCHAYA1050 1401
-#define MACH_TYPE_LEP9261 1402
-#define MACH_TYPE_SVENMEB 1403
-#define MACH_TYPE_FORTUNET2NE 1404
-#define MACH_TYPE_NXHX 1406
#define MACH_TYPE_REALVIEW_PB11MP 1407
-#define MACH_TYPE_IDS500 1408
-#define MACH_TYPE_ORS_N725 1409
-#define MACH_TYPE_HSDARM 1410
-#define MACH_TYPE_SHA_PON003 1411
-#define MACH_TYPE_SHA_PON004 1412
-#define MACH_TYPE_SHA_PON007 1413
-#define MACH_TYPE_SHA_PON011 1414
-#define MACH_TYPE_H6042 1415
-#define MACH_TYPE_H6043 1416
-#define MACH_TYPE_LOOXC550 1417
-#define MACH_TYPE_CNTY_TITAN 1418
-#define MACH_TYPE_APP3XX 1419
-#define MACH_TYPE_SIDEOATSGRAMA 1420
-#define MACH_TYPE_TREO700P 1421
-#define MACH_TYPE_TREO700W 1422
-#define MACH_TYPE_TREO750 1423
-#define MACH_TYPE_TREO755P 1424
-#define MACH_TYPE_EZREGANUT9200 1425
-#define MACH_TYPE_SARGE 1426
-#define MACH_TYPE_A696 1427
-#define MACH_TYPE_TURTLE 1428
#define MACH_TYPE_MX27_3DS 1430
-#define MACH_TYPE_BISHOP 1431
-#define MACH_TYPE_PXX 1432
-#define MACH_TYPE_REDWOOD 1433
-#define MACH_TYPE_OMAP_2430DLP 1436
-#define MACH_TYPE_OMAP_2430OSK 1437
-#define MACH_TYPE_SARDINE 1438
#define MACH_TYPE_HALIBUT 1439
#define MACH_TYPE_TROUT 1440
-#define MACH_TYPE_GOLDFISH 1441
-#define MACH_TYPE_GESBC2440 1442
-#define MACH_TYPE_NOMAD 1443
-#define MACH_TYPE_ROSALIND 1444
-#define MACH_TYPE_CC9P9215 1445
-#define MACH_TYPE_CC9P9210 1446
-#define MACH_TYPE_CC9P9215JS 1447
-#define MACH_TYPE_CC9P9210JS 1448
-#define MACH_TYPE_NASFFE 1449
-#define MACH_TYPE_TN2X0BD 1450
-#define MACH_TYPE_GWMPXA 1451
-#define MACH_TYPE_EXYPLUS 1452
-#define MACH_TYPE_JADOO21 1453
-#define MACH_TYPE_LOOXN560 1454
-#define MACH_TYPE_BONSAI 1455
-#define MACH_TYPE_ADSMILGATO 1456
-#define MACH_TYPE_GBA 1457
-#define MACH_TYPE_H6044 1458
-#define MACH_TYPE_APP 1459
#define MACH_TYPE_TCT_HAMMER 1460
#define MACH_TYPE_HERALD 1461
-#define MACH_TYPE_ARTEMIS 1462
-#define MACH_TYPE_HTCTITAN 1463
-#define MACH_TYPE_QRANIUM 1464
-#define MACH_TYPE_ADX_WSC2 1465
-#define MACH_TYPE_ADX_MEDCOM 1466
-#define MACH_TYPE_BBOARD 1467
-#define MACH_TYPE_CAMBRIA 1468
-#define MACH_TYPE_MT7XXX 1469
-#define MACH_TYPE_MATRIX512 1470
-#define MACH_TYPE_MATRIX522 1471
-#define MACH_TYPE_IPAC5010 1472
-#define MACH_TYPE_SAKURA 1473
-#define MACH_TYPE_GROCX 1474
-#define MACH_TYPE_PM9263 1475
#define MACH_TYPE_SIM_ONE 1476
-#define MACH_TYPE_ACQ132 1477
-#define MACH_TYPE_DATR 1478
-#define MACH_TYPE_ACTUX1 1479
-#define MACH_TYPE_ACTUX2 1480
-#define MACH_TYPE_ACTUX3 1481
-#define MACH_TYPE_FLEXIT 1482
-#define MACH_TYPE_BH2X0BD 1483
-#define MACH_TYPE_ATB2002 1484
-#define MACH_TYPE_XENON 1485
-#define MACH_TYPE_FM607 1486
-#define MACH_TYPE_MATRIX514 1487
-#define MACH_TYPE_MATRIX524 1488
-#define MACH_TYPE_INPOD 1489
#define MACH_TYPE_JIVE 1490
-#define MACH_TYPE_TLL_MX21 1491
-#define MACH_TYPE_SBC2800 1492
-#define MACH_TYPE_CC7UCAMRY 1493
-#define MACH_TYPE_UBISYS_P9_SC15 1494
-#define MACH_TYPE_UBISYS_P9_SSC2D10 1495
-#define MACH_TYPE_UBISYS_P9_RCU3 1496
-#define MACH_TYPE_AML_M8000 1497
-#define MACH_TYPE_SNAPPER_270 1498
-#define MACH_TYPE_OMAP_BBX 1499
-#define MACH_TYPE_UCN2410 1500
#define MACH_TYPE_SAM9_L9260 1501
-#define MACH_TYPE_ETI_C2 1502
-#define MACH_TYPE_AVALANCHE 1503
#define MACH_TYPE_REALVIEW_PB1176 1504
-#define MACH_TYPE_DP1500 1505
-#define MACH_TYPE_APPLE_IPHONE 1506
#define MACH_TYPE_YL9200 1507
#define MACH_TYPE_RD88F5182 1508
#define MACH_TYPE_KUROBOX_PRO 1509
-#define MACH_TYPE_SE_POET 1510
#define MACH_TYPE_MX31_3DS 1511
-#define MACH_TYPE_R270 1512
-#define MACH_TYPE_ARMOUR21 1513
-#define MACH_TYPE_DT2 1514
-#define MACH_TYPE_VT4 1515
-#define MACH_TYPE_TYCO320 1516
-#define MACH_TYPE_ADMA 1517
-#define MACH_TYPE_WP188 1518
-#define MACH_TYPE_CORSICA 1519
-#define MACH_TYPE_BIGEYE 1520
-#define MACH_TYPE_TLL5000 1522
-#define MACH_TYPE_BEBOT 1523
#define MACH_TYPE_QONG 1524
-#define MACH_TYPE_TCOMPACT 1525
-#define MACH_TYPE_PUMA5 1526
-#define MACH_TYPE_ELARA 1527
-#define MACH_TYPE_ELLINGTON 1528
-#define MACH_TYPE_XDA_ATOM 1529
-#define MACH_TYPE_ENERGIZER2 1530
-#define MACH_TYPE_ODIN 1531
-#define MACH_TYPE_ACTUX4 1532
-#define MACH_TYPE_ESL_OMAP 1533
#define MACH_TYPE_OMAP2EVM 1534
#define MACH_TYPE_OMAP3EVM 1535
-#define MACH_TYPE_ADX_PCU57 1536
-#define MACH_TYPE_MONACO 1537
-#define MACH_TYPE_LEVANTE 1538
-#define MACH_TYPE_TMXIPX425 1539
-#define MACH_TYPE_LEEP 1540
-#define MACH_TYPE_RAAD 1541
#define MACH_TYPE_DNS323 1542
-#define MACH_TYPE_AP1000 1543
-#define MACH_TYPE_A9SAM6432 1544
-#define MACH_TYPE_SHINY 1545
#define MACH_TYPE_OMAP3_BEAGLE 1546
-#define MACH_TYPE_CSR_BDB2 1547
#define MACH_TYPE_NOKIA_N810 1548
-#define MACH_TYPE_C270 1549
-#define MACH_TYPE_SENTRY 1550
#define MACH_TYPE_PCM038 1551
-#define MACH_TYPE_ANC300 1552
-#define MACH_TYPE_HTCKAISER 1553
-#define MACH_TYPE_SBAT100 1554
-#define MACH_TYPE_MODUNORM 1555
-#define MACH_TYPE_PELOS_TWARM 1556
-#define MACH_TYPE_FLANK 1557
-#define MACH_TYPE_SIRLOIN 1558
-#define MACH_TYPE_BRISKET 1559
-#define MACH_TYPE_CHUCK 1560
-#define MACH_TYPE_OTTER 1561
-#define MACH_TYPE_DAVINCI_LDK 1562
-#define MACH_TYPE_PHREEDOM 1563
-#define MACH_TYPE_SG310 1564
#define MACH_TYPE_TS209 1565
#define MACH_TYPE_AT91CAP9ADK 1566
-#define MACH_TYPE_TION9315 1567
-#define MACH_TYPE_MAST 1568
-#define MACH_TYPE_PFW 1569
-#define MACH_TYPE_YL_P2440 1570
-#define MACH_TYPE_ZSBC32 1571
-#define MACH_TYPE_OMAP_PACE2 1572
-#define MACH_TYPE_IMX_PACE2 1573
#define MACH_TYPE_MX31MOBOARD 1574
-#define MACH_TYPE_MX37_3DS 1575
-#define MACH_TYPE_RCC 1576
-#define MACH_TYPE_ARM9 1577
-#define MACH_TYPE_VISION_EP9307 1578
-#define MACH_TYPE_SCLY1000 1579
-#define MACH_TYPE_FONTEL_EP 1580
-#define MACH_TYPE_VOICEBLUE3G 1581
-#define MACH_TYPE_TT9200 1582
-#define MACH_TYPE_DIGI2410 1583
#define MACH_TYPE_TERASTATION_PRO2 1584
#define MACH_TYPE_LINKSTATION_PRO 1585
-#define MACH_TYPE_MOTOROLA_A780 1587
-#define MACH_TYPE_MOTOROLA_E6 1588
-#define MACH_TYPE_MOTOROLA_E2 1589
-#define MACH_TYPE_MOTOROLA_E680 1590
-#define MACH_TYPE_UR2410 1591
-#define MACH_TYPE_TAS9261 1592
-#define MACH_TYPE_HERMES_HD 1593
-#define MACH_TYPE_PERSEO_HD 1594
-#define MACH_TYPE_STARGAZER2 1595
#define MACH_TYPE_E350 1596
-#define MACH_TYPE_WPCM450 1597
-#define MACH_TYPE_CARTESIO 1598
-#define MACH_TYPE_TOYBOX 1599
-#define MACH_TYPE_TX27 1600
#define MACH_TYPE_TS409 1601
-#define MACH_TYPE_P300 1602
-#define MACH_TYPE_XDACOMET 1603
-#define MACH_TYPE_DEXFLEX2 1604
-#define MACH_TYPE_OW 1605
-#define MACH_TYPE_ARMEBS3 1606
-#define MACH_TYPE_U3 1607
-#define MACH_TYPE_SMDK2450 1608
-#define MACH_TYPE_RSI_EWS 1609
-#define MACH_TYPE_TNB 1610
-#define MACH_TYPE_TOEPATH 1611
-#define MACH_TYPE_KB9263 1612
-#define MACH_TYPE_MT7108 1613
-#define MACH_TYPE_SMTR2440 1614
-#define MACH_TYPE_MANAO 1615
#define MACH_TYPE_CM_X300 1616
-#define MACH_TYPE_GULFSTREAM_KP 1617
-#define MACH_TYPE_LANREADYFN522 1618
-#define MACH_TYPE_ARMA37 1619
-#define MACH_TYPE_MENDEL 1620
-#define MACH_TYPE_PELCO_ILIAD 1621
-#define MACH_TYPE_UNIT2P 1622
-#define MACH_TYPE_INC20OTTER 1623
#define MACH_TYPE_AT91SAM9G20EK 1624
-#define MACH_TYPE_STORCENTER 1625
#define MACH_TYPE_SMDK6410 1626
#define MACH_TYPE_U300 1627
-#define MACH_TYPE_U500 1628
-#define MACH_TYPE_DS9260 1629
-#define MACH_TYPE_RIVERROCK 1630
-#define MACH_TYPE_SCIBATH 1631
-#define MACH_TYPE_AT91SAM7SE512EK 1632
#define MACH_TYPE_WRT350N_V2 1633
-#define MACH_TYPE_MULTIMEDIA 1634
-#define MACH_TYPE_MARVIN 1635
-#define MACH_TYPE_X500 1636
-#define MACH_TYPE_AWLUG4LCU 1637
-#define MACH_TYPE_PALERMOC 1638
#define MACH_TYPE_OMAP_LDP 1639
-#define MACH_TYPE_IP500 1640
-#define MACH_TYPE_ASE2 1642
-#define MACH_TYPE_MX35EVB 1643
-#define MACH_TYPE_AML_M8050 1644
#define MACH_TYPE_MX35_3DS 1645
-#define MACH_TYPE_MARS 1646
#define MACH_TYPE_NEUROS_OSD2 1647
-#define MACH_TYPE_BADGER 1648
#define MACH_TYPE_TRIZEPS4WL 1649
-#define MACH_TYPE_TRIZEPS5 1650
-#define MACH_TYPE_MARLIN 1651
#define MACH_TYPE_TS78XX 1652
-#define MACH_TYPE_HPIPAQ214 1653
-#define MACH_TYPE_AT572D940DCM 1654
-#define MACH_TYPE_NE1BOARD 1655
-#define MACH_TYPE_ZANTE 1656
#define MACH_TYPE_SFFSDR 1657
-#define MACH_TYPE_TW2662 1658
-#define MACH_TYPE_VF10XX 1659
-#define MACH_TYPE_ZORAN43XX 1660
-#define MACH_TYPE_SONIX926 1661
-#define MACH_TYPE_CELESTIALSEMI 1662
-#define MACH_TYPE_CC9M2443JS 1663
-#define MACH_TYPE_TW5334 1664
-#define MACH_TYPE_HTCARTEMIS 1665
-#define MACH_TYPE_NAL_HLITE 1666
-#define MACH_TYPE_HTCVOGUE 1667
-#define MACH_TYPE_SMARTWEB 1668
-#define MACH_TYPE_MV86XX 1669
-#define MACH_TYPE_MV87XX 1670
-#define MACH_TYPE_SONGYOUNGHO 1671
-#define MACH_TYPE_YOUNGHOTEMA 1672
#define MACH_TYPE_PCM037 1673
-#define MACH_TYPE_MMVP 1674
-#define MACH_TYPE_MMAP 1675
-#define MACH_TYPE_PTID2410 1676
-#define MACH_TYPE_JAMES_926 1677
-#define MACH_TYPE_FM6000 1678
#define MACH_TYPE_DB88F6281_BP 1680
#define MACH_TYPE_RD88F6192_NAS 1681
#define MACH_TYPE_RD88F6281 1682
#define MACH_TYPE_DB78X00_BP 1683
#define MACH_TYPE_SMDK2416 1685
-#define MACH_TYPE_OCE_SPIDER_SI 1686
-#define MACH_TYPE_OCE_SPIDER_SK 1687
-#define MACH_TYPE_ROVERN6 1688
-#define MACH_TYPE_PELCO_EVOLUTION 1689
#define MACH_TYPE_WBD111 1690
-#define MACH_TYPE_ELARACPE 1691
-#define MACH_TYPE_MABV3 1692
#define MACH_TYPE_MV2120 1693
-#define MACH_TYPE_CSB737 1695
#define MACH_TYPE_MX51_3DS 1696
-#define MACH_TYPE_G900 1697
-#define MACH_TYPE_APF27 1698
-#define MACH_TYPE_GGUS2000 1699
-#define MACH_TYPE_OMAP_2430_MIMIC 1700
#define MACH_TYPE_IMX27LITE 1701
-#define MACH_TYPE_ALMEX 1702
-#define MACH_TYPE_CONTROL 1703
-#define MACH_TYPE_MBA2410 1704
-#define MACH_TYPE_VOLCANO 1705
-#define MACH_TYPE_ZENITH 1706
-#define MACH_TYPE_MUCHIP 1707
-#define MACH_TYPE_MAGELLAN 1708
#define MACH_TYPE_USB_A9260 1709
#define MACH_TYPE_USB_A9263 1710
#define MACH_TYPE_QIL_A9260 1711
-#define MACH_TYPE_CME9210 1712
-#define MACH_TYPE_HCZH4 1713
-#define MACH_TYPE_SPEARBASIC 1714
-#define MACH_TYPE_DEP2440 1715
-#define MACH_TYPE_HDL_GXR 1716
-#define MACH_TYPE_HDL_GT 1717
-#define MACH_TYPE_HDL_4G 1718
-#define MACH_TYPE_S3C6000 1719
-#define MACH_TYPE_MMSP2_MDK 1720
-#define MACH_TYPE_MPX220 1721
#define MACH_TYPE_KZM_ARM11_01 1722
-#define MACH_TYPE_HTC_POLARIS 1723
-#define MACH_TYPE_HTC_KAISER 1724
-#define MACH_TYPE_LG_KS20 1725
-#define MACH_TYPE_HHGPS 1726
#define MACH_TYPE_NOKIA_N810_WIMAX 1727
-#define MACH_TYPE_INSIGHT 1728
#define MACH_TYPE_SAPPHIRE 1729
-#define MACH_TYPE_CSB637XO 1730
-#define MACH_TYPE_EVISIONG 1731
#define MACH_TYPE_STMP37XX 1732
#define MACH_TYPE_STMP378X 1733
-#define MACH_TYPE_TNT 1734
-#define MACH_TYPE_TBXT 1735
-#define MACH_TYPE_PLAYMATE 1736
-#define MACH_TYPE_PNS10 1737
-#define MACH_TYPE_EZNAVI 1738
-#define MACH_TYPE_PS4000 1739
#define MACH_TYPE_EZX_A780 1740
#define MACH_TYPE_EZX_E680 1741
#define MACH_TYPE_EZX_A1200 1742
#define MACH_TYPE_EZX_E6 1743
#define MACH_TYPE_EZX_E2 1744
#define MACH_TYPE_EZX_A910 1745
-#define MACH_TYPE_CWMX31 1746
-#define MACH_TYPE_SL2312 1747
-#define MACH_TYPE_BLENNY 1748
-#define MACH_TYPE_DS107 1749
-#define MACH_TYPE_DSX07 1750
-#define MACH_TYPE_PICOCOM1 1751
-#define MACH_TYPE_LYNX_WOLVERINE 1752
-#define MACH_TYPE_UBISYS_P9_SC19 1753
-#define MACH_TYPE_KRATOS_LOW 1754
-#define MACH_TYPE_M700 1755
#define MACH_TYPE_EDMINI_V2 1756
#define MACH_TYPE_ZIPIT2 1757
-#define MACH_TYPE_HSLFEMTOCELL 1758
-#define MACH_TYPE_DAINTREE_AT91 1759
-#define MACH_TYPE_SG560USB 1760
#define MACH_TYPE_OMAP3_PANDORA 1761
-#define MACH_TYPE_USR8200 1762
-#define MACH_TYPE_S1S65K 1763
-#define MACH_TYPE_S2S65A 1764
-#define MACH_TYPE_ICORE 1765
#define MACH_TYPE_MSS2 1766
-#define MACH_TYPE_BELMONT 1767
-#define MACH_TYPE_ASUSP525 1768
#define MACH_TYPE_LB88RC8480 1769
-#define MACH_TYPE_HIPXA 1770
#define MACH_TYPE_MX25_3DS 1771
-#define MACH_TYPE_M800 1772
#define MACH_TYPE_OMAP3530_LV_SOM 1773
-#define MACH_TYPE_PRIMA_EVB 1774
-#define MACH_TYPE_MX31BT1 1775
-#define MACH_TYPE_ATLAS4_EVB 1776
-#define MACH_TYPE_MX31CICADA 1777
-#define MACH_TYPE_MI424WR 1778
-#define MACH_TYPE_AXS_ULTRAX 1779
-#define MACH_TYPE_AT572D940DEB 1780
#define MACH_TYPE_DAVINCI_DA830_EVM 1781
-#define MACH_TYPE_EP9302 1782
#define MACH_TYPE_AT572D940HFEB 1783
-#define MACH_TYPE_CYBOOK3 1784
-#define MACH_TYPE_WDG002 1785
-#define MACH_TYPE_SG560ADSL 1786
-#define MACH_TYPE_NEXTIO_N2800_ICA 1787
#define MACH_TYPE_DOVE_DB 1788
-#define MACH_TYPE_MARVELL_NEWDB 1789
-#define MACH_TYPE_VANDIHUD 1790
-#define MACH_TYPE_MAGX_E8 1791
-#define MACH_TYPE_MAGX_Z6 1792
-#define MACH_TYPE_MAGX_V8 1793
-#define MACH_TYPE_MAGX_U9 1794
-#define MACH_TYPE_TOUGHCF08 1795
-#define MACH_TYPE_ZW4400 1796
-#define MACH_TYPE_MARAT91 1797
#define MACH_TYPE_OVERO 1798
#define MACH_TYPE_AT2440EVB 1799
#define MACH_TYPE_NEOCORE926 1800
#define MACH_TYPE_WNR854T 1801
-#define MACH_TYPE_IMX27 1802
-#define MACH_TYPE_MOOSE_DB 1803
-#define MACH_TYPE_FAB4 1804
-#define MACH_TYPE_HTCDIAMOND 1805
-#define MACH_TYPE_FIONA 1806
-#define MACH_TYPE_MXC30030_X 1807
-#define MACH_TYPE_BMP1000 1808
-#define MACH_TYPE_LOGI9200 1809
-#define MACH_TYPE_TQMA31 1810
-#define MACH_TYPE_CCW9P9215JS 1811
#define MACH_TYPE_RD88F5181L_GE 1812
-#define MACH_TYPE_SIFMAIN 1813
-#define MACH_TYPE_SAM9_L9261 1814
-#define MACH_TYPE_CC9M2443 1815
-#define MACH_TYPE_XARIA300 1816
-#define MACH_TYPE_IT9200 1817
#define MACH_TYPE_RD88F5181L_FXO 1818
-#define MACH_TYPE_KRISS_SENSOR 1819
-#define MACH_TYPE_PILZ_PMI5 1820
-#define MACH_TYPE_JADE 1821
-#define MACH_TYPE_KS8695_SOFTPLC 1822
-#define MACH_TYPE_GPRISC3 1823
#define MACH_TYPE_STAMP9G20 1824
-#define MACH_TYPE_SMDK6430 1825
#define MACH_TYPE_SMDKC100 1826
#define MACH_TYPE_TAVOREVB 1827
#define MACH_TYPE_SAAR 1828
-#define MACH_TYPE_DEISTER_EYECAM 1829
#define MACH_TYPE_AT91SAM9M10G45EK 1830
-#define MACH_TYPE_LINKSTATION_PRODUO 1831
-#define MACH_TYPE_HIT_B0 1832
-#define MACH_TYPE_ADX_RMU 1833
-#define MACH_TYPE_XG_CPE_MAIN 1834
-#define MACH_TYPE_EDB9407A 1835
-#define MACH_TYPE_DTB9608 1836
-#define MACH_TYPE_EM104V1 1837
-#define MACH_TYPE_DEMO 1838
-#define MACH_TYPE_LOGI9260 1839
-#define MACH_TYPE_MX31_EXM32 1840
-#define MACH_TYPE_USB_A9G20 1841
-#define MACH_TYPE_PICPROJE2008 1842
-#define MACH_TYPE_CS_E9315 1843
-#define MACH_TYPE_QIL_A9G20 1844
-#define MACH_TYPE_SHA_PON020 1845
-#define MACH_TYPE_NAD 1846
-#define MACH_TYPE_SBC35_A9260 1847
-#define MACH_TYPE_SBC35_A9G20 1848
-#define MACH_TYPE_DAVINCI_BEGINNING 1849
-#define MACH_TYPE_UWC 1850
#define MACH_TYPE_MXLADS 1851
-#define MACH_TYPE_HTCNIKE 1852
-#define MACH_TYPE_DEISTER_PXA270 1853
-#define MACH_TYPE_CME9210JS 1854
-#define MACH_TYPE_CC9P9360 1855
-#define MACH_TYPE_MOCHA 1856
-#define MACH_TYPE_WAPD170AG 1857
#define MACH_TYPE_LINKSTATION_MINI 1858
#define MACH_TYPE_AFEB9260 1859
-#define MACH_TYPE_W90X900 1860
-#define MACH_TYPE_W90X700 1861
-#define MACH_TYPE_KT300IP 1862
-#define MACH_TYPE_KT300IP_G20 1863
-#define MACH_TYPE_SRCM 1864
-#define MACH_TYPE_WLNX_9260 1865
-#define MACH_TYPE_OPENMOKO_GTA03 1866
-#define MACH_TYPE_OSPREY2 1867
-#define MACH_TYPE_KBIO9260 1868
-#define MACH_TYPE_GINZA 1869
-#define MACH_TYPE_A636N 1870
#define MACH_TYPE_IMX27IPCAM 1871
-#define MACH_TYPE_NEMOC 1872
-#define MACH_TYPE_GENEVA 1873
-#define MACH_TYPE_HTCPHAROS 1874
-#define MACH_TYPE_NEONC 1875
-#define MACH_TYPE_NAS7100 1876
-#define MACH_TYPE_TEUPHONE 1877
-#define MACH_TYPE_ANNAX_ETH2 1878
-#define MACH_TYPE_CSB733 1879
-#define MACH_TYPE_BK3 1880
-#define MACH_TYPE_OMAP_EM32 1881
-#define MACH_TYPE_ET9261CP 1882
-#define MACH_TYPE_JASPERC 1883
-#define MACH_TYPE_ISSI_ARM9 1884
-#define MACH_TYPE_UED 1885
-#define MACH_TYPE_ESIBLADE 1886
-#define MACH_TYPE_EYE02 1887
-#define MACH_TYPE_IMX27KBD 1888
-#define MACH_TYPE_SST61VC010_FPGA 1889
-#define MACH_TYPE_KIXVP435 1890
-#define MACH_TYPE_KIXNP435 1891
-#define MACH_TYPE_AFRICA 1892
-#define MACH_TYPE_NH233 1893
#define MACH_TYPE_RD88F6183AP_GE 1894
-#define MACH_TYPE_BCM4760 1895
-#define MACH_TYPE_EDDY_V2 1896
#define MACH_TYPE_REALVIEW_PBA8 1897
-#define MACH_TYPE_HID_A7 1898
-#define MACH_TYPE_HERO 1899
-#define MACH_TYPE_OMAP_POSEIDON 1900
#define MACH_TYPE_REALVIEW_PBX 1901
#define MACH_TYPE_MICRO9S 1902
-#define MACH_TYPE_MAKO 1903
-#define MACH_TYPE_XDAFLAME 1904
-#define MACH_TYPE_PHIDGET_SBC2 1905
-#define MACH_TYPE_LIMESTONE 1906
-#define MACH_TYPE_IPROBE_C32 1907
#define MACH_TYPE_RUT100 1908
-#define MACH_TYPE_ASUSP535 1909
-#define MACH_TYPE_HTCRAPHAEL 1910
-#define MACH_TYPE_SYGDG1 1911
-#define MACH_TYPE_SYGDG2 1912
-#define MACH_TYPE_SEOUL 1913
-#define MACH_TYPE_SALERNO 1914
-#define MACH_TYPE_UCN_S3C64XX 1915
-#define MACH_TYPE_MSM7201A 1916
-#define MACH_TYPE_LPR1 1917
-#define MACH_TYPE_ARMADILLO500FX 1918
#define MACH_TYPE_G3EVM 1919
-#define MACH_TYPE_Z3_DM355 1920
#define MACH_TYPE_W90P910EVB 1921
-#define MACH_TYPE_W90P920EVB 1922
#define MACH_TYPE_W90P950EVB 1923
#define MACH_TYPE_W90N960EVB 1924
-#define MACH_TYPE_CAMHD 1925
-#define MACH_TYPE_MVC100 1926
-#define MACH_TYPE_ELECTRUM_200 1927
-#define MACH_TYPE_HTCJADE 1928
-#define MACH_TYPE_MEMPHIS 1929
-#define MACH_TYPE_IMX27SBC 1930
-#define MACH_TYPE_LEXTAR 1931
#define MACH_TYPE_MV88F6281GTW_GE 1932
#define MACH_TYPE_NCP 1933
-#define MACH_TYPE_Z32AN 1934
-#define MACH_TYPE_TMQ_CAPD 1935
-#define MACH_TYPE_OMAP3_WL 1936
-#define MACH_TYPE_CHUMBY 1937
-#define MACH_TYPE_ATSARM9 1938
#define MACH_TYPE_DAVINCI_DM365_EVM 1939
-#define MACH_TYPE_BAHAMAS 1940
-#define MACH_TYPE_DAS 1941
-#define MACH_TYPE_MINIDAS 1942
-#define MACH_TYPE_VK1000 1943
#define MACH_TYPE_CENTRO 1944
-#define MACH_TYPE_CTERA_2BAY 1945
-#define MACH_TYPE_EDGECONNECT 1946
-#define MACH_TYPE_ND27000 1947
-#define MACH_TYPE_GEMALTO_COBRA 1948
-#define MACH_TYPE_INGELABS_COMET 1949
-#define MACH_TYPE_POLLUX_WIZ 1950
-#define MACH_TYPE_BLACKSTONE 1951
-#define MACH_TYPE_TOPAZ 1952
-#define MACH_TYPE_AIXLE 1953
-#define MACH_TYPE_MW998 1954
#define MACH_TYPE_NOKIA_RX51 1955
-#define MACH_TYPE_VSC5605EV 1956
-#define MACH_TYPE_NT98700DK 1957
-#define MACH_TYPE_ICONTACT 1958
-#define MACH_TYPE_SWARCO_FRCPU 1959
-#define MACH_TYPE_SWARCO_SCPU 1960
-#define MACH_TYPE_BBOX_P16 1961
-#define MACH_TYPE_BSTD 1962
-#define MACH_TYPE_SBC2440II 1963
-#define MACH_TYPE_PCM034 1964
-#define MACH_TYPE_NESO 1965
-#define MACH_TYPE_WLNX_9G20 1966
#define MACH_TYPE_OMAP_ZOOM2 1967
-#define MACH_TYPE_TOTEMNOVA 1968
-#define MACH_TYPE_C5000 1969
-#define MACH_TYPE_UNIPO_AT91SAM9263 1970
-#define MACH_TYPE_ETHERNUT5 1971
-#define MACH_TYPE_ARM11 1972
#define MACH_TYPE_CPUAT9260 1973
-#define MACH_TYPE_CPUPXA255 1974
-#define MACH_TYPE_CPUIMX27 1975
-#define MACH_TYPE_CHEFLUX 1976
-#define MACH_TYPE_EB_CPUX9K2 1977
-#define MACH_TYPE_OPCOTEC 1978
-#define MACH_TYPE_YT 1979
-#define MACH_TYPE_MOTOQ 1980
-#define MACH_TYPE_BSB1 1981
+#define MACH_TYPE_EUKREA_CPUIMX27 1975
#define MACH_TYPE_ACS5K 1982
-#define MACH_TYPE_MILAN 1983
-#define MACH_TYPE_QUARTZV2 1984
-#define MACH_TYPE_RSVP 1985
-#define MACH_TYPE_RMP200 1986
#define MACH_TYPE_SNAPPER_9260 1987
#define MACH_TYPE_DSM320 1988
-#define MACH_TYPE_ADSGCM 1989
-#define MACH_TYPE_ASE2_400 1990
-#define MACH_TYPE_PIZZA 1991
-#define MACH_TYPE_SPOT_NGPL 1992
-#define MACH_TYPE_ARMATA 1993
#define MACH_TYPE_EXEDA 1994
-#define MACH_TYPE_MX31SF005 1995
-#define MACH_TYPE_F5D8231_4_V2 1996
-#define MACH_TYPE_Q2440 1997
-#define MACH_TYPE_QQ2440 1998
#define MACH_TYPE_MINI2440 1999
#define MACH_TYPE_COLIBRI300 2000
-#define MACH_TYPE_JADES 2001
-#define MACH_TYPE_SPARK 2002
-#define MACH_TYPE_BENZINA 2003
-#define MACH_TYPE_BLAZE 2004
#define MACH_TYPE_LINKSTATION_LS_HGL 2005
-#define MACH_TYPE_HTCKOVSKY 2006
-#define MACH_TYPE_SONY_PRS505 2007
-#define MACH_TYPE_HANLIN_V3 2008
-#define MACH_TYPE_SAPPHIRA 2009
-#define MACH_TYPE_DACK_SDA_01 2010
-#define MACH_TYPE_ARMBOX 2011
-#define MACH_TYPE_HARRIS_RVP 2012
-#define MACH_TYPE_RIBALDO 2013
-#define MACH_TYPE_AGORA 2014
-#define MACH_TYPE_OMAP3_MINI 2015
-#define MACH_TYPE_A9SAM6432_B 2016
-#define MACH_TYPE_USG2410 2017
-#define MACH_TYPE_PC72052_I10_REVB 2018
-#define MACH_TYPE_MX35_EXM32 2019
-#define MACH_TYPE_TOPAS910 2020
-#define MACH_TYPE_HYENA 2021
-#define MACH_TYPE_POSPAX 2022
-#define MACH_TYPE_HDL_GX 2023
-#define MACH_TYPE_CTERA_4BAY 2024
-#define MACH_TYPE_CTERA_PLUG_C 2025
-#define MACH_TYPE_CRWEA_PLUG_I 2026
-#define MACH_TYPE_EGAUGE2 2027
-#define MACH_TYPE_DIDJ 2028
-#define MACH_TYPE_MEISTER 2029
-#define MACH_TYPE_HTCBLACKSTONE 2030
#define MACH_TYPE_CPUAT9G20 2031
#define MACH_TYPE_SMDK6440 2032
-#define MACH_TYPE_OMAP_35XX_MVP 2033
-#define MACH_TYPE_CTERA_PLUG_I 2034
-#define MACH_TYPE_PVG610 2035
-#define MACH_TYPE_HPRW6815 2036
-#define MACH_TYPE_OMAP3_OSWALD 2037
#define MACH_TYPE_NAS4220B 2038
-#define MACH_TYPE_HTCRAPHAEL_CDMA 2039
-#define MACH_TYPE_HTCDIAMOND_CDMA 2040
-#define MACH_TYPE_SCALER 2041
#define MACH_TYPE_ZYLONITE2 2042
#define MACH_TYPE_ASPENITE 2043
-#define MACH_TYPE_TETON 2044
#define MACH_TYPE_TTC_DKB 2045
-#define MACH_TYPE_BISHOP2 2046
-#define MACH_TYPE_IPPV5 2047
-#define MACH_TYPE_FARM926 2048
-#define MACH_TYPE_MMCCPU 2049
-#define MACH_TYPE_SGMSFL 2050
-#define MACH_TYPE_TT8000 2051
-#define MACH_TYPE_ZRN4300LP 2052
-#define MACH_TYPE_MPTC 2053
-#define MACH_TYPE_H6051 2054
-#define MACH_TYPE_PVG610_101 2055
-#define MACH_TYPE_STAMP9261_PC_EVB 2056
-#define MACH_TYPE_PELCO_ODYSSEUS 2057
-#define MACH_TYPE_TNY_A9260 2058
-#define MACH_TYPE_TNY_A9G20 2059
-#define MACH_TYPE_AESOP_MP2530F 2060
-#define MACH_TYPE_DX900 2061
-#define MACH_TYPE_CPODC2 2062
-#define MACH_TYPE_TILT_8925 2063
-#define MACH_TYPE_DAVINCI_DM357_EVM 2064
-#define MACH_TYPE_SWORDFISH 2065
-#define MACH_TYPE_CORVUS 2066
-#define MACH_TYPE_TAURUS 2067
-#define MACH_TYPE_AXM 2068
-#define MACH_TYPE_AXC 2069
-#define MACH_TYPE_BABY 2070
-#define MACH_TYPE_MP200 2071
#define MACH_TYPE_PCM043 2072
-#define MACH_TYPE_HANLIN_V3C 2073
-#define MACH_TYPE_KBK9G20 2074
-#define MACH_TYPE_ADSTURBOG5 2075
-#define MACH_TYPE_AVENGER_LITE1 2076
-#define MACH_TYPE_SUC 2077
-#define MACH_TYPE_AT91SAM7S256 2078
-#define MACH_TYPE_MENDOZA 2079
-#define MACH_TYPE_KIRA 2080
-#define MACH_TYPE_MX1HBM 2081
-#define MACH_TYPE_QUATRO43XX 2082
-#define MACH_TYPE_QUATRO4230 2083
-#define MACH_TYPE_NSB400 2084
-#define MACH_TYPE_DRP255 2085
-#define MACH_TYPE_THOTH 2086
-#define MACH_TYPE_FIRESTONE 2087
-#define MACH_TYPE_ASUSP750 2088
-#define MACH_TYPE_CTERA_DL 2089
-#define MACH_TYPE_SOCR 2090
-#define MACH_TYPE_HTCOXYGEN 2091
-#define MACH_TYPE_HEROC 2092
-#define MACH_TYPE_ZENO6800 2093
-#define MACH_TYPE_SC2MCS 2094
-#define MACH_TYPE_GENE100 2095
-#define MACH_TYPE_AS353X 2096
#define MACH_TYPE_SHEEVAPLUG 2097
-#define MACH_TYPE_AT91SAM9G20 2098
-#define MACH_TYPE_MV88F6192GTW_FE 2099
-#define MACH_TYPE_CC9200 2100
-#define MACH_TYPE_SM9200 2101
-#define MACH_TYPE_TP9200 2102
-#define MACH_TYPE_SNAPPERDV 2103
#define MACH_TYPE_AVENGERS_LITE 2104
-#define MACH_TYPE_AVENGERS_LITE1 2105
-#define MACH_TYPE_OMAP3AXON 2106
-#define MACH_TYPE_MA8XX 2107
-#define MACH_TYPE_MP201EK 2108
-#define MACH_TYPE_DAVINCI_TUX 2109
-#define MACH_TYPE_MPA1600 2110
-#define MACH_TYPE_PELCO_TROY 2111
-#define MACH_TYPE_NSB667 2112
-#define MACH_TYPE_ROVERS5_4MPIX 2113
-#define MACH_TYPE_TWOCOM 2114
-#define MACH_TYPE_UBISYS_P9_RCU3R2 2115
-#define MACH_TYPE_HERO_ESPRESSO 2116
-#define MACH_TYPE_AFEUSB 2117
-#define MACH_TYPE_T830 2118
-#define MACH_TYPE_SPD8020_CC 2119
-#define MACH_TYPE_OM_3D7K 2120
-#define MACH_TYPE_PICOCOM2 2121
-#define MACH_TYPE_UWG4MX27 2122
-#define MACH_TYPE_UWG4MX31 2123
-#define MACH_TYPE_CHERRY 2124
#define MACH_TYPE_MX51_BABBAGE 2125
-#define MACH_TYPE_S3C2440TURKIYE 2126
-#define MACH_TYPE_TX37 2127
-#define MACH_TYPE_SBC2800_9G20 2128
-#define MACH_TYPE_BENZGLB 2129
-#define MACH_TYPE_BENZTD 2130
-#define MACH_TYPE_CARTESIO_PLUS 2131
-#define MACH_TYPE_SOLRAD_G20 2132
-#define MACH_TYPE_MX27WALLACE 2133
-#define MACH_TYPE_FMZWEBMODUL 2134
#define MACH_TYPE_RD78X00_MASA 2135
-#define MACH_TYPE_SMALLOGGER 2136
-#define MACH_TYPE_CCW9P9215 2137
#define MACH_TYPE_DM355_LEOPARD 2138
#define MACH_TYPE_TS219 2139
-#define MACH_TYPE_TNY_A9263 2140
-#define MACH_TYPE_APOLLO 2141
-#define MACH_TYPE_AT91CAP9STK 2142
-#define MACH_TYPE_SPC300 2143
-#define MACH_TYPE_EKO 2144
-#define MACH_TYPE_CCW9M2443 2145
-#define MACH_TYPE_CCW9M2443JS 2146
-#define MACH_TYPE_M2M_ROUTER_DEVICE 2147
-#define MACH_TYPE_STAR9104NAS 2148
#define MACH_TYPE_PCA100 2149
-#define MACH_TYPE_Z3_DM365_MOD_01 2150
-#define MACH_TYPE_HIPOX 2151
-#define MACH_TYPE_OMAP3_PITEDS 2152
-#define MACH_TYPE_BM150R 2153
-#define MACH_TYPE_TBONE 2154
-#define MACH_TYPE_MERLIN 2155
-#define MACH_TYPE_FALCON 2156
#define MACH_TYPE_DAVINCI_DA850_EVM 2157
-#define MACH_TYPE_S5P6440 2158
#define MACH_TYPE_AT91SAM9G10EK 2159
#define MACH_TYPE_OMAP_4430SDP 2160
-#define MACH_TYPE_LPC313X 2161
#define MACH_TYPE_MAGX_ZN5 2162
-#define MACH_TYPE_MAGX_EM30 2163
-#define MACH_TYPE_MAGX_VE66 2164
-#define MACH_TYPE_MEESC 2165
-#define MACH_TYPE_OTC570 2166
-#define MACH_TYPE_BCU2412 2167
-#define MACH_TYPE_BEACON 2168
-#define MACH_TYPE_ACTIA_TGW 2169
-#define MACH_TYPE_E4430 2170
-#define MACH_TYPE_QL300 2171
#define MACH_TYPE_BTMAVB101 2172
#define MACH_TYPE_BTMAWB101 2173
-#define MACH_TYPE_SQ201 2174
-#define MACH_TYPE_QUATRO45XX 2175
-#define MACH_TYPE_OPENPAD 2176
-#define MACH_TYPE_TX25 2177
#define MACH_TYPE_OMAP3_TORPEDO 2178
-#define MACH_TYPE_HTCRAPHAEL_K 2179
-#define MACH_TYPE_LAL43 2181
-#define MACH_TYPE_HTCRAPHAEL_CDMA500 2182
#define MACH_TYPE_ANW6410 2183
-#define MACH_TYPE_HTCPROPHET 2185
-#define MACH_TYPE_CFA_10022 2186
#define MACH_TYPE_IMX27_VISSTRIM_M10 2187
-#define MACH_TYPE_PX2IMX27 2188
-#define MACH_TYPE_STM3210E_EVAL 2189
-#define MACH_TYPE_DVS10 2190
#define MACH_TYPE_PORTUXG20 2191
-#define MACH_TYPE_ARM_SPV 2192
#define MACH_TYPE_SMDKC110 2193
-#define MACH_TYPE_CABESPRESSO 2194
-#define MACH_TYPE_HMC800 2195
-#define MACH_TYPE_SHOLES 2196
-#define MACH_TYPE_BTMXC31 2197
-#define MACH_TYPE_DT501 2198
-#define MACH_TYPE_KTX 2199
#define MACH_TYPE_OMAP3517EVM 2200
#define MACH_TYPE_NETSPACE_V2 2201
#define MACH_TYPE_NETSPACE_MAX_V2 2202
#define MACH_TYPE_D2NET_V2 2203
#define MACH_TYPE_NET2BIG_V2 2204
-#define MACH_TYPE_NET4BIG_V2 2205
#define MACH_TYPE_NET5BIG_V2 2206
-#define MACH_TYPE_ENDB2443 2207
#define MACH_TYPE_INETSPACE_V2 2208
-#define MACH_TYPE_TROS 2209
-#define MACH_TYPE_PELCO_HOMER 2210
-#define MACH_TYPE_OFSP8 2211
#define MACH_TYPE_AT91SAM9G45EKES 2212
-#define MACH_TYPE_GUF_CUPID 2213
-#define MACH_TYPE_EAB1R 2214
-#define MACH_TYPE_DESIREC 2215
-#define MACH_TYPE_CORDOBA 2216
-#define MACH_TYPE_IRVINE 2217
-#define MACH_TYPE_SFF772 2218
-#define MACH_TYPE_PELCO_MILANO 2219
#define MACH_TYPE_PC7302 2220
-#define MACH_TYPE_BIP6000 2221
-#define MACH_TYPE_SILVERMOON 2222
-#define MACH_TYPE_VC0830 2223
-#define MACH_TYPE_DT430 2224
-#define MACH_TYPE_JI42PF 2225
-#define MACH_TYPE_GNET_KSM 2226
-#define MACH_TYPE_GNET_SGM 2227
-#define MACH_TYPE_GNET_SGR 2228
-#define MACH_TYPE_OMAP3_ICETEKEVM 2229
-#define MACH_TYPE_PNP 2230
-#define MACH_TYPE_CTERA_2BAY_K 2231
-#define MACH_TYPE_CTERA_2BAY_U 2232
-#define MACH_TYPE_SAS_C 2233
-#define MACH_TYPE_VMA2315 2234
-#define MACH_TYPE_VCS 2235
#define MACH_TYPE_SPEAR600 2236
#define MACH_TYPE_SPEAR300 2237
-#define MACH_TYPE_SPEAR1300 2238
#define MACH_TYPE_LILLY1131 2239
-#define MACH_TYPE_ARVOO_AX301 2240
-#define MACH_TYPE_MAPPHONE 2241
-#define MACH_TYPE_LEGEND 2242
-#define MACH_TYPE_SALSA 2243
-#define MACH_TYPE_LOUNGE 2244
-#define MACH_TYPE_VISION 2245
-#define MACH_TYPE_VMB20 2246
-#define MACH_TYPE_HY2410 2247
-#define MACH_TYPE_HY9315 2248
-#define MACH_TYPE_BULLWINKLE 2249
-#define MACH_TYPE_ARM_ULTIMATOR2 2250
-#define MACH_TYPE_VS_V210 2252
-#define MACH_TYPE_VS_V212 2253
#define MACH_TYPE_HMT 2254
-#define MACH_TYPE_KM_KIRKWOOD 2255
-#define MACH_TYPE_VESPER 2256
-#define MACH_TYPE_STR9 2257
-#define MACH_TYPE_OMAP3_WL_FF 2258
-#define MACH_TYPE_SIMCOM 2259
-#define MACH_TYPE_MCWEBIO 2260
-#define MACH_TYPE_OMAP3_PHRAZER 2261
-#define MACH_TYPE_DARWIN 2262
-#define MACH_TYPE_ORATISCOMU 2263
-#define MACH_TYPE_RTSBC20 2264
-#define MACH_TYPE_I780 2265
-#define MACH_TYPE_GEMINI324 2266
-#define MACH_TYPE_ORATISLAN 2267
-#define MACH_TYPE_ORATISALOG 2268
-#define MACH_TYPE_ORATISMADI 2269
-#define MACH_TYPE_ORATISOT16 2270
-#define MACH_TYPE_ORATISDESK 2271
#define MACH_TYPE_VEXPRESS 2272
-#define MACH_TYPE_SINTEXO 2273
-#define MACH_TYPE_CM3389 2274
-#define MACH_TYPE_OMAP3_CIO 2275
-#define MACH_TYPE_SGH_I900 2276
-#define MACH_TYPE_BST100 2277
-#define MACH_TYPE_PASSION 2278
-#define MACH_TYPE_INDESIGN_AT91SAM 2279
-#define MACH_TYPE_C4_BADGER 2280
-#define MACH_TYPE_C4_VIPER 2281
#define MACH_TYPE_D2NET 2282
#define MACH_TYPE_BIGDISK 2283
-#define MACH_TYPE_NOTALVISION 2284
-#define MACH_TYPE_OMAP3_KBOC 2285
-#define MACH_TYPE_CYCLONE 2286
-#define MACH_TYPE_NINJA 2287
#define MACH_TYPE_AT91SAM9G20EK_2MMC 2288
#define MACH_TYPE_BCMRING 2289
-#define MACH_TYPE_RESOL_DL2 2290
-#define MACH_TYPE_IFOSW 2291
-#define MACH_TYPE_HTCRHODIUM 2292
-#define MACH_TYPE_HTCTOPAZ 2293
-#define MACH_TYPE_MATRIX504 2294
-#define MACH_TYPE_MRFSA 2295
-#define MACH_TYPE_SC_P270 2296
-#define MACH_TYPE_ATLAS5_EVB 2297
-#define MACH_TYPE_PELCO_LOBOX 2298
-#define MACH_TYPE_DILAX_PCU200 2299
-#define MACH_TYPE_LEONARDO 2300
-#define MACH_TYPE_ZORAN_APPROACH7 2301
#define MACH_TYPE_DP6XX 2302
-#define MACH_TYPE_BCM2153_VESPER 2303
#define MACH_TYPE_MAHIMAHI 2304
-#define MACH_TYPE_CLICKC 2305
-#define MACH_TYPE_ZB_GATEWAY 2306
-#define MACH_TYPE_TAZCARD 2307
-#define MACH_TYPE_TAZDEV 2308
-#define MACH_TYPE_ANNAX_CB_ARM 2309
-#define MACH_TYPE_ANNAX_DM3 2310
-#define MACH_TYPE_CEREBRIC 2311
-#define MACH_TYPE_ORCA 2312
-#define MACH_TYPE_PC9260 2313
-#define MACH_TYPE_EMS285A 2314
-#define MACH_TYPE_GEC2410 2315
-#define MACH_TYPE_GEC2440 2316
-#define MACH_TYPE_ARCH_MW903 2317
-#define MACH_TYPE_MW2440 2318
-#define MACH_TYPE_ECAC2378 2319
-#define MACH_TYPE_TAZKIOSK 2320
-#define MACH_TYPE_WHITERABBIT_MCH 2321
-#define MACH_TYPE_SBOX9263 2322
-#define MACH_TYPE_OREO 2323
#define MACH_TYPE_SMDK6442 2324
#define MACH_TYPE_OPENRD_BASE 2325
-#define MACH_TYPE_INCREDIBLE 2326
-#define MACH_TYPE_INCREDIBLEC 2327
-#define MACH_TYPE_HEROCT 2328
-#define MACH_TYPE_MMNET1000 2329
#define MACH_TYPE_DEVKIT8000 2330
-#define MACH_TYPE_DEVKIT9000 2331
-#define MACH_TYPE_MX31TXTR 2332
-#define MACH_TYPE_U380 2333
-#define MACH_TYPE_HUALU_BOARD 2334
-#define MACH_TYPE_NPCMX50 2335
#define MACH_TYPE_MX51_EFIKAMX 2336
-#define MACH_TYPE_MX51_LANGE52 2337
-#define MACH_TYPE_RIOM 2338
-#define MACH_TYPE_COMCAS 2339
-#define MACH_TYPE_WSI_MX27 2340
#define MACH_TYPE_CM_T35 2341
#define MACH_TYPE_NET2BIG 2342
-#define MACH_TYPE_MOTOROLA_A1600 2343
#define MACH_TYPE_IGEP0020 2344
-#define MACH_TYPE_IGEP0010 2345
-#define MACH_TYPE_MV6281GTWGE2 2346
-#define MACH_TYPE_SCAT100 2347
-#define MACH_TYPE_SANMINA 2348
-#define MACH_TYPE_MOMENTO 2349
-#define MACH_TYPE_NUC9XX 2350
-#define MACH_TYPE_NUC910EVB 2351
-#define MACH_TYPE_NUC920EVB 2352
-#define MACH_TYPE_NUC950EVB 2353
-#define MACH_TYPE_NUC945EVB 2354
-#define MACH_TYPE_NUC960EVB 2355
#define MACH_TYPE_NUC932EVB 2356
-#define MACH_TYPE_NUC900 2357
-#define MACH_TYPE_SD1SOC 2358
-#define MACH_TYPE_LN2440BC 2359
-#define MACH_TYPE_RSBC 2360
#define MACH_TYPE_OPENRD_CLIENT 2361
-#define MACH_TYPE_HPIPAQ11X 2362
-#define MACH_TYPE_WAYLAND 2363
-#define MACH_TYPE_ACNBSX102 2364
-#define MACH_TYPE_HWAT91 2365
-#define MACH_TYPE_AT91SAM9263CS 2366
-#define MACH_TYPE_CSB732 2367
#define MACH_TYPE_U8500 2368
-#define MACH_TYPE_HUQIU 2369
#define MACH_TYPE_MX51_EFIKASB 2370
-#define MACH_TYPE_PMT1G 2371
-#define MACH_TYPE_HTCELF 2372
-#define MACH_TYPE_ARMADILLO420 2373
-#define MACH_TYPE_ARMADILLO440 2374
-#define MACH_TYPE_U_CHIP_DUAL_ARM 2375
-#define MACH_TYPE_CSR_BDB3 2376
-#define MACH_TYPE_DOLBY_CAT1018 2377
-#define MACH_TYPE_HY9307 2378
-#define MACH_TYPE_A_ES 2379
-#define MACH_TYPE_DAVINCI_IRIF 2380
-#define MACH_TYPE_AGAMA9263 2381
#define MACH_TYPE_MARVELL_JASPER 2382
#define MACH_TYPE_FLINT 2383
#define MACH_TYPE_TAVOREVB3 2384
-#define MACH_TYPE_SCH_M490 2386
-#define MACH_TYPE_RBL01 2387
-#define MACH_TYPE_OMNIFI 2388
-#define MACH_TYPE_OTAVALO 2389
-#define MACH_TYPE_SIENNA 2390
-#define MACH_TYPE_HTC_EXCALIBUR_S620 2391
-#define MACH_TYPE_HTC_OPAL 2392
#define MACH_TYPE_TOUCHBOOK 2393
-#define MACH_TYPE_LATTE 2394
-#define MACH_TYPE_XA200 2395
-#define MACH_TYPE_NIMROD 2396
-#define MACH_TYPE_CC9P9215_3G 2397
-#define MACH_TYPE_CC9P9215_3GJS 2398
-#define MACH_TYPE_TK71 2399
-#define MACH_TYPE_COMHAM3525 2400
-#define MACH_TYPE_MX31EREBUS 2401
-#define MACH_TYPE_MCARDMX27 2402
-#define MACH_TYPE_PARADISE 2403
-#define MACH_TYPE_TIDE 2404
-#define MACH_TYPE_WZL2440 2405
-#define MACH_TYPE_SDRDEMO 2406
-#define MACH_TYPE_ETHERCAN2 2407
-#define MACH_TYPE_ECMIMG20 2408
-#define MACH_TYPE_OMAP_DRAGON 2409
-#define MACH_TYPE_HALO 2410
-#define MACH_TYPE_HUANGSHAN 2411
-#define MACH_TYPE_VL_MA2SC 2412
#define MACH_TYPE_RAUMFELD_RC 2413
#define MACH_TYPE_RAUMFELD_CONNECTOR 2414
#define MACH_TYPE_RAUMFELD_SPEAKER 2415
-#define MACH_TYPE_MULTIBUS_MASTER 2416
-#define MACH_TYPE_MULTIBUS_PBK 2417
#define MACH_TYPE_TNETV107X 2418
-#define MACH_TYPE_SNAKE 2419
-#define MACH_TYPE_CWMX27 2420
-#define MACH_TYPE_SCH_M480 2421
-#define MACH_TYPE_PLATYPUS 2422
-#define MACH_TYPE_PSS2 2423
-#define MACH_TYPE_DAVINCI_APM150 2424
-#define MACH_TYPE_STR9100 2425
-#define MACH_TYPE_NET5BIG 2426
-#define MACH_TYPE_SEABED9263 2427
-#define MACH_TYPE_MX51_M2ID 2428
-#define MACH_TYPE_OCTVOCPLUS_EB 2429
-#define MACH_TYPE_KLK_FIREFOX 2430
-#define MACH_TYPE_KLK_WIRMA_MODULE 2431
-#define MACH_TYPE_KLK_WIRMA_MMI 2432
-#define MACH_TYPE_SUPERSONIC 2433
-#define MACH_TYPE_LIBERTY 2434
-#define MACH_TYPE_MH355 2435
-#define MACH_TYPE_PC7802 2436
-#define MACH_TYPE_GNET_SGC 2437
-#define MACH_TYPE_EINSTEIN15 2438
-#define MACH_TYPE_CMPD 2439
-#define MACH_TYPE_DAVINCI_HASE1 2440
-#define MACH_TYPE_LGEINCITEPHONE 2441
-#define MACH_TYPE_EA313X 2442
-#define MACH_TYPE_FWBD_39064 2443
-#define MACH_TYPE_FWBD_390128 2444
-#define MACH_TYPE_PELCO_MOE 2445
-#define MACH_TYPE_MINIMIX27 2446
-#define MACH_TYPE_OMAP3_THUNDER 2447
-#define MACH_TYPE_PASSIONC 2448
-#define MACH_TYPE_MX27AMATA 2449
-#define MACH_TYPE_BGAT1 2450
-#define MACH_TYPE_BUZZ 2451
-#define MACH_TYPE_MB9G20 2452
-#define MACH_TYPE_YUSHAN 2453
-#define MACH_TYPE_LIZARD 2454
-#define MACH_TYPE_OMAP3POLYCOM 2455
#define MACH_TYPE_SMDKV210 2456
-#define MACH_TYPE_BRAVO 2457
-#define MACH_TYPE_SIOGENTOO1 2458
-#define MACH_TYPE_SIOGENTOO2 2459
-#define MACH_TYPE_SM3K 2460
-#define MACH_TYPE_ACER_TEMPO_F900 2461
-#define MACH_TYPE_SST61VC010_DEV 2462
-#define MACH_TYPE_GLITTERTIND 2463
#define MACH_TYPE_OMAP_ZOOM3 2464
#define MACH_TYPE_OMAP_3630SDP 2465
-#define MACH_TYPE_CYBOOK2440 2466
-#define MACH_TYPE_TORINO_S 2467
-#define MACH_TYPE_HAVANA 2468
-#define MACH_TYPE_BEAUMONT_11 2469
-#define MACH_TYPE_VANGUARD 2470
-#define MACH_TYPE_S5PC110_DRACO 2471
-#define MACH_TYPE_CARTESIO_TWO 2472
-#define MACH_TYPE_ASTER 2473
-#define MACH_TYPE_VOGUESV210 2474
-#define MACH_TYPE_ACM500X 2475
-#define MACH_TYPE_KM9260 2476
-#define MACH_TYPE_NIDEFLEXG1 2477
-#define MACH_TYPE_CTERA_PLUG_IO 2478
#define MACH_TYPE_SMARTQ7 2479
-#define MACH_TYPE_AT91SAM9G10EK2 2480
-#define MACH_TYPE_ASUSP527 2481
-#define MACH_TYPE_AT91SAM9G20MPM2 2482
-#define MACH_TYPE_TOPASA900 2483
-#define MACH_TYPE_ELECTRUM_100 2484
-#define MACH_TYPE_MX51GRB 2485
-#define MACH_TYPE_XEA300 2486
-#define MACH_TYPE_HTCSTARTREK 2487
-#define MACH_TYPE_LIMA 2488
-#define MACH_TYPE_CSB740 2489
-#define MACH_TYPE_USB_S8815 2490
#define MACH_TYPE_WATSON_EFM_PLUGIN 2491
-#define MACH_TYPE_MILKYWAY 2492
#define MACH_TYPE_G4EVM 2493
-#define MACH_TYPE_PICOMOD6 2494
#define MACH_TYPE_OMAPL138_HAWKBOARD 2495
-#define MACH_TYPE_IP6000 2496
-#define MACH_TYPE_IP6010 2497
-#define MACH_TYPE_UTM400 2498
-#define MACH_TYPE_OMAP3_ZYBEX 2499
-#define MACH_TYPE_WIRELESS_SPACE 2500
-#define MACH_TYPE_SX560 2501
#define MACH_TYPE_TS41X 2502
-#define MACH_TYPE_ELPHEL10373 2503
-#define MACH_TYPE_RHOBOT 2504
-#define MACH_TYPE_MX51_REFRESH 2505
-#define MACH_TYPE_LS9260 2506
-#define MACH_TYPE_SHANK 2507
-#define MACH_TYPE_QSD8X50_ST1 2508
-#define MACH_TYPE_AT91SAM9M10EKES 2509
-#define MACH_TYPE_HIRAM 2510
#define MACH_TYPE_PHY3250 2511
-#define MACH_TYPE_EA3250 2512
-#define MACH_TYPE_FDI3250 2513
-#define MACH_TYPE_WHITESTONE 2514
-#define MACH_TYPE_AT91SAM9263NIT 2515
-#define MACH_TYPE_CCMX51 2516
-#define MACH_TYPE_CCMX51JS 2517
-#define MACH_TYPE_CCWMX51 2518
-#define MACH_TYPE_CCWMX51JS 2519
#define MACH_TYPE_MINI6410 2520
-#define MACH_TYPE_TINY6410 2521
-#define MACH_TYPE_NANO6410 2522
-#define MACH_TYPE_AT572D940HFNLDB 2523
-#define MACH_TYPE_HTCLEO 2524
-#define MACH_TYPE_AVP13 2525
-#define MACH_TYPE_XXSVIDEOD 2526
-#define MACH_TYPE_VPNEXT 2527
-#define MACH_TYPE_SWARCO_ITC3 2528
-#define MACH_TYPE_TX51 2529
-#define MACH_TYPE_DOLBY_CAT1021 2530
#define MACH_TYPE_MX28EVK 2531
-#define MACH_TYPE_PHOENIX260 2532
-#define MACH_TYPE_UVACA_STORK 2533
#define MACH_TYPE_SMARTQ5 2534
-#define MACH_TYPE_ALL3078 2535
-#define MACH_TYPE_CTERA_2BAY_DS 2536
-#define MACH_TYPE_SIOGENTOO3 2537
-#define MACH_TYPE_EPB5000 2538
-#define MACH_TYPE_HY9263 2539
-#define MACH_TYPE_ACER_TEMPO_M900 2540
-#define MACH_TYPE_ACER_TEMPO_DX900 2541
-#define MACH_TYPE_ACER_TEMPO_X960 2542
-#define MACH_TYPE_ACER_ETEN_V900 2543
-#define MACH_TYPE_ACER_ETEN_X900 2544
-#define MACH_TYPE_BONNELL 2545
-#define MACH_TYPE_OHT_MX27 2546
-#define MACH_TYPE_HTCQUARTZ 2547
#define MACH_TYPE_DAVINCI_DM6467TEVM 2548
-#define MACH_TYPE_C3AX03 2549
#define MACH_TYPE_MXT_TD60 2550
-#define MACH_TYPE_ESYX 2551
-#define MACH_TYPE_DOVE_DB2 2552
-#define MACH_TYPE_BULLDOG 2553
-#define MACH_TYPE_DERELL_ME2000 2554
-#define MACH_TYPE_BCMRING_BASE 2555
-#define MACH_TYPE_BCMRING_EVM 2556
-#define MACH_TYPE_BCMRING_EVM_JAZZ 2557
-#define MACH_TYPE_BCMRING_SP 2558
-#define MACH_TYPE_BCMRING_SV 2559
-#define MACH_TYPE_BCMRING_SV_JAZZ 2560
-#define MACH_TYPE_BCMRING_TABLET 2561
-#define MACH_TYPE_BCMRING_VP 2562
-#define MACH_TYPE_BCMRING_EVM_SEIKOR 2563
-#define MACH_TYPE_BCMRING_SP_WQVGA 2564
-#define MACH_TYPE_BCMRING_CUSTOM 2565
-#define MACH_TYPE_ACER_S200 2566
-#define MACH_TYPE_BT270 2567
-#define MACH_TYPE_ISEO 2568
-#define MACH_TYPE_CEZANNE 2569
-#define MACH_TYPE_LUCCA 2570
-#define MACH_TYPE_SUPERSMART 2571
-#define MACH_TYPE_CS_MISANO 2572
-#define MACH_TYPE_MAGNOLIA2 2573
-#define MACH_TYPE_EMXX 2574
-#define MACH_TYPE_OUTLAW 2575
#define MACH_TYPE_RIOT_BEI2 2576
-#define MACH_TYPE_RIOT_VOX 2577
#define MACH_TYPE_RIOT_X37 2578
-#define MACH_TYPE_MEGA25MX 2579
-#define MACH_TYPE_BENZINA2 2580
-#define MACH_TYPE_IGNITE 2581
-#define MACH_TYPE_FOGGIA 2582
-#define MACH_TYPE_AREZZO 2583
-#define MACH_TYPE_LEICA_SKYWALKER 2584
-#define MACH_TYPE_JACINTO2_JAMR 2585
-#define MACH_TYPE_GTS_NOVA 2586
-#define MACH_TYPE_P3600 2587
-#define MACH_TYPE_DLT2 2588
-#define MACH_TYPE_DF3120 2589
-#define MACH_TYPE_ECUCORE_9G20 2590
-#define MACH_TYPE_NAUTEL_LPC3240 2591
-#define MACH_TYPE_GLACIER 2592
-#define MACH_TYPE_PHRAZER_BULLDOG 2593
-#define MACH_TYPE_OMAP3_BULLDOG 2594
-#define MACH_TYPE_PCA101 2595
-#define MACH_TYPE_BUZZC 2596
-#define MACH_TYPE_SASIE2 2597
-#define MACH_TYPE_DAVINCI_CIO 2598
-#define MACH_TYPE_SMARTMETER_DL 2599
-#define MACH_TYPE_WZL6410 2600
-#define MACH_TYPE_WZL6410M 2601
-#define MACH_TYPE_WZL6410F 2602
-#define MACH_TYPE_WZL6410I 2603
-#define MACH_TYPE_SPACECOM1 2604
-#define MACH_TYPE_PINGU920 2605
-#define MACH_TYPE_BRAVOC 2606
-#define MACH_TYPE_CYBO2440 2607
-#define MACH_TYPE_VDSSW 2608
-#define MACH_TYPE_ROMULUS 2609
-#define MACH_TYPE_OMAP_MAGIC 2610
-#define MACH_TYPE_ELTD100 2611
#define MACH_TYPE_CAPC7117 2612
-#define MACH_TYPE_SWAN 2613
-#define MACH_TYPE_VEU 2614
-#define MACH_TYPE_RM2 2615
-#define MACH_TYPE_TT2100 2616
-#define MACH_TYPE_VENICE 2617
-#define MACH_TYPE_PC7323 2618
-#define MACH_TYPE_MASP 2619
-#define MACH_TYPE_FUJITSU_TVSTBSOC 2620
-#define MACH_TYPE_FUJITSU_TVSTBSOC1 2621
-#define MACH_TYPE_LEXIKON 2622
-#define MACH_TYPE_MINI2440V2 2623
#define MACH_TYPE_ICONTROL 2624
-#define MACH_TYPE_SHEEVAD 2625
-#define MACH_TYPE_QSD8X50A_ST1_1 2626
#define MACH_TYPE_QSD8X50A_ST1_5 2627
-#define MACH_TYPE_BEE 2628
#define MACH_TYPE_MX23EVK 2629
#define MACH_TYPE_AP4EVB 2630
-#define MACH_TYPE_STOCKHOLM 2631
-#define MACH_TYPE_LPC_H3131 2632
-#define MACH_TYPE_STINGRAY 2633
-#define MACH_TYPE_KRAKEN 2634
-#define MACH_TYPE_GW2388 2635
-#define MACH_TYPE_JADECPU 2636
-#define MACH_TYPE_CARLISLE 2637
-#define MACH_TYPE_LUX_SF9 2638
-#define MACH_TYPE_NEMID_TB 2639
-#define MACH_TYPE_TERRIER 2640
-#define MACH_TYPE_TURBOT 2641
-#define MACH_TYPE_SANDDAB 2642
-#define MACH_TYPE_MX35_CICADA 2643
-#define MACH_TYPE_GHI2703D 2644
-#define MACH_TYPE_LUX_SFX9 2645
-#define MACH_TYPE_LUX_SF9G 2646
-#define MACH_TYPE_LUX_EDK9 2647
-#define MACH_TYPE_HW90240 2648
-#define MACH_TYPE_DM365_LEOPARD 2649
#define MACH_TYPE_MITYOMAPL138 2650
-#define MACH_TYPE_SCAT110 2651
-#define MACH_TYPE_ACER_A1 2652
-#define MACH_TYPE_CMCONTROL 2653
-#define MACH_TYPE_PELCO_LAMAR 2654
-#define MACH_TYPE_RFP43 2655
-#define MACH_TYPE_SK86R0301 2656
-#define MACH_TYPE_CTPXA 2657
-#define MACH_TYPE_EPB_ARM9_A 2658
#define MACH_TYPE_GURUPLUG 2659
#define MACH_TYPE_SPEAR310 2660
#define MACH_TYPE_SPEAR320 2661
-#define MACH_TYPE_ROBOTX 2662
-#define MACH_TYPE_LSXHL 2663
-#define MACH_TYPE_SMARTLITE 2664
-#define MACH_TYPE_CWS2 2665
-#define MACH_TYPE_M619 2666
-#define MACH_TYPE_SMARTVIEW 2667
-#define MACH_TYPE_LSA_SALSA 2668
-#define MACH_TYPE_KIZBOX 2669
-#define MACH_TYPE_HTCCHARMER 2670
-#define MACH_TYPE_GUF_NESO_LT 2671
-#define MACH_TYPE_PM9G45 2672
-#define MACH_TYPE_HTCPANTHER 2673
-#define MACH_TYPE_HTCPANTHER_CDMA 2674
-#define MACH_TYPE_REB01 2675
#define MACH_TYPE_AQUILA 2676
-#define MACH_TYPE_SPARK_SLS_HW2 2677
#define MACH_TYPE_ESATA_SHEEVAPLUG 2678
#define MACH_TYPE_MSM7X30_SURF 2679
-#define MACH_TYPE_MICRO2440 2680
-#define MACH_TYPE_AM2440 2681
-#define MACH_TYPE_TQ2440 2682
-#define MACH_TYPE_LPC2478OEM 2683
-#define MACH_TYPE_AK880X 2684
-#define MACH_TYPE_COBRA3530 2685
-#define MACH_TYPE_PMPPB 2686
-#define MACH_TYPE_U6715 2687
-#define MACH_TYPE_AXAR1500_SENDER 2688
-#define MACH_TYPE_G30_DVB 2689
-#define MACH_TYPE_VC088X 2690
-#define MACH_TYPE_MIOA702 2691
-#define MACH_TYPE_HPMIN 2692
-#define MACH_TYPE_AK880XAK 2693
-#define MACH_TYPE_ARM926TOMAP850 2694
-#define MACH_TYPE_LKEVM 2695
-#define MACH_TYPE_MW6410 2696
+#define MACH_TYPE_EA2478DEVKIT 2683
#define MACH_TYPE_TERASTATION_WXL 2697
-#define MACH_TYPE_CPU8000E 2698
-#define MACH_TYPE_CATANIA 2699
-#define MACH_TYPE_TOKYO 2700
-#define MACH_TYPE_MSM7201A_SURF 2701
-#define MACH_TYPE_MSM7201A_FFA 2702
#define MACH_TYPE_MSM7X25_SURF 2703
#define MACH_TYPE_MSM7X25_FFA 2704
#define MACH_TYPE_MSM7X27_SURF 2705
#define MACH_TYPE_MSM7X27_FFA 2706
#define MACH_TYPE_MSM7X30_FFA 2707
#define MACH_TYPE_QSD8X50_SURF 2708
-#define MACH_TYPE_QSD8X50_COMET 2709
-#define MACH_TYPE_QSD8X50_FFA 2710
-#define MACH_TYPE_QSD8X50A_SURF 2711
-#define MACH_TYPE_QSD8X50A_FFA 2712
-#define MACH_TYPE_ADX_XGCP10 2713
-#define MACH_TYPE_MCGWUMTS2A 2714
-#define MACH_TYPE_MOBIKT 2715
#define MACH_TYPE_MX53_EVK 2716
#define MACH_TYPE_IGEP0030 2717
-#define MACH_TYPE_AXELL_H40_H50_CTRL 2718
-#define MACH_TYPE_DTCOMMOD 2719
-#define MACH_TYPE_GOULD 2720
-#define MACH_TYPE_SIBERIA 2721
#define MACH_TYPE_SBC3530 2722
-#define MACH_TYPE_QARM 2723
-#define MACH_TYPE_MIPS 2724
-#define MACH_TYPE_MX27GRB 2725
-#define MACH_TYPE_SBC8100 2726
#define MACH_TYPE_SAARB 2727
-#define MACH_TYPE_OMAP3MINI 2728
-#define MACH_TYPE_CNMBOOK7SE 2729
-#define MACH_TYPE_CATAN 2730
#define MACH_TYPE_HARMONY 2731
-#define MACH_TYPE_TONGA 2732
-#define MACH_TYPE_CYBOOK_ORIZON 2733
-#define MACH_TYPE_HTCRHODIUMCDMA 2734
-#define MACH_TYPE_EPC_G45 2735
-#define MACH_TYPE_EPC_LPC3250 2736
-#define MACH_TYPE_MXC91341EVB 2737
-#define MACH_TYPE_RTW1000 2738
-#define MACH_TYPE_BOBCAT 2739
-#define MACH_TYPE_TRIZEPS6 2740
#define MACH_TYPE_MSM7X30_FLUID 2741
-#define MACH_TYPE_NEDAP9263 2742
-#define MACH_TYPE_NETGEAR_MS2110 2743
-#define MACH_TYPE_BMX 2744
-#define MACH_TYPE_NETSTREAM 2745
-#define MACH_TYPE_VPNEXT_RCU 2746
-#define MACH_TYPE_VPNEXT_MPU 2747
-#define MACH_TYPE_BCMRING_TABLET_V1 2748
-#define MACH_TYPE_SGARM10 2749
#define MACH_TYPE_CM_T3517 2750
-#define MACH_TYPE_OMAP3_CPS 2751
-#define MACH_TYPE_AXAR1500_RECEIVER 2752
#define MACH_TYPE_WBD222 2753
-#define MACH_TYPE_MT65XX 2754
#define MACH_TYPE_MSM8X60_SURF 2755
#define MACH_TYPE_MSM8X60_SIM 2756
-#define MACH_TYPE_VMC300 2757
#define MACH_TYPE_TCC8000_SDK 2758
#define MACH_TYPE_NANOS 2759
-#define MACH_TYPE_STAMP9G10 2760
#define MACH_TYPE_STAMP9G45 2761
-#define MACH_TYPE_H6053 2762
-#define MACH_TYPE_SMINT01 2763
-#define MACH_TYPE_PRTLVT2 2764
-#define MACH_TYPE_AP420 2765
-#define MACH_TYPE_HTCSHIFT 2766
-#define MACH_TYPE_DAVINCI_DM365_FC 2767
-#define MACH_TYPE_MSM8X55_SURF 2768
-#define MACH_TYPE_MSM8X55_FFA 2769
-#define MACH_TYPE_ESL_VAMANA 2770
-#define MACH_TYPE_SBC35 2771
-#define MACH_TYPE_MPX6446 2772
-#define MACH_TYPE_OREO_CONTROLLER 2773
-#define MACH_TYPE_KOPIN_MODELS 2774
-#define MACH_TYPE_TTC_VISION2 2775
#define MACH_TYPE_CNS3420VB 2776
-#define MACH_TYPE_LPC2 2777
-#define MACH_TYPE_OLYMPUS 2778
-#define MACH_TYPE_VORTEX 2779
-#define MACH_TYPE_S5PC200 2780
-#define MACH_TYPE_ECUCORE_9263 2781
-#define MACH_TYPE_SMDKC200 2782
-#define MACH_TYPE_EMSISO_SX27 2783
-#define MACH_TYPE_APX_SOM9G45_EK 2784
-#define MACH_TYPE_SONGSHAN 2785
-#define MACH_TYPE_TIANSHAN 2786
-#define MACH_TYPE_VPX500 2787
-#define MACH_TYPE_AM3517SAM 2788
-#define MACH_TYPE_SKAT91_SIM508 2789
-#define MACH_TYPE_SKAT91_S3E 2790
#define MACH_TYPE_OMAP4_PANDA 2791
-#define MACH_TYPE_DF7220 2792
-#define MACH_TYPE_NEMINI 2793
-#define MACH_TYPE_T8200 2794
-#define MACH_TYPE_APF51 2795
-#define MACH_TYPE_DR_RC_UNIT 2796
-#define MACH_TYPE_BORDEAUX 2797
-#define MACH_TYPE_CATANIA_B 2798
-#define MACH_TYPE_MX51_OCEAN 2799
#define MACH_TYPE_TI8168EVM 2800
-#define MACH_TYPE_NEOCOREOMAP 2801
-#define MACH_TYPE_WITHINGS_WBP 2802
-#define MACH_TYPE_DBPS 2803
-#define MACH_TYPE_SBC9261 2804
-#define MACH_TYPE_PCBFP0001 2805
-#define MACH_TYPE_SPEEDY 2806
-#define MACH_TYPE_CHRYSAOR 2807
-#define MACH_TYPE_TANGO 2808
-#define MACH_TYPE_SYNOLOGY_DSX11 2809
-#define MACH_TYPE_HANLIN_V3EXT 2810
-#define MACH_TYPE_HANLIN_V5 2811
-#define MACH_TYPE_HANLIN_V3PLUS 2812
-#define MACH_TYPE_IRIVER_STORY 2813
-#define MACH_TYPE_IREX_ILIAD 2814
-#define MACH_TYPE_IREX_DR1000 2815
#define MACH_TYPE_TETON_BGA 2816
-#define MACH_TYPE_SNAPPER9G45 2817
-#define MACH_TYPE_TAM3517 2818
-#define MACH_TYPE_PDC100 2819
-#define MACH_TYPE_EUKREA_CPUIMX25 2820
-#define MACH_TYPE_EUKREA_CPUIMX35 2821
+#define MACH_TYPE_EUKREA_CPUIMX25SD 2820
+#define MACH_TYPE_EUKREA_CPUIMX35SD 2821
#define MACH_TYPE_EUKREA_CPUIMX51SD 2822
#define MACH_TYPE_EUKREA_CPUIMX51 2823
-#define MACH_TYPE_P565 2824
-#define MACH_TYPE_ACER_A4 2825
-#define MACH_TYPE_DAVINCI_DM368_BIP 2826
-#define MACH_TYPE_ESHARE 2827
-#define MACH_TYPE_HW_OMAPL138_EUROPA 2828
-#define MACH_TYPE_WLBARGN 2829
-#define MACH_TYPE_BM170 2830
-#define MACH_TYPE_NETSPACE_MINI_V2 2831
-#define MACH_TYPE_NETSPACE_PLUG_V2 2832
-#define MACH_TYPE_SIEMENS_L1 2833
-#define MACH_TYPE_ELV_LCU1 2834
-#define MACH_TYPE_MCU1 2835
-#define MACH_TYPE_OMAP3_TAO3530 2836
-#define MACH_TYPE_OMAP3_PCUTOUCH 2837
#define MACH_TYPE_SMDKC210 2838
#define MACH_TYPE_OMAP3_BRAILLO 2839
#define MACH_TYPE_SPYPLUG 2840
@@ -2875,7 +528,6 @@ extern unsigned int __machine_arch_type;
#define MACH_TYPE_MECHA 2892
#define MACH_TYPE_BUBBA3 2893
#define MACH_TYPE_PUPITRE 2894
-#define MACH_TYPE_TEGRA_HARMONY 2895
#define MACH_TYPE_TEGRA_VOGUE 2896
#define MACH_TYPE_TEGRA_E1165 2897
#define MACH_TYPE_SIMPLENET 2898
@@ -2965,7 +617,6 @@ extern unsigned int __machine_arch_type;
#define MACH_TYPE_SSC 2984
#define MACH_TYPE_PREMIERWAVE_EN 2985
#define MACH_TYPE_WASABI 2986
-#define MACH_TYPE_VIVOW 2987
#define MACH_TYPE_MX50_RDP 2988
#define MACH_TYPE_UNIVERSAL_C210 2989
#define MACH_TYPE_REAL6410 2990
@@ -3013,12 +664,10 @@ extern unsigned int __machine_arch_type;
#define MACH_TYPE_AT91CAP7XDK 3032
#define MACH_TYPE_AT91CAP7STK 3033
#define MACH_TYPE_KT_SBC_SAM9_1 3034
-#define MACH_TYPE_ORATISROUTER 3035
#define MACH_TYPE_ARMADA_XP_DB 3036
#define MACH_TYPE_SPDM 3037
#define MACH_TYPE_GTIB 3038
#define MACH_TYPE_DGM3240 3039
-#define MACH_TYPE_ATLAS_I_LPE 3040
#define MACH_TYPE_HTCMEGA 3041
#define MACH_TYPE_TRICORDER 3042
#define MACH_TYPE_TX28 3043
@@ -3058,7 +707,6 @@ extern unsigned int __machine_arch_type;
#define MACH_TYPE_RUMP 3078
#define MACH_TYPE_TENDERLOIN 3079
#define MACH_TYPE_SHORTLOIN 3080
-#define MACH_TYPE_CRESPO 3081
#define MACH_TYPE_ANTARES 3082
#define MACH_TYPE_WB40N 3083
#define MACH_TYPE_HERRING 3084
@@ -3107,7 +755,6 @@ extern unsigned int __machine_arch_type;
#define MACH_TYPE_SMARTQV7 3127
#define MACH_TYPE_PAZ00 3128
#define MACH_TYPE_ACMENETUSFOXG20 3129
-#define MACH_TYPE_HTCWILLOW 3130
#define MACH_TYPE_FWBD_0404 3131
#define MACH_TYPE_HDGU 3132
#define MACH_TYPE_PYRAMID 3133
@@ -3158,7 +805,6 @@ extern unsigned int __machine_arch_type;
#define MACH_TYPE_S5500 3178
#define MACH_TYPE_ICON 3179
#define MACH_TYPE_ELEPHANT 3180
-#define MACH_TYPE_MSM8X60_FUSION 3181
#define MACH_TYPE_SHOOTER 3182
#define MACH_TYPE_SPADE_LTE 3183
#define MACH_TYPE_PHILHWANI 3184
@@ -3170,13 +816,11 @@ extern unsigned int __machine_arch_type;
#define MACH_TYPE_SC575PLC 3190
#define MACH_TYPE_SC575IPC 3191
#define MACH_TYPE_OMAP3_TDM3730 3192
-#define MACH_TYPE_G7 3193
#define MACH_TYPE_TOP9000_EVAL 3194
#define MACH_TYPE_TOP9000_SU 3195
#define MACH_TYPE_UTM300 3196
#define MACH_TYPE_TSUNAGI 3197
#define MACH_TYPE_TS75XX 3198
-#define MACH_TYPE_MSM8X60_FUSN_FFA 3199
#define MACH_TYPE_TS47XX 3200
#define MACH_TYPE_DA850_K5 3201
#define MACH_TYPE_AX502 3202
@@ -3257,7 +901,7 @@ extern unsigned int __machine_arch_type;
#define MACH_TYPE_UEMD 3281
#define MACH_TYPE_CCWMX51MUT 3282
#define MACH_TYPE_ROCKHOPPER 3283
-#define MACH_TYPE_NOOKCOLOR 3284
+#define MACH_TYPE_ENCORE 3284
#define MACH_TYPE_HKDKC100 3285
#define MACH_TYPE_TS42XX 3286
#define MACH_TYPE_AEBL 3287
@@ -3268,9 +912,7 @@ extern unsigned int __machine_arch_type;
#define MACH_TYPE_RASCAL 3292
#define MACH_TYPE_HREFV60 3293
#define MACH_TYPE_TPT_2_0 3294
-#define MACH_TYPE_PYRAMID_TD 3295
#define MACH_TYPE_SPLENDOR 3296
-#define MACH_TYPE_GUF_PLANET 3297
#define MACH_TYPE_MSM8X60_QT 3298
#define MACH_TYPE_HTC_HD_MINI 3299
#define MACH_TYPE_ATHENE 3300
@@ -3281,7 +923,6 @@ extern unsigned int __machine_arch_type;
#define MACH_TYPE_NMH 3305
#define MACH_TYPE_WN802T 3306
#define MACH_TYPE_DRAGONET 3307
-#define MACH_TYPE_GENEVA_B 3308
#define MACH_TYPE_AT91SAM9263DESK16L 3309
#define MACH_TYPE_BCMHANA_SV 3310
#define MACH_TYPE_BCMHANA_TABLET 3311
@@ -3312,6 +953,157 @@ extern unsigned int __machine_arch_type;
#define MACH_TYPE_T5388P 3336
#define MACH_TYPE_DINGO 3337
#define MACH_TYPE_GOFLEXHOME 3338
+#define MACH_TYPE_LANREADYFN511 3340
+#define MACH_TYPE_OMAP3_BAIA 3341
+#define MACH_TYPE_OMAP3SMARTDISPLAY 3342
+#define MACH_TYPE_XILINX 3343
+#define MACH_TYPE_A2F 3344
+#define MACH_TYPE_SKY25 3345
+#define MACH_TYPE_CCMX53 3346
+#define MACH_TYPE_CCMX53JS 3347
+#define MACH_TYPE_CCWMX53 3348
+#define MACH_TYPE_CCWMX53JS 3349
+#define MACH_TYPE_FRISMS 3350
+#define MACH_TYPE_MSM7X27A_FFA 3351
+#define MACH_TYPE_MSM7X27A_SURF 3352
+#define MACH_TYPE_MSM7X27A_RUMI3 3353
+#define MACH_TYPE_DIMMSAM9G20 3354
+#define MACH_TYPE_DIMM_IMX28 3355
+#define MACH_TYPE_AMK_A4 3356
+#define MACH_TYPE_GNET_SGME 3357
+#define MACH_TYPE_SHOOTER_U 3358
+#define MACH_TYPE_VMX53 3359
+#define MACH_TYPE_RHINO 3360
+#define MACH_TYPE_ARMLEX4210 3361
+#define MACH_TYPE_SWARCOEXTMODEM 3362
+#define MACH_TYPE_SNOWBALL 3363
+#define MACH_TYPE_PCM049 3364
+#define MACH_TYPE_VIGOR 3365
+#define MACH_TYPE_OSLO_AMUNDSEN 3366
+#define MACH_TYPE_GSL_DIAMOND 3367
+#define MACH_TYPE_CV2201 3368
+#define MACH_TYPE_CV2202 3369
+#define MACH_TYPE_CV2203 3370
+#define MACH_TYPE_VIT_IBOX 3371
+#define MACH_TYPE_DM6441_ESP 3372
+#define MACH_TYPE_AT91SAM9X5EK 3373
+#define MACH_TYPE_LIBRA 3374
+#define MACH_TYPE_EASYCRRH 3375
+#define MACH_TYPE_TRIPEL 3376
+#define MACH_TYPE_ENDIAN_MINI 3377
+#define MACH_TYPE_XILINX_EP107 3378
+#define MACH_TYPE_NURI 3379
+#define MACH_TYPE_JANUS 3380
+#define MACH_TYPE_DDNAS 3381
+#define MACH_TYPE_TAG 3382
+#define MACH_TYPE_TAGW 3383
+#define MACH_TYPE_NITROGEN_VM_IMX51 3384
+#define MACH_TYPE_VIPRINET 3385
+#define MACH_TYPE_BOCKW 3386
+#define MACH_TYPE_EVA2000 3387
+#define MACH_TYPE_STEELYARD 3388
+#define MACH_TYPE_MACH_SDH001 3390
+#define MACH_TYPE_NSSLSBOARD 3392
+#define MACH_TYPE_GENEVA_B5 3393
+#define MACH_TYPE_SPEAR1340 3394
+#define MACH_TYPE_REXMAS 3395
+#define MACH_TYPE_MSM8960_CDP 3396
+#define MACH_TYPE_MSM8960_MDP 3397
+#define MACH_TYPE_MSM8960_FLUID 3398
+#define MACH_TYPE_MSM8960_APQ 3399
+#define MACH_TYPE_HELIOS_V2 3400
+#define MACH_TYPE_MIF10P 3401
+#define MACH_TYPE_IAM28 3402
+#define MACH_TYPE_PICASSO 3403
+#define MACH_TYPE_MR301A 3404
+#define MACH_TYPE_NOTLE 3405
+#define MACH_TYPE_EELX2 3406
+#define MACH_TYPE_MOON 3407
+#define MACH_TYPE_RUBY 3408
+#define MACH_TYPE_GOLDENGATE 3409
+#define MACH_TYPE_CTBU_GEN2 3410
+#define MACH_TYPE_KMP_AM17_01 3411
+#define MACH_TYPE_WTPLUG 3412
+#define MACH_TYPE_MX27SU2 3413
+#define MACH_TYPE_NB31 3414
+#define MACH_TYPE_HJSDU 3415
+#define MACH_TYPE_TD3_REV1 3416
+#define MACH_TYPE_EAG_CI4000 3417
+#define MACH_TYPE_NET5BIG_NAND_V2 3418
+#define MACH_TYPE_CPX2 3419
+#define MACH_TYPE_NET2BIG_NAND_V2 3420
+#define MACH_TYPE_ECUV5 3421
+#define MACH_TYPE_HSGX6D 3422
+#define MACH_TYPE_DAWAD7 3423
+#define MACH_TYPE_SAM9REPEATER 3424
+#define MACH_TYPE_GT_I5700 3425
+#define MACH_TYPE_CTERA_PLUG_C2 3426
+#define MACH_TYPE_MARVELCT 3427
+#define MACH_TYPE_AG11005 3428
+#define MACH_TYPE_VANGOGH 3430
+#define MACH_TYPE_MATRIX505 3431
+#define MACH_TYPE_OCE_NIGMA 3432
+#define MACH_TYPE_T55 3433
+#define MACH_TYPE_BIO3K 3434
+#define MACH_TYPE_EXPRESSCT 3435
+#define MACH_TYPE_CARDHU 3436
+#define MACH_TYPE_ARUBA 3437
+#define MACH_TYPE_BONAIRE 3438
+#define MACH_TYPE_NUC700EVB 3439
+#define MACH_TYPE_NUC710EVB 3440
+#define MACH_TYPE_NUC740EVB 3441
+#define MACH_TYPE_NUC745EVB 3442
+#define MACH_TYPE_TRANSCEDE 3443
+#define MACH_TYPE_MORA 3444
+#define MACH_TYPE_NDA_EVM 3445
+#define MACH_TYPE_TIMU 3446
+#define MACH_TYPE_EXPRESSH 3447
+#define MACH_TYPE_VERIDIS_A300 3448
+#define MACH_TYPE_DM368_LEOPARD 3449
+#define MACH_TYPE_OMAP_MCOP 3450
+#define MACH_TYPE_TRITIP 3451
+#define MACH_TYPE_SM1K 3452
+#define MACH_TYPE_MONCH 3453
+#define MACH_TYPE_CURACAO 3454
+#define MACH_TYPE_ORIGEN 3455
+#define MACH_TYPE_EPC10 3456
+#define MACH_TYPE_SGH_I740 3457
+#define MACH_TYPE_TUNA 3458
+#define MACH_TYPE_MX51_TULIP 3459
+#define MACH_TYPE_MX51_ASTER7 3460
+#define MACH_TYPE_ACRO37XBRD 3461
+#define MACH_TYPE_ELKE 3462
+#define MACH_TYPE_SBC6000X 3463
+#define MACH_TYPE_R1801E 3464
+#define MACH_TYPE_H1600 3465
+#define MACH_TYPE_MINI210 3466
+#define MACH_TYPE_MINI8168 3467
+#define MACH_TYPE_PC7308 3468
+#define MACH_TYPE_KMM2M01 3470
+#define MACH_TYPE_MX51EREBUS 3471
+#define MACH_TYPE_WM8650REFBOARD 3472
+#define MACH_TYPE_TUXRAIL 3473
+#define MACH_TYPE_ARTHUR 3474
+#define MACH_TYPE_DOORBOY 3475
+#define MACH_TYPE_XARINA 3476
+#define MACH_TYPE_ROVERX7 3477
+#define MACH_TYPE_SDVR 3478
+#define MACH_TYPE_ACER_MAYA 3479
+#define MACH_TYPE_PICO 3480
+#define MACH_TYPE_CWMX233 3481
+#define MACH_TYPE_CWAM1808 3482
+#define MACH_TYPE_CWDM365 3483
+#define MACH_TYPE_MX51_MORAY 3484
+#define MACH_TYPE_THALES_CBC 3485
+#define MACH_TYPE_BLUEPOINT 3486
+#define MACH_TYPE_DIR665 3487
+#define MACH_TYPE_ACMEROVER1 3488
+#define MACH_TYPE_SHOOTER_CT 3489
+#define MACH_TYPE_BLISS 3490
+#define MACH_TYPE_BLISSC 3491
+#define MACH_TYPE_THALES_ADC 3492
+#define MACH_TYPE_UBISYS_P9D_EVP 3493
+#define MACH_TYPE_ATDGP318 3494
#ifdef CONFIG_ARCH_EBSA110
# ifdef machine_arch_type
@@ -3337,18 +1129,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_riscpc() (0)
#endif
-#ifdef CONFIG_ARCH_NEXUSPCI
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_NEXUSPCI
-# endif
-# define machine_is_nexuspci() (machine_arch_type == MACH_TYPE_NEXUSPCI)
-#else
-# define machine_is_nexuspci() (0)
-#endif
-
#ifdef CONFIG_ARCH_EBSA285
# ifdef machine_arch_type
# undef machine_arch_type
@@ -3385,102 +1165,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_cats() (0)
#endif
-#ifdef CONFIG_ARCH_TBOX
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_TBOX
-# endif
-# define machine_is_tbox() (machine_arch_type == MACH_TYPE_TBOX)
-#else
-# define machine_is_tbox() (0)
-#endif
-
-#ifdef CONFIG_ARCH_CO285
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CO285
-# endif
-# define machine_is_co285() (machine_arch_type == MACH_TYPE_CO285)
-#else
-# define machine_is_co285() (0)
-#endif
-
-#ifdef CONFIG_ARCH_CLPS7110
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CLPS7110
-# endif
-# define machine_is_clps7110() (machine_arch_type == MACH_TYPE_CLPS7110)
-#else
-# define machine_is_clps7110() (0)
-#endif
-
-#ifdef CONFIG_ARCH_ARC
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ARCHIMEDES
-# endif
-# define machine_is_archimedes() (machine_arch_type == MACH_TYPE_ARCHIMEDES)
-#else
-# define machine_is_archimedes() (0)
-#endif
-
-#ifdef CONFIG_ARCH_A5K
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_A5K
-# endif
-# define machine_is_a5k() (machine_arch_type == MACH_TYPE_A5K)
-#else
-# define machine_is_a5k() (0)
-#endif
-
-#ifdef CONFIG_ARCH_ETOILE
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ETOILE
-# endif
-# define machine_is_etoile() (machine_arch_type == MACH_TYPE_ETOILE)
-#else
-# define machine_is_etoile() (0)
-#endif
-
-#ifdef CONFIG_ARCH_LACIE_NAS
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_LACIE_NAS
-# endif
-# define machine_is_lacie_nas() (machine_arch_type == MACH_TYPE_LACIE_NAS)
-#else
-# define machine_is_lacie_nas() (0)
-#endif
-
-#ifdef CONFIG_ARCH_CLPS7500
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CLPS7500
-# endif
-# define machine_is_clps7500() (machine_arch_type == MACH_TYPE_CLPS7500)
-#else
-# define machine_is_clps7500() (0)
-#endif
-
#ifdef CONFIG_ARCH_SHARK
# ifdef machine_arch_type
# undef machine_arch_type
@@ -3517,18 +1201,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_personal_server() (0)
#endif
-#ifdef CONFIG_SA1100_ITSY
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ITSY
-# endif
-# define machine_is_itsy() (machine_arch_type == MACH_TYPE_ITSY)
-#else
-# define machine_is_itsy() (0)
-#endif
-
#ifdef CONFIG_ARCH_L7200
# ifdef machine_arch_type
# undef machine_arch_type
@@ -3577,18 +1249,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_h3600() (0)
#endif
-#ifdef CONFIG_ARCH_IXP1200
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_IXP1200
-# endif
-# define machine_is_ixp1200() (machine_arch_type == MACH_TYPE_IXP1200)
-#else
-# define machine_is_ixp1200() (0)
-#endif
-
#ifdef CONFIG_ARCH_P720T
# ifdef machine_arch_type
# undef machine_arch_type
@@ -3613,18 +1273,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_assabet() (0)
#endif
-#ifdef CONFIG_SA1100_VICTOR
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_VICTOR
-# endif
-# define machine_is_victor() (machine_arch_type == MACH_TYPE_VICTOR)
-#else
-# define machine_is_victor() (0)
-#endif
-
#ifdef CONFIG_SA1100_LART
# ifdef machine_arch_type
# undef machine_arch_type
@@ -3637,18 +1285,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_lart() (0)
#endif
-#ifdef CONFIG_SA1100_RANGER
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_RANGER
-# endif
-# define machine_is_ranger() (machine_arch_type == MACH_TYPE_RANGER)
-#else
-# define machine_is_ranger() (0)
-#endif
-
#ifdef CONFIG_SA1100_GRAPHICSCLIENT
# ifdef machine_arch_type
# undef machine_arch_type
@@ -3697,186 +1333,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_nanoengine() (0)
#endif
-#ifdef CONFIG_SA1100_FPIC
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_FPIC
-# endif
-# define machine_is_fpic() (machine_arch_type == MACH_TYPE_FPIC)
-#else
-# define machine_is_fpic() (0)
-#endif
-
-#ifdef CONFIG_SA1100_EXTENEX1
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_EXTENEX1
-# endif
-# define machine_is_extenex1() (machine_arch_type == MACH_TYPE_EXTENEX1)
-#else
-# define machine_is_extenex1() (0)
-#endif
-
-#ifdef CONFIG_SA1100_SHERMAN
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SHERMAN
-# endif
-# define machine_is_sherman() (machine_arch_type == MACH_TYPE_SHERMAN)
-#else
-# define machine_is_sherman() (0)
-#endif
-
-#ifdef CONFIG_SA1100_ACCELENT
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ACCELENT_SA
-# endif
-# define machine_is_accelent_sa() (machine_arch_type == MACH_TYPE_ACCELENT_SA)
-#else
-# define machine_is_accelent_sa() (0)
-#endif
-
-#ifdef CONFIG_ARCH_L7200_ACCELENT
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ACCELENT_L7200
-# endif
-# define machine_is_accelent_l7200() (machine_arch_type == MACH_TYPE_ACCELENT_L7200)
-#else
-# define machine_is_accelent_l7200() (0)
-#endif
-
-#ifdef CONFIG_SA1100_NETPORT
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_NETPORT
-# endif
-# define machine_is_netport() (machine_arch_type == MACH_TYPE_NETPORT)
-#else
-# define machine_is_netport() (0)
-#endif
-
-#ifdef CONFIG_SA1100_PANGOLIN
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_PANGOLIN
-# endif
-# define machine_is_pangolin() (machine_arch_type == MACH_TYPE_PANGOLIN)
-#else
-# define machine_is_pangolin() (0)
-#endif
-
-#ifdef CONFIG_SA1100_YOPY
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_YOPY
-# endif
-# define machine_is_yopy() (machine_arch_type == MACH_TYPE_YOPY)
-#else
-# define machine_is_yopy() (0)
-#endif
-
-#ifdef CONFIG_SA1100_COOLIDGE
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_COOLIDGE
-# endif
-# define machine_is_coolidge() (machine_arch_type == MACH_TYPE_COOLIDGE)
-#else
-# define machine_is_coolidge() (0)
-#endif
-
-#ifdef CONFIG_SA1100_HUW_WEBPANEL
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_HUW_WEBPANEL
-# endif
-# define machine_is_huw_webpanel() (machine_arch_type == MACH_TYPE_HUW_WEBPANEL)
-#else
-# define machine_is_huw_webpanel() (0)
-#endif
-
-#ifdef CONFIG_ARCH_SPOTME
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SPOTME
-# endif
-# define machine_is_spotme() (machine_arch_type == MACH_TYPE_SPOTME)
-#else
-# define machine_is_spotme() (0)
-#endif
-
-#ifdef CONFIG_ARCH_FREEBIRD
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_FREEBIRD
-# endif
-# define machine_is_freebird() (machine_arch_type == MACH_TYPE_FREEBIRD)
-#else
-# define machine_is_freebird() (0)
-#endif
-
-#ifdef CONFIG_ARCH_TI925
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_TI925
-# endif
-# define machine_is_ti925() (machine_arch_type == MACH_TYPE_TI925)
-#else
-# define machine_is_ti925() (0)
-#endif
-
-#ifdef CONFIG_ARCH_RISCSTATION
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_RISCSTATION
-# endif
-# define machine_is_riscstation() (machine_arch_type == MACH_TYPE_RISCSTATION)
-#else
-# define machine_is_riscstation() (0)
-#endif
-
-#ifdef CONFIG_SA1100_CAVY
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CAVY
-# endif
-# define machine_is_cavy() (machine_arch_type == MACH_TYPE_CAVY)
-#else
-# define machine_is_cavy() (0)
-#endif
-
#ifdef CONFIG_SA1100_JORNADA720
# ifdef machine_arch_type
# undef machine_arch_type
@@ -3889,18 +1345,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_jornada720() (0)
#endif
-#ifdef CONFIG_SA1100_OMNIMETER
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_OMNIMETER
-# endif
-# define machine_is_omnimeter() (machine_arch_type == MACH_TYPE_OMNIMETER)
-#else
-# define machine_is_omnimeter() (0)
-#endif
-
#ifdef CONFIG_ARCH_EDB7211
# ifdef machine_arch_type
# undef machine_arch_type
@@ -3913,18 +1357,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_edb7211() (0)
#endif
-#ifdef CONFIG_SA1100_CITYGO
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CITYGO
-# endif
-# define machine_is_citygo() (machine_arch_type == MACH_TYPE_CITYGO)
-#else
-# define machine_is_citygo() (0)
-#endif
-
#ifdef CONFIG_SA1100_PFS168
# ifdef machine_arch_type
# undef machine_arch_type
@@ -3937,18 +1369,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_pfs168() (0)
#endif
-#ifdef CONFIG_SA1100_SPOT
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SPOT
-# endif
-# define machine_is_spot() (machine_arch_type == MACH_TYPE_SPOT)
-#else
-# define machine_is_spot() (0)
-#endif
-
#ifdef CONFIG_SA1100_FLEXANET
# ifdef machine_arch_type
# undef machine_arch_type
@@ -3961,378 +1381,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_flexanet() (0)
#endif
-#ifdef CONFIG_ARCH_WEBPAL
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_WEBPAL
-# endif
-# define machine_is_webpal() (machine_arch_type == MACH_TYPE_WEBPAL)
-#else
-# define machine_is_webpal() (0)
-#endif
-
-#ifdef CONFIG_SA1100_LINPDA
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_LINPDA
-# endif
-# define machine_is_linpda() (machine_arch_type == MACH_TYPE_LINPDA)
-#else
-# define machine_is_linpda() (0)
-#endif
-
-#ifdef CONFIG_ARCH_ANAKIN
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ANAKIN
-# endif
-# define machine_is_anakin() (machine_arch_type == MACH_TYPE_ANAKIN)
-#else
-# define machine_is_anakin() (0)
-#endif
-
-#ifdef CONFIG_SA1100_MVI
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MVI
-# endif
-# define machine_is_mvi() (machine_arch_type == MACH_TYPE_MVI)
-#else
-# define machine_is_mvi() (0)
-#endif
-
-#ifdef CONFIG_SA1100_JUPITER
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_JUPITER
-# endif
-# define machine_is_jupiter() (machine_arch_type == MACH_TYPE_JUPITER)
-#else
-# define machine_is_jupiter() (0)
-#endif
-
-#ifdef CONFIG_ARCH_PSIONW
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_PSIONW
-# endif
-# define machine_is_psionw() (machine_arch_type == MACH_TYPE_PSIONW)
-#else
-# define machine_is_psionw() (0)
-#endif
-
-#ifdef CONFIG_SA1100_ALN
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ALN
-# endif
-# define machine_is_aln() (machine_arch_type == MACH_TYPE_ALN)
-#else
-# define machine_is_aln() (0)
-#endif
-
-#ifdef CONFIG_ARCH_CAMELOT
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CAMELOT
-# endif
-# define machine_is_epxa() (machine_arch_type == MACH_TYPE_CAMELOT)
-#else
-# define machine_is_epxa() (0)
-#endif
-
-#ifdef CONFIG_SA1100_GDS2200
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_GDS2200
-# endif
-# define machine_is_gds2200() (machine_arch_type == MACH_TYPE_GDS2200)
-#else
-# define machine_is_gds2200() (0)
-#endif
-
-#ifdef CONFIG_SA1100_PSION_SERIES7
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_PSION_SERIES7
-# endif
-# define machine_is_netbook() (machine_arch_type == MACH_TYPE_PSION_SERIES7)
-#else
-# define machine_is_netbook() (0)
-#endif
-
-#ifdef CONFIG_SA1100_XFILE
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_XFILE
-# endif
-# define machine_is_xfile() (machine_arch_type == MACH_TYPE_XFILE)
-#else
-# define machine_is_xfile() (0)
-#endif
-
-#ifdef CONFIG_ARCH_ACCELENT_EP9312
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ACCELENT_EP9312
-# endif
-# define machine_is_accelent_ep9312() (machine_arch_type == MACH_TYPE_ACCELENT_EP9312)
-#else
-# define machine_is_accelent_ep9312() (0)
-#endif
-
-#ifdef CONFIG_ARCH_IC200
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_IC200
-# endif
-# define machine_is_ic200() (machine_arch_type == MACH_TYPE_IC200)
-#else
-# define machine_is_ic200() (0)
-#endif
-
-#ifdef CONFIG_SA1100_CREDITLART
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CREDITLART
-# endif
-# define machine_is_creditlart() (machine_arch_type == MACH_TYPE_CREDITLART)
-#else
-# define machine_is_creditlart() (0)
-#endif
-
-#ifdef CONFIG_SA1100_HTM
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_HTM
-# endif
-# define machine_is_htm() (machine_arch_type == MACH_TYPE_HTM)
-#else
-# define machine_is_htm() (0)
-#endif
-
-#ifdef CONFIG_ARCH_IQ80310
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_IQ80310
-# endif
-# define machine_is_iq80310() (machine_arch_type == MACH_TYPE_IQ80310)
-#else
-# define machine_is_iq80310() (0)
-#endif
-
-#ifdef CONFIG_SA1100_FREEBOT
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_FREEBOT
-# endif
-# define machine_is_freebot() (machine_arch_type == MACH_TYPE_FREEBOT)
-#else
-# define machine_is_freebot() (0)
-#endif
-
-#ifdef CONFIG_ARCH_ENTEL
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ENTEL
-# endif
-# define machine_is_entel() (machine_arch_type == MACH_TYPE_ENTEL)
-#else
-# define machine_is_entel() (0)
-#endif
-
-#ifdef CONFIG_ARCH_ENP3510
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ENP3510
-# endif
-# define machine_is_enp3510() (machine_arch_type == MACH_TYPE_ENP3510)
-#else
-# define machine_is_enp3510() (0)
-#endif
-
-#ifdef CONFIG_SA1100_TRIZEPS
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_TRIZEPS
-# endif
-# define machine_is_trizeps() (machine_arch_type == MACH_TYPE_TRIZEPS)
-#else
-# define machine_is_trizeps() (0)
-#endif
-
-#ifdef CONFIG_SA1100_NESA
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_NESA
-# endif
-# define machine_is_nesa() (machine_arch_type == MACH_TYPE_NESA)
-#else
-# define machine_is_nesa() (0)
-#endif
-
-#ifdef CONFIG_ARCH_VENUS
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_VENUS
-# endif
-# define machine_is_venus() (machine_arch_type == MACH_TYPE_VENUS)
-#else
-# define machine_is_venus() (0)
-#endif
-
-#ifdef CONFIG_ARCH_TARDIS
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_TARDIS
-# endif
-# define machine_is_tardis() (machine_arch_type == MACH_TYPE_TARDIS)
-#else
-# define machine_is_tardis() (0)
-#endif
-
-#ifdef CONFIG_ARCH_MERCURY
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MERCURY
-# endif
-# define machine_is_mercury() (machine_arch_type == MACH_TYPE_MERCURY)
-#else
-# define machine_is_mercury() (0)
-#endif
-
-#ifdef CONFIG_SA1100_EMPEG
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_EMPEG
-# endif
-# define machine_is_empeg() (machine_arch_type == MACH_TYPE_EMPEG)
-#else
-# define machine_is_empeg() (0)
-#endif
-
-#ifdef CONFIG_ARCH_I80200FCC
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_I80200FCC
-# endif
-# define machine_is_adi_evb() (machine_arch_type == MACH_TYPE_I80200FCC)
-#else
-# define machine_is_adi_evb() (0)
-#endif
-
-#ifdef CONFIG_SA1100_ITT_CPB
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ITT_CPB
-# endif
-# define machine_is_itt_cpb() (machine_arch_type == MACH_TYPE_ITT_CPB)
-#else
-# define machine_is_itt_cpb() (0)
-#endif
-
-#ifdef CONFIG_SA1100_SVC
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SVC
-# endif
-# define machine_is_svc() (machine_arch_type == MACH_TYPE_SVC)
-#else
-# define machine_is_svc() (0)
-#endif
-
-#ifdef CONFIG_SA1100_ALPHA2
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ALPHA2
-# endif
-# define machine_is_alpha2() (machine_arch_type == MACH_TYPE_ALPHA2)
-#else
-# define machine_is_alpha2() (0)
-#endif
-
-#ifdef CONFIG_SA1100_ALPHA1
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ALPHA1
-# endif
-# define machine_is_alpha1() (machine_arch_type == MACH_TYPE_ALPHA1)
-#else
-# define machine_is_alpha1() (0)
-#endif
-
-#ifdef CONFIG_ARCH_NETARM
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_NETARM
-# endif
-# define machine_is_netarm() (machine_arch_type == MACH_TYPE_NETARM)
-#else
-# define machine_is_netarm() (0)
-#endif
-
#ifdef CONFIG_SA1100_SIMPAD
# ifdef machine_arch_type
# undef machine_arch_type
@@ -4345,18 +1393,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_simpad() (0)
#endif
-#ifdef CONFIG_ARCH_PDA1
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_PDA1
-# endif
-# define machine_is_pda1() (machine_arch_type == MACH_TYPE_PDA1)
-#else
-# define machine_is_pda1() (0)
-#endif
-
#ifdef CONFIG_ARCH_LUBBOCK
# ifdef machine_arch_type
# undef machine_arch_type
@@ -4369,18 +1405,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_lubbock() (0)
#endif
-#ifdef CONFIG_ARCH_ANIKO
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ANIKO
-# endif
-# define machine_is_aniko() (machine_arch_type == MACH_TYPE_ANIKO)
-#else
-# define machine_is_aniko() (0)
-#endif
-
#ifdef CONFIG_ARCH_CLEP7212
# ifdef machine_arch_type
# undef machine_arch_type
@@ -4393,66 +1417,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_clep7212() (0)
#endif
-#ifdef CONFIG_ARCH_CS89712
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CS89712
-# endif
-# define machine_is_cs89712() (machine_arch_type == MACH_TYPE_CS89712)
-#else
-# define machine_is_cs89712() (0)
-#endif
-
-#ifdef CONFIG_SA1100_WEARARM
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_WEARARM
-# endif
-# define machine_is_weararm() (machine_arch_type == MACH_TYPE_WEARARM)
-#else
-# define machine_is_weararm() (0)
-#endif
-
-#ifdef CONFIG_SA1100_POSSIO_PX
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_POSSIO_PX
-# endif
-# define machine_is_possio_px() (machine_arch_type == MACH_TYPE_POSSIO_PX)
-#else
-# define machine_is_possio_px() (0)
-#endif
-
-#ifdef CONFIG_SA1100_SIDEARM
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SIDEARM
-# endif
-# define machine_is_sidearm() (machine_arch_type == MACH_TYPE_SIDEARM)
-#else
-# define machine_is_sidearm() (0)
-#endif
-
-#ifdef CONFIG_SA1100_STORK
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_STORK
-# endif
-# define machine_is_stork() (machine_arch_type == MACH_TYPE_STORK)
-#else
-# define machine_is_stork() (0)
-#endif
-
#ifdef CONFIG_SA1100_SHANNON
# ifdef machine_arch_type
# undef machine_arch_type
@@ -4465,90 +1429,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_shannon() (0)
#endif
-#ifdef CONFIG_ARCH_ACE
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ACE
-# endif
-# define machine_is_ace() (machine_arch_type == MACH_TYPE_ACE)
-#else
-# define machine_is_ace() (0)
-#endif
-
-#ifdef CONFIG_SA1100_BALLYARM
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_BALLYARM
-# endif
-# define machine_is_ballyarm() (machine_arch_type == MACH_TYPE_BALLYARM)
-#else
-# define machine_is_ballyarm() (0)
-#endif
-
-#ifdef CONFIG_SA1100_SIMPUTER
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SIMPUTER
-# endif
-# define machine_is_simputer() (machine_arch_type == MACH_TYPE_SIMPUTER)
-#else
-# define machine_is_simputer() (0)
-#endif
-
-#ifdef CONFIG_SA1100_NEXTERM
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_NEXTERM
-# endif
-# define machine_is_nexterm() (machine_arch_type == MACH_TYPE_NEXTERM)
-#else
-# define machine_is_nexterm() (0)
-#endif
-
-#ifdef CONFIG_SA1100_SA1100_ELF
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SA1100_ELF
-# endif
-# define machine_is_sa1100_elf() (machine_arch_type == MACH_TYPE_SA1100_ELF)
-#else
-# define machine_is_sa1100_elf() (0)
-#endif
-
-#ifdef CONFIG_SA1100_GATOR
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_GATOR
-# endif
-# define machine_is_gator() (machine_arch_type == MACH_TYPE_GATOR)
-#else
-# define machine_is_gator() (0)
-#endif
-
-#ifdef CONFIG_ARCH_GRANITE
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_GRANITE
-# endif
-# define machine_is_granite() (machine_arch_type == MACH_TYPE_GRANITE)
-#else
-# define machine_is_granite() (0)
-#endif
-
#ifdef CONFIG_SA1100_CONSUS
# ifdef machine_arch_type
# undef machine_arch_type
@@ -4621,18 +1501,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_pxa_idp() (0)
#endif
-#ifdef CONFIG_ARCH_PLCE
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_PLCE
-# endif
-# define machine_is_plce() (machine_arch_type == MACH_TYPE_PLCE)
-#else
-# define machine_is_plce() (0)
-#endif
-
#ifdef CONFIG_SA1100_PT_SYSTEM3
# ifdef machine_arch_type
# undef machine_arch_type
@@ -4645,66 +1513,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_pt_system3() (0)
#endif
-#ifdef CONFIG_ARCH_MEDALB
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MEDALB
-# endif
-# define machine_is_murphy() (machine_arch_type == MACH_TYPE_MEDALB)
-#else
-# define machine_is_murphy() (0)
-#endif
-
-#ifdef CONFIG_ARCH_EAGLE
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_EAGLE
-# endif
-# define machine_is_eagle() (machine_arch_type == MACH_TYPE_EAGLE)
-#else
-# define machine_is_eagle() (0)
-#endif
-
-#ifdef CONFIG_ARCH_DSC21
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_DSC21
-# endif
-# define machine_is_dsc21() (machine_arch_type == MACH_TYPE_DSC21)
-#else
-# define machine_is_dsc21() (0)
-#endif
-
-#ifdef CONFIG_ARCH_DSC24
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_DSC24
-# endif
-# define machine_is_dsc24() (machine_arch_type == MACH_TYPE_DSC24)
-#else
-# define machine_is_dsc24() (0)
-#endif
-
-#ifdef CONFIG_ARCH_TI5472
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_TI5472
-# endif
-# define machine_is_ti5472() (machine_arch_type == MACH_TYPE_TI5472)
-#else
-# define machine_is_ti5472() (0)
-#endif
-
#ifdef CONFIG_ARCH_AUTCPU12
# ifdef machine_arch_type
# undef machine_arch_type
@@ -4717,210 +1525,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_autcpu12() (0)
#endif
-#ifdef CONFIG_ARCH_UENGINE
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_UENGINE
-# endif
-# define machine_is_uengine() (machine_arch_type == MACH_TYPE_UENGINE)
-#else
-# define machine_is_uengine() (0)
-#endif
-
-#ifdef CONFIG_SA1100_BLUESTEM
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_BLUESTEM
-# endif
-# define machine_is_bluestem() (machine_arch_type == MACH_TYPE_BLUESTEM)
-#else
-# define machine_is_bluestem() (0)
-#endif
-
-#ifdef CONFIG_ARCH_XINGU8
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_XINGU8
-# endif
-# define machine_is_xingu8() (machine_arch_type == MACH_TYPE_XINGU8)
-#else
-# define machine_is_xingu8() (0)
-#endif
-
-#ifdef CONFIG_ARCH_BUSHSTB
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_BUSHSTB
-# endif
-# define machine_is_bushstb() (machine_arch_type == MACH_TYPE_BUSHSTB)
-#else
-# define machine_is_bushstb() (0)
-#endif
-
-#ifdef CONFIG_SA1100_EPSILON1
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_EPSILON1
-# endif
-# define machine_is_epsilon1() (machine_arch_type == MACH_TYPE_EPSILON1)
-#else
-# define machine_is_epsilon1() (0)
-#endif
-
-#ifdef CONFIG_SA1100_BALLOON
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_BALLOON
-# endif
-# define machine_is_balloon() (machine_arch_type == MACH_TYPE_BALLOON)
-#else
-# define machine_is_balloon() (0)
-#endif
-
-#ifdef CONFIG_ARCH_PUPPY
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_PUPPY
-# endif
-# define machine_is_puppy() (machine_arch_type == MACH_TYPE_PUPPY)
-#else
-# define machine_is_puppy() (0)
-#endif
-
-#ifdef CONFIG_SA1100_ELROY
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ELROY
-# endif
-# define machine_is_elroy() (machine_arch_type == MACH_TYPE_ELROY)
-#else
-# define machine_is_elroy() (0)
-#endif
-
-#ifdef CONFIG_ARCH_GMS720
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_GMS720
-# endif
-# define machine_is_gms720() (machine_arch_type == MACH_TYPE_GMS720)
-#else
-# define machine_is_gms720() (0)
-#endif
-
-#ifdef CONFIG_ARCH_S24X
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_S24X
-# endif
-# define machine_is_s24x() (machine_arch_type == MACH_TYPE_S24X)
-#else
-# define machine_is_s24x() (0)
-#endif
-
-#ifdef CONFIG_ARCH_JTEL_CLEP7312
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_JTEL_CLEP7312
-# endif
-# define machine_is_jtel_clep7312() (machine_arch_type == MACH_TYPE_JTEL_CLEP7312)
-#else
-# define machine_is_jtel_clep7312() (0)
-#endif
-
-#ifdef CONFIG_ARCH_CX821XX
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CX821XX
-# endif
-# define machine_is_cx821xx() (machine_arch_type == MACH_TYPE_CX821XX)
-#else
-# define machine_is_cx821xx() (0)
-#endif
-
-#ifdef CONFIG_ARCH_EDB7312
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_EDB7312
-# endif
-# define machine_is_edb7312() (machine_arch_type == MACH_TYPE_EDB7312)
-#else
-# define machine_is_edb7312() (0)
-#endif
-
-#ifdef CONFIG_SA1100_BSA1110
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_BSA1110
-# endif
-# define machine_is_bsa1110() (machine_arch_type == MACH_TYPE_BSA1110)
-#else
-# define machine_is_bsa1110() (0)
-#endif
-
-#ifdef CONFIG_ARCH_POWERPIN
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_POWERPIN
-# endif
-# define machine_is_powerpin() (machine_arch_type == MACH_TYPE_POWERPIN)
-#else
-# define machine_is_powerpin() (0)
-#endif
-
-#ifdef CONFIG_ARCH_OPENARM
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_OPENARM
-# endif
-# define machine_is_openarm() (machine_arch_type == MACH_TYPE_OPENARM)
-#else
-# define machine_is_openarm() (0)
-#endif
-
-#ifdef CONFIG_SA1100_WHITECHAPEL
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_WHITECHAPEL
-# endif
-# define machine_is_whitechapel() (machine_arch_type == MACH_TYPE_WHITECHAPEL)
-#else
-# define machine_is_whitechapel() (0)
-#endif
-
#ifdef CONFIG_SA1100_H3100
# ifdef machine_arch_type
# undef machine_arch_type
@@ -4933,114 +1537,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_h3100() (0)
#endif
-#ifdef CONFIG_SA1100_H3800
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_H3800
-# endif
-# define machine_is_h3800() (machine_arch_type == MACH_TYPE_H3800)
-#else
-# define machine_is_h3800() (0)
-#endif
-
-#ifdef CONFIG_ARCH_BLUE_V1
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_BLUE_V1
-# endif
-# define machine_is_blue_v1() (machine_arch_type == MACH_TYPE_BLUE_V1)
-#else
-# define machine_is_blue_v1() (0)
-#endif
-
-#ifdef CONFIG_ARCH_PXA_CERF
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_PXA_CERF
-# endif
-# define machine_is_pxa_cerf() (machine_arch_type == MACH_TYPE_PXA_CERF)
-#else
-# define machine_is_pxa_cerf() (0)
-#endif
-
-#ifdef CONFIG_ARCH_ARM7TEVB
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ARM7TEVB
-# endif
-# define machine_is_arm7tevb() (machine_arch_type == MACH_TYPE_ARM7TEVB)
-#else
-# define machine_is_arm7tevb() (0)
-#endif
-
-#ifdef CONFIG_SA1100_D7400
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_D7400
-# endif
-# define machine_is_d7400() (machine_arch_type == MACH_TYPE_D7400)
-#else
-# define machine_is_d7400() (0)
-#endif
-
-#ifdef CONFIG_ARCH_PIRANHA
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_PIRANHA
-# endif
-# define machine_is_piranha() (machine_arch_type == MACH_TYPE_PIRANHA)
-#else
-# define machine_is_piranha() (0)
-#endif
-
-#ifdef CONFIG_SA1100_SBCAMELOT
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SBCAMELOT
-# endif
-# define machine_is_sbcamelot() (machine_arch_type == MACH_TYPE_SBCAMELOT)
-#else
-# define machine_is_sbcamelot() (0)
-#endif
-
-#ifdef CONFIG_SA1100_KINGS
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_KINGS
-# endif
-# define machine_is_kings() (machine_arch_type == MACH_TYPE_KINGS)
-#else
-# define machine_is_kings() (0)
-#endif
-
-#ifdef CONFIG_ARCH_SMDK2400
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SMDK2400
-# endif
-# define machine_is_smdk2400() (machine_arch_type == MACH_TYPE_SMDK2400)
-#else
-# define machine_is_smdk2400() (0)
-#endif
-
#ifdef CONFIG_SA1100_COLLIE
# ifdef machine_arch_type
# undef machine_arch_type
@@ -5053,18 +1549,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_collie() (0)
#endif
-#ifdef CONFIG_ARCH_IDR
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_IDR
-# endif
-# define machine_is_idr() (machine_arch_type == MACH_TYPE_IDR)
-#else
-# define machine_is_idr() (0)
-#endif
-
#ifdef CONFIG_SA1100_BADGE4
# ifdef machine_arch_type
# undef machine_arch_type
@@ -5077,42 +1561,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_badge4() (0)
#endif
-#ifdef CONFIG_ARCH_WEBNET
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_WEBNET
-# endif
-# define machine_is_webnet() (machine_arch_type == MACH_TYPE_WEBNET)
-#else
-# define machine_is_webnet() (0)
-#endif
-
-#ifdef CONFIG_SA1100_D7300
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_D7300
-# endif
-# define machine_is_d7300() (machine_arch_type == MACH_TYPE_D7300)
-#else
-# define machine_is_d7300() (0)
-#endif
-
-#ifdef CONFIG_SA1100_CEP
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CEP
-# endif
-# define machine_is_cep() (machine_arch_type == MACH_TYPE_CEP)
-#else
-# define machine_is_cep() (0)
-#endif
-
#ifdef CONFIG_ARCH_FORTUNET
# ifdef machine_arch_type
# undef machine_arch_type
@@ -5125,90 +1573,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_fortunet() (0)
#endif
-#ifdef CONFIG_ARCH_VC547X
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_VC547X
-# endif
-# define machine_is_vc547x() (machine_arch_type == MACH_TYPE_VC547X)
-#else
-# define machine_is_vc547x() (0)
-#endif
-
-#ifdef CONFIG_SA1100_FILEWALKER
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_FILEWALKER
-# endif
-# define machine_is_filewalker() (machine_arch_type == MACH_TYPE_FILEWALKER)
-#else
-# define machine_is_filewalker() (0)
-#endif
-
-#ifdef CONFIG_SA1100_NETGATEWAY
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_NETGATEWAY
-# endif
-# define machine_is_netgateway() (machine_arch_type == MACH_TYPE_NETGATEWAY)
-#else
-# define machine_is_netgateway() (0)
-#endif
-
-#ifdef CONFIG_SA1100_SYMBOL2800
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SYMBOL2800
-# endif
-# define machine_is_symbol2800() (machine_arch_type == MACH_TYPE_SYMBOL2800)
-#else
-# define machine_is_symbol2800() (0)
-#endif
-
-#ifdef CONFIG_SA1100_SUNS
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SUNS
-# endif
-# define machine_is_suns() (machine_arch_type == MACH_TYPE_SUNS)
-#else
-# define machine_is_suns() (0)
-#endif
-
-#ifdef CONFIG_SA1100_FRODO
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_FRODO
-# endif
-# define machine_is_frodo() (machine_arch_type == MACH_TYPE_FRODO)
-#else
-# define machine_is_frodo() (0)
-#endif
-
-#ifdef CONFIG_SA1100_MACH_TYTE_MS301
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MACH_TYTE_MS301
-# endif
-# define machine_is_ms301() (machine_arch_type == MACH_TYPE_MACH_TYTE_MS301)
-#else
-# define machine_is_ms301() (0)
-#endif
-
#ifdef CONFIG_ARCH_MX1ADS
# ifdef machine_arch_type
# undef machine_arch_type
@@ -5245,78 +1609,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_h7202() (0)
#endif
-#ifdef CONFIG_ARCH_AMICO
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_AMICO
-# endif
-# define machine_is_amico() (machine_arch_type == MACH_TYPE_AMICO)
-#else
-# define machine_is_amico() (0)
-#endif
-
-#ifdef CONFIG_SA1100_IAM
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_IAM
-# endif
-# define machine_is_iam() (machine_arch_type == MACH_TYPE_IAM)
-#else
-# define machine_is_iam() (0)
-#endif
-
-#ifdef CONFIG_SA1100_TT530
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_TT530
-# endif
-# define machine_is_tt530() (machine_arch_type == MACH_TYPE_TT530)
-#else
-# define machine_is_tt530() (0)
-#endif
-
-#ifdef CONFIG_ARCH_SAM2400
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SAM2400
-# endif
-# define machine_is_sam2400() (machine_arch_type == MACH_TYPE_SAM2400)
-#else
-# define machine_is_sam2400() (0)
-#endif
-
-#ifdef CONFIG_SA1100_JORNADA56X
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_JORNADA56X
-# endif
-# define machine_is_jornada56x() (machine_arch_type == MACH_TYPE_JORNADA56X)
-#else
-# define machine_is_jornada56x() (0)
-#endif
-
-#ifdef CONFIG_SA1100_ACTIVE
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ACTIVE
-# endif
-# define machine_is_active() (machine_arch_type == MACH_TYPE_ACTIVE)
-#else
-# define machine_is_active() (0)
-#endif
-
#ifdef CONFIG_ARCH_IQ80321
# ifdef machine_arch_type
# undef machine_arch_type
@@ -5329,126 +1621,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_iq80321() (0)
#endif
-#ifdef CONFIG_SA1100_WID
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_WID
-# endif
-# define machine_is_wid() (machine_arch_type == MACH_TYPE_WID)
-#else
-# define machine_is_wid() (0)
-#endif
-
-#ifdef CONFIG_ARCH_SABINAL
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SABINAL
-# endif
-# define machine_is_sabinal() (machine_arch_type == MACH_TYPE_SABINAL)
-#else
-# define machine_is_sabinal() (0)
-#endif
-
-#ifdef CONFIG_ARCH_IXP425_MATACUMBE
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_IXP425_MATACUMBE
-# endif
-# define machine_is_ixp425_matacumbe() (machine_arch_type == MACH_TYPE_IXP425_MATACUMBE)
-#else
-# define machine_is_ixp425_matacumbe() (0)
-#endif
-
-#ifdef CONFIG_SA1100_MINIPRINT
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MINIPRINT
-# endif
-# define machine_is_miniprint() (machine_arch_type == MACH_TYPE_MINIPRINT)
-#else
-# define machine_is_miniprint() (0)
-#endif
-
-#ifdef CONFIG_ARCH_ADM510X
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ADM510X
-# endif
-# define machine_is_adm510x() (machine_arch_type == MACH_TYPE_ADM510X)
-#else
-# define machine_is_adm510x() (0)
-#endif
-
-#ifdef CONFIG_SA1100_SVS200
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SVS200
-# endif
-# define machine_is_svs200() (machine_arch_type == MACH_TYPE_SVS200)
-#else
-# define machine_is_svs200() (0)
-#endif
-
-#ifdef CONFIG_ARCH_ATG_TCU
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ATG_TCU
-# endif
-# define machine_is_atg_tcu() (machine_arch_type == MACH_TYPE_ATG_TCU)
-#else
-# define machine_is_atg_tcu() (0)
-#endif
-
-#ifdef CONFIG_SA1100_JORNADA820
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_JORNADA820
-# endif
-# define machine_is_jornada820() (machine_arch_type == MACH_TYPE_JORNADA820)
-#else
-# define machine_is_jornada820() (0)
-#endif
-
-#ifdef CONFIG_ARCH_S3C44B0
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_S3C44B0
-# endif
-# define machine_is_s3c44b0() (machine_arch_type == MACH_TYPE_S3C44B0)
-#else
-# define machine_is_s3c44b0() (0)
-#endif
-
-#ifdef CONFIG_ARCH_MARGIS2
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MARGIS2
-# endif
-# define machine_is_margis2() (machine_arch_type == MACH_TYPE_MARGIS2)
-#else
-# define machine_is_margis2() (0)
-#endif
-
#ifdef CONFIG_ARCH_KS8695
# ifdef machine_arch_type
# undef machine_arch_type
@@ -5461,150 +1633,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_ks8695() (0)
#endif
-#ifdef CONFIG_ARCH_BRH
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_BRH
-# endif
-# define machine_is_brh() (machine_arch_type == MACH_TYPE_BRH)
-#else
-# define machine_is_brh() (0)
-#endif
-
-#ifdef CONFIG_ARCH_S3C2410
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_S3C2410
-# endif
-# define machine_is_s3c2410() (machine_arch_type == MACH_TYPE_S3C2410)
-#else
-# define machine_is_s3c2410() (0)
-#endif
-
-#ifdef CONFIG_ARCH_POSSIO_PX30
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_POSSIO_PX30
-# endif
-# define machine_is_possio_px30() (machine_arch_type == MACH_TYPE_POSSIO_PX30)
-#else
-# define machine_is_possio_px30() (0)
-#endif
-
-#ifdef CONFIG_ARCH_S3C2800
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_S3C2800
-# endif
-# define machine_is_s3c2800() (machine_arch_type == MACH_TYPE_S3C2800)
-#else
-# define machine_is_s3c2800() (0)
-#endif
-
-#ifdef CONFIG_SA1100_FLEETWOOD
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_FLEETWOOD
-# endif
-# define machine_is_fleetwood() (machine_arch_type == MACH_TYPE_FLEETWOOD)
-#else
-# define machine_is_fleetwood() (0)
-#endif
-
-#ifdef CONFIG_ARCH_OMAHA
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_OMAHA
-# endif
-# define machine_is_omaha() (machine_arch_type == MACH_TYPE_OMAHA)
-#else
-# define machine_is_omaha() (0)
-#endif
-
-#ifdef CONFIG_ARCH_TA7
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_TA7
-# endif
-# define machine_is_ta7() (machine_arch_type == MACH_TYPE_TA7)
-#else
-# define machine_is_ta7() (0)
-#endif
-
-#ifdef CONFIG_SA1100_NOVA
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_NOVA
-# endif
-# define machine_is_nova() (machine_arch_type == MACH_TYPE_NOVA)
-#else
-# define machine_is_nova() (0)
-#endif
-
-#ifdef CONFIG_ARCH_HMK
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_HMK
-# endif
-# define machine_is_hmk() (machine_arch_type == MACH_TYPE_HMK)
-#else
-# define machine_is_hmk() (0)
-#endif
-
-#ifdef CONFIG_ARCH_KARO
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_KARO
-# endif
-# define machine_is_karo() (machine_arch_type == MACH_TYPE_KARO)
-#else
-# define machine_is_karo() (0)
-#endif
-
-#ifdef CONFIG_SA1100_FESTER
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_FESTER
-# endif
-# define machine_is_fester() (machine_arch_type == MACH_TYPE_FESTER)
-#else
-# define machine_is_fester() (0)
-#endif
-
-#ifdef CONFIG_ARCH_GPI
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_GPI
-# endif
-# define machine_is_gpi() (machine_arch_type == MACH_TYPE_GPI)
-#else
-# define machine_is_gpi() (0)
-#endif
-
#ifdef CONFIG_ARCH_SMDK2410
# ifdef machine_arch_type
# undef machine_arch_type
@@ -5617,78 +1645,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_smdk2410() (0)
#endif
-#ifdef CONFIG_ARCH_I519
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_I519
-# endif
-# define machine_is_i519() (machine_arch_type == MACH_TYPE_I519)
-#else
-# define machine_is_i519() (0)
-#endif
-
-#ifdef CONFIG_SA1100_NEXIO
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_NEXIO
-# endif
-# define machine_is_nexio() (machine_arch_type == MACH_TYPE_NEXIO)
-#else
-# define machine_is_nexio() (0)
-#endif
-
-#ifdef CONFIG_SA1100_BITBOX
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_BITBOX
-# endif
-# define machine_is_bitbox() (machine_arch_type == MACH_TYPE_BITBOX)
-#else
-# define machine_is_bitbox() (0)
-#endif
-
-#ifdef CONFIG_SA1100_G200
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_G200
-# endif
-# define machine_is_g200() (machine_arch_type == MACH_TYPE_G200)
-#else
-# define machine_is_g200() (0)
-#endif
-
-#ifdef CONFIG_SA1100_GILL
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_GILL
-# endif
-# define machine_is_gill() (machine_arch_type == MACH_TYPE_GILL)
-#else
-# define machine_is_gill() (0)
-#endif
-
-#ifdef CONFIG_ARCH_PXA_MERCURY
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_PXA_MERCURY
-# endif
-# define machine_is_pxa_mercury() (machine_arch_type == MACH_TYPE_PXA_MERCURY)
-#else
-# define machine_is_pxa_mercury() (0)
-#endif
-
#ifdef CONFIG_ARCH_CEIVA
# ifdef machine_arch_type
# undef machine_arch_type
@@ -5701,210 +1657,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_ceiva() (0)
#endif
-#ifdef CONFIG_SA1100_FRET
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_FRET
-# endif
-# define machine_is_fret() (machine_arch_type == MACH_TYPE_FRET)
-#else
-# define machine_is_fret() (0)
-#endif
-
-#ifdef CONFIG_SA1100_EMAILPHONE
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_EMAILPHONE
-# endif
-# define machine_is_emailphone() (machine_arch_type == MACH_TYPE_EMAILPHONE)
-#else
-# define machine_is_emailphone() (0)
-#endif
-
-#ifdef CONFIG_ARCH_H3900
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_H3900
-# endif
-# define machine_is_h3900() (machine_arch_type == MACH_TYPE_H3900)
-#else
-# define machine_is_h3900() (0)
-#endif
-
-#ifdef CONFIG_ARCH_PXA1
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_PXA1
-# endif
-# define machine_is_pxa1() (machine_arch_type == MACH_TYPE_PXA1)
-#else
-# define machine_is_pxa1() (0)
-#endif
-
-#ifdef CONFIG_SA1100_KOAN369
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_KOAN369
-# endif
-# define machine_is_koan369() (machine_arch_type == MACH_TYPE_KOAN369)
-#else
-# define machine_is_koan369() (0)
-#endif
-
-#ifdef CONFIG_ARCH_COGENT
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_COGENT
-# endif
-# define machine_is_cogent() (machine_arch_type == MACH_TYPE_COGENT)
-#else
-# define machine_is_cogent() (0)
-#endif
-
-#ifdef CONFIG_ARCH_ESL_SIMPUTER
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ESL_SIMPUTER
-# endif
-# define machine_is_esl_simputer() (machine_arch_type == MACH_TYPE_ESL_SIMPUTER)
-#else
-# define machine_is_esl_simputer() (0)
-#endif
-
-#ifdef CONFIG_ARCH_ESL_SIMPUTER_CLR
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ESL_SIMPUTER_CLR
-# endif
-# define machine_is_esl_simputer_clr() (machine_arch_type == MACH_TYPE_ESL_SIMPUTER_CLR)
-#else
-# define machine_is_esl_simputer_clr() (0)
-#endif
-
-#ifdef CONFIG_ARCH_ESL_SIMPUTER_BW
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ESL_SIMPUTER_BW
-# endif
-# define machine_is_esl_simputer_bw() (machine_arch_type == MACH_TYPE_ESL_SIMPUTER_BW)
-#else
-# define machine_is_esl_simputer_bw() (0)
-#endif
-
-#ifdef CONFIG_ARCH_HHP_CRADLE
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_HHP_CRADLE
-# endif
-# define machine_is_hhp_cradle() (machine_arch_type == MACH_TYPE_HHP_CRADLE)
-#else
-# define machine_is_hhp_cradle() (0)
-#endif
-
-#ifdef CONFIG_ARCH_HE500
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_HE500
-# endif
-# define machine_is_he500() (machine_arch_type == MACH_TYPE_HE500)
-#else
-# define machine_is_he500() (0)
-#endif
-
-#ifdef CONFIG_SA1100_INHANDELF2
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_INHANDELF2
-# endif
-# define machine_is_inhandelf2() (machine_arch_type == MACH_TYPE_INHANDELF2)
-#else
-# define machine_is_inhandelf2() (0)
-#endif
-
-#ifdef CONFIG_SA1100_INHANDFTIP
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_INHANDFTIP
-# endif
-# define machine_is_inhandftip() (machine_arch_type == MACH_TYPE_INHANDFTIP)
-#else
-# define machine_is_inhandftip() (0)
-#endif
-
-#ifdef CONFIG_SA1100_DNP1110
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_DNP1110
-# endif
-# define machine_is_dnp1110() (machine_arch_type == MACH_TYPE_DNP1110)
-#else
-# define machine_is_dnp1110() (0)
-#endif
-
-#ifdef CONFIG_SA1100_PNP1110
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_PNP1110
-# endif
-# define machine_is_pnp1110() (machine_arch_type == MACH_TYPE_PNP1110)
-#else
-# define machine_is_pnp1110() (0)
-#endif
-
-#ifdef CONFIG_ARCH_CSB226
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CSB226
-# endif
-# define machine_is_csb226() (machine_arch_type == MACH_TYPE_CSB226)
-#else
-# define machine_is_csb226() (0)
-#endif
-
-#ifdef CONFIG_SA1100_ARNOLD
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ARNOLD
-# endif
-# define machine_is_arnold() (machine_arch_type == MACH_TYPE_ARNOLD)
-#else
-# define machine_is_arnold() (0)
-#endif
-
#ifdef CONFIG_MACH_VOICEBLUE
# ifdef machine_arch_type
# undef machine_arch_type
@@ -5917,18 +1669,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_voiceblue() (0)
#endif
-#ifdef CONFIG_ARCH_JZ8028
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_JZ8028
-# endif
-# define machine_is_jz8028() (machine_arch_type == MACH_TYPE_JZ8028)
-#else
-# define machine_is_jz8028() (0)
-#endif
-
#ifdef CONFIG_ARCH_H5400
# ifdef machine_arch_type
# undef machine_arch_type
@@ -5941,162 +1681,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_h5400() (0)
#endif
-#ifdef CONFIG_SA1100_FORTE
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_FORTE
-# endif
-# define machine_is_forte() (machine_arch_type == MACH_TYPE_FORTE)
-#else
-# define machine_is_forte() (0)
-#endif
-
-#ifdef CONFIG_SA1100_ACAM
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ACAM
-# endif
-# define machine_is_acam() (machine_arch_type == MACH_TYPE_ACAM)
-#else
-# define machine_is_acam() (0)
-#endif
-
-#ifdef CONFIG_SA1100_ABOX
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ABOX
-# endif
-# define machine_is_abox() (machine_arch_type == MACH_TYPE_ABOX)
-#else
-# define machine_is_abox() (0)
-#endif
-
-#ifdef CONFIG_ARCH_ATMEL
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ATMEL
-# endif
-# define machine_is_atmel() (machine_arch_type == MACH_TYPE_ATMEL)
-#else
-# define machine_is_atmel() (0)
-#endif
-
-#ifdef CONFIG_ARCH_SITSANG
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SITSANG
-# endif
-# define machine_is_sitsang() (machine_arch_type == MACH_TYPE_SITSANG)
-#else
-# define machine_is_sitsang() (0)
-#endif
-
-#ifdef CONFIG_SA1100_CPU1110LCDNET
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CPU1110LCDNET
-# endif
-# define machine_is_cpu1110lcdnet() (machine_arch_type == MACH_TYPE_CPU1110LCDNET)
-#else
-# define machine_is_cpu1110lcdnet() (0)
-#endif
-
-#ifdef CONFIG_ARCH_MPL_VCMA9
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MPL_VCMA9
-# endif
-# define machine_is_mpl_vcma9() (machine_arch_type == MACH_TYPE_MPL_VCMA9)
-#else
-# define machine_is_mpl_vcma9() (0)
-#endif
-
-#ifdef CONFIG_ARCH_OPUS_A1
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_OPUS_A1
-# endif
-# define machine_is_opus_a1() (machine_arch_type == MACH_TYPE_OPUS_A1)
-#else
-# define machine_is_opus_a1() (0)
-#endif
-
-#ifdef CONFIG_ARCH_DAYTONA
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_DAYTONA
-# endif
-# define machine_is_daytona() (machine_arch_type == MACH_TYPE_DAYTONA)
-#else
-# define machine_is_daytona() (0)
-#endif
-
-#ifdef CONFIG_SA1100_KILLBEAR
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_KILLBEAR
-# endif
-# define machine_is_killbear() (machine_arch_type == MACH_TYPE_KILLBEAR)
-#else
-# define machine_is_killbear() (0)
-#endif
-
-#ifdef CONFIG_ARCH_YOHO
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_YOHO
-# endif
-# define machine_is_yoho() (machine_arch_type == MACH_TYPE_YOHO)
-#else
-# define machine_is_yoho() (0)
-#endif
-
-#ifdef CONFIG_ARCH_JASPER
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_JASPER
-# endif
-# define machine_is_jasper() (machine_arch_type == MACH_TYPE_JASPER)
-#else
-# define machine_is_jasper() (0)
-#endif
-
-#ifdef CONFIG_ARCH_DSC25
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_DSC25
-# endif
-# define machine_is_dsc25() (machine_arch_type == MACH_TYPE_DSC25)
-#else
-# define machine_is_dsc25() (0)
-#endif
-
#ifdef CONFIG_MACH_OMAP_INNOVATOR
# ifdef machine_arch_type
# undef machine_arch_type
@@ -6109,90 +1693,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_omap_innovator() (0)
#endif
-#ifdef CONFIG_ARCH_RAMSES
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_RAMSES
-# endif
-# define machine_is_mnci() (machine_arch_type == MACH_TYPE_RAMSES)
-#else
-# define machine_is_mnci() (0)
-#endif
-
-#ifdef CONFIG_ARCH_S28X
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_S28X
-# endif
-# define machine_is_s28x() (machine_arch_type == MACH_TYPE_S28X)
-#else
-# define machine_is_s28x() (0)
-#endif
-
-#ifdef CONFIG_ARCH_MPORT3
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MPORT3
-# endif
-# define machine_is_mport3() (machine_arch_type == MACH_TYPE_MPORT3)
-#else
-# define machine_is_mport3() (0)
-#endif
-
-#ifdef CONFIG_ARCH_PXA_EAGLE250
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_PXA_EAGLE250
-# endif
-# define machine_is_pxa_eagle250() (machine_arch_type == MACH_TYPE_PXA_EAGLE250)
-#else
-# define machine_is_pxa_eagle250() (0)
-#endif
-
-#ifdef CONFIG_ARCH_PDB
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_PDB
-# endif
-# define machine_is_pdb() (machine_arch_type == MACH_TYPE_PDB)
-#else
-# define machine_is_pdb() (0)
-#endif
-
-#ifdef CONFIG_SA1100_BLUE_2G
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_BLUE_2G
-# endif
-# define machine_is_blue_2g() (machine_arch_type == MACH_TYPE_BLUE_2G)
-#else
-# define machine_is_blue_2g() (0)
-#endif
-
-#ifdef CONFIG_SA1100_BLUEARCH
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_BLUEARCH
-# endif
-# define machine_is_bluearch() (machine_arch_type == MACH_TYPE_BLUEARCH)
-#else
-# define machine_is_bluearch() (0)
-#endif
-
#ifdef CONFIG_ARCH_IXDP2400
# ifdef machine_arch_type
# undef machine_arch_type
@@ -6217,18 +1717,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_ixdp2800() (0)
#endif
-#ifdef CONFIG_SA1100_EXPLORER
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_EXPLORER
-# endif
-# define machine_is_explorer() (machine_arch_type == MACH_TYPE_EXPLORER)
-#else
-# define machine_is_explorer() (0)
-#endif
-
#ifdef CONFIG_ARCH_IXDP425
# ifdef machine_arch_type
# undef machine_arch_type
@@ -6241,102 +1729,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_ixdp425() (0)
#endif
-#ifdef CONFIG_ARCH_CHIMP
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CHIMP
-# endif
-# define machine_is_chimp() (machine_arch_type == MACH_TYPE_CHIMP)
-#else
-# define machine_is_chimp() (0)
-#endif
-
-#ifdef CONFIG_ARCH_STORK_NEST
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_STORK_NEST
-# endif
-# define machine_is_stork_nest() (machine_arch_type == MACH_TYPE_STORK_NEST)
-#else
-# define machine_is_stork_nest() (0)
-#endif
-
-#ifdef CONFIG_ARCH_STORK_EGG
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_STORK_EGG
-# endif
-# define machine_is_stork_egg() (machine_arch_type == MACH_TYPE_STORK_EGG)
-#else
-# define machine_is_stork_egg() (0)
-#endif
-
-#ifdef CONFIG_SA1100_WISMO
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_WISMO
-# endif
-# define machine_is_wismo() (machine_arch_type == MACH_TYPE_WISMO)
-#else
-# define machine_is_wismo() (0)
-#endif
-
-#ifdef CONFIG_ARCH_EZLINX
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_EZLINX
-# endif
-# define machine_is_ezlinx() (machine_arch_type == MACH_TYPE_EZLINX)
-#else
-# define machine_is_ezlinx() (0)
-#endif
-
-#ifdef CONFIG_ARCH_AT91RM9200
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_AT91RM9200
-# endif
-# define machine_is_at91rm9200() (machine_arch_type == MACH_TYPE_AT91RM9200)
-#else
-# define machine_is_at91rm9200() (0)
-#endif
-
-#ifdef CONFIG_ARCH_ADTECH_ORION
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ADTECH_ORION
-# endif
-# define machine_is_adtech_orion() (machine_arch_type == MACH_TYPE_ADTECH_ORION)
-#else
-# define machine_is_adtech_orion() (0)
-#endif
-
-#ifdef CONFIG_ARCH_NEPTUNE
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_NEPTUNE
-# endif
-# define machine_is_neptune() (machine_arch_type == MACH_TYPE_NEPTUNE)
-#else
-# define machine_is_neptune() (0)
-#endif
-
#ifdef CONFIG_SA1100_HACKKIT
# ifdef machine_arch_type
# undef machine_arch_type
@@ -6349,66 +1741,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_hackkit() (0)
#endif
-#ifdef CONFIG_ARCH_PXA_WINS30
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_PXA_WINS30
-# endif
-# define machine_is_pxa_wins30() (machine_arch_type == MACH_TYPE_PXA_WINS30)
-#else
-# define machine_is_pxa_wins30() (0)
-#endif
-
-#ifdef CONFIG_SA1100_LAVINNA
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_LAVINNA
-# endif
-# define machine_is_lavinna() (machine_arch_type == MACH_TYPE_LAVINNA)
-#else
-# define machine_is_lavinna() (0)
-#endif
-
-#ifdef CONFIG_ARCH_PXA_UENGINE
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_PXA_UENGINE
-# endif
-# define machine_is_pxa_uengine() (machine_arch_type == MACH_TYPE_PXA_UENGINE)
-#else
-# define machine_is_pxa_uengine() (0)
-#endif
-
-#ifdef CONFIG_ARCH_INNOKOM
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_INNOKOM
-# endif
-# define machine_is_innokom() (machine_arch_type == MACH_TYPE_INNOKOM)
-#else
-# define machine_is_innokom() (0)
-#endif
-
-#ifdef CONFIG_ARCH_BMS
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_BMS
-# endif
-# define machine_is_bms() (machine_arch_type == MACH_TYPE_BMS)
-#else
-# define machine_is_bms() (0)
-#endif
-
#ifdef CONFIG_ARCH_IXCDP1100
# ifdef machine_arch_type
# undef machine_arch_type
@@ -6421,18 +1753,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_ixcdp1100() (0)
#endif
-#ifdef CONFIG_ARCH_PRPMC1100
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_PRPMC1100
-# endif
-# define machine_is_prpmc1100() (machine_arch_type == MACH_TYPE_PRPMC1100)
-#else
-# define machine_is_prpmc1100() (0)
-#endif
-
#ifdef CONFIG_ARCH_AT91RM9200DK
# ifdef machine_arch_type
# undef machine_arch_type
@@ -6445,150 +1765,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_at91rm9200dk() (0)
#endif
-#ifdef CONFIG_ARCH_ARMSTICK
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ARMSTICK
-# endif
-# define machine_is_armstick() (machine_arch_type == MACH_TYPE_ARMSTICK)
-#else
-# define machine_is_armstick() (0)
-#endif
-
-#ifdef CONFIG_ARCH_ARMONIE
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ARMONIE
-# endif
-# define machine_is_armonie() (machine_arch_type == MACH_TYPE_ARMONIE)
-#else
-# define machine_is_armonie() (0)
-#endif
-
-#ifdef CONFIG_ARCH_MPORT1
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MPORT1
-# endif
-# define machine_is_mport1() (machine_arch_type == MACH_TYPE_MPORT1)
-#else
-# define machine_is_mport1() (0)
-#endif
-
-#ifdef CONFIG_ARCH_S3C5410
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_S3C5410
-# endif
-# define machine_is_s3c5410() (machine_arch_type == MACH_TYPE_S3C5410)
-#else
-# define machine_is_s3c5410() (0)
-#endif
-
-#ifdef CONFIG_ARCH_ZCP320A
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ZCP320A
-# endif
-# define machine_is_zcp320a() (machine_arch_type == MACH_TYPE_ZCP320A)
-#else
-# define machine_is_zcp320a() (0)
-#endif
-
-#ifdef CONFIG_ARCH_I_BOX
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_I_BOX
-# endif
-# define machine_is_i_box() (machine_arch_type == MACH_TYPE_I_BOX)
-#else
-# define machine_is_i_box() (0)
-#endif
-
-#ifdef CONFIG_ARCH_STLC1502
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_STLC1502
-# endif
-# define machine_is_stlc1502() (machine_arch_type == MACH_TYPE_STLC1502)
-#else
-# define machine_is_stlc1502() (0)
-#endif
-
-#ifdef CONFIG_ARCH_SIREN
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SIREN
-# endif
-# define machine_is_siren() (machine_arch_type == MACH_TYPE_SIREN)
-#else
-# define machine_is_siren() (0)
-#endif
-
-#ifdef CONFIG_ARCH_GREENLAKE
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_GREENLAKE
-# endif
-# define machine_is_greenlake() (machine_arch_type == MACH_TYPE_GREENLAKE)
-#else
-# define machine_is_greenlake() (0)
-#endif
-
-#ifdef CONFIG_ARCH_ARGUS
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ARGUS
-# endif
-# define machine_is_argus() (machine_arch_type == MACH_TYPE_ARGUS)
-#else
-# define machine_is_argus() (0)
-#endif
-
-#ifdef CONFIG_SA1100_COMBADGE
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_COMBADGE
-# endif
-# define machine_is_combadge() (machine_arch_type == MACH_TYPE_COMBADGE)
-#else
-# define machine_is_combadge() (0)
-#endif
-
-#ifdef CONFIG_ARCH_ROKEPXA
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ROKEPXA
-# endif
-# define machine_is_rokepxa() (machine_arch_type == MACH_TYPE_ROKEPXA)
-#else
-# define machine_is_rokepxa() (0)
-#endif
-
#ifdef CONFIG_ARCH_CINTEGRATOR
# ifdef machine_arch_type
# undef machine_arch_type
@@ -6601,90 +1777,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_cintegrator() (0)
#endif
-#ifdef CONFIG_ARCH_GUIDEA07
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_GUIDEA07
-# endif
-# define machine_is_guidea07() (machine_arch_type == MACH_TYPE_GUIDEA07)
-#else
-# define machine_is_guidea07() (0)
-#endif
-
-#ifdef CONFIG_ARCH_TAT257
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_TAT257
-# endif
-# define machine_is_tat257() (machine_arch_type == MACH_TYPE_TAT257)
-#else
-# define machine_is_tat257() (0)
-#endif
-
-#ifdef CONFIG_ARCH_IGP2425
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_IGP2425
-# endif
-# define machine_is_igp2425() (machine_arch_type == MACH_TYPE_IGP2425)
-#else
-# define machine_is_igp2425() (0)
-#endif
-
-#ifdef CONFIG_ARCH_BLUEGRAMMA
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_BLUEGRAMMA
-# endif
-# define machine_is_bluegrama() (machine_arch_type == MACH_TYPE_BLUEGRAMMA)
-#else
-# define machine_is_bluegrama() (0)
-#endif
-
-#ifdef CONFIG_ARCH_IPOD
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_IPOD
-# endif
-# define machine_is_ipod() (machine_arch_type == MACH_TYPE_IPOD)
-#else
-# define machine_is_ipod() (0)
-#endif
-
-#ifdef CONFIG_ARCH_ADSBITSYX
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ADSBITSYX
-# endif
-# define machine_is_adsbitsyx() (machine_arch_type == MACH_TYPE_ADSBITSYX)
-#else
-# define machine_is_adsbitsyx() (0)
-#endif
-
-#ifdef CONFIG_ARCH_TRIZEPS2
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_TRIZEPS2
-# endif
-# define machine_is_trizeps2() (machine_arch_type == MACH_TYPE_TRIZEPS2)
-#else
-# define machine_is_trizeps2() (0)
-#endif
-
#ifdef CONFIG_ARCH_VIPER
# ifdef machine_arch_type
# undef machine_arch_type
@@ -6697,78 +1789,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_viper() (0)
#endif
-#ifdef CONFIG_SA1100_ADSBITSYPLUS
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ADSBITSYPLUS
-# endif
-# define machine_is_adsbitsyplus() (machine_arch_type == MACH_TYPE_ADSBITSYPLUS)
-#else
-# define machine_is_adsbitsyplus() (0)
-#endif
-
-#ifdef CONFIG_SA1100_ADSAGC
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ADSAGC
-# endif
-# define machine_is_adsagc() (machine_arch_type == MACH_TYPE_ADSAGC)
-#else
-# define machine_is_adsagc() (0)
-#endif
-
-#ifdef CONFIG_ARCH_STP7312
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_STP7312
-# endif
-# define machine_is_stp7312() (machine_arch_type == MACH_TYPE_STP7312)
-#else
-# define machine_is_stp7312() (0)
-#endif
-
-#ifdef CONFIG_MACH_NX_PHNX
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_NX_PHNX
-# endif
-# define machine_is_nx_phnx() (machine_arch_type == MACH_TYPE_NX_PHNX)
-#else
-# define machine_is_nx_phnx() (0)
-#endif
-
-#ifdef CONFIG_ARCH_WEP_EP250
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_WEP_EP250
-# endif
-# define machine_is_wep_ep250() (machine_arch_type == MACH_TYPE_WEP_EP250)
-#else
-# define machine_is_wep_ep250() (0)
-#endif
-
-#ifdef CONFIG_ARCH_INHANDELF3
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_INHANDELF3
-# endif
-# define machine_is_inhandelf3() (machine_arch_type == MACH_TYPE_INHANDELF3)
-#else
-# define machine_is_inhandelf3() (0)
-#endif
-
#ifdef CONFIG_ARCH_ADI_COYOTE
# ifdef machine_arch_type
# undef machine_arch_type
@@ -6781,102 +1801,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_adi_coyote() (0)
#endif
-#ifdef CONFIG_ARCH_IYONIX
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_IYONIX
-# endif
-# define machine_is_iyonix() (machine_arch_type == MACH_TYPE_IYONIX)
-#else
-# define machine_is_iyonix() (0)
-#endif
-
-#ifdef CONFIG_ARCH_DAMICAM_SA1110
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_DAMICAM_SA1110
-# endif
-# define machine_is_damicam1() (machine_arch_type == MACH_TYPE_DAMICAM_SA1110)
-#else
-# define machine_is_damicam1() (0)
-#endif
-
-#ifdef CONFIG_ARCH_MEG03
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MEG03
-# endif
-# define machine_is_meg03() (machine_arch_type == MACH_TYPE_MEG03)
-#else
-# define machine_is_meg03() (0)
-#endif
-
-#ifdef CONFIG_ARCH_PXA_WHITECHAPEL
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_PXA_WHITECHAPEL
-# endif
-# define machine_is_pxa_whitechapel() (machine_arch_type == MACH_TYPE_PXA_WHITECHAPEL)
-#else
-# define machine_is_pxa_whitechapel() (0)
-#endif
-
-#ifdef CONFIG_ARCH_NWSC
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_NWSC
-# endif
-# define machine_is_nwsc() (machine_arch_type == MACH_TYPE_NWSC)
-#else
-# define machine_is_nwsc() (0)
-#endif
-
-#ifdef CONFIG_ARCH_NWLARM
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_NWLARM
-# endif
-# define machine_is_nwlarm() (machine_arch_type == MACH_TYPE_NWLARM)
-#else
-# define machine_is_nwlarm() (0)
-#endif
-
-#ifdef CONFIG_ARCH_IXP425_MGUARD
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_IXP425_MGUARD
-# endif
-# define machine_is_ixp425_mguard() (machine_arch_type == MACH_TYPE_IXP425_MGUARD)
-#else
-# define machine_is_ixp425_mguard() (0)
-#endif
-
-#ifdef CONFIG_ARCH_PXA_NETDCU4
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_PXA_NETDCU4
-# endif
-# define machine_is_pxa_netdcu4() (machine_arch_type == MACH_TYPE_PXA_NETDCU4)
-#else
-# define machine_is_pxa_netdcu4() (0)
-#endif
-
#ifdef CONFIG_ARCH_IXDP2401
# ifdef machine_arch_type
# undef machine_arch_type
@@ -6901,318 +1825,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_ixdp2801() (0)
#endif
-#ifdef CONFIG_ARCH_ZODIAC
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ZODIAC
-# endif
-# define machine_is_zodiac() (machine_arch_type == MACH_TYPE_ZODIAC)
-#else
-# define machine_is_zodiac() (0)
-#endif
-
-#ifdef CONFIG_ARCH_ARMMODUL
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ARMMODUL
-# endif
-# define machine_is_armmodul() (machine_arch_type == MACH_TYPE_ARMMODUL)
-#else
-# define machine_is_armmodul() (0)
-#endif
-
-#ifdef CONFIG_SA1100_KETOP
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_KETOP
-# endif
-# define machine_is_ketop() (machine_arch_type == MACH_TYPE_KETOP)
-#else
-# define machine_is_ketop() (0)
-#endif
-
-#ifdef CONFIG_ARCH_AV7200
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_AV7200
-# endif
-# define machine_is_av7200() (machine_arch_type == MACH_TYPE_AV7200)
-#else
-# define machine_is_av7200() (0)
-#endif
-
-#ifdef CONFIG_ARCH_ARCH_TI925
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ARCH_TI925
-# endif
-# define machine_is_arch_ti925() (machine_arch_type == MACH_TYPE_ARCH_TI925)
-#else
-# define machine_is_arch_ti925() (0)
-#endif
-
-#ifdef CONFIG_ARCH_ACQ200
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ACQ200
-# endif
-# define machine_is_acq200() (machine_arch_type == MACH_TYPE_ACQ200)
-#else
-# define machine_is_acq200() (0)
-#endif
-
-#ifdef CONFIG_SA1100_PT_DAFIT
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_PT_DAFIT
-# endif
-# define machine_is_pt_dafit() (machine_arch_type == MACH_TYPE_PT_DAFIT)
-#else
-# define machine_is_pt_dafit() (0)
-#endif
-
-#ifdef CONFIG_ARCH_IHBA
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_IHBA
-# endif
-# define machine_is_ihba() (machine_arch_type == MACH_TYPE_IHBA)
-#else
-# define machine_is_ihba() (0)
-#endif
-
-#ifdef CONFIG_ARCH_QUINQUE
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_QUINQUE
-# endif
-# define machine_is_quinque() (machine_arch_type == MACH_TYPE_QUINQUE)
-#else
-# define machine_is_quinque() (0)
-#endif
-
-#ifdef CONFIG_ARCH_NIMBRAONE
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_NIMBRAONE
-# endif
-# define machine_is_nimbraone() (machine_arch_type == MACH_TYPE_NIMBRAONE)
-#else
-# define machine_is_nimbraone() (0)
-#endif
-
-#ifdef CONFIG_ARCH_NIMBRA29X
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_NIMBRA29X
-# endif
-# define machine_is_nimbra29x() (machine_arch_type == MACH_TYPE_NIMBRA29X)
-#else
-# define machine_is_nimbra29x() (0)
-#endif
-
-#ifdef CONFIG_ARCH_NIMBRA210
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_NIMBRA210
-# endif
-# define machine_is_nimbra210() (machine_arch_type == MACH_TYPE_NIMBRA210)
-#else
-# define machine_is_nimbra210() (0)
-#endif
-
-#ifdef CONFIG_ARCH_HHP_D95XX
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_HHP_D95XX
-# endif
-# define machine_is_hhp_d95xx() (machine_arch_type == MACH_TYPE_HHP_D95XX)
-#else
-# define machine_is_hhp_d95xx() (0)
-#endif
-
-#ifdef CONFIG_ARCH_LABARM
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_LABARM
-# endif
-# define machine_is_labarm() (machine_arch_type == MACH_TYPE_LABARM)
-#else
-# define machine_is_labarm() (0)
-#endif
-
-#ifdef CONFIG_ARCH_M825XX
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_M825XX
-# endif
-# define machine_is_m825xx() (machine_arch_type == MACH_TYPE_M825XX)
-#else
-# define machine_is_m825xx() (0)
-#endif
-
-#ifdef CONFIG_SA1100_M7100
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_M7100
-# endif
-# define machine_is_m7100() (machine_arch_type == MACH_TYPE_M7100)
-#else
-# define machine_is_m7100() (0)
-#endif
-
-#ifdef CONFIG_ARCH_NIPC2
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_NIPC2
-# endif
-# define machine_is_nipc2() (machine_arch_type == MACH_TYPE_NIPC2)
-#else
-# define machine_is_nipc2() (0)
-#endif
-
-#ifdef CONFIG_ARCH_FU7202
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_FU7202
-# endif
-# define machine_is_fu7202() (machine_arch_type == MACH_TYPE_FU7202)
-#else
-# define machine_is_fu7202() (0)
-#endif
-
-#ifdef CONFIG_ARCH_ADSAGX
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ADSAGX
-# endif
-# define machine_is_adsagx() (machine_arch_type == MACH_TYPE_ADSAGX)
-#else
-# define machine_is_adsagx() (0)
-#endif
-
-#ifdef CONFIG_ARCH_PXA_POOH
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_PXA_POOH
-# endif
-# define machine_is_pxa_pooh() (machine_arch_type == MACH_TYPE_PXA_POOH)
-#else
-# define machine_is_pxa_pooh() (0)
-#endif
-
-#ifdef CONFIG_ARCH_BANDON
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_BANDON
-# endif
-# define machine_is_bandon() (machine_arch_type == MACH_TYPE_BANDON)
-#else
-# define machine_is_bandon() (0)
-#endif
-
-#ifdef CONFIG_ARCH_PCM7210
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_PCM7210
-# endif
-# define machine_is_pcm7210() (machine_arch_type == MACH_TYPE_PCM7210)
-#else
-# define machine_is_pcm7210() (0)
-#endif
-
-#ifdef CONFIG_ARCH_NMS9200
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_NMS9200
-# endif
-# define machine_is_nms9200() (machine_arch_type == MACH_TYPE_NMS9200)
-#else
-# define machine_is_nms9200() (0)
-#endif
-
-#ifdef CONFIG_ARCH_LOGODL
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_LOGODL
-# endif
-# define machine_is_logodl() (machine_arch_type == MACH_TYPE_LOGODL)
-#else
-# define machine_is_logodl() (0)
-#endif
-
-#ifdef CONFIG_SA1100_M7140
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_M7140
-# endif
-# define machine_is_m7140() (machine_arch_type == MACH_TYPE_M7140)
-#else
-# define machine_is_m7140() (0)
-#endif
-
-#ifdef CONFIG_ARCH_KOREBOT
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_KOREBOT
-# endif
-# define machine_is_korebot() (machine_arch_type == MACH_TYPE_KOREBOT)
-#else
-# define machine_is_korebot() (0)
-#endif
-
#ifdef CONFIG_ARCH_IQ31244
# ifdef machine_arch_type
# undef machine_arch_type
@@ -7225,42 +1837,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_iq31244() (0)
#endif
-#ifdef CONFIG_SA1100_KOAN393
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_KOAN393
-# endif
-# define machine_is_koan393() (machine_arch_type == MACH_TYPE_KOAN393)
-#else
-# define machine_is_koan393() (0)
-#endif
-
-#ifdef CONFIG_ARCH_INHANDFTIP3
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_INHANDFTIP3
-# endif
-# define machine_is_inhandftip3() (machine_arch_type == MACH_TYPE_INHANDFTIP3)
-#else
-# define machine_is_inhandftip3() (0)
-#endif
-
-#ifdef CONFIG_ARCH_GONZO
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_GONZO
-# endif
-# define machine_is_gonzo() (machine_arch_type == MACH_TYPE_GONZO)
-#else
-# define machine_is_gonzo() (0)
-#endif
-
#ifdef CONFIG_ARCH_BAST
# ifdef machine_arch_type
# undef machine_arch_type
@@ -7273,186 +1849,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_bast() (0)
#endif
-#ifdef CONFIG_ARCH_SCANPASS
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SCANPASS
-# endif
-# define machine_is_scanpass() (machine_arch_type == MACH_TYPE_SCANPASS)
-#else
-# define machine_is_scanpass() (0)
-#endif
-
-#ifdef CONFIG_ARCH_EP7312_POOH
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_EP7312_POOH
-# endif
-# define machine_is_ep7312_pooh() (machine_arch_type == MACH_TYPE_EP7312_POOH)
-#else
-# define machine_is_ep7312_pooh() (0)
-#endif
-
-#ifdef CONFIG_ARCH_TA7S
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_TA7S
-# endif
-# define machine_is_ta7s() (machine_arch_type == MACH_TYPE_TA7S)
-#else
-# define machine_is_ta7s() (0)
-#endif
-
-#ifdef CONFIG_ARCH_TA7V
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_TA7V
-# endif
-# define machine_is_ta7v() (machine_arch_type == MACH_TYPE_TA7V)
-#else
-# define machine_is_ta7v() (0)
-#endif
-
-#ifdef CONFIG_SA1100_ICARUS
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ICARUS
-# endif
-# define machine_is_icarus() (machine_arch_type == MACH_TYPE_ICARUS)
-#else
-# define machine_is_icarus() (0)
-#endif
-
-#ifdef CONFIG_ARCH_H1900
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_H1900
-# endif
-# define machine_is_h1900() (machine_arch_type == MACH_TYPE_H1900)
-#else
-# define machine_is_h1900() (0)
-#endif
-
-#ifdef CONFIG_SA1100_GEMINI
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_GEMINI
-# endif
-# define machine_is_gemini() (machine_arch_type == MACH_TYPE_GEMINI)
-#else
-# define machine_is_gemini() (0)
-#endif
-
-#ifdef CONFIG_ARCH_AXIM
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_AXIM
-# endif
-# define machine_is_axim() (machine_arch_type == MACH_TYPE_AXIM)
-#else
-# define machine_is_axim() (0)
-#endif
-
-#ifdef CONFIG_ARCH_AUDIOTRON
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_AUDIOTRON
-# endif
-# define machine_is_audiotron() (machine_arch_type == MACH_TYPE_AUDIOTRON)
-#else
-# define machine_is_audiotron() (0)
-#endif
-
-#ifdef CONFIG_ARCH_H2200
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_H2200
-# endif
-# define machine_is_h2200() (machine_arch_type == MACH_TYPE_H2200)
-#else
-# define machine_is_h2200() (0)
-#endif
-
-#ifdef CONFIG_ARCH_LOOX600
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_LOOX600
-# endif
-# define machine_is_loox600() (machine_arch_type == MACH_TYPE_LOOX600)
-#else
-# define machine_is_loox600() (0)
-#endif
-
-#ifdef CONFIG_ARCH_NIOP
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_NIOP
-# endif
-# define machine_is_niop() (machine_arch_type == MACH_TYPE_NIOP)
-#else
-# define machine_is_niop() (0)
-#endif
-
-#ifdef CONFIG_ARCH_DM310
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_DM310
-# endif
-# define machine_is_dm310() (machine_arch_type == MACH_TYPE_DM310)
-#else
-# define machine_is_dm310() (0)
-#endif
-
-#ifdef CONFIG_ARCH_SEEDPXA_C2
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SEEDPXA_C2
-# endif
-# define machine_is_seedpxa_c2() (machine_arch_type == MACH_TYPE_SEEDPXA_C2)
-#else
-# define machine_is_seedpxa_c2() (0)
-#endif
-
-#ifdef CONFIG_ARCH_IXP4XX_MGUARD_PCI
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_IXP4XX_MGUARD_PCI
-# endif
-# define machine_is_ixp4xx_mguardpci() (machine_arch_type == MACH_TYPE_IXP4XX_MGUARD_PCI)
-#else
-# define machine_is_ixp4xx_mguardpci() (0)
-#endif
-
#ifdef CONFIG_ARCH_H1940
# ifdef machine_arch_type
# undef machine_arch_type
@@ -7465,102 +1861,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_h1940() (0)
#endif
-#ifdef CONFIG_ARCH_SCORPIO
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SCORPIO
-# endif
-# define machine_is_scorpio() (machine_arch_type == MACH_TYPE_SCORPIO)
-#else
-# define machine_is_scorpio() (0)
-#endif
-
-#ifdef CONFIG_ARCH_VIVA
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_VIVA
-# endif
-# define machine_is_viva() (machine_arch_type == MACH_TYPE_VIVA)
-#else
-# define machine_is_viva() (0)
-#endif
-
-#ifdef CONFIG_ARCH_PXA_XCARD
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_PXA_XCARD
-# endif
-# define machine_is_pxa_xcard() (machine_arch_type == MACH_TYPE_PXA_XCARD)
-#else
-# define machine_is_pxa_xcard() (0)
-#endif
-
-#ifdef CONFIG_ARCH_CSB335
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CSB335
-# endif
-# define machine_is_csb335() (machine_arch_type == MACH_TYPE_CSB335)
-#else
-# define machine_is_csb335() (0)
-#endif
-
-#ifdef CONFIG_ARCH_IXRD425
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_IXRD425
-# endif
-# define machine_is_ixrd425() (machine_arch_type == MACH_TYPE_IXRD425)
-#else
-# define machine_is_ixrd425() (0)
-#endif
-
-#ifdef CONFIG_ARCH_IQ80315
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_IQ80315
-# endif
-# define machine_is_iq80315() (machine_arch_type == MACH_TYPE_IQ80315)
-#else
-# define machine_is_iq80315() (0)
-#endif
-
-#ifdef CONFIG_ARCH_NMP7312
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_NMP7312
-# endif
-# define machine_is_nmp7312() (machine_arch_type == MACH_TYPE_NMP7312)
-#else
-# define machine_is_nmp7312() (0)
-#endif
-
-#ifdef CONFIG_ARCH_CX861XX
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CX861XX
-# endif
-# define machine_is_cx861xx() (machine_arch_type == MACH_TYPE_CX861XX)
-#else
-# define machine_is_cx861xx() (0)
-#endif
-
#ifdef CONFIG_ARCH_ENP2611
# ifdef machine_arch_type
# undef machine_arch_type
@@ -7573,66 +1873,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_enp2611() (0)
#endif
-#ifdef CONFIG_SA1100_XDA
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_XDA
-# endif
-# define machine_is_xda() (machine_arch_type == MACH_TYPE_XDA)
-#else
-# define machine_is_xda() (0)
-#endif
-
-#ifdef CONFIG_ARCH_CSIR_IMS
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CSIR_IMS
-# endif
-# define machine_is_csir_ims() (machine_arch_type == MACH_TYPE_CSIR_IMS)
-#else
-# define machine_is_csir_ims() (0)
-#endif
-
-#ifdef CONFIG_ARCH_IXP421_DNAEETH
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_IXP421_DNAEETH
-# endif
-# define machine_is_ixp421_dnaeeth() (machine_arch_type == MACH_TYPE_IXP421_DNAEETH)
-#else
-# define machine_is_ixp421_dnaeeth() (0)
-#endif
-
-#ifdef CONFIG_ARCH_POCKETSERV9200
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_POCKETSERV9200
-# endif
-# define machine_is_pocketserv9200() (machine_arch_type == MACH_TYPE_POCKETSERV9200)
-#else
-# define machine_is_pocketserv9200() (0)
-#endif
-
-#ifdef CONFIG_ARCH_TOTO
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_TOTO
-# endif
-# define machine_is_toto() (machine_arch_type == MACH_TYPE_TOTO)
-#else
-# define machine_is_toto() (0)
-#endif
-
#ifdef CONFIG_ARCH_S3C2440
# ifdef machine_arch_type
# undef machine_arch_type
@@ -7645,126 +1885,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_s3c2440() (0)
#endif
-#ifdef CONFIG_ARCH_KS8695P
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_KS8695P
-# endif
-# define machine_is_ks8695p() (machine_arch_type == MACH_TYPE_KS8695P)
-#else
-# define machine_is_ks8695p() (0)
-#endif
-
-#ifdef CONFIG_ARCH_SE4000
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SE4000
-# endif
-# define machine_is_se4000() (machine_arch_type == MACH_TYPE_SE4000)
-#else
-# define machine_is_se4000() (0)
-#endif
-
-#ifdef CONFIG_ARCH_QUADRICEPS
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_QUADRICEPS
-# endif
-# define machine_is_quadriceps() (machine_arch_type == MACH_TYPE_QUADRICEPS)
-#else
-# define machine_is_quadriceps() (0)
-#endif
-
-#ifdef CONFIG_ARCH_BRONCO
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_BRONCO
-# endif
-# define machine_is_bronco() (machine_arch_type == MACH_TYPE_BRONCO)
-#else
-# define machine_is_bronco() (0)
-#endif
-
-#ifdef CONFIG_ARCH_ESL_WIRELESS_TAB
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ESL_WIRELESS_TAB
-# endif
-# define machine_is_esl_wireless_tab() (machine_arch_type == MACH_TYPE_ESL_WIRELESS_TAB)
-#else
-# define machine_is_esl_wireless_tab() (0)
-#endif
-
-#ifdef CONFIG_ARCH_ESL_SOFCOMP
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ESL_SOFCOMP
-# endif
-# define machine_is_esl_sofcomp() (machine_arch_type == MACH_TYPE_ESL_SOFCOMP)
-#else
-# define machine_is_esl_sofcomp() (0)
-#endif
-
-#ifdef CONFIG_ARCH_S5C7375
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_S5C7375
-# endif
-# define machine_is_s5c7375() (machine_arch_type == MACH_TYPE_S5C7375)
-#else
-# define machine_is_s5c7375() (0)
-#endif
-
-#ifdef CONFIG_ARCH_SPEARHEAD
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SPEARHEAD
-# endif
-# define machine_is_spearhead() (machine_arch_type == MACH_TYPE_SPEARHEAD)
-#else
-# define machine_is_spearhead() (0)
-#endif
-
-#ifdef CONFIG_ARCH_PANTERA
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_PANTERA
-# endif
-# define machine_is_pantera() (machine_arch_type == MACH_TYPE_PANTERA)
-#else
-# define machine_is_pantera() (0)
-#endif
-
-#ifdef CONFIG_ARCH_PRAYOGLITE
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_PRAYOGLITE
-# endif
-# define machine_is_prayoglite() (machine_arch_type == MACH_TYPE_PRAYOGLITE)
-#else
-# define machine_is_prayoglite() (0)
-#endif
-
#ifdef CONFIG_ARCH_GUMSTIX
# ifdef machine_arch_type
# undef machine_arch_type
@@ -7777,102 +1897,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_gumstix() (0)
#endif
-#ifdef CONFIG_ARCH_RCUBE
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_RCUBE
-# endif
-# define machine_is_rcube() (machine_arch_type == MACH_TYPE_RCUBE)
-#else
-# define machine_is_rcube() (0)
-#endif
-
-#ifdef CONFIG_ARCH_REA_OLV
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_REA_OLV
-# endif
-# define machine_is_rea_olv() (machine_arch_type == MACH_TYPE_REA_OLV)
-#else
-# define machine_is_rea_olv() (0)
-#endif
-
-#ifdef CONFIG_ARCH_PXA_IPHONE
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_PXA_IPHONE
-# endif
-# define machine_is_pxa_iphone() (machine_arch_type == MACH_TYPE_PXA_IPHONE)
-#else
-# define machine_is_pxa_iphone() (0)
-#endif
-
-#ifdef CONFIG_ARCH_S3C3410
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_S3C3410
-# endif
-# define machine_is_s3c3410() (machine_arch_type == MACH_TYPE_S3C3410)
-#else
-# define machine_is_s3c3410() (0)
-#endif
-
-#ifdef CONFIG_ARCH_ESPD_4510B
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ESPD_4510B
-# endif
-# define machine_is_espd_4510b() (machine_arch_type == MACH_TYPE_ESPD_4510B)
-#else
-# define machine_is_espd_4510b() (0)
-#endif
-
-#ifdef CONFIG_ARCH_MP1X
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MP1X
-# endif
-# define machine_is_mp1x() (machine_arch_type == MACH_TYPE_MP1X)
-#else
-# define machine_is_mp1x() (0)
-#endif
-
-#ifdef CONFIG_ARCH_AT91RM9200TB
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_AT91RM9200TB
-# endif
-# define machine_is_at91rm9200tb() (machine_arch_type == MACH_TYPE_AT91RM9200TB)
-#else
-# define machine_is_at91rm9200tb() (0)
-#endif
-
-#ifdef CONFIG_ARCH_ADSVGX
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ADSVGX
-# endif
-# define machine_is_adsvgx() (machine_arch_type == MACH_TYPE_ADSVGX)
-#else
-# define machine_is_adsvgx() (0)
-#endif
-
#ifdef CONFIG_MACH_OMAP_H2
# ifdef machine_arch_type
# undef machine_arch_type
@@ -7885,18 +1909,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_omap_h2() (0)
#endif
-#ifdef CONFIG_ARCH_PELEE
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_PELEE
-# endif
-# define machine_is_pelee() (machine_arch_type == MACH_TYPE_PELEE)
-#else
-# define machine_is_pelee() (0)
-#endif
-
#ifdef CONFIG_MACH_E740
# ifdef machine_arch_type
# undef machine_arch_type
@@ -7969,102 +1981,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_lpd7a404() (0)
#endif
-#ifdef CONFIG_ARCH_FUJITSU_CAMELOT
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_FUJITSU_CAMELOT
-# endif
-# define machine_is_fujitsu_camelot() (machine_arch_type == MACH_TYPE_FUJITSU_CAMELOT)
-#else
-# define machine_is_fujitsu_camelot() (0)
-#endif
-
-#ifdef CONFIG_ARCH_JANUS2M
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_JANUS2M
-# endif
-# define machine_is_janus2m() (machine_arch_type == MACH_TYPE_JANUS2M)
-#else
-# define machine_is_janus2m() (0)
-#endif
-
-#ifdef CONFIG_MACH_EMBTF
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_EMBTF
-# endif
-# define machine_is_embtf() (machine_arch_type == MACH_TYPE_EMBTF)
-#else
-# define machine_is_embtf() (0)
-#endif
-
-#ifdef CONFIG_MACH_HPM
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_HPM
-# endif
-# define machine_is_hpm() (machine_arch_type == MACH_TYPE_HPM)
-#else
-# define machine_is_hpm() (0)
-#endif
-
-#ifdef CONFIG_MACH_SMDK2410TK
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SMDK2410TK
-# endif
-# define machine_is_smdk2410tk() (machine_arch_type == MACH_TYPE_SMDK2410TK)
-#else
-# define machine_is_smdk2410tk() (0)
-#endif
-
-#ifdef CONFIG_MACH_SMDK2410AJ
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SMDK2410AJ
-# endif
-# define machine_is_smdk2410aj() (machine_arch_type == MACH_TYPE_SMDK2410AJ)
-#else
-# define machine_is_smdk2410aj() (0)
-#endif
-
-#ifdef CONFIG_MACH_STREETRACER
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_STREETRACER
-# endif
-# define machine_is_streetracer() (machine_arch_type == MACH_TYPE_STREETRACER)
-#else
-# define machine_is_streetracer() (0)
-#endif
-
-#ifdef CONFIG_MACH_EFRAME
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_EFRAME
-# endif
-# define machine_is_eframe() (machine_arch_type == MACH_TYPE_EFRAME)
-#else
-# define machine_is_eframe() (0)
-#endif
-
#ifdef CONFIG_MACH_CSB337
# ifdef machine_arch_type
# undef machine_arch_type
@@ -8077,78 +1993,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_csb337() (0)
#endif
-#ifdef CONFIG_MACH_PXA_LARK
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_PXA_LARK
-# endif
-# define machine_is_pxa_lark() (machine_arch_type == MACH_TYPE_PXA_LARK)
-#else
-# define machine_is_pxa_lark() (0)
-#endif
-
-#ifdef CONFIG_MACH_PNP2110
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_PNP2110
-# endif
-# define machine_is_pxa_pnp2110() (machine_arch_type == MACH_TYPE_PNP2110)
-#else
-# define machine_is_pxa_pnp2110() (0)
-#endif
-
-#ifdef CONFIG_MACH_TCC72X
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_TCC72X
-# endif
-# define machine_is_tcc72x() (machine_arch_type == MACH_TYPE_TCC72X)
-#else
-# define machine_is_tcc72x() (0)
-#endif
-
-#ifdef CONFIG_MACH_ALTAIR
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ALTAIR
-# endif
-# define machine_is_altair() (machine_arch_type == MACH_TYPE_ALTAIR)
-#else
-# define machine_is_altair() (0)
-#endif
-
-#ifdef CONFIG_MACH_KC3
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_KC3
-# endif
-# define machine_is_kc3() (machine_arch_type == MACH_TYPE_KC3)
-#else
-# define machine_is_kc3() (0)
-#endif
-
-#ifdef CONFIG_MACH_SINTEFTD
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SINTEFTD
-# endif
-# define machine_is_sinteftd() (machine_arch_type == MACH_TYPE_SINTEFTD)
-#else
-# define machine_is_sinteftd() (0)
-#endif
-
#ifdef CONFIG_MACH_MAINSTONE
# ifdef machine_arch_type
# undef machine_arch_type
@@ -8161,78 +2005,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_mainstone() (0)
#endif
-#ifdef CONFIG_MACH_ADAY4X
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ADAY4X
-# endif
-# define machine_is_aday4x() (machine_arch_type == MACH_TYPE_ADAY4X)
-#else
-# define machine_is_aday4x() (0)
-#endif
-
-#ifdef CONFIG_MACH_LITE300
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_LITE300
-# endif
-# define machine_is_lite300() (machine_arch_type == MACH_TYPE_LITE300)
-#else
-# define machine_is_lite300() (0)
-#endif
-
-#ifdef CONFIG_MACH_S5C7376
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_S5C7376
-# endif
-# define machine_is_s5c7376() (machine_arch_type == MACH_TYPE_S5C7376)
-#else
-# define machine_is_s5c7376() (0)
-#endif
-
-#ifdef CONFIG_MACH_MT02
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MT02
-# endif
-# define machine_is_mt02() (machine_arch_type == MACH_TYPE_MT02)
-#else
-# define machine_is_mt02() (0)
-#endif
-
-#ifdef CONFIG_MACH_MPORT3S
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MPORT3S
-# endif
-# define machine_is_mport3s() (machine_arch_type == MACH_TYPE_MPORT3S)
-#else
-# define machine_is_mport3s() (0)
-#endif
-
-#ifdef CONFIG_MACH_RA_ALPHA
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_RA_ALPHA
-# endif
-# define machine_is_ra_alpha() (machine_arch_type == MACH_TYPE_RA_ALPHA)
-#else
-# define machine_is_ra_alpha() (0)
-#endif
-
#ifdef CONFIG_MACH_XCEP
# ifdef machine_arch_type
# undef machine_arch_type
@@ -8257,66 +2029,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_arcom_vulcan() (0)
#endif
-#ifdef CONFIG_MACH_STARGATE
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_STARGATE
-# endif
-# define machine_is_stargate() (machine_arch_type == MACH_TYPE_STARGATE)
-#else
-# define machine_is_stargate() (0)
-#endif
-
-#ifdef CONFIG_MACH_ARMADILLOJ
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ARMADILLOJ
-# endif
-# define machine_is_armadilloj() (machine_arch_type == MACH_TYPE_ARMADILLOJ)
-#else
-# define machine_is_armadilloj() (0)
-#endif
-
-#ifdef CONFIG_MACH_ELROY_JACK
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ELROY_JACK
-# endif
-# define machine_is_elroy_jack() (machine_arch_type == MACH_TYPE_ELROY_JACK)
-#else
-# define machine_is_elroy_jack() (0)
-#endif
-
-#ifdef CONFIG_MACH_BACKEND
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_BACKEND
-# endif
-# define machine_is_backend() (machine_arch_type == MACH_TYPE_BACKEND)
-#else
-# define machine_is_backend() (0)
-#endif
-
-#ifdef CONFIG_MACH_S5LINBOX
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_S5LINBOX
-# endif
-# define machine_is_s5linbox() (machine_arch_type == MACH_TYPE_S5LINBOX)
-#else
-# define machine_is_s5linbox() (0)
-#endif
-
#ifdef CONFIG_MACH_NOMADIK
# ifdef machine_arch_type
# undef machine_arch_type
@@ -8329,30 +2041,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_nomadik() (0)
#endif
-#ifdef CONFIG_MACH_IA_CPU_9200
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_IA_CPU_9200
-# endif
-# define machine_is_ia_cpu_9200() (machine_arch_type == MACH_TYPE_IA_CPU_9200)
-#else
-# define machine_is_ia_cpu_9200() (0)
-#endif
-
-#ifdef CONFIG_MACH_AT91_BJA1
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_AT91_BJA1
-# endif
-# define machine_is_at91_bja1() (machine_arch_type == MACH_TYPE_AT91_BJA1)
-#else
-# define machine_is_at91_bja1() (0)
-#endif
-
#ifdef CONFIG_MACH_CORGI
# ifdef machine_arch_type
# undef machine_arch_type
@@ -8377,162 +2065,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_poodle() (0)
#endif
-#ifdef CONFIG_MACH_TEN
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_TEN
-# endif
-# define machine_is_ten() (machine_arch_type == MACH_TYPE_TEN)
-#else
-# define machine_is_ten() (0)
-#endif
-
-#ifdef CONFIG_MACH_ROVERP5P
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ROVERP5P
-# endif
-# define machine_is_roverp5p() (machine_arch_type == MACH_TYPE_ROVERP5P)
-#else
-# define machine_is_roverp5p() (0)
-#endif
-
-#ifdef CONFIG_MACH_SC2700
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SC2700
-# endif
-# define machine_is_sc2700() (machine_arch_type == MACH_TYPE_SC2700)
-#else
-# define machine_is_sc2700() (0)
-#endif
-
-#ifdef CONFIG_MACH_EX_EAGLE
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_EX_EAGLE
-# endif
-# define machine_is_ex_eagle() (machine_arch_type == MACH_TYPE_EX_EAGLE)
-#else
-# define machine_is_ex_eagle() (0)
-#endif
-
-#ifdef CONFIG_MACH_NX_PXA12
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_NX_PXA12
-# endif
-# define machine_is_nx_pxa12() (machine_arch_type == MACH_TYPE_NX_PXA12)
-#else
-# define machine_is_nx_pxa12() (0)
-#endif
-
-#ifdef CONFIG_MACH_NX_PXA5
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_NX_PXA5
-# endif
-# define machine_is_nx_pxa5() (machine_arch_type == MACH_TYPE_NX_PXA5)
-#else
-# define machine_is_nx_pxa5() (0)
-#endif
-
-#ifdef CONFIG_MACH_BLACKBOARD2
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_BLACKBOARD2
-# endif
-# define machine_is_blackboard2() (machine_arch_type == MACH_TYPE_BLACKBOARD2)
-#else
-# define machine_is_blackboard2() (0)
-#endif
-
-#ifdef CONFIG_MACH_I819
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_I819
-# endif
-# define machine_is_i819() (machine_arch_type == MACH_TYPE_I819)
-#else
-# define machine_is_i819() (0)
-#endif
-
-#ifdef CONFIG_MACH_IXMB995E
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_IXMB995E
-# endif
-# define machine_is_ixmb995e() (machine_arch_type == MACH_TYPE_IXMB995E)
-#else
-# define machine_is_ixmb995e() (0)
-#endif
-
-#ifdef CONFIG_MACH_SKYRIDER
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SKYRIDER
-# endif
-# define machine_is_skyrider() (machine_arch_type == MACH_TYPE_SKYRIDER)
-#else
-# define machine_is_skyrider() (0)
-#endif
-
-#ifdef CONFIG_MACH_SKYHAWK
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SKYHAWK
-# endif
-# define machine_is_skyhawk() (machine_arch_type == MACH_TYPE_SKYHAWK)
-#else
-# define machine_is_skyhawk() (0)
-#endif
-
-#ifdef CONFIG_MACH_ENTERPRISE
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ENTERPRISE
-# endif
-# define machine_is_enterprise() (machine_arch_type == MACH_TYPE_ENTERPRISE)
-#else
-# define machine_is_enterprise() (0)
-#endif
-
-#ifdef CONFIG_MACH_DEP2410
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_DEP2410
-# endif
-# define machine_is_dep2410() (machine_arch_type == MACH_TYPE_DEP2410)
-#else
-# define machine_is_dep2410() (0)
-#endif
-
#ifdef CONFIG_MACH_ARMCORE
# ifdef machine_arch_type
# undef machine_arch_type
@@ -8545,102 +2077,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_armcore() (0)
#endif
-#ifdef CONFIG_MACH_HOBBIT
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_HOBBIT
-# endif
-# define machine_is_hobbit() (machine_arch_type == MACH_TYPE_HOBBIT)
-#else
-# define machine_is_hobbit() (0)
-#endif
-
-#ifdef CONFIG_MACH_H7210
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_H7210
-# endif
-# define machine_is_h7210() (machine_arch_type == MACH_TYPE_H7210)
-#else
-# define machine_is_h7210() (0)
-#endif
-
-#ifdef CONFIG_MACH_PXA_NETDCU5
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_PXA_NETDCU5
-# endif
-# define machine_is_pxa_netdcu5() (machine_arch_type == MACH_TYPE_PXA_NETDCU5)
-#else
-# define machine_is_pxa_netdcu5() (0)
-#endif
-
-#ifdef CONFIG_MACH_ACC
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ACC
-# endif
-# define machine_is_acc() (machine_arch_type == MACH_TYPE_ACC)
-#else
-# define machine_is_acc() (0)
-#endif
-
-#ifdef CONFIG_MACH_ESL_SARVA
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ESL_SARVA
-# endif
-# define machine_is_esl_sarva() (machine_arch_type == MACH_TYPE_ESL_SARVA)
-#else
-# define machine_is_esl_sarva() (0)
-#endif
-
-#ifdef CONFIG_MACH_XM250
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_XM250
-# endif
-# define machine_is_xm250() (machine_arch_type == MACH_TYPE_XM250)
-#else
-# define machine_is_xm250() (0)
-#endif
-
-#ifdef CONFIG_MACH_T6TC1XB
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_T6TC1XB
-# endif
-# define machine_is_t6tc1xb() (machine_arch_type == MACH_TYPE_T6TC1XB)
-#else
-# define machine_is_t6tc1xb() (0)
-#endif
-
-#ifdef CONFIG_MACH_ESS710
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ESS710
-# endif
-# define machine_is_ess710() (machine_arch_type == MACH_TYPE_ESS710)
-#else
-# define machine_is_ess710() (0)
-#endif
-
#ifdef CONFIG_MACH_MX31ADS
# ifdef machine_arch_type
# undef machine_arch_type
@@ -8665,30 +2101,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_himalaya() (0)
#endif
-#ifdef CONFIG_MACH_BOLFENK
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_BOLFENK
-# endif
-# define machine_is_bolfenk() (machine_arch_type == MACH_TYPE_BOLFENK)
-#else
-# define machine_is_bolfenk() (0)
-#endif
-
-#ifdef CONFIG_MACH_AT91RM9200KR
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_AT91RM9200KR
-# endif
-# define machine_is_at91rm9200kr() (machine_arch_type == MACH_TYPE_AT91RM9200KR)
-#else
-# define machine_is_at91rm9200kr() (0)
-#endif
-
#ifdef CONFIG_MACH_EDB9312
# ifdef machine_arch_type
# undef machine_arch_type
@@ -8713,114 +2125,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_omap_generic() (0)
#endif
-#ifdef CONFIG_MACH_AXIMX3
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_AXIMX3
-# endif
-# define machine_is_aximx3() (machine_arch_type == MACH_TYPE_AXIMX3)
-#else
-# define machine_is_aximx3() (0)
-#endif
-
-#ifdef CONFIG_MACH_EB67XDIP
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_EB67XDIP
-# endif
-# define machine_is_eb67xdip() (machine_arch_type == MACH_TYPE_EB67XDIP)
-#else
-# define machine_is_eb67xdip() (0)
-#endif
-
-#ifdef CONFIG_MACH_WEBTXS
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_WEBTXS
-# endif
-# define machine_is_webtxs() (machine_arch_type == MACH_TYPE_WEBTXS)
-#else
-# define machine_is_webtxs() (0)
-#endif
-
-#ifdef CONFIG_MACH_HAWK
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_HAWK
-# endif
-# define machine_is_hawk() (machine_arch_type == MACH_TYPE_HAWK)
-#else
-# define machine_is_hawk() (0)
-#endif
-
-#ifdef CONFIG_MACH_CCAT91SBC001
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CCAT91SBC001
-# endif
-# define machine_is_ccat91sbc001() (machine_arch_type == MACH_TYPE_CCAT91SBC001)
-#else
-# define machine_is_ccat91sbc001() (0)
-#endif
-
-#ifdef CONFIG_MACH_EXPRESSO
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_EXPRESSO
-# endif
-# define machine_is_expresso() (machine_arch_type == MACH_TYPE_EXPRESSO)
-#else
-# define machine_is_expresso() (0)
-#endif
-
-#ifdef CONFIG_MACH_H4000
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_H4000
-# endif
-# define machine_is_h4000() (machine_arch_type == MACH_TYPE_H4000)
-#else
-# define machine_is_h4000() (0)
-#endif
-
-#ifdef CONFIG_MACH_DINO
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_DINO
-# endif
-# define machine_is_dino() (machine_arch_type == MACH_TYPE_DINO)
-#else
-# define machine_is_dino() (0)
-#endif
-
-#ifdef CONFIG_MACH_ML675K
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ML675K
-# endif
-# define machine_is_ml675k() (machine_arch_type == MACH_TYPE_ML675K)
-#else
-# define machine_is_ml675k() (0)
-#endif
-
#ifdef CONFIG_MACH_EDB9301
# ifdef machine_arch_type
# undef machine_arch_type
@@ -8845,138 +2149,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_edb9315() (0)
#endif
-#ifdef CONFIG_MACH_RECIVA_TT
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_RECIVA_TT
-# endif
-# define machine_is_reciva_tt() (machine_arch_type == MACH_TYPE_RECIVA_TT)
-#else
-# define machine_is_reciva_tt() (0)
-#endif
-
-#ifdef CONFIG_MACH_CSTCB01
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CSTCB01
-# endif
-# define machine_is_cstcb01() (machine_arch_type == MACH_TYPE_CSTCB01)
-#else
-# define machine_is_cstcb01() (0)
-#endif
-
-#ifdef CONFIG_MACH_CSTCB1
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CSTCB1
-# endif
-# define machine_is_cstcb1() (machine_arch_type == MACH_TYPE_CSTCB1)
-#else
-# define machine_is_cstcb1() (0)
-#endif
-
-#ifdef CONFIG_MACH_SHADWELL
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SHADWELL
-# endif
-# define machine_is_shadwell() (machine_arch_type == MACH_TYPE_SHADWELL)
-#else
-# define machine_is_shadwell() (0)
-#endif
-
-#ifdef CONFIG_MACH_GOEPEL263
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_GOEPEL263
-# endif
-# define machine_is_goepel263() (machine_arch_type == MACH_TYPE_GOEPEL263)
-#else
-# define machine_is_goepel263() (0)
-#endif
-
-#ifdef CONFIG_MACH_ACQ100
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ACQ100
-# endif
-# define machine_is_acq100() (machine_arch_type == MACH_TYPE_ACQ100)
-#else
-# define machine_is_acq100() (0)
-#endif
-
-#ifdef CONFIG_MACH_MX1FS2
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MX1FS2
-# endif
-# define machine_is_mx1fs2() (machine_arch_type == MACH_TYPE_MX1FS2)
-#else
-# define machine_is_mx1fs2() (0)
-#endif
-
-#ifdef CONFIG_MACH_HIPTOP_G1
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_HIPTOP_G1
-# endif
-# define machine_is_hiptop_g1() (machine_arch_type == MACH_TYPE_HIPTOP_G1)
-#else
-# define machine_is_hiptop_g1() (0)
-#endif
-
-#ifdef CONFIG_MACH_SPARKY
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SPARKY
-# endif
-# define machine_is_sparky() (machine_arch_type == MACH_TYPE_SPARKY)
-#else
-# define machine_is_sparky() (0)
-#endif
-
-#ifdef CONFIG_MACH_NS9750
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_NS9750
-# endif
-# define machine_is_ns9750() (machine_arch_type == MACH_TYPE_NS9750)
-#else
-# define machine_is_ns9750() (0)
-#endif
-
-#ifdef CONFIG_MACH_PHOENIX
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_PHOENIX
-# endif
-# define machine_is_phoenix() (machine_arch_type == MACH_TYPE_PHOENIX)
-#else
-# define machine_is_phoenix() (0)
-#endif
-
#ifdef CONFIG_MACH_VR1000
# ifdef machine_arch_type
# undef machine_arch_type
@@ -8989,186 +2161,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_vr1000() (0)
#endif
-#ifdef CONFIG_MACH_DEISTERPXA
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_DEISTERPXA
-# endif
-# define machine_is_deisterpxa() (machine_arch_type == MACH_TYPE_DEISTERPXA)
-#else
-# define machine_is_deisterpxa() (0)
-#endif
-
-#ifdef CONFIG_MACH_BCM1160
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_BCM1160
-# endif
-# define machine_is_bcm1160() (machine_arch_type == MACH_TYPE_BCM1160)
-#else
-# define machine_is_bcm1160() (0)
-#endif
-
-#ifdef CONFIG_MACH_PCM022
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_PCM022
-# endif
-# define machine_is_pcm022() (machine_arch_type == MACH_TYPE_PCM022)
-#else
-# define machine_is_pcm022() (0)
-#endif
-
-#ifdef CONFIG_MACH_ADSGCX
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ADSGCX
-# endif
-# define machine_is_adsgcx() (machine_arch_type == MACH_TYPE_ADSGCX)
-#else
-# define machine_is_adsgcx() (0)
-#endif
-
-#ifdef CONFIG_MACH_DREADNAUGHT
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_DREADNAUGHT
-# endif
-# define machine_is_dreadnaught() (machine_arch_type == MACH_TYPE_DREADNAUGHT)
-#else
-# define machine_is_dreadnaught() (0)
-#endif
-
-#ifdef CONFIG_MACH_DM320
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_DM320
-# endif
-# define machine_is_dm320() (machine_arch_type == MACH_TYPE_DM320)
-#else
-# define machine_is_dm320() (0)
-#endif
-
-#ifdef CONFIG_MACH_MARKOV
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MARKOV
-# endif
-# define machine_is_markov() (machine_arch_type == MACH_TYPE_MARKOV)
-#else
-# define machine_is_markov() (0)
-#endif
-
-#ifdef CONFIG_MACH_COS7A400
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_COS7A400
-# endif
-# define machine_is_cos7a400() (machine_arch_type == MACH_TYPE_COS7A400)
-#else
-# define machine_is_cos7a400() (0)
-#endif
-
-#ifdef CONFIG_MACH_MILANO
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MILANO
-# endif
-# define machine_is_milano() (machine_arch_type == MACH_TYPE_MILANO)
-#else
-# define machine_is_milano() (0)
-#endif
-
-#ifdef CONFIG_MACH_UE9328
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_UE9328
-# endif
-# define machine_is_ue9328() (machine_arch_type == MACH_TYPE_UE9328)
-#else
-# define machine_is_ue9328() (0)
-#endif
-
-#ifdef CONFIG_MACH_UEX255
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_UEX255
-# endif
-# define machine_is_uex255() (machine_arch_type == MACH_TYPE_UEX255)
-#else
-# define machine_is_uex255() (0)
-#endif
-
-#ifdef CONFIG_MACH_UE2410
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_UE2410
-# endif
-# define machine_is_ue2410() (machine_arch_type == MACH_TYPE_UE2410)
-#else
-# define machine_is_ue2410() (0)
-#endif
-
-#ifdef CONFIG_MACH_A620
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_A620
-# endif
-# define machine_is_a620() (machine_arch_type == MACH_TYPE_A620)
-#else
-# define machine_is_a620() (0)
-#endif
-
-#ifdef CONFIG_MACH_OCELOT
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_OCELOT
-# endif
-# define machine_is_ocelot() (machine_arch_type == MACH_TYPE_OCELOT)
-#else
-# define machine_is_ocelot() (0)
-#endif
-
-#ifdef CONFIG_MACH_CHEETAH
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CHEETAH
-# endif
-# define machine_is_cheetah() (machine_arch_type == MACH_TYPE_CHEETAH)
-#else
-# define machine_is_cheetah() (0)
-#endif
-
#ifdef CONFIG_MACH_OMAP_PERSEUS2
# ifdef machine_arch_type
# undef machine_arch_type
@@ -9181,54 +2173,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_omap_perseus2() (0)
#endif
-#ifdef CONFIG_MACH_ZVUE
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ZVUE
-# endif
-# define machine_is_zvue() (machine_arch_type == MACH_TYPE_ZVUE)
-#else
-# define machine_is_zvue() (0)
-#endif
-
-#ifdef CONFIG_MACH_ROVERP1
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ROVERP1
-# endif
-# define machine_is_roverp1() (machine_arch_type == MACH_TYPE_ROVERP1)
-#else
-# define machine_is_roverp1() (0)
-#endif
-
-#ifdef CONFIG_MACH_ASIDIAL2
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ASIDIAL2
-# endif
-# define machine_is_asidial2() (machine_arch_type == MACH_TYPE_ASIDIAL2)
-#else
-# define machine_is_asidial2() (0)
-#endif
-
-#ifdef CONFIG_MACH_S3C24A0
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_S3C24A0
-# endif
-# define machine_is_s3c24a0() (machine_arch_type == MACH_TYPE_S3C24A0)
-#else
-# define machine_is_s3c24a0() (0)
-#endif
-
#ifdef CONFIG_MACH_E800
# ifdef machine_arch_type
# undef machine_arch_type
@@ -9253,126 +2197,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_e750() (0)
#endif
-#ifdef CONFIG_MACH_S3C5500
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_S3C5500
-# endif
-# define machine_is_s3c5500() (machine_arch_type == MACH_TYPE_S3C5500)
-#else
-# define machine_is_s3c5500() (0)
-#endif
-
-#ifdef CONFIG_MACH_SMDK5500
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SMDK5500
-# endif
-# define machine_is_smdk5500() (machine_arch_type == MACH_TYPE_SMDK5500)
-#else
-# define machine_is_smdk5500() (0)
-#endif
-
-#ifdef CONFIG_MACH_SIGNALSYNC
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SIGNALSYNC
-# endif
-# define machine_is_signalsync() (machine_arch_type == MACH_TYPE_SIGNALSYNC)
-#else
-# define machine_is_signalsync() (0)
-#endif
-
-#ifdef CONFIG_MACH_NBC
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_NBC
-# endif
-# define machine_is_nbc() (machine_arch_type == MACH_TYPE_NBC)
-#else
-# define machine_is_nbc() (0)
-#endif
-
-#ifdef CONFIG_MACH_KODIAK
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_KODIAK
-# endif
-# define machine_is_kodiak() (machine_arch_type == MACH_TYPE_KODIAK)
-#else
-# define machine_is_kodiak() (0)
-#endif
-
-#ifdef CONFIG_MACH_NETBOOKPRO
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_NETBOOKPRO
-# endif
-# define machine_is_netbookpro() (machine_arch_type == MACH_TYPE_NETBOOKPRO)
-#else
-# define machine_is_netbookpro() (0)
-#endif
-
-#ifdef CONFIG_MACH_HW90200
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_HW90200
-# endif
-# define machine_is_hw90200() (machine_arch_type == MACH_TYPE_HW90200)
-#else
-# define machine_is_hw90200() (0)
-#endif
-
-#ifdef CONFIG_MACH_CONDOR
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CONDOR
-# endif
-# define machine_is_condor() (machine_arch_type == MACH_TYPE_CONDOR)
-#else
-# define machine_is_condor() (0)
-#endif
-
-#ifdef CONFIG_MACH_CUP
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CUP
-# endif
-# define machine_is_cup() (machine_arch_type == MACH_TYPE_CUP)
-#else
-# define machine_is_cup() (0)
-#endif
-
-#ifdef CONFIG_MACH_KITE
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_KITE
-# endif
-# define machine_is_kite() (machine_arch_type == MACH_TYPE_KITE)
-#else
-# define machine_is_kite() (0)
-#endif
-
#ifdef CONFIG_MACH_SCB9328
# ifdef machine_arch_type
# undef machine_arch_type
@@ -9409,54 +2233,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_omap_h4() (0)
#endif
-#ifdef CONFIG_MACH_N10
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_N10
-# endif
-# define machine_is_n10() (machine_arch_type == MACH_TYPE_N10)
-#else
-# define machine_is_n10() (0)
-#endif
-
-#ifdef CONFIG_MACH_MONTAJADE
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MONTAJADE
-# endif
-# define machine_is_montejade() (machine_arch_type == MACH_TYPE_MONTAJADE)
-#else
-# define machine_is_montejade() (0)
-#endif
-
-#ifdef CONFIG_MACH_SG560
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SG560
-# endif
-# define machine_is_sg560() (machine_arch_type == MACH_TYPE_SG560)
-#else
-# define machine_is_sg560() (0)
-#endif
-
-#ifdef CONFIG_MACH_DP1000
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_DP1000
-# endif
-# define machine_is_dp1000() (machine_arch_type == MACH_TYPE_DP1000)
-#else
-# define machine_is_dp1000() (0)
-#endif
-
#ifdef CONFIG_MACH_OMAP_OSK
# ifdef machine_arch_type
# undef machine_arch_type
@@ -9469,54 +2245,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_omap_osk() (0)
#endif
-#ifdef CONFIG_MACH_RG100V3
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_RG100V3
-# endif
-# define machine_is_rg100v3() (machine_arch_type == MACH_TYPE_RG100V3)
-#else
-# define machine_is_rg100v3() (0)
-#endif
-
-#ifdef CONFIG_MACH_MX2ADS
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MX2ADS
-# endif
-# define machine_is_mx2ads() (machine_arch_type == MACH_TYPE_MX2ADS)
-#else
-# define machine_is_mx2ads() (0)
-#endif
-
-#ifdef CONFIG_MACH_PXA_KILO
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_PXA_KILO
-# endif
-# define machine_is_pxa_kilo() (machine_arch_type == MACH_TYPE_PXA_KILO)
-#else
-# define machine_is_pxa_kilo() (0)
-#endif
-
-#ifdef CONFIG_MACH_IXP4XX_EAGLE
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_IXP4XX_EAGLE
-# endif
-# define machine_is_ixp4xx_eagle() (machine_arch_type == MACH_TYPE_IXP4XX_EAGLE)
-#else
-# define machine_is_ixp4xx_eagle() (0)
-#endif
-
#ifdef CONFIG_MACH_TOSA
# ifdef machine_arch_type
# undef machine_arch_type
@@ -9529,66 +2257,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_tosa() (0)
#endif
-#ifdef CONFIG_MACH_MB2520F
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MB2520F
-# endif
-# define machine_is_mb2520f() (machine_arch_type == MACH_TYPE_MB2520F)
-#else
-# define machine_is_mb2520f() (0)
-#endif
-
-#ifdef CONFIG_MACH_EMC1000
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_EMC1000
-# endif
-# define machine_is_emc1000() (machine_arch_type == MACH_TYPE_EMC1000)
-#else
-# define machine_is_emc1000() (0)
-#endif
-
-#ifdef CONFIG_MACH_TIDSC25
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_TIDSC25
-# endif
-# define machine_is_tidsc25() (machine_arch_type == MACH_TYPE_TIDSC25)
-#else
-# define machine_is_tidsc25() (0)
-#endif
-
-#ifdef CONFIG_MACH_AKCPMXL
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_AKCPMXL
-# endif
-# define machine_is_akcpmxl() (machine_arch_type == MACH_TYPE_AKCPMXL)
-#else
-# define machine_is_akcpmxl() (0)
-#endif
-
-#ifdef CONFIG_MACH_AV3XX
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_AV3XX
-# endif
-# define machine_is_av3xx() (machine_arch_type == MACH_TYPE_AV3XX)
-#else
-# define machine_is_av3xx() (0)
-#endif
-
#ifdef CONFIG_MACH_AVILA
# ifdef machine_arch_type
# undef machine_arch_type
@@ -9601,138 +2269,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_avila() (0)
#endif
-#ifdef CONFIG_MACH_PXA_MPM10
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_PXA_MPM10
-# endif
-# define machine_is_pxa_mpm10() (machine_arch_type == MACH_TYPE_PXA_MPM10)
-#else
-# define machine_is_pxa_mpm10() (0)
-#endif
-
-#ifdef CONFIG_MACH_PXA_KYANITE
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_PXA_KYANITE
-# endif
-# define machine_is_pxa_kyanite() (machine_arch_type == MACH_TYPE_PXA_KYANITE)
-#else
-# define machine_is_pxa_kyanite() (0)
-#endif
-
-#ifdef CONFIG_MACH_SGOLD
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SGOLD
-# endif
-# define machine_is_sgold() (machine_arch_type == MACH_TYPE_SGOLD)
-#else
-# define machine_is_sgold() (0)
-#endif
-
-#ifdef CONFIG_MACH_OSCAR
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_OSCAR
-# endif
-# define machine_is_oscar() (machine_arch_type == MACH_TYPE_OSCAR)
-#else
-# define machine_is_oscar() (0)
-#endif
-
-#ifdef CONFIG_MACH_EPXA4USB2
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_EPXA4USB2
-# endif
-# define machine_is_epxa4usb2() (machine_arch_type == MACH_TYPE_EPXA4USB2)
-#else
-# define machine_is_epxa4usb2() (0)
-#endif
-
-#ifdef CONFIG_MACH_XSENGINE
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_XSENGINE
-# endif
-# define machine_is_xsengine() (machine_arch_type == MACH_TYPE_XSENGINE)
-#else
-# define machine_is_xsengine() (0)
-#endif
-
-#ifdef CONFIG_MACH_IP600
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_IP600
-# endif
-# define machine_is_ip600() (machine_arch_type == MACH_TYPE_IP600)
-#else
-# define machine_is_ip600() (0)
-#endif
-
-#ifdef CONFIG_MACH_MCAN2
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MCAN2
-# endif
-# define machine_is_mcan2() (machine_arch_type == MACH_TYPE_MCAN2)
-#else
-# define machine_is_mcan2() (0)
-#endif
-
-#ifdef CONFIG_MACH_DDI_BLUERIDGE
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_DDI_BLUERIDGE
-# endif
-# define machine_is_ddi_blueridge() (machine_arch_type == MACH_TYPE_DDI_BLUERIDGE)
-#else
-# define machine_is_ddi_blueridge() (0)
-#endif
-
-#ifdef CONFIG_MACH_SKYMINDER
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SKYMINDER
-# endif
-# define machine_is_skyminder() (machine_arch_type == MACH_TYPE_SKYMINDER)
-#else
-# define machine_is_skyminder() (0)
-#endif
-
-#ifdef CONFIG_MACH_LPD79520
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_LPD79520
-# endif
-# define machine_is_lpd79520() (machine_arch_type == MACH_TYPE_LPD79520)
-#else
-# define machine_is_lpd79520() (0)
-#endif
-
#ifdef CONFIG_MACH_EDB9302
# ifdef machine_arch_type
# undef machine_arch_type
@@ -9745,54 +2281,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_edb9302() (0)
#endif
-#ifdef CONFIG_MACH_HW90340
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_HW90340
-# endif
-# define machine_is_hw90340() (machine_arch_type == MACH_TYPE_HW90340)
-#else
-# define machine_is_hw90340() (0)
-#endif
-
-#ifdef CONFIG_MACH_CIP_BOX
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CIP_BOX
-# endif
-# define machine_is_cip_box() (machine_arch_type == MACH_TYPE_CIP_BOX)
-#else
-# define machine_is_cip_box() (0)
-#endif
-
-#ifdef CONFIG_MACH_IVPN
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_IVPN
-# endif
-# define machine_is_ivpn() (machine_arch_type == MACH_TYPE_IVPN)
-#else
-# define machine_is_ivpn() (0)
-#endif
-
-#ifdef CONFIG_MACH_RSOC2
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_RSOC2
-# endif
-# define machine_is_rsoc2() (machine_arch_type == MACH_TYPE_RSOC2)
-#else
-# define machine_is_rsoc2() (0)
-#endif
-
#ifdef CONFIG_MACH_HUSKY
# ifdef machine_arch_type
# undef machine_arch_type
@@ -9805,18 +2293,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_husky() (0)
#endif
-#ifdef CONFIG_MACH_BOXER
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_BOXER
-# endif
-# define machine_is_boxer() (machine_arch_type == MACH_TYPE_BOXER)
-#else
-# define machine_is_boxer() (0)
-#endif
-
#ifdef CONFIG_MACH_SHEPHERD
# ifdef machine_arch_type
# undef machine_arch_type
@@ -9829,186 +2305,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_shepherd() (0)
#endif
-#ifdef CONFIG_MACH_AML42800AA
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_AML42800AA
-# endif
-# define machine_is_aml42800aa() (machine_arch_type == MACH_TYPE_AML42800AA)
-#else
-# define machine_is_aml42800aa() (0)
-#endif
-
-#ifdef CONFIG_MACH_LPC2294
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_LPC2294
-# endif
-# define machine_is_lpc2294() (machine_arch_type == MACH_TYPE_LPC2294)
-#else
-# define machine_is_lpc2294() (0)
-#endif
-
-#ifdef CONFIG_MACH_SWITCHGRASS
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SWITCHGRASS
-# endif
-# define machine_is_switchgrass() (machine_arch_type == MACH_TYPE_SWITCHGRASS)
-#else
-# define machine_is_switchgrass() (0)
-#endif
-
-#ifdef CONFIG_MACH_ENS_CMU
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ENS_CMU
-# endif
-# define machine_is_ens_cmu() (machine_arch_type == MACH_TYPE_ENS_CMU)
-#else
-# define machine_is_ens_cmu() (0)
-#endif
-
-#ifdef CONFIG_MACH_MM6_SDB
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MM6_SDB
-# endif
-# define machine_is_mm6_sdb() (machine_arch_type == MACH_TYPE_MM6_SDB)
-#else
-# define machine_is_mm6_sdb() (0)
-#endif
-
-#ifdef CONFIG_MACH_SATURN
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SATURN
-# endif
-# define machine_is_saturn() (machine_arch_type == MACH_TYPE_SATURN)
-#else
-# define machine_is_saturn() (0)
-#endif
-
-#ifdef CONFIG_MACH_I30030EVB
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_I30030EVB
-# endif
-# define machine_is_i30030evb() (machine_arch_type == MACH_TYPE_I30030EVB)
-#else
-# define machine_is_i30030evb() (0)
-#endif
-
-#ifdef CONFIG_MACH_MXC27530EVB
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MXC27530EVB
-# endif
-# define machine_is_mxc27530evb() (machine_arch_type == MACH_TYPE_MXC27530EVB)
-#else
-# define machine_is_mxc27530evb() (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
@@ -10021,354 +2317,6 @@ extern unsigned int __machine_arch_type;
# 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_CORNWALLIS
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CORNWALLIS
-# endif
-# define machine_is_cornwallis() (machine_arch_type == MACH_TYPE_CORNWALLIS)
-#else
-# define machine_is_cornwallis() (0)
-#endif
-
-#ifdef CONFIG_MACH_GURNEY_DRV
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_GURNEY_DRV
-# endif
-# define machine_is_gurney_drv() (machine_arch_type == MACH_TYPE_GURNEY_DRV)
-#else
-# define machine_is_gurney_drv() (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
@@ -10381,54 +2329,6 @@ extern unsigned int __machine_arch_type;
# 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
@@ -10453,66 +2353,6 @@ extern unsigned int __machine_arch_type;
# 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
@@ -10525,18 +2365,6 @@ extern unsigned int __machine_arch_type;
# 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
@@ -10561,54 +2389,6 @@ extern unsigned int __machine_arch_type;
# 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
@@ -10633,54 +2413,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_sx1() (0)
#endif
-#ifdef CONFIG_MACH_HMS39C7092
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_HMS39C7092
-# endif
-# define machine_is_hms39c7092() (machine_arch_type == MACH_TYPE_HMS39C7092)
-#else
-# define machine_is_hms39c7092() (0)
-#endif
-
-#ifdef CONFIG_MACH_ARMADILLO
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ARMADILLO
-# endif
-# define machine_is_armadillo() (machine_arch_type == MACH_TYPE_ARMADILLO)
-#else
-# define machine_is_armadillo() (0)
-#endif
-
-#ifdef CONFIG_MACH_IPCU
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_IPCU
-# endif
-# define machine_is_ipcu() (machine_arch_type == MACH_TYPE_IPCU)
-#else
-# define machine_is_ipcu() (0)
-#endif
-
-#ifdef CONFIG_MACH_LOOX720
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_LOOX720
-# endif
-# define machine_is_loox720() (machine_arch_type == MACH_TYPE_LOOX720)
-#else
-# define machine_is_loox720() (0)
-#endif
-
#ifdef CONFIG_MACH_IXDP465
# ifdef machine_arch_type
# undef machine_arch_type
@@ -10705,114 +2437,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_ixdp2351() (0)
#endif
-#ifdef CONFIG_MACH_ADSVIX
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ADSVIX
-# endif
-# define machine_is_adsvix() (machine_arch_type == MACH_TYPE_ADSVIX)
-#else
-# define machine_is_adsvix() (0)
-#endif
-
-#ifdef CONFIG_MACH_DM270
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_DM270
-# endif
-# define machine_is_dm270() (machine_arch_type == MACH_TYPE_DM270)
-#else
-# define machine_is_dm270() (0)
-#endif
-
-#ifdef CONFIG_MACH_SOCLTPLUS
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SOCLTPLUS
-# endif
-# define machine_is_socltplus() (machine_arch_type == MACH_TYPE_SOCLTPLUS)
-#else
-# define machine_is_socltplus() (0)
-#endif
-
-#ifdef CONFIG_MACH_ECIA
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ECIA
-# endif
-# define machine_is_ecia() (machine_arch_type == MACH_TYPE_ECIA)
-#else
-# define machine_is_ecia() (0)
-#endif
-
-#ifdef CONFIG_MACH_CM4008
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CM4008
-# endif
-# define machine_is_cm4008() (machine_arch_type == MACH_TYPE_CM4008)
-#else
-# define machine_is_cm4008() (0)
-#endif
-
-#ifdef CONFIG_MACH_P2001
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_P2001
-# endif
-# define machine_is_p2001() (machine_arch_type == MACH_TYPE_P2001)
-#else
-# define machine_is_p2001() (0)
-#endif
-
-#ifdef CONFIG_MACH_TWISTER
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_TWISTER
-# endif
-# define machine_is_twister() (machine_arch_type == MACH_TYPE_TWISTER)
-#else
-# define machine_is_twister() (0)
-#endif
-
-#ifdef CONFIG_MACH_MUDSHARK
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MUDSHARK
-# endif
-# define machine_is_mudshark() (machine_arch_type == MACH_TYPE_MUDSHARK)
-#else
-# define machine_is_mudshark() (0)
-#endif
-
-#ifdef CONFIG_MACH_HB2
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_HB2
-# endif
-# define machine_is_hb2() (machine_arch_type == MACH_TYPE_HB2)
-#else
-# define machine_is_hb2() (0)
-#endif
-
#ifdef CONFIG_MACH_IQ80332
# ifdef machine_arch_type
# undef machine_arch_type
@@ -10825,138 +2449,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_iq80332() (0)
#endif
-#ifdef CONFIG_MACH_SENDT
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SENDT
-# endif
-# define machine_is_sendt() (machine_arch_type == MACH_TYPE_SENDT)
-#else
-# define machine_is_sendt() (0)
-#endif
-
-#ifdef CONFIG_MACH_MX2JAZZ
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MX2JAZZ
-# endif
-# define machine_is_mx2jazz() (machine_arch_type == MACH_TYPE_MX2JAZZ)
-#else
-# define machine_is_mx2jazz() (0)
-#endif
-
-#ifdef CONFIG_MACH_MULTIIO
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MULTIIO
-# endif
-# define machine_is_multiio() (machine_arch_type == MACH_TYPE_MULTIIO)
-#else
-# define machine_is_multiio() (0)
-#endif
-
-#ifdef CONFIG_MACH_HRDISPLAY
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_HRDISPLAY
-# endif
-# define machine_is_hrdisplay() (machine_arch_type == MACH_TYPE_HRDISPLAY)
-#else
-# define machine_is_hrdisplay() (0)
-#endif
-
-#ifdef CONFIG_MACH_MXC27530ADS
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MXC27530ADS
-# endif
-# define machine_is_mxc27530ads() (machine_arch_type == MACH_TYPE_MXC27530ADS)
-#else
-# define machine_is_mxc27530ads() (0)
-#endif
-
-#ifdef CONFIG_MACH_TRIZEPS3
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_TRIZEPS3
-# endif
-# define machine_is_trizeps3() (machine_arch_type == MACH_TYPE_TRIZEPS3)
-#else
-# define machine_is_trizeps3() (0)
-#endif
-
-#ifdef CONFIG_MACH_ZEFEERDZA
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ZEFEERDZA
-# endif
-# define machine_is_zefeerdza() (machine_arch_type == MACH_TYPE_ZEFEERDZA)
-#else
-# define machine_is_zefeerdza() (0)
-#endif
-
-#ifdef CONFIG_MACH_ZEFEERDZB
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ZEFEERDZB
-# endif
-# define machine_is_zefeerdzb() (machine_arch_type == MACH_TYPE_ZEFEERDZB)
-#else
-# define machine_is_zefeerdzb() (0)
-#endif
-
-#ifdef CONFIG_MACH_ZEFEERDZG
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ZEFEERDZG
-# endif
-# define machine_is_zefeerdzg() (machine_arch_type == MACH_TYPE_ZEFEERDZG)
-#else
-# define machine_is_zefeerdzg() (0)
-#endif
-
-#ifdef CONFIG_MACH_ZEFEERDZN
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ZEFEERDZN
-# endif
-# define machine_is_zefeerdzn() (machine_arch_type == MACH_TYPE_ZEFEERDZN)
-#else
-# define machine_is_zefeerdzn() (0)
-#endif
-
-#ifdef CONFIG_MACH_ZEFEERDZQ
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ZEFEERDZQ
-# endif
-# define machine_is_zefeerdzq() (machine_arch_type == MACH_TYPE_ZEFEERDZQ)
-#else
-# define machine_is_zefeerdzq() (0)
-#endif
-
#ifdef CONFIG_MACH_GTWX5715
# ifdef machine_arch_type
# undef machine_arch_type
@@ -10969,66 +2461,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_gtwx5715() (0)
#endif
-#ifdef CONFIG_MACH_ASTRO_JACK
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ASTRO_JACK
-# endif
-# define machine_is_astro_jack() (machine_arch_type == MACH_TYPE_ASTRO_JACK)
-#else
-# define machine_is_astro_jack() (0)
-#endif
-
-#ifdef CONFIG_MACH_TIP03
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_TIP03
-# endif
-# define machine_is_tip03() (machine_arch_type == MACH_TYPE_TIP03)
-#else
-# define machine_is_tip03() (0)
-#endif
-
-#ifdef CONFIG_MACH_A9200EC
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_A9200EC
-# endif
-# define machine_is_a9200ec() (machine_arch_type == MACH_TYPE_A9200EC)
-#else
-# define machine_is_a9200ec() (0)
-#endif
-
-#ifdef CONFIG_MACH_PNX0105
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_PNX0105
-# endif
-# define machine_is_pnx0105() (machine_arch_type == MACH_TYPE_PNX0105)
-#else
-# define machine_is_pnx0105() (0)
-#endif
-
-#ifdef CONFIG_MACH_ADCPOECPU
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ADCPOECPU
-# endif
-# define machine_is_adcpoecpu() (machine_arch_type == MACH_TYPE_ADCPOECPU)
-#else
-# define machine_is_adcpoecpu() (0)
-#endif
-
#ifdef CONFIG_MACH_CSB637
# ifdef machine_arch_type
# undef machine_arch_type
@@ -11041,78 +2473,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_csb637() (0)
#endif
-#ifdef CONFIG_MACH_MB9200
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MB9200
-# endif
-# define machine_is_mb9200() (machine_arch_type == MACH_TYPE_MB9200)
-#else
-# define machine_is_mb9200() (0)
-#endif
-
-#ifdef CONFIG_MACH_KULUN
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_KULUN
-# endif
-# define machine_is_kulun() (machine_arch_type == MACH_TYPE_KULUN)
-#else
-# define machine_is_kulun() (0)
-#endif
-
-#ifdef CONFIG_MACH_SNAPPER
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SNAPPER
-# endif
-# define machine_is_snapper() (machine_arch_type == MACH_TYPE_SNAPPER)
-#else
-# define machine_is_snapper() (0)
-#endif
-
-#ifdef CONFIG_MACH_OPTIMA
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_OPTIMA
-# endif
-# define machine_is_optima() (machine_arch_type == MACH_TYPE_OPTIMA)
-#else
-# define machine_is_optima() (0)
-#endif
-
-#ifdef CONFIG_MACH_DLHSBC
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_DLHSBC
-# endif
-# define machine_is_dlhsbc() (machine_arch_type == MACH_TYPE_DLHSBC)
-#else
-# define machine_is_dlhsbc() (0)
-#endif
-
-#ifdef CONFIG_MACH_X30
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_X30
-# endif
-# define machine_is_x30() (machine_arch_type == MACH_TYPE_X30)
-#else
-# define machine_is_x30() (0)
-#endif
-
#ifdef CONFIG_MACH_N30
# ifdef machine_arch_type
# undef machine_arch_type
@@ -11125,30 +2485,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_n30() (0)
#endif
-#ifdef CONFIG_MACH_MANGA_KS8695
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MANGA_KS8695
-# endif
-# define machine_is_manga_ks8695() (machine_arch_type == MACH_TYPE_MANGA_KS8695)
-#else
-# define machine_is_manga_ks8695() (0)
-#endif
-
-#ifdef CONFIG_MACH_AJAX
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_AJAX
-# endif
-# define machine_is_ajax() (machine_arch_type == MACH_TYPE_AJAX)
-#else
-# define machine_is_ajax() (0)
-#endif
-
#ifdef CONFIG_MACH_NEC_MP900
# ifdef machine_arch_type
# undef machine_arch_type
@@ -11161,18 +2497,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_nec_mp900() (0)
#endif
-#ifdef CONFIG_MACH_VVTK1000
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_VVTK1000
-# endif
-# define machine_is_vvtk1000() (machine_arch_type == MACH_TYPE_VVTK1000)
-#else
-# define machine_is_vvtk1000() (0)
-#endif
-
#ifdef CONFIG_MACH_KAFA
# ifdef machine_arch_type
# undef machine_arch_type
@@ -11185,126 +2509,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_kafa() (0)
#endif
-#ifdef CONFIG_MACH_VVTK3000
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_VVTK3000
-# endif
-# define machine_is_vvtk3000() (machine_arch_type == MACH_TYPE_VVTK3000)
-#else
-# define machine_is_vvtk3000() (0)
-#endif
-
-#ifdef CONFIG_MACH_PIMX1
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_PIMX1
-# endif
-# define machine_is_pimx1() (machine_arch_type == MACH_TYPE_PIMX1)
-#else
-# define machine_is_pimx1() (0)
-#endif
-
-#ifdef CONFIG_MACH_OLLIE
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_OLLIE
-# endif
-# define machine_is_ollie() (machine_arch_type == MACH_TYPE_OLLIE)
-#else
-# define machine_is_ollie() (0)
-#endif
-
-#ifdef CONFIG_MACH_SKYMAX
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SKYMAX
-# endif
-# define machine_is_skymax() (machine_arch_type == MACH_TYPE_SKYMAX)
-#else
-# define machine_is_skymax() (0)
-#endif
-
-#ifdef CONFIG_MACH_JAZZ
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_JAZZ
-# endif
-# define machine_is_jazz() (machine_arch_type == MACH_TYPE_JAZZ)
-#else
-# define machine_is_jazz() (0)
-#endif
-
-#ifdef CONFIG_MACH_TEL_T3
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_TEL_T3
-# endif
-# define machine_is_tel_t3() (machine_arch_type == MACH_TYPE_TEL_T3)
-#else
-# define machine_is_tel_t3() (0)
-#endif
-
-#ifdef CONFIG_MACH_AISINO_FCR255
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_AISINO_FCR255
-# endif
-# define machine_is_aisino_fcr255() (machine_arch_type == MACH_TYPE_AISINO_FCR255)
-#else
-# define machine_is_aisino_fcr255() (0)
-#endif
-
-#ifdef CONFIG_MACH_BTWEB
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_BTWEB
-# endif
-# define machine_is_btweb() (machine_arch_type == MACH_TYPE_BTWEB)
-#else
-# define machine_is_btweb() (0)
-#endif
-
-#ifdef CONFIG_MACH_DBG_LH79520
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_DBG_LH79520
-# endif
-# define machine_is_dbg_lh79520() (machine_arch_type == MACH_TYPE_DBG_LH79520)
-#else
-# define machine_is_dbg_lh79520() (0)
-#endif
-
-#ifdef CONFIG_MACH_CM41XX
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CM41XX
-# endif
-# define machine_is_cm41xx() (machine_arch_type == MACH_TYPE_CM41XX)
-#else
-# define machine_is_cm41xx() (0)
-#endif
-
#ifdef CONFIG_MACH_TS72XX
# ifdef machine_arch_type
# undef machine_arch_type
@@ -11317,78 +2521,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_ts72xx() (0)
#endif
-#ifdef CONFIG_MACH_NGGPXA
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_NGGPXA
-# endif
-# define machine_is_nggpxa() (machine_arch_type == MACH_TYPE_NGGPXA)
-#else
-# define machine_is_nggpxa() (0)
-#endif
-
-#ifdef CONFIG_MACH_CSB535
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CSB535
-# endif
-# define machine_is_csb535() (machine_arch_type == MACH_TYPE_CSB535)
-#else
-# define machine_is_csb535() (0)
-#endif
-
-#ifdef CONFIG_MACH_CSB536
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CSB536
-# endif
-# define machine_is_csb536() (machine_arch_type == MACH_TYPE_CSB536)
-#else
-# define machine_is_csb536() (0)
-#endif
-
-#ifdef CONFIG_MACH_PXA_TRAKPOD
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_PXA_TRAKPOD
-# endif
-# define machine_is_pxa_trakpod() (machine_arch_type == MACH_TYPE_PXA_TRAKPOD)
-#else
-# define machine_is_pxa_trakpod() (0)
-#endif
-
-#ifdef CONFIG_MACH_PRAXIS
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_PRAXIS
-# endif
-# define machine_is_praxis() (machine_arch_type == MACH_TYPE_PRAXIS)
-#else
-# define machine_is_praxis() (0)
-#endif
-
-#ifdef CONFIG_MACH_LH75411
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_LH75411
-# endif
-# define machine_is_lh75411() (machine_arch_type == MACH_TYPE_LH75411)
-#else
-# define machine_is_lh75411() (0)
-#endif
-
#ifdef CONFIG_MACH_OTOM
# ifdef machine_arch_type
# undef machine_arch_type
@@ -11413,246 +2545,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_nexcoder_2440() (0)
#endif
-#ifdef CONFIG_MACH_LOOX410
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_LOOX410
-# endif
-# define machine_is_loox410() (machine_arch_type == MACH_TYPE_LOOX410)
-#else
-# define machine_is_loox410() (0)
-#endif
-
-#ifdef CONFIG_MACH_WESTLAKE
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_WESTLAKE
-# endif
-# define machine_is_westlake() (machine_arch_type == MACH_TYPE_WESTLAKE)
-#else
-# define machine_is_westlake() (0)
-#endif
-
-#ifdef CONFIG_MACH_NSB
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_NSB
-# endif
-# define machine_is_nsb() (machine_arch_type == MACH_TYPE_NSB)
-#else
-# define machine_is_nsb() (0)
-#endif
-
-#ifdef CONFIG_MACH_ESL_SARVA_STN
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ESL_SARVA_STN
-# endif
-# define machine_is_esl_sarva_stn() (machine_arch_type == MACH_TYPE_ESL_SARVA_STN)
-#else
-# define machine_is_esl_sarva_stn() (0)
-#endif
-
-#ifdef CONFIG_MACH_ESL_SARVA_TFT
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ESL_SARVA_TFT
-# endif
-# define machine_is_esl_sarva_tft() (machine_arch_type == MACH_TYPE_ESL_SARVA_TFT)
-#else
-# define machine_is_esl_sarva_tft() (0)
-#endif
-
-#ifdef CONFIG_MACH_ESL_SARVA_IAD
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ESL_SARVA_IAD
-# endif
-# define machine_is_esl_sarva_iad() (machine_arch_type == MACH_TYPE_ESL_SARVA_IAD)
-#else
-# define machine_is_esl_sarva_iad() (0)
-#endif
-
-#ifdef CONFIG_MACH_ESL_SARVA_ACC
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ESL_SARVA_ACC
-# endif
-# define machine_is_esl_sarva_acc() (machine_arch_type == MACH_TYPE_ESL_SARVA_ACC)
-#else
-# define machine_is_esl_sarva_acc() (0)
-#endif
-
-#ifdef CONFIG_MACH_TYPHOON
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_TYPHOON
-# endif
-# define machine_is_typhoon() (machine_arch_type == MACH_TYPE_TYPHOON)
-#else
-# define machine_is_typhoon() (0)
-#endif
-
-#ifdef CONFIG_MACH_CNAV
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CNAV
-# endif
-# define machine_is_cnav() (machine_arch_type == MACH_TYPE_CNAV)
-#else
-# define machine_is_cnav() (0)
-#endif
-
-#ifdef CONFIG_MACH_A730
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_A730
-# endif
-# define machine_is_a730() (machine_arch_type == MACH_TYPE_A730)
-#else
-# define machine_is_a730() (0)
-#endif
-
-#ifdef CONFIG_MACH_NETSTAR
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_NETSTAR
-# endif
-# define machine_is_netstar() (machine_arch_type == MACH_TYPE_NETSTAR)
-#else
-# define machine_is_netstar() (0)
-#endif
-
-#ifdef CONFIG_MACH_PHASEFALE_SUPERCON
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_PHASEFALE_SUPERCON
-# endif
-# define machine_is_supercon() (machine_arch_type == MACH_TYPE_PHASEFALE_SUPERCON)
-#else
-# define machine_is_supercon() (0)
-#endif
-
-#ifdef CONFIG_MACH_SHIVA1100
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SHIVA1100
-# endif
-# define machine_is_shiva1100() (machine_arch_type == MACH_TYPE_SHIVA1100)
-#else
-# define machine_is_shiva1100() (0)
-#endif
-
-#ifdef CONFIG_MACH_ETEXSC
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ETEXSC
-# endif
-# define machine_is_etexsc() (machine_arch_type == MACH_TYPE_ETEXSC)
-#else
-# define machine_is_etexsc() (0)
-#endif
-
-#ifdef CONFIG_MACH_IXDPG465
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_IXDPG465
-# endif
-# define machine_is_ixdpg465() (machine_arch_type == MACH_TYPE_IXDPG465)
-#else
-# define machine_is_ixdpg465() (0)
-#endif
-
-#ifdef CONFIG_MACH_A9M2410
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_A9M2410
-# endif
-# define machine_is_a9m2410() (machine_arch_type == MACH_TYPE_A9M2410)
-#else
-# define machine_is_a9m2410() (0)
-#endif
-
-#ifdef CONFIG_MACH_A9M2440
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_A9M2440
-# endif
-# define machine_is_a9m2440() (machine_arch_type == MACH_TYPE_A9M2440)
-#else
-# define machine_is_a9m2440() (0)
-#endif
-
-#ifdef CONFIG_MACH_A9M9750
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_A9M9750
-# endif
-# define machine_is_a9m9750() (machine_arch_type == MACH_TYPE_A9M9750)
-#else
-# define machine_is_a9m9750() (0)
-#endif
-
-#ifdef CONFIG_MACH_A9M9360
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_A9M9360
-# endif
-# define machine_is_a9m9360() (machine_arch_type == MACH_TYPE_A9M9360)
-#else
-# define machine_is_a9m9360() (0)
-#endif
-
-#ifdef CONFIG_MACH_UNC90
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_UNC90
-# endif
-# define machine_is_unc90() (machine_arch_type == MACH_TYPE_UNC90)
-#else
-# define machine_is_unc90() (0)
-#endif
-
#ifdef CONFIG_MACH_ECO920
# ifdef machine_arch_type
# undef machine_arch_type
@@ -11665,18 +2557,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_eco920() (0)
#endif
-#ifdef CONFIG_MACH_SATVIEW
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SATVIEW
-# endif
-# define machine_is_satview() (machine_arch_type == MACH_TYPE_SATVIEW)
-#else
-# define machine_is_satview() (0)
-#endif
-
#ifdef CONFIG_MACH_ROADRUNNER
# ifdef machine_arch_type
# undef machine_arch_type
@@ -11701,90 +2581,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_at91rm9200ek() (0)
#endif
-#ifdef CONFIG_MACH_GP32
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_GP32
-# endif
-# define machine_is_gp32() (machine_arch_type == MACH_TYPE_GP32)
-#else
-# define machine_is_gp32() (0)
-#endif
-
-#ifdef CONFIG_MACH_GEM
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_GEM
-# endif
-# define machine_is_gem() (machine_arch_type == MACH_TYPE_GEM)
-#else
-# define machine_is_gem() (0)
-#endif
-
-#ifdef CONFIG_MACH_I858
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_I858
-# endif
-# define machine_is_i858() (machine_arch_type == MACH_TYPE_I858)
-#else
-# define machine_is_i858() (0)
-#endif
-
-#ifdef CONFIG_MACH_HX2750
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_HX2750
-# endif
-# define machine_is_hx2750() (machine_arch_type == MACH_TYPE_HX2750)
-#else
-# define machine_is_hx2750() (0)
-#endif
-
-#ifdef CONFIG_MACH_MXC91131EVB
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MXC91131EVB
-# endif
-# define machine_is_mxc91131evb() (machine_arch_type == MACH_TYPE_MXC91131EVB)
-#else
-# define machine_is_mxc91131evb() (0)
-#endif
-
-#ifdef CONFIG_MACH_P700
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_P700
-# endif
-# define machine_is_p700() (machine_arch_type == MACH_TYPE_P700)
-#else
-# define machine_is_p700() (0)
-#endif
-
-#ifdef CONFIG_MACH_CPE
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CPE
-# endif
-# define machine_is_cpe() (machine_arch_type == MACH_TYPE_CPE)
-#else
-# define machine_is_cpe() (0)
-#endif
-
#ifdef CONFIG_MACH_SPITZ
# ifdef machine_arch_type
# undef machine_arch_type
@@ -11797,114 +2593,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_spitz() (0)
#endif
-#ifdef CONFIG_MACH_NIMBRA340
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_NIMBRA340
-# endif
-# define machine_is_nimbra340() (machine_arch_type == MACH_TYPE_NIMBRA340)
-#else
-# define machine_is_nimbra340() (0)
-#endif
-
-#ifdef CONFIG_MACH_LPC22XX
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_LPC22XX
-# endif
-# define machine_is_lpc22xx() (machine_arch_type == MACH_TYPE_LPC22XX)
-#else
-# define machine_is_lpc22xx() (0)
-#endif
-
-#ifdef CONFIG_MACH_COMET3
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_COMET3
-# endif
-# define machine_is_omap_comet3() (machine_arch_type == MACH_TYPE_COMET3)
-#else
-# define machine_is_omap_comet3() (0)
-#endif
-
-#ifdef CONFIG_MACH_COMET4
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_COMET4
-# endif
-# define machine_is_omap_comet4() (machine_arch_type == MACH_TYPE_COMET4)
-#else
-# define machine_is_omap_comet4() (0)
-#endif
-
-#ifdef CONFIG_MACH_CSB625
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CSB625
-# endif
-# define machine_is_csb625() (machine_arch_type == MACH_TYPE_CSB625)
-#else
-# define machine_is_csb625() (0)
-#endif
-
-#ifdef CONFIG_MACH_FORTUNET2
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_FORTUNET2
-# endif
-# define machine_is_fortunet2() (machine_arch_type == MACH_TYPE_FORTUNET2)
-#else
-# define machine_is_fortunet2() (0)
-#endif
-
-#ifdef CONFIG_MACH_S5H2200
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_S5H2200
-# endif
-# define machine_is_s5h2200() (machine_arch_type == MACH_TYPE_S5H2200)
-#else
-# define machine_is_s5h2200() (0)
-#endif
-
-#ifdef CONFIG_MACH_OPTORM920
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_OPTORM920
-# endif
-# define machine_is_optorm920() (machine_arch_type == MACH_TYPE_OPTORM920)
-#else
-# define machine_is_optorm920() (0)
-#endif
-
-#ifdef CONFIG_MACH_ADSBITSYXB
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ADSBITSYXB
-# endif
-# define machine_is_adsbitsyxb() (machine_arch_type == MACH_TYPE_ADSBITSYXB)
-#else
-# define machine_is_adsbitsyxb() (0)
-#endif
-
#ifdef CONFIG_MACH_ADSSPHERE
# ifdef machine_arch_type
# undef machine_arch_type
@@ -11917,66 +2605,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_adssphere() (0)
#endif
-#ifdef CONFIG_MACH_ADSPORTAL
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ADSPORTAL
-# endif
-# define machine_is_adsportal() (machine_arch_type == MACH_TYPE_ADSPORTAL)
-#else
-# define machine_is_adsportal() (0)
-#endif
-
-#ifdef CONFIG_MACH_LN2410SBC
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_LN2410SBC
-# endif
-# define machine_is_ln2410sbc() (machine_arch_type == MACH_TYPE_LN2410SBC)
-#else
-# define machine_is_ln2410sbc() (0)
-#endif
-
-#ifdef CONFIG_MACH_CB3RUFC
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CB3RUFC
-# endif
-# define machine_is_cb3rufc() (machine_arch_type == MACH_TYPE_CB3RUFC)
-#else
-# define machine_is_cb3rufc() (0)
-#endif
-
-#ifdef CONFIG_MACH_MP2USB
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MP2USB
-# endif
-# define machine_is_mp2usb() (machine_arch_type == MACH_TYPE_MP2USB)
-#else
-# define machine_is_mp2usb() (0)
-#endif
-
-#ifdef CONFIG_MACH_NTNP425C
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_NTNP425C
-# endif
-# define machine_is_ntnp425c() (machine_arch_type == MACH_TYPE_NTNP425C)
-#else
-# define machine_is_ntnp425c() (0)
-#endif
-
#ifdef CONFIG_MACH_COLIBRI
# ifdef machine_arch_type
# undef machine_arch_type
@@ -11989,18 +2617,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_colibri() (0)
#endif
-#ifdef CONFIG_MACH_PCM7220
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_PCM7220
-# endif
-# define machine_is_pcm7220() (machine_arch_type == MACH_TYPE_PCM7220)
-#else
-# define machine_is_pcm7220() (0)
-#endif
-
#ifdef CONFIG_MACH_GATEWAY7001
# ifdef machine_arch_type
# undef machine_arch_type
@@ -12025,18 +2641,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_pcm027() (0)
#endif
-#ifdef CONFIG_MACH_CMPXA
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CMPXA
-# endif
-# define machine_is_cmpxa() (machine_arch_type == MACH_TYPE_CMPXA)
-#else
-# define machine_is_cmpxa() (0)
-#endif
-
#ifdef CONFIG_MACH_ANUBIS
# ifdef machine_arch_type
# undef machine_arch_type
@@ -12049,102 +2653,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_anubis() (0)
#endif
-#ifdef CONFIG_MACH_ITE8152
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ITE8152
-# endif
-# define machine_is_ite8152() (machine_arch_type == MACH_TYPE_ITE8152)
-#else
-# define machine_is_ite8152() (0)
-#endif
-
-#ifdef CONFIG_MACH_LPC3XXX
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_LPC3XXX
-# endif
-# define machine_is_lpc3xxx() (machine_arch_type == MACH_TYPE_LPC3XXX)
-#else
-# define machine_is_lpc3xxx() (0)
-#endif
-
-#ifdef CONFIG_MACH_PUPPETEER
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_PUPPETEER
-# endif
-# define machine_is_puppeteer() (machine_arch_type == MACH_TYPE_PUPPETEER)
-#else
-# define machine_is_puppeteer() (0)
-#endif
-
-#ifdef CONFIG_MACH_E570
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_E570
-# endif
-# define machine_is_e570() (machine_arch_type == MACH_TYPE_E570)
-#else
-# define machine_is_e570() (0)
-#endif
-
-#ifdef CONFIG_MACH_X50
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_X50
-# endif
-# define machine_is_x50() (machine_arch_type == MACH_TYPE_X50)
-#else
-# define machine_is_x50() (0)
-#endif
-
-#ifdef CONFIG_MACH_RECON
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_RECON
-# endif
-# define machine_is_recon() (machine_arch_type == MACH_TYPE_RECON)
-#else
-# define machine_is_recon() (0)
-#endif
-
-#ifdef CONFIG_MACH_XBOARDGP8
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_XBOARDGP8
-# endif
-# define machine_is_xboardgp8() (machine_arch_type == MACH_TYPE_XBOARDGP8)
-#else
-# define machine_is_xboardgp8() (0)
-#endif
-
-#ifdef CONFIG_MACH_FPIC2
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_FPIC2
-# endif
-# define machine_is_fpic2() (machine_arch_type == MACH_TYPE_FPIC2)
-#else
-# define machine_is_fpic2() (0)
-#endif
-
#ifdef CONFIG_MACH_AKITA
# ifdef machine_arch_type
# undef machine_arch_type
@@ -12157,102 +2665,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_akita() (0)
#endif
-#ifdef CONFIG_MACH_A81
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_A81
-# endif
-# define machine_is_a81() (machine_arch_type == MACH_TYPE_A81)
-#else
-# define machine_is_a81() (0)
-#endif
-
-#ifdef CONFIG_MACH_SVM_SC25X
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SVM_SC25X
-# endif
-# define machine_is_svm_sc25x() (machine_arch_type == MACH_TYPE_SVM_SC25X)
-#else
-# define machine_is_svm_sc25x() (0)
-#endif
-
-#ifdef CONFIG_MACH_VADATECH020
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_VADATECH020
-# endif
-# define machine_is_vt020() (machine_arch_type == MACH_TYPE_VADATECH020)
-#else
-# define machine_is_vt020() (0)
-#endif
-
-#ifdef CONFIG_MACH_TLI
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_TLI
-# endif
-# define machine_is_tli() (machine_arch_type == MACH_TYPE_TLI)
-#else
-# define machine_is_tli() (0)
-#endif
-
-#ifdef CONFIG_MACH_EDB9315LC
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_EDB9315LC
-# endif
-# define machine_is_edb9315lc() (machine_arch_type == MACH_TYPE_EDB9315LC)
-#else
-# define machine_is_edb9315lc() (0)
-#endif
-
-#ifdef CONFIG_MACH_PASSEC
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_PASSEC
-# endif
-# define machine_is_passec() (machine_arch_type == MACH_TYPE_PASSEC)
-#else
-# define machine_is_passec() (0)
-#endif
-
-#ifdef CONFIG_MACH_DS_TIGER
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_DS_TIGER
-# endif
-# define machine_is_ds_tiger() (machine_arch_type == MACH_TYPE_DS_TIGER)
-#else
-# define machine_is_ds_tiger() (0)
-#endif
-
-#ifdef CONFIG_MACH_E310
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_E310
-# endif
-# define machine_is_e310() (machine_arch_type == MACH_TYPE_E310)
-#else
-# define machine_is_e310() (0)
-#endif
-
#ifdef CONFIG_MACH_E330
# ifdef machine_arch_type
# undef machine_arch_type
@@ -12265,18 +2677,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_e330() (0)
#endif
-#ifdef CONFIG_MACH_RT3000
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_RT3000
-# endif
-# define machine_is_rt3000() (machine_arch_type == MACH_TYPE_RT3000)
-#else
-# define machine_is_rt3000() (0)
-#endif
-
#ifdef CONFIG_MACH_NOKIA770
# ifdef machine_arch_type
# undef machine_arch_type
@@ -12289,162 +2689,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_nokia770() (0)
#endif
-#ifdef CONFIG_MACH_PNX0106
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_PNX0106
-# endif
-# define machine_is_pnx0106() (machine_arch_type == MACH_TYPE_PNX0106)
-#else
-# define machine_is_pnx0106() (0)
-#endif
-
-#ifdef CONFIG_MACH_HX21XX
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_HX21XX
-# endif
-# define machine_is_hx21xx() (machine_arch_type == MACH_TYPE_HX21XX)
-#else
-# define machine_is_hx21xx() (0)
-#endif
-
-#ifdef CONFIG_MACH_FARADAY
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_FARADAY
-# endif
-# define machine_is_faraday() (machine_arch_type == MACH_TYPE_FARADAY)
-#else
-# define machine_is_faraday() (0)
-#endif
-
-#ifdef CONFIG_MACH_SBC9312
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SBC9312
-# endif
-# define machine_is_sbc9312() (machine_arch_type == MACH_TYPE_SBC9312)
-#else
-# define machine_is_sbc9312() (0)
-#endif
-
-#ifdef CONFIG_MACH_BATMAN
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_BATMAN
-# endif
-# define machine_is_batman() (machine_arch_type == MACH_TYPE_BATMAN)
-#else
-# define machine_is_batman() (0)
-#endif
-
-#ifdef CONFIG_MACH_JPD201
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_JPD201
-# endif
-# define machine_is_jpd201() (machine_arch_type == MACH_TYPE_JPD201)
-#else
-# define machine_is_jpd201() (0)
-#endif
-
-#ifdef CONFIG_MACH_MIPSA
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MIPSA
-# endif
-# define machine_is_mipsa() (machine_arch_type == MACH_TYPE_MIPSA)
-#else
-# define machine_is_mipsa() (0)
-#endif
-
-#ifdef CONFIG_MACH_KACOM
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_KACOM
-# endif
-# define machine_is_kacom() (machine_arch_type == MACH_TYPE_KACOM)
-#else
-# define machine_is_kacom() (0)
-#endif
-
-#ifdef CONFIG_MACH_SWARCOCPU
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SWARCOCPU
-# endif
-# define machine_is_swarcocpu() (machine_arch_type == MACH_TYPE_SWARCOCPU)
-#else
-# define machine_is_swarcocpu() (0)
-#endif
-
-#ifdef CONFIG_MACH_SWARCODSL
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SWARCODSL
-# endif
-# define machine_is_swarcodsl() (machine_arch_type == MACH_TYPE_SWARCODSL)
-#else
-# define machine_is_swarcodsl() (0)
-#endif
-
-#ifdef CONFIG_MACH_BLUEANGEL
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_BLUEANGEL
-# endif
-# define machine_is_blueangel() (machine_arch_type == MACH_TYPE_BLUEANGEL)
-#else
-# define machine_is_blueangel() (0)
-#endif
-
-#ifdef CONFIG_MACH_HAIRYGRAMA
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_HAIRYGRAMA
-# endif
-# define machine_is_hairygrama() (machine_arch_type == MACH_TYPE_HAIRYGRAMA)
-#else
-# define machine_is_hairygrama() (0)
-#endif
-
-#ifdef CONFIG_MACH_BANFF
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_BANFF
-# endif
-# define machine_is_banff() (machine_arch_type == MACH_TYPE_BANFF)
-#else
-# define machine_is_banff() (0)
-#endif
-
#ifdef CONFIG_MACH_CARMEVA
# ifdef machine_arch_type
# undef machine_arch_type
@@ -12457,30 +2701,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_carmeva() (0)
#endif
-#ifdef CONFIG_MACH_SAM255
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SAM255
-# endif
-# define machine_is_sam255() (machine_arch_type == MACH_TYPE_SAM255)
-#else
-# define machine_is_sam255() (0)
-#endif
-
-#ifdef CONFIG_MACH_PPM10
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_PPM10
-# endif
-# define machine_is_ppm10() (machine_arch_type == MACH_TYPE_PPM10)
-#else
-# define machine_is_ppm10() (0)
-#endif
-
#ifdef CONFIG_MACH_EDB9315A
# ifdef machine_arch_type
# undef machine_arch_type
@@ -12493,18 +2713,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_edb9315a() (0)
#endif
-#ifdef CONFIG_MACH_SUNSET
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SUNSET
-# endif
-# define machine_is_sunset() (machine_arch_type == MACH_TYPE_SUNSET)
-#else
-# define machine_is_sunset() (0)
-#endif
-
#ifdef CONFIG_MACH_STARGATE2
# ifdef machine_arch_type
# undef machine_arch_type
@@ -12541,66 +2749,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_trizeps4() (0)
#endif
-#ifdef CONFIG_MACH_MAINSTONE2
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MAINSTONE2
-# endif
-# define machine_is_mainstone2() (machine_arch_type == MACH_TYPE_MAINSTONE2)
-#else
-# define machine_is_mainstone2() (0)
-#endif
-
-#ifdef CONFIG_MACH_EZ_IXP42X
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_EZ_IXP42X
-# endif
-# define machine_is_ez_ixp42x() (machine_arch_type == MACH_TYPE_EZ_IXP42X)
-#else
-# define machine_is_ez_ixp42x() (0)
-#endif
-
-#ifdef CONFIG_MACH_TAPWAVE_ZODIAC
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_TAPWAVE_ZODIAC
-# endif
-# define machine_is_tapwave_zodiac() (machine_arch_type == MACH_TYPE_TAPWAVE_ZODIAC)
-#else
-# define machine_is_tapwave_zodiac() (0)
-#endif
-
-#ifdef CONFIG_MACH_UNIVERSALMETER
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_UNIVERSALMETER
-# endif
-# define machine_is_universalmeter() (machine_arch_type == MACH_TYPE_UNIVERSALMETER)
-#else
-# define machine_is_universalmeter() (0)
-#endif
-
-#ifdef CONFIG_MACH_HICOARM9
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_HICOARM9
-# endif
-# define machine_is_hicoarm9() (machine_arch_type == MACH_TYPE_HICOARM9)
-#else
-# define machine_is_hicoarm9() (0)
-#endif
-
#ifdef CONFIG_MACH_PNX4008
# ifdef machine_arch_type
# undef machine_arch_type
@@ -12613,54 +2761,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_pnx4008() (0)
#endif
-#ifdef CONFIG_MACH_KWS6000
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_KWS6000
-# endif
-# define machine_is_kws6000() (machine_arch_type == MACH_TYPE_KWS6000)
-#else
-# define machine_is_kws6000() (0)
-#endif
-
-#ifdef CONFIG_MACH_PORTUX920T
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_PORTUX920T
-# endif
-# define machine_is_portux920t() (machine_arch_type == MACH_TYPE_PORTUX920T)
-#else
-# define machine_is_portux920t() (0)
-#endif
-
-#ifdef CONFIG_MACH_EZ_X5
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_EZ_X5
-# endif
-# define machine_is_ez_x5() (machine_arch_type == MACH_TYPE_EZ_X5)
-#else
-# define machine_is_ez_x5() (0)
-#endif
-
-#ifdef CONFIG_MACH_OMAP_RUDOLPH
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_OMAP_RUDOLPH
-# endif
-# define machine_is_omap_rudolph() (machine_arch_type == MACH_TYPE_OMAP_RUDOLPH)
-#else
-# define machine_is_omap_rudolph() (0)
-#endif
-
#ifdef CONFIG_MACH_CPUAT91
# ifdef machine_arch_type
# undef machine_arch_type
@@ -12673,138 +2773,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_cpuat91() (0)
#endif
-#ifdef CONFIG_MACH_REA9200
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_REA9200
-# endif
-# define machine_is_rea9200() (machine_arch_type == MACH_TYPE_REA9200)
-#else
-# define machine_is_rea9200() (0)
-#endif
-
-#ifdef CONFIG_MACH_ACTS_PUNE_SA1110
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ACTS_PUNE_SA1110
-# endif
-# define machine_is_acts_pune_sa1110() (machine_arch_type == MACH_TYPE_ACTS_PUNE_SA1110)
-#else
-# define machine_is_acts_pune_sa1110() (0)
-#endif
-
-#ifdef CONFIG_MACH_IXP425
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_IXP425
-# endif
-# define machine_is_ixp425() (machine_arch_type == MACH_TYPE_IXP425)
-#else
-# define machine_is_ixp425() (0)
-#endif
-
-#ifdef CONFIG_MACH_I30030ADS
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_I30030ADS
-# endif
-# define machine_is_i30030ads() (machine_arch_type == MACH_TYPE_I30030ADS)
-#else
-# define machine_is_i30030ads() (0)
-#endif
-
-#ifdef CONFIG_MACH_PERCH
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_PERCH
-# endif
-# define machine_is_perch() (machine_arch_type == MACH_TYPE_PERCH)
-#else
-# define machine_is_perch() (0)
-#endif
-
-#ifdef CONFIG_MACH_EIS05R1
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_EIS05R1
-# endif
-# define machine_is_eis05r1() (machine_arch_type == MACH_TYPE_EIS05R1)
-#else
-# define machine_is_eis05r1() (0)
-#endif
-
-#ifdef CONFIG_MACH_PEPPERPAD
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_PEPPERPAD
-# endif
-# define machine_is_pepperpad() (machine_arch_type == MACH_TYPE_PEPPERPAD)
-#else
-# define machine_is_pepperpad() (0)
-#endif
-
-#ifdef CONFIG_MACH_SB3010
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SB3010
-# endif
-# define machine_is_sb3010() (machine_arch_type == MACH_TYPE_SB3010)
-#else
-# define machine_is_sb3010() (0)
-#endif
-
-#ifdef CONFIG_MACH_RM9200
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_RM9200
-# endif
-# define machine_is_rm9200() (machine_arch_type == MACH_TYPE_RM9200)
-#else
-# define machine_is_rm9200() (0)
-#endif
-
-#ifdef CONFIG_MACH_DMA03
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_DMA03
-# endif
-# define machine_is_dma03() (machine_arch_type == MACH_TYPE_DMA03)
-#else
-# define machine_is_dma03() (0)
-#endif
-
-#ifdef CONFIG_MACH_ROAD_S101
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ROAD_S101
-# endif
-# define machine_is_road_s101() (machine_arch_type == MACH_TYPE_ROAD_S101)
-#else
-# define machine_is_road_s101() (0)
-#endif
-
#ifdef CONFIG_MACH_IQ81340SC
# ifdef machine_arch_type
# undef machine_arch_type
@@ -12817,18 +2785,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_iq81340sc() (0)
#endif
-#ifdef CONFIG_MACH_IQ_NEXTGEN_B
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_IQ_NEXTGEN_B
-# endif
-# define machine_is_iq_nextgen_b() (machine_arch_type == MACH_TYPE_IQ_NEXTGEN_B)
-#else
-# define machine_is_iq_nextgen_b() (0)
-#endif
-
#ifdef CONFIG_MACH_IQ81340MC
# ifdef machine_arch_type
# undef machine_arch_type
@@ -12841,114 +2797,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_iq81340mc() (0)
#endif
-#ifdef CONFIG_MACH_IQ_NEXTGEN_D
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_IQ_NEXTGEN_D
-# endif
-# define machine_is_iq_nextgen_d() (machine_arch_type == MACH_TYPE_IQ_NEXTGEN_D)
-#else
-# define machine_is_iq_nextgen_d() (0)
-#endif
-
-#ifdef CONFIG_MACH_IQ_NEXTGEN_E
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_IQ_NEXTGEN_E
-# endif
-# define machine_is_iq_nextgen_e() (machine_arch_type == MACH_TYPE_IQ_NEXTGEN_E)
-#else
-# define machine_is_iq_nextgen_e() (0)
-#endif
-
-#ifdef CONFIG_MACH_MALLOW_AT91
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MALLOW_AT91
-# endif
-# define machine_is_mallow_at91() (machine_arch_type == MACH_TYPE_MALLOW_AT91)
-#else
-# define machine_is_mallow_at91() (0)
-#endif
-
-#ifdef CONFIG_MACH_CYBERTRACKER_I
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CYBERTRACKER_I
-# endif
-# define machine_is_cybertracker_i() (machine_arch_type == MACH_TYPE_CYBERTRACKER_I)
-#else
-# define machine_is_cybertracker_i() (0)
-#endif
-
-#ifdef CONFIG_MACH_GESBC931X
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_GESBC931X
-# endif
-# define machine_is_gesbc931x() (machine_arch_type == MACH_TYPE_GESBC931X)
-#else
-# define machine_is_gesbc931x() (0)
-#endif
-
-#ifdef CONFIG_MACH_CENTIPAD
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CENTIPAD
-# endif
-# define machine_is_centipad() (machine_arch_type == MACH_TYPE_CENTIPAD)
-#else
-# define machine_is_centipad() (0)
-#endif
-
-#ifdef CONFIG_MACH_ARMSOC
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ARMSOC
-# endif
-# define machine_is_armsoc() (machine_arch_type == MACH_TYPE_ARMSOC)
-#else
-# define machine_is_armsoc() (0)
-#endif
-
-#ifdef CONFIG_MACH_SE4200
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SE4200
-# endif
-# define machine_is_se4200() (machine_arch_type == MACH_TYPE_SE4200)
-#else
-# define machine_is_se4200() (0)
-#endif
-
-#ifdef CONFIG_MACH_EMS197A
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_EMS197A
-# endif
-# define machine_is_ems197a() (machine_arch_type == MACH_TYPE_EMS197A)
-#else
-# define machine_is_ems197a() (0)
-#endif
-
#ifdef CONFIG_MACH_MICRO9
# ifdef machine_arch_type
# undef machine_arch_type
@@ -12973,54 +2821,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_micro9l() (0)
#endif
-#ifdef CONFIG_MACH_UC5471DSP
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_UC5471DSP
-# endif
-# define machine_is_uc5471dsp() (machine_arch_type == MACH_TYPE_UC5471DSP)
-#else
-# define machine_is_uc5471dsp() (0)
-#endif
-
-#ifdef CONFIG_MACH_SJ5471ENG
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SJ5471ENG
-# endif
-# define machine_is_sj5471eng() (machine_arch_type == MACH_TYPE_SJ5471ENG)
-#else
-# define machine_is_sj5471eng() (0)
-#endif
-
-#ifdef CONFIG_MACH_CMPXA26X
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CMPXA26X
-# endif
-# define machine_is_none() (machine_arch_type == MACH_TYPE_CMPXA26X)
-#else
-# define machine_is_none() (0)
-#endif
-
-#ifdef CONFIG_MACH_NC
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_NC
-# endif
-# define machine_is_nc1() (machine_arch_type == MACH_TYPE_NC)
-#else
-# define machine_is_nc1() (0)
-#endif
-
#ifdef CONFIG_MACH_OMAP_PALMTE
# ifdef machine_arch_type
# undef machine_arch_type
@@ -13033,114 +2833,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_omap_palmte() (0)
#endif
-#ifdef CONFIG_MACH_AJAX52X
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_AJAX52X
-# endif
-# define machine_is_ajax52x() (machine_arch_type == MACH_TYPE_AJAX52X)
-#else
-# define machine_is_ajax52x() (0)
-#endif
-
-#ifdef CONFIG_MACH_SIRIUSTAR
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SIRIUSTAR
-# endif
-# define machine_is_siriustar() (machine_arch_type == MACH_TYPE_SIRIUSTAR)
-#else
-# define machine_is_siriustar() (0)
-#endif
-
-#ifdef CONFIG_MACH_IODATA_HDLG
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_IODATA_HDLG
-# endif
-# define machine_is_iodata_hdlg() (machine_arch_type == MACH_TYPE_IODATA_HDLG)
-#else
-# define machine_is_iodata_hdlg() (0)
-#endif
-
-#ifdef CONFIG_MACH_AT91RM9200UTL
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_AT91RM9200UTL
-# endif
-# define machine_is_at91rm9200utl() (machine_arch_type == MACH_TYPE_AT91RM9200UTL)
-#else
-# define machine_is_at91rm9200utl() (0)
-#endif
-
-#ifdef CONFIG_MACH_BIOSAFE
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_BIOSAFE
-# endif
-# define machine_is_biosafe() (machine_arch_type == MACH_TYPE_BIOSAFE)
-#else
-# define machine_is_biosafe() (0)
-#endif
-
-#ifdef CONFIG_MACH_MP1000
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MP1000
-# endif
-# define machine_is_mp1000() (machine_arch_type == MACH_TYPE_MP1000)
-#else
-# define machine_is_mp1000() (0)
-#endif
-
-#ifdef CONFIG_MACH_PARSY
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_PARSY
-# endif
-# define machine_is_parsy() (machine_arch_type == MACH_TYPE_PARSY)
-#else
-# define machine_is_parsy() (0)
-#endif
-
-#ifdef CONFIG_MACH_CCXP
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CCXP
-# endif
-# define machine_is_ccxp270() (machine_arch_type == MACH_TYPE_CCXP)
-#else
-# define machine_is_ccxp270() (0)
-#endif
-
-#ifdef CONFIG_MACH_OMAP_GSAMPLE
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_OMAP_GSAMPLE
-# endif
-# define machine_is_omap_gsample() (machine_arch_type == MACH_TYPE_OMAP_GSAMPLE)
-#else
-# define machine_is_omap_gsample() (0)
-#endif
-
#ifdef CONFIG_MACH_REALVIEW_EB
# ifdef machine_arch_type
# undef machine_arch_type
@@ -13153,42 +2845,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_realview_eb() (0)
#endif
-#ifdef CONFIG_MACH_SAMOA
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SAMOA
-# endif
-# define machine_is_samoa() (machine_arch_type == MACH_TYPE_SAMOA)
-#else
-# define machine_is_samoa() (0)
-#endif
-
-#ifdef CONFIG_MACH_PALMT3
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_PALMT3
-# endif
-# define machine_is_palmt3() (machine_arch_type == MACH_TYPE_PALMT3)
-#else
-# define machine_is_palmt3() (0)
-#endif
-
-#ifdef CONFIG_MACH_I878
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_I878
-# endif
-# define machine_is_i878() (machine_arch_type == MACH_TYPE_I878)
-#else
-# define machine_is_i878() (0)
-#endif
-
#ifdef CONFIG_MACH_BORZOI
# ifdef machine_arch_type
# undef machine_arch_type
@@ -13201,42 +2857,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_borzoi() (0)
#endif
-#ifdef CONFIG_MACH_GECKO
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_GECKO
-# endif
-# define machine_is_gecko() (machine_arch_type == MACH_TYPE_GECKO)
-#else
-# define machine_is_gecko() (0)
-#endif
-
-#ifdef CONFIG_MACH_DS101
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_DS101
-# endif
-# define machine_is_ds101() (machine_arch_type == MACH_TYPE_DS101)
-#else
-# define machine_is_ds101() (0)
-#endif
-
-#ifdef CONFIG_MACH_OMAP_PALMTT2
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_OMAP_PALMTT2
-# endif
-# define machine_is_omap_palmtt2() (machine_arch_type == MACH_TYPE_OMAP_PALMTT2)
-#else
-# define machine_is_omap_palmtt2() (0)
-#endif
-
#ifdef CONFIG_MACH_PALMLD
# ifdef machine_arch_type
# undef machine_arch_type
@@ -13249,30 +2869,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_palmld() (0)
#endif
-#ifdef CONFIG_MACH_CC9C
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CC9C
-# endif
-# define machine_is_cc9c() (machine_arch_type == MACH_TYPE_CC9C)
-#else
-# define machine_is_cc9c() (0)
-#endif
-
-#ifdef CONFIG_MACH_SBC1670
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SBC1670
-# endif
-# define machine_is_sbc1670() (machine_arch_type == MACH_TYPE_SBC1670)
-#else
-# define machine_is_sbc1670() (0)
-#endif
-
#ifdef CONFIG_MACH_IXDP28X5
# ifdef machine_arch_type
# undef machine_arch_type
@@ -13297,18 +2893,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_omap_palmtt() (0)
#endif
-#ifdef CONFIG_MACH_ML696K
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ML696K
-# endif
-# define machine_is_ml696k() (machine_arch_type == MACH_TYPE_ML696K)
-#else
-# define machine_is_ml696k() (0)
-#endif
-
#ifdef CONFIG_MACH_ARCOM_ZEUS
# ifdef machine_arch_type
# undef machine_arch_type
@@ -13333,18 +2917,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_osiris() (0)
#endif
-#ifdef CONFIG_MACH_MAESTRO
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MAESTRO
-# endif
-# define machine_is_maestro() (machine_arch_type == MACH_TYPE_MAESTRO)
-#else
-# define machine_is_maestro() (0)
-#endif
-
#ifdef CONFIG_MACH_PALMTE2
# ifdef machine_arch_type
# undef machine_arch_type
@@ -13357,18 +2929,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_palmte2() (0)
#endif
-#ifdef CONFIG_MACH_IXBBM
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_IXBBM
-# endif
-# define machine_is_ixbbm() (machine_arch_type == MACH_TYPE_IXBBM)
-#else
-# define machine_is_ixbbm() (0)
-#endif
-
#ifdef CONFIG_MACH_MX27ADS
# ifdef machine_arch_type
# undef machine_arch_type
@@ -13381,18 +2941,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_mx27ads() (0)
#endif
-#ifdef CONFIG_MACH_AX8004
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_AX8004
-# endif
-# define machine_is_ax8004() (machine_arch_type == MACH_TYPE_AX8004)
-#else
-# define machine_is_ax8004() (0)
-#endif
-
#ifdef CONFIG_MACH_AT91SAM9261EK
# ifdef machine_arch_type
# undef machine_arch_type
@@ -13417,18 +2965,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_loft() (0)
#endif
-#ifdef CONFIG_MACH_MAGPIE
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MAGPIE
-# endif
-# define machine_is_magpie() (machine_arch_type == MACH_TYPE_MAGPIE)
-#else
-# define machine_is_magpie() (0)
-#endif
-
#ifdef CONFIG_MACH_MX21ADS
# ifdef machine_arch_type
# undef machine_arch_type
@@ -13441,126 +2977,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_mx21ads() (0)
#endif
-#ifdef CONFIG_MACH_MB87M3400
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MB87M3400
-# endif
-# define machine_is_mb87m3400() (machine_arch_type == MACH_TYPE_MB87M3400)
-#else
-# define machine_is_mb87m3400() (0)
-#endif
-
-#ifdef CONFIG_MACH_MGUARD_DELTA
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MGUARD_DELTA
-# endif
-# define machine_is_mguard_delta() (machine_arch_type == MACH_TYPE_MGUARD_DELTA)
-#else
-# define machine_is_mguard_delta() (0)
-#endif
-
-#ifdef CONFIG_MACH_DAVINCI_DVDP
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_DAVINCI_DVDP
-# endif
-# define machine_is_davinci_dvdp() (machine_arch_type == MACH_TYPE_DAVINCI_DVDP)
-#else
-# define machine_is_davinci_dvdp() (0)
-#endif
-
-#ifdef CONFIG_MACH_HTCUNIVERSAL
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_HTCUNIVERSAL
-# endif
-# define machine_is_htcuniversal() (machine_arch_type == MACH_TYPE_HTCUNIVERSAL)
-#else
-# define machine_is_htcuniversal() (0)
-#endif
-
-#ifdef CONFIG_MACH_TPAD
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_TPAD
-# endif
-# define machine_is_tpad() (machine_arch_type == MACH_TYPE_TPAD)
-#else
-# define machine_is_tpad() (0)
-#endif
-
-#ifdef CONFIG_MACH_ROVERP3
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ROVERP3
-# endif
-# define machine_is_roverp3() (machine_arch_type == MACH_TYPE_ROVERP3)
-#else
-# define machine_is_roverp3() (0)
-#endif
-
-#ifdef CONFIG_MACH_JORNADA928
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_JORNADA928
-# endif
-# define machine_is_jornada928() (machine_arch_type == MACH_TYPE_JORNADA928)
-#else
-# define machine_is_jornada928() (0)
-#endif
-
-#ifdef CONFIG_MACH_MV88FXX81
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MV88FXX81
-# endif
-# define machine_is_mv88fxx81() (machine_arch_type == MACH_TYPE_MV88FXX81)
-#else
-# define machine_is_mv88fxx81() (0)
-#endif
-
-#ifdef CONFIG_MACH_STMP36XX
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_STMP36XX
-# endif
-# define machine_is_stmp36xx() (machine_arch_type == MACH_TYPE_STMP36XX)
-#else
-# define machine_is_stmp36xx() (0)
-#endif
-
-#ifdef CONFIG_MACH_SXNI79524
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SXNI79524
-# endif
-# define machine_is_sxni79524() (machine_arch_type == MACH_TYPE_SXNI79524)
-#else
-# define machine_is_sxni79524() (0)
-#endif
-
#ifdef CONFIG_MACH_AMS_DELTA
# ifdef machine_arch_type
# undef machine_arch_type
@@ -13573,30 +2989,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_ams_delta() (0)
#endif
-#ifdef CONFIG_MACH_URANIUM
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_URANIUM
-# endif
-# define machine_is_uranium() (machine_arch_type == MACH_TYPE_URANIUM)
-#else
-# define machine_is_uranium() (0)
-#endif
-
-#ifdef CONFIG_MACH_UCON
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_UCON
-# endif
-# define machine_is_ucon() (machine_arch_type == MACH_TYPE_UCON)
-#else
-# define machine_is_ucon() (0)
-#endif
-
#ifdef CONFIG_MACH_NAS100D
# ifdef machine_arch_type
# undef machine_arch_type
@@ -13609,114 +3001,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_nas100d() (0)
#endif
-#ifdef CONFIG_MACH_L083_1000
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_L083_1000
-# endif
-# define machine_is_l083() (machine_arch_type == MACH_TYPE_L083_1000)
-#else
-# define machine_is_l083() (0)
-#endif
-
-#ifdef CONFIG_MACH_EZX
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_EZX
-# endif
-# define machine_is_ezx() (machine_arch_type == MACH_TYPE_EZX)
-#else
-# define machine_is_ezx() (0)
-#endif
-
-#ifdef CONFIG_MACH_PNX5220
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_PNX5220
-# endif
-# define machine_is_pnx5220() (machine_arch_type == MACH_TYPE_PNX5220)
-#else
-# define machine_is_pnx5220() (0)
-#endif
-
-#ifdef CONFIG_MACH_BUTTE
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_BUTTE
-# endif
-# define machine_is_butte() (machine_arch_type == MACH_TYPE_BUTTE)
-#else
-# define machine_is_butte() (0)
-#endif
-
-#ifdef CONFIG_MACH_SRM2
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SRM2
-# endif
-# define machine_is_srm2() (machine_arch_type == MACH_TYPE_SRM2)
-#else
-# define machine_is_srm2() (0)
-#endif
-
-#ifdef CONFIG_MACH_DSBR
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_DSBR
-# endif
-# define machine_is_dsbr() (machine_arch_type == MACH_TYPE_DSBR)
-#else
-# define machine_is_dsbr() (0)
-#endif
-
-#ifdef CONFIG_MACH_CRYSTALBALL
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CRYSTALBALL
-# endif
-# define machine_is_crystalball() (machine_arch_type == MACH_TYPE_CRYSTALBALL)
-#else
-# define machine_is_crystalball() (0)
-#endif
-
-#ifdef CONFIG_MACH_TINYPXA27X
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_TINYPXA27X
-# endif
-# define machine_is_tinypxa27x() (machine_arch_type == MACH_TYPE_TINYPXA27X)
-#else
-# define machine_is_tinypxa27x() (0)
-#endif
-
-#ifdef CONFIG_MACH_HERBIE
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_HERBIE
-# endif
-# define machine_is_herbie() (machine_arch_type == MACH_TYPE_HERBIE)
-#else
-# define machine_is_herbie() (0)
-#endif
-
#ifdef CONFIG_MACH_MAGICIAN
# ifdef machine_arch_type
# undef machine_arch_type
@@ -13729,54 +3013,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_magician() (0)
#endif
-#ifdef CONFIG_MACH_CM4002
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CM4002
-# endif
-# define machine_is_cm4002() (machine_arch_type == MACH_TYPE_CM4002)
-#else
-# define machine_is_cm4002() (0)
-#endif
-
-#ifdef CONFIG_MACH_B4
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_B4
-# endif
-# define machine_is_b4() (machine_arch_type == MACH_TYPE_B4)
-#else
-# define machine_is_b4() (0)
-#endif
-
-#ifdef CONFIG_MACH_MAUI
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MAUI
-# endif
-# define machine_is_maui() (machine_arch_type == MACH_TYPE_MAUI)
-#else
-# define machine_is_maui() (0)
-#endif
-
-#ifdef CONFIG_MACH_CYBERTRACKER_G
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CYBERTRACKER_G
-# endif
-# define machine_is_cybertracker_g() (machine_arch_type == MACH_TYPE_CYBERTRACKER_G)
-#else
-# define machine_is_cybertracker_g() (0)
-#endif
-
#ifdef CONFIG_MACH_NXDKN
# ifdef machine_arch_type
# undef machine_arch_type
@@ -13789,54 +3025,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_nxdkn() (0)
#endif
-#ifdef CONFIG_MACH_MIO8390
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MIO8390
-# endif
-# define machine_is_mio8390() (machine_arch_type == MACH_TYPE_MIO8390)
-#else
-# define machine_is_mio8390() (0)
-#endif
-
-#ifdef CONFIG_MACH_OMI_BOARD
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_OMI_BOARD
-# endif
-# define machine_is_omi_board() (machine_arch_type == MACH_TYPE_OMI_BOARD)
-#else
-# define machine_is_omi_board() (0)
-#endif
-
-#ifdef CONFIG_MACH_MX21CIV
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MX21CIV
-# endif
-# define machine_is_mx21civ() (machine_arch_type == MACH_TYPE_MX21CIV)
-#else
-# define machine_is_mx21civ() (0)
-#endif
-
-#ifdef CONFIG_MACH_MAHI_CDAC
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MAHI_CDAC
-# endif
-# define machine_is_mahi_cdac() (machine_arch_type == MACH_TYPE_MAHI_CDAC)
-#else
-# define machine_is_mahi_cdac() (0)
-#endif
-
#ifdef CONFIG_MACH_PALMTX
# ifdef machine_arch_type
# undef machine_arch_type
@@ -13861,30 +3049,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_s3c2413() (0)
#endif
-#ifdef CONFIG_MACH_SAMSYS_EP0
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SAMSYS_EP0
-# endif
-# define machine_is_samsys_ep0() (machine_arch_type == MACH_TYPE_SAMSYS_EP0)
-#else
-# define machine_is_samsys_ep0() (0)
-#endif
-
-#ifdef CONFIG_MACH_WG302V1
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_WG302V1
-# endif
-# define machine_is_wg302v1() (machine_arch_type == MACH_TYPE_WG302V1)
-#else
-# define machine_is_wg302v1() (0)
-#endif
-
#ifdef CONFIG_MACH_WG302V2
# ifdef machine_arch_type
# undef machine_arch_type
@@ -13897,114 +3061,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_wg302v2() (0)
#endif
-#ifdef CONFIG_MACH_EB42X
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_EB42X
-# endif
-# define machine_is_eb42x() (machine_arch_type == MACH_TYPE_EB42X)
-#else
-# define machine_is_eb42x() (0)
-#endif
-
-#ifdef CONFIG_MACH_IQ331ES
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_IQ331ES
-# endif
-# define machine_is_iq331es() (machine_arch_type == MACH_TYPE_IQ331ES)
-#else
-# define machine_is_iq331es() (0)
-#endif
-
-#ifdef CONFIG_MACH_COSYDSP
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_COSYDSP
-# endif
-# define machine_is_cosydsp() (machine_arch_type == MACH_TYPE_COSYDSP)
-#else
-# define machine_is_cosydsp() (0)
-#endif
-
-#ifdef CONFIG_MACH_UPLAT7D
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_UPLAT7D
-# endif
-# define machine_is_uplat7d_proto() (machine_arch_type == MACH_TYPE_UPLAT7D)
-#else
-# define machine_is_uplat7d_proto() (0)
-#endif
-
-#ifdef CONFIG_MACH_PTDAVINCI
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_PTDAVINCI
-# endif
-# define machine_is_ptdavinci() (machine_arch_type == MACH_TYPE_PTDAVINCI)
-#else
-# define machine_is_ptdavinci() (0)
-#endif
-
-#ifdef CONFIG_MACH_MBUS
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MBUS
-# endif
-# define machine_is_mbus() (machine_arch_type == MACH_TYPE_MBUS)
-#else
-# define machine_is_mbus() (0)
-#endif
-
-#ifdef CONFIG_MACH_NADIA2VB
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_NADIA2VB
-# endif
-# define machine_is_nadia2vb() (machine_arch_type == MACH_TYPE_NADIA2VB)
-#else
-# define machine_is_nadia2vb() (0)
-#endif
-
-#ifdef CONFIG_MACH_R1000
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_R1000
-# endif
-# define machine_is_r1000() (machine_arch_type == MACH_TYPE_R1000)
-#else
-# define machine_is_r1000() (0)
-#endif
-
-#ifdef CONFIG_MACH_HW90250
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_HW90250
-# endif
-# define machine_is_hw90250() (machine_arch_type == MACH_TYPE_HW90250)
-#else
-# define machine_is_hw90250() (0)
-#endif
-
#ifdef CONFIG_MACH_OMAP_2430SDP
# ifdef machine_arch_type
# undef machine_arch_type
@@ -14029,30 +3085,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_davinci_evm() (0)
#endif
-#ifdef CONFIG_MACH_OMAP_TORNADO
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_OMAP_TORNADO
-# endif
-# define machine_is_omap_tornado() (machine_arch_type == MACH_TYPE_OMAP_TORNADO)
-#else
-# define machine_is_omap_tornado() (0)
-#endif
-
-#ifdef CONFIG_MACH_OLOCREEK
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_OLOCREEK
-# endif
-# define machine_is_olocreek() (machine_arch_type == MACH_TYPE_OLOCREEK)
-#else
-# define machine_is_olocreek() (0)
-#endif
-
#ifdef CONFIG_MACH_PALMZ72
# ifdef machine_arch_type
# undef machine_arch_type
@@ -14077,138 +3109,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_nxdb500() (0)
#endif
-#ifdef CONFIG_MACH_APF9328
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_APF9328
-# endif
-# define machine_is_apf9328() (machine_arch_type == MACH_TYPE_APF9328)
-#else
-# define machine_is_apf9328() (0)
-#endif
-
-#ifdef CONFIG_MACH_OMAP_WIPOQ
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_OMAP_WIPOQ
-# endif
-# define machine_is_omap_wipoq() (machine_arch_type == MACH_TYPE_OMAP_WIPOQ)
-#else
-# define machine_is_omap_wipoq() (0)
-#endif
-
-#ifdef CONFIG_MACH_OMAP_TWIP
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_OMAP_TWIP
-# endif
-# define machine_is_omap_twip() (machine_arch_type == MACH_TYPE_OMAP_TWIP)
-#else
-# define machine_is_omap_twip() (0)
-#endif
-
-#ifdef CONFIG_MACH_TREO650
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_TREO650
-# endif
-# define machine_is_treo650() (machine_arch_type == MACH_TYPE_TREO650)
-#else
-# define machine_is_treo650() (0)
-#endif
-
-#ifdef CONFIG_MACH_ACUMEN
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ACUMEN
-# endif
-# define machine_is_acumen() (machine_arch_type == MACH_TYPE_ACUMEN)
-#else
-# define machine_is_acumen() (0)
-#endif
-
-#ifdef CONFIG_MACH_XP100
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_XP100
-# endif
-# define machine_is_xp100() (machine_arch_type == MACH_TYPE_XP100)
-#else
-# define machine_is_xp100() (0)
-#endif
-
-#ifdef CONFIG_MACH_FS2410
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_FS2410
-# endif
-# define machine_is_fs2410() (machine_arch_type == MACH_TYPE_FS2410)
-#else
-# define machine_is_fs2410() (0)
-#endif
-
-#ifdef CONFIG_MACH_PXA270_CERF
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_PXA270_CERF
-# endif
-# define machine_is_pxa270_cerf() (machine_arch_type == MACH_TYPE_PXA270_CERF)
-#else
-# define machine_is_pxa270_cerf() (0)
-#endif
-
-#ifdef CONFIG_MACH_SQ2FTLPALM
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SQ2FTLPALM
-# endif
-# define machine_is_sq2ftlpalm() (machine_arch_type == MACH_TYPE_SQ2FTLPALM)
-#else
-# define machine_is_sq2ftlpalm() (0)
-#endif
-
-#ifdef CONFIG_MACH_BSEMSERVER
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_BSEMSERVER
-# endif
-# define machine_is_bsemserver() (machine_arch_type == MACH_TYPE_BSEMSERVER)
-#else
-# define machine_is_bsemserver() (0)
-#endif
-
-#ifdef CONFIG_MACH_NETCLIENT
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_NETCLIENT
-# endif
-# define machine_is_netclient() (machine_arch_type == MACH_TYPE_NETCLIENT)
-#else
-# define machine_is_netclient() (0)
-#endif
-
#ifdef CONFIG_MACH_PALMT5
# ifdef machine_arch_type
# undef machine_arch_type
@@ -14245,42 +3145,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_omap_apollon() (0)
#endif
-#ifdef CONFIG_MACH_MXC30030EVB
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MXC30030EVB
-# endif
-# define machine_is_mxc30030evb() (machine_arch_type == MACH_TYPE_MXC30030EVB)
-#else
-# define machine_is_mxc30030evb() (0)
-#endif
-
-#ifdef CONFIG_MACH_REA_2D
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_REA_2D
-# endif
-# define machine_is_rea_cpu2() (machine_arch_type == MACH_TYPE_REA_2D)
-#else
-# define machine_is_rea_cpu2() (0)
-#endif
-
-#ifdef CONFIG_MACH_TI3E524
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_TI3E524
-# endif
-# define machine_is_eti3e524() (machine_arch_type == MACH_TYPE_TI3E524)
-#else
-# define machine_is_eti3e524() (0)
-#endif
-
#ifdef CONFIG_MACH_ATEB9200
# ifdef machine_arch_type
# undef machine_arch_type
@@ -14293,42 +3157,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_ateb9200() (0)
#endif
-#ifdef CONFIG_MACH_AUCKLAND
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_AUCKLAND
-# endif
-# define machine_is_auckland() (machine_arch_type == MACH_TYPE_AUCKLAND)
-#else
-# define machine_is_auckland() (0)
-#endif
-
-#ifdef CONFIG_MACH_AK3320M
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_AK3320M
-# endif
-# define machine_is_ak3220m() (machine_arch_type == MACH_TYPE_AK3320M)
-#else
-# define machine_is_ak3220m() (0)
-#endif
-
-#ifdef CONFIG_MACH_DURAMAX
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_DURAMAX
-# endif
-# define machine_is_duramax() (machine_arch_type == MACH_TYPE_DURAMAX)
-#else
-# define machine_is_duramax() (0)
-#endif
-
#ifdef CONFIG_MACH_N35
# ifdef machine_arch_type
# undef machine_arch_type
@@ -14341,30 +3169,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_n35() (0)
#endif
-#ifdef CONFIG_MACH_PRONGHORN
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_PRONGHORN
-# endif
-# define machine_is_pronghorn() (machine_arch_type == MACH_TYPE_PRONGHORN)
-#else
-# define machine_is_pronghorn() (0)
-#endif
-
-#ifdef CONFIG_MACH_FUNDY
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_FUNDY
-# endif
-# define machine_is_fundy() (machine_arch_type == MACH_TYPE_FUNDY)
-#else
-# define machine_is_fundy() (0)
-#endif
-
#ifdef CONFIG_MACH_LOGICPD_PXA270
# ifdef machine_arch_type
# undef machine_arch_type
@@ -14377,126 +3181,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_logicpd_pxa270() (0)
#endif
-#ifdef CONFIG_MACH_CPU777
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CPU777
-# endif
-# define machine_is_cpu777() (machine_arch_type == MACH_TYPE_CPU777)
-#else
-# define machine_is_cpu777() (0)
-#endif
-
-#ifdef CONFIG_MACH_SIMICON9201
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SIMICON9201
-# endif
-# define machine_is_simicon9201() (machine_arch_type == MACH_TYPE_SIMICON9201)
-#else
-# define machine_is_simicon9201() (0)
-#endif
-
-#ifdef CONFIG_MACH_LEAP2_HPM
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_LEAP2_HPM
-# endif
-# define machine_is_leap2_hpm() (machine_arch_type == MACH_TYPE_LEAP2_HPM)
-#else
-# define machine_is_leap2_hpm() (0)
-#endif
-
-#ifdef CONFIG_MACH_CM922TXA10
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CM922TXA10
-# endif
-# define machine_is_cm922txa10() (machine_arch_type == MACH_TYPE_CM922TXA10)
-#else
-# define machine_is_cm922txa10() (0)
-#endif
-
-#ifdef CONFIG_MACH_PXA
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_PXA
-# endif
-# define machine_is_sandgate() (machine_arch_type == MACH_TYPE_PXA)
-#else
-# define machine_is_sandgate() (0)
-#endif
-
-#ifdef CONFIG_MACH_SANDGATE2
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SANDGATE2
-# endif
-# define machine_is_sandgate2() (machine_arch_type == MACH_TYPE_SANDGATE2)
-#else
-# define machine_is_sandgate2() (0)
-#endif
-
-#ifdef CONFIG_MACH_SANDGATE2G
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SANDGATE2G
-# endif
-# define machine_is_sandgate2g() (machine_arch_type == MACH_TYPE_SANDGATE2G)
-#else
-# define machine_is_sandgate2g() (0)
-#endif
-
-#ifdef CONFIG_MACH_SANDGATE2P
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SANDGATE2P
-# endif
-# define machine_is_sandgate2p() (machine_arch_type == MACH_TYPE_SANDGATE2P)
-#else
-# define machine_is_sandgate2p() (0)
-#endif
-
-#ifdef CONFIG_MACH_FRED_JACK
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_FRED_JACK
-# endif
-# define machine_is_fred_jack() (machine_arch_type == MACH_TYPE_FRED_JACK)
-#else
-# define machine_is_fred_jack() (0)
-#endif
-
-#ifdef CONFIG_MACH_TTG_COLOR1
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_TTG_COLOR1
-# endif
-# define machine_is_ttg_color1() (machine_arch_type == MACH_TYPE_TTG_COLOR1)
-#else
-# define machine_is_ttg_color1() (0)
-#endif
-
#ifdef CONFIG_MACH_NXEB500HMI
# ifdef machine_arch_type
# undef machine_arch_type
@@ -14509,78 +3193,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_nxeb500hmi() (0)
#endif
-#ifdef CONFIG_MACH_NETDCU8
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_NETDCU8
-# endif
-# define machine_is_netdcu8() (machine_arch_type == MACH_TYPE_NETDCU8)
-#else
-# define machine_is_netdcu8() (0)
-#endif
-
-#ifdef CONFIG_MACH_NG_FVX538
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_NG_FVX538
-# endif
-# define machine_is_ng_fvx538() (machine_arch_type == MACH_TYPE_NG_FVX538)
-#else
-# define machine_is_ng_fvx538() (0)
-#endif
-
-#ifdef CONFIG_MACH_NG_FVS338
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_NG_FVS338
-# endif
-# define machine_is_ng_fvs338() (machine_arch_type == MACH_TYPE_NG_FVS338)
-#else
-# define machine_is_ng_fvs338() (0)
-#endif
-
-#ifdef CONFIG_MACH_PNX4103
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_PNX4103
-# endif
-# define machine_is_pnx4103() (machine_arch_type == MACH_TYPE_PNX4103)
-#else
-# define machine_is_pnx4103() (0)
-#endif
-
-#ifdef CONFIG_MACH_HESDB
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_HESDB
-# endif
-# define machine_is_hesdb() (machine_arch_type == MACH_TYPE_HESDB)
-#else
-# define machine_is_hesdb() (0)
-#endif
-
-#ifdef CONFIG_MACH_XSILO
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_XSILO
-# endif
-# define machine_is_xsilo() (machine_arch_type == MACH_TYPE_XSILO)
-#else
-# define machine_is_xsilo() (0)
-#endif
-
#ifdef CONFIG_MACH_ESPRESSO
# ifdef machine_arch_type
# undef machine_arch_type
@@ -14593,30 +3205,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_espresso() (0)
#endif
-#ifdef CONFIG_MACH_EMLC
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_EMLC
-# endif
-# define machine_is_emlc() (machine_arch_type == MACH_TYPE_EMLC)
-#else
-# define machine_is_emlc() (0)
-#endif
-
-#ifdef CONFIG_MACH_SISTERON
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SISTERON
-# endif
-# define machine_is_sisteron() (machine_arch_type == MACH_TYPE_SISTERON)
-#else
-# define machine_is_sisteron() (0)
-#endif
-
#ifdef CONFIG_MACH_RX1950
# ifdef machine_arch_type
# undef machine_arch_type
@@ -14629,66 +3217,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_rx1950() (0)
#endif
-#ifdef CONFIG_MACH_TSC_VENUS
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_TSC_VENUS
-# endif
-# define machine_is_tsc_venus() (machine_arch_type == MACH_TYPE_TSC_VENUS)
-#else
-# define machine_is_tsc_venus() (0)
-#endif
-
-#ifdef CONFIG_MACH_DS101J
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_DS101J
-# endif
-# define machine_is_ds101j() (machine_arch_type == MACH_TYPE_DS101J)
-#else
-# define machine_is_ds101j() (0)
-#endif
-
-#ifdef CONFIG_MACH_MXC30030ADS
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MXC30030ADS
-# endif
-# define machine_is_mxc30030ads() (machine_arch_type == MACH_TYPE_MXC30030ADS)
-#else
-# define machine_is_mxc30030ads() (0)
-#endif
-
-#ifdef CONFIG_MACH_FUJITSU_WIMAXSOC
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_FUJITSU_WIMAXSOC
-# endif
-# define machine_is_fujitsu_wimaxsoc() (machine_arch_type == MACH_TYPE_FUJITSU_WIMAXSOC)
-#else
-# define machine_is_fujitsu_wimaxsoc() (0)
-#endif
-
-#ifdef CONFIG_MACH_DUALPCMODEM
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_DUALPCMODEM
-# endif
-# define machine_is_dualpcmodem() (machine_arch_type == MACH_TYPE_DUALPCMODEM)
-#else
-# define machine_is_dualpcmodem() (0)
-#endif
-
#ifdef CONFIG_MACH_GESBC9312
# ifdef machine_arch_type
# undef machine_arch_type
@@ -14701,54 +3229,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_gesbc9312() (0)
#endif
-#ifdef CONFIG_MACH_HTCAPACHE
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_HTCAPACHE
-# endif
-# define machine_is_htcapache() (machine_arch_type == MACH_TYPE_HTCAPACHE)
-#else
-# define machine_is_htcapache() (0)
-#endif
-
-#ifdef CONFIG_MACH_IXDP435
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_IXDP435
-# endif
-# define machine_is_ixdp435() (machine_arch_type == MACH_TYPE_IXDP435)
-#else
-# define machine_is_ixdp435() (0)
-#endif
-
-#ifdef CONFIG_MACH_CATPROVT100
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CATPROVT100
-# endif
-# define machine_is_catprovt100() (machine_arch_type == MACH_TYPE_CATPROVT100)
-#else
-# define machine_is_catprovt100() (0)
-#endif
-
-#ifdef CONFIG_MACH_PICOTUX1XX
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_PICOTUX1XX
-# endif
-# define machine_is_picotux1xx() (machine_arch_type == MACH_TYPE_PICOTUX1XX)
-#else
-# define machine_is_picotux1xx() (0)
-#endif
-
#ifdef CONFIG_MACH_PICOTUX2XX
# ifdef machine_arch_type
# undef machine_arch_type
@@ -14773,66 +3253,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_dsmg600() (0)
#endif
-#ifdef CONFIG_MACH_EMPC2
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_EMPC2
-# endif
-# define machine_is_empc2() (machine_arch_type == MACH_TYPE_EMPC2)
-#else
-# define machine_is_empc2() (0)
-#endif
-
-#ifdef CONFIG_MACH_VENTURA
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_VENTURA
-# endif
-# define machine_is_ventura() (machine_arch_type == MACH_TYPE_VENTURA)
-#else
-# define machine_is_ventura() (0)
-#endif
-
-#ifdef CONFIG_MACH_PHIDGET_SBC
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_PHIDGET_SBC
-# endif
-# define machine_is_phidget_sbc() (machine_arch_type == MACH_TYPE_PHIDGET_SBC)
-#else
-# define machine_is_phidget_sbc() (0)
-#endif
-
-#ifdef CONFIG_MACH_IJ3K
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_IJ3K
-# endif
-# define machine_is_ij3k() (machine_arch_type == MACH_TYPE_IJ3K)
-#else
-# define machine_is_ij3k() (0)
-#endif
-
-#ifdef CONFIG_MACH_PISGAH
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_PISGAH
-# endif
-# define machine_is_pisgah() (machine_arch_type == MACH_TYPE_PISGAH)
-#else
-# define machine_is_pisgah() (0)
-#endif
-
#ifdef CONFIG_MACH_OMAP_FSAMPLE
# ifdef machine_arch_type
# undef machine_arch_type
@@ -14845,186 +3265,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_omap_fsample() (0)
#endif
-#ifdef CONFIG_MACH_SG720
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SG720
-# endif
-# define machine_is_sg720() (machine_arch_type == MACH_TYPE_SG720)
-#else
-# define machine_is_sg720() (0)
-#endif
-
-#ifdef CONFIG_MACH_REDFOX
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_REDFOX
-# endif
-# define machine_is_redfox() (machine_arch_type == MACH_TYPE_REDFOX)
-#else
-# define machine_is_redfox() (0)
-#endif
-
-#ifdef CONFIG_MACH_MYSH_EP9315_1
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MYSH_EP9315_1
-# endif
-# define machine_is_mysh_ep9315_1() (machine_arch_type == MACH_TYPE_MYSH_EP9315_1)
-#else
-# define machine_is_mysh_ep9315_1() (0)
-#endif
-
-#ifdef CONFIG_MACH_TPF106
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_TPF106
-# endif
-# define machine_is_tpf106() (machine_arch_type == MACH_TYPE_TPF106)
-#else
-# define machine_is_tpf106() (0)
-#endif
-
-#ifdef CONFIG_MACH_AT91RM9200KG
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_AT91RM9200KG
-# endif
-# define machine_is_at91rm9200kg() (machine_arch_type == MACH_TYPE_AT91RM9200KG)
-#else
-# define machine_is_at91rm9200kg() (0)
-#endif
-
-#ifdef CONFIG_MACH_SLEDB
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SLEDB
-# endif
-# define machine_is_rcmt2() (machine_arch_type == MACH_TYPE_SLEDB)
-#else
-# define machine_is_rcmt2() (0)
-#endif
-
-#ifdef CONFIG_MACH_ONTRACK
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ONTRACK
-# endif
-# define machine_is_ontrack() (machine_arch_type == MACH_TYPE_ONTRACK)
-#else
-# define machine_is_ontrack() (0)
-#endif
-
-#ifdef CONFIG_MACH_PM1200
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_PM1200
-# endif
-# define machine_is_pm1200() (machine_arch_type == MACH_TYPE_PM1200)
-#else
-# define machine_is_pm1200() (0)
-#endif
-
-#ifdef CONFIG_MACH_ESS24XXX
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ESS24XXX
-# endif
-# define machine_is_ess24562() (machine_arch_type == MACH_TYPE_ESS24XXX)
-#else
-# define machine_is_ess24562() (0)
-#endif
-
-#ifdef CONFIG_MACH_COREMP7
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_COREMP7
-# endif
-# define machine_is_coremp7() (machine_arch_type == MACH_TYPE_COREMP7)
-#else
-# define machine_is_coremp7() (0)
-#endif
-
-#ifdef CONFIG_MACH_NEXCODER_6446
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_NEXCODER_6446
-# endif
-# define machine_is_nexcoder_6446() (machine_arch_type == MACH_TYPE_NEXCODER_6446)
-#else
-# define machine_is_nexcoder_6446() (0)
-#endif
-
-#ifdef CONFIG_MACH_STVC8380
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_STVC8380
-# endif
-# define machine_is_stvc8380() (machine_arch_type == MACH_TYPE_STVC8380)
-#else
-# define machine_is_stvc8380() (0)
-#endif
-
-#ifdef CONFIG_MACH_TEKLYNX
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_TEKLYNX
-# endif
-# define machine_is_teklynx() (machine_arch_type == MACH_TYPE_TEKLYNX)
-#else
-# define machine_is_teklynx() (0)
-#endif
-
-#ifdef CONFIG_MACH_CARBONADO
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CARBONADO
-# endif
-# define machine_is_carbonado() (machine_arch_type == MACH_TYPE_CARBONADO)
-#else
-# define machine_is_carbonado() (0)
-#endif
-
-#ifdef CONFIG_MACH_SYSMOS_MP730
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SYSMOS_MP730
-# endif
-# define machine_is_sysmos_mp730() (machine_arch_type == MACH_TYPE_SYSMOS_MP730)
-#else
-# define machine_is_sysmos_mp730() (0)
-#endif
-
#ifdef CONFIG_MACH_SNAPPER_CL15
# ifdef machine_arch_type
# undef machine_arch_type
@@ -15037,78 +3277,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_snapper_cl15() (0)
#endif
-#ifdef CONFIG_MACH_PGIGIM
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_PGIGIM
-# endif
-# define machine_is_pgigim() (machine_arch_type == MACH_TYPE_PGIGIM)
-#else
-# define machine_is_pgigim() (0)
-#endif
-
-#ifdef CONFIG_MACH_PTX9160P2
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_PTX9160P2
-# endif
-# define machine_is_ptx9160p2() (machine_arch_type == MACH_TYPE_PTX9160P2)
-#else
-# define machine_is_ptx9160p2() (0)
-#endif
-
-#ifdef CONFIG_MACH_DCORE1
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_DCORE1
-# endif
-# define machine_is_dcore1() (machine_arch_type == MACH_TYPE_DCORE1)
-#else
-# define machine_is_dcore1() (0)
-#endif
-
-#ifdef CONFIG_MACH_VICTORPXA
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_VICTORPXA
-# endif
-# define machine_is_victorpxa() (machine_arch_type == MACH_TYPE_VICTORPXA)
-#else
-# define machine_is_victorpxa() (0)
-#endif
-
-#ifdef CONFIG_MACH_MX2DTB
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MX2DTB
-# endif
-# define machine_is_mx2dtb() (machine_arch_type == MACH_TYPE_MX2DTB)
-#else
-# define machine_is_mx2dtb() (0)
-#endif
-
-#ifdef CONFIG_MACH_PXA_IREX_ER0100
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_PXA_IREX_ER0100
-# endif
-# define machine_is_pxa_irex_er0100() (machine_arch_type == MACH_TYPE_PXA_IREX_ER0100)
-#else
-# define machine_is_pxa_irex_er0100() (0)
-#endif
-
#ifdef CONFIG_MACH_OMAP_PALMZ71
# ifdef machine_arch_type
# undef machine_arch_type
@@ -15121,186 +3289,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_omap_palmz71() (0)
#endif
-#ifdef CONFIG_MACH_BARTEC_DEG
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_BARTEC_DEG
-# endif
-# define machine_is_bartec_deg() (machine_arch_type == MACH_TYPE_BARTEC_DEG)
-#else
-# define machine_is_bartec_deg() (0)
-#endif
-
-#ifdef CONFIG_MACH_HW50251
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_HW50251
-# endif
-# define machine_is_hw50251() (machine_arch_type == MACH_TYPE_HW50251)
-#else
-# define machine_is_hw50251() (0)
-#endif
-
-#ifdef CONFIG_MACH_IBOX
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_IBOX
-# endif
-# define machine_is_ibox() (machine_arch_type == MACH_TYPE_IBOX)
-#else
-# define machine_is_ibox() (0)
-#endif
-
-#ifdef CONFIG_MACH_ATLASLH7A404
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ATLASLH7A404
-# endif
-# define machine_is_atlaslh7a404() (machine_arch_type == MACH_TYPE_ATLASLH7A404)
-#else
-# define machine_is_atlaslh7a404() (0)
-#endif
-
-#ifdef CONFIG_MACH_PT2026
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_PT2026
-# endif
-# define machine_is_pt2026() (machine_arch_type == MACH_TYPE_PT2026)
-#else
-# define machine_is_pt2026() (0)
-#endif
-
-#ifdef CONFIG_MACH_HTCALPINE
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_HTCALPINE
-# endif
-# define machine_is_htcalpine() (machine_arch_type == MACH_TYPE_HTCALPINE)
-#else
-# define machine_is_htcalpine() (0)
-#endif
-
-#ifdef CONFIG_MACH_BARTEC_VTU
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_BARTEC_VTU
-# endif
-# define machine_is_bartec_vtu() (machine_arch_type == MACH_TYPE_BARTEC_VTU)
-#else
-# define machine_is_bartec_vtu() (0)
-#endif
-
-#ifdef CONFIG_MACH_VCOREII
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_VCOREII
-# endif
-# define machine_is_vcoreii() (machine_arch_type == MACH_TYPE_VCOREII)
-#else
-# define machine_is_vcoreii() (0)
-#endif
-
-#ifdef CONFIG_MACH_PDNB3
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_PDNB3
-# endif
-# define machine_is_pdnb3() (machine_arch_type == MACH_TYPE_PDNB3)
-#else
-# define machine_is_pdnb3() (0)
-#endif
-
-#ifdef CONFIG_MACH_HTCBEETLES
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_HTCBEETLES
-# endif
-# define machine_is_htcbeetles() (machine_arch_type == MACH_TYPE_HTCBEETLES)
-#else
-# define machine_is_htcbeetles() (0)
-#endif
-
-#ifdef CONFIG_MACH_S3C6400
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_S3C6400
-# endif
-# define machine_is_s3c6400() (machine_arch_type == MACH_TYPE_S3C6400)
-#else
-# define machine_is_s3c6400() (0)
-#endif
-
-#ifdef CONFIG_MACH_S3C2443
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_S3C2443
-# endif
-# define machine_is_s3c2443() (machine_arch_type == MACH_TYPE_S3C2443)
-#else
-# define machine_is_s3c2443() (0)
-#endif
-
-#ifdef CONFIG_MACH_OMAP_LDK
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_OMAP_LDK
-# endif
-# define machine_is_omap_ldk() (machine_arch_type == MACH_TYPE_OMAP_LDK)
-#else
-# define machine_is_omap_ldk() (0)
-#endif
-
-#ifdef CONFIG_MACH_SMDK2460
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SMDK2460
-# endif
-# define machine_is_smdk2460() (machine_arch_type == MACH_TYPE_SMDK2460)
-#else
-# define machine_is_smdk2460() (0)
-#endif
-
-#ifdef CONFIG_MACH_SMDK2440
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SMDK2440
-# endif
-# define machine_is_smdk2440() (machine_arch_type == MACH_TYPE_SMDK2440)
-#else
-# define machine_is_smdk2440() (0)
-#endif
-
#ifdef CONFIG_MACH_SMDK2412
# ifdef machine_arch_type
# undef machine_arch_type
@@ -15313,150 +3301,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_smdk2412() (0)
#endif
-#ifdef CONFIG_MACH_WEBBOX
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_WEBBOX
-# endif
-# define machine_is_webbox() (machine_arch_type == MACH_TYPE_WEBBOX)
-#else
-# define machine_is_webbox() (0)
-#endif
-
-#ifdef CONFIG_MACH_CWWNDP
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CWWNDP
-# endif
-# define machine_is_cwwndp() (machine_arch_type == MACH_TYPE_CWWNDP)
-#else
-# define machine_is_cwwndp() (0)
-#endif
-
-#ifdef CONFIG_MACH_DRAGON
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_DRAGON
-# endif
-# define machine_is_i839() (machine_arch_type == MACH_TYPE_DRAGON)
-#else
-# define machine_is_i839() (0)
-#endif
-
-#ifdef CONFIG_MACH_OPENDO_CPU_BOARD
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_OPENDO_CPU_BOARD
-# endif
-# define machine_is_opendo_cpu_board() (machine_arch_type == MACH_TYPE_OPENDO_CPU_BOARD)
-#else
-# define machine_is_opendo_cpu_board() (0)
-#endif
-
-#ifdef CONFIG_MACH_CCM2200
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CCM2200
-# endif
-# define machine_is_ccm2200() (machine_arch_type == MACH_TYPE_CCM2200)
-#else
-# define machine_is_ccm2200() (0)
-#endif
-
-#ifdef CONFIG_MACH_ETWARM
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ETWARM
-# endif
-# define machine_is_etwarm() (machine_arch_type == MACH_TYPE_ETWARM)
-#else
-# define machine_is_etwarm() (0)
-#endif
-
-#ifdef CONFIG_MACH_M93030
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_M93030
-# endif
-# define machine_is_m93030() (machine_arch_type == MACH_TYPE_M93030)
-#else
-# define machine_is_m93030() (0)
-#endif
-
-#ifdef CONFIG_MACH_CC7U
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CC7U
-# endif
-# define machine_is_cc7u() (machine_arch_type == MACH_TYPE_CC7U)
-#else
-# define machine_is_cc7u() (0)
-#endif
-
-#ifdef CONFIG_MACH_MTT_RANGER
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MTT_RANGER
-# endif
-# define machine_is_mtt_ranger() (machine_arch_type == MACH_TYPE_MTT_RANGER)
-#else
-# define machine_is_mtt_ranger() (0)
-#endif
-
-#ifdef CONFIG_MACH_NEXUS
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_NEXUS
-# endif
-# define machine_is_nexus() (machine_arch_type == MACH_TYPE_NEXUS)
-#else
-# define machine_is_nexus() (0)
-#endif
-
-#ifdef CONFIG_MACH_DESMAN
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_DESMAN
-# endif
-# define machine_is_desman() (machine_arch_type == MACH_TYPE_DESMAN)
-#else
-# define machine_is_desman() (0)
-#endif
-
-#ifdef CONFIG_MACH_BKDE303
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_BKDE303
-# endif
-# define machine_is_bkde303() (machine_arch_type == MACH_TYPE_BKDE303)
-#else
-# define machine_is_bkde303() (0)
-#endif
-
#ifdef CONFIG_MACH_SMDK2413
# ifdef machine_arch_type
# undef machine_arch_type
@@ -15469,18 +3313,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_smdk2413() (0)
#endif
-#ifdef CONFIG_MACH_AML_M7200
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_AML_M7200
-# endif
-# define machine_is_aml_m7200() (machine_arch_type == MACH_TYPE_AML_M7200)
-#else
-# define machine_is_aml_m7200() (0)
-#endif
-
#ifdef CONFIG_MACH_AML_M5900
# ifdef machine_arch_type
# undef machine_arch_type
@@ -15493,54 +3325,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_aml_m5900() (0)
#endif
-#ifdef CONFIG_MACH_SG640
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SG640
-# endif
-# define machine_is_sg640() (machine_arch_type == MACH_TYPE_SG640)
-#else
-# define machine_is_sg640() (0)
-#endif
-
-#ifdef CONFIG_MACH_EDG79524
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_EDG79524
-# endif
-# define machine_is_edg79524() (machine_arch_type == MACH_TYPE_EDG79524)
-#else
-# define machine_is_edg79524() (0)
-#endif
-
-#ifdef CONFIG_MACH_AI2410
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_AI2410
-# endif
-# define machine_is_ai2410() (machine_arch_type == MACH_TYPE_AI2410)
-#else
-# define machine_is_ai2410() (0)
-#endif
-
-#ifdef CONFIG_MACH_IXP465
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_IXP465
-# endif
-# define machine_is_ixp465() (machine_arch_type == MACH_TYPE_IXP465)
-#else
-# define machine_is_ixp465() (0)
-#endif
-
#ifdef CONFIG_MACH_BALLOON3
# ifdef machine_arch_type
# undef machine_arch_type
@@ -15553,510 +3337,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_balloon3() (0)
#endif
-#ifdef CONFIG_MACH_HEINS
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_HEINS
-# endif
-# define machine_is_heins() (machine_arch_type == MACH_TYPE_HEINS)
-#else
-# define machine_is_heins() (0)
-#endif
-
-#ifdef CONFIG_MACH_MPLUSEVA
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MPLUSEVA
-# endif
-# define machine_is_mpluseva() (machine_arch_type == MACH_TYPE_MPLUSEVA)
-#else
-# define machine_is_mpluseva() (0)
-#endif
-
-#ifdef CONFIG_MACH_RT042
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_RT042
-# endif
-# define machine_is_rt042() (machine_arch_type == MACH_TYPE_RT042)
-#else
-# define machine_is_rt042() (0)
-#endif
-
-#ifdef CONFIG_MACH_CWIEM
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CWIEM
-# endif
-# define machine_is_cwiem() (machine_arch_type == MACH_TYPE_CWIEM)
-#else
-# define machine_is_cwiem() (0)
-#endif
-
-#ifdef CONFIG_MACH_CM_X270
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CM_X270
-# endif
-# define machine_is_cm_x270() (machine_arch_type == MACH_TYPE_CM_X270)
-#else
-# define machine_is_cm_x270() (0)
-#endif
-
-#ifdef CONFIG_MACH_CM_X255
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CM_X255
-# endif
-# define machine_is_cm_x255() (machine_arch_type == MACH_TYPE_CM_X255)
-#else
-# define machine_is_cm_x255() (0)
-#endif
-
-#ifdef CONFIG_MACH_ESH_AT91
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ESH_AT91
-# endif
-# define machine_is_esh_at91() (machine_arch_type == MACH_TYPE_ESH_AT91)
-#else
-# define machine_is_esh_at91() (0)
-#endif
-
-#ifdef CONFIG_MACH_SANDGATE3
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SANDGATE3
-# endif
-# define machine_is_sandgate3() (machine_arch_type == MACH_TYPE_SANDGATE3)
-#else
-# define machine_is_sandgate3() (0)
-#endif
-
-#ifdef CONFIG_MACH_PRIMO
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_PRIMO
-# endif
-# define machine_is_primo() (machine_arch_type == MACH_TYPE_PRIMO)
-#else
-# define machine_is_primo() (0)
-#endif
-
-#ifdef CONFIG_MACH_GEMSTONE
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_GEMSTONE
-# endif
-# define machine_is_gemstone() (machine_arch_type == MACH_TYPE_GEMSTONE)
-#else
-# define machine_is_gemstone() (0)
-#endif
-
-#ifdef CONFIG_MACH_PRONGHORNMETRO
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_PRONGHORNMETRO
-# endif
-# define machine_is_pronghorn_metro() (machine_arch_type == MACH_TYPE_PRONGHORNMETRO)
-#else
-# define machine_is_pronghorn_metro() (0)
-#endif
-
-#ifdef CONFIG_MACH_SIDEWINDER
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SIDEWINDER
-# endif
-# define machine_is_sidewinder() (machine_arch_type == MACH_TYPE_SIDEWINDER)
-#else
-# define machine_is_sidewinder() (0)
-#endif
-
-#ifdef CONFIG_MACH_PICOMOD1
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_PICOMOD1
-# endif
-# define machine_is_picomod1() (machine_arch_type == MACH_TYPE_PICOMOD1)
-#else
-# define machine_is_picomod1() (0)
-#endif
-
-#ifdef CONFIG_MACH_SG590
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SG590
-# endif
-# define machine_is_sg590() (machine_arch_type == MACH_TYPE_SG590)
-#else
-# define machine_is_sg590() (0)
-#endif
-
-#ifdef CONFIG_MACH_AKAI9307
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_AKAI9307
-# endif
-# define machine_is_akai9307() (machine_arch_type == MACH_TYPE_AKAI9307)
-#else
-# define machine_is_akai9307() (0)
-#endif
-
-#ifdef CONFIG_MACH_FONTAINE
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_FONTAINE
-# endif
-# define machine_is_fontaine() (machine_arch_type == MACH_TYPE_FONTAINE)
-#else
-# define machine_is_fontaine() (0)
-#endif
-
-#ifdef CONFIG_MACH_WOMBAT
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_WOMBAT
-# endif
-# define machine_is_wombat() (machine_arch_type == MACH_TYPE_WOMBAT)
-#else
-# define machine_is_wombat() (0)
-#endif
-
-#ifdef CONFIG_MACH_ACQ300
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ACQ300
-# endif
-# define machine_is_acq300() (machine_arch_type == MACH_TYPE_ACQ300)
-#else
-# define machine_is_acq300() (0)
-#endif
-
-#ifdef CONFIG_MACH_MOD_270
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MOD_270
-# endif
-# define machine_is_mod272() (machine_arch_type == MACH_TYPE_MOD_270)
-#else
-# define machine_is_mod272() (0)
-#endif
-
-#ifdef CONFIG_MACH_VC0820
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_VC0820
-# endif
-# define machine_is_vmc_vc0820() (machine_arch_type == MACH_TYPE_VC0820)
-#else
-# define machine_is_vmc_vc0820() (0)
-#endif
-
-#ifdef CONFIG_MACH_ANI_AIM
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ANI_AIM
-# endif
-# define machine_is_ani_aim() (machine_arch_type == MACH_TYPE_ANI_AIM)
-#else
-# define machine_is_ani_aim() (0)
-#endif
-
-#ifdef CONFIG_MACH_JELLYFISH
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_JELLYFISH
-# endif
-# define machine_is_jellyfish() (machine_arch_type == MACH_TYPE_JELLYFISH)
-#else
-# define machine_is_jellyfish() (0)
-#endif
-
-#ifdef CONFIG_MACH_AMANITA
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_AMANITA
-# endif
-# define machine_is_amanita() (machine_arch_type == MACH_TYPE_AMANITA)
-#else
-# define machine_is_amanita() (0)
-#endif
-
-#ifdef CONFIG_MACH_VLINK
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_VLINK
-# endif
-# define machine_is_vlink() (machine_arch_type == MACH_TYPE_VLINK)
-#else
-# define machine_is_vlink() (0)
-#endif
-
-#ifdef CONFIG_MACH_DEXFLEX
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_DEXFLEX
-# endif
-# define machine_is_dexflex() (machine_arch_type == MACH_TYPE_DEXFLEX)
-#else
-# define machine_is_dexflex() (0)
-#endif
-
-#ifdef CONFIG_MACH_EIGEN_TTQ
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_EIGEN_TTQ
-# endif
-# define machine_is_eigen_ttq() (machine_arch_type == MACH_TYPE_EIGEN_TTQ)
-#else
-# define machine_is_eigen_ttq() (0)
-#endif
-
-#ifdef CONFIG_MACH_ARCOM_TITAN
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ARCOM_TITAN
-# endif
-# define machine_is_arcom_titan() (machine_arch_type == MACH_TYPE_ARCOM_TITAN)
-#else
-# define machine_is_arcom_titan() (0)
-#endif
-
-#ifdef CONFIG_MACH_TABLA
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_TABLA
-# endif
-# define machine_is_tabla() (machine_arch_type == MACH_TYPE_TABLA)
-#else
-# define machine_is_tabla() (0)
-#endif
-
-#ifdef CONFIG_MACH_MDIRAC3
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MDIRAC3
-# endif
-# define machine_is_mdirac3() (machine_arch_type == MACH_TYPE_MDIRAC3)
-#else
-# define machine_is_mdirac3() (0)
-#endif
-
-#ifdef CONFIG_MACH_MRHFBP2
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MRHFBP2
-# endif
-# define machine_is_mrhfbp2() (machine_arch_type == MACH_TYPE_MRHFBP2)
-#else
-# define machine_is_mrhfbp2() (0)
-#endif
-
-#ifdef CONFIG_MACH_AT91RM9200RB
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_AT91RM9200RB
-# endif
-# define machine_is_at91rm9200rb() (machine_arch_type == MACH_TYPE_AT91RM9200RB)
-#else
-# define machine_is_at91rm9200rb() (0)
-#endif
-
-#ifdef CONFIG_MACH_ANI_APM
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ANI_APM
-# endif
-# define machine_is_ani_apm() (machine_arch_type == MACH_TYPE_ANI_APM)
-#else
-# define machine_is_ani_apm() (0)
-#endif
-
-#ifdef CONFIG_MACH_ELLA1
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ELLA1
-# endif
-# define machine_is_ella1() (machine_arch_type == MACH_TYPE_ELLA1)
-#else
-# define machine_is_ella1() (0)
-#endif
-
-#ifdef CONFIG_MACH_INHAND_PXA27X
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_INHAND_PXA27X
-# endif
-# define machine_is_inhand_pxa27x() (machine_arch_type == MACH_TYPE_INHAND_PXA27X)
-#else
-# define machine_is_inhand_pxa27x() (0)
-#endif
-
-#ifdef CONFIG_MACH_INHAND_PXA25X
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_INHAND_PXA25X
-# endif
-# define machine_is_inhand_pxa25x() (machine_arch_type == MACH_TYPE_INHAND_PXA25X)
-#else
-# define machine_is_inhand_pxa25x() (0)
-#endif
-
-#ifdef CONFIG_MACH_EMPOS_XM
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_EMPOS_XM
-# endif
-# define machine_is_empos_xm() (machine_arch_type == MACH_TYPE_EMPOS_XM)
-#else
-# define machine_is_empos_xm() (0)
-#endif
-
-#ifdef CONFIG_MACH_EMPOS
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_EMPOS
-# endif
-# define machine_is_empos() (machine_arch_type == MACH_TYPE_EMPOS)
-#else
-# define machine_is_empos() (0)
-#endif
-
-#ifdef CONFIG_MACH_EMPOS_TINY
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_EMPOS_TINY
-# endif
-# define machine_is_empos_tiny() (machine_arch_type == MACH_TYPE_EMPOS_TINY)
-#else
-# define machine_is_empos_tiny() (0)
-#endif
-
-#ifdef CONFIG_MACH_EMPOS_SM
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_EMPOS_SM
-# endif
-# define machine_is_empos_sm() (machine_arch_type == MACH_TYPE_EMPOS_SM)
-#else
-# define machine_is_empos_sm() (0)
-#endif
-
-#ifdef CONFIG_MACH_EGRET
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_EGRET
-# endif
-# define machine_is_egret() (machine_arch_type == MACH_TYPE_EGRET)
-#else
-# define machine_is_egret() (0)
-#endif
-
-#ifdef CONFIG_MACH_OSTRICH
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_OSTRICH
-# endif
-# define machine_is_ostrich() (machine_arch_type == MACH_TYPE_OSTRICH)
-#else
-# define machine_is_ostrich() (0)
-#endif
-
-#ifdef CONFIG_MACH_N50
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_N50
-# endif
-# define machine_is_n50() (machine_arch_type == MACH_TYPE_N50)
-#else
-# define machine_is_n50() (0)
-#endif
-
#ifdef CONFIG_MACH_ECBAT91
# ifdef machine_arch_type
# undef machine_arch_type
@@ -16069,30 +3349,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_ecbat91() (0)
#endif
-#ifdef CONFIG_MACH_STAREAST
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_STAREAST
-# endif
-# define machine_is_stareast() (machine_arch_type == MACH_TYPE_STAREAST)
-#else
-# define machine_is_stareast() (0)
-#endif
-
-#ifdef CONFIG_MACH_DSPG_DW
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_DSPG_DW
-# endif
-# define machine_is_dspg_dw() (machine_arch_type == MACH_TYPE_DSPG_DW)
-#else
-# define machine_is_dspg_dw() (0)
-#endif
-
#ifdef CONFIG_MACH_ONEARM
# ifdef machine_arch_type
# undef machine_arch_type
@@ -16105,102 +3361,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_onearm() (0)
#endif
-#ifdef CONFIG_MACH_MRG110_6
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MRG110_6
-# endif
-# define machine_is_mrg110_6() (machine_arch_type == MACH_TYPE_MRG110_6)
-#else
-# define machine_is_mrg110_6() (0)
-#endif
-
-#ifdef CONFIG_MACH_WRT300NV2
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_WRT300NV2
-# endif
-# define machine_is_wrt300nv2() (machine_arch_type == MACH_TYPE_WRT300NV2)
-#else
-# define machine_is_wrt300nv2() (0)
-#endif
-
-#ifdef CONFIG_MACH_XM_BULVERDE
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_XM_BULVERDE
-# endif
-# define machine_is_xm_bulverde() (machine_arch_type == MACH_TYPE_XM_BULVERDE)
-#else
-# define machine_is_xm_bulverde() (0)
-#endif
-
-#ifdef CONFIG_MACH_MSM6100
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MSM6100
-# endif
-# define machine_is_msm6100() (machine_arch_type == MACH_TYPE_MSM6100)
-#else
-# define machine_is_msm6100() (0)
-#endif
-
-#ifdef CONFIG_MACH_ETI_B1
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ETI_B1
-# endif
-# define machine_is_eti_b1() (machine_arch_type == MACH_TYPE_ETI_B1)
-#else
-# define machine_is_eti_b1() (0)
-#endif
-
-#ifdef CONFIG_MACH_ZILOG_ZA9L
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ZILOG_ZA9L
-# endif
-# define machine_is_za9l_series() (machine_arch_type == MACH_TYPE_ZILOG_ZA9L)
-#else
-# define machine_is_za9l_series() (0)
-#endif
-
-#ifdef CONFIG_MACH_BIT2440
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_BIT2440
-# endif
-# define machine_is_bit2440() (machine_arch_type == MACH_TYPE_BIT2440)
-#else
-# define machine_is_bit2440() (0)
-#endif
-
-#ifdef CONFIG_MACH_NBI
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_NBI
-# endif
-# define machine_is_nbi() (machine_arch_type == MACH_TYPE_NBI)
-#else
-# define machine_is_nbi() (0)
-#endif
-
#ifdef CONFIG_MACH_SMDK2443
# ifdef machine_arch_type
# undef machine_arch_type
@@ -16213,78 +3373,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_smdk2443() (0)
#endif
-#ifdef CONFIG_MACH_VDAVINCI
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_VDAVINCI
-# endif
-# define machine_is_vdavinci() (machine_arch_type == MACH_TYPE_VDAVINCI)
-#else
-# define machine_is_vdavinci() (0)
-#endif
-
-#ifdef CONFIG_MACH_ATC6
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ATC6
-# endif
-# define machine_is_atc6() (machine_arch_type == MACH_TYPE_ATC6)
-#else
-# define machine_is_atc6() (0)
-#endif
-
-#ifdef CONFIG_MACH_MULTMDW
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MULTMDW
-# endif
-# define machine_is_multmdw() (machine_arch_type == MACH_TYPE_MULTMDW)
-#else
-# define machine_is_multmdw() (0)
-#endif
-
-#ifdef CONFIG_MACH_MBA2440
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MBA2440
-# endif
-# define machine_is_mba2440() (machine_arch_type == MACH_TYPE_MBA2440)
-#else
-# define machine_is_mba2440() (0)
-#endif
-
-#ifdef CONFIG_MACH_ECSD
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ECSD
-# endif
-# define machine_is_ecsd() (machine_arch_type == MACH_TYPE_ECSD)
-#else
-# define machine_is_ecsd() (0)
-#endif
-
-#ifdef CONFIG_MACH_PALMZ31
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_PALMZ31
-# endif
-# define machine_is_palmz31() (machine_arch_type == MACH_TYPE_PALMZ31)
-#else
-# define machine_is_palmz31() (0)
-#endif
-
#ifdef CONFIG_MACH_FSG
# ifdef machine_arch_type
# undef machine_arch_type
@@ -16297,90 +3385,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_fsg() (0)
#endif
-#ifdef CONFIG_MACH_RAZOR101
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_RAZOR101
-# endif
-# define machine_is_razor101() (machine_arch_type == MACH_TYPE_RAZOR101)
-#else
-# define machine_is_razor101() (0)
-#endif
-
-#ifdef CONFIG_MACH_OPERA_TDM
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_OPERA_TDM
-# endif
-# define machine_is_opera_tdm() (machine_arch_type == MACH_TYPE_OPERA_TDM)
-#else
-# define machine_is_opera_tdm() (0)
-#endif
-
-#ifdef CONFIG_MACH_COMCERTO
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_COMCERTO
-# endif
-# define machine_is_comcerto() (machine_arch_type == MACH_TYPE_COMCERTO)
-#else
-# define machine_is_comcerto() (0)
-#endif
-
-#ifdef CONFIG_MACH_TB0319
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_TB0319
-# endif
-# define machine_is_tb0319() (machine_arch_type == MACH_TYPE_TB0319)
-#else
-# define machine_is_tb0319() (0)
-#endif
-
-#ifdef CONFIG_MACH_KWS8000
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_KWS8000
-# endif
-# define machine_is_kws8000() (machine_arch_type == MACH_TYPE_KWS8000)
-#else
-# define machine_is_kws8000() (0)
-#endif
-
-#ifdef CONFIG_MACH_B2
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_B2
-# endif
-# define machine_is_b2() (machine_arch_type == MACH_TYPE_B2)
-#else
-# define machine_is_b2() (0)
-#endif
-
-#ifdef CONFIG_MACH_LCL54
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_LCL54
-# endif
-# define machine_is_lcl54() (machine_arch_type == MACH_TYPE_LCL54)
-#else
-# define machine_is_lcl54() (0)
-#endif
-
#ifdef CONFIG_MACH_AT91SAM9260EK
# ifdef machine_arch_type
# undef machine_arch_type
@@ -16417,78 +3421,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_n2100() (0)
#endif
-#ifdef CONFIG_MACH_N4100
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_N4100
-# endif
-# define machine_is_n4100() (machine_arch_type == MACH_TYPE_N4100)
-#else
-# define machine_is_n4100() (0)
-#endif
-
-#ifdef CONFIG_MACH_VERTICAL_RSC4
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_VERTICAL_RSC4
-# endif
-# define machine_is_rsc4() (machine_arch_type == MACH_TYPE_VERTICAL_RSC4)
-#else
-# define machine_is_rsc4() (0)
-#endif
-
-#ifdef CONFIG_MACH_SG8100
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SG8100
-# endif
-# define machine_is_sg8100() (machine_arch_type == MACH_TYPE_SG8100)
-#else
-# define machine_is_sg8100() (0)
-#endif
-
-#ifdef CONFIG_MACH_IM42XX
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_IM42XX
-# endif
-# define machine_is_im42xx() (machine_arch_type == MACH_TYPE_IM42XX)
-#else
-# define machine_is_im42xx() (0)
-#endif
-
-#ifdef CONFIG_MACH_FTXX
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_FTXX
-# endif
-# define machine_is_ftxx() (machine_arch_type == MACH_TYPE_FTXX)
-#else
-# define machine_is_ftxx() (0)
-#endif
-
-#ifdef CONFIG_MACH_LWFUSION
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_LWFUSION
-# endif
-# define machine_is_lwfusion() (machine_arch_type == MACH_TYPE_LWFUSION)
-#else
-# define machine_is_lwfusion() (0)
-#endif
-
#ifdef CONFIG_MACH_QT2410
# ifdef machine_arch_type
# undef machine_arch_type
@@ -16513,54 +3445,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_kixrp435() (0)
#endif
-#ifdef CONFIG_MACH_CCW9C
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CCW9C
-# endif
-# define machine_is_ccw9c() (machine_arch_type == MACH_TYPE_CCW9C)
-#else
-# define machine_is_ccw9c() (0)
-#endif
-
-#ifdef CONFIG_MACH_DABHS
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_DABHS
-# endif
-# define machine_is_dabhs() (machine_arch_type == MACH_TYPE_DABHS)
-#else
-# define machine_is_dabhs() (0)
-#endif
-
-#ifdef CONFIG_MACH_GZMX
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_GZMX
-# endif
-# define machine_is_gzmx() (machine_arch_type == MACH_TYPE_GZMX)
-#else
-# define machine_is_gzmx() (0)
-#endif
-
-#ifdef CONFIG_MACH_IPNW100AP
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_IPNW100AP
-# endif
-# define machine_is_ipnw100ap() (machine_arch_type == MACH_TYPE_IPNW100AP)
-#else
-# define machine_is_ipnw100ap() (0)
-#endif
-
#ifdef CONFIG_MACH_CC9P9360DEV
# ifdef machine_arch_type
# undef machine_arch_type
@@ -16573,150 +3457,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_cc9p9360dev() (0)
#endif
-#ifdef CONFIG_MACH_CC9P9750DEV
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CC9P9750DEV
-# endif
-# define machine_is_cc9p9750dev() (machine_arch_type == MACH_TYPE_CC9P9750DEV)
-#else
-# define machine_is_cc9p9750dev() (0)
-#endif
-
-#ifdef CONFIG_MACH_CC9P9360VAL
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CC9P9360VAL
-# endif
-# define machine_is_cc9p9360val() (machine_arch_type == MACH_TYPE_CC9P9360VAL)
-#else
-# define machine_is_cc9p9360val() (0)
-#endif
-
-#ifdef CONFIG_MACH_CC9P9750VAL
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CC9P9750VAL
-# endif
-# define machine_is_cc9p9750val() (machine_arch_type == MACH_TYPE_CC9P9750VAL)
-#else
-# define machine_is_cc9p9750val() (0)
-#endif
-
-#ifdef CONFIG_MACH_NX70V
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_NX70V
-# endif
-# define machine_is_nx70v() (machine_arch_type == MACH_TYPE_NX70V)
-#else
-# define machine_is_nx70v() (0)
-#endif
-
-#ifdef CONFIG_MACH_AT91RM9200DF
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_AT91RM9200DF
-# endif
-# define machine_is_at91rm9200df() (machine_arch_type == MACH_TYPE_AT91RM9200DF)
-#else
-# define machine_is_at91rm9200df() (0)
-#endif
-
-#ifdef CONFIG_MACH_SE_PILOT2
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SE_PILOT2
-# endif
-# define machine_is_se_pilot2() (machine_arch_type == MACH_TYPE_SE_PILOT2)
-#else
-# define machine_is_se_pilot2() (0)
-#endif
-
-#ifdef CONFIG_MACH_MTCN_T800
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MTCN_T800
-# endif
-# define machine_is_mtcn_t800() (machine_arch_type == MACH_TYPE_MTCN_T800)
-#else
-# define machine_is_mtcn_t800() (0)
-#endif
-
-#ifdef CONFIG_MACH_VCMX212
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_VCMX212
-# endif
-# define machine_is_vcmx212() (machine_arch_type == MACH_TYPE_VCMX212)
-#else
-# define machine_is_vcmx212() (0)
-#endif
-
-#ifdef CONFIG_MACH_LYNX
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_LYNX
-# endif
-# define machine_is_lynx() (machine_arch_type == MACH_TYPE_LYNX)
-#else
-# define machine_is_lynx() (0)
-#endif
-
-#ifdef CONFIG_MACH_AT91SAM9260ID
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_AT91SAM9260ID
-# endif
-# define machine_is_at91sam9260id() (machine_arch_type == MACH_TYPE_AT91SAM9260ID)
-#else
-# define machine_is_at91sam9260id() (0)
-#endif
-
-#ifdef CONFIG_MACH_HW86052
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_HW86052
-# endif
-# define machine_is_hw86052() (machine_arch_type == MACH_TYPE_HW86052)
-#else
-# define machine_is_hw86052() (0)
-#endif
-
-#ifdef CONFIG_MACH_PILZ_PMI3
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_PILZ_PMI3
-# endif
-# define machine_is_pilz_pmi3() (machine_arch_type == MACH_TYPE_PILZ_PMI3)
-#else
-# define machine_is_pilz_pmi3() (0)
-#endif
-
#ifdef CONFIG_MACH_EDB9302A
# ifdef machine_arch_type
# undef machine_arch_type
@@ -16741,114 +3481,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_edb9307a() (0)
#endif
-#ifdef CONFIG_MACH_CT_DFS
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CT_DFS
-# endif
-# define machine_is_ct_dfs() (machine_arch_type == MACH_TYPE_CT_DFS)
-#else
-# define machine_is_ct_dfs() (0)
-#endif
-
-#ifdef CONFIG_MACH_PILZ_PMI4
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_PILZ_PMI4
-# endif
-# define machine_is_pilz_pmi4() (machine_arch_type == MACH_TYPE_PILZ_PMI4)
-#else
-# define machine_is_pilz_pmi4() (0)
-#endif
-
-#ifdef CONFIG_MACH_XCEEDNP_IXP
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_XCEEDNP_IXP
-# endif
-# define machine_is_xceednp_ixp() (machine_arch_type == MACH_TYPE_XCEEDNP_IXP)
-#else
-# define machine_is_xceednp_ixp() (0)
-#endif
-
-#ifdef CONFIG_MACH_SMDK2442B
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SMDK2442B
-# endif
-# define machine_is_smdk2442b() (machine_arch_type == MACH_TYPE_SMDK2442B)
-#else
-# define machine_is_smdk2442b() (0)
-#endif
-
-#ifdef CONFIG_MACH_XNODE
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_XNODE
-# endif
-# define machine_is_xnode() (machine_arch_type == MACH_TYPE_XNODE)
-#else
-# define machine_is_xnode() (0)
-#endif
-
-#ifdef CONFIG_MACH_AIDX270
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_AIDX270
-# endif
-# define machine_is_aidx270() (machine_arch_type == MACH_TYPE_AIDX270)
-#else
-# define machine_is_aidx270() (0)
-#endif
-
-#ifdef CONFIG_MACH_REMA
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_REMA
-# endif
-# define machine_is_rema() (machine_arch_type == MACH_TYPE_REMA)
-#else
-# define machine_is_rema() (0)
-#endif
-
-#ifdef CONFIG_MACH_BPS1000
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_BPS1000
-# endif
-# define machine_is_bps1000() (machine_arch_type == MACH_TYPE_BPS1000)
-#else
-# define machine_is_bps1000() (0)
-#endif
-
-#ifdef CONFIG_MACH_HW90350
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_HW90350
-# endif
-# define machine_is_hw90350() (machine_arch_type == MACH_TYPE_HW90350)
-#else
-# define machine_is_hw90350() (0)
-#endif
-
#ifdef CONFIG_MACH_OMAP_3430SDP
# ifdef machine_arch_type
# undef machine_arch_type
@@ -16861,18 +3493,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_omap_3430sdp() (0)
#endif
-#ifdef CONFIG_MACH_BLUETOUCH
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_BLUETOUCH
-# endif
-# define machine_is_bluetouch() (machine_arch_type == MACH_TYPE_BLUETOUCH)
-#else
-# define machine_is_bluetouch() (0)
-#endif
-
#ifdef CONFIG_MACH_VSTMS
# ifdef machine_arch_type
# undef machine_arch_type
@@ -16885,342 +3505,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_vstms() (0)
#endif
-#ifdef CONFIG_MACH_XSBASE270
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_XSBASE270
-# endif
-# define machine_is_xsbase270() (machine_arch_type == MACH_TYPE_XSBASE270)
-#else
-# define machine_is_xsbase270() (0)
-#endif
-
-#ifdef CONFIG_MACH_AT91SAM9260EK_CN
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_AT91SAM9260EK_CN
-# endif
-# define machine_is_at91sam9260ek_cn() (machine_arch_type == MACH_TYPE_AT91SAM9260EK_CN)
-#else
-# define machine_is_at91sam9260ek_cn() (0)
-#endif
-
-#ifdef CONFIG_MACH_ADSTURBOXB
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ADSTURBOXB
-# endif
-# define machine_is_adsturboxb() (machine_arch_type == MACH_TYPE_ADSTURBOXB)
-#else
-# define machine_is_adsturboxb() (0)
-#endif
-
-#ifdef CONFIG_MACH_OTI4110
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_OTI4110
-# endif
-# define machine_is_oti4110() (machine_arch_type == MACH_TYPE_OTI4110)
-#else
-# define machine_is_oti4110() (0)
-#endif
-
-#ifdef CONFIG_MACH_HME_PXA
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_HME_PXA
-# endif
-# define machine_is_hme_pxa() (machine_arch_type == MACH_TYPE_HME_PXA)
-#else
-# define machine_is_hme_pxa() (0)
-#endif
-
-#ifdef CONFIG_MACH_DEISTERDCA
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_DEISTERDCA
-# endif
-# define machine_is_deisterdca() (machine_arch_type == MACH_TYPE_DEISTERDCA)
-#else
-# define machine_is_deisterdca() (0)
-#endif
-
-#ifdef CONFIG_MACH_CES_SSEM2
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CES_SSEM2
-# endif
-# define machine_is_ces_ssem2() (machine_arch_type == MACH_TYPE_CES_SSEM2)
-#else
-# define machine_is_ces_ssem2() (0)
-#endif
-
-#ifdef CONFIG_MACH_CES_MTR
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CES_MTR
-# endif
-# define machine_is_ces_mtr() (machine_arch_type == MACH_TYPE_CES_MTR)
-#else
-# define machine_is_ces_mtr() (0)
-#endif
-
-#ifdef CONFIG_MACH_TDS_AVNG_SBC
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_TDS_AVNG_SBC
-# endif
-# define machine_is_tds_avng_sbc() (machine_arch_type == MACH_TYPE_TDS_AVNG_SBC)
-#else
-# define machine_is_tds_avng_sbc() (0)
-#endif
-
-#ifdef CONFIG_MACH_EVEREST
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_EVEREST
-# endif
-# define machine_is_everest() (machine_arch_type == MACH_TYPE_EVEREST)
-#else
-# define machine_is_everest() (0)
-#endif
-
-#ifdef CONFIG_MACH_PNX4010
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_PNX4010
-# endif
-# define machine_is_pnx4010() (machine_arch_type == MACH_TYPE_PNX4010)
-#else
-# define machine_is_pnx4010() (0)
-#endif
-
-#ifdef CONFIG_MACH_OXNAS
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_OXNAS
-# endif
-# define machine_is_oxnas() (machine_arch_type == MACH_TYPE_OXNAS)
-#else
-# define machine_is_oxnas() (0)
-#endif
-
-#ifdef CONFIG_MACH_FIORI
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_FIORI
-# endif
-# define machine_is_fiori() (machine_arch_type == MACH_TYPE_FIORI)
-#else
-# define machine_is_fiori() (0)
-#endif
-
-#ifdef CONFIG_MACH_ML1200
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ML1200
-# endif
-# define machine_is_ml1200() (machine_arch_type == MACH_TYPE_ML1200)
-#else
-# define machine_is_ml1200() (0)
-#endif
-
-#ifdef CONFIG_MACH_PECOS
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_PECOS
-# endif
-# define machine_is_pecos() (machine_arch_type == MACH_TYPE_PECOS)
-#else
-# define machine_is_pecos() (0)
-#endif
-
-#ifdef CONFIG_MACH_NB2XXX
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_NB2XXX
-# endif
-# define machine_is_nb2xxx() (machine_arch_type == MACH_TYPE_NB2XXX)
-#else
-# define machine_is_nb2xxx() (0)
-#endif
-
-#ifdef CONFIG_MACH_HW6900
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_HW6900
-# endif
-# define machine_is_hw6900() (machine_arch_type == MACH_TYPE_HW6900)
-#else
-# define machine_is_hw6900() (0)
-#endif
-
-#ifdef CONFIG_MACH_CDCS_QUOLL
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CDCS_QUOLL
-# endif
-# define machine_is_cdcs_quoll() (machine_arch_type == MACH_TYPE_CDCS_QUOLL)
-#else
-# define machine_is_cdcs_quoll() (0)
-#endif
-
-#ifdef CONFIG_MACH_QUICKSILVER
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_QUICKSILVER
-# endif
-# define machine_is_quicksilver() (machine_arch_type == MACH_TYPE_QUICKSILVER)
-#else
-# define machine_is_quicksilver() (0)
-#endif
-
-#ifdef CONFIG_MACH_UPLAT926
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_UPLAT926
-# endif
-# define machine_is_uplat926() (machine_arch_type == MACH_TYPE_UPLAT926)
-#else
-# define machine_is_uplat926() (0)
-#endif
-
-#ifdef CONFIG_MACH_DEP2410_THOMAS
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_DEP2410_THOMAS
-# endif
-# define machine_is_dep2410_dep2410() (machine_arch_type == MACH_TYPE_DEP2410_THOMAS)
-#else
-# define machine_is_dep2410_dep2410() (0)
-#endif
-
-#ifdef CONFIG_MACH_DTK2410
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_DTK2410
-# endif
-# define machine_is_dtk2410() (machine_arch_type == MACH_TYPE_DTK2410)
-#else
-# define machine_is_dtk2410() (0)
-#endif
-
-#ifdef CONFIG_MACH_CHILI
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CHILI
-# endif
-# define machine_is_chili() (machine_arch_type == MACH_TYPE_CHILI)
-#else
-# define machine_is_chili() (0)
-#endif
-
-#ifdef CONFIG_MACH_DEMETER
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_DEMETER
-# endif
-# define machine_is_demeter() (machine_arch_type == MACH_TYPE_DEMETER)
-#else
-# define machine_is_demeter() (0)
-#endif
-
-#ifdef CONFIG_MACH_DIONYSUS
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_DIONYSUS
-# endif
-# define machine_is_dionysus() (machine_arch_type == MACH_TYPE_DIONYSUS)
-#else
-# define machine_is_dionysus() (0)
-#endif
-
-#ifdef CONFIG_MACH_AS352X
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_AS352X
-# endif
-# define machine_is_as352x() (machine_arch_type == MACH_TYPE_AS352X)
-#else
-# define machine_is_as352x() (0)
-#endif
-
-#ifdef CONFIG_MACH_SERVICE
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SERVICE
-# endif
-# define machine_is_service() (machine_arch_type == MACH_TYPE_SERVICE)
-#else
-# define machine_is_service() (0)
-#endif
-
-#ifdef CONFIG_MACH_CS_E9301
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CS_E9301
-# endif
-# define machine_is_cs_e9301() (machine_arch_type == MACH_TYPE_CS_E9301)
-#else
-# define machine_is_cs_e9301() (0)
-#endif
-
#ifdef CONFIG_MACH_MICRO9M
# ifdef machine_arch_type
# undef machine_arch_type
@@ -17233,90 +3517,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_micro9m() (0)
#endif
-#ifdef CONFIG_MACH_IA_MOSPCK
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_IA_MOSPCK
-# endif
-# define machine_is_ia_mospck() (machine_arch_type == MACH_TYPE_IA_MOSPCK)
-#else
-# define machine_is_ia_mospck() (0)
-#endif
-
-#ifdef CONFIG_MACH_QL201B
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_QL201B
-# endif
-# define machine_is_ql201b() (machine_arch_type == MACH_TYPE_QL201B)
-#else
-# define machine_is_ql201b() (0)
-#endif
-
-#ifdef CONFIG_MACH_BBM
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_BBM
-# endif
-# define machine_is_bbm() (machine_arch_type == MACH_TYPE_BBM)
-#else
-# define machine_is_bbm() (0)
-#endif
-
-#ifdef CONFIG_MACH_EXXX
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_EXXX
-# endif
-# define machine_is_exxx() (machine_arch_type == MACH_TYPE_EXXX)
-#else
-# define machine_is_exxx() (0)
-#endif
-
-#ifdef CONFIG_MACH_WMA11B
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_WMA11B
-# endif
-# define machine_is_wma11b() (machine_arch_type == MACH_TYPE_WMA11B)
-#else
-# define machine_is_wma11b() (0)
-#endif
-
-#ifdef CONFIG_MACH_PELCO_ATLAS
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_PELCO_ATLAS
-# endif
-# define machine_is_pelco_atlas() (machine_arch_type == MACH_TYPE_PELCO_ATLAS)
-#else
-# define machine_is_pelco_atlas() (0)
-#endif
-
-#ifdef CONFIG_MACH_G500
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_G500
-# endif
-# define machine_is_g500() (machine_arch_type == MACH_TYPE_G500)
-#else
-# define machine_is_g500() (0)
-#endif
-
#ifdef CONFIG_MACH_BUG
# ifdef machine_arch_type
# undef machine_arch_type
@@ -17329,258 +3529,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_bug() (0)
#endif
-#ifdef CONFIG_MACH_MX33ADS
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MX33ADS
-# endif
-# define machine_is_mx33ads() (machine_arch_type == MACH_TYPE_MX33ADS)
-#else
-# define machine_is_mx33ads() (0)
-#endif
-
-#ifdef CONFIG_MACH_CHUB
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CHUB
-# endif
-# define machine_is_chub() (machine_arch_type == MACH_TYPE_CHUB)
-#else
-# define machine_is_chub() (0)
-#endif
-
-#ifdef CONFIG_MACH_NEO1973_GTA01
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_NEO1973_GTA01
-# endif
-# define machine_is_neo1973_gta01() (machine_arch_type == MACH_TYPE_NEO1973_GTA01)
-#else
-# define machine_is_neo1973_gta01() (0)
-#endif
-
-#ifdef CONFIG_MACH_W90N740
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_W90N740
-# endif
-# define machine_is_w90n740() (machine_arch_type == MACH_TYPE_W90N740)
-#else
-# define machine_is_w90n740() (0)
-#endif
-
-#ifdef CONFIG_MACH_MEDALLION_SA2410
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MEDALLION_SA2410
-# endif
-# define machine_is_medallion_sa2410() (machine_arch_type == MACH_TYPE_MEDALLION_SA2410)
-#else
-# define machine_is_medallion_sa2410() (0)
-#endif
-
-#ifdef CONFIG_MACH_IA_CPU_9200_2
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_IA_CPU_9200_2
-# endif
-# define machine_is_ia_cpu_9200_2() (machine_arch_type == MACH_TYPE_IA_CPU_9200_2)
-#else
-# define machine_is_ia_cpu_9200_2() (0)
-#endif
-
-#ifdef CONFIG_MACH_DIMMRM9200
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_DIMMRM9200
-# endif
-# define machine_is_dimmrm9200() (machine_arch_type == MACH_TYPE_DIMMRM9200)
-#else
-# define machine_is_dimmrm9200() (0)
-#endif
-
-#ifdef CONFIG_MACH_PM9261
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_PM9261
-# endif
-# define machine_is_pm9261() (machine_arch_type == MACH_TYPE_PM9261)
-#else
-# define machine_is_pm9261() (0)
-#endif
-
-#ifdef CONFIG_MACH_ML7304
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ML7304
-# endif
-# define machine_is_ml7304() (machine_arch_type == MACH_TYPE_ML7304)
-#else
-# define machine_is_ml7304() (0)
-#endif
-
-#ifdef CONFIG_MACH_UCP250
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_UCP250
-# endif
-# define machine_is_ucp250() (machine_arch_type == MACH_TYPE_UCP250)
-#else
-# define machine_is_ucp250() (0)
-#endif
-
-#ifdef CONFIG_MACH_INTBOARD
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_INTBOARD
-# endif
-# define machine_is_intboard() (machine_arch_type == MACH_TYPE_INTBOARD)
-#else
-# define machine_is_intboard() (0)
-#endif
-
-#ifdef CONFIG_MACH_GULFSTREAM
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_GULFSTREAM
-# endif
-# define machine_is_gulfstream() (machine_arch_type == MACH_TYPE_GULFSTREAM)
-#else
-# define machine_is_gulfstream() (0)
-#endif
-
-#ifdef CONFIG_MACH_LABQUEST
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_LABQUEST
-# endif
-# define machine_is_labquest() (machine_arch_type == MACH_TYPE_LABQUEST)
-#else
-# define machine_is_labquest() (0)
-#endif
-
-#ifdef CONFIG_MACH_VCMX313
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_VCMX313
-# endif
-# define machine_is_vcmx313() (machine_arch_type == MACH_TYPE_VCMX313)
-#else
-# define machine_is_vcmx313() (0)
-#endif
-
-#ifdef CONFIG_MACH_URG200
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_URG200
-# endif
-# define machine_is_urg200() (machine_arch_type == MACH_TYPE_URG200)
-#else
-# define machine_is_urg200() (0)
-#endif
-
-#ifdef CONFIG_MACH_CPUX255LCDNET
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CPUX255LCDNET
-# endif
-# define machine_is_cpux255lcdnet() (machine_arch_type == MACH_TYPE_CPUX255LCDNET)
-#else
-# define machine_is_cpux255lcdnet() (0)
-#endif
-
-#ifdef CONFIG_MACH_NETDCU9
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_NETDCU9
-# endif
-# define machine_is_netdcu9() (machine_arch_type == MACH_TYPE_NETDCU9)
-#else
-# define machine_is_netdcu9() (0)
-#endif
-
-#ifdef CONFIG_MACH_NETDCU10
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_NETDCU10
-# endif
-# define machine_is_netdcu10() (machine_arch_type == MACH_TYPE_NETDCU10)
-#else
-# define machine_is_netdcu10() (0)
-#endif
-
-#ifdef CONFIG_MACH_DSPG_DGA
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_DSPG_DGA
-# endif
-# define machine_is_dspg_dga() (machine_arch_type == MACH_TYPE_DSPG_DGA)
-#else
-# define machine_is_dspg_dga() (0)
-#endif
-
-#ifdef CONFIG_MACH_DSPG_DVW
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_DSPG_DVW
-# endif
-# define machine_is_dspg_dvw() (machine_arch_type == MACH_TYPE_DSPG_DVW)
-#else
-# define machine_is_dspg_dvw() (0)
-#endif
-
-#ifdef CONFIG_MACH_SOLOS
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SOLOS
-# endif
-# define machine_is_solos() (machine_arch_type == MACH_TYPE_SOLOS)
-#else
-# define machine_is_solos() (0)
-#endif
-
#ifdef CONFIG_MACH_AT91SAM9263EK
# ifdef machine_arch_type
# undef machine_arch_type
@@ -17593,114 +3541,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_at91sam9263ek() (0)
#endif
-#ifdef CONFIG_MACH_OSSTBOX
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_OSSTBOX
-# endif
-# define machine_is_osstbox() (machine_arch_type == MACH_TYPE_OSSTBOX)
-#else
-# define machine_is_osstbox() (0)
-#endif
-
-#ifdef CONFIG_MACH_KBAT9261
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_KBAT9261
-# endif
-# define machine_is_kbat9261() (machine_arch_type == MACH_TYPE_KBAT9261)
-#else
-# define machine_is_kbat9261() (0)
-#endif
-
-#ifdef CONFIG_MACH_CT1100
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CT1100
-# endif
-# define machine_is_ct1100() (machine_arch_type == MACH_TYPE_CT1100)
-#else
-# define machine_is_ct1100() (0)
-#endif
-
-#ifdef CONFIG_MACH_AKCPPXA
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_AKCPPXA
-# endif
-# define machine_is_akcppxa() (machine_arch_type == MACH_TYPE_AKCPPXA)
-#else
-# define machine_is_akcppxa() (0)
-#endif
-
-#ifdef CONFIG_MACH_OCHAYA1020
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_OCHAYA1020
-# endif
-# define machine_is_ochaya1020() (machine_arch_type == MACH_TYPE_OCHAYA1020)
-#else
-# define machine_is_ochaya1020() (0)
-#endif
-
-#ifdef CONFIG_MACH_HITRACK
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_HITRACK
-# endif
-# define machine_is_hitrack() (machine_arch_type == MACH_TYPE_HITRACK)
-#else
-# define machine_is_hitrack() (0)
-#endif
-
-#ifdef CONFIG_MACH_SYME1
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SYME1
-# endif
-# define machine_is_syme1() (machine_arch_type == MACH_TYPE_SYME1)
-#else
-# define machine_is_syme1() (0)
-#endif
-
-#ifdef CONFIG_MACH_SYHL1
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SYHL1
-# endif
-# define machine_is_syhl1() (machine_arch_type == MACH_TYPE_SYHL1)
-#else
-# define machine_is_syhl1() (0)
-#endif
-
-#ifdef CONFIG_MACH_EMPCA400
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_EMPCA400
-# endif
-# define machine_is_empca400() (machine_arch_type == MACH_TYPE_EMPCA400)
-#else
-# define machine_is_empca400() (0)
-#endif
-
#ifdef CONFIG_MACH_EM7210
# ifdef machine_arch_type
# undef machine_arch_type
@@ -17713,162 +3553,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_em7210() (0)
#endif
-#ifdef CONFIG_MACH_HTCHERMES
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_HTCHERMES
-# endif
-# define machine_is_htchermes() (machine_arch_type == MACH_TYPE_HTCHERMES)
-#else
-# define machine_is_htchermes() (0)
-#endif
-
-#ifdef CONFIG_MACH_ETI_C1
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ETI_C1
-# endif
-# define machine_is_eti_c1() (machine_arch_type == MACH_TYPE_ETI_C1)
-#else
-# define machine_is_eti_c1() (0)
-#endif
-
-#ifdef CONFIG_MACH_AC100
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_AC100
-# endif
-# define machine_is_ac100() (machine_arch_type == MACH_TYPE_AC100)
-#else
-# define machine_is_ac100() (0)
-#endif
-
-#ifdef CONFIG_MACH_SNEETCH
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SNEETCH
-# endif
-# define machine_is_sneetch() (machine_arch_type == MACH_TYPE_SNEETCH)
-#else
-# define machine_is_sneetch() (0)
-#endif
-
-#ifdef CONFIG_MACH_STUDENTMATE
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_STUDENTMATE
-# endif
-# define machine_is_studentmate() (machine_arch_type == MACH_TYPE_STUDENTMATE)
-#else
-# define machine_is_studentmate() (0)
-#endif
-
-#ifdef CONFIG_MACH_ZIR2410
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ZIR2410
-# endif
-# define machine_is_zir2410() (machine_arch_type == MACH_TYPE_ZIR2410)
-#else
-# define machine_is_zir2410() (0)
-#endif
-
-#ifdef CONFIG_MACH_ZIR2413
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ZIR2413
-# endif
-# define machine_is_zir2413() (machine_arch_type == MACH_TYPE_ZIR2413)
-#else
-# define machine_is_zir2413() (0)
-#endif
-
-#ifdef CONFIG_MACH_DLONIP3
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_DLONIP3
-# endif
-# define machine_is_dlonip3() (machine_arch_type == MACH_TYPE_DLONIP3)
-#else
-# define machine_is_dlonip3() (0)
-#endif
-
-#ifdef CONFIG_MACH_INSTREAM
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_INSTREAM
-# endif
-# define machine_is_instream() (machine_arch_type == MACH_TYPE_INSTREAM)
-#else
-# define machine_is_instream() (0)
-#endif
-
-#ifdef CONFIG_MACH_AMBARELLA
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_AMBARELLA
-# endif
-# define machine_is_ambarella() (machine_arch_type == MACH_TYPE_AMBARELLA)
-#else
-# define machine_is_ambarella() (0)
-#endif
-
-#ifdef CONFIG_MACH_NEVIS
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_NEVIS
-# endif
-# define machine_is_nevis() (machine_arch_type == MACH_TYPE_NEVIS)
-#else
-# define machine_is_nevis() (0)
-#endif
-
-#ifdef CONFIG_MACH_HTC_TRINITY
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_HTC_TRINITY
-# endif
-# define machine_is_htc_trinity() (machine_arch_type == MACH_TYPE_HTC_TRINITY)
-#else
-# define machine_is_htc_trinity() (0)
-#endif
-
-#ifdef CONFIG_MACH_QL202B
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_QL202B
-# endif
-# define machine_is_ql202b() (machine_arch_type == MACH_TYPE_QL202B)
-#else
-# define machine_is_ql202b() (0)
-#endif
-
#ifdef CONFIG_MACH_VPAC270
# ifdef machine_arch_type
# undef machine_arch_type
@@ -17881,30 +3565,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_vpac270() (0)
#endif
-#ifdef CONFIG_MACH_RD129
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_RD129
-# endif
-# define machine_is_rd129() (machine_arch_type == MACH_TYPE_RD129)
-#else
-# define machine_is_rd129() (0)
-#endif
-
-#ifdef CONFIG_MACH_HTCWIZARD
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_HTCWIZARD
-# endif
-# define machine_is_htcwizard() (machine_arch_type == MACH_TYPE_HTCWIZARD)
-#else
-# define machine_is_htcwizard() (0)
-#endif
-
#ifdef CONFIG_MACH_TREO680
# ifdef machine_arch_type
# undef machine_arch_type
@@ -17917,18 +3577,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_treo680() (0)
#endif
-#ifdef CONFIG_MACH_TECON_TMEZON
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_TECON_TMEZON
-# endif
-# define machine_is_tecon_tmezon() (machine_arch_type == MACH_TYPE_TECON_TMEZON)
-#else
-# define machine_is_tecon_tmezon() (0)
-#endif
-
#ifdef CONFIG_MACH_ZYLONITE
# ifdef machine_arch_type
# undef machine_arch_type
@@ -17941,30 +3589,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_zylonite() (0)
#endif
-#ifdef CONFIG_MACH_GENE1270
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_GENE1270
-# endif
-# define machine_is_gene1270() (machine_arch_type == MACH_TYPE_GENE1270)
-#else
-# define machine_is_gene1270() (0)
-#endif
-
-#ifdef CONFIG_MACH_ZIR2412
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ZIR2412
-# endif
-# define machine_is_zir2412() (machine_arch_type == MACH_TYPE_ZIR2412)
-#else
-# define machine_is_zir2412() (0)
-#endif
-
#ifdef CONFIG_MACH_MX31LITE
# ifdef machine_arch_type
# undef machine_arch_type
@@ -17977,234 +3601,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_mx31lite() (0)
#endif
-#ifdef CONFIG_MACH_T700WX
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_T700WX
-# endif
-# define machine_is_t700wx() (machine_arch_type == MACH_TYPE_T700WX)
-#else
-# define machine_is_t700wx() (0)
-#endif
-
-#ifdef CONFIG_MACH_VF100
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_VF100
-# endif
-# define machine_is_vf100() (machine_arch_type == MACH_TYPE_VF100)
-#else
-# define machine_is_vf100() (0)
-#endif
-
-#ifdef CONFIG_MACH_NSB2
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_NSB2
-# endif
-# define machine_is_nsb2() (machine_arch_type == MACH_TYPE_NSB2)
-#else
-# define machine_is_nsb2() (0)
-#endif
-
-#ifdef CONFIG_MACH_NXHMI_BB
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_NXHMI_BB
-# endif
-# define machine_is_nxhmi_bb() (machine_arch_type == MACH_TYPE_NXHMI_BB)
-#else
-# define machine_is_nxhmi_bb() (0)
-#endif
-
-#ifdef CONFIG_MACH_NXHMI_RE
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_NXHMI_RE
-# endif
-# define machine_is_nxhmi_re() (machine_arch_type == MACH_TYPE_NXHMI_RE)
-#else
-# define machine_is_nxhmi_re() (0)
-#endif
-
-#ifdef CONFIG_MACH_N4100PRO
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_N4100PRO
-# endif
-# define machine_is_n4100pro() (machine_arch_type == MACH_TYPE_N4100PRO)
-#else
-# define machine_is_n4100pro() (0)
-#endif
-
-#ifdef CONFIG_MACH_SAM9260
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SAM9260
-# endif
-# define machine_is_sam9260() (machine_arch_type == MACH_TYPE_SAM9260)
-#else
-# define machine_is_sam9260() (0)
-#endif
-
-#ifdef CONFIG_MACH_OMAP_TREO600
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_OMAP_TREO600
-# endif
-# define machine_is_omap_treo600() (machine_arch_type == MACH_TYPE_OMAP_TREO600)
-#else
-# define machine_is_omap_treo600() (0)
-#endif
-
-#ifdef CONFIG_MACH_INDY2410
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_INDY2410
-# endif
-# define machine_is_indy2410() (machine_arch_type == MACH_TYPE_INDY2410)
-#else
-# define machine_is_indy2410() (0)
-#endif
-
-#ifdef CONFIG_MACH_NELT_A
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_NELT_A
-# endif
-# define machine_is_nelt_a() (machine_arch_type == MACH_TYPE_NELT_A)
-#else
-# define machine_is_nelt_a() (0)
-#endif
-
-#ifdef CONFIG_MACH_N311
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_N311
-# endif
-# define machine_is_n311() (machine_arch_type == MACH_TYPE_N311)
-#else
-# define machine_is_n311() (0)
-#endif
-
-#ifdef CONFIG_MACH_AT91SAM9260VGK
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_AT91SAM9260VGK
-# endif
-# define machine_is_at91sam9260vgk() (machine_arch_type == MACH_TYPE_AT91SAM9260VGK)
-#else
-# define machine_is_at91sam9260vgk() (0)
-#endif
-
-#ifdef CONFIG_MACH_AT91LEPPE
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_AT91LEPPE
-# endif
-# define machine_is_at91leppe() (machine_arch_type == MACH_TYPE_AT91LEPPE)
-#else
-# define machine_is_at91leppe() (0)
-#endif
-
-#ifdef CONFIG_MACH_AT91LEPCCN
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_AT91LEPCCN
-# endif
-# define machine_is_at91lepccn() (machine_arch_type == MACH_TYPE_AT91LEPCCN)
-#else
-# define machine_is_at91lepccn() (0)
-#endif
-
-#ifdef CONFIG_MACH_APC7100
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_APC7100
-# endif
-# define machine_is_apc7100() (machine_arch_type == MACH_TYPE_APC7100)
-#else
-# define machine_is_apc7100() (0)
-#endif
-
-#ifdef CONFIG_MACH_STARGAZER
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_STARGAZER
-# endif
-# define machine_is_stargazer() (machine_arch_type == MACH_TYPE_STARGAZER)
-#else
-# define machine_is_stargazer() (0)
-#endif
-
-#ifdef CONFIG_MACH_SONATA
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SONATA
-# endif
-# define machine_is_sonata() (machine_arch_type == MACH_TYPE_SONATA)
-#else
-# define machine_is_sonata() (0)
-#endif
-
-#ifdef CONFIG_MACH_SCHMOOGIE
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SCHMOOGIE
-# endif
-# define machine_is_schmoogie() (machine_arch_type == MACH_TYPE_SCHMOOGIE)
-#else
-# define machine_is_schmoogie() (0)
-#endif
-
-#ifdef CONFIG_MACH_AZTOOL
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_AZTOOL
-# endif
-# define machine_is_aztool() (machine_arch_type == MACH_TYPE_AZTOOL)
-#else
-# define machine_is_aztool() (0)
-#endif
-
#ifdef CONFIG_MACH_MIOA701
# ifdef machine_arch_type
# undef machine_arch_type
@@ -18217,30 +3613,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_mioa701() (0)
#endif
-#ifdef CONFIG_MACH_SXNI9260
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SXNI9260
-# endif
-# define machine_is_sxni9260() (machine_arch_type == MACH_TYPE_SXNI9260)
-#else
-# define machine_is_sxni9260() (0)
-#endif
-
-#ifdef CONFIG_MACH_MXC27520EVB
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MXC27520EVB
-# endif
-# define machine_is_mxc27520evb() (machine_arch_type == MACH_TYPE_MXC27520EVB)
-#else
-# define machine_is_mxc27520evb() (0)
-#endif
-
#ifdef CONFIG_MACH_ARMADILLO5X0
# ifdef machine_arch_type
# undef machine_arch_type
@@ -18253,42 +3625,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_armadillo5x0() (0)
#endif
-#ifdef CONFIG_MACH_MB9260
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MB9260
-# endif
-# define machine_is_mb9260() (machine_arch_type == MACH_TYPE_MB9260)
-#else
-# define machine_is_mb9260() (0)
-#endif
-
-#ifdef CONFIG_MACH_MB9263
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MB9263
-# endif
-# define machine_is_mb9263() (machine_arch_type == MACH_TYPE_MB9263)
-#else
-# define machine_is_mb9263() (0)
-#endif
-
-#ifdef CONFIG_MACH_IPAC9302
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_IPAC9302
-# endif
-# define machine_is_ipac9302() (machine_arch_type == MACH_TYPE_IPAC9302)
-#else
-# define machine_is_ipac9302() (0)
-#endif
-
#ifdef CONFIG_MACH_CC9P9360JS
# ifdef machine_arch_type
# undef machine_arch_type
@@ -18301,66 +3637,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_cc9p9360js() (0)
#endif
-#ifdef CONFIG_MACH_GALLIUM
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_GALLIUM
-# endif
-# define machine_is_gallium() (machine_arch_type == MACH_TYPE_GALLIUM)
-#else
-# define machine_is_gallium() (0)
-#endif
-
-#ifdef CONFIG_MACH_MSC2410
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MSC2410
-# endif
-# define machine_is_msc2410() (machine_arch_type == MACH_TYPE_MSC2410)
-#else
-# define machine_is_msc2410() (0)
-#endif
-
-#ifdef CONFIG_MACH_GHI270
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_GHI270
-# endif
-# define machine_is_ghi270() (machine_arch_type == MACH_TYPE_GHI270)
-#else
-# define machine_is_ghi270() (0)
-#endif
-
-#ifdef CONFIG_MACH_DAVINCI_LEONARDO
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_DAVINCI_LEONARDO
-# endif
-# define machine_is_davinci_leonardo() (machine_arch_type == MACH_TYPE_DAVINCI_LEONARDO)
-#else
-# define machine_is_davinci_leonardo() (0)
-#endif
-
-#ifdef CONFIG_MACH_OIAB
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_OIAB
-# endif
-# define machine_is_oiab() (machine_arch_type == MACH_TYPE_OIAB)
-#else
-# define machine_is_oiab() (0)
-#endif
-
#ifdef CONFIG_MACH_SMDK6400
# ifdef machine_arch_type
# undef machine_arch_type
@@ -18385,114 +3661,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_nokia_n800() (0)
#endif
-#ifdef CONFIG_MACH_GREENPHONE
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_GREENPHONE
-# endif
-# define machine_is_greenphone() (machine_arch_type == MACH_TYPE_GREENPHONE)
-#else
-# define machine_is_greenphone() (0)
-#endif
-
-#ifdef CONFIG_MACH_COMPEXWP18
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_COMPEXWP18
-# endif
-# define machine_is_compex42x() (machine_arch_type == MACH_TYPE_COMPEXWP18)
-#else
-# define machine_is_compex42x() (0)
-#endif
-
-#ifdef CONFIG_MACH_XMATE
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_XMATE
-# endif
-# define machine_is_xmate() (machine_arch_type == MACH_TYPE_XMATE)
-#else
-# define machine_is_xmate() (0)
-#endif
-
-#ifdef CONFIG_MACH_ENERGIZER
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ENERGIZER
-# endif
-# define machine_is_energizer() (machine_arch_type == MACH_TYPE_ENERGIZER)
-#else
-# define machine_is_energizer() (0)
-#endif
-
-#ifdef CONFIG_MACH_IME1
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_IME1
-# endif
-# define machine_is_ime1() (machine_arch_type == MACH_TYPE_IME1)
-#else
-# define machine_is_ime1() (0)
-#endif
-
-#ifdef CONFIG_MACH_SWEDATMS
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SWEDATMS
-# endif
-# define machine_is_sweda_tms() (machine_arch_type == MACH_TYPE_SWEDATMS)
-#else
-# define machine_is_sweda_tms() (0)
-#endif
-
-#ifdef CONFIG_MACH_NTNP435C
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_NTNP435C
-# endif
-# define machine_is_ntnp435c() (machine_arch_type == MACH_TYPE_NTNP435C)
-#else
-# define machine_is_ntnp435c() (0)
-#endif
-
-#ifdef CONFIG_MACH_SPECTRO2
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SPECTRO2
-# endif
-# define machine_is_spectro2() (machine_arch_type == MACH_TYPE_SPECTRO2)
-#else
-# define machine_is_spectro2() (0)
-#endif
-
-#ifdef CONFIG_MACH_H6039
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_H6039
-# endif
-# define machine_is_h6039() (machine_arch_type == MACH_TYPE_H6039)
-#else
-# define machine_is_h6039() (0)
-#endif
-
#ifdef CONFIG_MACH_EP80219
# ifdef machine_arch_type
# undef machine_arch_type
@@ -18505,126 +3673,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_ep80219() (0)
#endif
-#ifdef CONFIG_MACH_SAMOA_II
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SAMOA_II
-# endif
-# define machine_is_samoa_ii() (machine_arch_type == MACH_TYPE_SAMOA_II)
-#else
-# define machine_is_samoa_ii() (0)
-#endif
-
-#ifdef CONFIG_MACH_CWMXL
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CWMXL
-# endif
-# define machine_is_cwmxl() (machine_arch_type == MACH_TYPE_CWMXL)
-#else
-# define machine_is_cwmxl() (0)
-#endif
-
-#ifdef CONFIG_MACH_AS9200
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_AS9200
-# endif
-# define machine_is_as9200() (machine_arch_type == MACH_TYPE_AS9200)
-#else
-# define machine_is_as9200() (0)
-#endif
-
-#ifdef CONFIG_MACH_SFX1149
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SFX1149
-# endif
-# define machine_is_sfx1149() (machine_arch_type == MACH_TYPE_SFX1149)
-#else
-# define machine_is_sfx1149() (0)
-#endif
-
-#ifdef CONFIG_MACH_NAVI010
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_NAVI010
-# endif
-# define machine_is_navi010() (machine_arch_type == MACH_TYPE_NAVI010)
-#else
-# define machine_is_navi010() (0)
-#endif
-
-#ifdef CONFIG_MACH_MULTMDP
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MULTMDP
-# endif
-# define machine_is_multmdp() (machine_arch_type == MACH_TYPE_MULTMDP)
-#else
-# define machine_is_multmdp() (0)
-#endif
-
-#ifdef CONFIG_MACH_SCB9520
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SCB9520
-# endif
-# define machine_is_scb9520() (machine_arch_type == MACH_TYPE_SCB9520)
-#else
-# define machine_is_scb9520() (0)
-#endif
-
-#ifdef CONFIG_MACH_HTCATHENA
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_HTCATHENA
-# endif
-# define machine_is_htcathena() (machine_arch_type == MACH_TYPE_HTCATHENA)
-#else
-# define machine_is_htcathena() (0)
-#endif
-
-#ifdef CONFIG_MACH_XP179
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_XP179
-# endif
-# define machine_is_xp179() (machine_arch_type == MACH_TYPE_XP179)
-#else
-# define machine_is_xp179() (0)
-#endif
-
-#ifdef CONFIG_MACH_H4300
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_H4300
-# endif
-# define machine_is_h4300() (machine_arch_type == MACH_TYPE_H4300)
-#else
-# define machine_is_h4300() (0)
-#endif
-
#ifdef CONFIG_MACH_GORAMO_MLR
# ifdef machine_arch_type
# undef machine_arch_type
@@ -18637,54 +3685,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_goramo_mlr() (0)
#endif
-#ifdef CONFIG_MACH_MXC30020EVB
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MXC30020EVB
-# endif
-# define machine_is_mxc30020evb() (machine_arch_type == MACH_TYPE_MXC30020EVB)
-#else
-# define machine_is_mxc30020evb() (0)
-#endif
-
-#ifdef CONFIG_MACH_ADSBITSYG5
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ADSBITSYG5
-# endif
-# define machine_is_adsbitsyg5() (machine_arch_type == MACH_TYPE_ADSBITSYG5)
-#else
-# define machine_is_adsbitsyg5() (0)
-#endif
-
-#ifdef CONFIG_MACH_ADSPORTALPLUS
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ADSPORTALPLUS
-# endif
-# define machine_is_adsportalplus() (machine_arch_type == MACH_TYPE_ADSPORTALPLUS)
-#else
-# define machine_is_adsportalplus() (0)
-#endif
-
-#ifdef CONFIG_MACH_MMSP2PLUS
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MMSP2PLUS
-# endif
-# define machine_is_mmsp2plus() (machine_arch_type == MACH_TYPE_MMSP2PLUS)
-#else
-# define machine_is_mmsp2plus() (0)
-#endif
-
#ifdef CONFIG_MACH_EM_X270
# ifdef machine_arch_type
# undef machine_arch_type
@@ -18697,78 +3697,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_em_x270() (0)
#endif
-#ifdef CONFIG_MACH_TPP302
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_TPP302
-# endif
-# define machine_is_tpp302() (machine_arch_type == MACH_TYPE_TPP302)
-#else
-# define machine_is_tpp302() (0)
-#endif
-
-#ifdef CONFIG_MACH_TPM104
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_TPM104
-# endif
-# define machine_is_tpp104() (machine_arch_type == MACH_TYPE_TPM104)
-#else
-# define machine_is_tpp104() (0)
-#endif
-
-#ifdef CONFIG_MACH_TPM102
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_TPM102
-# endif
-# define machine_is_tpm102() (machine_arch_type == MACH_TYPE_TPM102)
-#else
-# define machine_is_tpm102() (0)
-#endif
-
-#ifdef CONFIG_MACH_TPM109
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_TPM109
-# endif
-# define machine_is_tpm109() (machine_arch_type == MACH_TYPE_TPM109)
-#else
-# define machine_is_tpm109() (0)
-#endif
-
-#ifdef CONFIG_MACH_FBXO1
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_FBXO1
-# endif
-# define machine_is_fbxo1() (machine_arch_type == MACH_TYPE_FBXO1)
-#else
-# define machine_is_fbxo1() (0)
-#endif
-
-#ifdef CONFIG_MACH_HXD8
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_HXD8
-# endif
-# define machine_is_hxd8() (machine_arch_type == MACH_TYPE_HXD8)
-#else
-# define machine_is_hxd8() (0)
-#endif
-
#ifdef CONFIG_MACH_NEO1973_GTA02
# ifdef machine_arch_type
# undef machine_arch_type
@@ -18781,258 +3709,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_neo1973_gta02() (0)
#endif
-#ifdef CONFIG_MACH_EMTEST
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_EMTEST
-# endif
-# define machine_is_emtest() (machine_arch_type == MACH_TYPE_EMTEST)
-#else
-# define machine_is_emtest() (0)
-#endif
-
-#ifdef CONFIG_MACH_AD6900
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_AD6900
-# endif
-# define machine_is_ad6900() (machine_arch_type == MACH_TYPE_AD6900)
-#else
-# define machine_is_ad6900() (0)
-#endif
-
-#ifdef CONFIG_MACH_EUROPA
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_EUROPA
-# endif
-# define machine_is_europa() (machine_arch_type == MACH_TYPE_EUROPA)
-#else
-# define machine_is_europa() (0)
-#endif
-
-#ifdef CONFIG_MACH_METROCONNECT
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_METROCONNECT
-# endif
-# define machine_is_metroconnect() (machine_arch_type == MACH_TYPE_METROCONNECT)
-#else
-# define machine_is_metroconnect() (0)
-#endif
-
-#ifdef CONFIG_MACH_EZ_S2410
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_EZ_S2410
-# endif
-# define machine_is_ez_s2410() (machine_arch_type == MACH_TYPE_EZ_S2410)
-#else
-# define machine_is_ez_s2410() (0)
-#endif
-
-#ifdef CONFIG_MACH_EZ_S2440
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_EZ_S2440
-# endif
-# define machine_is_ez_s2440() (machine_arch_type == MACH_TYPE_EZ_S2440)
-#else
-# define machine_is_ez_s2440() (0)
-#endif
-
-#ifdef CONFIG_MACH_EZ_EP9312
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_EZ_EP9312
-# endif
-# define machine_is_ez_ep9312() (machine_arch_type == MACH_TYPE_EZ_EP9312)
-#else
-# define machine_is_ez_ep9312() (0)
-#endif
-
-#ifdef CONFIG_MACH_EZ_EP9315
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_EZ_EP9315
-# endif
-# define machine_is_ez_ep9315() (machine_arch_type == MACH_TYPE_EZ_EP9315)
-#else
-# define machine_is_ez_ep9315() (0)
-#endif
-
-#ifdef CONFIG_MACH_EZ_X7
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_EZ_X7
-# endif
-# define machine_is_ez_x7() (machine_arch_type == MACH_TYPE_EZ_X7)
-#else
-# define machine_is_ez_x7() (0)
-#endif
-
-#ifdef CONFIG_MACH_GODOTDB
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_GODOTDB
-# endif
-# define machine_is_godotdb() (machine_arch_type == MACH_TYPE_GODOTDB)
-#else
-# define machine_is_godotdb() (0)
-#endif
-
-#ifdef CONFIG_MACH_MISTRAL
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MISTRAL
-# endif
-# define machine_is_mistral() (machine_arch_type == MACH_TYPE_MISTRAL)
-#else
-# define machine_is_mistral() (0)
-#endif
-
-#ifdef CONFIG_MACH_MSM
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MSM
-# endif
-# define machine_is_msm() (machine_arch_type == MACH_TYPE_MSM)
-#else
-# define machine_is_msm() (0)
-#endif
-
-#ifdef CONFIG_MACH_CT5910
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CT5910
-# endif
-# define machine_is_ct5910() (machine_arch_type == MACH_TYPE_CT5910)
-#else
-# define machine_is_ct5910() (0)
-#endif
-
-#ifdef CONFIG_MACH_CT5912
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CT5912
-# endif
-# define machine_is_ct5912() (machine_arch_type == MACH_TYPE_CT5912)
-#else
-# define machine_is_ct5912() (0)
-#endif
-
-#ifdef CONFIG_MACH_HYNET_INE
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_HYNET_INE
-# endif
-# define machine_is_hynet_ine() (machine_arch_type == MACH_TYPE_HYNET_INE)
-#else
-# define machine_is_hynet_ine() (0)
-#endif
-
-#ifdef CONFIG_MACH_HYNET_APP
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_HYNET_APP
-# endif
-# define machine_is_hynet_app() (machine_arch_type == MACH_TYPE_HYNET_APP)
-#else
-# define machine_is_hynet_app() (0)
-#endif
-
-#ifdef CONFIG_MACH_MSM7200
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MSM7200
-# endif
-# define machine_is_msm7200() (machine_arch_type == MACH_TYPE_MSM7200)
-#else
-# define machine_is_msm7200() (0)
-#endif
-
-#ifdef CONFIG_MACH_MSM7600
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MSM7600
-# endif
-# define machine_is_msm7600() (machine_arch_type == MACH_TYPE_MSM7600)
-#else
-# define machine_is_msm7600() (0)
-#endif
-
-#ifdef CONFIG_MACH_CEB255
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CEB255
-# endif
-# define machine_is_ceb255() (machine_arch_type == MACH_TYPE_CEB255)
-#else
-# define machine_is_ceb255() (0)
-#endif
-
-#ifdef CONFIG_MACH_CIEL
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CIEL
-# endif
-# define machine_is_ciel() (machine_arch_type == MACH_TYPE_CIEL)
-#else
-# define machine_is_ciel() (0)
-#endif
-
-#ifdef CONFIG_MACH_SLM5650
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SLM5650
-# endif
-# define machine_is_slm5650() (machine_arch_type == MACH_TYPE_SLM5650)
-#else
-# define machine_is_slm5650() (0)
-#endif
-
#ifdef CONFIG_MACH_AT91SAM9RLEK
# ifdef machine_arch_type
# undef machine_arch_type
@@ -19045,162 +3721,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_at91sam9rlek() (0)
#endif
-#ifdef CONFIG_MACH_COMTECH_ROUTER
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_COMTECH_ROUTER
-# endif
-# define machine_is_comtech_router() (machine_arch_type == MACH_TYPE_COMTECH_ROUTER)
-#else
-# define machine_is_comtech_router() (0)
-#endif
-
-#ifdef CONFIG_MACH_SBC2410X
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SBC2410X
-# endif
-# define machine_is_sbc2410x() (machine_arch_type == MACH_TYPE_SBC2410X)
-#else
-# define machine_is_sbc2410x() (0)
-#endif
-
-#ifdef CONFIG_MACH_AT4X0BD
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_AT4X0BD
-# endif
-# define machine_is_at4x0bd() (machine_arch_type == MACH_TYPE_AT4X0BD)
-#else
-# define machine_is_at4x0bd() (0)
-#endif
-
-#ifdef CONFIG_MACH_CBIFR
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CBIFR
-# endif
-# define machine_is_cbifr() (machine_arch_type == MACH_TYPE_CBIFR)
-#else
-# define machine_is_cbifr() (0)
-#endif
-
-#ifdef CONFIG_MACH_ARCOM_QUANTUM
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ARCOM_QUANTUM
-# endif
-# define machine_is_arcom_quantum() (machine_arch_type == MACH_TYPE_ARCOM_QUANTUM)
-#else
-# define machine_is_arcom_quantum() (0)
-#endif
-
-#ifdef CONFIG_MACH_MATRIX520
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MATRIX520
-# endif
-# define machine_is_matrix520() (machine_arch_type == MACH_TYPE_MATRIX520)
-#else
-# define machine_is_matrix520() (0)
-#endif
-
-#ifdef CONFIG_MACH_MATRIX510
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MATRIX510
-# endif
-# define machine_is_matrix510() (machine_arch_type == MACH_TYPE_MATRIX510)
-#else
-# define machine_is_matrix510() (0)
-#endif
-
-#ifdef CONFIG_MACH_MATRIX500
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MATRIX500
-# endif
-# define machine_is_matrix500() (machine_arch_type == MACH_TYPE_MATRIX500)
-#else
-# define machine_is_matrix500() (0)
-#endif
-
-#ifdef CONFIG_MACH_M501
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_M501
-# endif
-# define machine_is_m501() (machine_arch_type == MACH_TYPE_M501)
-#else
-# define machine_is_m501() (0)
-#endif
-
-#ifdef CONFIG_MACH_AAEON1270
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_AAEON1270
-# endif
-# define machine_is_aaeon1270() (machine_arch_type == MACH_TYPE_AAEON1270)
-#else
-# define machine_is_aaeon1270() (0)
-#endif
-
-#ifdef CONFIG_MACH_MATRIX500EV
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MATRIX500EV
-# endif
-# define machine_is_matrix500ev() (machine_arch_type == MACH_TYPE_MATRIX500EV)
-#else
-# define machine_is_matrix500ev() (0)
-#endif
-
-#ifdef CONFIG_MACH_PAC500
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_PAC500
-# endif
-# define machine_is_pac500() (machine_arch_type == MACH_TYPE_PAC500)
-#else
-# define machine_is_pac500() (0)
-#endif
-
-#ifdef CONFIG_MACH_PNX8181
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_PNX8181
-# endif
-# define machine_is_pnx8181() (machine_arch_type == MACH_TYPE_PNX8181)
-#else
-# define machine_is_pnx8181() (0)
-#endif
-
#ifdef CONFIG_MACH_COLIBRI320
# ifdef machine_arch_type
# undef machine_arch_type
@@ -19213,126 +3733,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_colibri320() (0)
#endif
-#ifdef CONFIG_MACH_AZTOOLBB
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_AZTOOLBB
-# endif
-# define machine_is_aztoolbb() (machine_arch_type == MACH_TYPE_AZTOOLBB)
-#else
-# define machine_is_aztoolbb() (0)
-#endif
-
-#ifdef CONFIG_MACH_AZTOOLG2
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_AZTOOLG2
-# endif
-# define machine_is_aztoolg2() (machine_arch_type == MACH_TYPE_AZTOOLG2)
-#else
-# define machine_is_aztoolg2() (0)
-#endif
-
-#ifdef CONFIG_MACH_DVLHOST
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_DVLHOST
-# endif
-# define machine_is_dvlhost() (machine_arch_type == MACH_TYPE_DVLHOST)
-#else
-# define machine_is_dvlhost() (0)
-#endif
-
-#ifdef CONFIG_MACH_ZIR9200
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ZIR9200
-# endif
-# define machine_is_zir9200() (machine_arch_type == MACH_TYPE_ZIR9200)
-#else
-# define machine_is_zir9200() (0)
-#endif
-
-#ifdef CONFIG_MACH_ZIR9260
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ZIR9260
-# endif
-# define machine_is_zir9260() (machine_arch_type == MACH_TYPE_ZIR9260)
-#else
-# define machine_is_zir9260() (0)
-#endif
-
-#ifdef CONFIG_MACH_COCOPAH
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_COCOPAH
-# endif
-# define machine_is_cocopah() (machine_arch_type == MACH_TYPE_COCOPAH)
-#else
-# define machine_is_cocopah() (0)
-#endif
-
-#ifdef CONFIG_MACH_NDS
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_NDS
-# endif
-# define machine_is_nds() (machine_arch_type == MACH_TYPE_NDS)
-#else
-# define machine_is_nds() (0)
-#endif
-
-#ifdef CONFIG_MACH_ROSENCRANTZ
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ROSENCRANTZ
-# endif
-# define machine_is_rosencrantz() (machine_arch_type == MACH_TYPE_ROSENCRANTZ)
-#else
-# define machine_is_rosencrantz() (0)
-#endif
-
-#ifdef CONFIG_MACH_FTTX_ODSC
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_FTTX_ODSC
-# endif
-# define machine_is_fttx_odsc() (machine_arch_type == MACH_TYPE_FTTX_ODSC)
-#else
-# define machine_is_fttx_odsc() (0)
-#endif
-
-#ifdef CONFIG_MACH_CLASSE_R6904
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CLASSE_R6904
-# endif
-# define machine_is_classe_r6904() (machine_arch_type == MACH_TYPE_CLASSE_R6904)
-#else
-# define machine_is_classe_r6904() (0)
-#endif
-
#ifdef CONFIG_MACH_CAM60
# ifdef machine_arch_type
# undef machine_arch_type
@@ -19345,30 +3745,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_cam60() (0)
#endif
-#ifdef CONFIG_MACH_MXC30031ADS
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MXC30031ADS
-# endif
-# define machine_is_mxc30031ads() (machine_arch_type == MACH_TYPE_MXC30031ADS)
-#else
-# define machine_is_mxc30031ads() (0)
-#endif
-
-#ifdef CONFIG_MACH_DATACALL
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_DATACALL
-# endif
-# define machine_is_datacall() (machine_arch_type == MACH_TYPE_DATACALL)
-#else
-# define machine_is_datacall() (0)
-#endif
-
#ifdef CONFIG_MACH_AT91EB01
# ifdef machine_arch_type
# undef machine_arch_type
@@ -19381,42 +3757,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_at91eb01() (0)
#endif
-#ifdef CONFIG_MACH_RTY
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_RTY
-# endif
-# define machine_is_rty() (machine_arch_type == MACH_TYPE_RTY)
-#else
-# define machine_is_rty() (0)
-#endif
-
-#ifdef CONFIG_MACH_DWL2100
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_DWL2100
-# endif
-# define machine_is_dwl2100() (machine_arch_type == MACH_TYPE_DWL2100)
-#else
-# define machine_is_dwl2100() (0)
-#endif
-
-#ifdef CONFIG_MACH_VINSI
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_VINSI
-# endif
-# define machine_is_vinsi() (machine_arch_type == MACH_TYPE_VINSI)
-#else
-# define machine_is_vinsi() (0)
-#endif
-
#ifdef CONFIG_MACH_DB88F5281
# ifdef machine_arch_type
# undef machine_arch_type
@@ -19441,234 +3781,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_csb726() (0)
#endif
-#ifdef CONFIG_MACH_TIK27
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_TIK27
-# endif
-# define machine_is_tik27() (machine_arch_type == MACH_TYPE_TIK27)
-#else
-# define machine_is_tik27() (0)
-#endif
-
-#ifdef CONFIG_MACH_MX_UC7420
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MX_UC7420
-# endif
-# define machine_is_mx_uc7420() (machine_arch_type == MACH_TYPE_MX_UC7420)
-#else
-# define machine_is_mx_uc7420() (0)
-#endif
-
-#ifdef CONFIG_MACH_RIRM3
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_RIRM3
-# endif
-# define machine_is_rirm3() (machine_arch_type == MACH_TYPE_RIRM3)
-#else
-# define machine_is_rirm3() (0)
-#endif
-
-#ifdef CONFIG_MACH_PELCO_ODYSSEY
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_PELCO_ODYSSEY
-# endif
-# define machine_is_pelco_odyssey() (machine_arch_type == MACH_TYPE_PELCO_ODYSSEY)
-#else
-# define machine_is_pelco_odyssey() (0)
-#endif
-
-#ifdef CONFIG_MACH_ADX_ABOX
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ADX_ABOX
-# endif
-# define machine_is_adx_abox() (machine_arch_type == MACH_TYPE_ADX_ABOX)
-#else
-# define machine_is_adx_abox() (0)
-#endif
-
-#ifdef CONFIG_MACH_ADX_TPID
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ADX_TPID
-# endif
-# define machine_is_adx_tpid() (machine_arch_type == MACH_TYPE_ADX_TPID)
-#else
-# define machine_is_adx_tpid() (0)
-#endif
-
-#ifdef CONFIG_MACH_MINICHECK
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MINICHECK
-# endif
-# define machine_is_minicheck() (machine_arch_type == MACH_TYPE_MINICHECK)
-#else
-# define machine_is_minicheck() (0)
-#endif
-
-#ifdef CONFIG_MACH_IDAM
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_IDAM
-# endif
-# define machine_is_idam() (machine_arch_type == MACH_TYPE_IDAM)
-#else
-# define machine_is_idam() (0)
-#endif
-
-#ifdef CONFIG_MACH_MARIO_MX
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MARIO_MX
-# endif
-# define machine_is_mario_mx() (machine_arch_type == MACH_TYPE_MARIO_MX)
-#else
-# define machine_is_mario_mx() (0)
-#endif
-
-#ifdef CONFIG_MACH_VI1888
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_VI1888
-# endif
-# define machine_is_vi1888() (machine_arch_type == MACH_TYPE_VI1888)
-#else
-# define machine_is_vi1888() (0)
-#endif
-
-#ifdef CONFIG_MACH_ZR4230
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ZR4230
-# endif
-# define machine_is_zr4230() (machine_arch_type == MACH_TYPE_ZR4230)
-#else
-# define machine_is_zr4230() (0)
-#endif
-
-#ifdef CONFIG_MACH_T1_IX_BLUE
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_T1_IX_BLUE
-# endif
-# define machine_is_t1_ix_blue() (machine_arch_type == MACH_TYPE_T1_IX_BLUE)
-#else
-# define machine_is_t1_ix_blue() (0)
-#endif
-
-#ifdef CONFIG_MACH_SYHQ2
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SYHQ2
-# endif
-# define machine_is_syhq2() (machine_arch_type == MACH_TYPE_SYHQ2)
-#else
-# define machine_is_syhq2() (0)
-#endif
-
-#ifdef CONFIG_MACH_COMPUTIME_R3
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_COMPUTIME_R3
-# endif
-# define machine_is_computime_r3() (machine_arch_type == MACH_TYPE_COMPUTIME_R3)
-#else
-# define machine_is_computime_r3() (0)
-#endif
-
-#ifdef CONFIG_MACH_ORATIS
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ORATIS
-# endif
-# define machine_is_oratis() (machine_arch_type == MACH_TYPE_ORATIS)
-#else
-# define machine_is_oratis() (0)
-#endif
-
-#ifdef CONFIG_MACH_MIKKO
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MIKKO
-# endif
-# define machine_is_mikko() (machine_arch_type == MACH_TYPE_MIKKO)
-#else
-# define machine_is_mikko() (0)
-#endif
-
-#ifdef CONFIG_MACH_HOLON
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_HOLON
-# endif
-# define machine_is_holon() (machine_arch_type == MACH_TYPE_HOLON)
-#else
-# define machine_is_holon() (0)
-#endif
-
-#ifdef CONFIG_MACH_OLIP8
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_OLIP8
-# endif
-# define machine_is_olip8() (machine_arch_type == MACH_TYPE_OLIP8)
-#else
-# define machine_is_olip8() (0)
-#endif
-
-#ifdef CONFIG_MACH_GHI270HG
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_GHI270HG
-# endif
-# define machine_is_ghi270hg() (machine_arch_type == MACH_TYPE_GHI270HG)
-#else
-# define machine_is_ghi270hg() (0)
-#endif
-
#ifdef CONFIG_MACH_DAVINCI_DM6467_EVM
# ifdef machine_arch_type
# undef machine_arch_type
@@ -19693,66 +3805,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_davinci_dm355_evm() (0)
#endif
-#ifdef CONFIG_MACH_BLACKRIVER
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_BLACKRIVER
-# endif
-# define machine_is_blackriver() (machine_arch_type == MACH_TYPE_BLACKRIVER)
-#else
-# define machine_is_blackriver() (0)
-#endif
-
-#ifdef CONFIG_MACH_SANDGATEWP
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SANDGATEWP
-# endif
-# define machine_is_sandgate_wp() (machine_arch_type == MACH_TYPE_SANDGATEWP)
-#else
-# define machine_is_sandgate_wp() (0)
-#endif
-
-#ifdef CONFIG_MACH_CDOTBWSG
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CDOTBWSG
-# endif
-# define machine_is_cdotbwsg() (machine_arch_type == MACH_TYPE_CDOTBWSG)
-#else
-# define machine_is_cdotbwsg() (0)
-#endif
-
-#ifdef CONFIG_MACH_QUARK963
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_QUARK963
-# endif
-# define machine_is_quark963() (machine_arch_type == MACH_TYPE_QUARK963)
-#else
-# define machine_is_quark963() (0)
-#endif
-
-#ifdef CONFIG_MACH_CSB735
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CSB735
-# endif
-# define machine_is_csb735() (machine_arch_type == MACH_TYPE_CSB735)
-#else
-# define machine_is_csb735() (0)
-#endif
-
#ifdef CONFIG_MACH_LITTLETON
# ifdef machine_arch_type
# undef machine_arch_type
@@ -19765,210 +3817,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_littleton() (0)
#endif
-#ifdef CONFIG_MACH_MIO_P550
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MIO_P550
-# endif
-# define machine_is_mio_p550() (machine_arch_type == MACH_TYPE_MIO_P550)
-#else
-# define machine_is_mio_p550() (0)
-#endif
-
-#ifdef CONFIG_MACH_MOTION2440
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MOTION2440
-# endif
-# define machine_is_motion2440() (machine_arch_type == MACH_TYPE_MOTION2440)
-#else
-# define machine_is_motion2440() (0)
-#endif
-
-#ifdef CONFIG_MACH_IMM500
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_IMM500
-# endif
-# define machine_is_imm500() (machine_arch_type == MACH_TYPE_IMM500)
-#else
-# define machine_is_imm500() (0)
-#endif
-
-#ifdef CONFIG_MACH_HOMEMATIC
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_HOMEMATIC
-# endif
-# define machine_is_homematic() (machine_arch_type == MACH_TYPE_HOMEMATIC)
-#else
-# define machine_is_homematic() (0)
-#endif
-
-#ifdef CONFIG_MACH_ERMINE
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ERMINE
-# endif
-# define machine_is_ermine() (machine_arch_type == MACH_TYPE_ERMINE)
-#else
-# define machine_is_ermine() (0)
-#endif
-
-#ifdef CONFIG_MACH_KB9202B
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_KB9202B
-# endif
-# define machine_is_kb9202b() (machine_arch_type == MACH_TYPE_KB9202B)
-#else
-# define machine_is_kb9202b() (0)
-#endif
-
-#ifdef CONFIG_MACH_HS1XX
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_HS1XX
-# endif
-# define machine_is_hs1xx() (machine_arch_type == MACH_TYPE_HS1XX)
-#else
-# define machine_is_hs1xx() (0)
-#endif
-
-#ifdef CONFIG_MACH_STUDENTMATE2440
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_STUDENTMATE2440
-# endif
-# define machine_is_studentmate2440() (machine_arch_type == MACH_TYPE_STUDENTMATE2440)
-#else
-# define machine_is_studentmate2440() (0)
-#endif
-
-#ifdef CONFIG_MACH_ARVOO_L1_Z1
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ARVOO_L1_Z1
-# endif
-# define machine_is_arvoo_l1_z1() (machine_arch_type == MACH_TYPE_ARVOO_L1_Z1)
-#else
-# define machine_is_arvoo_l1_z1() (0)
-#endif
-
-#ifdef CONFIG_MACH_DEP2410K
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_DEP2410K
-# endif
-# define machine_is_dep2410k() (machine_arch_type == MACH_TYPE_DEP2410K)
-#else
-# define machine_is_dep2410k() (0)
-#endif
-
-#ifdef CONFIG_MACH_XXSVIDEO
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_XXSVIDEO
-# endif
-# define machine_is_xxsvideo() (machine_arch_type == MACH_TYPE_XXSVIDEO)
-#else
-# define machine_is_xxsvideo() (0)
-#endif
-
-#ifdef CONFIG_MACH_IM4004
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_IM4004
-# endif
-# define machine_is_im4004() (machine_arch_type == MACH_TYPE_IM4004)
-#else
-# define machine_is_im4004() (0)
-#endif
-
-#ifdef CONFIG_MACH_OCHAYA1050
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_OCHAYA1050
-# endif
-# define machine_is_ochaya1050() (machine_arch_type == MACH_TYPE_OCHAYA1050)
-#else
-# define machine_is_ochaya1050() (0)
-#endif
-
-#ifdef CONFIG_MACH_LEP9261
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_LEP9261
-# endif
-# define machine_is_lep9261() (machine_arch_type == MACH_TYPE_LEP9261)
-#else
-# define machine_is_lep9261() (0)
-#endif
-
-#ifdef CONFIG_MACH_SVENMEB
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SVENMEB
-# endif
-# define machine_is_svenmeb() (machine_arch_type == MACH_TYPE_SVENMEB)
-#else
-# define machine_is_svenmeb() (0)
-#endif
-
-#ifdef CONFIG_MACH_FORTUNET2NE
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_FORTUNET2NE
-# endif
-# define machine_is_fortunet2ne() (machine_arch_type == MACH_TYPE_FORTUNET2NE)
-#else
-# define machine_is_fortunet2ne() (0)
-#endif
-
-#ifdef CONFIG_MACH_NXHX
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_NXHX
-# endif
-# define machine_is_nxhx() (machine_arch_type == MACH_TYPE_NXHX)
-#else
-# define machine_is_nxhx() (0)
-#endif
-
#ifdef CONFIG_MACH_REALVIEW_PB11MP
# ifdef machine_arch_type
# undef machine_arch_type
@@ -19981,258 +3829,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_realview_pb11mp() (0)
#endif
-#ifdef CONFIG_MACH_IDS500
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_IDS500
-# endif
-# define machine_is_ids500() (machine_arch_type == MACH_TYPE_IDS500)
-#else
-# define machine_is_ids500() (0)
-#endif
-
-#ifdef CONFIG_MACH_ORS_N725
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ORS_N725
-# endif
-# define machine_is_ors_n725() (machine_arch_type == MACH_TYPE_ORS_N725)
-#else
-# define machine_is_ors_n725() (0)
-#endif
-
-#ifdef CONFIG_MACH_HSDARM
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_HSDARM
-# endif
-# define machine_is_hsdarm() (machine_arch_type == MACH_TYPE_HSDARM)
-#else
-# define machine_is_hsdarm() (0)
-#endif
-
-#ifdef CONFIG_MACH_SHA_PON003
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SHA_PON003
-# endif
-# define machine_is_sha_pon003() (machine_arch_type == MACH_TYPE_SHA_PON003)
-#else
-# define machine_is_sha_pon003() (0)
-#endif
-
-#ifdef CONFIG_MACH_SHA_PON004
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SHA_PON004
-# endif
-# define machine_is_sha_pon004() (machine_arch_type == MACH_TYPE_SHA_PON004)
-#else
-# define machine_is_sha_pon004() (0)
-#endif
-
-#ifdef CONFIG_MACH_SHA_PON007
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SHA_PON007
-# endif
-# define machine_is_sha_pon007() (machine_arch_type == MACH_TYPE_SHA_PON007)
-#else
-# define machine_is_sha_pon007() (0)
-#endif
-
-#ifdef CONFIG_MACH_SHA_PON011
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SHA_PON011
-# endif
-# define machine_is_sha_pon011() (machine_arch_type == MACH_TYPE_SHA_PON011)
-#else
-# define machine_is_sha_pon011() (0)
-#endif
-
-#ifdef CONFIG_MACH_H6042
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_H6042
-# endif
-# define machine_is_h6042() (machine_arch_type == MACH_TYPE_H6042)
-#else
-# define machine_is_h6042() (0)
-#endif
-
-#ifdef CONFIG_MACH_H6043
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_H6043
-# endif
-# define machine_is_h6043() (machine_arch_type == MACH_TYPE_H6043)
-#else
-# define machine_is_h6043() (0)
-#endif
-
-#ifdef CONFIG_MACH_LOOXC550
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_LOOXC550
-# endif
-# define machine_is_looxc550() (machine_arch_type == MACH_TYPE_LOOXC550)
-#else
-# define machine_is_looxc550() (0)
-#endif
-
-#ifdef CONFIG_MACH_CNTY_TITAN
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CNTY_TITAN
-# endif
-# define machine_is_cnty_titan() (machine_arch_type == MACH_TYPE_CNTY_TITAN)
-#else
-# define machine_is_cnty_titan() (0)
-#endif
-
-#ifdef CONFIG_MACH_APP3XX
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_APP3XX
-# endif
-# define machine_is_app3xx() (machine_arch_type == MACH_TYPE_APP3XX)
-#else
-# define machine_is_app3xx() (0)
-#endif
-
-#ifdef CONFIG_MACH_SIDEOATSGRAMA
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SIDEOATSGRAMA
-# endif
-# define machine_is_sideoatsgrama() (machine_arch_type == MACH_TYPE_SIDEOATSGRAMA)
-#else
-# define machine_is_sideoatsgrama() (0)
-#endif
-
-#ifdef CONFIG_MACH_TREO700P
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_TREO700P
-# endif
-# define machine_is_treo700p() (machine_arch_type == MACH_TYPE_TREO700P)
-#else
-# define machine_is_treo700p() (0)
-#endif
-
-#ifdef CONFIG_MACH_TREO700W
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_TREO700W
-# endif
-# define machine_is_treo700w() (machine_arch_type == MACH_TYPE_TREO700W)
-#else
-# define machine_is_treo700w() (0)
-#endif
-
-#ifdef CONFIG_MACH_TREO750
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_TREO750
-# endif
-# define machine_is_treo750() (machine_arch_type == MACH_TYPE_TREO750)
-#else
-# define machine_is_treo750() (0)
-#endif
-
-#ifdef CONFIG_MACH_TREO755P
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_TREO755P
-# endif
-# define machine_is_treo755p() (machine_arch_type == MACH_TYPE_TREO755P)
-#else
-# define machine_is_treo755p() (0)
-#endif
-
-#ifdef CONFIG_MACH_EZREGANUT9200
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_EZREGANUT9200
-# endif
-# define machine_is_ezreganut9200() (machine_arch_type == MACH_TYPE_EZREGANUT9200)
-#else
-# define machine_is_ezreganut9200() (0)
-#endif
-
-#ifdef CONFIG_MACH_SARGE
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SARGE
-# endif
-# define machine_is_sarge() (machine_arch_type == MACH_TYPE_SARGE)
-#else
-# define machine_is_sarge() (0)
-#endif
-
-#ifdef CONFIG_MACH_A696
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_A696
-# endif
-# define machine_is_a696() (machine_arch_type == MACH_TYPE_A696)
-#else
-# define machine_is_a696() (0)
-#endif
-
-#ifdef CONFIG_MACH_TURTLE
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_TURTLE
-# endif
-# define machine_is_turtle1916() (machine_arch_type == MACH_TYPE_TURTLE)
-#else
-# define machine_is_turtle1916() (0)
-#endif
-
#ifdef CONFIG_MACH_MX27_3DS
# ifdef machine_arch_type
# undef machine_arch_type
@@ -20245,78 +3841,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_mx27_3ds() (0)
#endif
-#ifdef CONFIG_MACH_BISHOP
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_BISHOP
-# endif
-# define machine_is_bishop() (machine_arch_type == MACH_TYPE_BISHOP)
-#else
-# define machine_is_bishop() (0)
-#endif
-
-#ifdef CONFIG_MACH_PXX
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_PXX
-# endif
-# define machine_is_pxx() (machine_arch_type == MACH_TYPE_PXX)
-#else
-# define machine_is_pxx() (0)
-#endif
-
-#ifdef CONFIG_MACH_REDWOOD
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_REDWOOD
-# endif
-# define machine_is_redwood() (machine_arch_type == MACH_TYPE_REDWOOD)
-#else
-# define machine_is_redwood() (0)
-#endif
-
-#ifdef CONFIG_MACH_OMAP_2430DLP
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_OMAP_2430DLP
-# endif
-# define machine_is_omap_2430dlp() (machine_arch_type == MACH_TYPE_OMAP_2430DLP)
-#else
-# define machine_is_omap_2430dlp() (0)
-#endif
-
-#ifdef CONFIG_MACH_OMAP_2430OSK
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_OMAP_2430OSK
-# endif
-# define machine_is_omap_2430osk() (machine_arch_type == MACH_TYPE_OMAP_2430OSK)
-#else
-# define machine_is_omap_2430osk() (0)
-#endif
-
-#ifdef CONFIG_MACH_SARDINE
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SARDINE
-# endif
-# define machine_is_sardine() (machine_arch_type == MACH_TYPE_SARDINE)
-#else
-# define machine_is_sardine() (0)
-#endif
-
#ifdef CONFIG_MACH_HALIBUT
# ifdef machine_arch_type
# undef machine_arch_type
@@ -20341,234 +3865,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_trout() (0)
#endif
-#ifdef CONFIG_MACH_GOLDFISH
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_GOLDFISH
-# endif
-# define machine_is_goldfish() (machine_arch_type == MACH_TYPE_GOLDFISH)
-#else
-# define machine_is_goldfish() (0)
-#endif
-
-#ifdef CONFIG_MACH_GESBC2440
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_GESBC2440
-# endif
-# define machine_is_gesbc2440() (machine_arch_type == MACH_TYPE_GESBC2440)
-#else
-# define machine_is_gesbc2440() (0)
-#endif
-
-#ifdef CONFIG_MACH_NOMAD
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_NOMAD
-# endif
-# define machine_is_nomad() (machine_arch_type == MACH_TYPE_NOMAD)
-#else
-# define machine_is_nomad() (0)
-#endif
-
-#ifdef CONFIG_MACH_ROSALIND
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ROSALIND
-# endif
-# define machine_is_rosalind() (machine_arch_type == MACH_TYPE_ROSALIND)
-#else
-# define machine_is_rosalind() (0)
-#endif
-
-#ifdef CONFIG_MACH_CC9P9215
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CC9P9215
-# endif
-# define machine_is_cc9p9215() (machine_arch_type == MACH_TYPE_CC9P9215)
-#else
-# define machine_is_cc9p9215() (0)
-#endif
-
-#ifdef CONFIG_MACH_CC9P9210
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CC9P9210
-# endif
-# define machine_is_cc9p9210() (machine_arch_type == MACH_TYPE_CC9P9210)
-#else
-# define machine_is_cc9p9210() (0)
-#endif
-
-#ifdef CONFIG_MACH_CC9P9215JS
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CC9P9215JS
-# endif
-# define machine_is_cc9p9215js() (machine_arch_type == MACH_TYPE_CC9P9215JS)
-#else
-# define machine_is_cc9p9215js() (0)
-#endif
-
-#ifdef CONFIG_MACH_CC9P9210JS
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CC9P9210JS
-# endif
-# define machine_is_cc9p9210js() (machine_arch_type == MACH_TYPE_CC9P9210JS)
-#else
-# define machine_is_cc9p9210js() (0)
-#endif
-
-#ifdef CONFIG_MACH_NASFFE
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_NASFFE
-# endif
-# define machine_is_nasffe() (machine_arch_type == MACH_TYPE_NASFFE)
-#else
-# define machine_is_nasffe() (0)
-#endif
-
-#ifdef CONFIG_MACH_TN2X0BD
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_TN2X0BD
-# endif
-# define machine_is_tn2x0bd() (machine_arch_type == MACH_TYPE_TN2X0BD)
-#else
-# define machine_is_tn2x0bd() (0)
-#endif
-
-#ifdef CONFIG_MACH_GWMPXA
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_GWMPXA
-# endif
-# define machine_is_gwmpxa() (machine_arch_type == MACH_TYPE_GWMPXA)
-#else
-# define machine_is_gwmpxa() (0)
-#endif
-
-#ifdef CONFIG_MACH_EXYPLUS
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_EXYPLUS
-# endif
-# define machine_is_exyplus() (machine_arch_type == MACH_TYPE_EXYPLUS)
-#else
-# define machine_is_exyplus() (0)
-#endif
-
-#ifdef CONFIG_MACH_JADOO21
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_JADOO21
-# endif
-# define machine_is_jadoo21() (machine_arch_type == MACH_TYPE_JADOO21)
-#else
-# define machine_is_jadoo21() (0)
-#endif
-
-#ifdef CONFIG_MACH_LOOXN560
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_LOOXN560
-# endif
-# define machine_is_looxn560() (machine_arch_type == MACH_TYPE_LOOXN560)
-#else
-# define machine_is_looxn560() (0)
-#endif
-
-#ifdef CONFIG_MACH_BONSAI
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_BONSAI
-# endif
-# define machine_is_bonsai() (machine_arch_type == MACH_TYPE_BONSAI)
-#else
-# define machine_is_bonsai() (0)
-#endif
-
-#ifdef CONFIG_MACH_ADSMILGATO
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ADSMILGATO
-# endif
-# define machine_is_adsmilgato() (machine_arch_type == MACH_TYPE_ADSMILGATO)
-#else
-# define machine_is_adsmilgato() (0)
-#endif
-
-#ifdef CONFIG_MACH_GBA
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_GBA
-# endif
-# define machine_is_gba() (machine_arch_type == MACH_TYPE_GBA)
-#else
-# define machine_is_gba() (0)
-#endif
-
-#ifdef CONFIG_MACH_H6044
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_H6044
-# endif
-# define machine_is_h6044() (machine_arch_type == MACH_TYPE_H6044)
-#else
-# define machine_is_h6044() (0)
-#endif
-
-#ifdef CONFIG_MACH_APP
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_APP
-# endif
-# define machine_is_app() (machine_arch_type == MACH_TYPE_APP)
-#else
-# define machine_is_app() (0)
-#endif
-
#ifdef CONFIG_MACH_TCT_HAMMER
# ifdef machine_arch_type
# undef machine_arch_type
@@ -20593,174 +3889,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_herald() (0)
#endif
-#ifdef CONFIG_MACH_ARTEMIS
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ARTEMIS
-# endif
-# define machine_is_artemis() (machine_arch_type == MACH_TYPE_ARTEMIS)
-#else
-# define machine_is_artemis() (0)
-#endif
-
-#ifdef CONFIG_MACH_HTCTITAN
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_HTCTITAN
-# endif
-# define machine_is_htctitan() (machine_arch_type == MACH_TYPE_HTCTITAN)
-#else
-# define machine_is_htctitan() (0)
-#endif
-
-#ifdef CONFIG_MACH_QRANIUM
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_QRANIUM
-# endif
-# define machine_is_qranium() (machine_arch_type == MACH_TYPE_QRANIUM)
-#else
-# define machine_is_qranium() (0)
-#endif
-
-#ifdef CONFIG_MACH_ADX_WSC2
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ADX_WSC2
-# endif
-# define machine_is_adx_wsc2() (machine_arch_type == MACH_TYPE_ADX_WSC2)
-#else
-# define machine_is_adx_wsc2() (0)
-#endif
-
-#ifdef CONFIG_MACH_ADX_MEDCOM
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ADX_MEDCOM
-# endif
-# define machine_is_adx_medcom() (machine_arch_type == MACH_TYPE_ADX_MEDCOM)
-#else
-# define machine_is_adx_medcom() (0)
-#endif
-
-#ifdef CONFIG_MACH_BBOARD
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_BBOARD
-# endif
-# define machine_is_bboard() (machine_arch_type == MACH_TYPE_BBOARD)
-#else
-# define machine_is_bboard() (0)
-#endif
-
-#ifdef CONFIG_MACH_CAMBRIA
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CAMBRIA
-# endif
-# define machine_is_cambria() (machine_arch_type == MACH_TYPE_CAMBRIA)
-#else
-# define machine_is_cambria() (0)
-#endif
-
-#ifdef CONFIG_MACH_MT7XXX
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MT7XXX
-# endif
-# define machine_is_mt7xxx() (machine_arch_type == MACH_TYPE_MT7XXX)
-#else
-# define machine_is_mt7xxx() (0)
-#endif
-
-#ifdef CONFIG_MACH_MATRIX512
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MATRIX512
-# endif
-# define machine_is_matrix512() (machine_arch_type == MACH_TYPE_MATRIX512)
-#else
-# define machine_is_matrix512() (0)
-#endif
-
-#ifdef CONFIG_MACH_MATRIX522
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MATRIX522
-# endif
-# define machine_is_matrix522() (machine_arch_type == MACH_TYPE_MATRIX522)
-#else
-# define machine_is_matrix522() (0)
-#endif
-
-#ifdef CONFIG_MACH_IPAC5010
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_IPAC5010
-# endif
-# define machine_is_ipac5010() (machine_arch_type == MACH_TYPE_IPAC5010)
-#else
-# define machine_is_ipac5010() (0)
-#endif
-
-#ifdef CONFIG_MACH_SAKURA
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SAKURA
-# endif
-# define machine_is_sakura() (machine_arch_type == MACH_TYPE_SAKURA)
-#else
-# define machine_is_sakura() (0)
-#endif
-
-#ifdef CONFIG_MACH_GROCX
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_GROCX
-# endif
-# define machine_is_grocx() (machine_arch_type == MACH_TYPE_GROCX)
-#else
-# define machine_is_grocx() (0)
-#endif
-
-#ifdef CONFIG_MACH_PM9263
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_PM9263
-# endif
-# define machine_is_pm9263() (machine_arch_type == MACH_TYPE_PM9263)
-#else
-# define machine_is_pm9263() (0)
-#endif
-
#ifdef CONFIG_MACH_SIM_ONE
# ifdef machine_arch_type
# undef machine_arch_type
@@ -20773,162 +3901,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_sim_one() (0)
#endif
-#ifdef CONFIG_MACH_ACQ132
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ACQ132
-# endif
-# define machine_is_acq132() (machine_arch_type == MACH_TYPE_ACQ132)
-#else
-# define machine_is_acq132() (0)
-#endif
-
-#ifdef CONFIG_MACH_DATR
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_DATR
-# endif
-# define machine_is_datr() (machine_arch_type == MACH_TYPE_DATR)
-#else
-# define machine_is_datr() (0)
-#endif
-
-#ifdef CONFIG_MACH_ACTUX1
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ACTUX1
-# endif
-# define machine_is_actux1() (machine_arch_type == MACH_TYPE_ACTUX1)
-#else
-# define machine_is_actux1() (0)
-#endif
-
-#ifdef CONFIG_MACH_ACTUX2
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ACTUX2
-# endif
-# define machine_is_actux2() (machine_arch_type == MACH_TYPE_ACTUX2)
-#else
-# define machine_is_actux2() (0)
-#endif
-
-#ifdef CONFIG_MACH_ACTUX3
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ACTUX3
-# endif
-# define machine_is_actux3() (machine_arch_type == MACH_TYPE_ACTUX3)
-#else
-# define machine_is_actux3() (0)
-#endif
-
-#ifdef CONFIG_MACH_FLEXIT
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_FLEXIT
-# endif
-# define machine_is_flexit() (machine_arch_type == MACH_TYPE_FLEXIT)
-#else
-# define machine_is_flexit() (0)
-#endif
-
-#ifdef CONFIG_MACH_BH2X0BD
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_BH2X0BD
-# endif
-# define machine_is_bh2x0bd() (machine_arch_type == MACH_TYPE_BH2X0BD)
-#else
-# define machine_is_bh2x0bd() (0)
-#endif
-
-#ifdef CONFIG_MACH_ATB2002
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ATB2002
-# endif
-# define machine_is_atb2002() (machine_arch_type == MACH_TYPE_ATB2002)
-#else
-# define machine_is_atb2002() (0)
-#endif
-
-#ifdef CONFIG_MACH_XENON
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_XENON
-# endif
-# define machine_is_xenon() (machine_arch_type == MACH_TYPE_XENON)
-#else
-# define machine_is_xenon() (0)
-#endif
-
-#ifdef CONFIG_MACH_FM607
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_FM607
-# endif
-# define machine_is_fm607() (machine_arch_type == MACH_TYPE_FM607)
-#else
-# define machine_is_fm607() (0)
-#endif
-
-#ifdef CONFIG_MACH_MATRIX514
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MATRIX514
-# endif
-# define machine_is_matrix514() (machine_arch_type == MACH_TYPE_MATRIX514)
-#else
-# define machine_is_matrix514() (0)
-#endif
-
-#ifdef CONFIG_MACH_MATRIX524
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MATRIX524
-# endif
-# define machine_is_matrix524() (machine_arch_type == MACH_TYPE_MATRIX524)
-#else
-# define machine_is_matrix524() (0)
-#endif
-
-#ifdef CONFIG_MACH_INPOD
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_INPOD
-# endif
-# define machine_is_inpod() (machine_arch_type == MACH_TYPE_INPOD)
-#else
-# define machine_is_inpod() (0)
-#endif
-
#ifdef CONFIG_MACH_JIVE
# ifdef machine_arch_type
# undef machine_arch_type
@@ -20941,126 +3913,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_jive() (0)
#endif
-#ifdef CONFIG_MACH_TLL_MX21
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_TLL_MX21
-# endif
-# define machine_is_tll_mx21() (machine_arch_type == MACH_TYPE_TLL_MX21)
-#else
-# define machine_is_tll_mx21() (0)
-#endif
-
-#ifdef CONFIG_MACH_SBC2800
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SBC2800
-# endif
-# define machine_is_sbc2800() (machine_arch_type == MACH_TYPE_SBC2800)
-#else
-# define machine_is_sbc2800() (0)
-#endif
-
-#ifdef CONFIG_MACH_CC7UCAMRY
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CC7UCAMRY
-# endif
-# define machine_is_cc7ucamry() (machine_arch_type == MACH_TYPE_CC7UCAMRY)
-#else
-# define machine_is_cc7ucamry() (0)
-#endif
-
-#ifdef CONFIG_MACH_UBISYS_P9_SC15
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_UBISYS_P9_SC15
-# endif
-# define machine_is_ubisys_p9_sc15() (machine_arch_type == MACH_TYPE_UBISYS_P9_SC15)
-#else
-# define machine_is_ubisys_p9_sc15() (0)
-#endif
-
-#ifdef CONFIG_MACH_UBISYS_P9_SSC2D10
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_UBISYS_P9_SSC2D10
-# endif
-# define machine_is_ubisys_p9_ssc2d10() (machine_arch_type == MACH_TYPE_UBISYS_P9_SSC2D10)
-#else
-# define machine_is_ubisys_p9_ssc2d10() (0)
-#endif
-
-#ifdef CONFIG_MACH_UBISYS_P9_RCU3
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_UBISYS_P9_RCU3
-# endif
-# define machine_is_ubisys_p9_rcu3() (machine_arch_type == MACH_TYPE_UBISYS_P9_RCU3)
-#else
-# define machine_is_ubisys_p9_rcu3() (0)
-#endif
-
-#ifdef CONFIG_MACH_AML_M8000
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_AML_M8000
-# endif
-# define machine_is_aml_m8000() (machine_arch_type == MACH_TYPE_AML_M8000)
-#else
-# define machine_is_aml_m8000() (0)
-#endif
-
-#ifdef CONFIG_MACH_SNAPPER_270
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SNAPPER_270
-# endif
-# define machine_is_snapper_270() (machine_arch_type == MACH_TYPE_SNAPPER_270)
-#else
-# define machine_is_snapper_270() (0)
-#endif
-
-#ifdef CONFIG_MACH_OMAP_BBX
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_OMAP_BBX
-# endif
-# define machine_is_omap_bbx() (machine_arch_type == MACH_TYPE_OMAP_BBX)
-#else
-# define machine_is_omap_bbx() (0)
-#endif
-
-#ifdef CONFIG_MACH_UCN2410
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_UCN2410
-# endif
-# define machine_is_ucn2410() (machine_arch_type == MACH_TYPE_UCN2410)
-#else
-# define machine_is_ucn2410() (0)
-#endif
-
#ifdef CONFIG_MACH_SAM9_L9260
# ifdef machine_arch_type
# undef machine_arch_type
@@ -21073,30 +3925,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_sam9_l9260() (0)
#endif
-#ifdef CONFIG_MACH_ETI_C2
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ETI_C2
-# endif
-# define machine_is_eti_c2() (machine_arch_type == MACH_TYPE_ETI_C2)
-#else
-# define machine_is_eti_c2() (0)
-#endif
-
-#ifdef CONFIG_MACH_AVALANCHE
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_AVALANCHE
-# endif
-# define machine_is_avalanche() (machine_arch_type == MACH_TYPE_AVALANCHE)
-#else
-# define machine_is_avalanche() (0)
-#endif
-
#ifdef CONFIG_MACH_REALVIEW_PB1176
# ifdef machine_arch_type
# undef machine_arch_type
@@ -21109,30 +3937,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_realview_pb1176() (0)
#endif
-#ifdef CONFIG_MACH_DP1500
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_DP1500
-# endif
-# define machine_is_dp1500() (machine_arch_type == MACH_TYPE_DP1500)
-#else
-# define machine_is_dp1500() (0)
-#endif
-
-#ifdef CONFIG_MACH_APPLE_IPHONE
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_APPLE_IPHONE
-# endif
-# define machine_is_apple_iphone() (machine_arch_type == MACH_TYPE_APPLE_IPHONE)
-#else
-# define machine_is_apple_iphone() (0)
-#endif
-
#ifdef CONFIG_MACH_YL9200
# ifdef machine_arch_type
# undef machine_arch_type
@@ -21169,18 +3973,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_kurobox_pro() (0)
#endif
-#ifdef CONFIG_MACH_SE_POET
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SE_POET
-# endif
-# define machine_is_se_poet() (machine_arch_type == MACH_TYPE_SE_POET)
-#else
-# define machine_is_se_poet() (0)
-#endif
-
#ifdef CONFIG_MACH_MX31_3DS
# ifdef machine_arch_type
# undef machine_arch_type
@@ -21193,138 +3985,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_mx31_3ds() (0)
#endif
-#ifdef CONFIG_MACH_R270
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_R270
-# endif
-# define machine_is_r270() (machine_arch_type == MACH_TYPE_R270)
-#else
-# define machine_is_r270() (0)
-#endif
-
-#ifdef CONFIG_MACH_ARMOUR21
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ARMOUR21
-# endif
-# define machine_is_armour21() (machine_arch_type == MACH_TYPE_ARMOUR21)
-#else
-# define machine_is_armour21() (0)
-#endif
-
-#ifdef CONFIG_MACH_DT2
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_DT2
-# endif
-# define machine_is_dt2() (machine_arch_type == MACH_TYPE_DT2)
-#else
-# define machine_is_dt2() (0)
-#endif
-
-#ifdef CONFIG_MACH_VT4
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_VT4
-# endif
-# define machine_is_vt4() (machine_arch_type == MACH_TYPE_VT4)
-#else
-# define machine_is_vt4() (0)
-#endif
-
-#ifdef CONFIG_MACH_TYCO320
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_TYCO320
-# endif
-# define machine_is_tyco320() (machine_arch_type == MACH_TYPE_TYCO320)
-#else
-# define machine_is_tyco320() (0)
-#endif
-
-#ifdef CONFIG_MACH_ADMA
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ADMA
-# endif
-# define machine_is_adma() (machine_arch_type == MACH_TYPE_ADMA)
-#else
-# define machine_is_adma() (0)
-#endif
-
-#ifdef CONFIG_MACH_WP188
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_WP188
-# endif
-# define machine_is_wp188() (machine_arch_type == MACH_TYPE_WP188)
-#else
-# define machine_is_wp188() (0)
-#endif
-
-#ifdef CONFIG_MACH_CORSICA
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CORSICA
-# endif
-# define machine_is_corsica() (machine_arch_type == MACH_TYPE_CORSICA)
-#else
-# define machine_is_corsica() (0)
-#endif
-
-#ifdef CONFIG_MACH_BIGEYE
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_BIGEYE
-# endif
-# define machine_is_bigeye() (machine_arch_type == MACH_TYPE_BIGEYE)
-#else
-# define machine_is_bigeye() (0)
-#endif
-
-#ifdef CONFIG_MACH_TLL5000
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_TLL5000
-# endif
-# define machine_is_tll5000() (machine_arch_type == MACH_TYPE_TLL5000)
-#else
-# define machine_is_tll5000() (0)
-#endif
-
-#ifdef CONFIG_MACH_BEBOT
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_BEBOT
-# endif
-# define machine_is_bebot() (machine_arch_type == MACH_TYPE_BEBOT)
-#else
-# define machine_is_bebot() (0)
-#endif
-
#ifdef CONFIG_MACH_QONG
# ifdef machine_arch_type
# undef machine_arch_type
@@ -21337,114 +3997,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_qong() (0)
#endif
-#ifdef CONFIG_MACH_TCOMPACT
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_TCOMPACT
-# endif
-# define machine_is_tcompact() (machine_arch_type == MACH_TYPE_TCOMPACT)
-#else
-# define machine_is_tcompact() (0)
-#endif
-
-#ifdef CONFIG_MACH_PUMA5
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_PUMA5
-# endif
-# define machine_is_puma5() (machine_arch_type == MACH_TYPE_PUMA5)
-#else
-# define machine_is_puma5() (0)
-#endif
-
-#ifdef CONFIG_MACH_ELARA
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ELARA
-# endif
-# define machine_is_elara() (machine_arch_type == MACH_TYPE_ELARA)
-#else
-# define machine_is_elara() (0)
-#endif
-
-#ifdef CONFIG_MACH_ELLINGTON
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ELLINGTON
-# endif
-# define machine_is_ellington() (machine_arch_type == MACH_TYPE_ELLINGTON)
-#else
-# define machine_is_ellington() (0)
-#endif
-
-#ifdef CONFIG_MACH_XDA_ATOM
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_XDA_ATOM
-# endif
-# define machine_is_xda_atom() (machine_arch_type == MACH_TYPE_XDA_ATOM)
-#else
-# define machine_is_xda_atom() (0)
-#endif
-
-#ifdef CONFIG_MACH_ENERGIZER2
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ENERGIZER2
-# endif
-# define machine_is_energizer2() (machine_arch_type == MACH_TYPE_ENERGIZER2)
-#else
-# define machine_is_energizer2() (0)
-#endif
-
-#ifdef CONFIG_MACH_ODIN
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ODIN
-# endif
-# define machine_is_odin() (machine_arch_type == MACH_TYPE_ODIN)
-#else
-# define machine_is_odin() (0)
-#endif
-
-#ifdef CONFIG_MACH_ACTUX4
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ACTUX4
-# endif
-# define machine_is_actux4() (machine_arch_type == MACH_TYPE_ACTUX4)
-#else
-# define machine_is_actux4() (0)
-#endif
-
-#ifdef CONFIG_MACH_ESL_OMAP
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ESL_OMAP
-# endif
-# define machine_is_esl_omap() (machine_arch_type == MACH_TYPE_ESL_OMAP)
-#else
-# define machine_is_esl_omap() (0)
-#endif
-
#ifdef CONFIG_MACH_OMAP2EVM
# ifdef machine_arch_type
# undef machine_arch_type
@@ -21469,78 +4021,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_omap3evm() (0)
#endif
-#ifdef CONFIG_MACH_ADX_PCU57
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ADX_PCU57
-# endif
-# define machine_is_adx_pcu57() (machine_arch_type == MACH_TYPE_ADX_PCU57)
-#else
-# define machine_is_adx_pcu57() (0)
-#endif
-
-#ifdef CONFIG_MACH_MONACO
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MONACO
-# endif
-# define machine_is_monaco() (machine_arch_type == MACH_TYPE_MONACO)
-#else
-# define machine_is_monaco() (0)
-#endif
-
-#ifdef CONFIG_MACH_LEVANTE
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_LEVANTE
-# endif
-# define machine_is_levante() (machine_arch_type == MACH_TYPE_LEVANTE)
-#else
-# define machine_is_levante() (0)
-#endif
-
-#ifdef CONFIG_MACH_TMXIPX425
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_TMXIPX425
-# endif
-# define machine_is_tmxipx425() (machine_arch_type == MACH_TYPE_TMXIPX425)
-#else
-# define machine_is_tmxipx425() (0)
-#endif
-
-#ifdef CONFIG_MACH_LEEP
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_LEEP
-# endif
-# define machine_is_leep() (machine_arch_type == MACH_TYPE_LEEP)
-#else
-# define machine_is_leep() (0)
-#endif
-
-#ifdef CONFIG_MACH_RAAD
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_RAAD
-# endif
-# define machine_is_raad() (machine_arch_type == MACH_TYPE_RAAD)
-#else
-# define machine_is_raad() (0)
-#endif
-
#ifdef CONFIG_MACH_DNS323
# ifdef machine_arch_type
# undef machine_arch_type
@@ -21553,42 +4033,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_dns323() (0)
#endif
-#ifdef CONFIG_MACH_AP1000
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_AP1000
-# endif
-# define machine_is_ap1000() (machine_arch_type == MACH_TYPE_AP1000)
-#else
-# define machine_is_ap1000() (0)
-#endif
-
-#ifdef CONFIG_MACH_A9SAM6432
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_A9SAM6432
-# endif
-# define machine_is_a9sam6432() (machine_arch_type == MACH_TYPE_A9SAM6432)
-#else
-# define machine_is_a9sam6432() (0)
-#endif
-
-#ifdef CONFIG_MACH_SHINY
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SHINY
-# endif
-# define machine_is_shiny() (machine_arch_type == MACH_TYPE_SHINY)
-#else
-# define machine_is_shiny() (0)
-#endif
-
#ifdef CONFIG_MACH_OMAP3_BEAGLE
# ifdef machine_arch_type
# undef machine_arch_type
@@ -21601,18 +4045,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_omap3_beagle() (0)
#endif
-#ifdef CONFIG_MACH_CSR_BDB2
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CSR_BDB2
-# endif
-# define machine_is_csr_bdb2() (machine_arch_type == MACH_TYPE_CSR_BDB2)
-#else
-# define machine_is_csr_bdb2() (0)
-#endif
-
#ifdef CONFIG_MACH_NOKIA_N810
# ifdef machine_arch_type
# undef machine_arch_type
@@ -21625,30 +4057,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_nokia_n810() (0)
#endif
-#ifdef CONFIG_MACH_C270
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_C270
-# endif
-# define machine_is_c270() (machine_arch_type == MACH_TYPE_C270)
-#else
-# define machine_is_c270() (0)
-#endif
-
-#ifdef CONFIG_MACH_SENTRY
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SENTRY
-# endif
-# define machine_is_sentry() (machine_arch_type == MACH_TYPE_SENTRY)
-#else
-# define machine_is_sentry() (0)
-#endif
-
#ifdef CONFIG_MACH_PCM038
# ifdef machine_arch_type
# undef machine_arch_type
@@ -21661,162 +4069,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_pcm038() (0)
#endif
-#ifdef CONFIG_MACH_ANC300
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ANC300
-# endif
-# define machine_is_anc300() (machine_arch_type == MACH_TYPE_ANC300)
-#else
-# define machine_is_anc300() (0)
-#endif
-
-#ifdef CONFIG_MACH_HTCKAISER
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_HTCKAISER
-# endif
-# define machine_is_htckaiser() (machine_arch_type == MACH_TYPE_HTCKAISER)
-#else
-# define machine_is_htckaiser() (0)
-#endif
-
-#ifdef CONFIG_MACH_SBAT100
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SBAT100
-# endif
-# define machine_is_sbat100() (machine_arch_type == MACH_TYPE_SBAT100)
-#else
-# define machine_is_sbat100() (0)
-#endif
-
-#ifdef CONFIG_MACH_MODUNORM
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MODUNORM
-# endif
-# define machine_is_modunorm() (machine_arch_type == MACH_TYPE_MODUNORM)
-#else
-# define machine_is_modunorm() (0)
-#endif
-
-#ifdef CONFIG_MACH_PELOS_TWARM
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_PELOS_TWARM
-# endif
-# define machine_is_pelos_twarm() (machine_arch_type == MACH_TYPE_PELOS_TWARM)
-#else
-# define machine_is_pelos_twarm() (0)
-#endif
-
-#ifdef CONFIG_MACH_FLANK
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_FLANK
-# endif
-# define machine_is_flank() (machine_arch_type == MACH_TYPE_FLANK)
-#else
-# define machine_is_flank() (0)
-#endif
-
-#ifdef CONFIG_MACH_SIRLOIN
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SIRLOIN
-# endif
-# define machine_is_sirloin() (machine_arch_type == MACH_TYPE_SIRLOIN)
-#else
-# define machine_is_sirloin() (0)
-#endif
-
-#ifdef CONFIG_MACH_BRISKET
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_BRISKET
-# endif
-# define machine_is_brisket() (machine_arch_type == MACH_TYPE_BRISKET)
-#else
-# define machine_is_brisket() (0)
-#endif
-
-#ifdef CONFIG_MACH_CHUCK
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CHUCK
-# endif
-# define machine_is_chuck() (machine_arch_type == MACH_TYPE_CHUCK)
-#else
-# define machine_is_chuck() (0)
-#endif
-
-#ifdef CONFIG_MACH_OTTER
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_OTTER
-# endif
-# define machine_is_otter() (machine_arch_type == MACH_TYPE_OTTER)
-#else
-# define machine_is_otter() (0)
-#endif
-
-#ifdef CONFIG_MACH_DAVINCI_LDK
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_DAVINCI_LDK
-# endif
-# define machine_is_davinci_ldk() (machine_arch_type == MACH_TYPE_DAVINCI_LDK)
-#else
-# define machine_is_davinci_ldk() (0)
-#endif
-
-#ifdef CONFIG_MACH_PHREEDOM
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_PHREEDOM
-# endif
-# define machine_is_phreedom() (machine_arch_type == MACH_TYPE_PHREEDOM)
-#else
-# define machine_is_phreedom() (0)
-#endif
-
-#ifdef CONFIG_MACH_SG310
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SG310
-# endif
-# define machine_is_sg310() (machine_arch_type == MACH_TYPE_SG310)
-#else
-# define machine_is_sg310() (0)
-#endif
-
#ifdef CONFIG_MACH_TS209
# ifdef machine_arch_type
# undef machine_arch_type
@@ -21841,90 +4093,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_at91cap9adk() (0)
#endif
-#ifdef CONFIG_MACH_TION9315
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_TION9315
-# endif
-# define machine_is_tion9315() (machine_arch_type == MACH_TYPE_TION9315)
-#else
-# define machine_is_tion9315() (0)
-#endif
-
-#ifdef CONFIG_MACH_MAST
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MAST
-# endif
-# define machine_is_mast() (machine_arch_type == MACH_TYPE_MAST)
-#else
-# define machine_is_mast() (0)
-#endif
-
-#ifdef CONFIG_MACH_PFW
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_PFW
-# endif
-# define machine_is_pfw() (machine_arch_type == MACH_TYPE_PFW)
-#else
-# define machine_is_pfw() (0)
-#endif
-
-#ifdef CONFIG_MACH_YL_P2440
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_YL_P2440
-# endif
-# define machine_is_yl_p2440() (machine_arch_type == MACH_TYPE_YL_P2440)
-#else
-# define machine_is_yl_p2440() (0)
-#endif
-
-#ifdef CONFIG_MACH_ZSBC32
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ZSBC32
-# endif
-# define machine_is_zsbc32() (machine_arch_type == MACH_TYPE_ZSBC32)
-#else
-# define machine_is_zsbc32() (0)
-#endif
-
-#ifdef CONFIG_MACH_OMAP_PACE2
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_OMAP_PACE2
-# endif
-# define machine_is_omap_pace2() (machine_arch_type == MACH_TYPE_OMAP_PACE2)
-#else
-# define machine_is_omap_pace2() (0)
-#endif
-
-#ifdef CONFIG_MACH_IMX_PACE2
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_IMX_PACE2
-# endif
-# define machine_is_imx_pace2() (machine_arch_type == MACH_TYPE_IMX_PACE2)
-#else
-# define machine_is_imx_pace2() (0)
-#endif
-
#ifdef CONFIG_MACH_MX31MOBOARD
# ifdef machine_arch_type
# undef machine_arch_type
@@ -21937,114 +4105,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_mx31moboard() (0)
#endif
-#ifdef CONFIG_MACH_MX37_3DS
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MX37_3DS
-# endif
-# define machine_is_mx37_3ds() (machine_arch_type == MACH_TYPE_MX37_3DS)
-#else
-# define machine_is_mx37_3ds() (0)
-#endif
-
-#ifdef CONFIG_MACH_RCC
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_RCC
-# endif
-# define machine_is_rcc() (machine_arch_type == MACH_TYPE_RCC)
-#else
-# define machine_is_rcc() (0)
-#endif
-
-#ifdef CONFIG_MACH_ARM9
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ARM9
-# endif
-# define machine_is_dmp() (machine_arch_type == MACH_TYPE_ARM9)
-#else
-# define machine_is_dmp() (0)
-#endif
-
-#ifdef CONFIG_MACH_VISION_EP9307
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_VISION_EP9307
-# endif
-# define machine_is_vision_ep9307() (machine_arch_type == MACH_TYPE_VISION_EP9307)
-#else
-# define machine_is_vision_ep9307() (0)
-#endif
-
-#ifdef CONFIG_MACH_SCLY1000
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SCLY1000
-# endif
-# define machine_is_scly1000() (machine_arch_type == MACH_TYPE_SCLY1000)
-#else
-# define machine_is_scly1000() (0)
-#endif
-
-#ifdef CONFIG_MACH_FONTEL_EP
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_FONTEL_EP
-# endif
-# define machine_is_fontel_ep() (machine_arch_type == MACH_TYPE_FONTEL_EP)
-#else
-# define machine_is_fontel_ep() (0)
-#endif
-
-#ifdef CONFIG_MACH_VOICEBLUE3G
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_VOICEBLUE3G
-# endif
-# define machine_is_voiceblue3g() (machine_arch_type == MACH_TYPE_VOICEBLUE3G)
-#else
-# define machine_is_voiceblue3g() (0)
-#endif
-
-#ifdef CONFIG_MACH_TT9200
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_TT9200
-# endif
-# define machine_is_tt9200() (machine_arch_type == MACH_TYPE_TT9200)
-#else
-# define machine_is_tt9200() (0)
-#endif
-
-#ifdef CONFIG_MACH_DIGI2410
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_DIGI2410
-# endif
-# define machine_is_digi2410() (machine_arch_type == MACH_TYPE_DIGI2410)
-#else
-# define machine_is_digi2410() (0)
-#endif
-
#ifdef CONFIG_MACH_TERASTATION_PRO2
# ifdef machine_arch_type
# undef machine_arch_type
@@ -22069,114 +4129,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_linkstation_pro() (0)
#endif
-#ifdef CONFIG_MACH_MOTOROLA_A780
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MOTOROLA_A780
-# endif
-# define machine_is_motorola_a780() (machine_arch_type == MACH_TYPE_MOTOROLA_A780)
-#else
-# define machine_is_motorola_a780() (0)
-#endif
-
-#ifdef CONFIG_MACH_MOTOROLA_E6
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MOTOROLA_E6
-# endif
-# define machine_is_motorola_e6() (machine_arch_type == MACH_TYPE_MOTOROLA_E6)
-#else
-# define machine_is_motorola_e6() (0)
-#endif
-
-#ifdef CONFIG_MACH_MOTOROLA_E2
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MOTOROLA_E2
-# endif
-# define machine_is_motorola_e2() (machine_arch_type == MACH_TYPE_MOTOROLA_E2)
-#else
-# define machine_is_motorola_e2() (0)
-#endif
-
-#ifdef CONFIG_MACH_MOTOROLA_E680
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MOTOROLA_E680
-# endif
-# define machine_is_motorola_e680() (machine_arch_type == MACH_TYPE_MOTOROLA_E680)
-#else
-# define machine_is_motorola_e680() (0)
-#endif
-
-#ifdef CONFIG_MACH_UR2410
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_UR2410
-# endif
-# define machine_is_ur2410() (machine_arch_type == MACH_TYPE_UR2410)
-#else
-# define machine_is_ur2410() (0)
-#endif
-
-#ifdef CONFIG_MACH_TAS9261
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_TAS9261
-# endif
-# define machine_is_tas9261() (machine_arch_type == MACH_TYPE_TAS9261)
-#else
-# define machine_is_tas9261() (0)
-#endif
-
-#ifdef CONFIG_MACH_HERMES_HD
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_HERMES_HD
-# endif
-# define machine_is_davinci_hermes_hd() (machine_arch_type == MACH_TYPE_HERMES_HD)
-#else
-# define machine_is_davinci_hermes_hd() (0)
-#endif
-
-#ifdef CONFIG_MACH_PERSEO_HD
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_PERSEO_HD
-# endif
-# define machine_is_davinci_perseo_hd() (machine_arch_type == MACH_TYPE_PERSEO_HD)
-#else
-# define machine_is_davinci_perseo_hd() (0)
-#endif
-
-#ifdef CONFIG_MACH_STARGAZER2
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_STARGAZER2
-# endif
-# define machine_is_stargazer2() (machine_arch_type == MACH_TYPE_STARGAZER2)
-#else
-# define machine_is_stargazer2() (0)
-#endif
-
#ifdef CONFIG_MACH_E350
# ifdef machine_arch_type
# undef machine_arch_type
@@ -22189,54 +4141,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_e350() (0)
#endif
-#ifdef CONFIG_MACH_WPCM450
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_WPCM450
-# endif
-# define machine_is_wpcm450() (machine_arch_type == MACH_TYPE_WPCM450)
-#else
-# define machine_is_wpcm450() (0)
-#endif
-
-#ifdef CONFIG_MACH_CARTESIO
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CARTESIO
-# endif
-# define machine_is_cartesio() (machine_arch_type == MACH_TYPE_CARTESIO)
-#else
-# define machine_is_cartesio() (0)
-#endif
-
-#ifdef CONFIG_MACH_TOYBOX
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_TOYBOX
-# endif
-# define machine_is_toybox() (machine_arch_type == MACH_TYPE_TOYBOX)
-#else
-# define machine_is_toybox() (0)
-#endif
-
-#ifdef CONFIG_MACH_TX27
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_TX27
-# endif
-# define machine_is_tx27() (machine_arch_type == MACH_TYPE_TX27)
-#else
-# define machine_is_tx27() (0)
-#endif
-
#ifdef CONFIG_MACH_TS409
# ifdef machine_arch_type
# undef machine_arch_type
@@ -22249,174 +4153,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_ts409() (0)
#endif
-#ifdef CONFIG_MACH_P300
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_P300
-# endif
-# define machine_is_p300() (machine_arch_type == MACH_TYPE_P300)
-#else
-# define machine_is_p300() (0)
-#endif
-
-#ifdef CONFIG_MACH_XDACOMET
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_XDACOMET
-# endif
-# define machine_is_xdacomet() (machine_arch_type == MACH_TYPE_XDACOMET)
-#else
-# define machine_is_xdacomet() (0)
-#endif
-
-#ifdef CONFIG_MACH_DEXFLEX2
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_DEXFLEX2
-# endif
-# define machine_is_dexflex2() (machine_arch_type == MACH_TYPE_DEXFLEX2)
-#else
-# define machine_is_dexflex2() (0)
-#endif
-
-#ifdef CONFIG_MACH_OW
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_OW
-# endif
-# define machine_is_ow() (machine_arch_type == MACH_TYPE_OW)
-#else
-# define machine_is_ow() (0)
-#endif
-
-#ifdef CONFIG_MACH_ARMEBS3
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ARMEBS3
-# endif
-# define machine_is_armebs3() (machine_arch_type == MACH_TYPE_ARMEBS3)
-#else
-# define machine_is_armebs3() (0)
-#endif
-
-#ifdef CONFIG_MACH_U3
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_U3
-# endif
-# define machine_is_u3() (machine_arch_type == MACH_TYPE_U3)
-#else
-# define machine_is_u3() (0)
-#endif
-
-#ifdef CONFIG_MACH_SMDK2450
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SMDK2450
-# endif
-# define machine_is_smdk2450() (machine_arch_type == MACH_TYPE_SMDK2450)
-#else
-# define machine_is_smdk2450() (0)
-#endif
-
-#ifdef CONFIG_MACH_RSI_EWS
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_RSI_EWS
-# endif
-# define machine_is_rsi_ews() (machine_arch_type == MACH_TYPE_RSI_EWS)
-#else
-# define machine_is_rsi_ews() (0)
-#endif
-
-#ifdef CONFIG_MACH_TNB
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_TNB
-# endif
-# define machine_is_tnb() (machine_arch_type == MACH_TYPE_TNB)
-#else
-# define machine_is_tnb() (0)
-#endif
-
-#ifdef CONFIG_MACH_TOEPATH
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_TOEPATH
-# endif
-# define machine_is_toepath() (machine_arch_type == MACH_TYPE_TOEPATH)
-#else
-# define machine_is_toepath() (0)
-#endif
-
-#ifdef CONFIG_MACH_KB9263
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_KB9263
-# endif
-# define machine_is_kb9263() (machine_arch_type == MACH_TYPE_KB9263)
-#else
-# define machine_is_kb9263() (0)
-#endif
-
-#ifdef CONFIG_MACH_MT7108
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MT7108
-# endif
-# define machine_is_mt7108() (machine_arch_type == MACH_TYPE_MT7108)
-#else
-# define machine_is_mt7108() (0)
-#endif
-
-#ifdef CONFIG_MACH_SMTR2440
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SMTR2440
-# endif
-# define machine_is_smtr2440() (machine_arch_type == MACH_TYPE_SMTR2440)
-#else
-# define machine_is_smtr2440() (0)
-#endif
-
-#ifdef CONFIG_MACH_MANAO
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MANAO
-# endif
-# define machine_is_manao() (machine_arch_type == MACH_TYPE_MANAO)
-#else
-# define machine_is_manao() (0)
-#endif
-
#ifdef CONFIG_MACH_CM_X300
# ifdef machine_arch_type
# undef machine_arch_type
@@ -22429,90 +4165,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_cm_x300() (0)
#endif
-#ifdef CONFIG_MACH_GULFSTREAM_KP
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_GULFSTREAM_KP
-# endif
-# define machine_is_gulfstream_kp() (machine_arch_type == MACH_TYPE_GULFSTREAM_KP)
-#else
-# define machine_is_gulfstream_kp() (0)
-#endif
-
-#ifdef CONFIG_MACH_LANREADYFN522
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_LANREADYFN522
-# endif
-# define machine_is_lanreadyfn522() (machine_arch_type == MACH_TYPE_LANREADYFN522)
-#else
-# define machine_is_lanreadyfn522() (0)
-#endif
-
-#ifdef CONFIG_MACH_ARMA37
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ARMA37
-# endif
-# define machine_is_arma37() (machine_arch_type == MACH_TYPE_ARMA37)
-#else
-# define machine_is_arma37() (0)
-#endif
-
-#ifdef CONFIG_MACH_MENDEL
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MENDEL
-# endif
-# define machine_is_mendel() (machine_arch_type == MACH_TYPE_MENDEL)
-#else
-# define machine_is_mendel() (0)
-#endif
-
-#ifdef CONFIG_MACH_PELCO_ILIAD
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_PELCO_ILIAD
-# endif
-# define machine_is_pelco_iliad() (machine_arch_type == MACH_TYPE_PELCO_ILIAD)
-#else
-# define machine_is_pelco_iliad() (0)
-#endif
-
-#ifdef CONFIG_MACH_UNIT2P
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_UNIT2P
-# endif
-# define machine_is_unit2p() (machine_arch_type == MACH_TYPE_UNIT2P)
-#else
-# define machine_is_unit2p() (0)
-#endif
-
-#ifdef CONFIG_MACH_INC20OTTER
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_INC20OTTER
-# endif
-# define machine_is_inc20otter() (machine_arch_type == MACH_TYPE_INC20OTTER)
-#else
-# define machine_is_inc20otter() (0)
-#endif
-
#ifdef CONFIG_MACH_AT91SAM9G20EK
# ifdef machine_arch_type
# undef machine_arch_type
@@ -22525,18 +4177,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_at91sam9g20ek() (0)
#endif
-#ifdef CONFIG_MACH_STORCENTER
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_STORCENTER
-# endif
-# define machine_is_sc_ge2() (machine_arch_type == MACH_TYPE_STORCENTER)
-#else
-# define machine_is_sc_ge2() (0)
-#endif
-
#ifdef CONFIG_MACH_SMDK6410
# ifdef machine_arch_type
# undef machine_arch_type
@@ -22561,66 +4201,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_u300() (0)
#endif
-#ifdef CONFIG_MACH_U500
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_U500
-# endif
-# define machine_is_u500() (machine_arch_type == MACH_TYPE_U500)
-#else
-# define machine_is_u500() (0)
-#endif
-
-#ifdef CONFIG_MACH_DS9260
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_DS9260
-# endif
-# define machine_is_ds9260() (machine_arch_type == MACH_TYPE_DS9260)
-#else
-# define machine_is_ds9260() (0)
-#endif
-
-#ifdef CONFIG_MACH_RIVERROCK
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_RIVERROCK
-# endif
-# define machine_is_riverrock() (machine_arch_type == MACH_TYPE_RIVERROCK)
-#else
-# define machine_is_riverrock() (0)
-#endif
-
-#ifdef CONFIG_MACH_SCIBATH
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SCIBATH
-# endif
-# define machine_is_scibath() (machine_arch_type == MACH_TYPE_SCIBATH)
-#else
-# define machine_is_scibath() (0)
-#endif
-
-#ifdef CONFIG_MACH_AT91SAM7SE512EK
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_AT91SAM7SE512EK
-# endif
-# define machine_is_at91sam7se() (machine_arch_type == MACH_TYPE_AT91SAM7SE512EK)
-#else
-# define machine_is_at91sam7se() (0)
-#endif
-
#ifdef CONFIG_MACH_WRT350N_V2
# ifdef machine_arch_type
# undef machine_arch_type
@@ -22633,66 +4213,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_wrt350n_v2() (0)
#endif
-#ifdef CONFIG_MACH_MULTIMEDIA
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MULTIMEDIA
-# endif
-# define machine_is_multimedia() (machine_arch_type == MACH_TYPE_MULTIMEDIA)
-#else
-# define machine_is_multimedia() (0)
-#endif
-
-#ifdef CONFIG_MACH_MARVIN
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MARVIN
-# endif
-# define machine_is_marvin() (machine_arch_type == MACH_TYPE_MARVIN)
-#else
-# define machine_is_marvin() (0)
-#endif
-
-#ifdef CONFIG_MACH_X500
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_X500
-# endif
-# define machine_is_x500() (machine_arch_type == MACH_TYPE_X500)
-#else
-# define machine_is_x500() (0)
-#endif
-
-#ifdef CONFIG_MACH_AWLUG4LCU
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_AWLUG4LCU
-# endif
-# define machine_is_awlug4lcu() (machine_arch_type == MACH_TYPE_AWLUG4LCU)
-#else
-# define machine_is_awlug4lcu() (0)
-#endif
-
-#ifdef CONFIG_MACH_PALERMOC
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_PALERMOC
-# endif
-# define machine_is_palermoc() (machine_arch_type == MACH_TYPE_PALERMOC)
-#else
-# define machine_is_palermoc() (0)
-#endif
-
#ifdef CONFIG_MACH_OMAP_LDP
# ifdef machine_arch_type
# undef machine_arch_type
@@ -22705,54 +4225,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_omap_ldp() (0)
#endif
-#ifdef CONFIG_MACH_IP500
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_IP500
-# endif
-# define machine_is_ip500() (machine_arch_type == MACH_TYPE_IP500)
-#else
-# define machine_is_ip500() (0)
-#endif
-
-#ifdef CONFIG_MACH_ASE2
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ASE2
-# endif
-# define machine_is_ase2() (machine_arch_type == MACH_TYPE_ASE2)
-#else
-# define machine_is_ase2() (0)
-#endif
-
-#ifdef CONFIG_MACH_MX35EVB
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MX35EVB
-# endif
-# define machine_is_mx35evb() (machine_arch_type == MACH_TYPE_MX35EVB)
-#else
-# define machine_is_mx35evb() (0)
-#endif
-
-#ifdef CONFIG_MACH_AML_M8050
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_AML_M8050
-# endif
-# define machine_is_aml_m8050() (machine_arch_type == MACH_TYPE_AML_M8050)
-#else
-# define machine_is_aml_m8050() (0)
-#endif
-
#ifdef CONFIG_MACH_MX35_3DS
# ifdef machine_arch_type
# undef machine_arch_type
@@ -22765,18 +4237,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_mx35_3ds() (0)
#endif
-#ifdef CONFIG_MACH_MARS
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MARS
-# endif
-# define machine_is_mars() (machine_arch_type == MACH_TYPE_MARS)
-#else
-# define machine_is_mars() (0)
-#endif
-
#ifdef CONFIG_MACH_NEUROS_OSD2
# ifdef machine_arch_type
# undef machine_arch_type
@@ -22789,18 +4249,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_neuros_osd2() (0)
#endif
-#ifdef CONFIG_MACH_BADGER
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_BADGER
-# endif
-# define machine_is_badger() (machine_arch_type == MACH_TYPE_BADGER)
-#else
-# define machine_is_badger() (0)
-#endif
-
#ifdef CONFIG_MACH_TRIZEPS4WL
# ifdef machine_arch_type
# undef machine_arch_type
@@ -22813,30 +4261,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_trizeps4wl() (0)
#endif
-#ifdef CONFIG_MACH_TRIZEPS5
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_TRIZEPS5
-# endif
-# define machine_is_trizeps5() (machine_arch_type == MACH_TYPE_TRIZEPS5)
-#else
-# define machine_is_trizeps5() (0)
-#endif
-
-#ifdef CONFIG_MACH_MARLIN
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MARLIN
-# endif
-# define machine_is_marlin() (machine_arch_type == MACH_TYPE_MARLIN)
-#else
-# define machine_is_marlin() (0)
-#endif
-
#ifdef CONFIG_MACH_TS78XX
# ifdef machine_arch_type
# undef machine_arch_type
@@ -22849,54 +4273,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_ts78xx() (0)
#endif
-#ifdef CONFIG_MACH_HPIPAQ214
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_HPIPAQ214
-# endif
-# define machine_is_hpipaq214() (machine_arch_type == MACH_TYPE_HPIPAQ214)
-#else
-# define machine_is_hpipaq214() (0)
-#endif
-
-#ifdef CONFIG_MACH_AT572D940DCM
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_AT572D940DCM
-# endif
-# define machine_is_at572d940dcm() (machine_arch_type == MACH_TYPE_AT572D940DCM)
-#else
-# define machine_is_at572d940dcm() (0)
-#endif
-
-#ifdef CONFIG_MACH_NE1BOARD
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_NE1BOARD
-# endif
-# define machine_is_ne1board() (machine_arch_type == MACH_TYPE_NE1BOARD)
-#else
-# define machine_is_ne1board() (0)
-#endif
-
-#ifdef CONFIG_MACH_ZANTE
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ZANTE
-# endif
-# define machine_is_zante() (machine_arch_type == MACH_TYPE_ZANTE)
-#else
-# define machine_is_zante() (0)
-#endif
-
#ifdef CONFIG_MACH_SFFSDR
# ifdef machine_arch_type
# undef machine_arch_type
@@ -22909,186 +4285,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_sffsdr() (0)
#endif
-#ifdef CONFIG_MACH_TW2662
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_TW2662
-# endif
-# define machine_is_tw2662() (machine_arch_type == MACH_TYPE_TW2662)
-#else
-# define machine_is_tw2662() (0)
-#endif
-
-#ifdef CONFIG_MACH_VF10XX
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_VF10XX
-# endif
-# define machine_is_vf10xx() (machine_arch_type == MACH_TYPE_VF10XX)
-#else
-# define machine_is_vf10xx() (0)
-#endif
-
-#ifdef CONFIG_MACH_ZORAN43XX
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ZORAN43XX
-# endif
-# define machine_is_zoran43xx() (machine_arch_type == MACH_TYPE_ZORAN43XX)
-#else
-# define machine_is_zoran43xx() (0)
-#endif
-
-#ifdef CONFIG_MACH_SONIX926
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SONIX926
-# endif
-# define machine_is_sonix926() (machine_arch_type == MACH_TYPE_SONIX926)
-#else
-# define machine_is_sonix926() (0)
-#endif
-
-#ifdef CONFIG_MACH_CELESTIALSEMI
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CELESTIALSEMI
-# endif
-# define machine_is_celestialsemi() (machine_arch_type == MACH_TYPE_CELESTIALSEMI)
-#else
-# define machine_is_celestialsemi() (0)
-#endif
-
-#ifdef CONFIG_MACH_CC9M2443JS
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CC9M2443JS
-# endif
-# define machine_is_cc9m2443js() (machine_arch_type == MACH_TYPE_CC9M2443JS)
-#else
-# define machine_is_cc9m2443js() (0)
-#endif
-
-#ifdef CONFIG_MACH_TW5334
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_TW5334
-# endif
-# define machine_is_tw5334() (machine_arch_type == MACH_TYPE_TW5334)
-#else
-# define machine_is_tw5334() (0)
-#endif
-
-#ifdef CONFIG_MACH_HTCARTEMIS
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_HTCARTEMIS
-# endif
-# define machine_is_omap_htcartemis() (machine_arch_type == MACH_TYPE_HTCARTEMIS)
-#else
-# define machine_is_omap_htcartemis() (0)
-#endif
-
-#ifdef CONFIG_MACH_NAL_HLITE
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_NAL_HLITE
-# endif
-# define machine_is_nal_hlite() (machine_arch_type == MACH_TYPE_NAL_HLITE)
-#else
-# define machine_is_nal_hlite() (0)
-#endif
-
-#ifdef CONFIG_MACH_HTCVOGUE
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_HTCVOGUE
-# endif
-# define machine_is_htcvogue() (machine_arch_type == MACH_TYPE_HTCVOGUE)
-#else
-# define machine_is_htcvogue() (0)
-#endif
-
-#ifdef CONFIG_MACH_SMARTWEB
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SMARTWEB
-# endif
-# define machine_is_smartweb() (machine_arch_type == MACH_TYPE_SMARTWEB)
-#else
-# define machine_is_smartweb() (0)
-#endif
-
-#ifdef CONFIG_MACH_MV86XX
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MV86XX
-# endif
-# define machine_is_mv86xx() (machine_arch_type == MACH_TYPE_MV86XX)
-#else
-# define machine_is_mv86xx() (0)
-#endif
-
-#ifdef CONFIG_MACH_MV87XX
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MV87XX
-# endif
-# define machine_is_mv87xx() (machine_arch_type == MACH_TYPE_MV87XX)
-#else
-# define machine_is_mv87xx() (0)
-#endif
-
-#ifdef CONFIG_MACH_SONGYOUNGHO
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SONGYOUNGHO
-# endif
-# define machine_is_songyoungho() (machine_arch_type == MACH_TYPE_SONGYOUNGHO)
-#else
-# define machine_is_songyoungho() (0)
-#endif
-
-#ifdef CONFIG_MACH_YOUNGHOTEMA
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_YOUNGHOTEMA
-# endif
-# define machine_is_younghotema() (machine_arch_type == MACH_TYPE_YOUNGHOTEMA)
-#else
-# define machine_is_younghotema() (0)
-#endif
-
#ifdef CONFIG_MACH_PCM037
# ifdef machine_arch_type
# undef machine_arch_type
@@ -23101,66 +4297,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_pcm037() (0)
#endif
-#ifdef CONFIG_MACH_MMVP
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MMVP
-# endif
-# define machine_is_mmvp() (machine_arch_type == MACH_TYPE_MMVP)
-#else
-# define machine_is_mmvp() (0)
-#endif
-
-#ifdef CONFIG_MACH_MMAP
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MMAP
-# endif
-# define machine_is_mmap() (machine_arch_type == MACH_TYPE_MMAP)
-#else
-# define machine_is_mmap() (0)
-#endif
-
-#ifdef CONFIG_MACH_PTID2410
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_PTID2410
-# endif
-# define machine_is_ptid2410() (machine_arch_type == MACH_TYPE_PTID2410)
-#else
-# define machine_is_ptid2410() (0)
-#endif
-
-#ifdef CONFIG_MACH_JAMES_926
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_JAMES_926
-# endif
-# define machine_is_james_926() (machine_arch_type == MACH_TYPE_JAMES_926)
-#else
-# define machine_is_james_926() (0)
-#endif
-
-#ifdef CONFIG_MACH_FM6000
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_FM6000
-# endif
-# define machine_is_fm6000() (machine_arch_type == MACH_TYPE_FM6000)
-#else
-# define machine_is_fm6000() (0)
-#endif
-
#ifdef CONFIG_MACH_DB88F6281_BP
# ifdef machine_arch_type
# undef machine_arch_type
@@ -23221,54 +4357,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_smdk2416() (0)
#endif
-#ifdef CONFIG_MACH_OCE_SPIDER_SI
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_OCE_SPIDER_SI
-# endif
-# define machine_is_oce_spider_si() (machine_arch_type == MACH_TYPE_OCE_SPIDER_SI)
-#else
-# define machine_is_oce_spider_si() (0)
-#endif
-
-#ifdef CONFIG_MACH_OCE_SPIDER_SK
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_OCE_SPIDER_SK
-# endif
-# define machine_is_oce_spider_sk() (machine_arch_type == MACH_TYPE_OCE_SPIDER_SK)
-#else
-# define machine_is_oce_spider_sk() (0)
-#endif
-
-#ifdef CONFIG_MACH_ROVERN6
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ROVERN6
-# endif
-# define machine_is_rovern6() (machine_arch_type == MACH_TYPE_ROVERN6)
-#else
-# define machine_is_rovern6() (0)
-#endif
-
-#ifdef CONFIG_MACH_PELCO_EVOLUTION
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_PELCO_EVOLUTION
-# endif
-# define machine_is_pelco_evolution() (machine_arch_type == MACH_TYPE_PELCO_EVOLUTION)
-#else
-# define machine_is_pelco_evolution() (0)
-#endif
-
#ifdef CONFIG_MACH_WBD111
# ifdef machine_arch_type
# undef machine_arch_type
@@ -23281,30 +4369,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_wbd111() (0)
#endif
-#ifdef CONFIG_MACH_ELARACPE
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ELARACPE
-# endif
-# define machine_is_elaracpe() (machine_arch_type == MACH_TYPE_ELARACPE)
-#else
-# define machine_is_elaracpe() (0)
-#endif
-
-#ifdef CONFIG_MACH_MABV3
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MABV3
-# endif
-# define machine_is_mabv3() (machine_arch_type == MACH_TYPE_MABV3)
-#else
-# define machine_is_mabv3() (0)
-#endif
-
#ifdef CONFIG_MACH_MV2120
# ifdef machine_arch_type
# undef machine_arch_type
@@ -23317,18 +4381,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_mv2120() (0)
#endif
-#ifdef CONFIG_MACH_CSB737
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CSB737
-# endif
-# define machine_is_csb737() (machine_arch_type == MACH_TYPE_CSB737)
-#else
-# define machine_is_csb737() (0)
-#endif
-
#ifdef CONFIG_MACH_MX51_3DS
# ifdef machine_arch_type
# undef machine_arch_type
@@ -23341,54 +4393,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_mx51_3ds() (0)
#endif
-#ifdef CONFIG_MACH_G900
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_G900
-# endif
-# define machine_is_g900() (machine_arch_type == MACH_TYPE_G900)
-#else
-# define machine_is_g900() (0)
-#endif
-
-#ifdef CONFIG_MACH_APF27
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_APF27
-# endif
-# define machine_is_apf27() (machine_arch_type == MACH_TYPE_APF27)
-#else
-# define machine_is_apf27() (0)
-#endif
-
-#ifdef CONFIG_MACH_GGUS2000
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_GGUS2000
-# endif
-# define machine_is_ggus2000() (machine_arch_type == MACH_TYPE_GGUS2000)
-#else
-# define machine_is_ggus2000() (0)
-#endif
-
-#ifdef CONFIG_MACH_OMAP_2430_MIMIC
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_OMAP_2430_MIMIC
-# endif
-# define machine_is_omap_2430_mimic() (machine_arch_type == MACH_TYPE_OMAP_2430_MIMIC)
-#else
-# define machine_is_omap_2430_mimic() (0)
-#endif
-
#ifdef CONFIG_MACH_IMX27LITE
# ifdef machine_arch_type
# undef machine_arch_type
@@ -23401,90 +4405,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_imx27lite() (0)
#endif
-#ifdef CONFIG_MACH_ALMEX
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ALMEX
-# endif
-# define machine_is_almex() (machine_arch_type == MACH_TYPE_ALMEX)
-#else
-# define machine_is_almex() (0)
-#endif
-
-#ifdef CONFIG_MACH_CONTROL
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CONTROL
-# endif
-# define machine_is_control() (machine_arch_type == MACH_TYPE_CONTROL)
-#else
-# define machine_is_control() (0)
-#endif
-
-#ifdef CONFIG_MACH_MBA2410
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MBA2410
-# endif
-# define machine_is_mba2410() (machine_arch_type == MACH_TYPE_MBA2410)
-#else
-# define machine_is_mba2410() (0)
-#endif
-
-#ifdef CONFIG_MACH_VOLCANO
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_VOLCANO
-# endif
-# define machine_is_volcano() (machine_arch_type == MACH_TYPE_VOLCANO)
-#else
-# define machine_is_volcano() (0)
-#endif
-
-#ifdef CONFIG_MACH_ZENITH
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ZENITH
-# endif
-# define machine_is_zenith() (machine_arch_type == MACH_TYPE_ZENITH)
-#else
-# define machine_is_zenith() (0)
-#endif
-
-#ifdef CONFIG_MACH_MUCHIP
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MUCHIP
-# endif
-# define machine_is_muchip() (machine_arch_type == MACH_TYPE_MUCHIP)
-#else
-# define machine_is_muchip() (0)
-#endif
-
-#ifdef CONFIG_MACH_MAGELLAN
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MAGELLAN
-# endif
-# define machine_is_magellan() (machine_arch_type == MACH_TYPE_MAGELLAN)
-#else
-# define machine_is_magellan() (0)
-#endif
-
#ifdef CONFIG_MACH_USB_A9260
# ifdef machine_arch_type
# undef machine_arch_type
@@ -23521,126 +4441,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_qil_a9260() (0)
#endif
-#ifdef CONFIG_MACH_CME9210
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CME9210
-# endif
-# define machine_is_cme9210() (machine_arch_type == MACH_TYPE_CME9210)
-#else
-# define machine_is_cme9210() (0)
-#endif
-
-#ifdef CONFIG_MACH_HCZH4
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_HCZH4
-# endif
-# define machine_is_hczh4() (machine_arch_type == MACH_TYPE_HCZH4)
-#else
-# define machine_is_hczh4() (0)
-#endif
-
-#ifdef CONFIG_MACH_SPEARBASIC
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SPEARBASIC
-# endif
-# define machine_is_spearbasic() (machine_arch_type == MACH_TYPE_SPEARBASIC)
-#else
-# define machine_is_spearbasic() (0)
-#endif
-
-#ifdef CONFIG_MACH_DEP2440
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_DEP2440
-# endif
-# define machine_is_dep2440() (machine_arch_type == MACH_TYPE_DEP2440)
-#else
-# define machine_is_dep2440() (0)
-#endif
-
-#ifdef CONFIG_MACH_HDL_GXR
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_HDL_GXR
-# endif
-# define machine_is_hdl_gxr() (machine_arch_type == MACH_TYPE_HDL_GXR)
-#else
-# define machine_is_hdl_gxr() (0)
-#endif
-
-#ifdef CONFIG_MACH_HDL_GT
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_HDL_GT
-# endif
-# define machine_is_hdl_gt() (machine_arch_type == MACH_TYPE_HDL_GT)
-#else
-# define machine_is_hdl_gt() (0)
-#endif
-
-#ifdef CONFIG_MACH_HDL_4G
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_HDL_4G
-# endif
-# define machine_is_hdl_4g() (machine_arch_type == MACH_TYPE_HDL_4G)
-#else
-# define machine_is_hdl_4g() (0)
-#endif
-
-#ifdef CONFIG_MACH_S3C6000
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_S3C6000
-# endif
-# define machine_is_s3c6000() (machine_arch_type == MACH_TYPE_S3C6000)
-#else
-# define machine_is_s3c6000() (0)
-#endif
-
-#ifdef CONFIG_MACH_MMSP2_MDK
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MMSP2_MDK
-# endif
-# define machine_is_mmsp2_mdk() (machine_arch_type == MACH_TYPE_MMSP2_MDK)
-#else
-# define machine_is_mmsp2_mdk() (0)
-#endif
-
-#ifdef CONFIG_MACH_MPX220
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MPX220
-# endif
-# define machine_is_mpx220() (machine_arch_type == MACH_TYPE_MPX220)
-#else
-# define machine_is_mpx220() (0)
-#endif
-
#ifdef CONFIG_MACH_KZM_ARM11_01
# ifdef machine_arch_type
# undef machine_arch_type
@@ -23653,54 +4453,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_kzm_arm11_01() (0)
#endif
-#ifdef CONFIG_MACH_HTC_POLARIS
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_HTC_POLARIS
-# endif
-# define machine_is_htc_polaris() (machine_arch_type == MACH_TYPE_HTC_POLARIS)
-#else
-# define machine_is_htc_polaris() (0)
-#endif
-
-#ifdef CONFIG_MACH_HTC_KAISER
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_HTC_KAISER
-# endif
-# define machine_is_htc_kaiser() (machine_arch_type == MACH_TYPE_HTC_KAISER)
-#else
-# define machine_is_htc_kaiser() (0)
-#endif
-
-#ifdef CONFIG_MACH_LG_KS20
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_LG_KS20
-# endif
-# define machine_is_lg_ks20() (machine_arch_type == MACH_TYPE_LG_KS20)
-#else
-# define machine_is_lg_ks20() (0)
-#endif
-
-#ifdef CONFIG_MACH_HHGPS
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_HHGPS
-# endif
-# define machine_is_hhgps() (machine_arch_type == MACH_TYPE_HHGPS)
-#else
-# define machine_is_hhgps() (0)
-#endif
-
#ifdef CONFIG_MACH_NOKIA_N810_WIMAX
# ifdef machine_arch_type
# undef machine_arch_type
@@ -23713,18 +4465,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_nokia_n810_wimax() (0)
#endif
-#ifdef CONFIG_MACH_INSIGHT
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_INSIGHT
-# endif
-# define machine_is_insight() (machine_arch_type == MACH_TYPE_INSIGHT)
-#else
-# define machine_is_insight() (0)
-#endif
-
#ifdef CONFIG_MACH_SAPPHIRE
# ifdef machine_arch_type
# undef machine_arch_type
@@ -23737,30 +4477,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_sapphire() (0)
#endif
-#ifdef CONFIG_MACH_CSB637XO
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CSB637XO
-# endif
-# define machine_is_csb637xo() (machine_arch_type == MACH_TYPE_CSB637XO)
-#else
-# define machine_is_csb637xo() (0)
-#endif
-
-#ifdef CONFIG_MACH_EVISIONG
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_EVISIONG
-# endif
-# define machine_is_evisiong() (machine_arch_type == MACH_TYPE_EVISIONG)
-#else
-# define machine_is_evisiong() (0)
-#endif
-
#ifdef CONFIG_MACH_STMP37XX
# ifdef machine_arch_type
# undef machine_arch_type
@@ -23785,78 +4501,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_stmp378x() (0)
#endif
-#ifdef CONFIG_MACH_TNT
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_TNT
-# endif
-# define machine_is_tnt() (machine_arch_type == MACH_TYPE_TNT)
-#else
-# define machine_is_tnt() (0)
-#endif
-
-#ifdef CONFIG_MACH_TBXT
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_TBXT
-# endif
-# define machine_is_tbxt() (machine_arch_type == MACH_TYPE_TBXT)
-#else
-# define machine_is_tbxt() (0)
-#endif
-
-#ifdef CONFIG_MACH_PLAYMATE
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_PLAYMATE
-# endif
-# define machine_is_playmate() (machine_arch_type == MACH_TYPE_PLAYMATE)
-#else
-# define machine_is_playmate() (0)
-#endif
-
-#ifdef CONFIG_MACH_PNS10
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_PNS10
-# endif
-# define machine_is_pns10() (machine_arch_type == MACH_TYPE_PNS10)
-#else
-# define machine_is_pns10() (0)
-#endif
-
-#ifdef CONFIG_MACH_EZNAVI
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_EZNAVI
-# endif
-# define machine_is_eznavi() (machine_arch_type == MACH_TYPE_EZNAVI)
-#else
-# define machine_is_eznavi() (0)
-#endif
-
-#ifdef CONFIG_MACH_PS4000
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_PS4000
-# endif
-# define machine_is_ps4000() (machine_arch_type == MACH_TYPE_PS4000)
-#else
-# define machine_is_ps4000() (0)
-#endif
-
#ifdef CONFIG_MACH_EZX_A780
# ifdef machine_arch_type
# undef machine_arch_type
@@ -23929,126 +4573,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_ezx_a910() (0)
#endif
-#ifdef CONFIG_MACH_CWMX31
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CWMX31
-# endif
-# define machine_is_cwmx31() (machine_arch_type == MACH_TYPE_CWMX31)
-#else
-# define machine_is_cwmx31() (0)
-#endif
-
-#ifdef CONFIG_MACH_SL2312
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SL2312
-# endif
-# define machine_is_sl2312() (machine_arch_type == MACH_TYPE_SL2312)
-#else
-# define machine_is_sl2312() (0)
-#endif
-
-#ifdef CONFIG_MACH_BLENNY
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_BLENNY
-# endif
-# define machine_is_blenny() (machine_arch_type == MACH_TYPE_BLENNY)
-#else
-# define machine_is_blenny() (0)
-#endif
-
-#ifdef CONFIG_MACH_DS107
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_DS107
-# endif
-# define machine_is_ds107() (machine_arch_type == MACH_TYPE_DS107)
-#else
-# define machine_is_ds107() (0)
-#endif
-
-#ifdef CONFIG_MACH_DSX07
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_DSX07
-# endif
-# define machine_is_dsx07() (machine_arch_type == MACH_TYPE_DSX07)
-#else
-# define machine_is_dsx07() (0)
-#endif
-
-#ifdef CONFIG_MACH_PICOCOM1
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_PICOCOM1
-# endif
-# define machine_is_picocom1() (machine_arch_type == MACH_TYPE_PICOCOM1)
-#else
-# define machine_is_picocom1() (0)
-#endif
-
-#ifdef CONFIG_MACH_LYNX_WOLVERINE
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_LYNX_WOLVERINE
-# endif
-# define machine_is_lynx_wolverine() (machine_arch_type == MACH_TYPE_LYNX_WOLVERINE)
-#else
-# define machine_is_lynx_wolverine() (0)
-#endif
-
-#ifdef CONFIG_MACH_UBISYS_P9_SC19
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_UBISYS_P9_SC19
-# endif
-# define machine_is_ubisys_p9_sc19() (machine_arch_type == MACH_TYPE_UBISYS_P9_SC19)
-#else
-# define machine_is_ubisys_p9_sc19() (0)
-#endif
-
-#ifdef CONFIG_MACH_KRATOS_LOW
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_KRATOS_LOW
-# endif
-# define machine_is_kratos_low() (machine_arch_type == MACH_TYPE_KRATOS_LOW)
-#else
-# define machine_is_kratos_low() (0)
-#endif
-
-#ifdef CONFIG_MACH_M700
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_M700
-# endif
-# define machine_is_m700() (machine_arch_type == MACH_TYPE_M700)
-#else
-# define machine_is_m700() (0)
-#endif
-
#ifdef CONFIG_MACH_EDMINI_V2
# ifdef machine_arch_type
# undef machine_arch_type
@@ -24073,42 +4597,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_zipit2() (0)
#endif
-#ifdef CONFIG_MACH_HSLFEMTOCELL
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_HSLFEMTOCELL
-# endif
-# define machine_is_hslfemtocell() (machine_arch_type == MACH_TYPE_HSLFEMTOCELL)
-#else
-# define machine_is_hslfemtocell() (0)
-#endif
-
-#ifdef CONFIG_MACH_DAINTREE_AT91
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_DAINTREE_AT91
-# endif
-# define machine_is_daintree_at91() (machine_arch_type == MACH_TYPE_DAINTREE_AT91)
-#else
-# define machine_is_daintree_at91() (0)
-#endif
-
-#ifdef CONFIG_MACH_SG560USB
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SG560USB
-# endif
-# define machine_is_sg560usb() (machine_arch_type == MACH_TYPE_SG560USB)
-#else
-# define machine_is_sg560usb() (0)
-#endif
-
#ifdef CONFIG_MACH_OMAP3_PANDORA
# ifdef machine_arch_type
# undef machine_arch_type
@@ -24121,54 +4609,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_omap3_pandora() (0)
#endif
-#ifdef CONFIG_MACH_USR8200
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_USR8200
-# endif
-# define machine_is_usr8200() (machine_arch_type == MACH_TYPE_USR8200)
-#else
-# define machine_is_usr8200() (0)
-#endif
-
-#ifdef CONFIG_MACH_S1S65K
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_S1S65K
-# endif
-# define machine_is_s1s65k() (machine_arch_type == MACH_TYPE_S1S65K)
-#else
-# define machine_is_s1s65k() (0)
-#endif
-
-#ifdef CONFIG_MACH_S2S65A
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_S2S65A
-# endif
-# define machine_is_s2s65a() (machine_arch_type == MACH_TYPE_S2S65A)
-#else
-# define machine_is_s2s65a() (0)
-#endif
-
-#ifdef CONFIG_MACH_ICORE
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ICORE
-# endif
-# define machine_is_icore() (machine_arch_type == MACH_TYPE_ICORE)
-#else
-# define machine_is_icore() (0)
-#endif
-
#ifdef CONFIG_MACH_MSS2
# ifdef machine_arch_type
# undef machine_arch_type
@@ -24181,30 +4621,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_mss2() (0)
#endif
-#ifdef CONFIG_MACH_BELMONT
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_BELMONT
-# endif
-# define machine_is_belmont() (machine_arch_type == MACH_TYPE_BELMONT)
-#else
-# define machine_is_belmont() (0)
-#endif
-
-#ifdef CONFIG_MACH_ASUSP525
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ASUSP525
-# endif
-# define machine_is_asusp525() (machine_arch_type == MACH_TYPE_ASUSP525)
-#else
-# define machine_is_asusp525() (0)
-#endif
-
#ifdef CONFIG_MACH_LB88RC8480
# ifdef machine_arch_type
# undef machine_arch_type
@@ -24217,18 +4633,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_lb88rc8480() (0)
#endif
-#ifdef CONFIG_MACH_HIPXA
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_HIPXA
-# endif
-# define machine_is_hipxa() (machine_arch_type == MACH_TYPE_HIPXA)
-#else
-# define machine_is_hipxa() (0)
-#endif
-
#ifdef CONFIG_MACH_MX25_3DS
# ifdef machine_arch_type
# undef machine_arch_type
@@ -24241,18 +4645,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_mx25_3ds() (0)
#endif
-#ifdef CONFIG_MACH_M800
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_M800
-# endif
-# define machine_is_m800() (machine_arch_type == MACH_TYPE_M800)
-#else
-# define machine_is_m800() (0)
-#endif
-
#ifdef CONFIG_MACH_OMAP3530_LV_SOM
# ifdef machine_arch_type
# undef machine_arch_type
@@ -24265,90 +4657,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_omap3530_lv_som() (0)
#endif
-#ifdef CONFIG_MACH_PRIMA_EVB
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_PRIMA_EVB
-# endif
-# define machine_is_prima_evb() (machine_arch_type == MACH_TYPE_PRIMA_EVB)
-#else
-# define machine_is_prima_evb() (0)
-#endif
-
-#ifdef CONFIG_MACH_MX31BT1
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MX31BT1
-# endif
-# define machine_is_mx31bt1() (machine_arch_type == MACH_TYPE_MX31BT1)
-#else
-# define machine_is_mx31bt1() (0)
-#endif
-
-#ifdef CONFIG_MACH_ATLAS4_EVB
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ATLAS4_EVB
-# endif
-# define machine_is_atlas4_evb() (machine_arch_type == MACH_TYPE_ATLAS4_EVB)
-#else
-# define machine_is_atlas4_evb() (0)
-#endif
-
-#ifdef CONFIG_MACH_MX31CICADA
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MX31CICADA
-# endif
-# define machine_is_mx31cicada() (machine_arch_type == MACH_TYPE_MX31CICADA)
-#else
-# define machine_is_mx31cicada() (0)
-#endif
-
-#ifdef CONFIG_MACH_MI424WR
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MI424WR
-# endif
-# define machine_is_mi424wr() (machine_arch_type == MACH_TYPE_MI424WR)
-#else
-# define machine_is_mi424wr() (0)
-#endif
-
-#ifdef CONFIG_MACH_AXS_ULTRAX
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_AXS_ULTRAX
-# endif
-# define machine_is_axs_ultrax() (machine_arch_type == MACH_TYPE_AXS_ULTRAX)
-#else
-# define machine_is_axs_ultrax() (0)
-#endif
-
-#ifdef CONFIG_MACH_AT572D940DEB
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_AT572D940DEB
-# endif
-# define machine_is_at572d940deb() (machine_arch_type == MACH_TYPE_AT572D940DEB)
-#else
-# define machine_is_at572d940deb() (0)
-#endif
-
#ifdef CONFIG_MACH_DAVINCI_DA830_EVM
# ifdef machine_arch_type
# undef machine_arch_type
@@ -24361,18 +4669,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_davinci_da830_evm() (0)
#endif
-#ifdef CONFIG_MACH_EP9302
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_EP9302
-# endif
-# define machine_is_ep9302() (machine_arch_type == MACH_TYPE_EP9302)
-#else
-# define machine_is_ep9302() (0)
-#endif
-
#ifdef CONFIG_MACH_AT572D940HFEB
# ifdef machine_arch_type
# undef machine_arch_type
@@ -24385,54 +4681,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_at572d940hfek() (0)
#endif
-#ifdef CONFIG_MACH_CYBOOK3
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CYBOOK3
-# endif
-# define machine_is_cybook3() (machine_arch_type == MACH_TYPE_CYBOOK3)
-#else
-# define machine_is_cybook3() (0)
-#endif
-
-#ifdef CONFIG_MACH_WDG002
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_WDG002
-# endif
-# define machine_is_wdg002() (machine_arch_type == MACH_TYPE_WDG002)
-#else
-# define machine_is_wdg002() (0)
-#endif
-
-#ifdef CONFIG_MACH_SG560ADSL
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SG560ADSL
-# endif
-# define machine_is_sg560adsl() (machine_arch_type == MACH_TYPE_SG560ADSL)
-#else
-# define machine_is_sg560adsl() (0)
-#endif
-
-#ifdef CONFIG_MACH_NEXTIO_N2800_ICA
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_NEXTIO_N2800_ICA
-# endif
-# define machine_is_nextio_n2800_ica() (machine_arch_type == MACH_TYPE_NEXTIO_N2800_ICA)
-#else
-# define machine_is_nextio_n2800_ica() (0)
-#endif
-
#ifdef CONFIG_MACH_DOVE_DB
# ifdef machine_arch_type
# undef machine_arch_type
@@ -24445,114 +4693,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_dove_db() (0)
#endif
-#ifdef CONFIG_MACH_MARVELL_NEWDB
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MARVELL_NEWDB
-# endif
-# define machine_is_marvell_newdb() (machine_arch_type == MACH_TYPE_MARVELL_NEWDB)
-#else
-# define machine_is_marvell_newdb() (0)
-#endif
-
-#ifdef CONFIG_MACH_VANDIHUD
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_VANDIHUD
-# endif
-# define machine_is_vandihud() (machine_arch_type == MACH_TYPE_VANDIHUD)
-#else
-# define machine_is_vandihud() (0)
-#endif
-
-#ifdef CONFIG_MACH_MAGX_E8
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MAGX_E8
-# endif
-# define machine_is_magx_e8() (machine_arch_type == MACH_TYPE_MAGX_E8)
-#else
-# define machine_is_magx_e8() (0)
-#endif
-
-#ifdef CONFIG_MACH_MAGX_Z6
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MAGX_Z6
-# endif
-# define machine_is_magx_z6() (machine_arch_type == MACH_TYPE_MAGX_Z6)
-#else
-# define machine_is_magx_z6() (0)
-#endif
-
-#ifdef CONFIG_MACH_MAGX_V8
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MAGX_V8
-# endif
-# define machine_is_magx_v8() (machine_arch_type == MACH_TYPE_MAGX_V8)
-#else
-# define machine_is_magx_v8() (0)
-#endif
-
-#ifdef CONFIG_MACH_MAGX_U9
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MAGX_U9
-# endif
-# define machine_is_magx_u9() (machine_arch_type == MACH_TYPE_MAGX_U9)
-#else
-# define machine_is_magx_u9() (0)
-#endif
-
-#ifdef CONFIG_MACH_TOUGHCF08
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_TOUGHCF08
-# endif
-# define machine_is_toughcf08() (machine_arch_type == MACH_TYPE_TOUGHCF08)
-#else
-# define machine_is_toughcf08() (0)
-#endif
-
-#ifdef CONFIG_MACH_ZW4400
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ZW4400
-# endif
-# define machine_is_zw4400() (machine_arch_type == MACH_TYPE_ZW4400)
-#else
-# define machine_is_zw4400() (0)
-#endif
-
-#ifdef CONFIG_MACH_MARAT91
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MARAT91
-# endif
-# define machine_is_marat91() (machine_arch_type == MACH_TYPE_MARAT91)
-#else
-# define machine_is_marat91() (0)
-#endif
-
#ifdef CONFIG_MACH_OVERO
# ifdef machine_arch_type
# undef machine_arch_type
@@ -24601,126 +4741,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_wnr854t() (0)
#endif
-#ifdef CONFIG_MACH_IMX27
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_IMX27
-# endif
-# define machine_is_imx27() (machine_arch_type == MACH_TYPE_IMX27)
-#else
-# define machine_is_imx27() (0)
-#endif
-
-#ifdef CONFIG_MACH_MOOSE_DB
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MOOSE_DB
-# endif
-# define machine_is_moose_db() (machine_arch_type == MACH_TYPE_MOOSE_DB)
-#else
-# define machine_is_moose_db() (0)
-#endif
-
-#ifdef CONFIG_MACH_FAB4
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_FAB4
-# endif
-# define machine_is_fab4() (machine_arch_type == MACH_TYPE_FAB4)
-#else
-# define machine_is_fab4() (0)
-#endif
-
-#ifdef CONFIG_MACH_HTCDIAMOND
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_HTCDIAMOND
-# endif
-# define machine_is_htcdiamond() (machine_arch_type == MACH_TYPE_HTCDIAMOND)
-#else
-# define machine_is_htcdiamond() (0)
-#endif
-
-#ifdef CONFIG_MACH_FIONA
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_FIONA
-# endif
-# define machine_is_fiona() (machine_arch_type == MACH_TYPE_FIONA)
-#else
-# define machine_is_fiona() (0)
-#endif
-
-#ifdef CONFIG_MACH_MXC30030_X
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MXC30030_X
-# endif
-# define machine_is_mxc30030_x() (machine_arch_type == MACH_TYPE_MXC30030_X)
-#else
-# define machine_is_mxc30030_x() (0)
-#endif
-
-#ifdef CONFIG_MACH_BMP1000
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_BMP1000
-# endif
-# define machine_is_bmp1000() (machine_arch_type == MACH_TYPE_BMP1000)
-#else
-# define machine_is_bmp1000() (0)
-#endif
-
-#ifdef CONFIG_MACH_LOGI9200
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_LOGI9200
-# endif
-# define machine_is_logi9200() (machine_arch_type == MACH_TYPE_LOGI9200)
-#else
-# define machine_is_logi9200() (0)
-#endif
-
-#ifdef CONFIG_MACH_TQMA31
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_TQMA31
-# endif
-# define machine_is_tqma31() (machine_arch_type == MACH_TYPE_TQMA31)
-#else
-# define machine_is_tqma31() (0)
-#endif
-
-#ifdef CONFIG_MACH_CCW9P9215JS
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CCW9P9215JS
-# endif
-# define machine_is_ccw9p9215js() (machine_arch_type == MACH_TYPE_CCW9P9215JS)
-#else
-# define machine_is_ccw9p9215js() (0)
-#endif
-
#ifdef CONFIG_MACH_RD88F5181L_GE
# ifdef machine_arch_type
# undef machine_arch_type
@@ -24733,66 +4753,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_rd88f5181l_ge() (0)
#endif
-#ifdef CONFIG_MACH_SIFMAIN
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SIFMAIN
-# endif
-# define machine_is_sifmain() (machine_arch_type == MACH_TYPE_SIFMAIN)
-#else
-# define machine_is_sifmain() (0)
-#endif
-
-#ifdef CONFIG_MACH_SAM9_L9261
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SAM9_L9261
-# endif
-# define machine_is_sam9_l9261() (machine_arch_type == MACH_TYPE_SAM9_L9261)
-#else
-# define machine_is_sam9_l9261() (0)
-#endif
-
-#ifdef CONFIG_MACH_CC9M2443
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CC9M2443
-# endif
-# define machine_is_cc9m2443() (machine_arch_type == MACH_TYPE_CC9M2443)
-#else
-# define machine_is_cc9m2443() (0)
-#endif
-
-#ifdef CONFIG_MACH_XARIA300
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_XARIA300
-# endif
-# define machine_is_xaria300() (machine_arch_type == MACH_TYPE_XARIA300)
-#else
-# define machine_is_xaria300() (0)
-#endif
-
-#ifdef CONFIG_MACH_IT9200
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_IT9200
-# endif
-# define machine_is_it9200() (machine_arch_type == MACH_TYPE_IT9200)
-#else
-# define machine_is_it9200() (0)
-#endif
-
#ifdef CONFIG_MACH_RD88F5181L_FXO
# ifdef machine_arch_type
# undef machine_arch_type
@@ -24805,66 +4765,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_rd88f5181l_fxo() (0)
#endif
-#ifdef CONFIG_MACH_KRISS_SENSOR
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_KRISS_SENSOR
-# endif
-# define machine_is_kriss_sensor() (machine_arch_type == MACH_TYPE_KRISS_SENSOR)
-#else
-# define machine_is_kriss_sensor() (0)
-#endif
-
-#ifdef CONFIG_MACH_PILZ_PMI5
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_PILZ_PMI5
-# endif
-# define machine_is_pilz_pmi5() (machine_arch_type == MACH_TYPE_PILZ_PMI5)
-#else
-# define machine_is_pilz_pmi5() (0)
-#endif
-
-#ifdef CONFIG_MACH_JADE
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_JADE
-# endif
-# define machine_is_jade() (machine_arch_type == MACH_TYPE_JADE)
-#else
-# define machine_is_jade() (0)
-#endif
-
-#ifdef CONFIG_MACH_KS8695_SOFTPLC
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_KS8695_SOFTPLC
-# endif
-# define machine_is_ks8695_softplc() (machine_arch_type == MACH_TYPE_KS8695_SOFTPLC)
-#else
-# define machine_is_ks8695_softplc() (0)
-#endif
-
-#ifdef CONFIG_MACH_GPRISC3
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_GPRISC3
-# endif
-# define machine_is_gprisc3() (machine_arch_type == MACH_TYPE_GPRISC3)
-#else
-# define machine_is_gprisc3() (0)
-#endif
-
#ifdef CONFIG_MACH_STAMP9G20
# ifdef machine_arch_type
# undef machine_arch_type
@@ -24877,18 +4777,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_stamp9g20() (0)
#endif
-#ifdef CONFIG_MACH_SMDK6430
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SMDK6430
-# endif
-# define machine_is_smdk6430() (machine_arch_type == MACH_TYPE_SMDK6430)
-#else
-# define machine_is_smdk6430() (0)
-#endif
-
#ifdef CONFIG_MACH_SMDKC100
# ifdef machine_arch_type
# undef machine_arch_type
@@ -24925,18 +4813,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_saar() (0)
#endif
-#ifdef CONFIG_MACH_DEISTER_EYECAM
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_DEISTER_EYECAM
-# endif
-# define machine_is_deister_eyecam() (machine_arch_type == MACH_TYPE_DEISTER_EYECAM)
-#else
-# define machine_is_deister_eyecam() (0)
-#endif
-
#ifdef CONFIG_MACH_AT91SAM9M10G45EK
# ifdef machine_arch_type
# undef machine_arch_type
@@ -24949,246 +4825,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_at91sam9m10g45ek() (0)
#endif
-#ifdef CONFIG_MACH_LINKSTATION_PRODUO
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_LINKSTATION_PRODUO
-# endif
-# define machine_is_linkstation_produo() (machine_arch_type == MACH_TYPE_LINKSTATION_PRODUO)
-#else
-# define machine_is_linkstation_produo() (0)
-#endif
-
-#ifdef CONFIG_MACH_HIT_B0
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_HIT_B0
-# endif
-# define machine_is_hit_b0() (machine_arch_type == MACH_TYPE_HIT_B0)
-#else
-# define machine_is_hit_b0() (0)
-#endif
-
-#ifdef CONFIG_MACH_ADX_RMU
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ADX_RMU
-# endif
-# define machine_is_adx_rmu() (machine_arch_type == MACH_TYPE_ADX_RMU)
-#else
-# define machine_is_adx_rmu() (0)
-#endif
-
-#ifdef CONFIG_MACH_XG_CPE_MAIN
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_XG_CPE_MAIN
-# endif
-# define machine_is_xg_cpe_main() (machine_arch_type == MACH_TYPE_XG_CPE_MAIN)
-#else
-# define machine_is_xg_cpe_main() (0)
-#endif
-
-#ifdef CONFIG_MACH_EDB9407A
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_EDB9407A
-# endif
-# define machine_is_edb9407a() (machine_arch_type == MACH_TYPE_EDB9407A)
-#else
-# define machine_is_edb9407a() (0)
-#endif
-
-#ifdef CONFIG_MACH_DTB9608
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_DTB9608
-# endif
-# define machine_is_dtb9608() (machine_arch_type == MACH_TYPE_DTB9608)
-#else
-# define machine_is_dtb9608() (0)
-#endif
-
-#ifdef CONFIG_MACH_EM104V1
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_EM104V1
-# endif
-# define machine_is_em104v1() (machine_arch_type == MACH_TYPE_EM104V1)
-#else
-# define machine_is_em104v1() (0)
-#endif
-
-#ifdef CONFIG_MACH_DEMO
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_DEMO
-# endif
-# define machine_is_demo() (machine_arch_type == MACH_TYPE_DEMO)
-#else
-# define machine_is_demo() (0)
-#endif
-
-#ifdef CONFIG_MACH_LOGI9260
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_LOGI9260
-# endif
-# define machine_is_logi9260() (machine_arch_type == MACH_TYPE_LOGI9260)
-#else
-# define machine_is_logi9260() (0)
-#endif
-
-#ifdef CONFIG_MACH_MX31_EXM32
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MX31_EXM32
-# endif
-# define machine_is_mx31_exm32() (machine_arch_type == MACH_TYPE_MX31_EXM32)
-#else
-# define machine_is_mx31_exm32() (0)
-#endif
-
-#ifdef CONFIG_MACH_USB_A9G20
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_USB_A9G20
-# endif
-# define machine_is_usb_a9g20() (machine_arch_type == MACH_TYPE_USB_A9G20)
-#else
-# define machine_is_usb_a9g20() (0)
-#endif
-
-#ifdef CONFIG_MACH_PICPROJE2008
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_PICPROJE2008
-# endif
-# define machine_is_picproje2008() (machine_arch_type == MACH_TYPE_PICPROJE2008)
-#else
-# define machine_is_picproje2008() (0)
-#endif
-
-#ifdef CONFIG_MACH_CS_E9315
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CS_E9315
-# endif
-# define machine_is_cs_e9315() (machine_arch_type == MACH_TYPE_CS_E9315)
-#else
-# define machine_is_cs_e9315() (0)
-#endif
-
-#ifdef CONFIG_MACH_QIL_A9G20
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_QIL_A9G20
-# endif
-# define machine_is_qil_a9g20() (machine_arch_type == MACH_TYPE_QIL_A9G20)
-#else
-# define machine_is_qil_a9g20() (0)
-#endif
-
-#ifdef CONFIG_MACH_SHA_PON020
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SHA_PON020
-# endif
-# define machine_is_sha_pon020() (machine_arch_type == MACH_TYPE_SHA_PON020)
-#else
-# define machine_is_sha_pon020() (0)
-#endif
-
-#ifdef CONFIG_MACH_NAD
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_NAD
-# endif
-# define machine_is_nad() (machine_arch_type == MACH_TYPE_NAD)
-#else
-# define machine_is_nad() (0)
-#endif
-
-#ifdef CONFIG_MACH_SBC35_A9260
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SBC35_A9260
-# endif
-# define machine_is_sbc35_a9260() (machine_arch_type == MACH_TYPE_SBC35_A9260)
-#else
-# define machine_is_sbc35_a9260() (0)
-#endif
-
-#ifdef CONFIG_MACH_SBC35_A9G20
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SBC35_A9G20
-# endif
-# define machine_is_sbc35_a9g20() (machine_arch_type == MACH_TYPE_SBC35_A9G20)
-#else
-# define machine_is_sbc35_a9g20() (0)
-#endif
-
-#ifdef CONFIG_MACH_DAVINCI_BEGINNING
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_DAVINCI_BEGINNING
-# endif
-# define machine_is_davinci_beginning() (machine_arch_type == MACH_TYPE_DAVINCI_BEGINNING)
-#else
-# define machine_is_davinci_beginning() (0)
-#endif
-
-#ifdef CONFIG_MACH_UWC
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_UWC
-# endif
-# define machine_is_uwc() (machine_arch_type == MACH_TYPE_UWC)
-#else
-# define machine_is_uwc() (0)
-#endif
-
#ifdef CONFIG_MACH_MXLADS
# ifdef machine_arch_type
# undef machine_arch_type
@@ -25201,78 +4837,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_mxlads() (0)
#endif
-#ifdef CONFIG_MACH_HTCNIKE
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_HTCNIKE
-# endif
-# define machine_is_htcnike() (machine_arch_type == MACH_TYPE_HTCNIKE)
-#else
-# define machine_is_htcnike() (0)
-#endif
-
-#ifdef CONFIG_MACH_DEISTER_PXA270
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_DEISTER_PXA270
-# endif
-# define machine_is_deister_pxa270() (machine_arch_type == MACH_TYPE_DEISTER_PXA270)
-#else
-# define machine_is_deister_pxa270() (0)
-#endif
-
-#ifdef CONFIG_MACH_CME9210JS
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CME9210JS
-# endif
-# define machine_is_cme9210js() (machine_arch_type == MACH_TYPE_CME9210JS)
-#else
-# define machine_is_cme9210js() (0)
-#endif
-
-#ifdef CONFIG_MACH_CC9P9360
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CC9P9360
-# endif
-# define machine_is_cc9p9360() (machine_arch_type == MACH_TYPE_CC9P9360)
-#else
-# define machine_is_cc9p9360() (0)
-#endif
-
-#ifdef CONFIG_MACH_MOCHA
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MOCHA
-# endif
-# define machine_is_mocha() (machine_arch_type == MACH_TYPE_MOCHA)
-#else
-# define machine_is_mocha() (0)
-#endif
-
-#ifdef CONFIG_MACH_WAPD170AG
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_WAPD170AG
-# endif
-# define machine_is_wapd170ag() (machine_arch_type == MACH_TYPE_WAPD170AG)
-#else
-# define machine_is_wapd170ag() (0)
-#endif
-
#ifdef CONFIG_MACH_LINKSTATION_MINI
# ifdef machine_arch_type
# undef machine_arch_type
@@ -25297,138 +4861,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_afeb9260() (0)
#endif
-#ifdef CONFIG_MACH_W90X900
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_W90X900
-# endif
-# define machine_is_w90x900() (machine_arch_type == MACH_TYPE_W90X900)
-#else
-# define machine_is_w90x900() (0)
-#endif
-
-#ifdef CONFIG_MACH_W90X700
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_W90X700
-# endif
-# define machine_is_w90x700() (machine_arch_type == MACH_TYPE_W90X700)
-#else
-# define machine_is_w90x700() (0)
-#endif
-
-#ifdef CONFIG_MACH_KT300IP
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_KT300IP
-# endif
-# define machine_is_kt300ip() (machine_arch_type == MACH_TYPE_KT300IP)
-#else
-# define machine_is_kt300ip() (0)
-#endif
-
-#ifdef CONFIG_MACH_KT300IP_G20
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_KT300IP_G20
-# endif
-# define machine_is_kt300ip_g20() (machine_arch_type == MACH_TYPE_KT300IP_G20)
-#else
-# define machine_is_kt300ip_g20() (0)
-#endif
-
-#ifdef CONFIG_MACH_SRCM
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SRCM
-# endif
-# define machine_is_srcm() (machine_arch_type == MACH_TYPE_SRCM)
-#else
-# define machine_is_srcm() (0)
-#endif
-
-#ifdef CONFIG_MACH_WLNX_9260
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_WLNX_9260
-# endif
-# define machine_is_wlnx_9260() (machine_arch_type == MACH_TYPE_WLNX_9260)
-#else
-# define machine_is_wlnx_9260() (0)
-#endif
-
-#ifdef CONFIG_MACH_OPENMOKO_GTA03
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_OPENMOKO_GTA03
-# endif
-# define machine_is_openmoko_gta03() (machine_arch_type == MACH_TYPE_OPENMOKO_GTA03)
-#else
-# define machine_is_openmoko_gta03() (0)
-#endif
-
-#ifdef CONFIG_MACH_OSPREY2
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_OSPREY2
-# endif
-# define machine_is_osprey2() (machine_arch_type == MACH_TYPE_OSPREY2)
-#else
-# define machine_is_osprey2() (0)
-#endif
-
-#ifdef CONFIG_MACH_KBIO9260
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_KBIO9260
-# endif
-# define machine_is_kbio9260() (machine_arch_type == MACH_TYPE_KBIO9260)
-#else
-# define machine_is_kbio9260() (0)
-#endif
-
-#ifdef CONFIG_MACH_GINZA
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_GINZA
-# endif
-# define machine_is_ginza() (machine_arch_type == MACH_TYPE_GINZA)
-#else
-# define machine_is_ginza() (0)
-#endif
-
-#ifdef CONFIG_MACH_A636N
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_A636N
-# endif
-# define machine_is_a636n() (machine_arch_type == MACH_TYPE_A636N)
-#else
-# define machine_is_a636n() (0)
-#endif
-
#ifdef CONFIG_MACH_IMX27IPCAM
# ifdef machine_arch_type
# undef machine_arch_type
@@ -25441,270 +4873,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_imx27ipcam() (0)
#endif
-#ifdef CONFIG_MACH_NEMOC
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_NEMOC
-# endif
-# define machine_is_nemoc() (machine_arch_type == MACH_TYPE_NEMOC)
-#else
-# define machine_is_nemoc() (0)
-#endif
-
-#ifdef CONFIG_MACH_GENEVA
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_GENEVA
-# endif
-# define machine_is_geneva() (machine_arch_type == MACH_TYPE_GENEVA)
-#else
-# define machine_is_geneva() (0)
-#endif
-
-#ifdef CONFIG_MACH_HTCPHAROS
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_HTCPHAROS
-# endif
-# define machine_is_htcpharos() (machine_arch_type == MACH_TYPE_HTCPHAROS)
-#else
-# define machine_is_htcpharos() (0)
-#endif
-
-#ifdef CONFIG_MACH_NEONC
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_NEONC
-# endif
-# define machine_is_neonc() (machine_arch_type == MACH_TYPE_NEONC)
-#else
-# define machine_is_neonc() (0)
-#endif
-
-#ifdef CONFIG_MACH_NAS7100
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_NAS7100
-# endif
-# define machine_is_nas7100() (machine_arch_type == MACH_TYPE_NAS7100)
-#else
-# define machine_is_nas7100() (0)
-#endif
-
-#ifdef CONFIG_MACH_TEUPHONE
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_TEUPHONE
-# endif
-# define machine_is_teuphone() (machine_arch_type == MACH_TYPE_TEUPHONE)
-#else
-# define machine_is_teuphone() (0)
-#endif
-
-#ifdef CONFIG_MACH_ANNAX_ETH2
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ANNAX_ETH2
-# endif
-# define machine_is_annax_eth2() (machine_arch_type == MACH_TYPE_ANNAX_ETH2)
-#else
-# define machine_is_annax_eth2() (0)
-#endif
-
-#ifdef CONFIG_MACH_CSB733
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CSB733
-# endif
-# define machine_is_csb733() (machine_arch_type == MACH_TYPE_CSB733)
-#else
-# define machine_is_csb733() (0)
-#endif
-
-#ifdef CONFIG_MACH_BK3
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_BK3
-# endif
-# define machine_is_bk3() (machine_arch_type == MACH_TYPE_BK3)
-#else
-# define machine_is_bk3() (0)
-#endif
-
-#ifdef CONFIG_MACH_OMAP_EM32
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_OMAP_EM32
-# endif
-# define machine_is_omap_em32() (machine_arch_type == MACH_TYPE_OMAP_EM32)
-#else
-# define machine_is_omap_em32() (0)
-#endif
-
-#ifdef CONFIG_MACH_ET9261CP
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ET9261CP
-# endif
-# define machine_is_et9261cp() (machine_arch_type == MACH_TYPE_ET9261CP)
-#else
-# define machine_is_et9261cp() (0)
-#endif
-
-#ifdef CONFIG_MACH_JASPERC
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_JASPERC
-# endif
-# define machine_is_jasperc() (machine_arch_type == MACH_TYPE_JASPERC)
-#else
-# define machine_is_jasperc() (0)
-#endif
-
-#ifdef CONFIG_MACH_ISSI_ARM9
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ISSI_ARM9
-# endif
-# define machine_is_issi_arm9() (machine_arch_type == MACH_TYPE_ISSI_ARM9)
-#else
-# define machine_is_issi_arm9() (0)
-#endif
-
-#ifdef CONFIG_MACH_UED
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_UED
-# endif
-# define machine_is_ued() (machine_arch_type == MACH_TYPE_UED)
-#else
-# define machine_is_ued() (0)
-#endif
-
-#ifdef CONFIG_MACH_ESIBLADE
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ESIBLADE
-# endif
-# define machine_is_esiblade() (machine_arch_type == MACH_TYPE_ESIBLADE)
-#else
-# define machine_is_esiblade() (0)
-#endif
-
-#ifdef CONFIG_MACH_EYE02
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_EYE02
-# endif
-# define machine_is_eye02() (machine_arch_type == MACH_TYPE_EYE02)
-#else
-# define machine_is_eye02() (0)
-#endif
-
-#ifdef CONFIG_MACH_IMX27KBD
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_IMX27KBD
-# endif
-# define machine_is_imx27kbd() (machine_arch_type == MACH_TYPE_IMX27KBD)
-#else
-# define machine_is_imx27kbd() (0)
-#endif
-
-#ifdef CONFIG_MACH_SST61VC010_FPGA
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SST61VC010_FPGA
-# endif
-# define machine_is_sst61vc010_fpga() (machine_arch_type == MACH_TYPE_SST61VC010_FPGA)
-#else
-# define machine_is_sst61vc010_fpga() (0)
-#endif
-
-#ifdef CONFIG_MACH_KIXVP435
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_KIXVP435
-# endif
-# define machine_is_kixvp435() (machine_arch_type == MACH_TYPE_KIXVP435)
-#else
-# define machine_is_kixvp435() (0)
-#endif
-
-#ifdef CONFIG_MACH_KIXNP435
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_KIXNP435
-# endif
-# define machine_is_kixnp435() (machine_arch_type == MACH_TYPE_KIXNP435)
-#else
-# define machine_is_kixnp435() (0)
-#endif
-
-#ifdef CONFIG_MACH_AFRICA
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_AFRICA
-# endif
-# define machine_is_africa() (machine_arch_type == MACH_TYPE_AFRICA)
-#else
-# define machine_is_africa() (0)
-#endif
-
-#ifdef CONFIG_MACH_NH233
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_NH233
-# endif
-# define machine_is_nh233() (machine_arch_type == MACH_TYPE_NH233)
-#else
-# define machine_is_nh233() (0)
-#endif
-
#ifdef CONFIG_MACH_RD88F6183AP_GE
# ifdef machine_arch_type
# undef machine_arch_type
@@ -25717,30 +4885,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_rd88f6183ap_ge() (0)
#endif
-#ifdef CONFIG_MACH_BCM4760
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_BCM4760
-# endif
-# define machine_is_bcm4760() (machine_arch_type == MACH_TYPE_BCM4760)
-#else
-# define machine_is_bcm4760() (0)
-#endif
-
-#ifdef CONFIG_MACH_EDDY_V2
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_EDDY_V2
-# endif
-# define machine_is_eddy_v2() (machine_arch_type == MACH_TYPE_EDDY_V2)
-#else
-# define machine_is_eddy_v2() (0)
-#endif
-
#ifdef CONFIG_MACH_REALVIEW_PBA8
# ifdef machine_arch_type
# undef machine_arch_type
@@ -25753,42 +4897,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_realview_pba8() (0)
#endif
-#ifdef CONFIG_MACH_HID_A7
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_HID_A7
-# endif
-# define machine_is_hid_a7() (machine_arch_type == MACH_TYPE_HID_A7)
-#else
-# define machine_is_hid_a7() (0)
-#endif
-
-#ifdef CONFIG_MACH_HERO
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_HERO
-# endif
-# define machine_is_hero() (machine_arch_type == MACH_TYPE_HERO)
-#else
-# define machine_is_hero() (0)
-#endif
-
-#ifdef CONFIG_MACH_OMAP_POSEIDON
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_OMAP_POSEIDON
-# endif
-# define machine_is_omap_poseidon() (machine_arch_type == MACH_TYPE_OMAP_POSEIDON)
-#else
-# define machine_is_omap_poseidon() (0)
-#endif
-
#ifdef CONFIG_MACH_REALVIEW_PBX
# ifdef machine_arch_type
# undef machine_arch_type
@@ -25813,66 +4921,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_micro9s() (0)
#endif
-#ifdef CONFIG_MACH_MAKO
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MAKO
-# endif
-# define machine_is_mako() (machine_arch_type == MACH_TYPE_MAKO)
-#else
-# define machine_is_mako() (0)
-#endif
-
-#ifdef CONFIG_MACH_XDAFLAME
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_XDAFLAME
-# endif
-# define machine_is_xdaflame() (machine_arch_type == MACH_TYPE_XDAFLAME)
-#else
-# define machine_is_xdaflame() (0)
-#endif
-
-#ifdef CONFIG_MACH_PHIDGET_SBC2
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_PHIDGET_SBC2
-# endif
-# define machine_is_phidget_sbc2() (machine_arch_type == MACH_TYPE_PHIDGET_SBC2)
-#else
-# define machine_is_phidget_sbc2() (0)
-#endif
-
-#ifdef CONFIG_MACH_LIMESTONE
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_LIMESTONE
-# endif
-# define machine_is_limestone() (machine_arch_type == MACH_TYPE_LIMESTONE)
-#else
-# define machine_is_limestone() (0)
-#endif
-
-#ifdef CONFIG_MACH_IPROBE_C32
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_IPROBE_C32
-# endif
-# define machine_is_iprobe_c32() (machine_arch_type == MACH_TYPE_IPROBE_C32)
-#else
-# define machine_is_iprobe_c32() (0)
-#endif
-
#ifdef CONFIG_MACH_RUT100
# ifdef machine_arch_type
# undef machine_arch_type
@@ -25885,126 +4933,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_rut100() (0)
#endif
-#ifdef CONFIG_MACH_ASUSP535
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ASUSP535
-# endif
-# define machine_is_asusp535() (machine_arch_type == MACH_TYPE_ASUSP535)
-#else
-# define machine_is_asusp535() (0)
-#endif
-
-#ifdef CONFIG_MACH_HTCRAPHAEL
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_HTCRAPHAEL
-# endif
-# define machine_is_htcraphael() (machine_arch_type == MACH_TYPE_HTCRAPHAEL)
-#else
-# define machine_is_htcraphael() (0)
-#endif
-
-#ifdef CONFIG_MACH_SYGDG1
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SYGDG1
-# endif
-# define machine_is_sygdg1() (machine_arch_type == MACH_TYPE_SYGDG1)
-#else
-# define machine_is_sygdg1() (0)
-#endif
-
-#ifdef CONFIG_MACH_SYGDG2
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SYGDG2
-# endif
-# define machine_is_sygdg2() (machine_arch_type == MACH_TYPE_SYGDG2)
-#else
-# define machine_is_sygdg2() (0)
-#endif
-
-#ifdef CONFIG_MACH_SEOUL
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SEOUL
-# endif
-# define machine_is_seoul() (machine_arch_type == MACH_TYPE_SEOUL)
-#else
-# define machine_is_seoul() (0)
-#endif
-
-#ifdef CONFIG_MACH_SALERNO
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SALERNO
-# endif
-# define machine_is_salerno() (machine_arch_type == MACH_TYPE_SALERNO)
-#else
-# define machine_is_salerno() (0)
-#endif
-
-#ifdef CONFIG_MACH_UCN_S3C64XX
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_UCN_S3C64XX
-# endif
-# define machine_is_ucn_s3c64xx() (machine_arch_type == MACH_TYPE_UCN_S3C64XX)
-#else
-# define machine_is_ucn_s3c64xx() (0)
-#endif
-
-#ifdef CONFIG_MACH_MSM7201A
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MSM7201A
-# endif
-# define machine_is_msm7201a() (machine_arch_type == MACH_TYPE_MSM7201A)
-#else
-# define machine_is_msm7201a() (0)
-#endif
-
-#ifdef CONFIG_MACH_LPR1
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_LPR1
-# endif
-# define machine_is_lpr1() (machine_arch_type == MACH_TYPE_LPR1)
-#else
-# define machine_is_lpr1() (0)
-#endif
-
-#ifdef CONFIG_MACH_ARMADILLO500FX
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ARMADILLO500FX
-# endif
-# define machine_is_armadillo500fx() (machine_arch_type == MACH_TYPE_ARMADILLO500FX)
-#else
-# define machine_is_armadillo500fx() (0)
-#endif
-
#ifdef CONFIG_MACH_G3EVM
# ifdef machine_arch_type
# undef machine_arch_type
@@ -26017,18 +4945,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_g3evm() (0)
#endif
-#ifdef CONFIG_MACH_Z3_DM355
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_Z3_DM355
-# endif
-# define machine_is_z3_dm355() (machine_arch_type == MACH_TYPE_Z3_DM355)
-#else
-# define machine_is_z3_dm355() (0)
-#endif
-
#ifdef CONFIG_MACH_W90P910EVB
# ifdef machine_arch_type
# undef machine_arch_type
@@ -26041,18 +4957,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_w90p910evb() (0)
#endif
-#ifdef CONFIG_MACH_W90P920EVB
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_W90P920EVB
-# endif
-# define machine_is_w90p920evb() (machine_arch_type == MACH_TYPE_W90P920EVB)
-#else
-# define machine_is_w90p920evb() (0)
-#endif
-
#ifdef CONFIG_MACH_W90P950EVB
# ifdef machine_arch_type
# undef machine_arch_type
@@ -26077,90 +4981,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_w90n960evb() (0)
#endif
-#ifdef CONFIG_MACH_CAMHD
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CAMHD
-# endif
-# define machine_is_camhd() (machine_arch_type == MACH_TYPE_CAMHD)
-#else
-# define machine_is_camhd() (0)
-#endif
-
-#ifdef CONFIG_MACH_MVC100
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MVC100
-# endif
-# define machine_is_mvc100() (machine_arch_type == MACH_TYPE_MVC100)
-#else
-# define machine_is_mvc100() (0)
-#endif
-
-#ifdef CONFIG_MACH_ELECTRUM_200
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ELECTRUM_200
-# endif
-# define machine_is_electrum_200() (machine_arch_type == MACH_TYPE_ELECTRUM_200)
-#else
-# define machine_is_electrum_200() (0)
-#endif
-
-#ifdef CONFIG_MACH_HTCJADE
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_HTCJADE
-# endif
-# define machine_is_htcjade() (machine_arch_type == MACH_TYPE_HTCJADE)
-#else
-# define machine_is_htcjade() (0)
-#endif
-
-#ifdef CONFIG_MACH_MEMPHIS
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MEMPHIS
-# endif
-# define machine_is_memphis() (machine_arch_type == MACH_TYPE_MEMPHIS)
-#else
-# define machine_is_memphis() (0)
-#endif
-
-#ifdef CONFIG_MACH_IMX27SBC
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_IMX27SBC
-# endif
-# define machine_is_imx27sbc() (machine_arch_type == MACH_TYPE_IMX27SBC)
-#else
-# define machine_is_imx27sbc() (0)
-#endif
-
-#ifdef CONFIG_MACH_LEXTAR
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_LEXTAR
-# endif
-# define machine_is_lextar() (machine_arch_type == MACH_TYPE_LEXTAR)
-#else
-# define machine_is_lextar() (0)
-#endif
-
#ifdef CONFIG_MACH_MV88F6281GTW_GE
# ifdef machine_arch_type
# undef machine_arch_type
@@ -26185,66 +5005,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_ncp() (0)
#endif
-#ifdef CONFIG_MACH_Z32AN
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_Z32AN
-# endif
-# define machine_is_z32an_series() (machine_arch_type == MACH_TYPE_Z32AN)
-#else
-# define machine_is_z32an_series() (0)
-#endif
-
-#ifdef CONFIG_MACH_TMQ_CAPD
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_TMQ_CAPD
-# endif
-# define machine_is_tmq_capd() (machine_arch_type == MACH_TYPE_TMQ_CAPD)
-#else
-# define machine_is_tmq_capd() (0)
-#endif
-
-#ifdef CONFIG_MACH_OMAP3_WL
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_OMAP3_WL
-# endif
-# define machine_is_omap3_wl() (machine_arch_type == MACH_TYPE_OMAP3_WL)
-#else
-# define machine_is_omap3_wl() (0)
-#endif
-
-#ifdef CONFIG_MACH_CHUMBY
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CHUMBY
-# endif
-# define machine_is_chumby() (machine_arch_type == MACH_TYPE_CHUMBY)
-#else
-# define machine_is_chumby() (0)
-#endif
-
-#ifdef CONFIG_MACH_ATSARM9
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ATSARM9
-# endif
-# define machine_is_atsarm9() (machine_arch_type == MACH_TYPE_ATSARM9)
-#else
-# define machine_is_atsarm9() (0)
-#endif
-
#ifdef CONFIG_MACH_DAVINCI_DM365_EVM
# ifdef machine_arch_type
# undef machine_arch_type
@@ -26257,54 +5017,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_davinci_dm365_evm() (0)
#endif
-#ifdef CONFIG_MACH_BAHAMAS
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_BAHAMAS
-# endif
-# define machine_is_bahamas() (machine_arch_type == MACH_TYPE_BAHAMAS)
-#else
-# define machine_is_bahamas() (0)
-#endif
-
-#ifdef CONFIG_MACH_DAS
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_DAS
-# endif
-# define machine_is_das() (machine_arch_type == MACH_TYPE_DAS)
-#else
-# define machine_is_das() (0)
-#endif
-
-#ifdef CONFIG_MACH_MINIDAS
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MINIDAS
-# endif
-# define machine_is_minidas() (machine_arch_type == MACH_TYPE_MINIDAS)
-#else
-# define machine_is_minidas() (0)
-#endif
-
-#ifdef CONFIG_MACH_VK1000
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_VK1000
-# endif
-# define machine_is_vk1000() (machine_arch_type == MACH_TYPE_VK1000)
-#else
-# define machine_is_vk1000() (0)
-#endif
-
#ifdef CONFIG_MACH_CENTRO
# ifdef machine_arch_type
# undef machine_arch_type
@@ -26317,126 +5029,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_centro() (0)
#endif
-#ifdef CONFIG_MACH_CTERA_2BAY
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CTERA_2BAY
-# endif
-# define machine_is_ctera_2bay() (machine_arch_type == MACH_TYPE_CTERA_2BAY)
-#else
-# define machine_is_ctera_2bay() (0)
-#endif
-
-#ifdef CONFIG_MACH_EDGECONNECT
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_EDGECONNECT
-# endif
-# define machine_is_edgeconnect() (machine_arch_type == MACH_TYPE_EDGECONNECT)
-#else
-# define machine_is_edgeconnect() (0)
-#endif
-
-#ifdef CONFIG_MACH_ND27000
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ND27000
-# endif
-# define machine_is_nd27000() (machine_arch_type == MACH_TYPE_ND27000)
-#else
-# define machine_is_nd27000() (0)
-#endif
-
-#ifdef CONFIG_MACH_GEMALTO_COBRA
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_GEMALTO_COBRA
-# endif
-# define machine_is_cobra() (machine_arch_type == MACH_TYPE_GEMALTO_COBRA)
-#else
-# define machine_is_cobra() (0)
-#endif
-
-#ifdef CONFIG_MACH_INGELABS_COMET
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_INGELABS_COMET
-# endif
-# define machine_is_ingelabs_comet() (machine_arch_type == MACH_TYPE_INGELABS_COMET)
-#else
-# define machine_is_ingelabs_comet() (0)
-#endif
-
-#ifdef CONFIG_MACH_POLLUX_WIZ
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_POLLUX_WIZ
-# endif
-# define machine_is_pollux_wiz() (machine_arch_type == MACH_TYPE_POLLUX_WIZ)
-#else
-# define machine_is_pollux_wiz() (0)
-#endif
-
-#ifdef CONFIG_MACH_BLACKSTONE
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_BLACKSTONE
-# endif
-# define machine_is_blackstone() (machine_arch_type == MACH_TYPE_BLACKSTONE)
-#else
-# define machine_is_blackstone() (0)
-#endif
-
-#ifdef CONFIG_MACH_TOPAZ
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_TOPAZ
-# endif
-# define machine_is_topaz() (machine_arch_type == MACH_TYPE_TOPAZ)
-#else
-# define machine_is_topaz() (0)
-#endif
-
-#ifdef CONFIG_MACH_AIXLE
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_AIXLE
-# endif
-# define machine_is_aixle() (machine_arch_type == MACH_TYPE_AIXLE)
-#else
-# define machine_is_aixle() (0)
-#endif
-
-#ifdef CONFIG_MACH_MW998
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MW998
-# endif
-# define machine_is_mw998() (machine_arch_type == MACH_TYPE_MW998)
-#else
-# define machine_is_mw998() (0)
-#endif
-
#ifdef CONFIG_MACH_NOKIA_RX51
# ifdef machine_arch_type
# undef machine_arch_type
@@ -26449,138 +5041,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_nokia_rx51() (0)
#endif
-#ifdef CONFIG_MACH_VSC5605EV
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_VSC5605EV
-# endif
-# define machine_is_vsc5605ev() (machine_arch_type == MACH_TYPE_VSC5605EV)
-#else
-# define machine_is_vsc5605ev() (0)
-#endif
-
-#ifdef CONFIG_MACH_NT98700DK
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_NT98700DK
-# endif
-# define machine_is_nt98700dk() (machine_arch_type == MACH_TYPE_NT98700DK)
-#else
-# define machine_is_nt98700dk() (0)
-#endif
-
-#ifdef CONFIG_MACH_ICONTACT
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ICONTACT
-# endif
-# define machine_is_icontact() (machine_arch_type == MACH_TYPE_ICONTACT)
-#else
-# define machine_is_icontact() (0)
-#endif
-
-#ifdef CONFIG_MACH_SWARCO_FRCPU
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SWARCO_FRCPU
-# endif
-# define machine_is_swarco_frcpu() (machine_arch_type == MACH_TYPE_SWARCO_FRCPU)
-#else
-# define machine_is_swarco_frcpu() (0)
-#endif
-
-#ifdef CONFIG_MACH_SWARCO_SCPU
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SWARCO_SCPU
-# endif
-# define machine_is_swarco_scpu() (machine_arch_type == MACH_TYPE_SWARCO_SCPU)
-#else
-# define machine_is_swarco_scpu() (0)
-#endif
-
-#ifdef CONFIG_MACH_BBOX_P16
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_BBOX_P16
-# endif
-# define machine_is_bbox_p16() (machine_arch_type == MACH_TYPE_BBOX_P16)
-#else
-# define machine_is_bbox_p16() (0)
-#endif
-
-#ifdef CONFIG_MACH_BSTD
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_BSTD
-# endif
-# define machine_is_bstd() (machine_arch_type == MACH_TYPE_BSTD)
-#else
-# define machine_is_bstd() (0)
-#endif
-
-#ifdef CONFIG_MACH_SBC2440II
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SBC2440II
-# endif
-# define machine_is_sbc2440ii() (machine_arch_type == MACH_TYPE_SBC2440II)
-#else
-# define machine_is_sbc2440ii() (0)
-#endif
-
-#ifdef CONFIG_MACH_PCM034
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_PCM034
-# endif
-# define machine_is_pcm034() (machine_arch_type == MACH_TYPE_PCM034)
-#else
-# define machine_is_pcm034() (0)
-#endif
-
-#ifdef CONFIG_MACH_NESO
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_NESO
-# endif
-# define machine_is_neso() (machine_arch_type == MACH_TYPE_NESO)
-#else
-# define machine_is_neso() (0)
-#endif
-
-#ifdef CONFIG_MACH_WLNX_9G20
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_WLNX_9G20
-# endif
-# define machine_is_wlnx_9g20() (machine_arch_type == MACH_TYPE_WLNX_9G20)
-#else
-# define machine_is_wlnx_9g20() (0)
-#endif
-
#ifdef CONFIG_MACH_OMAP_ZOOM2
# ifdef machine_arch_type
# undef machine_arch_type
@@ -26593,66 +5053,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_omap_zoom2() (0)
#endif
-#ifdef CONFIG_MACH_TOTEMNOVA
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_TOTEMNOVA
-# endif
-# define machine_is_totemnova() (machine_arch_type == MACH_TYPE_TOTEMNOVA)
-#else
-# define machine_is_totemnova() (0)
-#endif
-
-#ifdef CONFIG_MACH_C5000
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_C5000
-# endif
-# define machine_is_c5000() (machine_arch_type == MACH_TYPE_C5000)
-#else
-# define machine_is_c5000() (0)
-#endif
-
-#ifdef CONFIG_MACH_UNIPO_AT91SAM9263
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_UNIPO_AT91SAM9263
-# endif
-# define machine_is_unipo_at91sam9263() (machine_arch_type == MACH_TYPE_UNIPO_AT91SAM9263)
-#else
-# define machine_is_unipo_at91sam9263() (0)
-#endif
-
-#ifdef CONFIG_MACH_ETHERNUT5
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ETHERNUT5
-# endif
-# define machine_is_ethernut5() (machine_arch_type == MACH_TYPE_ETHERNUT5)
-#else
-# define machine_is_ethernut5() (0)
-#endif
-
-#ifdef CONFIG_MACH_ARM11
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ARM11
-# endif
-# define machine_is_arm11() (machine_arch_type == MACH_TYPE_ARM11)
-#else
-# define machine_is_arm11() (0)
-#endif
-
#ifdef CONFIG_MACH_CPUAT9260
# ifdef machine_arch_type
# undef machine_arch_type
@@ -26665,102 +5065,18 @@ extern unsigned int __machine_arch_type;
# define machine_is_cpuat9260() (0)
#endif
-#ifdef CONFIG_MACH_CPUPXA255
+#ifdef CONFIG_MACH_EUKREA_CPUIMX27
# ifdef machine_arch_type
# undef machine_arch_type
# define machine_arch_type __machine_arch_type
# else
-# define machine_arch_type MACH_TYPE_CPUPXA255
+# define machine_arch_type MACH_TYPE_EUKREA_CPUIMX27
# endif
-# define machine_is_cpupxa255() (machine_arch_type == MACH_TYPE_CPUPXA255)
-#else
-# define machine_is_cpupxa255() (0)
-#endif
-
-#ifdef CONFIG_MACH_CPUIMX27
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CPUIMX27
-# endif
-# define machine_is_eukrea_cpuimx27() (machine_arch_type == MACH_TYPE_CPUIMX27)
+# define machine_is_eukrea_cpuimx27() (machine_arch_type == MACH_TYPE_EUKREA_CPUIMX27)
#else
# define machine_is_eukrea_cpuimx27() (0)
#endif
-#ifdef CONFIG_MACH_CHEFLUX
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CHEFLUX
-# endif
-# define machine_is_cheflux() (machine_arch_type == MACH_TYPE_CHEFLUX)
-#else
-# define machine_is_cheflux() (0)
-#endif
-
-#ifdef CONFIG_MACH_EB_CPUX9K2
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_EB_CPUX9K2
-# endif
-# define machine_is_eb_cpux9k2() (machine_arch_type == MACH_TYPE_EB_CPUX9K2)
-#else
-# define machine_is_eb_cpux9k2() (0)
-#endif
-
-#ifdef CONFIG_MACH_OPCOTEC
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_OPCOTEC
-# endif
-# define machine_is_opcotec() (machine_arch_type == MACH_TYPE_OPCOTEC)
-#else
-# define machine_is_opcotec() (0)
-#endif
-
-#ifdef CONFIG_MACH_YT
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_YT
-# endif
-# define machine_is_yt() (machine_arch_type == MACH_TYPE_YT)
-#else
-# define machine_is_yt() (0)
-#endif
-
-#ifdef CONFIG_MACH_MOTOQ
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MOTOQ
-# endif
-# define machine_is_motoq() (machine_arch_type == MACH_TYPE_MOTOQ)
-#else
-# define machine_is_motoq() (0)
-#endif
-
-#ifdef CONFIG_MACH_BSB1
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_BSB1
-# endif
-# define machine_is_bsb1() (machine_arch_type == MACH_TYPE_BSB1)
-#else
-# define machine_is_bsb1() (0)
-#endif
-
#ifdef CONFIG_MACH_ACS5K
# ifdef machine_arch_type
# undef machine_arch_type
@@ -26773,54 +5089,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_acs5k() (0)
#endif
-#ifdef CONFIG_MACH_MILAN
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MILAN
-# endif
-# define machine_is_milan() (machine_arch_type == MACH_TYPE_MILAN)
-#else
-# define machine_is_milan() (0)
-#endif
-
-#ifdef CONFIG_MACH_QUARTZV2
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_QUARTZV2
-# endif
-# define machine_is_quartzv2() (machine_arch_type == MACH_TYPE_QUARTZV2)
-#else
-# define machine_is_quartzv2() (0)
-#endif
-
-#ifdef CONFIG_MACH_RSVP
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_RSVP
-# endif
-# define machine_is_rsvp() (machine_arch_type == MACH_TYPE_RSVP)
-#else
-# define machine_is_rsvp() (0)
-#endif
-
-#ifdef CONFIG_MACH_RMP200
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_RMP200
-# endif
-# define machine_is_rmp200() (machine_arch_type == MACH_TYPE_RMP200)
-#else
-# define machine_is_rmp200() (0)
-#endif
-
#ifdef CONFIG_MACH_SNAPPER_9260
# ifdef machine_arch_type
# undef machine_arch_type
@@ -26845,66 +5113,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_dsm320() (0)
#endif
-#ifdef CONFIG_MACH_ADSGCM
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ADSGCM
-# endif
-# define machine_is_adsgcm() (machine_arch_type == MACH_TYPE_ADSGCM)
-#else
-# define machine_is_adsgcm() (0)
-#endif
-
-#ifdef CONFIG_MACH_ASE2_400
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ASE2_400
-# endif
-# define machine_is_ase2_400() (machine_arch_type == MACH_TYPE_ASE2_400)
-#else
-# define machine_is_ase2_400() (0)
-#endif
-
-#ifdef CONFIG_MACH_PIZZA
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_PIZZA
-# endif
-# define machine_is_pizza() (machine_arch_type == MACH_TYPE_PIZZA)
-#else
-# define machine_is_pizza() (0)
-#endif
-
-#ifdef CONFIG_MACH_SPOT_NGPL
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SPOT_NGPL
-# endif
-# define machine_is_spot_ngpl() (machine_arch_type == MACH_TYPE_SPOT_NGPL)
-#else
-# define machine_is_spot_ngpl() (0)
-#endif
-
-#ifdef CONFIG_MACH_ARMATA
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ARMATA
-# endif
-# define machine_is_armata() (machine_arch_type == MACH_TYPE_ARMATA)
-#else
-# define machine_is_armata() (0)
-#endif
-
#ifdef CONFIG_MACH_EXEDA
# ifdef machine_arch_type
# undef machine_arch_type
@@ -26917,54 +5125,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_exeda() (0)
#endif
-#ifdef CONFIG_MACH_MX31SF005
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MX31SF005
-# endif
-# define machine_is_mx31sf005() (machine_arch_type == MACH_TYPE_MX31SF005)
-#else
-# define machine_is_mx31sf005() (0)
-#endif
-
-#ifdef CONFIG_MACH_F5D8231_4_V2
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_F5D8231_4_V2
-# endif
-# define machine_is_f5d8231_4_v2() (machine_arch_type == MACH_TYPE_F5D8231_4_V2)
-#else
-# define machine_is_f5d8231_4_v2() (0)
-#endif
-
-#ifdef CONFIG_MACH_Q2440
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_Q2440
-# endif
-# define machine_is_q2440() (machine_arch_type == MACH_TYPE_Q2440)
-#else
-# define machine_is_q2440() (0)
-#endif
-
-#ifdef CONFIG_MACH_QQ2440
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_QQ2440
-# endif
-# define machine_is_qq2440() (machine_arch_type == MACH_TYPE_QQ2440)
-#else
-# define machine_is_qq2440() (0)
-#endif
-
#ifdef CONFIG_MACH_MINI2440
# ifdef machine_arch_type
# undef machine_arch_type
@@ -26989,54 +5149,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_colibri300() (0)
#endif
-#ifdef CONFIG_MACH_JADES
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_JADES
-# endif
-# define machine_is_jades() (machine_arch_type == MACH_TYPE_JADES)
-#else
-# define machine_is_jades() (0)
-#endif
-
-#ifdef CONFIG_MACH_SPARK
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SPARK
-# endif
-# define machine_is_spark() (machine_arch_type == MACH_TYPE_SPARK)
-#else
-# define machine_is_spark() (0)
-#endif
-
-#ifdef CONFIG_MACH_BENZINA
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_BENZINA
-# endif
-# define machine_is_benzina() (machine_arch_type == MACH_TYPE_BENZINA)
-#else
-# define machine_is_benzina() (0)
-#endif
-
-#ifdef CONFIG_MACH_BLAZE
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_BLAZE
-# endif
-# define machine_is_blaze() (machine_arch_type == MACH_TYPE_BLAZE)
-#else
-# define machine_is_blaze() (0)
-#endif
-
#ifdef CONFIG_MACH_LINKSTATION_LS_HGL
# ifdef machine_arch_type
# undef machine_arch_type
@@ -27049,306 +5161,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_linkstation_ls_hgl() (0)
#endif
-#ifdef CONFIG_MACH_HTCKOVSKY
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_HTCKOVSKY
-# endif
-# define machine_is_htckovsky() (machine_arch_type == MACH_TYPE_HTCKOVSKY)
-#else
-# define machine_is_htckovsky() (0)
-#endif
-
-#ifdef CONFIG_MACH_SONY_PRS505
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SONY_PRS505
-# endif
-# define machine_is_sony_prs505() (machine_arch_type == MACH_TYPE_SONY_PRS505)
-#else
-# define machine_is_sony_prs505() (0)
-#endif
-
-#ifdef CONFIG_MACH_HANLIN_V3
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_HANLIN_V3
-# endif
-# define machine_is_hanlin_v3() (machine_arch_type == MACH_TYPE_HANLIN_V3)
-#else
-# define machine_is_hanlin_v3() (0)
-#endif
-
-#ifdef CONFIG_MACH_SAPPHIRA
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SAPPHIRA
-# endif
-# define machine_is_sapphira() (machine_arch_type == MACH_TYPE_SAPPHIRA)
-#else
-# define machine_is_sapphira() (0)
-#endif
-
-#ifdef CONFIG_MACH_DACK_SDA_01
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_DACK_SDA_01
-# endif
-# define machine_is_dack_sda_01() (machine_arch_type == MACH_TYPE_DACK_SDA_01)
-#else
-# define machine_is_dack_sda_01() (0)
-#endif
-
-#ifdef CONFIG_MACH_ARMBOX
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ARMBOX
-# endif
-# define machine_is_armbox() (machine_arch_type == MACH_TYPE_ARMBOX)
-#else
-# define machine_is_armbox() (0)
-#endif
-
-#ifdef CONFIG_MACH_HARRIS_RVP
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_HARRIS_RVP
-# endif
-# define machine_is_harris_rvp() (machine_arch_type == MACH_TYPE_HARRIS_RVP)
-#else
-# define machine_is_harris_rvp() (0)
-#endif
-
-#ifdef CONFIG_MACH_RIBALDO
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_RIBALDO
-# endif
-# define machine_is_ribaldo() (machine_arch_type == MACH_TYPE_RIBALDO)
-#else
-# define machine_is_ribaldo() (0)
-#endif
-
-#ifdef CONFIG_MACH_AGORA
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_AGORA
-# endif
-# define machine_is_agora() (machine_arch_type == MACH_TYPE_AGORA)
-#else
-# define machine_is_agora() (0)
-#endif
-
-#ifdef CONFIG_MACH_OMAP3_MINI
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_OMAP3_MINI
-# endif
-# define machine_is_omap3_mini() (machine_arch_type == MACH_TYPE_OMAP3_MINI)
-#else
-# define machine_is_omap3_mini() (0)
-#endif
-
-#ifdef CONFIG_MACH_A9SAM6432_B
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_A9SAM6432_B
-# endif
-# define machine_is_a9sam6432_b() (machine_arch_type == MACH_TYPE_A9SAM6432_B)
-#else
-# define machine_is_a9sam6432_b() (0)
-#endif
-
-#ifdef CONFIG_MACH_USG2410
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_USG2410
-# endif
-# define machine_is_usg2410() (machine_arch_type == MACH_TYPE_USG2410)
-#else
-# define machine_is_usg2410() (0)
-#endif
-
-#ifdef CONFIG_MACH_PC72052_I10_REVB
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_PC72052_I10_REVB
-# endif
-# define machine_is_pc72052_i10_revb() (machine_arch_type == MACH_TYPE_PC72052_I10_REVB)
-#else
-# define machine_is_pc72052_i10_revb() (0)
-#endif
-
-#ifdef CONFIG_MACH_MX35_EXM32
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MX35_EXM32
-# endif
-# define machine_is_mx35_exm32() (machine_arch_type == MACH_TYPE_MX35_EXM32)
-#else
-# define machine_is_mx35_exm32() (0)
-#endif
-
-#ifdef CONFIG_MACH_TOPAS910
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_TOPAS910
-# endif
-# define machine_is_topas910() (machine_arch_type == MACH_TYPE_TOPAS910)
-#else
-# define machine_is_topas910() (0)
-#endif
-
-#ifdef CONFIG_MACH_HYENA
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_HYENA
-# endif
-# define machine_is_hyena() (machine_arch_type == MACH_TYPE_HYENA)
-#else
-# define machine_is_hyena() (0)
-#endif
-
-#ifdef CONFIG_MACH_POSPAX
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_POSPAX
-# endif
-# define machine_is_pospax() (machine_arch_type == MACH_TYPE_POSPAX)
-#else
-# define machine_is_pospax() (0)
-#endif
-
-#ifdef CONFIG_MACH_HDL_GX
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_HDL_GX
-# endif
-# define machine_is_hdl_gx() (machine_arch_type == MACH_TYPE_HDL_GX)
-#else
-# define machine_is_hdl_gx() (0)
-#endif
-
-#ifdef CONFIG_MACH_CTERA_4BAY
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CTERA_4BAY
-# endif
-# define machine_is_ctera_4bay() (machine_arch_type == MACH_TYPE_CTERA_4BAY)
-#else
-# define machine_is_ctera_4bay() (0)
-#endif
-
-#ifdef CONFIG_MACH_CTERA_PLUG_C
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CTERA_PLUG_C
-# endif
-# define machine_is_ctera_plug_c() (machine_arch_type == MACH_TYPE_CTERA_PLUG_C)
-#else
-# define machine_is_ctera_plug_c() (0)
-#endif
-
-#ifdef CONFIG_MACH_CRWEA_PLUG_I
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CRWEA_PLUG_I
-# endif
-# define machine_is_crwea_plug_i() (machine_arch_type == MACH_TYPE_CRWEA_PLUG_I)
-#else
-# define machine_is_crwea_plug_i() (0)
-#endif
-
-#ifdef CONFIG_MACH_EGAUGE2
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_EGAUGE2
-# endif
-# define machine_is_egauge2() (machine_arch_type == MACH_TYPE_EGAUGE2)
-#else
-# define machine_is_egauge2() (0)
-#endif
-
-#ifdef CONFIG_MACH_DIDJ
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_DIDJ
-# endif
-# define machine_is_didj() (machine_arch_type == MACH_TYPE_DIDJ)
-#else
-# define machine_is_didj() (0)
-#endif
-
-#ifdef CONFIG_MACH_MEISTER
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MEISTER
-# endif
-# define machine_is_m_s3c2443() (machine_arch_type == MACH_TYPE_MEISTER)
-#else
-# define machine_is_m_s3c2443() (0)
-#endif
-
-#ifdef CONFIG_MACH_HTCBLACKSTONE
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_HTCBLACKSTONE
-# endif
-# define machine_is_htcblackstone() (machine_arch_type == MACH_TYPE_HTCBLACKSTONE)
-#else
-# define machine_is_htcblackstone() (0)
-#endif
-
#ifdef CONFIG_MACH_CPUAT9G20
# ifdef machine_arch_type
# undef machine_arch_type
@@ -27373,66 +5185,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_smdk6440() (0)
#endif
-#ifdef CONFIG_MACH_OMAP_35XX_MVP
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_OMAP_35XX_MVP
-# endif
-# define machine_is_omap_35xx_mvp() (machine_arch_type == MACH_TYPE_OMAP_35XX_MVP)
-#else
-# define machine_is_omap_35xx_mvp() (0)
-#endif
-
-#ifdef CONFIG_MACH_CTERA_PLUG_I
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CTERA_PLUG_I
-# endif
-# define machine_is_ctera_plug_i() (machine_arch_type == MACH_TYPE_CTERA_PLUG_I)
-#else
-# define machine_is_ctera_plug_i() (0)
-#endif
-
-#ifdef CONFIG_MACH_PVG610
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_PVG610
-# endif
-# define machine_is_pvg610_100() (machine_arch_type == MACH_TYPE_PVG610)
-#else
-# define machine_is_pvg610_100() (0)
-#endif
-
-#ifdef CONFIG_MACH_HPRW6815
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_HPRW6815
-# endif
-# define machine_is_hprw6815() (machine_arch_type == MACH_TYPE_HPRW6815)
-#else
-# define machine_is_hprw6815() (0)
-#endif
-
-#ifdef CONFIG_MACH_OMAP3_OSWALD
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_OMAP3_OSWALD
-# endif
-# define machine_is_omap3_oswald() (machine_arch_type == MACH_TYPE_OMAP3_OSWALD)
-#else
-# define machine_is_omap3_oswald() (0)
-#endif
-
#ifdef CONFIG_MACH_NAS4220B
# ifdef machine_arch_type
# undef machine_arch_type
@@ -27445,42 +5197,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_nas4220b() (0)
#endif
-#ifdef CONFIG_MACH_HTCRAPHAEL_CDMA
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_HTCRAPHAEL_CDMA
-# endif
-# define machine_is_htcraphael_cdma() (machine_arch_type == MACH_TYPE_HTCRAPHAEL_CDMA)
-#else
-# define machine_is_htcraphael_cdma() (0)
-#endif
-
-#ifdef CONFIG_MACH_HTCDIAMOND_CDMA
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_HTCDIAMOND_CDMA
-# endif
-# define machine_is_htcdiamond_cdma() (machine_arch_type == MACH_TYPE_HTCDIAMOND_CDMA)
-#else
-# define machine_is_htcdiamond_cdma() (0)
-#endif
-
-#ifdef CONFIG_MACH_SCALER
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SCALER
-# endif
-# define machine_is_scaler() (machine_arch_type == MACH_TYPE_SCALER)
-#else
-# define machine_is_scaler() (0)
-#endif
-
#ifdef CONFIG_MACH_ZYLONITE2
# ifdef machine_arch_type
# undef machine_arch_type
@@ -27505,18 +5221,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_aspenite() (0)
#endif
-#ifdef CONFIG_MACH_TETON
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_TETON
-# endif
-# define machine_is_teton() (machine_arch_type == MACH_TYPE_TETON)
-#else
-# define machine_is_teton() (0)
-#endif
-
#ifdef CONFIG_MACH_TTC_DKB
# ifdef machine_arch_type
# undef machine_arch_type
@@ -27529,318 +5233,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_ttc_dkb() (0)
#endif
-#ifdef CONFIG_MACH_BISHOP2
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_BISHOP2
-# endif
-# define machine_is_bishop2() (machine_arch_type == MACH_TYPE_BISHOP2)
-#else
-# define machine_is_bishop2() (0)
-#endif
-
-#ifdef CONFIG_MACH_IPPV5
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_IPPV5
-# endif
-# define machine_is_ippv5() (machine_arch_type == MACH_TYPE_IPPV5)
-#else
-# define machine_is_ippv5() (0)
-#endif
-
-#ifdef CONFIG_MACH_FARM926
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_FARM926
-# endif
-# define machine_is_farm926() (machine_arch_type == MACH_TYPE_FARM926)
-#else
-# define machine_is_farm926() (0)
-#endif
-
-#ifdef CONFIG_MACH_MMCCPU
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MMCCPU
-# endif
-# define machine_is_mmccpu() (machine_arch_type == MACH_TYPE_MMCCPU)
-#else
-# define machine_is_mmccpu() (0)
-#endif
-
-#ifdef CONFIG_MACH_SGMSFL
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SGMSFL
-# endif
-# define machine_is_sgmsfl() (machine_arch_type == MACH_TYPE_SGMSFL)
-#else
-# define machine_is_sgmsfl() (0)
-#endif
-
-#ifdef CONFIG_MACH_TT8000
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_TT8000
-# endif
-# define machine_is_tt8000() (machine_arch_type == MACH_TYPE_TT8000)
-#else
-# define machine_is_tt8000() (0)
-#endif
-
-#ifdef CONFIG_MACH_ZRN4300LP
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ZRN4300LP
-# endif
-# define machine_is_zrn4300lp() (machine_arch_type == MACH_TYPE_ZRN4300LP)
-#else
-# define machine_is_zrn4300lp() (0)
-#endif
-
-#ifdef CONFIG_MACH_MPTC
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MPTC
-# endif
-# define machine_is_mptc() (machine_arch_type == MACH_TYPE_MPTC)
-#else
-# define machine_is_mptc() (0)
-#endif
-
-#ifdef CONFIG_MACH_H6051
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_H6051
-# endif
-# define machine_is_h6051() (machine_arch_type == MACH_TYPE_H6051)
-#else
-# define machine_is_h6051() (0)
-#endif
-
-#ifdef CONFIG_MACH_PVG610_101
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_PVG610_101
-# endif
-# define machine_is_pvg610_101() (machine_arch_type == MACH_TYPE_PVG610_101)
-#else
-# define machine_is_pvg610_101() (0)
-#endif
-
-#ifdef CONFIG_MACH_STAMP9261_PC_EVB
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_STAMP9261_PC_EVB
-# endif
-# define machine_is_stamp9261_pc_evb() (machine_arch_type == MACH_TYPE_STAMP9261_PC_EVB)
-#else
-# define machine_is_stamp9261_pc_evb() (0)
-#endif
-
-#ifdef CONFIG_MACH_PELCO_ODYSSEUS
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_PELCO_ODYSSEUS
-# endif
-# define machine_is_pelco_odysseus() (machine_arch_type == MACH_TYPE_PELCO_ODYSSEUS)
-#else
-# define machine_is_pelco_odysseus() (0)
-#endif
-
-#ifdef CONFIG_MACH_TNY_A9260
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_TNY_A9260
-# endif
-# define machine_is_tny_a9260() (machine_arch_type == MACH_TYPE_TNY_A9260)
-#else
-# define machine_is_tny_a9260() (0)
-#endif
-
-#ifdef CONFIG_MACH_TNY_A9G20
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_TNY_A9G20
-# endif
-# define machine_is_tny_a9g20() (machine_arch_type == MACH_TYPE_TNY_A9G20)
-#else
-# define machine_is_tny_a9g20() (0)
-#endif
-
-#ifdef CONFIG_MACH_AESOP_MP2530F
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_AESOP_MP2530F
-# endif
-# define machine_is_aesop_mp2530f() (machine_arch_type == MACH_TYPE_AESOP_MP2530F)
-#else
-# define machine_is_aesop_mp2530f() (0)
-#endif
-
-#ifdef CONFIG_MACH_DX900
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_DX900
-# endif
-# define machine_is_dx900() (machine_arch_type == MACH_TYPE_DX900)
-#else
-# define machine_is_dx900() (0)
-#endif
-
-#ifdef CONFIG_MACH_CPODC2
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CPODC2
-# endif
-# define machine_is_cpodc2() (machine_arch_type == MACH_TYPE_CPODC2)
-#else
-# define machine_is_cpodc2() (0)
-#endif
-
-#ifdef CONFIG_MACH_TILT_8925
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_TILT_8925
-# endif
-# define machine_is_tilt_8925() (machine_arch_type == MACH_TYPE_TILT_8925)
-#else
-# define machine_is_tilt_8925() (0)
-#endif
-
-#ifdef CONFIG_MACH_DAVINCI_DM357_EVM
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_DAVINCI_DM357_EVM
-# endif
-# define machine_is_davinci_dm357_evm() (machine_arch_type == MACH_TYPE_DAVINCI_DM357_EVM)
-#else
-# define machine_is_davinci_dm357_evm() (0)
-#endif
-
-#ifdef CONFIG_MACH_SWORDFISH
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SWORDFISH
-# endif
-# define machine_is_swordfish() (machine_arch_type == MACH_TYPE_SWORDFISH)
-#else
-# define machine_is_swordfish() (0)
-#endif
-
-#ifdef CONFIG_MACH_CORVUS
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CORVUS
-# endif
-# define machine_is_corvus() (machine_arch_type == MACH_TYPE_CORVUS)
-#else
-# define machine_is_corvus() (0)
-#endif
-
-#ifdef CONFIG_MACH_TAURUS
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_TAURUS
-# endif
-# define machine_is_taurus() (machine_arch_type == MACH_TYPE_TAURUS)
-#else
-# define machine_is_taurus() (0)
-#endif
-
-#ifdef CONFIG_MACH_AXM
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_AXM
-# endif
-# define machine_is_axm() (machine_arch_type == MACH_TYPE_AXM)
-#else
-# define machine_is_axm() (0)
-#endif
-
-#ifdef CONFIG_MACH_AXC
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_AXC
-# endif
-# define machine_is_axc() (machine_arch_type == MACH_TYPE_AXC)
-#else
-# define machine_is_axc() (0)
-#endif
-
-#ifdef CONFIG_MACH_BABY
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_BABY
-# endif
-# define machine_is_baby() (machine_arch_type == MACH_TYPE_BABY)
-#else
-# define machine_is_baby() (0)
-#endif
-
-#ifdef CONFIG_MACH_MP200
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MP200
-# endif
-# define machine_is_mp200() (machine_arch_type == MACH_TYPE_MP200)
-#else
-# define machine_is_mp200() (0)
-#endif
-
#ifdef CONFIG_MACH_PCM043
# ifdef machine_arch_type
# undef machine_arch_type
@@ -27853,294 +5245,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_pcm043() (0)
#endif
-#ifdef CONFIG_MACH_HANLIN_V3C
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_HANLIN_V3C
-# endif
-# define machine_is_hanlin_v3c() (machine_arch_type == MACH_TYPE_HANLIN_V3C)
-#else
-# define machine_is_hanlin_v3c() (0)
-#endif
-
-#ifdef CONFIG_MACH_KBK9G20
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_KBK9G20
-# endif
-# define machine_is_kbk9g20() (machine_arch_type == MACH_TYPE_KBK9G20)
-#else
-# define machine_is_kbk9g20() (0)
-#endif
-
-#ifdef CONFIG_MACH_ADSTURBOG5
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ADSTURBOG5
-# endif
-# define machine_is_adsturbog5() (machine_arch_type == MACH_TYPE_ADSTURBOG5)
-#else
-# define machine_is_adsturbog5() (0)
-#endif
-
-#ifdef CONFIG_MACH_AVENGER_LITE1
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_AVENGER_LITE1
-# endif
-# define machine_is_avenger_lite1() (machine_arch_type == MACH_TYPE_AVENGER_LITE1)
-#else
-# define machine_is_avenger_lite1() (0)
-#endif
-
-#ifdef CONFIG_MACH_SUC
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SUC
-# endif
-# define machine_is_suc82x() (machine_arch_type == MACH_TYPE_SUC)
-#else
-# define machine_is_suc82x() (0)
-#endif
-
-#ifdef CONFIG_MACH_AT91SAM7S256
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_AT91SAM7S256
-# endif
-# define machine_is_at91sam7s256() (machine_arch_type == MACH_TYPE_AT91SAM7S256)
-#else
-# define machine_is_at91sam7s256() (0)
-#endif
-
-#ifdef CONFIG_MACH_MENDOZA
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MENDOZA
-# endif
-# define machine_is_mendoza() (machine_arch_type == MACH_TYPE_MENDOZA)
-#else
-# define machine_is_mendoza() (0)
-#endif
-
-#ifdef CONFIG_MACH_KIRA
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_KIRA
-# endif
-# define machine_is_kira() (machine_arch_type == MACH_TYPE_KIRA)
-#else
-# define machine_is_kira() (0)
-#endif
-
-#ifdef CONFIG_MACH_MX1HBM
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MX1HBM
-# endif
-# define machine_is_mx1hbm() (machine_arch_type == MACH_TYPE_MX1HBM)
-#else
-# define machine_is_mx1hbm() (0)
-#endif
-
-#ifdef CONFIG_MACH_QUATRO43XX
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_QUATRO43XX
-# endif
-# define machine_is_quatro43xx() (machine_arch_type == MACH_TYPE_QUATRO43XX)
-#else
-# define machine_is_quatro43xx() (0)
-#endif
-
-#ifdef CONFIG_MACH_QUATRO4230
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_QUATRO4230
-# endif
-# define machine_is_quatro4230() (machine_arch_type == MACH_TYPE_QUATRO4230)
-#else
-# define machine_is_quatro4230() (0)
-#endif
-
-#ifdef CONFIG_MACH_NSB400
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_NSB400
-# endif
-# define machine_is_nsb400() (machine_arch_type == MACH_TYPE_NSB400)
-#else
-# define machine_is_nsb400() (0)
-#endif
-
-#ifdef CONFIG_MACH_DRP255
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_DRP255
-# endif
-# define machine_is_drp255() (machine_arch_type == MACH_TYPE_DRP255)
-#else
-# define machine_is_drp255() (0)
-#endif
-
-#ifdef CONFIG_MACH_THOTH
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_THOTH
-# endif
-# define machine_is_thoth() (machine_arch_type == MACH_TYPE_THOTH)
-#else
-# define machine_is_thoth() (0)
-#endif
-
-#ifdef CONFIG_MACH_FIRESTONE
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_FIRESTONE
-# endif
-# define machine_is_firestone() (machine_arch_type == MACH_TYPE_FIRESTONE)
-#else
-# define machine_is_firestone() (0)
-#endif
-
-#ifdef CONFIG_MACH_ASUSP750
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ASUSP750
-# endif
-# define machine_is_asusp750() (machine_arch_type == MACH_TYPE_ASUSP750)
-#else
-# define machine_is_asusp750() (0)
-#endif
-
-#ifdef CONFIG_MACH_CTERA_DL
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CTERA_DL
-# endif
-# define machine_is_ctera_dl() (machine_arch_type == MACH_TYPE_CTERA_DL)
-#else
-# define machine_is_ctera_dl() (0)
-#endif
-
-#ifdef CONFIG_MACH_SOCR
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SOCR
-# endif
-# define machine_is_socr() (machine_arch_type == MACH_TYPE_SOCR)
-#else
-# define machine_is_socr() (0)
-#endif
-
-#ifdef CONFIG_MACH_HTCOXYGEN
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_HTCOXYGEN
-# endif
-# define machine_is_htcoxygen() (machine_arch_type == MACH_TYPE_HTCOXYGEN)
-#else
-# define machine_is_htcoxygen() (0)
-#endif
-
-#ifdef CONFIG_MACH_HEROC
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_HEROC
-# endif
-# define machine_is_heroc() (machine_arch_type == MACH_TYPE_HEROC)
-#else
-# define machine_is_heroc() (0)
-#endif
-
-#ifdef CONFIG_MACH_ZENO6800
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ZENO6800
-# endif
-# define machine_is_zeno6800() (machine_arch_type == MACH_TYPE_ZENO6800)
-#else
-# define machine_is_zeno6800() (0)
-#endif
-
-#ifdef CONFIG_MACH_SC2MCS
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SC2MCS
-# endif
-# define machine_is_sc2mcs() (machine_arch_type == MACH_TYPE_SC2MCS)
-#else
-# define machine_is_sc2mcs() (0)
-#endif
-
-#ifdef CONFIG_MACH_GENE100
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_GENE100
-# endif
-# define machine_is_gene100() (machine_arch_type == MACH_TYPE_GENE100)
-#else
-# define machine_is_gene100() (0)
-#endif
-
-#ifdef CONFIG_MACH_AS353X
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_AS353X
-# endif
-# define machine_is_as353x() (machine_arch_type == MACH_TYPE_AS353X)
-#else
-# define machine_is_as353x() (0)
-#endif
-
#ifdef CONFIG_MACH_SHEEVAPLUG
# ifdef machine_arch_type
# undef machine_arch_type
@@ -28153,78 +5257,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_sheevaplug() (0)
#endif
-#ifdef CONFIG_MACH_AT91SAM9G20
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_AT91SAM9G20
-# endif
-# define machine_is_at91sam9g20() (machine_arch_type == MACH_TYPE_AT91SAM9G20)
-#else
-# define machine_is_at91sam9g20() (0)
-#endif
-
-#ifdef CONFIG_MACH_MV88F6192GTW_FE
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MV88F6192GTW_FE
-# endif
-# define machine_is_mv88f6192gtw_fe() (machine_arch_type == MACH_TYPE_MV88F6192GTW_FE)
-#else
-# define machine_is_mv88f6192gtw_fe() (0)
-#endif
-
-#ifdef CONFIG_MACH_CC9200
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CC9200
-# endif
-# define machine_is_cc9200() (machine_arch_type == MACH_TYPE_CC9200)
-#else
-# define machine_is_cc9200() (0)
-#endif
-
-#ifdef CONFIG_MACH_SM9200
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SM9200
-# endif
-# define machine_is_sm9200() (machine_arch_type == MACH_TYPE_SM9200)
-#else
-# define machine_is_sm9200() (0)
-#endif
-
-#ifdef CONFIG_MACH_TP9200
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_TP9200
-# endif
-# define machine_is_tp9200() (machine_arch_type == MACH_TYPE_TP9200)
-#else
-# define machine_is_tp9200() (0)
-#endif
-
-#ifdef CONFIG_MACH_SNAPPERDV
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SNAPPERDV
-# endif
-# define machine_is_snapperdv() (machine_arch_type == MACH_TYPE_SNAPPERDV)
-#else
-# define machine_is_snapperdv() (0)
-#endif
-
#ifdef CONFIG_MACH_AVENGERS_LITE
# ifdef machine_arch_type
# undef machine_arch_type
@@ -28237,246 +5269,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_avengers_lite() (0)
#endif
-#ifdef CONFIG_MACH_AVENGERS_LITE1
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_AVENGERS_LITE1
-# endif
-# define machine_is_avengers_lite1() (machine_arch_type == MACH_TYPE_AVENGERS_LITE1)
-#else
-# define machine_is_avengers_lite1() (0)
-#endif
-
-#ifdef CONFIG_MACH_OMAP3AXON
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_OMAP3AXON
-# endif
-# define machine_is_omap3axon() (machine_arch_type == MACH_TYPE_OMAP3AXON)
-#else
-# define machine_is_omap3axon() (0)
-#endif
-
-#ifdef CONFIG_MACH_MA8XX
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MA8XX
-# endif
-# define machine_is_ma8xx() (machine_arch_type == MACH_TYPE_MA8XX)
-#else
-# define machine_is_ma8xx() (0)
-#endif
-
-#ifdef CONFIG_MACH_MP201EK
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MP201EK
-# endif
-# define machine_is_mp201ek() (machine_arch_type == MACH_TYPE_MP201EK)
-#else
-# define machine_is_mp201ek() (0)
-#endif
-
-#ifdef CONFIG_MACH_DAVINCI_TUX
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_DAVINCI_TUX
-# endif
-# define machine_is_davinci_tux() (machine_arch_type == MACH_TYPE_DAVINCI_TUX)
-#else
-# define machine_is_davinci_tux() (0)
-#endif
-
-#ifdef CONFIG_MACH_MPA1600
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MPA1600
-# endif
-# define machine_is_mpa1600() (machine_arch_type == MACH_TYPE_MPA1600)
-#else
-# define machine_is_mpa1600() (0)
-#endif
-
-#ifdef CONFIG_MACH_PELCO_TROY
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_PELCO_TROY
-# endif
-# define machine_is_pelco_troy() (machine_arch_type == MACH_TYPE_PELCO_TROY)
-#else
-# define machine_is_pelco_troy() (0)
-#endif
-
-#ifdef CONFIG_MACH_NSB667
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_NSB667
-# endif
-# define machine_is_nsb667() (machine_arch_type == MACH_TYPE_NSB667)
-#else
-# define machine_is_nsb667() (0)
-#endif
-
-#ifdef CONFIG_MACH_ROVERS5_4MPIX
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ROVERS5_4MPIX
-# endif
-# define machine_is_rovers5_4mpix() (machine_arch_type == MACH_TYPE_ROVERS5_4MPIX)
-#else
-# define machine_is_rovers5_4mpix() (0)
-#endif
-
-#ifdef CONFIG_MACH_TWOCOM
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_TWOCOM
-# endif
-# define machine_is_twocom() (machine_arch_type == MACH_TYPE_TWOCOM)
-#else
-# define machine_is_twocom() (0)
-#endif
-
-#ifdef CONFIG_MACH_UBISYS_P9_RCU3R2
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_UBISYS_P9_RCU3R2
-# endif
-# define machine_is_ubisys_p9_rcu3r2() (machine_arch_type == MACH_TYPE_UBISYS_P9_RCU3R2)
-#else
-# define machine_is_ubisys_p9_rcu3r2() (0)
-#endif
-
-#ifdef CONFIG_MACH_HERO_ESPRESSO
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_HERO_ESPRESSO
-# endif
-# define machine_is_hero_espresso() (machine_arch_type == MACH_TYPE_HERO_ESPRESSO)
-#else
-# define machine_is_hero_espresso() (0)
-#endif
-
-#ifdef CONFIG_MACH_AFEUSB
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_AFEUSB
-# endif
-# define machine_is_afeusb() (machine_arch_type == MACH_TYPE_AFEUSB)
-#else
-# define machine_is_afeusb() (0)
-#endif
-
-#ifdef CONFIG_MACH_T830
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_T830
-# endif
-# define machine_is_t830() (machine_arch_type == MACH_TYPE_T830)
-#else
-# define machine_is_t830() (0)
-#endif
-
-#ifdef CONFIG_MACH_SPD8020_CC
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SPD8020_CC
-# endif
-# define machine_is_spd8020_cc() (machine_arch_type == MACH_TYPE_SPD8020_CC)
-#else
-# define machine_is_spd8020_cc() (0)
-#endif
-
-#ifdef CONFIG_MACH_OM_3D7K
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_OM_3D7K
-# endif
-# define machine_is_om_3d7k() (machine_arch_type == MACH_TYPE_OM_3D7K)
-#else
-# define machine_is_om_3d7k() (0)
-#endif
-
-#ifdef CONFIG_MACH_PICOCOM2
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_PICOCOM2
-# endif
-# define machine_is_picocom2() (machine_arch_type == MACH_TYPE_PICOCOM2)
-#else
-# define machine_is_picocom2() (0)
-#endif
-
-#ifdef CONFIG_MACH_UWG4MX27
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_UWG4MX27
-# endif
-# define machine_is_uwg4mx27() (machine_arch_type == MACH_TYPE_UWG4MX27)
-#else
-# define machine_is_uwg4mx27() (0)
-#endif
-
-#ifdef CONFIG_MACH_UWG4MX31
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_UWG4MX31
-# endif
-# define machine_is_uwg4mx31() (machine_arch_type == MACH_TYPE_UWG4MX31)
-#else
-# define machine_is_uwg4mx31() (0)
-#endif
-
-#ifdef CONFIG_MACH_CHERRY
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CHERRY
-# endif
-# define machine_is_cherry() (machine_arch_type == MACH_TYPE_CHERRY)
-#else
-# define machine_is_cherry() (0)
-#endif
-
#ifdef CONFIG_MACH_MX51_BABBAGE
# ifdef machine_arch_type
# undef machine_arch_type
@@ -28489,114 +5281,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_mx51_babbage() (0)
#endif
-#ifdef CONFIG_MACH_S3C2440TURKIYE
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_S3C2440TURKIYE
-# endif
-# define machine_is_s3c2440turkiye() (machine_arch_type == MACH_TYPE_S3C2440TURKIYE)
-#else
-# define machine_is_s3c2440turkiye() (0)
-#endif
-
-#ifdef CONFIG_MACH_TX37
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_TX37
-# endif
-# define machine_is_tx37() (machine_arch_type == MACH_TYPE_TX37)
-#else
-# define machine_is_tx37() (0)
-#endif
-
-#ifdef CONFIG_MACH_SBC2800_9G20
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SBC2800_9G20
-# endif
-# define machine_is_sbc2800_9g20() (machine_arch_type == MACH_TYPE_SBC2800_9G20)
-#else
-# define machine_is_sbc2800_9g20() (0)
-#endif
-
-#ifdef CONFIG_MACH_BENZGLB
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_BENZGLB
-# endif
-# define machine_is_benzglb() (machine_arch_type == MACH_TYPE_BENZGLB)
-#else
-# define machine_is_benzglb() (0)
-#endif
-
-#ifdef CONFIG_MACH_BENZTD
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_BENZTD
-# endif
-# define machine_is_benztd() (machine_arch_type == MACH_TYPE_BENZTD)
-#else
-# define machine_is_benztd() (0)
-#endif
-
-#ifdef CONFIG_MACH_CARTESIO_PLUS
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CARTESIO_PLUS
-# endif
-# define machine_is_cartesio_plus() (machine_arch_type == MACH_TYPE_CARTESIO_PLUS)
-#else
-# define machine_is_cartesio_plus() (0)
-#endif
-
-#ifdef CONFIG_MACH_SOLRAD_G20
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SOLRAD_G20
-# endif
-# define machine_is_solrad_g20() (machine_arch_type == MACH_TYPE_SOLRAD_G20)
-#else
-# define machine_is_solrad_g20() (0)
-#endif
-
-#ifdef CONFIG_MACH_MX27WALLACE
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MX27WALLACE
-# endif
-# define machine_is_mx27wallace() (machine_arch_type == MACH_TYPE_MX27WALLACE)
-#else
-# define machine_is_mx27wallace() (0)
-#endif
-
-#ifdef CONFIG_MACH_FMZWEBMODUL
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_FMZWEBMODUL
-# endif
-# define machine_is_fmzwebmodul() (machine_arch_type == MACH_TYPE_FMZWEBMODUL)
-#else
-# define machine_is_fmzwebmodul() (0)
-#endif
-
#ifdef CONFIG_MACH_RD78X00_MASA
# ifdef machine_arch_type
# undef machine_arch_type
@@ -28609,30 +5293,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_rd78x00_masa() (0)
#endif
-#ifdef CONFIG_MACH_SMALLOGGER
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SMALLOGGER
-# endif
-# define machine_is_smallogger() (machine_arch_type == MACH_TYPE_SMALLOGGER)
-#else
-# define machine_is_smallogger() (0)
-#endif
-
-#ifdef CONFIG_MACH_CCW9P9215
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CCW9P9215
-# endif
-# define machine_is_ccw9p9215() (machine_arch_type == MACH_TYPE_CCW9P9215)
-#else
-# define machine_is_ccw9p9215() (0)
-#endif
-
#ifdef CONFIG_MACH_DM355_LEOPARD
# ifdef machine_arch_type
# undef machine_arch_type
@@ -28657,114 +5317,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_ts219() (0)
#endif
-#ifdef CONFIG_MACH_TNY_A9263
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_TNY_A9263
-# endif
-# define machine_is_tny_a9263() (machine_arch_type == MACH_TYPE_TNY_A9263)
-#else
-# define machine_is_tny_a9263() (0)
-#endif
-
-#ifdef CONFIG_MACH_APOLLO
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_APOLLO
-# endif
-# define machine_is_apollo() (machine_arch_type == MACH_TYPE_APOLLO)
-#else
-# define machine_is_apollo() (0)
-#endif
-
-#ifdef CONFIG_MACH_AT91CAP9STK
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_AT91CAP9STK
-# endif
-# define machine_is_at91cap9stk() (machine_arch_type == MACH_TYPE_AT91CAP9STK)
-#else
-# define machine_is_at91cap9stk() (0)
-#endif
-
-#ifdef CONFIG_MACH_SPC300
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SPC300
-# endif
-# define machine_is_spc300() (machine_arch_type == MACH_TYPE_SPC300)
-#else
-# define machine_is_spc300() (0)
-#endif
-
-#ifdef CONFIG_MACH_EKO
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_EKO
-# endif
-# define machine_is_eko() (machine_arch_type == MACH_TYPE_EKO)
-#else
-# define machine_is_eko() (0)
-#endif
-
-#ifdef CONFIG_MACH_CCW9M2443
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CCW9M2443
-# endif
-# define machine_is_ccw9m2443() (machine_arch_type == MACH_TYPE_CCW9M2443)
-#else
-# define machine_is_ccw9m2443() (0)
-#endif
-
-#ifdef CONFIG_MACH_CCW9M2443JS
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CCW9M2443JS
-# endif
-# define machine_is_ccw9m2443js() (machine_arch_type == MACH_TYPE_CCW9M2443JS)
-#else
-# define machine_is_ccw9m2443js() (0)
-#endif
-
-#ifdef CONFIG_MACH_M2M_ROUTER_DEVICE
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_M2M_ROUTER_DEVICE
-# endif
-# define machine_is_m2m_router_device() (machine_arch_type == MACH_TYPE_M2M_ROUTER_DEVICE)
-#else
-# define machine_is_m2m_router_device() (0)
-#endif
-
-#ifdef CONFIG_MACH_STAR9104NAS
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_STAR9104NAS
-# endif
-# define machine_is_str9104nas() (machine_arch_type == MACH_TYPE_STAR9104NAS)
-#else
-# define machine_is_str9104nas() (0)
-#endif
-
#ifdef CONFIG_MACH_PCA100
# ifdef machine_arch_type
# undef machine_arch_type
@@ -28777,90 +5329,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_pca100() (0)
#endif
-#ifdef CONFIG_MACH_Z3_DM365_MOD_01
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_Z3_DM365_MOD_01
-# endif
-# define machine_is_z3_dm365_mod_01() (machine_arch_type == MACH_TYPE_Z3_DM365_MOD_01)
-#else
-# define machine_is_z3_dm365_mod_01() (0)
-#endif
-
-#ifdef CONFIG_MACH_HIPOX
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_HIPOX
-# endif
-# define machine_is_hipox() (machine_arch_type == MACH_TYPE_HIPOX)
-#else
-# define machine_is_hipox() (0)
-#endif
-
-#ifdef CONFIG_MACH_OMAP3_PITEDS
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_OMAP3_PITEDS
-# endif
-# define machine_is_omap3_piteds() (machine_arch_type == MACH_TYPE_OMAP3_PITEDS)
-#else
-# define machine_is_omap3_piteds() (0)
-#endif
-
-#ifdef CONFIG_MACH_BM150R
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_BM150R
-# endif
-# define machine_is_bm150r() (machine_arch_type == MACH_TYPE_BM150R)
-#else
-# define machine_is_bm150r() (0)
-#endif
-
-#ifdef CONFIG_MACH_TBONE
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_TBONE
-# endif
-# define machine_is_tbone() (machine_arch_type == MACH_TYPE_TBONE)
-#else
-# define machine_is_tbone() (0)
-#endif
-
-#ifdef CONFIG_MACH_MERLIN
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MERLIN
-# endif
-# define machine_is_merlin() (machine_arch_type == MACH_TYPE_MERLIN)
-#else
-# define machine_is_merlin() (0)
-#endif
-
-#ifdef CONFIG_MACH_FALCON
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_FALCON
-# endif
-# define machine_is_falcon() (machine_arch_type == MACH_TYPE_FALCON)
-#else
-# define machine_is_falcon() (0)
-#endif
-
#ifdef CONFIG_MACH_DAVINCI_DA850_EVM
# ifdef machine_arch_type
# undef machine_arch_type
@@ -28873,18 +5341,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_davinci_da850_evm() (0)
#endif
-#ifdef CONFIG_MACH_S5P6440
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_S5P6440
-# endif
-# define machine_is_s5p6440() (machine_arch_type == MACH_TYPE_S5P6440)
-#else
-# define machine_is_s5p6440() (0)
-#endif
-
#ifdef CONFIG_MACH_AT91SAM9G10EK
# ifdef machine_arch_type
# undef machine_arch_type
@@ -28909,18 +5365,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_omap_4430sdp() (0)
#endif
-#ifdef CONFIG_MACH_LPC313X
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_LPC313X
-# endif
-# define machine_is_lpc313x() (machine_arch_type == MACH_TYPE_LPC313X)
-#else
-# define machine_is_lpc313x() (0)
-#endif
-
#ifdef CONFIG_MACH_MAGX_ZN5
# ifdef machine_arch_type
# undef machine_arch_type
@@ -28933,114 +5377,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_magx_zn5() (0)
#endif
-#ifdef CONFIG_MACH_MAGX_EM30
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MAGX_EM30
-# endif
-# define machine_is_magx_em30() (machine_arch_type == MACH_TYPE_MAGX_EM30)
-#else
-# define machine_is_magx_em30() (0)
-#endif
-
-#ifdef CONFIG_MACH_MAGX_VE66
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MAGX_VE66
-# endif
-# define machine_is_magx_ve66() (machine_arch_type == MACH_TYPE_MAGX_VE66)
-#else
-# define machine_is_magx_ve66() (0)
-#endif
-
-#ifdef CONFIG_MACH_MEESC
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MEESC
-# endif
-# define machine_is_meesc() (machine_arch_type == MACH_TYPE_MEESC)
-#else
-# define machine_is_meesc() (0)
-#endif
-
-#ifdef CONFIG_MACH_OTC570
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_OTC570
-# endif
-# define machine_is_otc570() (machine_arch_type == MACH_TYPE_OTC570)
-#else
-# define machine_is_otc570() (0)
-#endif
-
-#ifdef CONFIG_MACH_BCU2412
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_BCU2412
-# endif
-# define machine_is_bcu2412() (machine_arch_type == MACH_TYPE_BCU2412)
-#else
-# define machine_is_bcu2412() (0)
-#endif
-
-#ifdef CONFIG_MACH_BEACON
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_BEACON
-# endif
-# define machine_is_beacon() (machine_arch_type == MACH_TYPE_BEACON)
-#else
-# define machine_is_beacon() (0)
-#endif
-
-#ifdef CONFIG_MACH_ACTIA_TGW
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ACTIA_TGW
-# endif
-# define machine_is_actia_tgw() (machine_arch_type == MACH_TYPE_ACTIA_TGW)
-#else
-# define machine_is_actia_tgw() (0)
-#endif
-
-#ifdef CONFIG_MACH_E4430
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_E4430
-# endif
-# define machine_is_e4430() (machine_arch_type == MACH_TYPE_E4430)
-#else
-# define machine_is_e4430() (0)
-#endif
-
-#ifdef CONFIG_MACH_QL300
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_QL300
-# endif
-# define machine_is_ql300() (machine_arch_type == MACH_TYPE_QL300)
-#else
-# define machine_is_ql300() (0)
-#endif
-
#ifdef CONFIG_MACH_BTMAVB101
# ifdef machine_arch_type
# undef machine_arch_type
@@ -29065,54 +5401,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_btmawb101() (0)
#endif
-#ifdef CONFIG_MACH_SQ201
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SQ201
-# endif
-# define machine_is_sq201() (machine_arch_type == MACH_TYPE_SQ201)
-#else
-# define machine_is_sq201() (0)
-#endif
-
-#ifdef CONFIG_MACH_QUATRO45XX
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_QUATRO45XX
-# endif
-# define machine_is_quatro45xx() (machine_arch_type == MACH_TYPE_QUATRO45XX)
-#else
-# define machine_is_quatro45xx() (0)
-#endif
-
-#ifdef CONFIG_MACH_OPENPAD
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_OPENPAD
-# endif
-# define machine_is_openpad() (machine_arch_type == MACH_TYPE_OPENPAD)
-#else
-# define machine_is_openpad() (0)
-#endif
-
-#ifdef CONFIG_MACH_TX25
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_TX25
-# endif
-# define machine_is_tx25() (machine_arch_type == MACH_TYPE_TX25)
-#else
-# define machine_is_tx25() (0)
-#endif
-
#ifdef CONFIG_MACH_OMAP3_TORPEDO
# ifdef machine_arch_type
# undef machine_arch_type
@@ -29125,42 +5413,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_omap3_torpedo() (0)
#endif
-#ifdef CONFIG_MACH_HTCRAPHAEL_K
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_HTCRAPHAEL_K
-# endif
-# define machine_is_htcraphael_k() (machine_arch_type == MACH_TYPE_HTCRAPHAEL_K)
-#else
-# define machine_is_htcraphael_k() (0)
-#endif
-
-#ifdef CONFIG_MACH_LAL43
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_LAL43
-# endif
-# define machine_is_lal43() (machine_arch_type == MACH_TYPE_LAL43)
-#else
-# define machine_is_lal43() (0)
-#endif
-
-#ifdef CONFIG_MACH_HTCRAPHAEL_CDMA500
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_HTCRAPHAEL_CDMA500
-# endif
-# define machine_is_htcraphael_cdma500() (machine_arch_type == MACH_TYPE_HTCRAPHAEL_CDMA500)
-#else
-# define machine_is_htcraphael_cdma500() (0)
-#endif
-
#ifdef CONFIG_MACH_ANW6410
# ifdef machine_arch_type
# undef machine_arch_type
@@ -29173,30 +5425,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_anw6410() (0)
#endif
-#ifdef CONFIG_MACH_HTCPROPHET
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_HTCPROPHET
-# endif
-# define machine_is_htcprophet() (machine_arch_type == MACH_TYPE_HTCPROPHET)
-#else
-# define machine_is_htcprophet() (0)
-#endif
-
-#ifdef CONFIG_MACH_CFA_10022
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CFA_10022
-# endif
-# define machine_is_cfa_10022() (machine_arch_type == MACH_TYPE_CFA_10022)
-#else
-# define machine_is_cfa_10022() (0)
-#endif
-
#ifdef CONFIG_MACH_IMX27_VISSTRIM_M10
# ifdef machine_arch_type
# undef machine_arch_type
@@ -29209,42 +5437,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_imx27_visstrim_m10() (0)
#endif
-#ifdef CONFIG_MACH_PX2IMX27
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_PX2IMX27
-# endif
-# define machine_is_px2imx27() (machine_arch_type == MACH_TYPE_PX2IMX27)
-#else
-# define machine_is_px2imx27() (0)
-#endif
-
-#ifdef CONFIG_MACH_STM3210E_EVAL
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_STM3210E_EVAL
-# endif
-# define machine_is_stm3210e_eval() (machine_arch_type == MACH_TYPE_STM3210E_EVAL)
-#else
-# define machine_is_stm3210e_eval() (0)
-#endif
-
-#ifdef CONFIG_MACH_DVS10
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_DVS10
-# endif
-# define machine_is_dvs10() (machine_arch_type == MACH_TYPE_DVS10)
-#else
-# define machine_is_dvs10() (0)
-#endif
-
#ifdef CONFIG_MACH_PORTUXG20
# ifdef machine_arch_type
# undef machine_arch_type
@@ -29257,18 +5449,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_portuxg20() (0)
#endif
-#ifdef CONFIG_MACH_ARM_SPV
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ARM_SPV
-# endif
-# define machine_is_arm_spv() (machine_arch_type == MACH_TYPE_ARM_SPV)
-#else
-# define machine_is_arm_spv() (0)
-#endif
-
#ifdef CONFIG_MACH_SMDKC110
# ifdef machine_arch_type
# undef machine_arch_type
@@ -29281,78 +5461,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_smdkc110() (0)
#endif
-#ifdef CONFIG_MACH_CABESPRESSO
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CABESPRESSO
-# endif
-# define machine_is_cabespresso() (machine_arch_type == MACH_TYPE_CABESPRESSO)
-#else
-# define machine_is_cabespresso() (0)
-#endif
-
-#ifdef CONFIG_MACH_HMC800
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_HMC800
-# endif
-# define machine_is_hmc800() (machine_arch_type == MACH_TYPE_HMC800)
-#else
-# define machine_is_hmc800() (0)
-#endif
-
-#ifdef CONFIG_MACH_SHOLES
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SHOLES
-# endif
-# define machine_is_sholes() (machine_arch_type == MACH_TYPE_SHOLES)
-#else
-# define machine_is_sholes() (0)
-#endif
-
-#ifdef CONFIG_MACH_BTMXC31
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_BTMXC31
-# endif
-# define machine_is_btmxc31() (machine_arch_type == MACH_TYPE_BTMXC31)
-#else
-# define machine_is_btmxc31() (0)
-#endif
-
-#ifdef CONFIG_MACH_DT501
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_DT501
-# endif
-# define machine_is_dt501() (machine_arch_type == MACH_TYPE_DT501)
-#else
-# define machine_is_dt501() (0)
-#endif
-
-#ifdef CONFIG_MACH_KTX
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_KTX
-# endif
-# define machine_is_ktx() (machine_arch_type == MACH_TYPE_KTX)
-#else
-# define machine_is_ktx() (0)
-#endif
-
#ifdef CONFIG_MACH_OMAP3517EVM
# ifdef machine_arch_type
# undef machine_arch_type
@@ -29413,18 +5521,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_net2big_v2() (0)
#endif
-#ifdef CONFIG_MACH_NET4BIG_V2
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_NET4BIG_V2
-# endif
-# define machine_is_net4big_v2() (machine_arch_type == MACH_TYPE_NET4BIG_V2)
-#else
-# define machine_is_net4big_v2() (0)
-#endif
-
#ifdef CONFIG_MACH_NET5BIG_V2
# ifdef machine_arch_type
# undef machine_arch_type
@@ -29437,18 +5533,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_net5big_v2() (0)
#endif
-#ifdef CONFIG_MACH_ENDB2443
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ENDB2443
-# endif
-# define machine_is_endb2443() (machine_arch_type == MACH_TYPE_ENDB2443)
-#else
-# define machine_is_endb2443() (0)
-#endif
-
#ifdef CONFIG_MACH_INETSPACE_V2
# ifdef machine_arch_type
# undef machine_arch_type
@@ -29461,42 +5545,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_inetspace_v2() (0)
#endif
-#ifdef CONFIG_MACH_TROS
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_TROS
-# endif
-# define machine_is_tros() (machine_arch_type == MACH_TYPE_TROS)
-#else
-# define machine_is_tros() (0)
-#endif
-
-#ifdef CONFIG_MACH_PELCO_HOMER
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_PELCO_HOMER
-# endif
-# define machine_is_pelco_homer() (machine_arch_type == MACH_TYPE_PELCO_HOMER)
-#else
-# define machine_is_pelco_homer() (0)
-#endif
-
-#ifdef CONFIG_MACH_OFSP8
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_OFSP8
-# endif
-# define machine_is_ofsp8() (machine_arch_type == MACH_TYPE_OFSP8)
-#else
-# define machine_is_ofsp8() (0)
-#endif
-
#ifdef CONFIG_MACH_AT91SAM9G45EKES
# ifdef machine_arch_type
# undef machine_arch_type
@@ -29509,90 +5557,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_at91sam9g45ekes() (0)
#endif
-#ifdef CONFIG_MACH_GUF_CUPID
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_GUF_CUPID
-# endif
-# define machine_is_guf_cupid() (machine_arch_type == MACH_TYPE_GUF_CUPID)
-#else
-# define machine_is_guf_cupid() (0)
-#endif
-
-#ifdef CONFIG_MACH_EAB1R
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_EAB1R
-# endif
-# define machine_is_eab1r() (machine_arch_type == MACH_TYPE_EAB1R)
-#else
-# define machine_is_eab1r() (0)
-#endif
-
-#ifdef CONFIG_MACH_DESIREC
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_DESIREC
-# endif
-# define machine_is_desirec() (machine_arch_type == MACH_TYPE_DESIREC)
-#else
-# define machine_is_desirec() (0)
-#endif
-
-#ifdef CONFIG_MACH_CORDOBA
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CORDOBA
-# endif
-# define machine_is_cordoba() (machine_arch_type == MACH_TYPE_CORDOBA)
-#else
-# define machine_is_cordoba() (0)
-#endif
-
-#ifdef CONFIG_MACH_IRVINE
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_IRVINE
-# endif
-# define machine_is_irvine() (machine_arch_type == MACH_TYPE_IRVINE)
-#else
-# define machine_is_irvine() (0)
-#endif
-
-#ifdef CONFIG_MACH_SFF772
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SFF772
-# endif
-# define machine_is_sff772() (machine_arch_type == MACH_TYPE_SFF772)
-#else
-# define machine_is_sff772() (0)
-#endif
-
-#ifdef CONFIG_MACH_PELCO_MILANO
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_PELCO_MILANO
-# endif
-# define machine_is_pelco_milano() (machine_arch_type == MACH_TYPE_PELCO_MILANO)
-#else
-# define machine_is_pelco_milano() (0)
-#endif
-
#ifdef CONFIG_MACH_PC7302
# ifdef machine_arch_type
# undef machine_arch_type
@@ -29605,186 +5569,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_pc7302() (0)
#endif
-#ifdef CONFIG_MACH_BIP6000
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_BIP6000
-# endif
-# define machine_is_bip6000() (machine_arch_type == MACH_TYPE_BIP6000)
-#else
-# define machine_is_bip6000() (0)
-#endif
-
-#ifdef CONFIG_MACH_SILVERMOON
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SILVERMOON
-# endif
-# define machine_is_silvermoon() (machine_arch_type == MACH_TYPE_SILVERMOON)
-#else
-# define machine_is_silvermoon() (0)
-#endif
-
-#ifdef CONFIG_MACH_VC0830
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_VC0830
-# endif
-# define machine_is_vc0830() (machine_arch_type == MACH_TYPE_VC0830)
-#else
-# define machine_is_vc0830() (0)
-#endif
-
-#ifdef CONFIG_MACH_DT430
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_DT430
-# endif
-# define machine_is_dt430() (machine_arch_type == MACH_TYPE_DT430)
-#else
-# define machine_is_dt430() (0)
-#endif
-
-#ifdef CONFIG_MACH_JI42PF
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_JI42PF
-# endif
-# define machine_is_ji42pf() (machine_arch_type == MACH_TYPE_JI42PF)
-#else
-# define machine_is_ji42pf() (0)
-#endif
-
-#ifdef CONFIG_MACH_GNET_KSM
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_GNET_KSM
-# endif
-# define machine_is_gnet_ksm() (machine_arch_type == MACH_TYPE_GNET_KSM)
-#else
-# define machine_is_gnet_ksm() (0)
-#endif
-
-#ifdef CONFIG_MACH_GNET_SGM
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_GNET_SGM
-# endif
-# define machine_is_gnet_sgm() (machine_arch_type == MACH_TYPE_GNET_SGM)
-#else
-# define machine_is_gnet_sgm() (0)
-#endif
-
-#ifdef CONFIG_MACH_GNET_SGR
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_GNET_SGR
-# endif
-# define machine_is_gnet_sgr() (machine_arch_type == MACH_TYPE_GNET_SGR)
-#else
-# define machine_is_gnet_sgr() (0)
-#endif
-
-#ifdef CONFIG_MACH_OMAP3_ICETEKEVM
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_OMAP3_ICETEKEVM
-# endif
-# define machine_is_omap3_icetekevm() (machine_arch_type == MACH_TYPE_OMAP3_ICETEKEVM)
-#else
-# define machine_is_omap3_icetekevm() (0)
-#endif
-
-#ifdef CONFIG_MACH_PNP
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_PNP
-# endif
-# define machine_is_pnp() (machine_arch_type == MACH_TYPE_PNP)
-#else
-# define machine_is_pnp() (0)
-#endif
-
-#ifdef CONFIG_MACH_CTERA_2BAY_K
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CTERA_2BAY_K
-# endif
-# define machine_is_ctera_2bay_k() (machine_arch_type == MACH_TYPE_CTERA_2BAY_K)
-#else
-# define machine_is_ctera_2bay_k() (0)
-#endif
-
-#ifdef CONFIG_MACH_CTERA_2BAY_U
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CTERA_2BAY_U
-# endif
-# define machine_is_ctera_2bay_u() (machine_arch_type == MACH_TYPE_CTERA_2BAY_U)
-#else
-# define machine_is_ctera_2bay_u() (0)
-#endif
-
-#ifdef CONFIG_MACH_SAS_C
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SAS_C
-# endif
-# define machine_is_sas_c() (machine_arch_type == MACH_TYPE_SAS_C)
-#else
-# define machine_is_sas_c() (0)
-#endif
-
-#ifdef CONFIG_MACH_VMA2315
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_VMA2315
-# endif
-# define machine_is_vma2315() (machine_arch_type == MACH_TYPE_VMA2315)
-#else
-# define machine_is_vma2315() (0)
-#endif
-
-#ifdef CONFIG_MACH_VCS
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_VCS
-# endif
-# define machine_is_vcs() (machine_arch_type == MACH_TYPE_VCS)
-#else
-# define machine_is_vcs() (0)
-#endif
-
#ifdef CONFIG_MACH_SPEAR600
# ifdef machine_arch_type
# undef machine_arch_type
@@ -29809,18 +5593,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_spear300() (0)
#endif
-#ifdef CONFIG_MACH_SPEAR1300
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SPEAR1300
-# endif
-# define machine_is_spear1300() (machine_arch_type == MACH_TYPE_SPEAR1300)
-#else
-# define machine_is_spear1300() (0)
-#endif
-
#ifdef CONFIG_MACH_LILLY1131
# ifdef machine_arch_type
# undef machine_arch_type
@@ -29833,162 +5605,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_lilly1131() (0)
#endif
-#ifdef CONFIG_MACH_ARVOO_AX301
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ARVOO_AX301
-# endif
-# define machine_is_arvoo_ax301() (machine_arch_type == MACH_TYPE_ARVOO_AX301)
-#else
-# define machine_is_arvoo_ax301() (0)
-#endif
-
-#ifdef CONFIG_MACH_MAPPHONE
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MAPPHONE
-# endif
-# define machine_is_mapphone() (machine_arch_type == MACH_TYPE_MAPPHONE)
-#else
-# define machine_is_mapphone() (0)
-#endif
-
-#ifdef CONFIG_MACH_LEGEND
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_LEGEND
-# endif
-# define machine_is_legend() (machine_arch_type == MACH_TYPE_LEGEND)
-#else
-# define machine_is_legend() (0)
-#endif
-
-#ifdef CONFIG_MACH_SALSA
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SALSA
-# endif
-# define machine_is_salsa() (machine_arch_type == MACH_TYPE_SALSA)
-#else
-# define machine_is_salsa() (0)
-#endif
-
-#ifdef CONFIG_MACH_LOUNGE
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_LOUNGE
-# endif
-# define machine_is_lounge() (machine_arch_type == MACH_TYPE_LOUNGE)
-#else
-# define machine_is_lounge() (0)
-#endif
-
-#ifdef CONFIG_MACH_VISION
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_VISION
-# endif
-# define machine_is_vision() (machine_arch_type == MACH_TYPE_VISION)
-#else
-# define machine_is_vision() (0)
-#endif
-
-#ifdef CONFIG_MACH_VMB20
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_VMB20
-# endif
-# define machine_is_vmb20() (machine_arch_type == MACH_TYPE_VMB20)
-#else
-# define machine_is_vmb20() (0)
-#endif
-
-#ifdef CONFIG_MACH_HY2410
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_HY2410
-# endif
-# define machine_is_hy2410() (machine_arch_type == MACH_TYPE_HY2410)
-#else
-# define machine_is_hy2410() (0)
-#endif
-
-#ifdef CONFIG_MACH_HY9315
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_HY9315
-# endif
-# define machine_is_hy9315() (machine_arch_type == MACH_TYPE_HY9315)
-#else
-# define machine_is_hy9315() (0)
-#endif
-
-#ifdef CONFIG_MACH_BULLWINKLE
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_BULLWINKLE
-# endif
-# define machine_is_bullwinkle() (machine_arch_type == MACH_TYPE_BULLWINKLE)
-#else
-# define machine_is_bullwinkle() (0)
-#endif
-
-#ifdef CONFIG_MACH_ARM_ULTIMATOR2
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ARM_ULTIMATOR2
-# endif
-# define machine_is_arm_ultimator2() (machine_arch_type == MACH_TYPE_ARM_ULTIMATOR2)
-#else
-# define machine_is_arm_ultimator2() (0)
-#endif
-
-#ifdef CONFIG_MACH_VS_V210
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_VS_V210
-# endif
-# define machine_is_vs_v210() (machine_arch_type == MACH_TYPE_VS_V210)
-#else
-# define machine_is_vs_v210() (0)
-#endif
-
-#ifdef CONFIG_MACH_VS_V212
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_VS_V212
-# endif
-# define machine_is_vs_v212() (machine_arch_type == MACH_TYPE_VS_V212)
-#else
-# define machine_is_vs_v212() (0)
-#endif
-
#ifdef CONFIG_MACH_HMT
# ifdef machine_arch_type
# undef machine_arch_type
@@ -30001,210 +5617,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_hmt() (0)
#endif
-#ifdef CONFIG_MACH_KM_KIRKWOOD
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_KM_KIRKWOOD
-# endif
-# define machine_is_km_kirkwood() (machine_arch_type == MACH_TYPE_KM_KIRKWOOD)
-#else
-# define machine_is_km_kirkwood() (0)
-#endif
-
-#ifdef CONFIG_MACH_VESPER
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_VESPER
-# endif
-# define machine_is_vesper() (machine_arch_type == MACH_TYPE_VESPER)
-#else
-# define machine_is_vesper() (0)
-#endif
-
-#ifdef CONFIG_MACH_STR9
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_STR9
-# endif
-# define machine_is_str9() (machine_arch_type == MACH_TYPE_STR9)
-#else
-# define machine_is_str9() (0)
-#endif
-
-#ifdef CONFIG_MACH_OMAP3_WL_FF
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_OMAP3_WL_FF
-# endif
-# define machine_is_omap3_wl_ff() (machine_arch_type == MACH_TYPE_OMAP3_WL_FF)
-#else
-# define machine_is_omap3_wl_ff() (0)
-#endif
-
-#ifdef CONFIG_MACH_SIMCOM
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SIMCOM
-# endif
-# define machine_is_simcom() (machine_arch_type == MACH_TYPE_SIMCOM)
-#else
-# define machine_is_simcom() (0)
-#endif
-
-#ifdef CONFIG_MACH_MCWEBIO
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MCWEBIO
-# endif
-# define machine_is_mcwebio() (machine_arch_type == MACH_TYPE_MCWEBIO)
-#else
-# define machine_is_mcwebio() (0)
-#endif
-
-#ifdef CONFIG_MACH_OMAP3_PHRAZER
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_OMAP3_PHRAZER
-# endif
-# define machine_is_omap3_phrazer() (machine_arch_type == MACH_TYPE_OMAP3_PHRAZER)
-#else
-# define machine_is_omap3_phrazer() (0)
-#endif
-
-#ifdef CONFIG_MACH_DARWIN
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_DARWIN
-# endif
-# define machine_is_darwin() (machine_arch_type == MACH_TYPE_DARWIN)
-#else
-# define machine_is_darwin() (0)
-#endif
-
-#ifdef CONFIG_MACH_ORATISCOMU
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ORATISCOMU
-# endif
-# define machine_is_oratiscomu() (machine_arch_type == MACH_TYPE_ORATISCOMU)
-#else
-# define machine_is_oratiscomu() (0)
-#endif
-
-#ifdef CONFIG_MACH_RTSBC20
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_RTSBC20
-# endif
-# define machine_is_rtsbc20() (machine_arch_type == MACH_TYPE_RTSBC20)
-#else
-# define machine_is_rtsbc20() (0)
-#endif
-
-#ifdef CONFIG_MACH_I780
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_I780
-# endif
-# define machine_is_sgh_i780() (machine_arch_type == MACH_TYPE_I780)
-#else
-# define machine_is_sgh_i780() (0)
-#endif
-
-#ifdef CONFIG_MACH_GEMINI324
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_GEMINI324
-# endif
-# define machine_is_gemini324() (machine_arch_type == MACH_TYPE_GEMINI324)
-#else
-# define machine_is_gemini324() (0)
-#endif
-
-#ifdef CONFIG_MACH_ORATISLAN
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ORATISLAN
-# endif
-# define machine_is_oratislan() (machine_arch_type == MACH_TYPE_ORATISLAN)
-#else
-# define machine_is_oratislan() (0)
-#endif
-
-#ifdef CONFIG_MACH_ORATISALOG
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ORATISALOG
-# endif
-# define machine_is_oratisalog() (machine_arch_type == MACH_TYPE_ORATISALOG)
-#else
-# define machine_is_oratisalog() (0)
-#endif
-
-#ifdef CONFIG_MACH_ORATISMADI
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ORATISMADI
-# endif
-# define machine_is_oratismadi() (machine_arch_type == MACH_TYPE_ORATISMADI)
-#else
-# define machine_is_oratismadi() (0)
-#endif
-
-#ifdef CONFIG_MACH_ORATISOT16
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ORATISOT16
-# endif
-# define machine_is_oratisot16() (machine_arch_type == MACH_TYPE_ORATISOT16)
-#else
-# define machine_is_oratisot16() (0)
-#endif
-
-#ifdef CONFIG_MACH_ORATISDESK
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ORATISDESK
-# endif
-# define machine_is_oratisdesk() (machine_arch_type == MACH_TYPE_ORATISDESK)
-#else
-# define machine_is_oratisdesk() (0)
-#endif
-
#ifdef CONFIG_MACH_VEXPRESS
# ifdef machine_arch_type
# undef machine_arch_type
@@ -30217,114 +5629,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_vexpress() (0)
#endif
-#ifdef CONFIG_MACH_SINTEXO
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SINTEXO
-# endif
-# define machine_is_sintexo() (machine_arch_type == MACH_TYPE_SINTEXO)
-#else
-# define machine_is_sintexo() (0)
-#endif
-
-#ifdef CONFIG_MACH_CM3389
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CM3389
-# endif
-# define machine_is_cm3389() (machine_arch_type == MACH_TYPE_CM3389)
-#else
-# define machine_is_cm3389() (0)
-#endif
-
-#ifdef CONFIG_MACH_OMAP3_CIO
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_OMAP3_CIO
-# endif
-# define machine_is_omap3_cio() (machine_arch_type == MACH_TYPE_OMAP3_CIO)
-#else
-# define machine_is_omap3_cio() (0)
-#endif
-
-#ifdef CONFIG_MACH_SGH_I900
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SGH_I900
-# endif
-# define machine_is_sgh_i900() (machine_arch_type == MACH_TYPE_SGH_I900)
-#else
-# define machine_is_sgh_i900() (0)
-#endif
-
-#ifdef CONFIG_MACH_BST100
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_BST100
-# endif
-# define machine_is_bst100() (machine_arch_type == MACH_TYPE_BST100)
-#else
-# define machine_is_bst100() (0)
-#endif
-
-#ifdef CONFIG_MACH_PASSION
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_PASSION
-# endif
-# define machine_is_passion() (machine_arch_type == MACH_TYPE_PASSION)
-#else
-# define machine_is_passion() (0)
-#endif
-
-#ifdef CONFIG_MACH_INDESIGN_AT91SAM
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_INDESIGN_AT91SAM
-# endif
-# define machine_is_indesign_at91sam() (machine_arch_type == MACH_TYPE_INDESIGN_AT91SAM)
-#else
-# define machine_is_indesign_at91sam() (0)
-#endif
-
-#ifdef CONFIG_MACH_C4_BADGER
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_C4_BADGER
-# endif
-# define machine_is_c4_badger() (machine_arch_type == MACH_TYPE_C4_BADGER)
-#else
-# define machine_is_c4_badger() (0)
-#endif
-
-#ifdef CONFIG_MACH_C4_VIPER
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_C4_VIPER
-# endif
-# define machine_is_c4_viper() (machine_arch_type == MACH_TYPE_C4_VIPER)
-#else
-# define machine_is_c4_viper() (0)
-#endif
-
#ifdef CONFIG_MACH_D2NET
# ifdef machine_arch_type
# undef machine_arch_type
@@ -30349,54 +5653,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_bigdisk() (0)
#endif
-#ifdef CONFIG_MACH_NOTALVISION
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_NOTALVISION
-# endif
-# define machine_is_notalvision() (machine_arch_type == MACH_TYPE_NOTALVISION)
-#else
-# define machine_is_notalvision() (0)
-#endif
-
-#ifdef CONFIG_MACH_OMAP3_KBOC
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_OMAP3_KBOC
-# endif
-# define machine_is_omap3_kboc() (machine_arch_type == MACH_TYPE_OMAP3_KBOC)
-#else
-# define machine_is_omap3_kboc() (0)
-#endif
-
-#ifdef CONFIG_MACH_CYCLONE
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CYCLONE
-# endif
-# define machine_is_cyclone() (machine_arch_type == MACH_TYPE_CYCLONE)
-#else
-# define machine_is_cyclone() (0)
-#endif
-
-#ifdef CONFIG_MACH_NINJA
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_NINJA
-# endif
-# define machine_is_ninja() (machine_arch_type == MACH_TYPE_NINJA)
-#else
-# define machine_is_ninja() (0)
-#endif
-
#ifdef CONFIG_MACH_AT91SAM9G20EK_2MMC
# ifdef machine_arch_type
# undef machine_arch_type
@@ -30421,150 +5677,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_bcmring() (0)
#endif
-#ifdef CONFIG_MACH_RESOL_DL2
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_RESOL_DL2
-# endif
-# define machine_is_resol_dl2() (machine_arch_type == MACH_TYPE_RESOL_DL2)
-#else
-# define machine_is_resol_dl2() (0)
-#endif
-
-#ifdef CONFIG_MACH_IFOSW
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_IFOSW
-# endif
-# define machine_is_ifosw() (machine_arch_type == MACH_TYPE_IFOSW)
-#else
-# define machine_is_ifosw() (0)
-#endif
-
-#ifdef CONFIG_MACH_HTCRHODIUM
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_HTCRHODIUM
-# endif
-# define machine_is_htcrhodium() (machine_arch_type == MACH_TYPE_HTCRHODIUM)
-#else
-# define machine_is_htcrhodium() (0)
-#endif
-
-#ifdef CONFIG_MACH_HTCTOPAZ
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_HTCTOPAZ
-# endif
-# define machine_is_htctopaz() (machine_arch_type == MACH_TYPE_HTCTOPAZ)
-#else
-# define machine_is_htctopaz() (0)
-#endif
-
-#ifdef CONFIG_MACH_MATRIX504
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MATRIX504
-# endif
-# define machine_is_matrix504() (machine_arch_type == MACH_TYPE_MATRIX504)
-#else
-# define machine_is_matrix504() (0)
-#endif
-
-#ifdef CONFIG_MACH_MRFSA
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MRFSA
-# endif
-# define machine_is_mrfsa() (machine_arch_type == MACH_TYPE_MRFSA)
-#else
-# define machine_is_mrfsa() (0)
-#endif
-
-#ifdef CONFIG_MACH_SC_P270
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SC_P270
-# endif
-# define machine_is_sc_p270() (machine_arch_type == MACH_TYPE_SC_P270)
-#else
-# define machine_is_sc_p270() (0)
-#endif
-
-#ifdef CONFIG_MACH_ATLAS5_EVB
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ATLAS5_EVB
-# endif
-# define machine_is_atlas5_evb() (machine_arch_type == MACH_TYPE_ATLAS5_EVB)
-#else
-# define machine_is_atlas5_evb() (0)
-#endif
-
-#ifdef CONFIG_MACH_PELCO_LOBOX
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_PELCO_LOBOX
-# endif
-# define machine_is_pelco_lobox() (machine_arch_type == MACH_TYPE_PELCO_LOBOX)
-#else
-# define machine_is_pelco_lobox() (0)
-#endif
-
-#ifdef CONFIG_MACH_DILAX_PCU200
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_DILAX_PCU200
-# endif
-# define machine_is_dilax_pcu200() (machine_arch_type == MACH_TYPE_DILAX_PCU200)
-#else
-# define machine_is_dilax_pcu200() (0)
-#endif
-
-#ifdef CONFIG_MACH_LEONARDO
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_LEONARDO
-# endif
-# define machine_is_leonardo() (machine_arch_type == MACH_TYPE_LEONARDO)
-#else
-# define machine_is_leonardo() (0)
-#endif
-
-#ifdef CONFIG_MACH_ZORAN_APPROACH7
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ZORAN_APPROACH7
-# endif
-# define machine_is_zoran_approach7() (machine_arch_type == MACH_TYPE_ZORAN_APPROACH7)
-#else
-# define machine_is_zoran_approach7() (0)
-#endif
-
#ifdef CONFIG_MACH_DP6XX
# ifdef machine_arch_type
# undef machine_arch_type
@@ -30577,18 +5689,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_dp6xx() (0)
#endif
-#ifdef CONFIG_MACH_BCM2153_VESPER
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_BCM2153_VESPER
-# endif
-# define machine_is_bcm2153_vesper() (machine_arch_type == MACH_TYPE_BCM2153_VESPER)
-#else
-# define machine_is_bcm2153_vesper() (0)
-#endif
-
#ifdef CONFIG_MACH_MAHIMAHI
# ifdef machine_arch_type
# undef machine_arch_type
@@ -30601,234 +5701,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_mahimahi() (0)
#endif
-#ifdef CONFIG_MACH_CLICKC
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CLICKC
-# endif
-# define machine_is_clickc() (machine_arch_type == MACH_TYPE_CLICKC)
-#else
-# define machine_is_clickc() (0)
-#endif
-
-#ifdef CONFIG_MACH_ZB_GATEWAY
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ZB_GATEWAY
-# endif
-# define machine_is_zb_gateway() (machine_arch_type == MACH_TYPE_ZB_GATEWAY)
-#else
-# define machine_is_zb_gateway() (0)
-#endif
-
-#ifdef CONFIG_MACH_TAZCARD
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_TAZCARD
-# endif
-# define machine_is_tazcard() (machine_arch_type == MACH_TYPE_TAZCARD)
-#else
-# define machine_is_tazcard() (0)
-#endif
-
-#ifdef CONFIG_MACH_TAZDEV
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_TAZDEV
-# endif
-# define machine_is_tazdev() (machine_arch_type == MACH_TYPE_TAZDEV)
-#else
-# define machine_is_tazdev() (0)
-#endif
-
-#ifdef CONFIG_MACH_ANNAX_CB_ARM
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ANNAX_CB_ARM
-# endif
-# define machine_is_annax_cb_arm() (machine_arch_type == MACH_TYPE_ANNAX_CB_ARM)
-#else
-# define machine_is_annax_cb_arm() (0)
-#endif
-
-#ifdef CONFIG_MACH_ANNAX_DM3
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ANNAX_DM3
-# endif
-# define machine_is_annax_dm3() (machine_arch_type == MACH_TYPE_ANNAX_DM3)
-#else
-# define machine_is_annax_dm3() (0)
-#endif
-
-#ifdef CONFIG_MACH_CEREBRIC
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CEREBRIC
-# endif
-# define machine_is_cerebric() (machine_arch_type == MACH_TYPE_CEREBRIC)
-#else
-# define machine_is_cerebric() (0)
-#endif
-
-#ifdef CONFIG_MACH_ORCA
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ORCA
-# endif
-# define machine_is_orca() (machine_arch_type == MACH_TYPE_ORCA)
-#else
-# define machine_is_orca() (0)
-#endif
-
-#ifdef CONFIG_MACH_PC9260
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_PC9260
-# endif
-# define machine_is_pc9260() (machine_arch_type == MACH_TYPE_PC9260)
-#else
-# define machine_is_pc9260() (0)
-#endif
-
-#ifdef CONFIG_MACH_EMS285A
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_EMS285A
-# endif
-# define machine_is_ems285a() (machine_arch_type == MACH_TYPE_EMS285A)
-#else
-# define machine_is_ems285a() (0)
-#endif
-
-#ifdef CONFIG_MACH_GEC2410
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_GEC2410
-# endif
-# define machine_is_gec2410() (machine_arch_type == MACH_TYPE_GEC2410)
-#else
-# define machine_is_gec2410() (0)
-#endif
-
-#ifdef CONFIG_MACH_GEC2440
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_GEC2440
-# endif
-# define machine_is_gec2440() (machine_arch_type == MACH_TYPE_GEC2440)
-#else
-# define machine_is_gec2440() (0)
-#endif
-
-#ifdef CONFIG_MACH_ARCH_MW903
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ARCH_MW903
-# endif
-# define machine_is_mw903() (machine_arch_type == MACH_TYPE_ARCH_MW903)
-#else
-# define machine_is_mw903() (0)
-#endif
-
-#ifdef CONFIG_MACH_MW2440
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MW2440
-# endif
-# define machine_is_mw2440() (machine_arch_type == MACH_TYPE_MW2440)
-#else
-# define machine_is_mw2440() (0)
-#endif
-
-#ifdef CONFIG_MACH_ECAC2378
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ECAC2378
-# endif
-# define machine_is_ecac2378() (machine_arch_type == MACH_TYPE_ECAC2378)
-#else
-# define machine_is_ecac2378() (0)
-#endif
-
-#ifdef CONFIG_MACH_TAZKIOSK
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_TAZKIOSK
-# endif
-# define machine_is_tazkiosk() (machine_arch_type == MACH_TYPE_TAZKIOSK)
-#else
-# define machine_is_tazkiosk() (0)
-#endif
-
-#ifdef CONFIG_MACH_WHITERABBIT_MCH
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_WHITERABBIT_MCH
-# endif
-# define machine_is_whiterabbit_mch() (machine_arch_type == MACH_TYPE_WHITERABBIT_MCH)
-#else
-# define machine_is_whiterabbit_mch() (0)
-#endif
-
-#ifdef CONFIG_MACH_SBOX9263
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SBOX9263
-# endif
-# define machine_is_sbox9263() (machine_arch_type == MACH_TYPE_SBOX9263)
-#else
-# define machine_is_sbox9263() (0)
-#endif
-
-#ifdef CONFIG_MACH_OREO
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_OREO
-# endif
-# define machine_is_oreo() (machine_arch_type == MACH_TYPE_OREO)
-#else
-# define machine_is_oreo() (0)
-#endif
-
#ifdef CONFIG_MACH_SMDK6442
# ifdef machine_arch_type
# undef machine_arch_type
@@ -30853,54 +5725,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_openrd_base() (0)
#endif
-#ifdef CONFIG_MACH_INCREDIBLE
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_INCREDIBLE
-# endif
-# define machine_is_incredible() (machine_arch_type == MACH_TYPE_INCREDIBLE)
-#else
-# define machine_is_incredible() (0)
-#endif
-
-#ifdef CONFIG_MACH_INCREDIBLEC
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_INCREDIBLEC
-# endif
-# define machine_is_incrediblec() (machine_arch_type == MACH_TYPE_INCREDIBLEC)
-#else
-# define machine_is_incrediblec() (0)
-#endif
-
-#ifdef CONFIG_MACH_HEROCT
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_HEROCT
-# endif
-# define machine_is_heroct() (machine_arch_type == MACH_TYPE_HEROCT)
-#else
-# define machine_is_heroct() (0)
-#endif
-
-#ifdef CONFIG_MACH_MMNET1000
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MMNET1000
-# endif
-# define machine_is_mmnet1000() (machine_arch_type == MACH_TYPE_MMNET1000)
-#else
-# define machine_is_mmnet1000() (0)
-#endif
-
#ifdef CONFIG_MACH_DEVKIT8000
# ifdef machine_arch_type
# undef machine_arch_type
@@ -30913,66 +5737,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_devkit8000() (0)
#endif
-#ifdef CONFIG_MACH_DEVKIT9000
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_DEVKIT9000
-# endif
-# define machine_is_devkit9000() (machine_arch_type == MACH_TYPE_DEVKIT9000)
-#else
-# define machine_is_devkit9000() (0)
-#endif
-
-#ifdef CONFIG_MACH_MX31TXTR
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MX31TXTR
-# endif
-# define machine_is_mx31txtr() (machine_arch_type == MACH_TYPE_MX31TXTR)
-#else
-# define machine_is_mx31txtr() (0)
-#endif
-
-#ifdef CONFIG_MACH_U380
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_U380
-# endif
-# define machine_is_u380() (machine_arch_type == MACH_TYPE_U380)
-#else
-# define machine_is_u380() (0)
-#endif
-
-#ifdef CONFIG_MACH_HUALU_BOARD
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_HUALU_BOARD
-# endif
-# define machine_is_oamp3_hualu() (machine_arch_type == MACH_TYPE_HUALU_BOARD)
-#else
-# define machine_is_oamp3_hualu() (0)
-#endif
-
-#ifdef CONFIG_MACH_NPCMX50
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_NPCMX50
-# endif
-# define machine_is_npcmx50() (machine_arch_type == MACH_TYPE_NPCMX50)
-#else
-# define machine_is_npcmx50() (0)
-#endif
-
#ifdef CONFIG_MACH_MX51_EFIKAMX
# ifdef machine_arch_type
# undef machine_arch_type
@@ -30985,54 +5749,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_mx51_efikamx() (0)
#endif
-#ifdef CONFIG_MACH_MX51_LANGE52
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MX51_LANGE52
-# endif
-# define machine_is_mx51_lange52() (machine_arch_type == MACH_TYPE_MX51_LANGE52)
-#else
-# define machine_is_mx51_lange52() (0)
-#endif
-
-#ifdef CONFIG_MACH_RIOM
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_RIOM
-# endif
-# define machine_is_riom() (machine_arch_type == MACH_TYPE_RIOM)
-#else
-# define machine_is_riom() (0)
-#endif
-
-#ifdef CONFIG_MACH_COMCAS
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_COMCAS
-# endif
-# define machine_is_comcas() (machine_arch_type == MACH_TYPE_COMCAS)
-#else
-# define machine_is_comcas() (0)
-#endif
-
-#ifdef CONFIG_MACH_WSI_MX27
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_WSI_MX27
-# endif
-# define machine_is_wsi_mx27() (machine_arch_type == MACH_TYPE_WSI_MX27)
-#else
-# define machine_is_wsi_mx27() (0)
-#endif
-
#ifdef CONFIG_MACH_CM_T35
# ifdef machine_arch_type
# undef machine_arch_type
@@ -31057,18 +5773,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_net2big() (0)
#endif
-#ifdef CONFIG_MACH_MOTOROLA_A1600
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MOTOROLA_A1600
-# endif
-# define machine_is_motorola_a1600() (machine_arch_type == MACH_TYPE_MOTOROLA_A1600)
-#else
-# define machine_is_motorola_a1600() (0)
-#endif
-
#ifdef CONFIG_MACH_IGEP0020
# ifdef machine_arch_type
# undef machine_arch_type
@@ -31081,138 +5785,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_igep0020() (0)
#endif
-#ifdef CONFIG_MACH_IGEP0010
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_IGEP0010
-# endif
-# define machine_is_igep0010() (machine_arch_type == MACH_TYPE_IGEP0010)
-#else
-# define machine_is_igep0010() (0)
-#endif
-
-#ifdef CONFIG_MACH_MV6281GTWGE2
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MV6281GTWGE2
-# endif
-# define machine_is_mv6281gtwge2() (machine_arch_type == MACH_TYPE_MV6281GTWGE2)
-#else
-# define machine_is_mv6281gtwge2() (0)
-#endif
-
-#ifdef CONFIG_MACH_SCAT100
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SCAT100
-# endif
-# define machine_is_scat100() (machine_arch_type == MACH_TYPE_SCAT100)
-#else
-# define machine_is_scat100() (0)
-#endif
-
-#ifdef CONFIG_MACH_SANMINA
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SANMINA
-# endif
-# define machine_is_sanmina() (machine_arch_type == MACH_TYPE_SANMINA)
-#else
-# define machine_is_sanmina() (0)
-#endif
-
-#ifdef CONFIG_MACH_MOMENTO
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MOMENTO
-# endif
-# define machine_is_momento() (machine_arch_type == MACH_TYPE_MOMENTO)
-#else
-# define machine_is_momento() (0)
-#endif
-
-#ifdef CONFIG_MACH_NUC9XX
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_NUC9XX
-# endif
-# define machine_is_nuc9xx() (machine_arch_type == MACH_TYPE_NUC9XX)
-#else
-# define machine_is_nuc9xx() (0)
-#endif
-
-#ifdef CONFIG_MACH_NUC910EVB
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_NUC910EVB
-# endif
-# define machine_is_nuc910evb() (machine_arch_type == MACH_TYPE_NUC910EVB)
-#else
-# define machine_is_nuc910evb() (0)
-#endif
-
-#ifdef CONFIG_MACH_NUC920EVB
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_NUC920EVB
-# endif
-# define machine_is_nuc920evb() (machine_arch_type == MACH_TYPE_NUC920EVB)
-#else
-# define machine_is_nuc920evb() (0)
-#endif
-
-#ifdef CONFIG_MACH_NUC950EVB
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_NUC950EVB
-# endif
-# define machine_is_nuc950evb() (machine_arch_type == MACH_TYPE_NUC950EVB)
-#else
-# define machine_is_nuc950evb() (0)
-#endif
-
-#ifdef CONFIG_MACH_NUC945EVB
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_NUC945EVB
-# endif
-# define machine_is_nuc945evb() (machine_arch_type == MACH_TYPE_NUC945EVB)
-#else
-# define machine_is_nuc945evb() (0)
-#endif
-
-#ifdef CONFIG_MACH_NUC960EVB
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_NUC960EVB
-# endif
-# define machine_is_nuc960evb() (machine_arch_type == MACH_TYPE_NUC960EVB)
-#else
-# define machine_is_nuc960evb() (0)
-#endif
-
#ifdef CONFIG_MACH_NUC932EVB
# ifdef machine_arch_type
# undef machine_arch_type
@@ -31225,54 +5797,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_nuc932evb() (0)
#endif
-#ifdef CONFIG_MACH_NUC900
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_NUC900
-# endif
-# define machine_is_nuc900() (machine_arch_type == MACH_TYPE_NUC900)
-#else
-# define machine_is_nuc900() (0)
-#endif
-
-#ifdef CONFIG_MACH_SD1SOC
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SD1SOC
-# endif
-# define machine_is_sd1soc() (machine_arch_type == MACH_TYPE_SD1SOC)
-#else
-# define machine_is_sd1soc() (0)
-#endif
-
-#ifdef CONFIG_MACH_LN2440BC
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_LN2440BC
-# endif
-# define machine_is_ln2440bc() (machine_arch_type == MACH_TYPE_LN2440BC)
-#else
-# define machine_is_ln2440bc() (0)
-#endif
-
-#ifdef CONFIG_MACH_RSBC
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_RSBC
-# endif
-# define machine_is_rsbc() (machine_arch_type == MACH_TYPE_RSBC)
-#else
-# define machine_is_rsbc() (0)
-#endif
-
#ifdef CONFIG_MACH_OPENRD_CLIENT
# ifdef machine_arch_type
# undef machine_arch_type
@@ -31285,78 +5809,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_openrd_client() (0)
#endif
-#ifdef CONFIG_MACH_HPIPAQ11X
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_HPIPAQ11X
-# endif
-# define machine_is_hpipaq11x() (machine_arch_type == MACH_TYPE_HPIPAQ11X)
-#else
-# define machine_is_hpipaq11x() (0)
-#endif
-
-#ifdef CONFIG_MACH_WAYLAND
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_WAYLAND
-# endif
-# define machine_is_wayland() (machine_arch_type == MACH_TYPE_WAYLAND)
-#else
-# define machine_is_wayland() (0)
-#endif
-
-#ifdef CONFIG_MACH_ACNBSX102
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ACNBSX102
-# endif
-# define machine_is_acnbsx102() (machine_arch_type == MACH_TYPE_ACNBSX102)
-#else
-# define machine_is_acnbsx102() (0)
-#endif
-
-#ifdef CONFIG_MACH_HWAT91
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_HWAT91
-# endif
-# define machine_is_hwat91() (machine_arch_type == MACH_TYPE_HWAT91)
-#else
-# define machine_is_hwat91() (0)
-#endif
-
-#ifdef CONFIG_MACH_AT91SAM9263CS
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_AT91SAM9263CS
-# endif
-# define machine_is_at91sam9263cs() (machine_arch_type == MACH_TYPE_AT91SAM9263CS)
-#else
-# define machine_is_at91sam9263cs() (0)
-#endif
-
-#ifdef CONFIG_MACH_CSB732
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CSB732
-# endif
-# define machine_is_csb732() (machine_arch_type == MACH_TYPE_CSB732)
-#else
-# define machine_is_csb732() (0)
-#endif
-
#ifdef CONFIG_MACH_U8500
# ifdef machine_arch_type
# undef machine_arch_type
@@ -31369,18 +5821,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_u8500() (0)
#endif
-#ifdef CONFIG_MACH_HUQIU
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_HUQIU
-# endif
-# define machine_is_huqiu() (machine_arch_type == MACH_TYPE_HUQIU)
-#else
-# define machine_is_huqiu() (0)
-#endif
-
#ifdef CONFIG_MACH_MX51_EFIKASB
# ifdef machine_arch_type
# undef machine_arch_type
@@ -31393,138 +5833,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_mx51_efikasb() (0)
#endif
-#ifdef CONFIG_MACH_PMT1G
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_PMT1G
-# endif
-# define machine_is_pmt1g() (machine_arch_type == MACH_TYPE_PMT1G)
-#else
-# define machine_is_pmt1g() (0)
-#endif
-
-#ifdef CONFIG_MACH_HTCELF
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_HTCELF
-# endif
-# define machine_is_htcelf() (machine_arch_type == MACH_TYPE_HTCELF)
-#else
-# define machine_is_htcelf() (0)
-#endif
-
-#ifdef CONFIG_MACH_ARMADILLO420
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ARMADILLO420
-# endif
-# define machine_is_armadillo420() (machine_arch_type == MACH_TYPE_ARMADILLO420)
-#else
-# define machine_is_armadillo420() (0)
-#endif
-
-#ifdef CONFIG_MACH_ARMADILLO440
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ARMADILLO440
-# endif
-# define machine_is_armadillo440() (machine_arch_type == MACH_TYPE_ARMADILLO440)
-#else
-# define machine_is_armadillo440() (0)
-#endif
-
-#ifdef CONFIG_MACH_U_CHIP_DUAL_ARM
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_U_CHIP_DUAL_ARM
-# endif
-# define machine_is_u_chip_dual_arm() (machine_arch_type == MACH_TYPE_U_CHIP_DUAL_ARM)
-#else
-# define machine_is_u_chip_dual_arm() (0)
-#endif
-
-#ifdef CONFIG_MACH_CSR_BDB3
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CSR_BDB3
-# endif
-# define machine_is_csr_bdb3() (machine_arch_type == MACH_TYPE_CSR_BDB3)
-#else
-# define machine_is_csr_bdb3() (0)
-#endif
-
-#ifdef CONFIG_MACH_DOLBY_CAT1018
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_DOLBY_CAT1018
-# endif
-# define machine_is_dolby_cat1018() (machine_arch_type == MACH_TYPE_DOLBY_CAT1018)
-#else
-# define machine_is_dolby_cat1018() (0)
-#endif
-
-#ifdef CONFIG_MACH_HY9307
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_HY9307
-# endif
-# define machine_is_hy9307() (machine_arch_type == MACH_TYPE_HY9307)
-#else
-# define machine_is_hy9307() (0)
-#endif
-
-#ifdef CONFIG_MACH_A_ES
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_A_ES
-# endif
-# define machine_is_aspire_easystore() (machine_arch_type == MACH_TYPE_A_ES)
-#else
-# define machine_is_aspire_easystore() (0)
-#endif
-
-#ifdef CONFIG_MACH_DAVINCI_IRIF
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_DAVINCI_IRIF
-# endif
-# define machine_is_davinci_irif() (machine_arch_type == MACH_TYPE_DAVINCI_IRIF)
-#else
-# define machine_is_davinci_irif() (0)
-#endif
-
-#ifdef CONFIG_MACH_AGAMA9263
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_AGAMA9263
-# endif
-# define machine_is_agama9263() (machine_arch_type == MACH_TYPE_AGAMA9263)
-#else
-# define machine_is_agama9263() (0)
-#endif
-
#ifdef CONFIG_MACH_MARVELL_JASPER
# ifdef machine_arch_type
# undef machine_arch_type
@@ -31561,90 +5869,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_tavorevb3() (0)
#endif
-#ifdef CONFIG_MACH_SCH_M490
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SCH_M490
-# endif
-# define machine_is_sch_m490() (machine_arch_type == MACH_TYPE_SCH_M490)
-#else
-# define machine_is_sch_m490() (0)
-#endif
-
-#ifdef CONFIG_MACH_RBL01
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_RBL01
-# endif
-# define machine_is_rbl01() (machine_arch_type == MACH_TYPE_RBL01)
-#else
-# define machine_is_rbl01() (0)
-#endif
-
-#ifdef CONFIG_MACH_OMNIFI
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_OMNIFI
-# endif
-# define machine_is_omnifi() (machine_arch_type == MACH_TYPE_OMNIFI)
-#else
-# define machine_is_omnifi() (0)
-#endif
-
-#ifdef CONFIG_MACH_OTAVALO
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_OTAVALO
-# endif
-# define machine_is_otavalo() (machine_arch_type == MACH_TYPE_OTAVALO)
-#else
-# define machine_is_otavalo() (0)
-#endif
-
-#ifdef CONFIG_MACH_SIENNA
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SIENNA
-# endif
-# define machine_is_sienna() (machine_arch_type == MACH_TYPE_SIENNA)
-#else
-# define machine_is_sienna() (0)
-#endif
-
-#ifdef CONFIG_MACH_HTC_EXCALIBUR_S620
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_HTC_EXCALIBUR_S620
-# endif
-# define machine_is_htc_excalibur_s620() (machine_arch_type == MACH_TYPE_HTC_EXCALIBUR_S620)
-#else
-# define machine_is_htc_excalibur_s620() (0)
-#endif
-
-#ifdef CONFIG_MACH_HTC_OPAL
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_HTC_OPAL
-# endif
-# define machine_is_htc_opal() (machine_arch_type == MACH_TYPE_HTC_OPAL)
-#else
-# define machine_is_htc_opal() (0)
-#endif
-
#ifdef CONFIG_MACH_TOUCHBOOK
# ifdef machine_arch_type
# undef machine_arch_type
@@ -31657,234 +5881,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_touchbook() (0)
#endif
-#ifdef CONFIG_MACH_LATTE
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_LATTE
-# endif
-# define machine_is_latte() (machine_arch_type == MACH_TYPE_LATTE)
-#else
-# define machine_is_latte() (0)
-#endif
-
-#ifdef CONFIG_MACH_XA200
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_XA200
-# endif
-# define machine_is_xa200() (machine_arch_type == MACH_TYPE_XA200)
-#else
-# define machine_is_xa200() (0)
-#endif
-
-#ifdef CONFIG_MACH_NIMROD
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_NIMROD
-# endif
-# define machine_is_nimrod() (machine_arch_type == MACH_TYPE_NIMROD)
-#else
-# define machine_is_nimrod() (0)
-#endif
-
-#ifdef CONFIG_MACH_CC9P9215_3G
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CC9P9215_3G
-# endif
-# define machine_is_cc9p9215_3g() (machine_arch_type == MACH_TYPE_CC9P9215_3G)
-#else
-# define machine_is_cc9p9215_3g() (0)
-#endif
-
-#ifdef CONFIG_MACH_CC9P9215_3GJS
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CC9P9215_3GJS
-# endif
-# define machine_is_cc9p9215_3gjs() (machine_arch_type == MACH_TYPE_CC9P9215_3GJS)
-#else
-# define machine_is_cc9p9215_3gjs() (0)
-#endif
-
-#ifdef CONFIG_MACH_TK71
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_TK71
-# endif
-# define machine_is_tk71() (machine_arch_type == MACH_TYPE_TK71)
-#else
-# define machine_is_tk71() (0)
-#endif
-
-#ifdef CONFIG_MACH_COMHAM3525
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_COMHAM3525
-# endif
-# define machine_is_comham3525() (machine_arch_type == MACH_TYPE_COMHAM3525)
-#else
-# define machine_is_comham3525() (0)
-#endif
-
-#ifdef CONFIG_MACH_MX31EREBUS
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MX31EREBUS
-# endif
-# define machine_is_mx31erebus() (machine_arch_type == MACH_TYPE_MX31EREBUS)
-#else
-# define machine_is_mx31erebus() (0)
-#endif
-
-#ifdef CONFIG_MACH_MCARDMX27
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MCARDMX27
-# endif
-# define machine_is_mcardmx27() (machine_arch_type == MACH_TYPE_MCARDMX27)
-#else
-# define machine_is_mcardmx27() (0)
-#endif
-
-#ifdef CONFIG_MACH_PARADISE
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_PARADISE
-# endif
-# define machine_is_paradise() (machine_arch_type == MACH_TYPE_PARADISE)
-#else
-# define machine_is_paradise() (0)
-#endif
-
-#ifdef CONFIG_MACH_TIDE
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_TIDE
-# endif
-# define machine_is_tide() (machine_arch_type == MACH_TYPE_TIDE)
-#else
-# define machine_is_tide() (0)
-#endif
-
-#ifdef CONFIG_MACH_WZL2440
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_WZL2440
-# endif
-# define machine_is_wzl2440() (machine_arch_type == MACH_TYPE_WZL2440)
-#else
-# define machine_is_wzl2440() (0)
-#endif
-
-#ifdef CONFIG_MACH_SDRDEMO
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SDRDEMO
-# endif
-# define machine_is_sdrdemo() (machine_arch_type == MACH_TYPE_SDRDEMO)
-#else
-# define machine_is_sdrdemo() (0)
-#endif
-
-#ifdef CONFIG_MACH_ETHERCAN2
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ETHERCAN2
-# endif
-# define machine_is_ethercan2() (machine_arch_type == MACH_TYPE_ETHERCAN2)
-#else
-# define machine_is_ethercan2() (0)
-#endif
-
-#ifdef CONFIG_MACH_ECMIMG20
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ECMIMG20
-# endif
-# define machine_is_ecmimg20() (machine_arch_type == MACH_TYPE_ECMIMG20)
-#else
-# define machine_is_ecmimg20() (0)
-#endif
-
-#ifdef CONFIG_MACH_OMAP_DRAGON
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_OMAP_DRAGON
-# endif
-# define machine_is_omap_dragon() (machine_arch_type == MACH_TYPE_OMAP_DRAGON)
-#else
-# define machine_is_omap_dragon() (0)
-#endif
-
-#ifdef CONFIG_MACH_HALO
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_HALO
-# endif
-# define machine_is_halo() (machine_arch_type == MACH_TYPE_HALO)
-#else
-# define machine_is_halo() (0)
-#endif
-
-#ifdef CONFIG_MACH_HUANGSHAN
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_HUANGSHAN
-# endif
-# define machine_is_huangshan() (machine_arch_type == MACH_TYPE_HUANGSHAN)
-#else
-# define machine_is_huangshan() (0)
-#endif
-
-#ifdef CONFIG_MACH_VL_MA2SC
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_VL_MA2SC
-# endif
-# define machine_is_vl_ma2sc() (machine_arch_type == MACH_TYPE_VL_MA2SC)
-#else
-# define machine_is_vl_ma2sc() (0)
-#endif
-
#ifdef CONFIG_MACH_RAUMFELD_RC
# ifdef machine_arch_type
# undef machine_arch_type
@@ -31921,30 +5917,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_raumfeld_speaker() (0)
#endif
-#ifdef CONFIG_MACH_MULTIBUS_MASTER
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MULTIBUS_MASTER
-# endif
-# define machine_is_multibus_master() (machine_arch_type == MACH_TYPE_MULTIBUS_MASTER)
-#else
-# define machine_is_multibus_master() (0)
-#endif
-
-#ifdef CONFIG_MACH_MULTIBUS_PBK
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MULTIBUS_PBK
-# endif
-# define machine_is_multibus_pbk() (machine_arch_type == MACH_TYPE_MULTIBUS_PBK)
-#else
-# define machine_is_multibus_pbk() (0)
-#endif
-
#ifdef CONFIG_MACH_TNETV107X
# ifdef machine_arch_type
# undef machine_arch_type
@@ -31957,450 +5929,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_tnetv107x() (0)
#endif
-#ifdef CONFIG_MACH_SNAKE
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SNAKE
-# endif
-# define machine_is_snake() (machine_arch_type == MACH_TYPE_SNAKE)
-#else
-# define machine_is_snake() (0)
-#endif
-
-#ifdef CONFIG_MACH_CWMX27
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CWMX27
-# endif
-# define machine_is_cwmx27() (machine_arch_type == MACH_TYPE_CWMX27)
-#else
-# define machine_is_cwmx27() (0)
-#endif
-
-#ifdef CONFIG_MACH_SCH_M480
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SCH_M480
-# endif
-# define machine_is_sch_m480() (machine_arch_type == MACH_TYPE_SCH_M480)
-#else
-# define machine_is_sch_m480() (0)
-#endif
-
-#ifdef CONFIG_MACH_PLATYPUS
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_PLATYPUS
-# endif
-# define machine_is_platypus() (machine_arch_type == MACH_TYPE_PLATYPUS)
-#else
-# define machine_is_platypus() (0)
-#endif
-
-#ifdef CONFIG_MACH_PSS2
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_PSS2
-# endif
-# define machine_is_pss2() (machine_arch_type == MACH_TYPE_PSS2)
-#else
-# define machine_is_pss2() (0)
-#endif
-
-#ifdef CONFIG_MACH_DAVINCI_APM150
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_DAVINCI_APM150
-# endif
-# define machine_is_davinci_apm150() (machine_arch_type == MACH_TYPE_DAVINCI_APM150)
-#else
-# define machine_is_davinci_apm150() (0)
-#endif
-
-#ifdef CONFIG_MACH_STR9100
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_STR9100
-# endif
-# define machine_is_str9100() (machine_arch_type == MACH_TYPE_STR9100)
-#else
-# define machine_is_str9100() (0)
-#endif
-
-#ifdef CONFIG_MACH_NET5BIG
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_NET5BIG
-# endif
-# define machine_is_net5big() (machine_arch_type == MACH_TYPE_NET5BIG)
-#else
-# define machine_is_net5big() (0)
-#endif
-
-#ifdef CONFIG_MACH_SEABED9263
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SEABED9263
-# endif
-# define machine_is_seabed9263() (machine_arch_type == MACH_TYPE_SEABED9263)
-#else
-# define machine_is_seabed9263() (0)
-#endif
-
-#ifdef CONFIG_MACH_MX51_M2ID
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MX51_M2ID
-# endif
-# define machine_is_mx51_m2id() (machine_arch_type == MACH_TYPE_MX51_M2ID)
-#else
-# define machine_is_mx51_m2id() (0)
-#endif
-
-#ifdef CONFIG_MACH_OCTVOCPLUS_EB
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_OCTVOCPLUS_EB
-# endif
-# define machine_is_octvocplus_eb() (machine_arch_type == MACH_TYPE_OCTVOCPLUS_EB)
-#else
-# define machine_is_octvocplus_eb() (0)
-#endif
-
-#ifdef CONFIG_MACH_KLK_FIREFOX
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_KLK_FIREFOX
-# endif
-# define machine_is_klk_firefox() (machine_arch_type == MACH_TYPE_KLK_FIREFOX)
-#else
-# define machine_is_klk_firefox() (0)
-#endif
-
-#ifdef CONFIG_MACH_KLK_WIRMA_MODULE
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_KLK_WIRMA_MODULE
-# endif
-# define machine_is_klk_wirma_module() (machine_arch_type == MACH_TYPE_KLK_WIRMA_MODULE)
-#else
-# define machine_is_klk_wirma_module() (0)
-#endif
-
-#ifdef CONFIG_MACH_KLK_WIRMA_MMI
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_KLK_WIRMA_MMI
-# endif
-# define machine_is_klk_wirma_mmi() (machine_arch_type == MACH_TYPE_KLK_WIRMA_MMI)
-#else
-# define machine_is_klk_wirma_mmi() (0)
-#endif
-
-#ifdef CONFIG_MACH_SUPERSONIC
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SUPERSONIC
-# endif
-# define machine_is_supersonic() (machine_arch_type == MACH_TYPE_SUPERSONIC)
-#else
-# define machine_is_supersonic() (0)
-#endif
-
-#ifdef CONFIG_MACH_LIBERTY
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_LIBERTY
-# endif
-# define machine_is_liberty() (machine_arch_type == MACH_TYPE_LIBERTY)
-#else
-# define machine_is_liberty() (0)
-#endif
-
-#ifdef CONFIG_MACH_MH355
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MH355
-# endif
-# define machine_is_mh355() (machine_arch_type == MACH_TYPE_MH355)
-#else
-# define machine_is_mh355() (0)
-#endif
-
-#ifdef CONFIG_MACH_PC7802
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_PC7802
-# endif
-# define machine_is_pc7802() (machine_arch_type == MACH_TYPE_PC7802)
-#else
-# define machine_is_pc7802() (0)
-#endif
-
-#ifdef CONFIG_MACH_GNET_SGC
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_GNET_SGC
-# endif
-# define machine_is_gnet_sgc() (machine_arch_type == MACH_TYPE_GNET_SGC)
-#else
-# define machine_is_gnet_sgc() (0)
-#endif
-
-#ifdef CONFIG_MACH_EINSTEIN15
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_EINSTEIN15
-# endif
-# define machine_is_einstein15() (machine_arch_type == MACH_TYPE_EINSTEIN15)
-#else
-# define machine_is_einstein15() (0)
-#endif
-
-#ifdef CONFIG_MACH_CMPD
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CMPD
-# endif
-# define machine_is_cmpd() (machine_arch_type == MACH_TYPE_CMPD)
-#else
-# define machine_is_cmpd() (0)
-#endif
-
-#ifdef CONFIG_MACH_DAVINCI_HASE1
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_DAVINCI_HASE1
-# endif
-# define machine_is_davinci_hase1() (machine_arch_type == MACH_TYPE_DAVINCI_HASE1)
-#else
-# define machine_is_davinci_hase1() (0)
-#endif
-
-#ifdef CONFIG_MACH_LGEINCITEPHONE
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_LGEINCITEPHONE
-# endif
-# define machine_is_lgeincitephone() (machine_arch_type == MACH_TYPE_LGEINCITEPHONE)
-#else
-# define machine_is_lgeincitephone() (0)
-#endif
-
-#ifdef CONFIG_MACH_EA313X
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_EA313X
-# endif
-# define machine_is_ea313x() (machine_arch_type == MACH_TYPE_EA313X)
-#else
-# define machine_is_ea313x() (0)
-#endif
-
-#ifdef CONFIG_MACH_FWBD_39064
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_FWBD_39064
-# endif
-# define machine_is_fwbd_39064() (machine_arch_type == MACH_TYPE_FWBD_39064)
-#else
-# define machine_is_fwbd_39064() (0)
-#endif
-
-#ifdef CONFIG_MACH_FWBD_390128
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_FWBD_390128
-# endif
-# define machine_is_fwbd_390128() (machine_arch_type == MACH_TYPE_FWBD_390128)
-#else
-# define machine_is_fwbd_390128() (0)
-#endif
-
-#ifdef CONFIG_MACH_PELCO_MOE
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_PELCO_MOE
-# endif
-# define machine_is_pelco_moe() (machine_arch_type == MACH_TYPE_PELCO_MOE)
-#else
-# define machine_is_pelco_moe() (0)
-#endif
-
-#ifdef CONFIG_MACH_MINIMIX27
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MINIMIX27
-# endif
-# define machine_is_minimix27() (machine_arch_type == MACH_TYPE_MINIMIX27)
-#else
-# define machine_is_minimix27() (0)
-#endif
-
-#ifdef CONFIG_MACH_OMAP3_THUNDER
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_OMAP3_THUNDER
-# endif
-# define machine_is_omap3_thunder() (machine_arch_type == MACH_TYPE_OMAP3_THUNDER)
-#else
-# define machine_is_omap3_thunder() (0)
-#endif
-
-#ifdef CONFIG_MACH_PASSIONC
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_PASSIONC
-# endif
-# define machine_is_passionc() (machine_arch_type == MACH_TYPE_PASSIONC)
-#else
-# define machine_is_passionc() (0)
-#endif
-
-#ifdef CONFIG_MACH_MX27AMATA
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MX27AMATA
-# endif
-# define machine_is_mx27amata() (machine_arch_type == MACH_TYPE_MX27AMATA)
-#else
-# define machine_is_mx27amata() (0)
-#endif
-
-#ifdef CONFIG_MACH_BGAT1
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_BGAT1
-# endif
-# define machine_is_bgat1() (machine_arch_type == MACH_TYPE_BGAT1)
-#else
-# define machine_is_bgat1() (0)
-#endif
-
-#ifdef CONFIG_MACH_BUZZ
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_BUZZ
-# endif
-# define machine_is_buzz() (machine_arch_type == MACH_TYPE_BUZZ)
-#else
-# define machine_is_buzz() (0)
-#endif
-
-#ifdef CONFIG_MACH_MB9G20
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MB9G20
-# endif
-# define machine_is_mb9g20() (machine_arch_type == MACH_TYPE_MB9G20)
-#else
-# define machine_is_mb9g20() (0)
-#endif
-
-#ifdef CONFIG_MACH_YUSHAN
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_YUSHAN
-# endif
-# define machine_is_yushan() (machine_arch_type == MACH_TYPE_YUSHAN)
-#else
-# define machine_is_yushan() (0)
-#endif
-
-#ifdef CONFIG_MACH_LIZARD
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_LIZARD
-# endif
-# define machine_is_lizard() (machine_arch_type == MACH_TYPE_LIZARD)
-#else
-# define machine_is_lizard() (0)
-#endif
-
-#ifdef CONFIG_MACH_OMAP3POLYCOM
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_OMAP3POLYCOM
-# endif
-# define machine_is_omap3polycom() (machine_arch_type == MACH_TYPE_OMAP3POLYCOM)
-#else
-# define machine_is_omap3polycom() (0)
-#endif
-
#ifdef CONFIG_MACH_SMDKV210
# ifdef machine_arch_type
# undef machine_arch_type
@@ -32413,90 +5941,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_smdkv210() (0)
#endif
-#ifdef CONFIG_MACH_BRAVO
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_BRAVO
-# endif
-# define machine_is_bravo() (machine_arch_type == MACH_TYPE_BRAVO)
-#else
-# define machine_is_bravo() (0)
-#endif
-
-#ifdef CONFIG_MACH_SIOGENTOO1
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SIOGENTOO1
-# endif
-# define machine_is_siogentoo1() (machine_arch_type == MACH_TYPE_SIOGENTOO1)
-#else
-# define machine_is_siogentoo1() (0)
-#endif
-
-#ifdef CONFIG_MACH_SIOGENTOO2
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SIOGENTOO2
-# endif
-# define machine_is_siogentoo2() (machine_arch_type == MACH_TYPE_SIOGENTOO2)
-#else
-# define machine_is_siogentoo2() (0)
-#endif
-
-#ifdef CONFIG_MACH_SM3K
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SM3K
-# endif
-# define machine_is_sm3k() (machine_arch_type == MACH_TYPE_SM3K)
-#else
-# define machine_is_sm3k() (0)
-#endif
-
-#ifdef CONFIG_MACH_ACER_TEMPO_F900
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ACER_TEMPO_F900
-# endif
-# define machine_is_acer_tempo_f900() (machine_arch_type == MACH_TYPE_ACER_TEMPO_F900)
-#else
-# define machine_is_acer_tempo_f900() (0)
-#endif
-
-#ifdef CONFIG_MACH_SST61VC010_DEV
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SST61VC010_DEV
-# endif
-# define machine_is_sst61vc010_dev() (machine_arch_type == MACH_TYPE_SST61VC010_DEV)
-#else
-# define machine_is_sst61vc010_dev() (0)
-#endif
-
-#ifdef CONFIG_MACH_GLITTERTIND
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_GLITTERTIND
-# endif
-# define machine_is_glittertind() (machine_arch_type == MACH_TYPE_GLITTERTIND)
-#else
-# define machine_is_glittertind() (0)
-#endif
-
#ifdef CONFIG_MACH_OMAP_ZOOM3
# ifdef machine_arch_type
# undef machine_arch_type
@@ -32521,162 +5965,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_omap_3630sdp() (0)
#endif
-#ifdef CONFIG_MACH_CYBOOK2440
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CYBOOK2440
-# endif
-# define machine_is_cybook2440() (machine_arch_type == MACH_TYPE_CYBOOK2440)
-#else
-# define machine_is_cybook2440() (0)
-#endif
-
-#ifdef CONFIG_MACH_TORINO_S
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_TORINO_S
-# endif
-# define machine_is_torino_s() (machine_arch_type == MACH_TYPE_TORINO_S)
-#else
-# define machine_is_torino_s() (0)
-#endif
-
-#ifdef CONFIG_MACH_HAVANA
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_HAVANA
-# endif
-# define machine_is_havana() (machine_arch_type == MACH_TYPE_HAVANA)
-#else
-# define machine_is_havana() (0)
-#endif
-
-#ifdef CONFIG_MACH_BEAUMONT_11
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_BEAUMONT_11
-# endif
-# define machine_is_beaumont_11() (machine_arch_type == MACH_TYPE_BEAUMONT_11)
-#else
-# define machine_is_beaumont_11() (0)
-#endif
-
-#ifdef CONFIG_MACH_VANGUARD
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_VANGUARD
-# endif
-# define machine_is_vanguard() (machine_arch_type == MACH_TYPE_VANGUARD)
-#else
-# define machine_is_vanguard() (0)
-#endif
-
-#ifdef CONFIG_MACH_S5PC110_DRACO
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_S5PC110_DRACO
-# endif
-# define machine_is_s5pc110_draco() (machine_arch_type == MACH_TYPE_S5PC110_DRACO)
-#else
-# define machine_is_s5pc110_draco() (0)
-#endif
-
-#ifdef CONFIG_MACH_CARTESIO_TWO
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CARTESIO_TWO
-# endif
-# define machine_is_cartesio_two() (machine_arch_type == MACH_TYPE_CARTESIO_TWO)
-#else
-# define machine_is_cartesio_two() (0)
-#endif
-
-#ifdef CONFIG_MACH_ASTER
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ASTER
-# endif
-# define machine_is_aster() (machine_arch_type == MACH_TYPE_ASTER)
-#else
-# define machine_is_aster() (0)
-#endif
-
-#ifdef CONFIG_MACH_VOGUESV210
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_VOGUESV210
-# endif
-# define machine_is_voguesv210() (machine_arch_type == MACH_TYPE_VOGUESV210)
-#else
-# define machine_is_voguesv210() (0)
-#endif
-
-#ifdef CONFIG_MACH_ACM500X
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ACM500X
-# endif
-# define machine_is_acm500x() (machine_arch_type == MACH_TYPE_ACM500X)
-#else
-# define machine_is_acm500x() (0)
-#endif
-
-#ifdef CONFIG_MACH_KM9260
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_KM9260
-# endif
-# define machine_is_km9260() (machine_arch_type == MACH_TYPE_KM9260)
-#else
-# define machine_is_km9260() (0)
-#endif
-
-#ifdef CONFIG_MACH_NIDEFLEXG1
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_NIDEFLEXG1
-# endif
-# define machine_is_nideflexg1() (machine_arch_type == MACH_TYPE_NIDEFLEXG1)
-#else
-# define machine_is_nideflexg1() (0)
-#endif
-
-#ifdef CONFIG_MACH_CTERA_PLUG_IO
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CTERA_PLUG_IO
-# endif
-# define machine_is_ctera_plug_io() (machine_arch_type == MACH_TYPE_CTERA_PLUG_IO)
-#else
-# define machine_is_ctera_plug_io() (0)
-#endif
-
#ifdef CONFIG_MACH_SMARTQ7
# ifdef machine_arch_type
# undef machine_arch_type
@@ -32689,138 +5977,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_smartq7() (0)
#endif
-#ifdef CONFIG_MACH_AT91SAM9G10EK2
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_AT91SAM9G10EK2
-# endif
-# define machine_is_at91sam9g10ek2() (machine_arch_type == MACH_TYPE_AT91SAM9G10EK2)
-#else
-# define machine_is_at91sam9g10ek2() (0)
-#endif
-
-#ifdef CONFIG_MACH_ASUSP527
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ASUSP527
-# endif
-# define machine_is_asusp527() (machine_arch_type == MACH_TYPE_ASUSP527)
-#else
-# define machine_is_asusp527() (0)
-#endif
-
-#ifdef CONFIG_MACH_AT91SAM9G20MPM2
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_AT91SAM9G20MPM2
-# endif
-# define machine_is_at91sam9g20mpm2() (machine_arch_type == MACH_TYPE_AT91SAM9G20MPM2)
-#else
-# define machine_is_at91sam9g20mpm2() (0)
-#endif
-
-#ifdef CONFIG_MACH_TOPASA900
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_TOPASA900
-# endif
-# define machine_is_topasa900() (machine_arch_type == MACH_TYPE_TOPASA900)
-#else
-# define machine_is_topasa900() (0)
-#endif
-
-#ifdef CONFIG_MACH_ELECTRUM_100
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ELECTRUM_100
-# endif
-# define machine_is_electrum_100() (machine_arch_type == MACH_TYPE_ELECTRUM_100)
-#else
-# define machine_is_electrum_100() (0)
-#endif
-
-#ifdef CONFIG_MACH_MX51GRB
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MX51GRB
-# endif
-# define machine_is_mx51grb() (machine_arch_type == MACH_TYPE_MX51GRB)
-#else
-# define machine_is_mx51grb() (0)
-#endif
-
-#ifdef CONFIG_MACH_XEA300
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_XEA300
-# endif
-# define machine_is_xea300() (machine_arch_type == MACH_TYPE_XEA300)
-#else
-# define machine_is_xea300() (0)
-#endif
-
-#ifdef CONFIG_MACH_HTCSTARTREK
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_HTCSTARTREK
-# endif
-# define machine_is_htcstartrek() (machine_arch_type == MACH_TYPE_HTCSTARTREK)
-#else
-# define machine_is_htcstartrek() (0)
-#endif
-
-#ifdef CONFIG_MACH_LIMA
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_LIMA
-# endif
-# define machine_is_lima() (machine_arch_type == MACH_TYPE_LIMA)
-#else
-# define machine_is_lima() (0)
-#endif
-
-#ifdef CONFIG_MACH_CSB740
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CSB740
-# endif
-# define machine_is_csb740() (machine_arch_type == MACH_TYPE_CSB740)
-#else
-# define machine_is_csb740() (0)
-#endif
-
-#ifdef CONFIG_MACH_USB_S8815
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_USB_S8815
-# endif
-# define machine_is_usb_s8815() (machine_arch_type == MACH_TYPE_USB_S8815)
-#else
-# define machine_is_usb_s8815() (0)
-#endif
-
#ifdef CONFIG_MACH_WATSON_EFM_PLUGIN
# ifdef machine_arch_type
# undef machine_arch_type
@@ -32833,18 +5989,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_watson_efm_plugin() (0)
#endif
-#ifdef CONFIG_MACH_MILKYWAY
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MILKYWAY
-# endif
-# define machine_is_milkyway() (machine_arch_type == MACH_TYPE_MILKYWAY)
-#else
-# define machine_is_milkyway() (0)
-#endif
-
#ifdef CONFIG_MACH_G4EVM
# ifdef machine_arch_type
# undef machine_arch_type
@@ -32857,18 +6001,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_g4evm() (0)
#endif
-#ifdef CONFIG_MACH_PICOMOD6
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_PICOMOD6
-# endif
-# define machine_is_picomod6() (machine_arch_type == MACH_TYPE_PICOMOD6)
-#else
-# define machine_is_picomod6() (0)
-#endif
-
#ifdef CONFIG_MACH_OMAPL138_HAWKBOARD
# ifdef machine_arch_type
# undef machine_arch_type
@@ -32881,78 +6013,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_omapl138_hawkboard() (0)
#endif
-#ifdef CONFIG_MACH_IP6000
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_IP6000
-# endif
-# define machine_is_ip6000() (machine_arch_type == MACH_TYPE_IP6000)
-#else
-# define machine_is_ip6000() (0)
-#endif
-
-#ifdef CONFIG_MACH_IP6010
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_IP6010
-# endif
-# define machine_is_ip6010() (machine_arch_type == MACH_TYPE_IP6010)
-#else
-# define machine_is_ip6010() (0)
-#endif
-
-#ifdef CONFIG_MACH_UTM400
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_UTM400
-# endif
-# define machine_is_utm400() (machine_arch_type == MACH_TYPE_UTM400)
-#else
-# define machine_is_utm400() (0)
-#endif
-
-#ifdef CONFIG_MACH_OMAP3_ZYBEX
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_OMAP3_ZYBEX
-# endif
-# define machine_is_omap3_zybex() (machine_arch_type == MACH_TYPE_OMAP3_ZYBEX)
-#else
-# define machine_is_omap3_zybex() (0)
-#endif
-
-#ifdef CONFIG_MACH_WIRELESS_SPACE
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_WIRELESS_SPACE
-# endif
-# define machine_is_wireless_space() (machine_arch_type == MACH_TYPE_WIRELESS_SPACE)
-#else
-# define machine_is_wireless_space() (0)
-#endif
-
-#ifdef CONFIG_MACH_SX560
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SX560
-# endif
-# define machine_is_sx560() (machine_arch_type == MACH_TYPE_SX560)
-#else
-# define machine_is_sx560() (0)
-#endif
-
#ifdef CONFIG_MACH_TS41X
# ifdef machine_arch_type
# undef machine_arch_type
@@ -32965,102 +6025,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_ts41x() (0)
#endif
-#ifdef CONFIG_MACH_ELPHEL10373
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ELPHEL10373
-# endif
-# define machine_is_elphel10373() (machine_arch_type == MACH_TYPE_ELPHEL10373)
-#else
-# define machine_is_elphel10373() (0)
-#endif
-
-#ifdef CONFIG_MACH_RHOBOT
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_RHOBOT
-# endif
-# define machine_is_rhobot() (machine_arch_type == MACH_TYPE_RHOBOT)
-#else
-# define machine_is_rhobot() (0)
-#endif
-
-#ifdef CONFIG_MACH_MX51_REFRESH
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MX51_REFRESH
-# endif
-# define machine_is_mx51_refresh() (machine_arch_type == MACH_TYPE_MX51_REFRESH)
-#else
-# define machine_is_mx51_refresh() (0)
-#endif
-
-#ifdef CONFIG_MACH_LS9260
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_LS9260
-# endif
-# define machine_is_ls9260() (machine_arch_type == MACH_TYPE_LS9260)
-#else
-# define machine_is_ls9260() (0)
-#endif
-
-#ifdef CONFIG_MACH_SHANK
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SHANK
-# endif
-# define machine_is_shank() (machine_arch_type == MACH_TYPE_SHANK)
-#else
-# define machine_is_shank() (0)
-#endif
-
-#ifdef CONFIG_MACH_QSD8X50_ST1
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_QSD8X50_ST1
-# endif
-# define machine_is_qsd8x50_st1() (machine_arch_type == MACH_TYPE_QSD8X50_ST1)
-#else
-# define machine_is_qsd8x50_st1() (0)
-#endif
-
-#ifdef CONFIG_MACH_AT91SAM9M10EKES
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_AT91SAM9M10EKES
-# endif
-# define machine_is_at91sam9m10ekes() (machine_arch_type == MACH_TYPE_AT91SAM9M10EKES)
-#else
-# define machine_is_at91sam9m10ekes() (0)
-#endif
-
-#ifdef CONFIG_MACH_HIRAM
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_HIRAM
-# endif
-# define machine_is_hiram() (machine_arch_type == MACH_TYPE_HIRAM)
-#else
-# define machine_is_hiram() (0)
-#endif
-
#ifdef CONFIG_MACH_PHY3250
# ifdef machine_arch_type
# undef machine_arch_type
@@ -33073,102 +6037,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_phy3250() (0)
#endif
-#ifdef CONFIG_MACH_EA3250
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_EA3250
-# endif
-# define machine_is_ea3250() (machine_arch_type == MACH_TYPE_EA3250)
-#else
-# define machine_is_ea3250() (0)
-#endif
-
-#ifdef CONFIG_MACH_FDI3250
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_FDI3250
-# endif
-# define machine_is_fdi3250() (machine_arch_type == MACH_TYPE_FDI3250)
-#else
-# define machine_is_fdi3250() (0)
-#endif
-
-#ifdef CONFIG_MACH_WHITESTONE
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_WHITESTONE
-# endif
-# define machine_is_whitestone() (machine_arch_type == MACH_TYPE_WHITESTONE)
-#else
-# define machine_is_whitestone() (0)
-#endif
-
-#ifdef CONFIG_MACH_AT91SAM9263NIT
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_AT91SAM9263NIT
-# endif
-# define machine_is_at91sam9263nit() (machine_arch_type == MACH_TYPE_AT91SAM9263NIT)
-#else
-# define machine_is_at91sam9263nit() (0)
-#endif
-
-#ifdef CONFIG_MACH_CCMX51
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CCMX51
-# endif
-# define machine_is_ccmx51() (machine_arch_type == MACH_TYPE_CCMX51)
-#else
-# define machine_is_ccmx51() (0)
-#endif
-
-#ifdef CONFIG_MACH_CCMX51JS
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CCMX51JS
-# endif
-# define machine_is_ccmx51js() (machine_arch_type == MACH_TYPE_CCMX51JS)
-#else
-# define machine_is_ccmx51js() (0)
-#endif
-
-#ifdef CONFIG_MACH_CCWMX51
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CCWMX51
-# endif
-# define machine_is_ccwmx51() (machine_arch_type == MACH_TYPE_CCWMX51)
-#else
-# define machine_is_ccwmx51() (0)
-#endif
-
-#ifdef CONFIG_MACH_CCWMX51JS
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CCWMX51JS
-# endif
-# define machine_is_ccwmx51js() (machine_arch_type == MACH_TYPE_CCWMX51JS)
-#else
-# define machine_is_ccwmx51js() (0)
-#endif
-
#ifdef CONFIG_MACH_MINI6410
# ifdef machine_arch_type
# undef machine_arch_type
@@ -33181,126 +6049,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_mini6410() (0)
#endif
-#ifdef CONFIG_MACH_TINY6410
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_TINY6410
-# endif
-# define machine_is_tiny6410() (machine_arch_type == MACH_TYPE_TINY6410)
-#else
-# define machine_is_tiny6410() (0)
-#endif
-
-#ifdef CONFIG_MACH_NANO6410
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_NANO6410
-# endif
-# define machine_is_nano6410() (machine_arch_type == MACH_TYPE_NANO6410)
-#else
-# define machine_is_nano6410() (0)
-#endif
-
-#ifdef CONFIG_MACH_AT572D940HFNLDB
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_AT572D940HFNLDB
-# endif
-# define machine_is_at572d940hfnldb() (machine_arch_type == MACH_TYPE_AT572D940HFNLDB)
-#else
-# define machine_is_at572d940hfnldb() (0)
-#endif
-
-#ifdef CONFIG_MACH_HTCLEO
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_HTCLEO
-# endif
-# define machine_is_htcleo() (machine_arch_type == MACH_TYPE_HTCLEO)
-#else
-# define machine_is_htcleo() (0)
-#endif
-
-#ifdef CONFIG_MACH_AVP13
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_AVP13
-# endif
-# define machine_is_avp13() (machine_arch_type == MACH_TYPE_AVP13)
-#else
-# define machine_is_avp13() (0)
-#endif
-
-#ifdef CONFIG_MACH_XXSVIDEOD
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_XXSVIDEOD
-# endif
-# define machine_is_xxsvideod() (machine_arch_type == MACH_TYPE_XXSVIDEOD)
-#else
-# define machine_is_xxsvideod() (0)
-#endif
-
-#ifdef CONFIG_MACH_VPNEXT
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_VPNEXT
-# endif
-# define machine_is_vpnext() (machine_arch_type == MACH_TYPE_VPNEXT)
-#else
-# define machine_is_vpnext() (0)
-#endif
-
-#ifdef CONFIG_MACH_SWARCO_ITC3
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SWARCO_ITC3
-# endif
-# define machine_is_swarco_itc3() (machine_arch_type == MACH_TYPE_SWARCO_ITC3)
-#else
-# define machine_is_swarco_itc3() (0)
-#endif
-
-#ifdef CONFIG_MACH_TX51
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_TX51
-# endif
-# define machine_is_tx51() (machine_arch_type == MACH_TYPE_TX51)
-#else
-# define machine_is_tx51() (0)
-#endif
-
-#ifdef CONFIG_MACH_DOLBY_CAT1021
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_DOLBY_CAT1021
-# endif
-# define machine_is_dolby_cat1021() (machine_arch_type == MACH_TYPE_DOLBY_CAT1021)
-#else
-# define machine_is_dolby_cat1021() (0)
-#endif
-
#ifdef CONFIG_MACH_MX28EVK
# ifdef machine_arch_type
# undef machine_arch_type
@@ -33313,30 +6061,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_mx28evk() (0)
#endif
-#ifdef CONFIG_MACH_PHOENIX260
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_PHOENIX260
-# endif
-# define machine_is_phoenix260() (machine_arch_type == MACH_TYPE_PHOENIX260)
-#else
-# define machine_is_phoenix260() (0)
-#endif
-
-#ifdef CONFIG_MACH_UVACA_STORK
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_UVACA_STORK
-# endif
-# define machine_is_uvaca_stork() (machine_arch_type == MACH_TYPE_UVACA_STORK)
-#else
-# define machine_is_uvaca_stork() (0)
-#endif
-
#ifdef CONFIG_MACH_SMARTQ5
# ifdef machine_arch_type
# undef machine_arch_type
@@ -33349,162 +6073,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_smartq5() (0)
#endif
-#ifdef CONFIG_MACH_ALL3078
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ALL3078
-# endif
-# define machine_is_all3078() (machine_arch_type == MACH_TYPE_ALL3078)
-#else
-# define machine_is_all3078() (0)
-#endif
-
-#ifdef CONFIG_MACH_CTERA_2BAY_DS
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CTERA_2BAY_DS
-# endif
-# define machine_is_ctera_2bay_ds() (machine_arch_type == MACH_TYPE_CTERA_2BAY_DS)
-#else
-# define machine_is_ctera_2bay_ds() (0)
-#endif
-
-#ifdef CONFIG_MACH_SIOGENTOO3
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SIOGENTOO3
-# endif
-# define machine_is_siogentoo3() (machine_arch_type == MACH_TYPE_SIOGENTOO3)
-#else
-# define machine_is_siogentoo3() (0)
-#endif
-
-#ifdef CONFIG_MACH_EPB5000
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_EPB5000
-# endif
-# define machine_is_epb5000() (machine_arch_type == MACH_TYPE_EPB5000)
-#else
-# define machine_is_epb5000() (0)
-#endif
-
-#ifdef CONFIG_MACH_HY9263
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_HY9263
-# endif
-# define machine_is_hy9263() (machine_arch_type == MACH_TYPE_HY9263)
-#else
-# define machine_is_hy9263() (0)
-#endif
-
-#ifdef CONFIG_MACH_ACER_TEMPO_M900
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ACER_TEMPO_M900
-# endif
-# define machine_is_acer_tempo_m900() (machine_arch_type == MACH_TYPE_ACER_TEMPO_M900)
-#else
-# define machine_is_acer_tempo_m900() (0)
-#endif
-
-#ifdef CONFIG_MACH_ACER_TEMPO_DX900
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ACER_TEMPO_DX900
-# endif
-# define machine_is_acer_tempo_dx650() (machine_arch_type == MACH_TYPE_ACER_TEMPO_DX900)
-#else
-# define machine_is_acer_tempo_dx650() (0)
-#endif
-
-#ifdef CONFIG_MACH_ACER_TEMPO_X960
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ACER_TEMPO_X960
-# endif
-# define machine_is_acer_tempo_x960() (machine_arch_type == MACH_TYPE_ACER_TEMPO_X960)
-#else
-# define machine_is_acer_tempo_x960() (0)
-#endif
-
-#ifdef CONFIG_MACH_ACER_ETEN_V900
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ACER_ETEN_V900
-# endif
-# define machine_is_acer_eten_v900() (machine_arch_type == MACH_TYPE_ACER_ETEN_V900)
-#else
-# define machine_is_acer_eten_v900() (0)
-#endif
-
-#ifdef CONFIG_MACH_ACER_ETEN_X900
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ACER_ETEN_X900
-# endif
-# define machine_is_acer_eten_x900() (machine_arch_type == MACH_TYPE_ACER_ETEN_X900)
-#else
-# define machine_is_acer_eten_x900() (0)
-#endif
-
-#ifdef CONFIG_MACH_BONNELL
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_BONNELL
-# endif
-# define machine_is_bonnell() (machine_arch_type == MACH_TYPE_BONNELL)
-#else
-# define machine_is_bonnell() (0)
-#endif
-
-#ifdef CONFIG_MACH_OHT_MX27
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_OHT_MX27
-# endif
-# define machine_is_oht_mx27() (machine_arch_type == MACH_TYPE_OHT_MX27)
-#else
-# define machine_is_oht_mx27() (0)
-#endif
-
-#ifdef CONFIG_MACH_HTCQUARTZ
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_HTCQUARTZ
-# endif
-# define machine_is_htcquartz() (machine_arch_type == MACH_TYPE_HTCQUARTZ)
-#else
-# define machine_is_htcquartz() (0)
-#endif
-
#ifdef CONFIG_MACH_DAVINCI_DM6467TEVM
# ifdef machine_arch_type
# undef machine_arch_type
@@ -33517,18 +6085,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_davinci_dm6467tevm() (0)
#endif
-#ifdef CONFIG_MACH_C3AX03
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_C3AX03
-# endif
-# define machine_is_c3ax03() (machine_arch_type == MACH_TYPE_C3AX03)
-#else
-# define machine_is_c3ax03() (0)
-#endif
-
#ifdef CONFIG_MACH_MXT_TD60
# ifdef machine_arch_type
# undef machine_arch_type
@@ -33541,306 +6097,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_mxt_td60() (0)
#endif
-#ifdef CONFIG_MACH_ESYX
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ESYX
-# endif
-# define machine_is_esyx() (machine_arch_type == MACH_TYPE_ESYX)
-#else
-# define machine_is_esyx() (0)
-#endif
-
-#ifdef CONFIG_MACH_DOVE_DB2
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_DOVE_DB2
-# endif
-# define machine_is_dove_db2() (machine_arch_type == MACH_TYPE_DOVE_DB2)
-#else
-# define machine_is_dove_db2() (0)
-#endif
-
-#ifdef CONFIG_MACH_BULLDOG
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_BULLDOG
-# endif
-# define machine_is_bulldog() (machine_arch_type == MACH_TYPE_BULLDOG)
-#else
-# define machine_is_bulldog() (0)
-#endif
-
-#ifdef CONFIG_MACH_DERELL_ME2000
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_DERELL_ME2000
-# endif
-# define machine_is_derell_me2000() (machine_arch_type == MACH_TYPE_DERELL_ME2000)
-#else
-# define machine_is_derell_me2000() (0)
-#endif
-
-#ifdef CONFIG_MACH_BCMRING_BASE
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_BCMRING_BASE
-# endif
-# define machine_is_bcmring_base() (machine_arch_type == MACH_TYPE_BCMRING_BASE)
-#else
-# define machine_is_bcmring_base() (0)
-#endif
-
-#ifdef CONFIG_MACH_BCMRING_EVM
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_BCMRING_EVM
-# endif
-# define machine_is_bcmring_evm() (machine_arch_type == MACH_TYPE_BCMRING_EVM)
-#else
-# define machine_is_bcmring_evm() (0)
-#endif
-
-#ifdef CONFIG_MACH_BCMRING_EVM_JAZZ
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_BCMRING_EVM_JAZZ
-# endif
-# define machine_is_bcmring_evm_jazz() (machine_arch_type == MACH_TYPE_BCMRING_EVM_JAZZ)
-#else
-# define machine_is_bcmring_evm_jazz() (0)
-#endif
-
-#ifdef CONFIG_MACH_BCMRING_SP
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_BCMRING_SP
-# endif
-# define machine_is_bcmring_sp() (machine_arch_type == MACH_TYPE_BCMRING_SP)
-#else
-# define machine_is_bcmring_sp() (0)
-#endif
-
-#ifdef CONFIG_MACH_BCMRING_SV
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_BCMRING_SV
-# endif
-# define machine_is_bcmring_sv() (machine_arch_type == MACH_TYPE_BCMRING_SV)
-#else
-# define machine_is_bcmring_sv() (0)
-#endif
-
-#ifdef CONFIG_MACH_BCMRING_SV_JAZZ
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_BCMRING_SV_JAZZ
-# endif
-# define machine_is_bcmring_sv_jazz() (machine_arch_type == MACH_TYPE_BCMRING_SV_JAZZ)
-#else
-# define machine_is_bcmring_sv_jazz() (0)
-#endif
-
-#ifdef CONFIG_MACH_BCMRING_TABLET
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_BCMRING_TABLET
-# endif
-# define machine_is_bcmring_tablet() (machine_arch_type == MACH_TYPE_BCMRING_TABLET)
-#else
-# define machine_is_bcmring_tablet() (0)
-#endif
-
-#ifdef CONFIG_MACH_BCMRING_VP
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_BCMRING_VP
-# endif
-# define machine_is_bcmring_vp() (machine_arch_type == MACH_TYPE_BCMRING_VP)
-#else
-# define machine_is_bcmring_vp() (0)
-#endif
-
-#ifdef CONFIG_MACH_BCMRING_EVM_SEIKOR
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_BCMRING_EVM_SEIKOR
-# endif
-# define machine_is_bcmring_evm_seikor() (machine_arch_type == MACH_TYPE_BCMRING_EVM_SEIKOR)
-#else
-# define machine_is_bcmring_evm_seikor() (0)
-#endif
-
-#ifdef CONFIG_MACH_BCMRING_SP_WQVGA
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_BCMRING_SP_WQVGA
-# endif
-# define machine_is_bcmring_sp_wqvga() (machine_arch_type == MACH_TYPE_BCMRING_SP_WQVGA)
-#else
-# define machine_is_bcmring_sp_wqvga() (0)
-#endif
-
-#ifdef CONFIG_MACH_BCMRING_CUSTOM
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_BCMRING_CUSTOM
-# endif
-# define machine_is_bcmring_custom() (machine_arch_type == MACH_TYPE_BCMRING_CUSTOM)
-#else
-# define machine_is_bcmring_custom() (0)
-#endif
-
-#ifdef CONFIG_MACH_ACER_S200
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ACER_S200
-# endif
-# define machine_is_acer_s200() (machine_arch_type == MACH_TYPE_ACER_S200)
-#else
-# define machine_is_acer_s200() (0)
-#endif
-
-#ifdef CONFIG_MACH_BT270
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_BT270
-# endif
-# define machine_is_bt270() (machine_arch_type == MACH_TYPE_BT270)
-#else
-# define machine_is_bt270() (0)
-#endif
-
-#ifdef CONFIG_MACH_ISEO
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ISEO
-# endif
-# define machine_is_iseo() (machine_arch_type == MACH_TYPE_ISEO)
-#else
-# define machine_is_iseo() (0)
-#endif
-
-#ifdef CONFIG_MACH_CEZANNE
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CEZANNE
-# endif
-# define machine_is_cezanne() (machine_arch_type == MACH_TYPE_CEZANNE)
-#else
-# define machine_is_cezanne() (0)
-#endif
-
-#ifdef CONFIG_MACH_LUCCA
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_LUCCA
-# endif
-# define machine_is_lucca() (machine_arch_type == MACH_TYPE_LUCCA)
-#else
-# define machine_is_lucca() (0)
-#endif
-
-#ifdef CONFIG_MACH_SUPERSMART
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SUPERSMART
-# endif
-# define machine_is_supersmart() (machine_arch_type == MACH_TYPE_SUPERSMART)
-#else
-# define machine_is_supersmart() (0)
-#endif
-
-#ifdef CONFIG_MACH_CS_MISANO
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CS_MISANO
-# endif
-# define machine_is_arm11_board() (machine_arch_type == MACH_TYPE_CS_MISANO)
-#else
-# define machine_is_arm11_board() (0)
-#endif
-
-#ifdef CONFIG_MACH_MAGNOLIA2
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MAGNOLIA2
-# endif
-# define machine_is_magnolia2() (machine_arch_type == MACH_TYPE_MAGNOLIA2)
-#else
-# define machine_is_magnolia2() (0)
-#endif
-
-#ifdef CONFIG_MACH_EMXX
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_EMXX
-# endif
-# define machine_is_emxx() (machine_arch_type == MACH_TYPE_EMXX)
-#else
-# define machine_is_emxx() (0)
-#endif
-
-#ifdef CONFIG_MACH_OUTLAW
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_OUTLAW
-# endif
-# define machine_is_outlaw() (machine_arch_type == MACH_TYPE_OUTLAW)
-#else
-# define machine_is_outlaw() (0)
-#endif
-
#ifdef CONFIG_MACH_RIOT_BEI2
# ifdef machine_arch_type
# undef machine_arch_type
@@ -33853,18 +6109,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_riot_bei2() (0)
#endif
-#ifdef CONFIG_MACH_RIOT_VOX
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_RIOT_VOX
-# endif
-# define machine_is_riot_vox() (machine_arch_type == MACH_TYPE_RIOT_VOX)
-#else
-# define machine_is_riot_vox() (0)
-#endif
-
#ifdef CONFIG_MACH_RIOT_X37
# ifdef machine_arch_type
# undef machine_arch_type
@@ -33877,402 +6121,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_riot_x37() (0)
#endif
-#ifdef CONFIG_MACH_MEGA25MX
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MEGA25MX
-# endif
-# define machine_is_mega25mx() (machine_arch_type == MACH_TYPE_MEGA25MX)
-#else
-# define machine_is_mega25mx() (0)
-#endif
-
-#ifdef CONFIG_MACH_BENZINA2
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_BENZINA2
-# endif
-# define machine_is_benzina2() (machine_arch_type == MACH_TYPE_BENZINA2)
-#else
-# define machine_is_benzina2() (0)
-#endif
-
-#ifdef CONFIG_MACH_IGNITE
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_IGNITE
-# endif
-# define machine_is_ignite() (machine_arch_type == MACH_TYPE_IGNITE)
-#else
-# define machine_is_ignite() (0)
-#endif
-
-#ifdef CONFIG_MACH_FOGGIA
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_FOGGIA
-# endif
-# define machine_is_foggia() (machine_arch_type == MACH_TYPE_FOGGIA)
-#else
-# define machine_is_foggia() (0)
-#endif
-
-#ifdef CONFIG_MACH_AREZZO
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_AREZZO
-# endif
-# define machine_is_arezzo() (machine_arch_type == MACH_TYPE_AREZZO)
-#else
-# define machine_is_arezzo() (0)
-#endif
-
-#ifdef CONFIG_MACH_LEICA_SKYWALKER
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_LEICA_SKYWALKER
-# endif
-# define machine_is_leica_skywalker() (machine_arch_type == MACH_TYPE_LEICA_SKYWALKER)
-#else
-# define machine_is_leica_skywalker() (0)
-#endif
-
-#ifdef CONFIG_MACH_JACINTO2_JAMR
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_JACINTO2_JAMR
-# endif
-# define machine_is_jacinto2_jamr() (machine_arch_type == MACH_TYPE_JACINTO2_JAMR)
-#else
-# define machine_is_jacinto2_jamr() (0)
-#endif
-
-#ifdef CONFIG_MACH_GTS_NOVA
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_GTS_NOVA
-# endif
-# define machine_is_gts_nova() (machine_arch_type == MACH_TYPE_GTS_NOVA)
-#else
-# define machine_is_gts_nova() (0)
-#endif
-
-#ifdef CONFIG_MACH_P3600
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_P3600
-# endif
-# define machine_is_p3600() (machine_arch_type == MACH_TYPE_P3600)
-#else
-# define machine_is_p3600() (0)
-#endif
-
-#ifdef CONFIG_MACH_DLT2
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_DLT2
-# endif
-# define machine_is_dlt2() (machine_arch_type == MACH_TYPE_DLT2)
-#else
-# define machine_is_dlt2() (0)
-#endif
-
-#ifdef CONFIG_MACH_DF3120
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_DF3120
-# endif
-# define machine_is_df3120() (machine_arch_type == MACH_TYPE_DF3120)
-#else
-# define machine_is_df3120() (0)
-#endif
-
-#ifdef CONFIG_MACH_ECUCORE_9G20
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ECUCORE_9G20
-# endif
-# define machine_is_ecucore_9g20() (machine_arch_type == MACH_TYPE_ECUCORE_9G20)
-#else
-# define machine_is_ecucore_9g20() (0)
-#endif
-
-#ifdef CONFIG_MACH_NAUTEL_LPC3240
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_NAUTEL_LPC3240
-# endif
-# define machine_is_nautel_lpc3240() (machine_arch_type == MACH_TYPE_NAUTEL_LPC3240)
-#else
-# define machine_is_nautel_lpc3240() (0)
-#endif
-
-#ifdef CONFIG_MACH_GLACIER
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_GLACIER
-# endif
-# define machine_is_glacier() (machine_arch_type == MACH_TYPE_GLACIER)
-#else
-# define machine_is_glacier() (0)
-#endif
-
-#ifdef CONFIG_MACH_PHRAZER_BULLDOG
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_PHRAZER_BULLDOG
-# endif
-# define machine_is_phrazer_bulldog() (machine_arch_type == MACH_TYPE_PHRAZER_BULLDOG)
-#else
-# define machine_is_phrazer_bulldog() (0)
-#endif
-
-#ifdef CONFIG_MACH_OMAP3_BULLDOG
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_OMAP3_BULLDOG
-# endif
-# define machine_is_omap3_bulldog() (machine_arch_type == MACH_TYPE_OMAP3_BULLDOG)
-#else
-# define machine_is_omap3_bulldog() (0)
-#endif
-
-#ifdef CONFIG_MACH_PCA101
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_PCA101
-# endif
-# define machine_is_pca101() (machine_arch_type == MACH_TYPE_PCA101)
-#else
-# define machine_is_pca101() (0)
-#endif
-
-#ifdef CONFIG_MACH_BUZZC
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_BUZZC
-# endif
-# define machine_is_buzzc() (machine_arch_type == MACH_TYPE_BUZZC)
-#else
-# define machine_is_buzzc() (0)
-#endif
-
-#ifdef CONFIG_MACH_SASIE2
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SASIE2
-# endif
-# define machine_is_sasie2() (machine_arch_type == MACH_TYPE_SASIE2)
-#else
-# define machine_is_sasie2() (0)
-#endif
-
-#ifdef CONFIG_MACH_DAVINCI_CIO
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_DAVINCI_CIO
-# endif
-# define machine_is_davinci_cio() (machine_arch_type == MACH_TYPE_DAVINCI_CIO)
-#else
-# define machine_is_davinci_cio() (0)
-#endif
-
-#ifdef CONFIG_MACH_SMARTMETER_DL
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SMARTMETER_DL
-# endif
-# define machine_is_smartmeter_dl() (machine_arch_type == MACH_TYPE_SMARTMETER_DL)
-#else
-# define machine_is_smartmeter_dl() (0)
-#endif
-
-#ifdef CONFIG_MACH_WZL6410
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_WZL6410
-# endif
-# define machine_is_wzl6410() (machine_arch_type == MACH_TYPE_WZL6410)
-#else
-# define machine_is_wzl6410() (0)
-#endif
-
-#ifdef CONFIG_MACH_WZL6410M
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_WZL6410M
-# endif
-# define machine_is_wzl6410m() (machine_arch_type == MACH_TYPE_WZL6410M)
-#else
-# define machine_is_wzl6410m() (0)
-#endif
-
-#ifdef CONFIG_MACH_WZL6410F
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_WZL6410F
-# endif
-# define machine_is_wzl6410f() (machine_arch_type == MACH_TYPE_WZL6410F)
-#else
-# define machine_is_wzl6410f() (0)
-#endif
-
-#ifdef CONFIG_MACH_WZL6410I
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_WZL6410I
-# endif
-# define machine_is_wzl6410i() (machine_arch_type == MACH_TYPE_WZL6410I)
-#else
-# define machine_is_wzl6410i() (0)
-#endif
-
-#ifdef CONFIG_MACH_SPACECOM1
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SPACECOM1
-# endif
-# define machine_is_spacecom1() (machine_arch_type == MACH_TYPE_SPACECOM1)
-#else
-# define machine_is_spacecom1() (0)
-#endif
-
-#ifdef CONFIG_MACH_PINGU920
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_PINGU920
-# endif
-# define machine_is_pingu920() (machine_arch_type == MACH_TYPE_PINGU920)
-#else
-# define machine_is_pingu920() (0)
-#endif
-
-#ifdef CONFIG_MACH_BRAVOC
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_BRAVOC
-# endif
-# define machine_is_bravoc() (machine_arch_type == MACH_TYPE_BRAVOC)
-#else
-# define machine_is_bravoc() (0)
-#endif
-
-#ifdef CONFIG_MACH_CYBO2440
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CYBO2440
-# endif
-# define machine_is_cybo2440() (machine_arch_type == MACH_TYPE_CYBO2440)
-#else
-# define machine_is_cybo2440() (0)
-#endif
-
-#ifdef CONFIG_MACH_VDSSW
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_VDSSW
-# endif
-# define machine_is_vdssw() (machine_arch_type == MACH_TYPE_VDSSW)
-#else
-# define machine_is_vdssw() (0)
-#endif
-
-#ifdef CONFIG_MACH_ROMULUS
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ROMULUS
-# endif
-# define machine_is_romulus() (machine_arch_type == MACH_TYPE_ROMULUS)
-#else
-# define machine_is_romulus() (0)
-#endif
-
-#ifdef CONFIG_MACH_OMAP_MAGIC
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_OMAP_MAGIC
-# endif
-# define machine_is_omap_magic() (machine_arch_type == MACH_TYPE_OMAP_MAGIC)
-#else
-# define machine_is_omap_magic() (0)
-#endif
-
-#ifdef CONFIG_MACH_ELTD100
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ELTD100
-# endif
-# define machine_is_eltd100() (machine_arch_type == MACH_TYPE_ELTD100)
-#else
-# define machine_is_eltd100() (0)
-#endif
-
#ifdef CONFIG_MACH_CAPC7117
# ifdef machine_arch_type
# undef machine_arch_type
@@ -34285,138 +6133,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_capc7117() (0)
#endif
-#ifdef CONFIG_MACH_SWAN
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SWAN
-# endif
-# define machine_is_swan() (machine_arch_type == MACH_TYPE_SWAN)
-#else
-# define machine_is_swan() (0)
-#endif
-
-#ifdef CONFIG_MACH_VEU
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_VEU
-# endif
-# define machine_is_veu() (machine_arch_type == MACH_TYPE_VEU)
-#else
-# define machine_is_veu() (0)
-#endif
-
-#ifdef CONFIG_MACH_RM2
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_RM2
-# endif
-# define machine_is_rm2() (machine_arch_type == MACH_TYPE_RM2)
-#else
-# define machine_is_rm2() (0)
-#endif
-
-#ifdef CONFIG_MACH_TT2100
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_TT2100
-# endif
-# define machine_is_tt2100() (machine_arch_type == MACH_TYPE_TT2100)
-#else
-# define machine_is_tt2100() (0)
-#endif
-
-#ifdef CONFIG_MACH_VENICE
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_VENICE
-# endif
-# define machine_is_venice() (machine_arch_type == MACH_TYPE_VENICE)
-#else
-# define machine_is_venice() (0)
-#endif
-
-#ifdef CONFIG_MACH_PC7323
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_PC7323
-# endif
-# define machine_is_pc7323() (machine_arch_type == MACH_TYPE_PC7323)
-#else
-# define machine_is_pc7323() (0)
-#endif
-
-#ifdef CONFIG_MACH_MASP
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MASP
-# endif
-# define machine_is_masp() (machine_arch_type == MACH_TYPE_MASP)
-#else
-# define machine_is_masp() (0)
-#endif
-
-#ifdef CONFIG_MACH_FUJITSU_TVSTBSOC
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_FUJITSU_TVSTBSOC
-# endif
-# define machine_is_fujitsu_tvstbsoc0() (machine_arch_type == MACH_TYPE_FUJITSU_TVSTBSOC)
-#else
-# define machine_is_fujitsu_tvstbsoc0() (0)
-#endif
-
-#ifdef CONFIG_MACH_FUJITSU_TVSTBSOC1
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_FUJITSU_TVSTBSOC1
-# endif
-# define machine_is_fujitsu_tvstbsoc1() (machine_arch_type == MACH_TYPE_FUJITSU_TVSTBSOC1)
-#else
-# define machine_is_fujitsu_tvstbsoc1() (0)
-#endif
-
-#ifdef CONFIG_MACH_LEXIKON
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_LEXIKON
-# endif
-# define machine_is_lexikon() (machine_arch_type == MACH_TYPE_LEXIKON)
-#else
-# define machine_is_lexikon() (0)
-#endif
-
-#ifdef CONFIG_MACH_MINI2440V2
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MINI2440V2
-# endif
-# define machine_is_mini2440v2() (machine_arch_type == MACH_TYPE_MINI2440V2)
-#else
-# define machine_is_mini2440v2() (0)
-#endif
-
#ifdef CONFIG_MACH_ICONTROL
# ifdef machine_arch_type
# undef machine_arch_type
@@ -34429,30 +6145,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_icontrol() (0)
#endif
-#ifdef CONFIG_MACH_SHEEVAD
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SHEEVAD
-# endif
-# define machine_is_gplugd() (machine_arch_type == MACH_TYPE_SHEEVAD)
-#else
-# define machine_is_gplugd() (0)
-#endif
-
-#ifdef CONFIG_MACH_QSD8X50A_ST1_1
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_QSD8X50A_ST1_1
-# endif
-# define machine_is_qsd8x50a_st1_1() (machine_arch_type == MACH_TYPE_QSD8X50A_ST1_1)
-#else
-# define machine_is_qsd8x50a_st1_1() (0)
-#endif
-
#ifdef CONFIG_MACH_QSD8X50A_ST1_5
# ifdef machine_arch_type
# undef machine_arch_type
@@ -34465,18 +6157,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_qsd8x50a_st1_5() (0)
#endif
-#ifdef CONFIG_MACH_BEE
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_BEE
-# endif
-# define machine_is_bee() (machine_arch_type == MACH_TYPE_BEE)
-#else
-# define machine_is_bee() (0)
-#endif
-
#ifdef CONFIG_MACH_MX23EVK
# ifdef machine_arch_type
# undef machine_arch_type
@@ -34501,234 +6181,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_ap4evb() (0)
#endif
-#ifdef CONFIG_MACH_STOCKHOLM
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_STOCKHOLM
-# endif
-# define machine_is_stockholm() (machine_arch_type == MACH_TYPE_STOCKHOLM)
-#else
-# define machine_is_stockholm() (0)
-#endif
-
-#ifdef CONFIG_MACH_LPC_H3131
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_LPC_H3131
-# endif
-# define machine_is_lpc_h3131() (machine_arch_type == MACH_TYPE_LPC_H3131)
-#else
-# define machine_is_lpc_h3131() (0)
-#endif
-
-#ifdef CONFIG_MACH_STINGRAY
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_STINGRAY
-# endif
-# define machine_is_stingray() (machine_arch_type == MACH_TYPE_STINGRAY)
-#else
-# define machine_is_stingray() (0)
-#endif
-
-#ifdef CONFIG_MACH_KRAKEN
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_KRAKEN
-# endif
-# define machine_is_kraken() (machine_arch_type == MACH_TYPE_KRAKEN)
-#else
-# define machine_is_kraken() (0)
-#endif
-
-#ifdef CONFIG_MACH_GW2388
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_GW2388
-# endif
-# define machine_is_gw2388() (machine_arch_type == MACH_TYPE_GW2388)
-#else
-# define machine_is_gw2388() (0)
-#endif
-
-#ifdef CONFIG_MACH_JADECPU
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_JADECPU
-# endif
-# define machine_is_jadecpu() (machine_arch_type == MACH_TYPE_JADECPU)
-#else
-# define machine_is_jadecpu() (0)
-#endif
-
-#ifdef CONFIG_MACH_CARLISLE
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CARLISLE
-# endif
-# define machine_is_carlisle() (machine_arch_type == MACH_TYPE_CARLISLE)
-#else
-# define machine_is_carlisle() (0)
-#endif
-
-#ifdef CONFIG_MACH_LUX_SF9
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_LUX_SF9
-# endif
-# define machine_is_lux_sf9() (machine_arch_type == MACH_TYPE_LUX_SF9)
-#else
-# define machine_is_lux_sf9() (0)
-#endif
-
-#ifdef CONFIG_MACH_NEMID_TB
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_NEMID_TB
-# endif
-# define machine_is_nemid_tb() (machine_arch_type == MACH_TYPE_NEMID_TB)
-#else
-# define machine_is_nemid_tb() (0)
-#endif
-
-#ifdef CONFIG_MACH_TERRIER
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_TERRIER
-# endif
-# define machine_is_terrier() (machine_arch_type == MACH_TYPE_TERRIER)
-#else
-# define machine_is_terrier() (0)
-#endif
-
-#ifdef CONFIG_MACH_TURBOT
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_TURBOT
-# endif
-# define machine_is_turbot() (machine_arch_type == MACH_TYPE_TURBOT)
-#else
-# define machine_is_turbot() (0)
-#endif
-
-#ifdef CONFIG_MACH_SANDDAB
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SANDDAB
-# endif
-# define machine_is_sanddab() (machine_arch_type == MACH_TYPE_SANDDAB)
-#else
-# define machine_is_sanddab() (0)
-#endif
-
-#ifdef CONFIG_MACH_MX35_CICADA
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MX35_CICADA
-# endif
-# define machine_is_mx35_cicada() (machine_arch_type == MACH_TYPE_MX35_CICADA)
-#else
-# define machine_is_mx35_cicada() (0)
-#endif
-
-#ifdef CONFIG_MACH_GHI2703D
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_GHI2703D
-# endif
-# define machine_is_ghi2703d() (machine_arch_type == MACH_TYPE_GHI2703D)
-#else
-# define machine_is_ghi2703d() (0)
-#endif
-
-#ifdef CONFIG_MACH_LUX_SFX9
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_LUX_SFX9
-# endif
-# define machine_is_lux_sfx9() (machine_arch_type == MACH_TYPE_LUX_SFX9)
-#else
-# define machine_is_lux_sfx9() (0)
-#endif
-
-#ifdef CONFIG_MACH_LUX_SF9G
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_LUX_SF9G
-# endif
-# define machine_is_lux_sf9g() (machine_arch_type == MACH_TYPE_LUX_SF9G)
-#else
-# define machine_is_lux_sf9g() (0)
-#endif
-
-#ifdef CONFIG_MACH_LUX_EDK9
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_LUX_EDK9
-# endif
-# define machine_is_lux_edk9() (machine_arch_type == MACH_TYPE_LUX_EDK9)
-#else
-# define machine_is_lux_edk9() (0)
-#endif
-
-#ifdef CONFIG_MACH_HW90240
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_HW90240
-# endif
-# define machine_is_hw90240() (machine_arch_type == MACH_TYPE_HW90240)
-#else
-# define machine_is_hw90240() (0)
-#endif
-
-#ifdef CONFIG_MACH_DM365_LEOPARD
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_DM365_LEOPARD
-# endif
-# define machine_is_dm365_leopard() (machine_arch_type == MACH_TYPE_DM365_LEOPARD)
-#else
-# define machine_is_dm365_leopard() (0)
-#endif
-
#ifdef CONFIG_MACH_MITYOMAPL138
# ifdef machine_arch_type
# undef machine_arch_type
@@ -34741,102 +6193,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_mityomapl138() (0)
#endif
-#ifdef CONFIG_MACH_SCAT110
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SCAT110
-# endif
-# define machine_is_scat110() (machine_arch_type == MACH_TYPE_SCAT110)
-#else
-# define machine_is_scat110() (0)
-#endif
-
-#ifdef CONFIG_MACH_ACER_A1
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ACER_A1
-# endif
-# define machine_is_acer_a1() (machine_arch_type == MACH_TYPE_ACER_A1)
-#else
-# define machine_is_acer_a1() (0)
-#endif
-
-#ifdef CONFIG_MACH_CMCONTROL
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CMCONTROL
-# endif
-# define machine_is_cmcontrol() (machine_arch_type == MACH_TYPE_CMCONTROL)
-#else
-# define machine_is_cmcontrol() (0)
-#endif
-
-#ifdef CONFIG_MACH_PELCO_LAMAR
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_PELCO_LAMAR
-# endif
-# define machine_is_pelco_lamar() (machine_arch_type == MACH_TYPE_PELCO_LAMAR)
-#else
-# define machine_is_pelco_lamar() (0)
-#endif
-
-#ifdef CONFIG_MACH_RFP43
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_RFP43
-# endif
-# define machine_is_rfp43() (machine_arch_type == MACH_TYPE_RFP43)
-#else
-# define machine_is_rfp43() (0)
-#endif
-
-#ifdef CONFIG_MACH_SK86R0301
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SK86R0301
-# endif
-# define machine_is_sk86r0301() (machine_arch_type == MACH_TYPE_SK86R0301)
-#else
-# define machine_is_sk86r0301() (0)
-#endif
-
-#ifdef CONFIG_MACH_CTPXA
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CTPXA
-# endif
-# define machine_is_ctpxa() (machine_arch_type == MACH_TYPE_CTPXA)
-#else
-# define machine_is_ctpxa() (0)
-#endif
-
-#ifdef CONFIG_MACH_EPB_ARM9_A
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_EPB_ARM9_A
-# endif
-# define machine_is_epb_arm9_a() (machine_arch_type == MACH_TYPE_EPB_ARM9_A)
-#else
-# define machine_is_epb_arm9_a() (0)
-#endif
-
#ifdef CONFIG_MACH_GURUPLUG
# ifdef machine_arch_type
# undef machine_arch_type
@@ -34873,174 +6229,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_spear320() (0)
#endif
-#ifdef CONFIG_MACH_ROBOTX
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ROBOTX
-# endif
-# define machine_is_robotx() (machine_arch_type == MACH_TYPE_ROBOTX)
-#else
-# define machine_is_robotx() (0)
-#endif
-
-#ifdef CONFIG_MACH_LSXHL
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_LSXHL
-# endif
-# define machine_is_lsxhl() (machine_arch_type == MACH_TYPE_LSXHL)
-#else
-# define machine_is_lsxhl() (0)
-#endif
-
-#ifdef CONFIG_MACH_SMARTLITE
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SMARTLITE
-# endif
-# define machine_is_smartlite() (machine_arch_type == MACH_TYPE_SMARTLITE)
-#else
-# define machine_is_smartlite() (0)
-#endif
-
-#ifdef CONFIG_MACH_CWS2
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CWS2
-# endif
-# define machine_is_cws2() (machine_arch_type == MACH_TYPE_CWS2)
-#else
-# define machine_is_cws2() (0)
-#endif
-
-#ifdef CONFIG_MACH_M619
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_M619
-# endif
-# define machine_is_m619() (machine_arch_type == MACH_TYPE_M619)
-#else
-# define machine_is_m619() (0)
-#endif
-
-#ifdef CONFIG_MACH_SMARTVIEW
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SMARTVIEW
-# endif
-# define machine_is_smartview() (machine_arch_type == MACH_TYPE_SMARTVIEW)
-#else
-# define machine_is_smartview() (0)
-#endif
-
-#ifdef CONFIG_MACH_LSA_SALSA
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_LSA_SALSA
-# endif
-# define machine_is_lsa_salsa() (machine_arch_type == MACH_TYPE_LSA_SALSA)
-#else
-# define machine_is_lsa_salsa() (0)
-#endif
-
-#ifdef CONFIG_MACH_KIZBOX
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_KIZBOX
-# endif
-# define machine_is_kizbox() (machine_arch_type == MACH_TYPE_KIZBOX)
-#else
-# define machine_is_kizbox() (0)
-#endif
-
-#ifdef CONFIG_MACH_HTCCHARMER
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_HTCCHARMER
-# endif
-# define machine_is_htccharmer() (machine_arch_type == MACH_TYPE_HTCCHARMER)
-#else
-# define machine_is_htccharmer() (0)
-#endif
-
-#ifdef CONFIG_MACH_GUF_NESO_LT
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_GUF_NESO_LT
-# endif
-# define machine_is_guf_neso_lt() (machine_arch_type == MACH_TYPE_GUF_NESO_LT)
-#else
-# define machine_is_guf_neso_lt() (0)
-#endif
-
-#ifdef CONFIG_MACH_PM9G45
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_PM9G45
-# endif
-# define machine_is_pm9g45() (machine_arch_type == MACH_TYPE_PM9G45)
-#else
-# define machine_is_pm9g45() (0)
-#endif
-
-#ifdef CONFIG_MACH_HTCPANTHER
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_HTCPANTHER
-# endif
-# define machine_is_htcpanther() (machine_arch_type == MACH_TYPE_HTCPANTHER)
-#else
-# define machine_is_htcpanther() (0)
-#endif
-
-#ifdef CONFIG_MACH_HTCPANTHER_CDMA
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_HTCPANTHER_CDMA
-# endif
-# define machine_is_htcpanther_cdma() (machine_arch_type == MACH_TYPE_HTCPANTHER_CDMA)
-#else
-# define machine_is_htcpanther_cdma() (0)
-#endif
-
-#ifdef CONFIG_MACH_REB01
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_REB01
-# endif
-# define machine_is_reb01() (machine_arch_type == MACH_TYPE_REB01)
-#else
-# define machine_is_reb01() (0)
-#endif
-
#ifdef CONFIG_MACH_AQUILA
# ifdef machine_arch_type
# undef machine_arch_type
@@ -35053,18 +6241,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_aquila() (0)
#endif
-#ifdef CONFIG_MACH_SPARK_SLS_HW2
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SPARK_SLS_HW2
-# endif
-# define machine_is_spark_sls_hw2() (machine_arch_type == MACH_TYPE_SPARK_SLS_HW2)
-#else
-# define machine_is_spark_sls_hw2() (0)
-#endif
-
#ifdef CONFIG_MACH_ESATA_SHEEVAPLUG
# ifdef machine_arch_type
# undef machine_arch_type
@@ -35089,208 +6265,16 @@ extern unsigned int __machine_arch_type;
# define machine_is_msm7x30_surf() (0)
#endif
-#ifdef CONFIG_MACH_MICRO2440
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MICRO2440
-# endif
-# define machine_is_micro2440() (machine_arch_type == MACH_TYPE_MICRO2440)
-#else
-# define machine_is_micro2440() (0)
-#endif
-
-#ifdef CONFIG_MACH_AM2440
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_AM2440
-# endif
-# define machine_is_am2440() (machine_arch_type == MACH_TYPE_AM2440)
-#else
-# define machine_is_am2440() (0)
-#endif
-
-#ifdef CONFIG_MACH_TQ2440
+#ifdef CONFIG_MACH_EA2478DEVKIT
# ifdef machine_arch_type
# undef machine_arch_type
# define machine_arch_type __machine_arch_type
# else
-# define machine_arch_type MACH_TYPE_TQ2440
+# define machine_arch_type MACH_TYPE_EA2478DEVKIT
# endif
-# define machine_is_tq2440() (machine_arch_type == MACH_TYPE_TQ2440)
+# define machine_is_ea2478devkit() (machine_arch_type == MACH_TYPE_EA2478DEVKIT)
#else
-# define machine_is_tq2440() (0)
-#endif
-
-#ifdef CONFIG_MACH_LPC2478OEM
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_LPC2478OEM
-# endif
-# define machine_is_lpc2478oem() (machine_arch_type == MACH_TYPE_LPC2478OEM)
-#else
-# define machine_is_lpc2478oem() (0)
-#endif
-
-#ifdef CONFIG_MACH_AK880X
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_AK880X
-# endif
-# define machine_is_ak880x() (machine_arch_type == MACH_TYPE_AK880X)
-#else
-# define machine_is_ak880x() (0)
-#endif
-
-#ifdef CONFIG_MACH_COBRA3530
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_COBRA3530
-# endif
-# define machine_is_cobra3530() (machine_arch_type == MACH_TYPE_COBRA3530)
-#else
-# define machine_is_cobra3530() (0)
-#endif
-
-#ifdef CONFIG_MACH_PMPPB
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_PMPPB
-# endif
-# define machine_is_pmppb() (machine_arch_type == MACH_TYPE_PMPPB)
-#else
-# define machine_is_pmppb() (0)
-#endif
-
-#ifdef CONFIG_MACH_U6715
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_U6715
-# endif
-# define machine_is_u6715() (machine_arch_type == MACH_TYPE_U6715)
-#else
-# define machine_is_u6715() (0)
-#endif
-
-#ifdef CONFIG_MACH_AXAR1500_SENDER
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_AXAR1500_SENDER
-# endif
-# define machine_is_axar1500_sender() (machine_arch_type == MACH_TYPE_AXAR1500_SENDER)
-#else
-# define machine_is_axar1500_sender() (0)
-#endif
-
-#ifdef CONFIG_MACH_G30_DVB
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_G30_DVB
-# endif
-# define machine_is_g30_dvb() (machine_arch_type == MACH_TYPE_G30_DVB)
-#else
-# define machine_is_g30_dvb() (0)
-#endif
-
-#ifdef CONFIG_MACH_VC088X
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_VC088X
-# endif
-# define machine_is_vc088x() (machine_arch_type == MACH_TYPE_VC088X)
-#else
-# define machine_is_vc088x() (0)
-#endif
-
-#ifdef CONFIG_MACH_MIOA702
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MIOA702
-# endif
-# define machine_is_mioa702() (machine_arch_type == MACH_TYPE_MIOA702)
-#else
-# define machine_is_mioa702() (0)
-#endif
-
-#ifdef CONFIG_MACH_HPMIN
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_HPMIN
-# endif
-# define machine_is_hpmin() (machine_arch_type == MACH_TYPE_HPMIN)
-#else
-# define machine_is_hpmin() (0)
-#endif
-
-#ifdef CONFIG_MACH_AK880XAK
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_AK880XAK
-# endif
-# define machine_is_ak880xak() (machine_arch_type == MACH_TYPE_AK880XAK)
-#else
-# define machine_is_ak880xak() (0)
-#endif
-
-#ifdef CONFIG_MACH_ARM926TOMAP850
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ARM926TOMAP850
-# endif
-# define machine_is_arm926tomap850() (machine_arch_type == MACH_TYPE_ARM926TOMAP850)
-#else
-# define machine_is_arm926tomap850() (0)
-#endif
-
-#ifdef CONFIG_MACH_LKEVM
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_LKEVM
-# endif
-# define machine_is_lkevm() (machine_arch_type == MACH_TYPE_LKEVM)
-#else
-# define machine_is_lkevm() (0)
-#endif
-
-#ifdef CONFIG_MACH_MW6410
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MW6410
-# endif
-# define machine_is_mw6410() (machine_arch_type == MACH_TYPE_MW6410)
-#else
-# define machine_is_mw6410() (0)
+# define machine_is_ea2478devkit() (0)
#endif
#ifdef CONFIG_MACH_TERASTATION_WXL
@@ -35305,66 +6289,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_terastation_wxl() (0)
#endif
-#ifdef CONFIG_MACH_CPU8000E
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CPU8000E
-# endif
-# define machine_is_cpu8000e() (machine_arch_type == MACH_TYPE_CPU8000E)
-#else
-# define machine_is_cpu8000e() (0)
-#endif
-
-#ifdef CONFIG_MACH_CATANIA
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CATANIA
-# endif
-# define machine_is_catania() (machine_arch_type == MACH_TYPE_CATANIA)
-#else
-# define machine_is_catania() (0)
-#endif
-
-#ifdef CONFIG_MACH_TOKYO
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_TOKYO
-# endif
-# define machine_is_tokyo() (machine_arch_type == MACH_TYPE_TOKYO)
-#else
-# define machine_is_tokyo() (0)
-#endif
-
-#ifdef CONFIG_MACH_MSM7201A_SURF
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MSM7201A_SURF
-# endif
-# define machine_is_msm7201a_surf() (machine_arch_type == MACH_TYPE_MSM7201A_SURF)
-#else
-# define machine_is_msm7201a_surf() (0)
-#endif
-
-#ifdef CONFIG_MACH_MSM7201A_FFA
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MSM7201A_FFA
-# endif
-# define machine_is_msm7201a_ffa() (machine_arch_type == MACH_TYPE_MSM7201A_FFA)
-#else
-# define machine_is_msm7201a_ffa() (0)
-#endif
-
#ifdef CONFIG_MACH_MSM7X25_SURF
# ifdef machine_arch_type
# undef machine_arch_type
@@ -35437,90 +6361,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_qsd8x50_surf() (0)
#endif
-#ifdef CONFIG_MACH_QSD8X50_COMET
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_QSD8X50_COMET
-# endif
-# define machine_is_qsd8x50_comet() (machine_arch_type == MACH_TYPE_QSD8X50_COMET)
-#else
-# define machine_is_qsd8x50_comet() (0)
-#endif
-
-#ifdef CONFIG_MACH_QSD8X50_FFA
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_QSD8X50_FFA
-# endif
-# define machine_is_qsd8x50_ffa() (machine_arch_type == MACH_TYPE_QSD8X50_FFA)
-#else
-# define machine_is_qsd8x50_ffa() (0)
-#endif
-
-#ifdef CONFIG_MACH_QSD8X50A_SURF
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_QSD8X50A_SURF
-# endif
-# define machine_is_qsd8x50a_surf() (machine_arch_type == MACH_TYPE_QSD8X50A_SURF)
-#else
-# define machine_is_qsd8x50a_surf() (0)
-#endif
-
-#ifdef CONFIG_MACH_QSD8X50A_FFA
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_QSD8X50A_FFA
-# endif
-# define machine_is_qsd8x50a_ffa() (machine_arch_type == MACH_TYPE_QSD8X50A_FFA)
-#else
-# define machine_is_qsd8x50a_ffa() (0)
-#endif
-
-#ifdef CONFIG_MACH_ADX_XGCP10
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ADX_XGCP10
-# endif
-# define machine_is_adx_xgcp10() (machine_arch_type == MACH_TYPE_ADX_XGCP10)
-#else
-# define machine_is_adx_xgcp10() (0)
-#endif
-
-#ifdef CONFIG_MACH_MCGWUMTS2A
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MCGWUMTS2A
-# endif
-# define machine_is_mcgwumts2a() (machine_arch_type == MACH_TYPE_MCGWUMTS2A)
-#else
-# define machine_is_mcgwumts2a() (0)
-#endif
-
-#ifdef CONFIG_MACH_MOBIKT
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MOBIKT
-# endif
-# define machine_is_mobikt() (machine_arch_type == MACH_TYPE_MOBIKT)
-#else
-# define machine_is_mobikt() (0)
-#endif
-
#ifdef CONFIG_MACH_MX53_EVK
# ifdef machine_arch_type
# undef machine_arch_type
@@ -35545,54 +6385,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_igep0030() (0)
#endif
-#ifdef CONFIG_MACH_AXELL_H40_H50_CTRL
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_AXELL_H40_H50_CTRL
-# endif
-# define machine_is_axell_h40_h50_ctrl() (machine_arch_type == MACH_TYPE_AXELL_H40_H50_CTRL)
-#else
-# define machine_is_axell_h40_h50_ctrl() (0)
-#endif
-
-#ifdef CONFIG_MACH_DTCOMMOD
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_DTCOMMOD
-# endif
-# define machine_is_dtcommod() (machine_arch_type == MACH_TYPE_DTCOMMOD)
-#else
-# define machine_is_dtcommod() (0)
-#endif
-
-#ifdef CONFIG_MACH_GOULD
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_GOULD
-# endif
-# define machine_is_gould() (machine_arch_type == MACH_TYPE_GOULD)
-#else
-# define machine_is_gould() (0)
-#endif
-
-#ifdef CONFIG_MACH_SIBERIA
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SIBERIA
-# endif
-# define machine_is_siberia() (machine_arch_type == MACH_TYPE_SIBERIA)
-#else
-# define machine_is_siberia() (0)
-#endif
-
#ifdef CONFIG_MACH_SBC3530
# ifdef machine_arch_type
# undef machine_arch_type
@@ -35605,54 +6397,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_sbc3530() (0)
#endif
-#ifdef CONFIG_MACH_QARM
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_QARM
-# endif
-# define machine_is_qarm() (machine_arch_type == MACH_TYPE_QARM)
-#else
-# define machine_is_qarm() (0)
-#endif
-
-#ifdef CONFIG_MACH_MIPS
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MIPS
-# endif
-# define machine_is_mips() (machine_arch_type == MACH_TYPE_MIPS)
-#else
-# define machine_is_mips() (0)
-#endif
-
-#ifdef CONFIG_MACH_MX27GRB
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MX27GRB
-# endif
-# define machine_is_mx27grb() (machine_arch_type == MACH_TYPE_MX27GRB)
-#else
-# define machine_is_mx27grb() (0)
-#endif
-
-#ifdef CONFIG_MACH_SBC8100
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SBC8100
-# endif
-# define machine_is_sbc8100() (machine_arch_type == MACH_TYPE_SBC8100)
-#else
-# define machine_is_sbc8100() (0)
-#endif
-
#ifdef CONFIG_MACH_SAARB
# ifdef machine_arch_type
# undef machine_arch_type
@@ -35665,42 +6409,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_saarb() (0)
#endif
-#ifdef CONFIG_MACH_OMAP3MINI
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_OMAP3MINI
-# endif
-# define machine_is_omap3mini() (machine_arch_type == MACH_TYPE_OMAP3MINI)
-#else
-# define machine_is_omap3mini() (0)
-#endif
-
-#ifdef CONFIG_MACH_CNMBOOK7SE
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CNMBOOK7SE
-# endif
-# define machine_is_cnmbook7se() (machine_arch_type == MACH_TYPE_CNMBOOK7SE)
-#else
-# define machine_is_cnmbook7se() (0)
-#endif
-
-#ifdef CONFIG_MACH_CATAN
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CATAN
-# endif
-# define machine_is_catan() (machine_arch_type == MACH_TYPE_CATAN)
-#else
-# define machine_is_catan() (0)
-#endif
-
#ifdef CONFIG_MACH_HARMONY
# ifdef machine_arch_type
# undef machine_arch_type
@@ -35713,114 +6421,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_harmony() (0)
#endif
-#ifdef CONFIG_MACH_TONGA
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_TONGA
-# endif
-# define machine_is_tonga() (machine_arch_type == MACH_TYPE_TONGA)
-#else
-# define machine_is_tonga() (0)
-#endif
-
-#ifdef CONFIG_MACH_CYBOOK_ORIZON
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CYBOOK_ORIZON
-# endif
-# define machine_is_cybook_orizon() (machine_arch_type == MACH_TYPE_CYBOOK_ORIZON)
-#else
-# define machine_is_cybook_orizon() (0)
-#endif
-
-#ifdef CONFIG_MACH_HTCRHODIUMCDMA
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_HTCRHODIUMCDMA
-# endif
-# define machine_is_htcrhodiumcdma() (machine_arch_type == MACH_TYPE_HTCRHODIUMCDMA)
-#else
-# define machine_is_htcrhodiumcdma() (0)
-#endif
-
-#ifdef CONFIG_MACH_EPC_G45
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_EPC_G45
-# endif
-# define machine_is_epc_g45() (machine_arch_type == MACH_TYPE_EPC_G45)
-#else
-# define machine_is_epc_g45() (0)
-#endif
-
-#ifdef CONFIG_MACH_EPC_LPC3250
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_EPC_LPC3250
-# endif
-# define machine_is_epc_lpc3250() (machine_arch_type == MACH_TYPE_EPC_LPC3250)
-#else
-# define machine_is_epc_lpc3250() (0)
-#endif
-
-#ifdef CONFIG_MACH_MXC91341EVB
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MXC91341EVB
-# endif
-# define machine_is_mxc91341evb() (machine_arch_type == MACH_TYPE_MXC91341EVB)
-#else
-# define machine_is_mxc91341evb() (0)
-#endif
-
-#ifdef CONFIG_MACH_RTW1000
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_RTW1000
-# endif
-# define machine_is_rtw1000() (machine_arch_type == MACH_TYPE_RTW1000)
-#else
-# define machine_is_rtw1000() (0)
-#endif
-
-#ifdef CONFIG_MACH_BOBCAT
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_BOBCAT
-# endif
-# define machine_is_bobcat() (machine_arch_type == MACH_TYPE_BOBCAT)
-#else
-# define machine_is_bobcat() (0)
-#endif
-
-#ifdef CONFIG_MACH_TRIZEPS6
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_TRIZEPS6
-# endif
-# define machine_is_trizeps6() (machine_arch_type == MACH_TYPE_TRIZEPS6)
-#else
-# define machine_is_trizeps6() (0)
-#endif
-
#ifdef CONFIG_MACH_MSM7X30_FLUID
# ifdef machine_arch_type
# undef machine_arch_type
@@ -35833,102 +6433,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_msm7x30_fluid() (0)
#endif
-#ifdef CONFIG_MACH_NEDAP9263
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_NEDAP9263
-# endif
-# define machine_is_nedap9263() (machine_arch_type == MACH_TYPE_NEDAP9263)
-#else
-# define machine_is_nedap9263() (0)
-#endif
-
-#ifdef CONFIG_MACH_NETGEAR_MS2110
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_NETGEAR_MS2110
-# endif
-# define machine_is_netgear_ms2110() (machine_arch_type == MACH_TYPE_NETGEAR_MS2110)
-#else
-# define machine_is_netgear_ms2110() (0)
-#endif
-
-#ifdef CONFIG_MACH_BMX
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_BMX
-# endif
-# define machine_is_bmx() (machine_arch_type == MACH_TYPE_BMX)
-#else
-# define machine_is_bmx() (0)
-#endif
-
-#ifdef CONFIG_MACH_NETSTREAM
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_NETSTREAM
-# endif
-# define machine_is_netstream() (machine_arch_type == MACH_TYPE_NETSTREAM)
-#else
-# define machine_is_netstream() (0)
-#endif
-
-#ifdef CONFIG_MACH_VPNEXT_RCU
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_VPNEXT_RCU
-# endif
-# define machine_is_vpnext_rcu() (machine_arch_type == MACH_TYPE_VPNEXT_RCU)
-#else
-# define machine_is_vpnext_rcu() (0)
-#endif
-
-#ifdef CONFIG_MACH_VPNEXT_MPU
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_VPNEXT_MPU
-# endif
-# define machine_is_vpnext_mpu() (machine_arch_type == MACH_TYPE_VPNEXT_MPU)
-#else
-# define machine_is_vpnext_mpu() (0)
-#endif
-
-#ifdef CONFIG_MACH_BCMRING_TABLET_V1
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_BCMRING_TABLET_V1
-# endif
-# define machine_is_bcmring_tablet_v1() (machine_arch_type == MACH_TYPE_BCMRING_TABLET_V1)
-#else
-# define machine_is_bcmring_tablet_v1() (0)
-#endif
-
-#ifdef CONFIG_MACH_SGARM10
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SGARM10
-# endif
-# define machine_is_sgarm10() (machine_arch_type == MACH_TYPE_SGARM10)
-#else
-# define machine_is_sgarm10() (0)
-#endif
-
#ifdef CONFIG_MACH_CM_T3517
# ifdef machine_arch_type
# undef machine_arch_type
@@ -35941,30 +6445,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_cm_t3517() (0)
#endif
-#ifdef CONFIG_MACH_OMAP3_CPS
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_OMAP3_CPS
-# endif
-# define machine_is_omap3_cps() (machine_arch_type == MACH_TYPE_OMAP3_CPS)
-#else
-# define machine_is_omap3_cps() (0)
-#endif
-
-#ifdef CONFIG_MACH_AXAR1500_RECEIVER
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_AXAR1500_RECEIVER
-# endif
-# define machine_is_axar1500_receiver() (machine_arch_type == MACH_TYPE_AXAR1500_RECEIVER)
-#else
-# define machine_is_axar1500_receiver() (0)
-#endif
-
#ifdef CONFIG_MACH_WBD222
# ifdef machine_arch_type
# undef machine_arch_type
@@ -35977,18 +6457,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_wbd222() (0)
#endif
-#ifdef CONFIG_MACH_MT65XX
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MT65XX
-# endif
-# define machine_is_mt65xx() (machine_arch_type == MACH_TYPE_MT65XX)
-#else
-# define machine_is_mt65xx() (0)
-#endif
-
#ifdef CONFIG_MACH_MSM8X60_SURF
# ifdef machine_arch_type
# undef machine_arch_type
@@ -36013,18 +6481,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_msm8x60_sim() (0)
#endif
-#ifdef CONFIG_MACH_VMC300
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_VMC300
-# endif
-# define machine_is_vmc300() (machine_arch_type == MACH_TYPE_VMC300)
-#else
-# define machine_is_vmc300() (0)
-#endif
-
#ifdef CONFIG_MACH_TCC8000_SDK
# ifdef machine_arch_type
# undef machine_arch_type
@@ -36049,18 +6505,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_nanos() (0)
#endif
-#ifdef CONFIG_MACH_STAMP9G10
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_STAMP9G10
-# endif
-# define machine_is_stamp9g10() (machine_arch_type == MACH_TYPE_STAMP9G10)
-#else
-# define machine_is_stamp9g10() (0)
-#endif
-
#ifdef CONFIG_MACH_STAMP9G45
# ifdef machine_arch_type
# undef machine_arch_type
@@ -36073,174 +6517,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_stamp9g45() (0)
#endif
-#ifdef CONFIG_MACH_H6053
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_H6053
-# endif
-# define machine_is_h6053() (machine_arch_type == MACH_TYPE_H6053)
-#else
-# define machine_is_h6053() (0)
-#endif
-
-#ifdef CONFIG_MACH_SMINT01
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SMINT01
-# endif
-# define machine_is_smint01() (machine_arch_type == MACH_TYPE_SMINT01)
-#else
-# define machine_is_smint01() (0)
-#endif
-
-#ifdef CONFIG_MACH_PRTLVT2
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_PRTLVT2
-# endif
-# define machine_is_prtlvt2() (machine_arch_type == MACH_TYPE_PRTLVT2)
-#else
-# define machine_is_prtlvt2() (0)
-#endif
-
-#ifdef CONFIG_MACH_AP420
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_AP420
-# endif
-# define machine_is_ap420() (machine_arch_type == MACH_TYPE_AP420)
-#else
-# define machine_is_ap420() (0)
-#endif
-
-#ifdef CONFIG_MACH_HTCSHIFT
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_HTCSHIFT
-# endif
-# define machine_is_htcshift() (machine_arch_type == MACH_TYPE_HTCSHIFT)
-#else
-# define machine_is_htcshift() (0)
-#endif
-
-#ifdef CONFIG_MACH_DAVINCI_DM365_FC
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_DAVINCI_DM365_FC
-# endif
-# define machine_is_davinci_dm365_fc() (machine_arch_type == MACH_TYPE_DAVINCI_DM365_FC)
-#else
-# define machine_is_davinci_dm365_fc() (0)
-#endif
-
-#ifdef CONFIG_MACH_MSM8X55_SURF
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MSM8X55_SURF
-# endif
-# define machine_is_msm8x55_surf() (machine_arch_type == MACH_TYPE_MSM8X55_SURF)
-#else
-# define machine_is_msm8x55_surf() (0)
-#endif
-
-#ifdef CONFIG_MACH_MSM8X55_FFA
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MSM8X55_FFA
-# endif
-# define machine_is_msm8x55_ffa() (machine_arch_type == MACH_TYPE_MSM8X55_FFA)
-#else
-# define machine_is_msm8x55_ffa() (0)
-#endif
-
-#ifdef CONFIG_MACH_ESL_VAMANA
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ESL_VAMANA
-# endif
-# define machine_is_esl_vamana() (machine_arch_type == MACH_TYPE_ESL_VAMANA)
-#else
-# define machine_is_esl_vamana() (0)
-#endif
-
-#ifdef CONFIG_MACH_SBC35
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SBC35
-# endif
-# define machine_is_sbc35() (machine_arch_type == MACH_TYPE_SBC35)
-#else
-# define machine_is_sbc35() (0)
-#endif
-
-#ifdef CONFIG_MACH_MPX6446
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MPX6446
-# endif
-# define machine_is_mpx6446() (machine_arch_type == MACH_TYPE_MPX6446)
-#else
-# define machine_is_mpx6446() (0)
-#endif
-
-#ifdef CONFIG_MACH_OREO_CONTROLLER
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_OREO_CONTROLLER
-# endif
-# define machine_is_oreo_controller() (machine_arch_type == MACH_TYPE_OREO_CONTROLLER)
-#else
-# define machine_is_oreo_controller() (0)
-#endif
-
-#ifdef CONFIG_MACH_KOPIN_MODELS
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_KOPIN_MODELS
-# endif
-# define machine_is_kopin_models() (machine_arch_type == MACH_TYPE_KOPIN_MODELS)
-#else
-# define machine_is_kopin_models() (0)
-#endif
-
-#ifdef CONFIG_MACH_TTC_VISION2
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_TTC_VISION2
-# endif
-# define machine_is_ttc_vision2() (machine_arch_type == MACH_TYPE_TTC_VISION2)
-#else
-# define machine_is_ttc_vision2() (0)
-#endif
-
#ifdef CONFIG_MACH_CNS3420VB
# ifdef machine_arch_type
# undef machine_arch_type
@@ -36253,174 +6529,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_cns3420vb() (0)
#endif
-#ifdef CONFIG_MACH_LPC2
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_LPC2
-# endif
-# define machine_is_lpc2() (machine_arch_type == MACH_TYPE_LPC2)
-#else
-# define machine_is_lpc2() (0)
-#endif
-
-#ifdef CONFIG_MACH_OLYMPUS
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_OLYMPUS
-# endif
-# define machine_is_olympus() (machine_arch_type == MACH_TYPE_OLYMPUS)
-#else
-# define machine_is_olympus() (0)
-#endif
-
-#ifdef CONFIG_MACH_VORTEX
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_VORTEX
-# endif
-# define machine_is_vortex() (machine_arch_type == MACH_TYPE_VORTEX)
-#else
-# define machine_is_vortex() (0)
-#endif
-
-#ifdef CONFIG_MACH_S5PC200
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_S5PC200
-# endif
-# define machine_is_s5pc200() (machine_arch_type == MACH_TYPE_S5PC200)
-#else
-# define machine_is_s5pc200() (0)
-#endif
-
-#ifdef CONFIG_MACH_ECUCORE_9263
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ECUCORE_9263
-# endif
-# define machine_is_ecucore_9263() (machine_arch_type == MACH_TYPE_ECUCORE_9263)
-#else
-# define machine_is_ecucore_9263() (0)
-#endif
-
-#ifdef CONFIG_MACH_SMDKC200
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SMDKC200
-# endif
-# define machine_is_smdkc200() (machine_arch_type == MACH_TYPE_SMDKC200)
-#else
-# define machine_is_smdkc200() (0)
-#endif
-
-#ifdef CONFIG_MACH_EMSISO_SX27
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_EMSISO_SX27
-# endif
-# define machine_is_emsiso_sx27() (machine_arch_type == MACH_TYPE_EMSISO_SX27)
-#else
-# define machine_is_emsiso_sx27() (0)
-#endif
-
-#ifdef CONFIG_MACH_APX_SOM9G45_EK
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_APX_SOM9G45_EK
-# endif
-# define machine_is_apx_som9g45_ek() (machine_arch_type == MACH_TYPE_APX_SOM9G45_EK)
-#else
-# define machine_is_apx_som9g45_ek() (0)
-#endif
-
-#ifdef CONFIG_MACH_SONGSHAN
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SONGSHAN
-# endif
-# define machine_is_songshan() (machine_arch_type == MACH_TYPE_SONGSHAN)
-#else
-# define machine_is_songshan() (0)
-#endif
-
-#ifdef CONFIG_MACH_TIANSHAN
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_TIANSHAN
-# endif
-# define machine_is_tianshan() (machine_arch_type == MACH_TYPE_TIANSHAN)
-#else
-# define machine_is_tianshan() (0)
-#endif
-
-#ifdef CONFIG_MACH_VPX500
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_VPX500
-# endif
-# define machine_is_vpx500() (machine_arch_type == MACH_TYPE_VPX500)
-#else
-# define machine_is_vpx500() (0)
-#endif
-
-#ifdef CONFIG_MACH_AM3517SAM
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_AM3517SAM
-# endif
-# define machine_is_am3517sam() (machine_arch_type == MACH_TYPE_AM3517SAM)
-#else
-# define machine_is_am3517sam() (0)
-#endif
-
-#ifdef CONFIG_MACH_SKAT91_SIM508
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SKAT91_SIM508
-# endif
-# define machine_is_skat91_sim508() (machine_arch_type == MACH_TYPE_SKAT91_SIM508)
-#else
-# define machine_is_skat91_sim508() (0)
-#endif
-
-#ifdef CONFIG_MACH_SKAT91_S3E
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SKAT91_S3E
-# endif
-# define machine_is_skat91_s3e() (machine_arch_type == MACH_TYPE_SKAT91_S3E)
-#else
-# define machine_is_skat91_s3e() (0)
-#endif
-
#ifdef CONFIG_MACH_OMAP4_PANDA
# ifdef machine_arch_type
# undef machine_arch_type
@@ -36433,102 +6541,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_omap4_panda() (0)
#endif
-#ifdef CONFIG_MACH_DF7220
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_DF7220
-# endif
-# define machine_is_df7220() (machine_arch_type == MACH_TYPE_DF7220)
-#else
-# define machine_is_df7220() (0)
-#endif
-
-#ifdef CONFIG_MACH_NEMINI
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_NEMINI
-# endif
-# define machine_is_nemini() (machine_arch_type == MACH_TYPE_NEMINI)
-#else
-# define machine_is_nemini() (0)
-#endif
-
-#ifdef CONFIG_MACH_T8200
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_T8200
-# endif
-# define machine_is_t8200() (machine_arch_type == MACH_TYPE_T8200)
-#else
-# define machine_is_t8200() (0)
-#endif
-
-#ifdef CONFIG_MACH_APF51
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_APF51
-# endif
-# define machine_is_apf51() (machine_arch_type == MACH_TYPE_APF51)
-#else
-# define machine_is_apf51() (0)
-#endif
-
-#ifdef CONFIG_MACH_DR_RC_UNIT
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_DR_RC_UNIT
-# endif
-# define machine_is_dr_rc_unit() (machine_arch_type == MACH_TYPE_DR_RC_UNIT)
-#else
-# define machine_is_dr_rc_unit() (0)
-#endif
-
-#ifdef CONFIG_MACH_BORDEAUX
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_BORDEAUX
-# endif
-# define machine_is_bordeaux() (machine_arch_type == MACH_TYPE_BORDEAUX)
-#else
-# define machine_is_bordeaux() (0)
-#endif
-
-#ifdef CONFIG_MACH_CATANIA_B
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CATANIA_B
-# endif
-# define machine_is_catania_b() (machine_arch_type == MACH_TYPE_CATANIA_B)
-#else
-# define machine_is_catania_b() (0)
-#endif
-
-#ifdef CONFIG_MACH_MX51_OCEAN
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MX51_OCEAN
-# endif
-# define machine_is_mx51_ocean() (machine_arch_type == MACH_TYPE_MX51_OCEAN)
-#else
-# define machine_is_mx51_ocean() (0)
-#endif
-
#ifdef CONFIG_MACH_TI8168EVM
# ifdef machine_arch_type
# undef machine_arch_type
@@ -36541,186 +6553,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_ti8168evm() (0)
#endif
-#ifdef CONFIG_MACH_NEOCOREOMAP
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_NEOCOREOMAP
-# endif
-# define machine_is_neocoreomap() (machine_arch_type == MACH_TYPE_NEOCOREOMAP)
-#else
-# define machine_is_neocoreomap() (0)
-#endif
-
-#ifdef CONFIG_MACH_WITHINGS_WBP
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_WITHINGS_WBP
-# endif
-# define machine_is_withings_wbp() (machine_arch_type == MACH_TYPE_WITHINGS_WBP)
-#else
-# define machine_is_withings_wbp() (0)
-#endif
-
-#ifdef CONFIG_MACH_DBPS
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_DBPS
-# endif
-# define machine_is_dbps() (machine_arch_type == MACH_TYPE_DBPS)
-#else
-# define machine_is_dbps() (0)
-#endif
-
-#ifdef CONFIG_MACH_SBC9261
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SBC9261
-# endif
-# define machine_is_sbc9261() (machine_arch_type == MACH_TYPE_SBC9261)
-#else
-# define machine_is_sbc9261() (0)
-#endif
-
-#ifdef CONFIG_MACH_PCBFP0001
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_PCBFP0001
-# endif
-# define machine_is_pcbfp0001() (machine_arch_type == MACH_TYPE_PCBFP0001)
-#else
-# define machine_is_pcbfp0001() (0)
-#endif
-
-#ifdef CONFIG_MACH_SPEEDY
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SPEEDY
-# endif
-# define machine_is_speedy() (machine_arch_type == MACH_TYPE_SPEEDY)
-#else
-# define machine_is_speedy() (0)
-#endif
-
-#ifdef CONFIG_MACH_CHRYSAOR
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CHRYSAOR
-# endif
-# define machine_is_chrysaor() (machine_arch_type == MACH_TYPE_CHRYSAOR)
-#else
-# define machine_is_chrysaor() (0)
-#endif
-
-#ifdef CONFIG_MACH_TANGO
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_TANGO
-# endif
-# define machine_is_tango() (machine_arch_type == MACH_TYPE_TANGO)
-#else
-# define machine_is_tango() (0)
-#endif
-
-#ifdef CONFIG_MACH_SYNOLOGY_DSX11
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SYNOLOGY_DSX11
-# endif
-# define machine_is_synology_dsx11() (machine_arch_type == MACH_TYPE_SYNOLOGY_DSX11)
-#else
-# define machine_is_synology_dsx11() (0)
-#endif
-
-#ifdef CONFIG_MACH_HANLIN_V3EXT
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_HANLIN_V3EXT
-# endif
-# define machine_is_hanlin_v3ext() (machine_arch_type == MACH_TYPE_HANLIN_V3EXT)
-#else
-# define machine_is_hanlin_v3ext() (0)
-#endif
-
-#ifdef CONFIG_MACH_HANLIN_V5
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_HANLIN_V5
-# endif
-# define machine_is_hanlin_v5() (machine_arch_type == MACH_TYPE_HANLIN_V5)
-#else
-# define machine_is_hanlin_v5() (0)
-#endif
-
-#ifdef CONFIG_MACH_HANLIN_V3PLUS
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_HANLIN_V3PLUS
-# endif
-# define machine_is_hanlin_v3plus() (machine_arch_type == MACH_TYPE_HANLIN_V3PLUS)
-#else
-# define machine_is_hanlin_v3plus() (0)
-#endif
-
-#ifdef CONFIG_MACH_IRIVER_STORY
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_IRIVER_STORY
-# endif
-# define machine_is_iriver_story() (machine_arch_type == MACH_TYPE_IRIVER_STORY)
-#else
-# define machine_is_iriver_story() (0)
-#endif
-
-#ifdef CONFIG_MACH_IREX_ILIAD
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_IREX_ILIAD
-# endif
-# define machine_is_irex_iliad() (machine_arch_type == MACH_TYPE_IREX_ILIAD)
-#else
-# define machine_is_irex_iliad() (0)
-#endif
-
-#ifdef CONFIG_MACH_IREX_DR1000
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_IREX_DR1000
-# endif
-# define machine_is_irex_dr1000() (machine_arch_type == MACH_TYPE_IREX_DR1000)
-#else
-# define machine_is_irex_dr1000() (0)
-#endif
-
#ifdef CONFIG_MACH_TETON_BGA
# ifdef machine_arch_type
# undef machine_arch_type
@@ -36733,62 +6565,26 @@ extern unsigned int __machine_arch_type;
# define machine_is_teton_bga() (0)
#endif
-#ifdef CONFIG_MACH_SNAPPER9G45
+#ifdef CONFIG_MACH_EUKREA_CPUIMX25SD
# ifdef machine_arch_type
# undef machine_arch_type
# define machine_arch_type __machine_arch_type
# else
-# define machine_arch_type MACH_TYPE_SNAPPER9G45
+# define machine_arch_type MACH_TYPE_EUKREA_CPUIMX25SD
# endif
-# define machine_is_snapper9g45() (machine_arch_type == MACH_TYPE_SNAPPER9G45)
-#else
-# define machine_is_snapper9g45() (0)
-#endif
-
-#ifdef CONFIG_MACH_TAM3517
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_TAM3517
-# endif
-# define machine_is_tam3517() (machine_arch_type == MACH_TYPE_TAM3517)
-#else
-# define machine_is_tam3517() (0)
-#endif
-
-#ifdef CONFIG_MACH_PDC100
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_PDC100
-# endif
-# define machine_is_pdc100() (machine_arch_type == MACH_TYPE_PDC100)
-#else
-# define machine_is_pdc100() (0)
-#endif
-
-#ifdef CONFIG_MACH_EUKREA_CPUIMX25
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_EUKREA_CPUIMX25
-# endif
-# define machine_is_eukrea_cpuimx25sd() (machine_arch_type == MACH_TYPE_EUKREA_CPUIMX25)
+# define machine_is_eukrea_cpuimx25sd() (machine_arch_type == MACH_TYPE_EUKREA_CPUIMX25SD)
#else
# define machine_is_eukrea_cpuimx25sd() (0)
#endif
-#ifdef CONFIG_MACH_EUKREA_CPUIMX35
+#ifdef CONFIG_MACH_EUKREA_CPUIMX35SD
# ifdef machine_arch_type
# undef machine_arch_type
# define machine_arch_type __machine_arch_type
# else
-# define machine_arch_type MACH_TYPE_EUKREA_CPUIMX35
+# define machine_arch_type MACH_TYPE_EUKREA_CPUIMX35SD
# endif
-# define machine_is_eukrea_cpuimx35sd() (machine_arch_type == MACH_TYPE_EUKREA_CPUIMX35)
+# define machine_is_eukrea_cpuimx35sd() (machine_arch_type == MACH_TYPE_EUKREA_CPUIMX35SD)
#else
# define machine_is_eukrea_cpuimx35sd() (0)
#endif
@@ -36817,174 +6613,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_eukrea_cpuimx51() (0)
#endif
-#ifdef CONFIG_MACH_P565
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_P565
-# endif
-# define machine_is_p565() (machine_arch_type == MACH_TYPE_P565)
-#else
-# define machine_is_p565() (0)
-#endif
-
-#ifdef CONFIG_MACH_ACER_A4
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ACER_A4
-# endif
-# define machine_is_acer_a4() (machine_arch_type == MACH_TYPE_ACER_A4)
-#else
-# define machine_is_acer_a4() (0)
-#endif
-
-#ifdef CONFIG_MACH_DAVINCI_DM368_BIP
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_DAVINCI_DM368_BIP
-# endif
-# define machine_is_davinci_dm368_bip() (machine_arch_type == MACH_TYPE_DAVINCI_DM368_BIP)
-#else
-# define machine_is_davinci_dm368_bip() (0)
-#endif
-
-#ifdef CONFIG_MACH_ESHARE
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ESHARE
-# endif
-# define machine_is_eshare() (machine_arch_type == MACH_TYPE_ESHARE)
-#else
-# define machine_is_eshare() (0)
-#endif
-
-#ifdef CONFIG_MACH_HW_OMAPL138_EUROPA
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_HW_OMAPL138_EUROPA
-# endif
-# define machine_is_hw_omapl138_europa() (machine_arch_type == MACH_TYPE_HW_OMAPL138_EUROPA)
-#else
-# define machine_is_hw_omapl138_europa() (0)
-#endif
-
-#ifdef CONFIG_MACH_WLBARGN
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_WLBARGN
-# endif
-# define machine_is_wlbargn() (machine_arch_type == MACH_TYPE_WLBARGN)
-#else
-# define machine_is_wlbargn() (0)
-#endif
-
-#ifdef CONFIG_MACH_BM170
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_BM170
-# endif
-# define machine_is_bm170() (machine_arch_type == MACH_TYPE_BM170)
-#else
-# define machine_is_bm170() (0)
-#endif
-
-#ifdef CONFIG_MACH_NETSPACE_MINI_V2
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_NETSPACE_MINI_V2
-# endif
-# define machine_is_netspace_mini_v2() (machine_arch_type == MACH_TYPE_NETSPACE_MINI_V2)
-#else
-# define machine_is_netspace_mini_v2() (0)
-#endif
-
-#ifdef CONFIG_MACH_NETSPACE_PLUG_V2
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_NETSPACE_PLUG_V2
-# endif
-# define machine_is_netspace_plug_v2() (machine_arch_type == MACH_TYPE_NETSPACE_PLUG_V2)
-#else
-# define machine_is_netspace_plug_v2() (0)
-#endif
-
-#ifdef CONFIG_MACH_SIEMENS_L1
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_SIEMENS_L1
-# endif
-# define machine_is_siemens_l1() (machine_arch_type == MACH_TYPE_SIEMENS_L1)
-#else
-# define machine_is_siemens_l1() (0)
-#endif
-
-#ifdef CONFIG_MACH_ELV_LCU1
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ELV_LCU1
-# endif
-# define machine_is_elv_lcu1() (machine_arch_type == MACH_TYPE_ELV_LCU1)
-#else
-# define machine_is_elv_lcu1() (0)
-#endif
-
-#ifdef CONFIG_MACH_MCU1
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MCU1
-# endif
-# define machine_is_mcu1() (machine_arch_type == MACH_TYPE_MCU1)
-#else
-# define machine_is_mcu1() (0)
-#endif
-
-#ifdef CONFIG_MACH_OMAP3_TAO3530
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_OMAP3_TAO3530
-# endif
-# define machine_is_omap3_tao3530() (machine_arch_type == MACH_TYPE_OMAP3_TAO3530)
-#else
-# define machine_is_omap3_tao3530() (0)
-#endif
-
-#ifdef CONFIG_MACH_OMAP3_PCUTOUCH
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_OMAP3_PCUTOUCH
-# endif
-# define machine_is_omap3_pcutouch() (machine_arch_type == MACH_TYPE_OMAP3_PCUTOUCH)
-#else
-# define machine_is_omap3_pcutouch() (0)
-#endif
-
#ifdef CONFIG_MACH_SMDKC210
# ifdef machine_arch_type
# undef machine_arch_type
@@ -37669,18 +7297,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_pupitre() (0)
#endif
-#ifdef CONFIG_MACH_TEGRA_HARMONY
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_TEGRA_HARMONY
-# endif
-# define machine_is_tegra_harmony() (machine_arch_type == MACH_TYPE_TEGRA_HARMONY)
-#else
-# define machine_is_tegra_harmony() (0)
-#endif
-
#ifdef CONFIG_MACH_TEGRA_VOGUE
# ifdef machine_arch_type
# undef machine_arch_type
@@ -38749,18 +8365,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_wasabi() (0)
#endif
-#ifdef CONFIG_MACH_VIVOW
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_VIVOW
-# endif
-# define machine_is_vivow() (machine_arch_type == MACH_TYPE_VIVOW)
-#else
-# define machine_is_vivow() (0)
-#endif
-
#ifdef CONFIG_MACH_MX50_RDP
# ifdef machine_arch_type
# undef machine_arch_type
@@ -39325,18 +8929,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_kt_sbc_sam9_1() (0)
#endif
-#ifdef CONFIG_MACH_ORATISROUTER
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ORATISROUTER
-# endif
-# define machine_is_oratisrouter() (machine_arch_type == MACH_TYPE_ORATISROUTER)
-#else
-# define machine_is_oratisrouter() (0)
-#endif
-
#ifdef CONFIG_MACH_ARMADA_XP_DB
# ifdef machine_arch_type
# undef machine_arch_type
@@ -39385,18 +8977,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_dgm3240() (0)
#endif
-#ifdef CONFIG_MACH_ATLAS_I_LPE
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_ATLAS_I_LPE
-# endif
-# define machine_is_atlas_i_lpe() (machine_arch_type == MACH_TYPE_ATLAS_I_LPE)
-#else
-# define machine_is_atlas_i_lpe() (0)
-#endif
-
#ifdef CONFIG_MACH_HTCMEGA
# ifdef machine_arch_type
# undef machine_arch_type
@@ -39865,18 +9445,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_shortloin() (0)
#endif
-#ifdef CONFIG_MACH_CRESPO
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_CRESPO
-# endif
-# define machine_is_crespo() (machine_arch_type == MACH_TYPE_CRESPO)
-#else
-# define machine_is_crespo() (0)
-#endif
-
#ifdef CONFIG_MACH_ANTARES
# ifdef machine_arch_type
# undef machine_arch_type
@@ -40453,18 +10021,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_acmenetusfoxg20() (0)
#endif
-#ifdef CONFIG_MACH_HTCWILLOW
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_HTCWILLOW
-# endif
-# define machine_is_htcwillow() (machine_arch_type == MACH_TYPE_HTCWILLOW)
-#else
-# define machine_is_htcwillow() (0)
-#endif
-
#ifdef CONFIG_MACH_FWBD_0404
# ifdef machine_arch_type
# undef machine_arch_type
@@ -41065,18 +10621,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_elephant() (0)
#endif
-#ifdef CONFIG_MACH_MSM8X60_FUSION
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MSM8X60_FUSION
-# endif
-# define machine_is_msm8x60_fusion() (machine_arch_type == MACH_TYPE_MSM8X60_FUSION)
-#else
-# define machine_is_msm8x60_fusion() (0)
-#endif
-
#ifdef CONFIG_MACH_SHOOTER
# ifdef machine_arch_type
# undef machine_arch_type
@@ -41209,18 +10753,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_omap3_tdm3730() (0)
#endif
-#ifdef CONFIG_MACH_G7
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_G7
-# endif
-# define machine_is_g7() (machine_arch_type == MACH_TYPE_G7)
-#else
-# define machine_is_g7() (0)
-#endif
-
#ifdef CONFIG_MACH_TOP9000_EVAL
# ifdef machine_arch_type
# undef machine_arch_type
@@ -41281,18 +10813,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_ts75xx() (0)
#endif
-#ifdef CONFIG_MACH_MSM8X60_FUSN_FFA
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_MSM8X60_FUSN_FFA
-# endif
-# define machine_is_msm8x60_fusn_ffa() (machine_arch_type == MACH_TYPE_MSM8X60_FUSN_FFA)
-#else
-# define machine_is_msm8x60_fusn_ffa() (0)
-#endif
-
#ifdef CONFIG_MACH_TS47XX
# ifdef machine_arch_type
# undef machine_arch_type
@@ -42253,16 +11773,16 @@ extern unsigned int __machine_arch_type;
# define machine_is_rockhopper() (0)
#endif
-#ifdef CONFIG_MACH_NOOKCOLOR
+#ifdef CONFIG_MACH_ENCORE
# ifdef machine_arch_type
# undef machine_arch_type
# define machine_arch_type __machine_arch_type
# else
-# define machine_arch_type MACH_TYPE_NOOKCOLOR
+# define machine_arch_type MACH_TYPE_ENCORE
# endif
-# define machine_is_nookcolor() (machine_arch_type == MACH_TYPE_NOOKCOLOR)
+# define machine_is_encore() (machine_arch_type == MACH_TYPE_ENCORE)
#else
-# define machine_is_nookcolor() (0)
+# define machine_is_encore() (0)
#endif
#ifdef CONFIG_MACH_HKDKC100
@@ -42385,18 +11905,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_tpt_2_0() (0)
#endif
-#ifdef CONFIG_MACH_PYRAMID_TD
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_PYRAMID_TD
-# endif
-# define machine_is_pyramid_td() (machine_arch_type == MACH_TYPE_PYRAMID_TD)
-#else
-# define machine_is_pyramid_td() (0)
-#endif
-
#ifdef CONFIG_MACH_SPLENDOR
# ifdef machine_arch_type
# undef machine_arch_type
@@ -42409,18 +11917,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_splendor() (0)
#endif
-#ifdef CONFIG_MACH_GUF_PLANET
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_GUF_PLANET
-# endif
-# define machine_is_guf_planet() (machine_arch_type == MACH_TYPE_GUF_PLANET)
-#else
-# define machine_is_guf_planet() (0)
-#endif
-
#ifdef CONFIG_MACH_MSM8X60_QT
# ifdef machine_arch_type
# undef machine_arch_type
@@ -42541,18 +12037,6 @@ extern unsigned int __machine_arch_type;
# define machine_is_dragonet() (0)
#endif
-#ifdef CONFIG_MACH_GENEVA_B
-# ifdef machine_arch_type
-# undef machine_arch_type
-# define machine_arch_type __machine_arch_type
-# else
-# define machine_arch_type MACH_TYPE_GENEVA_B
-# endif
-# define machine_is_geneva_b() (machine_arch_type == MACH_TYPE_GENEVA_B)
-#else
-# define machine_is_geneva_b() (0)
-#endif
-
#ifdef CONFIG_MACH_AT91SAM9263DESK16L
# ifdef machine_arch_type
# undef machine_arch_type
@@ -42913,6 +12397,1818 @@ extern unsigned int __machine_arch_type;
# define machine_is_goflexhome() (0)
#endif
+#ifdef CONFIG_MACH_LANREADYFN511
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_LANREADYFN511
+# endif
+# define machine_is_lanreadyfn511() (machine_arch_type == MACH_TYPE_LANREADYFN511)
+#else
+# define machine_is_lanreadyfn511() (0)
+#endif
+
+#ifdef CONFIG_MACH_OMAP3_BAIA
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_OMAP3_BAIA
+# endif
+# define machine_is_omap3_baia() (machine_arch_type == MACH_TYPE_OMAP3_BAIA)
+#else
+# define machine_is_omap3_baia() (0)
+#endif
+
+#ifdef CONFIG_MACH_OMAP3SMARTDISPLAY
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_OMAP3SMARTDISPLAY
+# endif
+# define machine_is_omap3smartdisplay() (machine_arch_type == MACH_TYPE_OMAP3SMARTDISPLAY)
+#else
+# define machine_is_omap3smartdisplay() (0)
+#endif
+
+#ifdef CONFIG_MACH_XILINX
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_XILINX
+# endif
+# define machine_is_xilinx() (machine_arch_type == MACH_TYPE_XILINX)
+#else
+# define machine_is_xilinx() (0)
+#endif
+
+#ifdef CONFIG_MACH_A2F
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_A2F
+# endif
+# define machine_is_a2f() (machine_arch_type == MACH_TYPE_A2F)
+#else
+# define machine_is_a2f() (0)
+#endif
+
+#ifdef CONFIG_MACH_SKY25
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_SKY25
+# endif
+# define machine_is_sky25() (machine_arch_type == MACH_TYPE_SKY25)
+#else
+# define machine_is_sky25() (0)
+#endif
+
+#ifdef CONFIG_MACH_CCMX53
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_CCMX53
+# endif
+# define machine_is_ccmx53() (machine_arch_type == MACH_TYPE_CCMX53)
+#else
+# define machine_is_ccmx53() (0)
+#endif
+
+#ifdef CONFIG_MACH_CCMX53JS
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_CCMX53JS
+# endif
+# define machine_is_ccmx53js() (machine_arch_type == MACH_TYPE_CCMX53JS)
+#else
+# define machine_is_ccmx53js() (0)
+#endif
+
+#ifdef CONFIG_MACH_CCWMX53
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_CCWMX53
+# endif
+# define machine_is_ccwmx53() (machine_arch_type == MACH_TYPE_CCWMX53)
+#else
+# define machine_is_ccwmx53() (0)
+#endif
+
+#ifdef CONFIG_MACH_CCWMX53JS
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_CCWMX53JS
+# endif
+# define machine_is_ccwmx53js() (machine_arch_type == MACH_TYPE_CCWMX53JS)
+#else
+# define machine_is_ccwmx53js() (0)
+#endif
+
+#ifdef CONFIG_MACH_FRISMS
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_FRISMS
+# endif
+# define machine_is_frisms() (machine_arch_type == MACH_TYPE_FRISMS)
+#else
+# define machine_is_frisms() (0)
+#endif
+
+#ifdef CONFIG_MACH_MSM7X27A_FFA
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_MSM7X27A_FFA
+# endif
+# define machine_is_msm7x27a_ffa() (machine_arch_type == MACH_TYPE_MSM7X27A_FFA)
+#else
+# define machine_is_msm7x27a_ffa() (0)
+#endif
+
+#ifdef CONFIG_MACH_MSM7X27A_SURF
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_MSM7X27A_SURF
+# endif
+# define machine_is_msm7x27a_surf() (machine_arch_type == MACH_TYPE_MSM7X27A_SURF)
+#else
+# define machine_is_msm7x27a_surf() (0)
+#endif
+
+#ifdef CONFIG_MACH_MSM7X27A_RUMI3
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_MSM7X27A_RUMI3
+# endif
+# define machine_is_msm7x27a_rumi3() (machine_arch_type == MACH_TYPE_MSM7X27A_RUMI3)
+#else
+# define machine_is_msm7x27a_rumi3() (0)
+#endif
+
+#ifdef CONFIG_MACH_DIMMSAM9G20
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_DIMMSAM9G20
+# endif
+# define machine_is_dimmsam9g20() (machine_arch_type == MACH_TYPE_DIMMSAM9G20)
+#else
+# define machine_is_dimmsam9g20() (0)
+#endif
+
+#ifdef CONFIG_MACH_DIMM_IMX28
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_DIMM_IMX28
+# endif
+# define machine_is_dimm_imx28() (machine_arch_type == MACH_TYPE_DIMM_IMX28)
+#else
+# define machine_is_dimm_imx28() (0)
+#endif
+
+#ifdef CONFIG_MACH_AMK_A4
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_AMK_A4
+# endif
+# define machine_is_amk_a4() (machine_arch_type == MACH_TYPE_AMK_A4)
+#else
+# define machine_is_amk_a4() (0)
+#endif
+
+#ifdef CONFIG_MACH_GNET_SGME
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_GNET_SGME
+# endif
+# define machine_is_gnet_sgme() (machine_arch_type == MACH_TYPE_GNET_SGME)
+#else
+# define machine_is_gnet_sgme() (0)
+#endif
+
+#ifdef CONFIG_MACH_SHOOTER_U
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_SHOOTER_U
+# endif
+# define machine_is_shooter_u() (machine_arch_type == MACH_TYPE_SHOOTER_U)
+#else
+# define machine_is_shooter_u() (0)
+#endif
+
+#ifdef CONFIG_MACH_VMX53
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_VMX53
+# endif
+# define machine_is_vmx53() (machine_arch_type == MACH_TYPE_VMX53)
+#else
+# define machine_is_vmx53() (0)
+#endif
+
+#ifdef CONFIG_MACH_RHINO
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_RHINO
+# endif
+# define machine_is_rhino() (machine_arch_type == MACH_TYPE_RHINO)
+#else
+# define machine_is_rhino() (0)
+#endif
+
+#ifdef CONFIG_MACH_ARMLEX4210
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_ARMLEX4210
+# endif
+# define machine_is_armlex4210() (machine_arch_type == MACH_TYPE_ARMLEX4210)
+#else
+# define machine_is_armlex4210() (0)
+#endif
+
+#ifdef CONFIG_MACH_SWARCOEXTMODEM
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_SWARCOEXTMODEM
+# endif
+# define machine_is_swarcoextmodem() (machine_arch_type == MACH_TYPE_SWARCOEXTMODEM)
+#else
+# define machine_is_swarcoextmodem() (0)
+#endif
+
+#ifdef CONFIG_MACH_SNOWBALL
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_SNOWBALL
+# endif
+# define machine_is_snowball() (machine_arch_type == MACH_TYPE_SNOWBALL)
+#else
+# define machine_is_snowball() (0)
+#endif
+
+#ifdef CONFIG_MACH_PCM049
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_PCM049
+# endif
+# define machine_is_pcm049() (machine_arch_type == MACH_TYPE_PCM049)
+#else
+# define machine_is_pcm049() (0)
+#endif
+
+#ifdef CONFIG_MACH_VIGOR
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_VIGOR
+# endif
+# define machine_is_vigor() (machine_arch_type == MACH_TYPE_VIGOR)
+#else
+# define machine_is_vigor() (0)
+#endif
+
+#ifdef CONFIG_MACH_OSLO_AMUNDSEN
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_OSLO_AMUNDSEN
+# endif
+# define machine_is_oslo_amundsen() (machine_arch_type == MACH_TYPE_OSLO_AMUNDSEN)
+#else
+# define machine_is_oslo_amundsen() (0)
+#endif
+
+#ifdef CONFIG_MACH_GSL_DIAMOND
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_GSL_DIAMOND
+# endif
+# define machine_is_gsl_diamond() (machine_arch_type == MACH_TYPE_GSL_DIAMOND)
+#else
+# define machine_is_gsl_diamond() (0)
+#endif
+
+#ifdef CONFIG_MACH_CV2201
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_CV2201
+# endif
+# define machine_is_cv2201() (machine_arch_type == MACH_TYPE_CV2201)
+#else
+# define machine_is_cv2201() (0)
+#endif
+
+#ifdef CONFIG_MACH_CV2202
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_CV2202
+# endif
+# define machine_is_cv2202() (machine_arch_type == MACH_TYPE_CV2202)
+#else
+# define machine_is_cv2202() (0)
+#endif
+
+#ifdef CONFIG_MACH_CV2203
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_CV2203
+# endif
+# define machine_is_cv2203() (machine_arch_type == MACH_TYPE_CV2203)
+#else
+# define machine_is_cv2203() (0)
+#endif
+
+#ifdef CONFIG_MACH_VIT_IBOX
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_VIT_IBOX
+# endif
+# define machine_is_vit_ibox() (machine_arch_type == MACH_TYPE_VIT_IBOX)
+#else
+# define machine_is_vit_ibox() (0)
+#endif
+
+#ifdef CONFIG_MACH_DM6441_ESP
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_DM6441_ESP
+# endif
+# define machine_is_dm6441_esp() (machine_arch_type == MACH_TYPE_DM6441_ESP)
+#else
+# define machine_is_dm6441_esp() (0)
+#endif
+
+#ifdef CONFIG_MACH_AT91SAM9X5EK
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_AT91SAM9X5EK
+# endif
+# define machine_is_at91sam9x5ek() (machine_arch_type == MACH_TYPE_AT91SAM9X5EK)
+#else
+# define machine_is_at91sam9x5ek() (0)
+#endif
+
+#ifdef CONFIG_MACH_LIBRA
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_LIBRA
+# endif
+# define machine_is_libra() (machine_arch_type == MACH_TYPE_LIBRA)
+#else
+# define machine_is_libra() (0)
+#endif
+
+#ifdef CONFIG_MACH_EASYCRRH
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_EASYCRRH
+# endif
+# define machine_is_easycrrh() (machine_arch_type == MACH_TYPE_EASYCRRH)
+#else
+# define machine_is_easycrrh() (0)
+#endif
+
+#ifdef CONFIG_MACH_TRIPEL
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_TRIPEL
+# endif
+# define machine_is_tripel() (machine_arch_type == MACH_TYPE_TRIPEL)
+#else
+# define machine_is_tripel() (0)
+#endif
+
+#ifdef CONFIG_MACH_ENDIAN_MINI
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_ENDIAN_MINI
+# endif
+# define machine_is_endian_mini() (machine_arch_type == MACH_TYPE_ENDIAN_MINI)
+#else
+# define machine_is_endian_mini() (0)
+#endif
+
+#ifdef CONFIG_MACH_XILINX_EP107
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_XILINX_EP107
+# endif
+# define machine_is_xilinx_ep107() (machine_arch_type == MACH_TYPE_XILINX_EP107)
+#else
+# define machine_is_xilinx_ep107() (0)
+#endif
+
+#ifdef CONFIG_MACH_NURI
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_NURI
+# endif
+# define machine_is_nuri() (machine_arch_type == MACH_TYPE_NURI)
+#else
+# define machine_is_nuri() (0)
+#endif
+
+#ifdef CONFIG_MACH_JANUS
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_JANUS
+# endif
+# define machine_is_janus() (machine_arch_type == MACH_TYPE_JANUS)
+#else
+# define machine_is_janus() (0)
+#endif
+
+#ifdef CONFIG_MACH_DDNAS
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_DDNAS
+# endif
+# define machine_is_ddnas() (machine_arch_type == MACH_TYPE_DDNAS)
+#else
+# define machine_is_ddnas() (0)
+#endif
+
+#ifdef CONFIG_MACH_TAG
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_TAG
+# endif
+# define machine_is_tag() (machine_arch_type == MACH_TYPE_TAG)
+#else
+# define machine_is_tag() (0)
+#endif
+
+#ifdef CONFIG_MACH_TAGW
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_TAGW
+# endif
+# define machine_is_tagw() (machine_arch_type == MACH_TYPE_TAGW)
+#else
+# define machine_is_tagw() (0)
+#endif
+
+#ifdef CONFIG_MACH_NITROGEN_VM_IMX51
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_NITROGEN_VM_IMX51
+# endif
+# define machine_is_nitrogen_vm_imx51() (machine_arch_type == MACH_TYPE_NITROGEN_VM_IMX51)
+#else
+# define machine_is_nitrogen_vm_imx51() (0)
+#endif
+
+#ifdef CONFIG_MACH_VIPRINET
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_VIPRINET
+# endif
+# define machine_is_viprinet() (machine_arch_type == MACH_TYPE_VIPRINET)
+#else
+# define machine_is_viprinet() (0)
+#endif
+
+#ifdef CONFIG_MACH_BOCKW
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_BOCKW
+# endif
+# define machine_is_bockw() (machine_arch_type == MACH_TYPE_BOCKW)
+#else
+# define machine_is_bockw() (0)
+#endif
+
+#ifdef CONFIG_MACH_EVA2000
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_EVA2000
+# endif
+# define machine_is_eva2000() (machine_arch_type == MACH_TYPE_EVA2000)
+#else
+# define machine_is_eva2000() (0)
+#endif
+
+#ifdef CONFIG_MACH_STEELYARD
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_STEELYARD
+# endif
+# define machine_is_steelyard() (machine_arch_type == MACH_TYPE_STEELYARD)
+#else
+# define machine_is_steelyard() (0)
+#endif
+
+#ifdef CONFIG_MACH_MACH_SDH001
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_MACH_SDH001
+# endif
+# define machine_is_sdh001() (machine_arch_type == MACH_TYPE_MACH_SDH001)
+#else
+# define machine_is_sdh001() (0)
+#endif
+
+#ifdef CONFIG_MACH_NSSLSBOARD
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_NSSLSBOARD
+# endif
+# define machine_is_nsslsboard() (machine_arch_type == MACH_TYPE_NSSLSBOARD)
+#else
+# define machine_is_nsslsboard() (0)
+#endif
+
+#ifdef CONFIG_MACH_GENEVA_B5
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_GENEVA_B5
+# endif
+# define machine_is_geneva_b5() (machine_arch_type == MACH_TYPE_GENEVA_B5)
+#else
+# define machine_is_geneva_b5() (0)
+#endif
+
+#ifdef CONFIG_MACH_SPEAR1340
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_SPEAR1340
+# endif
+# define machine_is_spear1340() (machine_arch_type == MACH_TYPE_SPEAR1340)
+#else
+# define machine_is_spear1340() (0)
+#endif
+
+#ifdef CONFIG_MACH_REXMAS
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_REXMAS
+# endif
+# define machine_is_rexmas() (machine_arch_type == MACH_TYPE_REXMAS)
+#else
+# define machine_is_rexmas() (0)
+#endif
+
+#ifdef CONFIG_MACH_MSM8960_CDP
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_MSM8960_CDP
+# endif
+# define machine_is_msm8960_cdp() (machine_arch_type == MACH_TYPE_MSM8960_CDP)
+#else
+# define machine_is_msm8960_cdp() (0)
+#endif
+
+#ifdef CONFIG_MACH_MSM8960_MDP
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_MSM8960_MDP
+# endif
+# define machine_is_msm8960_mdp() (machine_arch_type == MACH_TYPE_MSM8960_MDP)
+#else
+# define machine_is_msm8960_mdp() (0)
+#endif
+
+#ifdef CONFIG_MACH_MSM8960_FLUID
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_MSM8960_FLUID
+# endif
+# define machine_is_msm8960_fluid() (machine_arch_type == MACH_TYPE_MSM8960_FLUID)
+#else
+# define machine_is_msm8960_fluid() (0)
+#endif
+
+#ifdef CONFIG_MACH_MSM8960_APQ
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_MSM8960_APQ
+# endif
+# define machine_is_msm8960_apq() (machine_arch_type == MACH_TYPE_MSM8960_APQ)
+#else
+# define machine_is_msm8960_apq() (0)
+#endif
+
+#ifdef CONFIG_MACH_HELIOS_V2
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_HELIOS_V2
+# endif
+# define machine_is_helios_v2() (machine_arch_type == MACH_TYPE_HELIOS_V2)
+#else
+# define machine_is_helios_v2() (0)
+#endif
+
+#ifdef CONFIG_MACH_MIF10P
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_MIF10P
+# endif
+# define machine_is_mif10p() (machine_arch_type == MACH_TYPE_MIF10P)
+#else
+# define machine_is_mif10p() (0)
+#endif
+
+#ifdef CONFIG_MACH_IAM28
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_IAM28
+# endif
+# define machine_is_iam28() (machine_arch_type == MACH_TYPE_IAM28)
+#else
+# define machine_is_iam28() (0)
+#endif
+
+#ifdef CONFIG_MACH_PICASSO
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_PICASSO
+# endif
+# define machine_is_picasso() (machine_arch_type == MACH_TYPE_PICASSO)
+#else
+# define machine_is_picasso() (0)
+#endif
+
+#ifdef CONFIG_MACH_MR301A
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_MR301A
+# endif
+# define machine_is_mr301a() (machine_arch_type == MACH_TYPE_MR301A)
+#else
+# define machine_is_mr301a() (0)
+#endif
+
+#ifdef CONFIG_MACH_NOTLE
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_NOTLE
+# endif
+# define machine_is_notle() (machine_arch_type == MACH_TYPE_NOTLE)
+#else
+# define machine_is_notle() (0)
+#endif
+
+#ifdef CONFIG_MACH_EELX2
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_EELX2
+# endif
+# define machine_is_eelx2() (machine_arch_type == MACH_TYPE_EELX2)
+#else
+# define machine_is_eelx2() (0)
+#endif
+
+#ifdef CONFIG_MACH_MOON
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_MOON
+# endif
+# define machine_is_moon() (machine_arch_type == MACH_TYPE_MOON)
+#else
+# define machine_is_moon() (0)
+#endif
+
+#ifdef CONFIG_MACH_RUBY
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_RUBY
+# endif
+# define machine_is_ruby() (machine_arch_type == MACH_TYPE_RUBY)
+#else
+# define machine_is_ruby() (0)
+#endif
+
+#ifdef CONFIG_MACH_GOLDENGATE
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_GOLDENGATE
+# endif
+# define machine_is_goldengate() (machine_arch_type == MACH_TYPE_GOLDENGATE)
+#else
+# define machine_is_goldengate() (0)
+#endif
+
+#ifdef CONFIG_MACH_CTBU_GEN2
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_CTBU_GEN2
+# endif
+# define machine_is_ctbu_gen2() (machine_arch_type == MACH_TYPE_CTBU_GEN2)
+#else
+# define machine_is_ctbu_gen2() (0)
+#endif
+
+#ifdef CONFIG_MACH_KMP_AM17_01
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_KMP_AM17_01
+# endif
+# define machine_is_kmp_am17_01() (machine_arch_type == MACH_TYPE_KMP_AM17_01)
+#else
+# define machine_is_kmp_am17_01() (0)
+#endif
+
+#ifdef CONFIG_MACH_WTPLUG
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_WTPLUG
+# endif
+# define machine_is_wtplug() (machine_arch_type == MACH_TYPE_WTPLUG)
+#else
+# define machine_is_wtplug() (0)
+#endif
+
+#ifdef CONFIG_MACH_MX27SU2
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_MX27SU2
+# endif
+# define machine_is_mx27su2() (machine_arch_type == MACH_TYPE_MX27SU2)
+#else
+# define machine_is_mx27su2() (0)
+#endif
+
+#ifdef CONFIG_MACH_NB31
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_NB31
+# endif
+# define machine_is_nb31() (machine_arch_type == MACH_TYPE_NB31)
+#else
+# define machine_is_nb31() (0)
+#endif
+
+#ifdef CONFIG_MACH_HJSDU
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_HJSDU
+# endif
+# define machine_is_hjsdu() (machine_arch_type == MACH_TYPE_HJSDU)
+#else
+# define machine_is_hjsdu() (0)
+#endif
+
+#ifdef CONFIG_MACH_TD3_REV1
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_TD3_REV1
+# endif
+# define machine_is_td3_rev1() (machine_arch_type == MACH_TYPE_TD3_REV1)
+#else
+# define machine_is_td3_rev1() (0)
+#endif
+
+#ifdef CONFIG_MACH_EAG_CI4000
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_EAG_CI4000
+# endif
+# define machine_is_eag_ci4000() (machine_arch_type == MACH_TYPE_EAG_CI4000)
+#else
+# define machine_is_eag_ci4000() (0)
+#endif
+
+#ifdef CONFIG_MACH_NET5BIG_NAND_V2
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_NET5BIG_NAND_V2
+# endif
+# define machine_is_net5big_nand_v2() (machine_arch_type == MACH_TYPE_NET5BIG_NAND_V2)
+#else
+# define machine_is_net5big_nand_v2() (0)
+#endif
+
+#ifdef CONFIG_MACH_CPX2
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_CPX2
+# endif
+# define machine_is_cpx2() (machine_arch_type == MACH_TYPE_CPX2)
+#else
+# define machine_is_cpx2() (0)
+#endif
+
+#ifdef CONFIG_MACH_NET2BIG_NAND_V2
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_NET2BIG_NAND_V2
+# endif
+# define machine_is_net2big_nand_v2() (machine_arch_type == MACH_TYPE_NET2BIG_NAND_V2)
+#else
+# define machine_is_net2big_nand_v2() (0)
+#endif
+
+#ifdef CONFIG_MACH_ECUV5
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_ECUV5
+# endif
+# define machine_is_ecuv5() (machine_arch_type == MACH_TYPE_ECUV5)
+#else
+# define machine_is_ecuv5() (0)
+#endif
+
+#ifdef CONFIG_MACH_HSGX6D
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_HSGX6D
+# endif
+# define machine_is_hsgx6d() (machine_arch_type == MACH_TYPE_HSGX6D)
+#else
+# define machine_is_hsgx6d() (0)
+#endif
+
+#ifdef CONFIG_MACH_DAWAD7
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_DAWAD7
+# endif
+# define machine_is_dawad7() (machine_arch_type == MACH_TYPE_DAWAD7)
+#else
+# define machine_is_dawad7() (0)
+#endif
+
+#ifdef CONFIG_MACH_SAM9REPEATER
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_SAM9REPEATER
+# endif
+# define machine_is_sam9repeater() (machine_arch_type == MACH_TYPE_SAM9REPEATER)
+#else
+# define machine_is_sam9repeater() (0)
+#endif
+
+#ifdef CONFIG_MACH_GT_I5700
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_GT_I5700
+# endif
+# define machine_is_gt_i5700() (machine_arch_type == MACH_TYPE_GT_I5700)
+#else
+# define machine_is_gt_i5700() (0)
+#endif
+
+#ifdef CONFIG_MACH_CTERA_PLUG_C2
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_CTERA_PLUG_C2
+# endif
+# define machine_is_ctera_plug_c2() (machine_arch_type == MACH_TYPE_CTERA_PLUG_C2)
+#else
+# define machine_is_ctera_plug_c2() (0)
+#endif
+
+#ifdef CONFIG_MACH_MARVELCT
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_MARVELCT
+# endif
+# define machine_is_marvelct() (machine_arch_type == MACH_TYPE_MARVELCT)
+#else
+# define machine_is_marvelct() (0)
+#endif
+
+#ifdef CONFIG_MACH_AG11005
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_AG11005
+# endif
+# define machine_is_ag11005() (machine_arch_type == MACH_TYPE_AG11005)
+#else
+# define machine_is_ag11005() (0)
+#endif
+
+#ifdef CONFIG_MACH_VANGOGH
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_VANGOGH
+# endif
+# define machine_is_vangogh() (machine_arch_type == MACH_TYPE_VANGOGH)
+#else
+# define machine_is_vangogh() (0)
+#endif
+
+#ifdef CONFIG_MACH_MATRIX505
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_MATRIX505
+# endif
+# define machine_is_matrix505() (machine_arch_type == MACH_TYPE_MATRIX505)
+#else
+# define machine_is_matrix505() (0)
+#endif
+
+#ifdef CONFIG_MACH_OCE_NIGMA
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_OCE_NIGMA
+# endif
+# define machine_is_oce_nigma() (machine_arch_type == MACH_TYPE_OCE_NIGMA)
+#else
+# define machine_is_oce_nigma() (0)
+#endif
+
+#ifdef CONFIG_MACH_T55
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_T55
+# endif
+# define machine_is_t55() (machine_arch_type == MACH_TYPE_T55)
+#else
+# define machine_is_t55() (0)
+#endif
+
+#ifdef CONFIG_MACH_BIO3K
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_BIO3K
+# endif
+# define machine_is_bio3k() (machine_arch_type == MACH_TYPE_BIO3K)
+#else
+# define machine_is_bio3k() (0)
+#endif
+
+#ifdef CONFIG_MACH_EXPRESSCT
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_EXPRESSCT
+# endif
+# define machine_is_expressct() (machine_arch_type == MACH_TYPE_EXPRESSCT)
+#else
+# define machine_is_expressct() (0)
+#endif
+
+#ifdef CONFIG_MACH_CARDHU
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_CARDHU
+# endif
+# define machine_is_cardhu() (machine_arch_type == MACH_TYPE_CARDHU)
+#else
+# define machine_is_cardhu() (0)
+#endif
+
+#ifdef CONFIG_MACH_ARUBA
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_ARUBA
+# endif
+# define machine_is_aruba() (machine_arch_type == MACH_TYPE_ARUBA)
+#else
+# define machine_is_aruba() (0)
+#endif
+
+#ifdef CONFIG_MACH_BONAIRE
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_BONAIRE
+# endif
+# define machine_is_bonaire() (machine_arch_type == MACH_TYPE_BONAIRE)
+#else
+# define machine_is_bonaire() (0)
+#endif
+
+#ifdef CONFIG_MACH_NUC700EVB
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_NUC700EVB
+# endif
+# define machine_is_nuc700evb() (machine_arch_type == MACH_TYPE_NUC700EVB)
+#else
+# define machine_is_nuc700evb() (0)
+#endif
+
+#ifdef CONFIG_MACH_NUC710EVB
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_NUC710EVB
+# endif
+# define machine_is_nuc710evb() (machine_arch_type == MACH_TYPE_NUC710EVB)
+#else
+# define machine_is_nuc710evb() (0)
+#endif
+
+#ifdef CONFIG_MACH_NUC740EVB
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_NUC740EVB
+# endif
+# define machine_is_nuc740evb() (machine_arch_type == MACH_TYPE_NUC740EVB)
+#else
+# define machine_is_nuc740evb() (0)
+#endif
+
+#ifdef CONFIG_MACH_NUC745EVB
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_NUC745EVB
+# endif
+# define machine_is_nuc745evb() (machine_arch_type == MACH_TYPE_NUC745EVB)
+#else
+# define machine_is_nuc745evb() (0)
+#endif
+
+#ifdef CONFIG_MACH_TRANSCEDE
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_TRANSCEDE
+# endif
+# define machine_is_transcede() (machine_arch_type == MACH_TYPE_TRANSCEDE)
+#else
+# define machine_is_transcede() (0)
+#endif
+
+#ifdef CONFIG_MACH_MORA
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_MORA
+# endif
+# define machine_is_mora() (machine_arch_type == MACH_TYPE_MORA)
+#else
+# define machine_is_mora() (0)
+#endif
+
+#ifdef CONFIG_MACH_NDA_EVM
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_NDA_EVM
+# endif
+# define machine_is_nda_evm() (machine_arch_type == MACH_TYPE_NDA_EVM)
+#else
+# define machine_is_nda_evm() (0)
+#endif
+
+#ifdef CONFIG_MACH_TIMU
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_TIMU
+# endif
+# define machine_is_timu() (machine_arch_type == MACH_TYPE_TIMU)
+#else
+# define machine_is_timu() (0)
+#endif
+
+#ifdef CONFIG_MACH_EXPRESSH
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_EXPRESSH
+# endif
+# define machine_is_expressh() (machine_arch_type == MACH_TYPE_EXPRESSH)
+#else
+# define machine_is_expressh() (0)
+#endif
+
+#ifdef CONFIG_MACH_VERIDIS_A300
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_VERIDIS_A300
+# endif
+# define machine_is_veridis_a300() (machine_arch_type == MACH_TYPE_VERIDIS_A300)
+#else
+# define machine_is_veridis_a300() (0)
+#endif
+
+#ifdef CONFIG_MACH_DM368_LEOPARD
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_DM368_LEOPARD
+# endif
+# define machine_is_dm368_leopard() (machine_arch_type == MACH_TYPE_DM368_LEOPARD)
+#else
+# define machine_is_dm368_leopard() (0)
+#endif
+
+#ifdef CONFIG_MACH_OMAP_MCOP
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_OMAP_MCOP
+# endif
+# define machine_is_omap_mcop() (machine_arch_type == MACH_TYPE_OMAP_MCOP)
+#else
+# define machine_is_omap_mcop() (0)
+#endif
+
+#ifdef CONFIG_MACH_TRITIP
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_TRITIP
+# endif
+# define machine_is_tritip() (machine_arch_type == MACH_TYPE_TRITIP)
+#else
+# define machine_is_tritip() (0)
+#endif
+
+#ifdef CONFIG_MACH_SM1K
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_SM1K
+# endif
+# define machine_is_sm1k() (machine_arch_type == MACH_TYPE_SM1K)
+#else
+# define machine_is_sm1k() (0)
+#endif
+
+#ifdef CONFIG_MACH_MONCH
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_MONCH
+# endif
+# define machine_is_monch() (machine_arch_type == MACH_TYPE_MONCH)
+#else
+# define machine_is_monch() (0)
+#endif
+
+#ifdef CONFIG_MACH_CURACAO
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_CURACAO
+# endif
+# define machine_is_curacao() (machine_arch_type == MACH_TYPE_CURACAO)
+#else
+# define machine_is_curacao() (0)
+#endif
+
+#ifdef CONFIG_MACH_ORIGEN
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_ORIGEN
+# endif
+# define machine_is_origen() (machine_arch_type == MACH_TYPE_ORIGEN)
+#else
+# define machine_is_origen() (0)
+#endif
+
+#ifdef CONFIG_MACH_EPC10
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_EPC10
+# endif
+# define machine_is_epc10() (machine_arch_type == MACH_TYPE_EPC10)
+#else
+# define machine_is_epc10() (0)
+#endif
+
+#ifdef CONFIG_MACH_SGH_I740
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_SGH_I740
+# endif
+# define machine_is_sgh_i740() (machine_arch_type == MACH_TYPE_SGH_I740)
+#else
+# define machine_is_sgh_i740() (0)
+#endif
+
+#ifdef CONFIG_MACH_TUNA
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_TUNA
+# endif
+# define machine_is_tuna() (machine_arch_type == MACH_TYPE_TUNA)
+#else
+# define machine_is_tuna() (0)
+#endif
+
+#ifdef CONFIG_MACH_MX51_TULIP
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_MX51_TULIP
+# endif
+# define machine_is_mx51_tulip() (machine_arch_type == MACH_TYPE_MX51_TULIP)
+#else
+# define machine_is_mx51_tulip() (0)
+#endif
+
+#ifdef CONFIG_MACH_MX51_ASTER7
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_MX51_ASTER7
+# endif
+# define machine_is_mx51_aster7() (machine_arch_type == MACH_TYPE_MX51_ASTER7)
+#else
+# define machine_is_mx51_aster7() (0)
+#endif
+
+#ifdef CONFIG_MACH_ACRO37XBRD
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_ACRO37XBRD
+# endif
+# define machine_is_acro37xbrd() (machine_arch_type == MACH_TYPE_ACRO37XBRD)
+#else
+# define machine_is_acro37xbrd() (0)
+#endif
+
+#ifdef CONFIG_MACH_ELKE
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_ELKE
+# endif
+# define machine_is_elke() (machine_arch_type == MACH_TYPE_ELKE)
+#else
+# define machine_is_elke() (0)
+#endif
+
+#ifdef CONFIG_MACH_SBC6000X
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_SBC6000X
+# endif
+# define machine_is_sbc6000x() (machine_arch_type == MACH_TYPE_SBC6000X)
+#else
+# define machine_is_sbc6000x() (0)
+#endif
+
+#ifdef CONFIG_MACH_R1801E
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_R1801E
+# endif
+# define machine_is_r1801e() (machine_arch_type == MACH_TYPE_R1801E)
+#else
+# define machine_is_r1801e() (0)
+#endif
+
+#ifdef CONFIG_MACH_H1600
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_H1600
+# endif
+# define machine_is_h1600() (machine_arch_type == MACH_TYPE_H1600)
+#else
+# define machine_is_h1600() (0)
+#endif
+
+#ifdef CONFIG_MACH_MINI210
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_MINI210
+# endif
+# define machine_is_mini210() (machine_arch_type == MACH_TYPE_MINI210)
+#else
+# define machine_is_mini210() (0)
+#endif
+
+#ifdef CONFIG_MACH_MINI8168
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_MINI8168
+# endif
+# define machine_is_mini8168() (machine_arch_type == MACH_TYPE_MINI8168)
+#else
+# define machine_is_mini8168() (0)
+#endif
+
+#ifdef CONFIG_MACH_PC7308
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_PC7308
+# endif
+# define machine_is_pc7308() (machine_arch_type == MACH_TYPE_PC7308)
+#else
+# define machine_is_pc7308() (0)
+#endif
+
+#ifdef CONFIG_MACH_KMM2M01
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_KMM2M01
+# endif
+# define machine_is_kmm2m01() (machine_arch_type == MACH_TYPE_KMM2M01)
+#else
+# define machine_is_kmm2m01() (0)
+#endif
+
+#ifdef CONFIG_MACH_MX51EREBUS
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_MX51EREBUS
+# endif
+# define machine_is_mx51erebus() (machine_arch_type == MACH_TYPE_MX51EREBUS)
+#else
+# define machine_is_mx51erebus() (0)
+#endif
+
+#ifdef CONFIG_MACH_WM8650REFBOARD
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_WM8650REFBOARD
+# endif
+# define machine_is_wm8650refboard() (machine_arch_type == MACH_TYPE_WM8650REFBOARD)
+#else
+# define machine_is_wm8650refboard() (0)
+#endif
+
+#ifdef CONFIG_MACH_TUXRAIL
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_TUXRAIL
+# endif
+# define machine_is_tuxrail() (machine_arch_type == MACH_TYPE_TUXRAIL)
+#else
+# define machine_is_tuxrail() (0)
+#endif
+
+#ifdef CONFIG_MACH_ARTHUR
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_ARTHUR
+# endif
+# define machine_is_arthur() (machine_arch_type == MACH_TYPE_ARTHUR)
+#else
+# define machine_is_arthur() (0)
+#endif
+
+#ifdef CONFIG_MACH_DOORBOY
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_DOORBOY
+# endif
+# define machine_is_doorboy() (machine_arch_type == MACH_TYPE_DOORBOY)
+#else
+# define machine_is_doorboy() (0)
+#endif
+
+#ifdef CONFIG_MACH_XARINA
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_XARINA
+# endif
+# define machine_is_xarina() (machine_arch_type == MACH_TYPE_XARINA)
+#else
+# define machine_is_xarina() (0)
+#endif
+
+#ifdef CONFIG_MACH_ROVERX7
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_ROVERX7
+# endif
+# define machine_is_roverx7() (machine_arch_type == MACH_TYPE_ROVERX7)
+#else
+# define machine_is_roverx7() (0)
+#endif
+
+#ifdef CONFIG_MACH_SDVR
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_SDVR
+# endif
+# define machine_is_sdvr() (machine_arch_type == MACH_TYPE_SDVR)
+#else
+# define machine_is_sdvr() (0)
+#endif
+
+#ifdef CONFIG_MACH_ACER_MAYA
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_ACER_MAYA
+# endif
+# define machine_is_acer_maya() (machine_arch_type == MACH_TYPE_ACER_MAYA)
+#else
+# define machine_is_acer_maya() (0)
+#endif
+
+#ifdef CONFIG_MACH_PICO
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_PICO
+# endif
+# define machine_is_pico() (machine_arch_type == MACH_TYPE_PICO)
+#else
+# define machine_is_pico() (0)
+#endif
+
+#ifdef CONFIG_MACH_CWMX233
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_CWMX233
+# endif
+# define machine_is_cwmx233() (machine_arch_type == MACH_TYPE_CWMX233)
+#else
+# define machine_is_cwmx233() (0)
+#endif
+
+#ifdef CONFIG_MACH_CWAM1808
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_CWAM1808
+# endif
+# define machine_is_cwam1808() (machine_arch_type == MACH_TYPE_CWAM1808)
+#else
+# define machine_is_cwam1808() (0)
+#endif
+
+#ifdef CONFIG_MACH_CWDM365
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_CWDM365
+# endif
+# define machine_is_cwdm365() (machine_arch_type == MACH_TYPE_CWDM365)
+#else
+# define machine_is_cwdm365() (0)
+#endif
+
+#ifdef CONFIG_MACH_MX51_MORAY
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_MX51_MORAY
+# endif
+# define machine_is_mx51_moray() (machine_arch_type == MACH_TYPE_MX51_MORAY)
+#else
+# define machine_is_mx51_moray() (0)
+#endif
+
+#ifdef CONFIG_MACH_THALES_CBC
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_THALES_CBC
+# endif
+# define machine_is_thales_cbc() (machine_arch_type == MACH_TYPE_THALES_CBC)
+#else
+# define machine_is_thales_cbc() (0)
+#endif
+
+#ifdef CONFIG_MACH_BLUEPOINT
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_BLUEPOINT
+# endif
+# define machine_is_bluepoint() (machine_arch_type == MACH_TYPE_BLUEPOINT)
+#else
+# define machine_is_bluepoint() (0)
+#endif
+
+#ifdef CONFIG_MACH_DIR665
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_DIR665
+# endif
+# define machine_is_dir665() (machine_arch_type == MACH_TYPE_DIR665)
+#else
+# define machine_is_dir665() (0)
+#endif
+
+#ifdef CONFIG_MACH_ACMEROVER1
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_ACMEROVER1
+# endif
+# define machine_is_acmerover1() (machine_arch_type == MACH_TYPE_ACMEROVER1)
+#else
+# define machine_is_acmerover1() (0)
+#endif
+
+#ifdef CONFIG_MACH_SHOOTER_CT
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_SHOOTER_CT
+# endif
+# define machine_is_shooter_ct() (machine_arch_type == MACH_TYPE_SHOOTER_CT)
+#else
+# define machine_is_shooter_ct() (0)
+#endif
+
+#ifdef CONFIG_MACH_BLISS
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_BLISS
+# endif
+# define machine_is_bliss() (machine_arch_type == MACH_TYPE_BLISS)
+#else
+# define machine_is_bliss() (0)
+#endif
+
+#ifdef CONFIG_MACH_BLISSC
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_BLISSC
+# endif
+# define machine_is_blissc() (machine_arch_type == MACH_TYPE_BLISSC)
+#else
+# define machine_is_blissc() (0)
+#endif
+
+#ifdef CONFIG_MACH_THALES_ADC
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_THALES_ADC
+# endif
+# define machine_is_thales_adc() (machine_arch_type == MACH_TYPE_THALES_ADC)
+#else
+# define machine_is_thales_adc() (0)
+#endif
+
+#ifdef CONFIG_MACH_UBISYS_P9D_EVP
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_UBISYS_P9D_EVP
+# endif
+# define machine_is_ubisys_p9d_evp() (machine_arch_type == MACH_TYPE_UBISYS_P9D_EVP)
+#else
+# define machine_is_ubisys_p9d_evp() (0)
+#endif
+
+#ifdef CONFIG_MACH_ATDGP318
+# ifdef machine_arch_type
+# undef machine_arch_type
+# define machine_arch_type __machine_arch_type
+# else
+# define machine_arch_type MACH_TYPE_ATDGP318
+# endif
+# define machine_is_atdgp318() (machine_arch_type == MACH_TYPE_ATDGP318)
+#else
+# define machine_is_atdgp318() (0)
+#endif
+
/*
* These have not yet been registered
*/
diff --git a/arch/arm/include/asm/omap_common.h b/arch/arm/include/asm/omap_common.h
index 66d6b71..3f2f004 100644
--- a/arch/arm/include/asm/omap_common.h
+++ b/arch/arm/include/asm/omap_common.h
@@ -77,6 +77,7 @@ u32 omap_boot_mode(void);
/* SPL common function s*/
void spl_parse_image_header(const struct image_header *header);
+void omap_rev_string(char *omap_rev_string);
/* NAND SPL functions */
void spl_nand_load_image(void);
diff --git a/arch/arm/lib/board.c b/arch/arm/lib/board.c
index 368fc5d..a482706 100644
--- a/arch/arm/lib/board.c
+++ b/arch/arm/lib/board.c
@@ -82,7 +82,6 @@ extern void rtl8019_get_enetaddr (uchar * addr);
#include <i2c.h>
#endif
-
/************************************************************************
* Coloured LED functionality
************************************************************************
diff --git a/board/Marvell/aspenite/aspenite.c b/board/Marvell/aspenite/aspenite.c
index 34ac7aa..3be33bf 100644
--- a/board/Marvell/aspenite/aspenite.c
+++ b/board/Marvell/aspenite/aspenite.c
@@ -25,6 +25,7 @@
#include <common.h>
#include <mvmfp.h>
+#include <asm/arch/cpu.h>
#include <asm/arch/mfp.h>
#include <asm/arch/armada100.h>
diff --git a/board/Marvell/dkb/dkb.c b/board/Marvell/dkb/dkb.c
index 00f73e7..4a9abee 100644
--- a/board/Marvell/dkb/dkb.c
+++ b/board/Marvell/dkb/dkb.c
@@ -24,8 +24,12 @@
#include <common.h>
#include <mvmfp.h>
+#include <i2c.h>
#include <asm/arch/mfp.h>
#include <asm/arch/cpu.h>
+#ifdef CONFIG_GENERIC_MMC
+#include <sdhci.h>
+#endif
DECLARE_GLOBAL_DATA_PTR;
@@ -40,6 +44,20 @@ int board_early_init_f(void)
MFP53_CI2C_SCL,
MFP54_CI2C_SDA,
+ /* MMC1 */
+ MFP_MMC1_DAT7,
+ MFP_MMC1_DAT6,
+ MFP_MMC1_DAT5,
+ MFP_MMC1_DAT4,
+ MFP_MMC1_DAT3,
+ MFP_MMC1_DAT2,
+ MFP_MMC1_DAT1,
+ MFP_MMC1_DAT0,
+ MFP_MMC1_CMD,
+ MFP_MMC1_CLK,
+ MFP_MMC1_CD,
+ MFP_MMC1_WP,
+
MFP_EOC /*End of configureation*/
};
/* configure MFP's */
@@ -56,3 +74,28 @@ int board_init(void)
gd->bd->bi_boot_params = panth_sdram_base(0) + 0x100;
return 0;
}
+
+#ifdef CONFIG_GENERIC_MMC
+#define I2C_SLAVE_ADDR 0x34
+#define LDO13_REG 0x28
+#define LDO_V30 0x6
+#define LDO_VOLTAGE(x) ((x & 0x7) << 1)
+#define LDO_EN 0x1
+int board_mmc_init(bd_t *bd)
+{
+ ulong mmc_base_address[CONFIG_SYS_MMC_NUM] = CONFIG_SYS_MMC_BASE;
+ u8 i, data;
+
+ /* set LDO 13 to 3.0v */
+ data = LDO_VOLTAGE(LDO_V30) | LDO_EN;
+ i2c_write(I2C_SLAVE_ADDR, LDO13_REG, 1, &data, 1);
+
+ for (i = 0; i < CONFIG_SYS_MMC_NUM; i++) {
+ if (mv_sdh_init(mmc_base_address[i], 0, 0,
+ SDHCI_QUIRK_32BIT_DMA_ADDR))
+ return 1;
+ }
+
+ return 0;
+}
+#endif
diff --git a/board/Marvell/dreamplug/Makefile b/board/Marvell/dreamplug/Makefile
new file mode 100644
index 0000000..9ee5406
--- /dev/null
+++ b/board/Marvell/dreamplug/Makefile
@@ -0,0 +1,54 @@
+#
+# (C) Copyright 2011
+# Jason Cooper <u-boot@lakedaemon.net>
+#
+# Based on work by:
+# Marvell Semiconductor <www.marvell.com>
+# Written-by: Siddarth Gore <gores@marvell.com>
+#
+# See file CREDITS for list of people who contributed to this
+# project.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2 of
+# the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA 02110-1301 USA
+#
+
+include $(TOPDIR)/config.mk
+
+LIB = $(obj)lib$(BOARD).o
+
+COBJS := dreamplug.o
+
+SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
+OBJS := $(addprefix $(obj),$(COBJS))
+SOBJS := $(addprefix $(obj),$(SOBJS))
+
+$(LIB): $(obj).depend $(OBJS) $(SOBJS)
+ $(call cmd_link_o_target, $(OBJS) $(SOBJS))
+
+clean:
+ rm -f $(SOBJS) $(OBJS)
+
+distclean: clean
+ rm -f $(LIB) core *.bak .depend
+
+#########################################################################
+
+# defines $(obj).depend target
+include $(SRCTREE)/rules.mk
+
+sinclude $(obj).depend
+
+#########################################################################
diff --git a/board/Marvell/dreamplug/dreamplug.c b/board/Marvell/dreamplug/dreamplug.c
new file mode 100644
index 0000000..13b4013
--- /dev/null
+++ b/board/Marvell/dreamplug/dreamplug.c
@@ -0,0 +1,151 @@
+/*
+ * (C) Copyright 2011
+ * Jason Cooper <u-boot@lakedaemon.net>
+ *
+ * Based on work by:
+ * Marvell Semiconductor <www.marvell.com>
+ * Written-by: Siddarth Gore <gores@marvell.com>
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301 USA
+ */
+
+#include <common.h>
+#include <miiphy.h>
+#include <asm/arch/kirkwood.h>
+#include <asm/arch/mpp.h>
+#include "dreamplug.h"
+
+DECLARE_GLOBAL_DATA_PTR;
+
+int board_early_init_f(void)
+{
+ /*
+ * default gpio configuration
+ * There are maximum 64 gpios controlled through 2 sets of registers
+ * the below configuration configures mainly initial LED status
+ */
+ kw_config_gpio(DREAMPLUG_OE_VAL_LOW,
+ DREAMPLUG_OE_VAL_HIGH,
+ DREAMPLUG_OE_LOW, DREAMPLUG_OE_HIGH);
+
+ /* Multi-Purpose Pins Functionality configuration */
+ u32 kwmpp_config[] = {
+ MPP0_SPI_SCn, /* SPI Flash */
+ MPP1_SPI_MOSI,
+ MPP2_SPI_SCK,
+ MPP3_SPI_MISO,
+ MPP4_NF_IO6,
+ MPP5_NF_IO7,
+ MPP6_SYSRST_OUTn,
+ MPP7_GPO,
+ MPP8_TW_SDA,
+ MPP9_TW_SCK,
+ MPP10_UART0_TXD, /* Serial */
+ MPP11_UART0_RXD,
+ MPP12_SD_CLK, /* SDIO Slot */
+ MPP13_SD_CMD,
+ MPP14_SD_D0,
+ MPP15_SD_D1,
+ MPP16_SD_D2,
+ MPP17_SD_D3,
+ MPP18_NF_IO0,
+ MPP19_NF_IO1,
+ MPP20_GE1_0, /* Gigabit Ethernet */
+ MPP21_GE1_1,
+ MPP22_GE1_2,
+ MPP23_GE1_3,
+ MPP24_GE1_4,
+ MPP25_GE1_5,
+ MPP26_GE1_6,
+ MPP27_GE1_7,
+ MPP28_GE1_8,
+ MPP29_GE1_9,
+ MPP30_GE1_10,
+ MPP31_GE1_11,
+ MPP32_GE1_12,
+ MPP33_GE1_13,
+ MPP34_GE1_14,
+ MPP35_GE1_15,
+ MPP36_GPIO, /* 7 external GPIO pins (36 - 45) */
+ MPP37_GPIO,
+ MPP38_GPIO,
+ MPP39_GPIO,
+ MPP40_TDM_SPI_SCK,
+ MPP41_TDM_SPI_MISO,
+ MPP42_TDM_SPI_MOSI,
+ MPP43_GPIO,
+ MPP44_GPIO,
+ MPP45_GPIO,
+ MPP46_GPIO,
+ MPP47_GPIO, /* Bluetooth LED */
+ MPP48_GPIO, /* Wifi LED */
+ MPP49_GPIO, /* Wifi AP LED */
+ 0
+ };
+ kirkwood_mpp_conf(kwmpp_config);
+ return 0;
+}
+
+int board_init(void)
+{
+ /* adress of boot parameters */
+ gd->bd->bi_boot_params = kw_sdram_bar(0) + 0x100;
+
+ return 0;
+}
+
+#ifdef CONFIG_RESET_PHY_R
+void mv_phy_88e1116_init(char *name)
+{
+ u16 reg;
+ u16 devadr;
+
+ if (miiphy_set_current_dev(name))
+ return;
+
+ /* command to read PHY dev address */
+ if (miiphy_read(name, 0xEE, 0xEE, (u16 *) &devadr)) {
+ printf("Err..%s could not read PHY dev address\n",
+ __func__);
+ return;
+ }
+
+ /*
+ * Enable RGMII delay on Tx and Rx for CPU port
+ * Ref: sec 4.7.2 of chip datasheet
+ */
+ miiphy_write(name, devadr, MV88E1116_PGADR_REG, 2);
+ miiphy_read(name, devadr, MV88E1116_MAC_CTRL2_REG, &reg);
+ reg |= (MV88E1116_RGMII_RXTM_CTRL | MV88E1116_RGMII_TXTM_CTRL);
+ miiphy_write(name, devadr, MV88E1116_MAC_CTRL2_REG, reg);
+ miiphy_write(name, devadr, MV88E1116_PGADR_REG, 0);
+
+ /* reset the phy */
+ miiphy_reset(name, devadr);
+
+ printf("88E1116 Initialized on %s\n", name);
+}
+
+void reset_phy(void)
+{
+ /* configure and initialize both PHY's */
+ mv_phy_88e1116_init("egiga0");
+ mv_phy_88e1116_init("egiga1");
+}
+#endif /* CONFIG_RESET_PHY_R */
diff --git a/board/Marvell/dreamplug/dreamplug.h b/board/Marvell/dreamplug/dreamplug.h
new file mode 100644
index 0000000..ad5ffcf
--- /dev/null
+++ b/board/Marvell/dreamplug/dreamplug.h
@@ -0,0 +1,42 @@
+/*
+ * (C) Copyright 2011
+ * Jason Cooper <u-boot@lakedaemon.net>
+ *
+ * Based on work by:
+ * Marvell Semiconductor <www.marvell.com>
+ * Written-by: Siddarth Gore <gores@marvell.com>
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301 USA
+ */
+
+#ifndef __DREAMPLUG_H
+#define __DREAMPLUG_H
+
+#define DREAMPLUG_OE_LOW (~(0))
+#define DREAMPLUG_OE_HIGH (~(0))
+#define DREAMPLUG_OE_VAL_LOW 0
+#define DREAMPLUG_OE_VAL_HIGH (0xf << 16) /* 4 LED Pins high */
+
+/* PHY related */
+#define MV88E1116_MAC_CTRL2_REG 21
+#define MV88E1116_PGADR_REG 22
+#define MV88E1116_RGMII_TXTM_CTRL (1 << 4)
+#define MV88E1116_RGMII_RXTM_CTRL (1 << 5)
+
+#endif /* __DREAMPLUG_H */
diff --git a/board/Marvell/dreamplug/kwbimage.cfg b/board/Marvell/dreamplug/kwbimage.cfg
new file mode 100644
index 0000000..ca9cd74
--- /dev/null
+++ b/board/Marvell/dreamplug/kwbimage.cfg
@@ -0,0 +1,163 @@
+#
+# (C) Copyright 2011
+# Jason Cooper <u-boot@lakedaemon.net>
+#
+# Based on work by:
+# Marvell Semiconductor <www.marvell.com>
+# Written-by: Siddarth Gore <gores@marvell.com>
+#
+# See file CREDITS for list of people who contributed to this
+# project.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2 of
+# the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA 02110-1301 USA
+#
+# Refer docs/README.kwimage for more details about how-to configure
+# and create kirkwood boot image
+#
+
+# Boot Media configurations
+BOOT_FROM spi
+
+# SOC registers configuration using bootrom header extension
+# Maximum KWBIMAGE_MAX_CONFIG configurations allowed
+
+# Configure RGMII-0/1 interface pad voltage to 1.8V
+DATA 0xFFD100e0 0x1b1b9b9b
+
+#Dram initalization for SINGLE x16 CL=5 @ 400MHz
+DATA 0xFFD01400 0x43000c30 # DDR Configuration register
+# bit13-0: 0xc30 (3120 DDR2 clks refresh rate)
+# bit23-14: zero
+# bit24: 1= enable exit self refresh mode on DDR access
+# bit25: 1 required
+# bit29-26: zero
+# bit31-30: 01
+
+DATA 0xFFD01404 0x37543000 # DDR Controller Control Low
+# bit 4: 0=addr/cmd in smame cycle
+# bit 5: 0=clk is driven during self refresh, we don't care for APX
+# bit 6: 0=use recommended falling edge of clk for addr/cmd
+# bit14: 0=input buffer always powered up
+# bit18: 1=cpu lock transaction enabled
+# bit23-20: 5=recommended value for CL=5 and STARTBURST_DEL disabled bit31=0
+# bit27-24: 7= CL+2, STARTBURST sample stages, for freqs 400MHz, unbuffered DIMM
+# bit30-28: 3 required
+# bit31: 0=no additional STARTBURST delay
+
+DATA 0xFFD01408 0x22125451 # DDR Timing (Low) (active cycles value +1)
+# bit3-0: TRAS lsbs
+# bit7-4: TRCD
+# bit11- 8: TRP
+# bit15-12: TWR
+# bit19-16: TWTR
+# bit20: TRAS msb
+# bit23-21: 0x0
+# bit27-24: TRRD
+# bit31-28: TRTP
+
+DATA 0xFFD0140C 0x00000a33 # DDR Timing (High)
+# bit6-0: TRFC
+# bit8-7: TR2R
+# bit10-9: TR2W
+# bit12-11: TW2W
+# bit31-13: zero required
+
+DATA 0xFFD01410 0x000000cc # DDR Address Control
+# bit1-0: 01, Cs0width=x8
+# bit3-2: 10, Cs0size=1Gb
+# bit5-4: 01, Cs1width=x8
+# bit7-6: 10, Cs1size=1Gb
+# bit9-8: 00, Cs2width=nonexistent
+# bit11-10: 00, Cs2size =nonexistent
+# bit13-12: 00, Cs3width=nonexistent
+# bit15-14: 00, Cs3size =nonexistent
+# bit16: 0, Cs0AddrSel
+# bit17: 0, Cs1AddrSel
+# bit18: 0, Cs2AddrSel
+# bit19: 0, Cs3AddrSel
+# bit31-20: 0 required
+
+DATA 0xFFD01414 0x00000000 # DDR Open Pages Control
+# bit0: 0, OpenPage enabled
+# bit31-1: 0 required
+
+DATA 0xFFD01418 0x00000000 # DDR Operation
+# bit3-0: 0x0, DDR cmd
+# bit31-4: 0 required
+
+DATA 0xFFD0141C 0x00000C52 # DDR Mode
+# bit2-0: 2, BurstLen=2 required
+# bit3: 0, BurstType=0 required
+# bit6-4: 4, CL=5
+# bit7: 0, TestMode=0 normal
+# bit8: 0, DLL reset=0 normal
+# bit11-9: 6, auto-precharge write recovery ????????????
+# bit12: 0, PD must be zero
+# bit31-13: 0 required
+
+DATA 0xFFD01420 0x00000040 # DDR Extended Mode
+# bit0: 0, DDR DLL enabled
+# bit1: 0, DDR drive strenght normal
+# bit2: 0, DDR ODT control lsd (disabled)
+# bit5-3: 000, required
+# bit6: 1, DDR ODT control msb, (disabled)
+# bit9-7: 000, required
+# bit10: 0, differential DQS enabled
+# bit11: 0, required
+# bit12: 0, DDR output buffer enabled
+# bit31-13: 0 required
+
+DATA 0xFFD01424 0x0000F17F # DDR Controller Control High
+# bit2-0: 111, required
+# bit3 : 1 , MBUS Burst Chop disabled
+# bit6-4: 111, required
+# bit7 : 0
+# bit8 : 1 , add writepath sample stage, must be 1 for DDR freq >= 300MHz
+# bit9 : 0 , no half clock cycle addition to dataout
+# bit10 : 0 , 1/4 clock cycle skew enabled for addr/ctl signals
+# bit11 : 0 , 1/4 clock cycle skew disabled for write mesh
+# bit15-12: 1111 required
+# bit31-16: 0 required
+
+DATA 0xFFD01428 0x00085520 # DDR2 ODT Read Timing (default values)
+DATA 0xFFD0147C 0x00008552 # DDR2 ODT Write Timing (default values)
+
+DATA 0xFFD01500 0x00000000 # CS[0]n Base address to 0x0
+DATA 0xFFD01504 0x0FFFFFF1 # CS[0]n Size
+# bit0: 1, Window enabled
+# bit1: 0, Write Protect disabled
+# bit3-2: 00, CS0 hit selected
+# bit23-4: ones, required
+# bit31-24: 0x0F, Size (i.e. 256MB)
+
+DATA 0xFFD01508 0x10000000 # CS[1]n Base address to 256Mb
+DATA 0xFFD0150C 0x0FFFFFF5 # CS[1]n Size 256Mb Window enabled for CS1
+
+DATA 0xFFD01514 0x00000000 # CS[2]n Size, window disabled
+DATA 0xFFD0151C 0x00000000 # CS[3]n Size, window disabled
+
+DATA 0xFFD01494 0x00030000 # DDR ODT Control (Low)
+DATA 0xFFD01498 0x00000000 # DDR ODT Control (High)
+# bit1-0: 00, ODT0 controlled by ODT Control (low) register above
+# bit3-2: 01, ODT1 active NEVER!
+# bit31-4: zero, required
+
+DATA 0xFFD0149C 0x0000E803 # CPU ODT Control
+DATA 0xFFD01480 0x00000001 # DDR Initialization Control
+#bit0=1, enable DDR init upon this register write
+
+# End of Header extension
+DATA 0x0 0x0
diff --git a/board/Marvell/gplugd/gplugd.c b/board/Marvell/gplugd/gplugd.c
index b4f7f81..a697c19 100644
--- a/board/Marvell/gplugd/gplugd.c
+++ b/board/Marvell/gplugd/gplugd.c
@@ -30,6 +30,7 @@
#include <common.h>
#include <mvmfp.h>
+#include <asm/arch/cpu.h>
#include <asm/arch/mfp.h>
#include <asm/arch/armada100.h>
#include <asm/gpio.h>
@@ -72,6 +73,12 @@ int board_early_init_f(void)
MFP101_ETH_MDIO,
MFP103_ETH_RXDV,
+ /* SSP2 */
+ MFP107_SSP2_RXD,
+ MFP108_SSP2_TXD,
+ MFP110_SSP2_CS,
+ MFP111_SSP2_CLK,
+
MFP_EOC /*End of configuration*/
};
/* configure MFP's */
@@ -81,6 +88,9 @@ int board_early_init_f(void)
int board_init(void)
{
+ struct armd1apb2_registers *apb2_regs =
+ (struct armd1apb2_registers *)ARMD1_APBC2_BASE;
+
/* arch number of Board */
gd->bd->bi_arch_number = MACH_TYPE_SHEEVAD;
/* adress of boot parameters */
@@ -90,6 +100,9 @@ int board_init(void)
udelay(10);
/* Deassert PHY_RST# */
gpio_set_value(CONFIG_SYS_GPIO_PHY_RST, GPIO_HIGH);
+
+ /* Enable SSP2 clock */
+ writel(SSP2_APBCLK | SSP2_FNCLK, &apb2_regs->ssp2_clkrst);
return 0;
}
diff --git a/board/Marvell/guruplug/guruplug.c b/board/Marvell/guruplug/guruplug.c
index 1f0e67a..057c558 100644
--- a/board/Marvell/guruplug/guruplug.c
+++ b/board/Marvell/guruplug/guruplug.c
@@ -24,6 +24,7 @@
#include <common.h>
#include <miiphy.h>
+#include <asm/arch/cpu.h>
#include <asm/arch/kirkwood.h>
#include <asm/arch/mpp.h>
#include "guruplug.h"
diff --git a/board/Marvell/mv88f6281gtw_ge/mv88f6281gtw_ge.c b/board/Marvell/mv88f6281gtw_ge/mv88f6281gtw_ge.c
index 80fd20b..4c41f3b 100644
--- a/board/Marvell/mv88f6281gtw_ge/mv88f6281gtw_ge.c
+++ b/board/Marvell/mv88f6281gtw_ge/mv88f6281gtw_ge.c
@@ -26,6 +26,7 @@
#include <common.h>
#include <netdev.h>
+#include <asm/arch/cpu.h>
#include <asm/arch/kirkwood.h>
#include <asm/arch/mpp.h>
#include "mv88f6281gtw_ge.h"
diff --git a/board/Marvell/openrd/openrd.c b/board/Marvell/openrd/openrd.c
index 87939de..2a10e69 100644
--- a/board/Marvell/openrd/openrd.c
+++ b/board/Marvell/openrd/openrd.c
@@ -29,6 +29,7 @@
#include <common.h>
#include <miiphy.h>
+#include <asm/arch/cpu.h>
#include <asm/arch/kirkwood.h>
#include <asm/arch/mpp.h>
#include "openrd.h"
diff --git a/board/Marvell/rd6281a/rd6281a.c b/board/Marvell/rd6281a/rd6281a.c
index ecdea82..9c768bf 100644
--- a/board/Marvell/rd6281a/rd6281a.c
+++ b/board/Marvell/rd6281a/rd6281a.c
@@ -25,6 +25,7 @@
#include <common.h>
#include <miiphy.h>
#include <netdev.h>
+#include <asm/arch/cpu.h>
#include <asm/arch/kirkwood.h>
#include <asm/arch/mpp.h>
#include "rd6281a.h"
diff --git a/board/Marvell/sheevaplug/sheevaplug.c b/board/Marvell/sheevaplug/sheevaplug.c
index d7dc80c..71e6793 100644
--- a/board/Marvell/sheevaplug/sheevaplug.c
+++ b/board/Marvell/sheevaplug/sheevaplug.c
@@ -24,6 +24,7 @@
#include <common.h>
#include <miiphy.h>
+#include <asm/arch/cpu.h>
#include <asm/arch/kirkwood.h>
#include <asm/arch/mpp.h>
#include "sheevaplug.h"
diff --git a/board/davedenx/qong/qong.c b/board/davedenx/qong/qong.c
index 99432ed..5b2830c 100644
--- a/board/davedenx/qong/qong.c
+++ b/board/davedenx/qong/qong.c
@@ -25,8 +25,10 @@
#include <netdev.h>
#include <asm/arch/clock.h>
#include <asm/arch/imx-regs.h>
+#include <asm/arch/sys_proto.h>
#include <asm/io.h>
#include <nand.h>
+#include <pmic.h>
#include <fsl_pmic.h>
#include <asm/gpio.h>
#include "qong_fpga.h"
@@ -41,7 +43,7 @@ void hw_watchdog_reset(void)
}
#endif
-int dram_init (void)
+int dram_init(void)
{
/* dram_init must store complete ramsize in gd->ram_size */
gd->ram_size = get_ram_size((void *)CONFIG_SYS_SDRAM_BASE,
@@ -58,14 +60,20 @@ static void qong_fpga_reset(void)
udelay(300);
}
-int board_early_init_f (void)
+int board_early_init_f(void)
{
#ifdef CONFIG_QONG_FPGA
- /* CS1: FPGA/Network Controller/GPIO */
- /* 16-bit, no DTACK */
- __REG(CSCR_U(1)) = 0x00000A01;
- __REG(CSCR_L(1)) = 0x20040501;
- __REG(CSCR_A(1)) = 0x04020C00;
+ /* CS1: FPGA/Network Controller/GPIO, 16-bit, no DTACK */
+ static const struct mxc_weimcs cs1 = {
+ /* sp wp bcd bcs psz pme sync dol cnc wsc ew wws edc */
+ CSCR_U(0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 1),
+ /* oea oen ebwa ebwn csa ebc dsz csn psr cre wrap csen */
+ CSCR_L(2, 0, 0, 4, 0, 0, 5, 0, 0, 0, 0, 1),
+ /* ebra ebrn rwa rwn mum lah lbn lba dww dct wwu age cnc2 fce*/
+ CSCR_A(0, 4, 0, 2, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0)
+ };
+
+ mxc_setup_weimcs(1, &cs1);
/* setup pins for FPGA */
mx31_gpio_mux(IOMUX_MODE(0x76, MUX_CTL_GPIO));
@@ -141,55 +149,21 @@ int board_early_init_f (void)
}
-int board_init (void)
+int board_init(void)
{
/* Chip selects */
/* CS0: Nor Flash #0 - it must be init'ed when executing from DDR */
/* Assumptions: HCLK = 133 MHz, tACC = 130ns */
- __REG(CSCR_U(0)) = ((0 << 31) | /* SP */
- (0 << 30) | /* WP */
- (0 << 28) | /* BCD */
- (0 << 24) | /* BCS */
- (0 << 22) | /* PSZ */
- (0 << 21) | /* PME */
- (0 << 20) | /* SYNC */
- (0 << 16) | /* DOL */
- (3 << 14) | /* CNC */
- (21 << 8) | /* WSC */
- (0 << 7) | /* EW */
- (0 << 4) | /* WWS */
- (6 << 0) /* EDC */
- );
-
- __REG(CSCR_L(0)) = ((2 << 28) | /* OEA */
- (1 << 24) | /* OEN */
- (3 << 20) | /* EBWA */
- (3 << 16) | /* EBWN */
- (1 << 12) | /* CSA */
- (1 << 11) | /* EBC */
- (5 << 8) | /* DSZ */
- (1 << 4) | /* CSN */
- (0 << 3) | /* PSR */
- (0 << 2) | /* CRE */
- (0 << 1) | /* WRAP */
- (1 << 0) /* CSEN */
- );
-
- __REG(CSCR_A(0)) = ((2 << 28) | /* EBRA */
- (1 << 24) | /* EBRN */
- (2 << 20) | /* RWA */
- (2 << 16) | /* RWN */
- (0 << 15) | /* MUM */
- (0 << 13) | /* LAH */
- (2 << 10) | /* LBN */
- (0 << 8) | /* LBA */
- (0 << 6) | /* DWW */
- (0 << 4) | /* DCT */
- (0 << 3) | /* WWU */
- (0 << 2) | /* AGE */
- (0 << 1) | /* CNC2 */
- (0 << 0) /* FCE */
- );
+ static const struct mxc_weimcs cs0 = {
+ /* sp wp bcd bcs psz pme sync dol cnc wsc ew wws edc */
+ CSCR_U(0, 0, 0, 0, 0, 0, 0, 0, 3, 21, 0, 0, 6),
+ /* oea oen ebwa ebwn csa ebc dsz csn psr cre wrap csen */
+ CSCR_L(0, 1, 3, 3, 1, 1, 5, 1, 0, 0, 0, 1),
+ /* ebra ebrn rwa rwn mum lah lbn lba dww dct wwu age cnc2 fce*/
+ CSCR_A(0, 1, 2, 2, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0)
+ };
+
+ mxc_setup_weimcs(0, &cs0);
/* board id for linux */
gd->bd->bi_arch_number = MACH_TYPE_QONG;
@@ -203,11 +177,15 @@ int board_init (void)
int board_late_init(void)
{
u32 val;
+ struct pmic *p;
+
+ pmic_init();
+ p = get_pmic();
/* Enable RTC battery */
- val = pmic_reg_read(REG_POWER_CTL0);
- pmic_reg_write(REG_POWER_CTL0, val | COINCHEN);
- pmic_reg_write(REG_INT_STATUS1, RTCRSTI);
+ pmic_reg_read(p, REG_POWER_CTL0, &val);
+ pmic_reg_write(p, REG_POWER_CTL0, val | COINCHEN);
+ pmic_reg_write(p, REG_INT_STATUS1, RTCRSTI);
#ifdef CONFIG_HW_WATCHDOG
mxc_hw_watchdog_enable();
@@ -216,13 +194,13 @@ int board_late_init(void)
return 0;
}
-int checkboard (void)
+int checkboard(void)
{
printf("Board: DAVE/DENX Qong\n");
return 0;
}
-int misc_init_r (void)
+int misc_init_r(void)
{
#ifdef CONFIG_QONG_FPGA
u32 tmp;
@@ -247,11 +225,18 @@ int board_eth_init(bd_t *bis)
#if defined(CONFIG_QONG_FPGA) && defined(CONFIG_NAND_PLAT)
static void board_nand_setup(void)
{
-
/* CS3: NAND 8-bit */
- __REG(CSCR_U(3)) = 0x00004f00;
- __REG(CSCR_L(3)) = 0x20013b31;
- __REG(CSCR_A(3)) = 0x00020800;
+ static const struct mxc_weimcs cs3 = {
+ /* sp wp bcd bcs psz pme sync dol cnc wsc ew wws edc */
+ CSCR_U(0, 0, 0, 0, 0, 0, 0, 0, 1, 15, 0, 0, 0),
+ /* oea oen ebwa ebwn csa ebc dsz csn psr cre wrap csen */
+ CSCR_L(2, 0, 0, 1, 3, 1, 3, 3, 0, 0, 0, 1),
+ /* ebra ebrn rwa rwn mum lah lbn lba dww dct wwu age cnc2 fce*/
+ CSCR_A(0, 0, 0, 2, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0)
+ };
+
+ mxc_setup_weimcs(3, &cs3);
+
__REG(IOMUXC_GPR) |= 1 << 13;
mx31_gpio_mux(IOMUX_MODE(MUX_CTL_NFC_WP, MUX_CTL_IN_GPIO));
diff --git a/board/davinci/da8xxevm/da830evm.c b/board/davinci/da8xxevm/da830evm.c
index 0650653..2021e73 100644
--- a/board/davinci/da8xxevm/da830evm.c
+++ b/board/davinci/da8xxevm/da830evm.c
@@ -40,6 +40,8 @@
#include <asm/arch/emif_defs.h>
#include <asm/arch/emac_defs.h>
#include <asm/io.h>
+#include <nand.h>
+#include <asm/arch/nand_defs.h>
#include <asm/arch/davinci_misc.h>
DECLARE_GLOBAL_DATA_PTR;
@@ -98,6 +100,56 @@ static const struct pinmux_config i2c_pins[] = {
{ pinmux(8), 2, 4 }
};
+#ifdef CONFIG_USE_NAND
+/* NAND pin muxer settings */
+const struct pinmux_config aemif_pins[] = {
+ { pinmux(13), 1, 6 },
+ { pinmux(13), 1, 7 },
+ { pinmux(14), 1, 0 },
+ { pinmux(14), 1, 1 },
+ { pinmux(14), 1, 2 },
+ { pinmux(14), 1, 3 },
+ { pinmux(14), 1, 4 },
+ { pinmux(14), 1, 5 },
+ { pinmux(14), 1, 6 },
+ { pinmux(14), 1, 7 },
+ { pinmux(15), 1, 0 },
+ { pinmux(15), 1, 1 },
+ { pinmux(15), 1, 2 },
+ { pinmux(15), 1, 3 },
+ { pinmux(15), 1, 4 },
+ { pinmux(15), 1, 5 },
+ { pinmux(15), 1, 6 },
+ { pinmux(15), 1, 7 },
+ { pinmux(16), 1, 0 },
+ { pinmux(16), 1, 1 },
+ { pinmux(16), 1, 2 },
+ { pinmux(16), 1, 3 },
+ { pinmux(16), 1, 4 },
+ { pinmux(16), 1, 5 },
+ { pinmux(16), 1, 6 },
+ { pinmux(16), 1, 7 },
+ { pinmux(17), 1, 0 },
+ { pinmux(17), 1, 1 },
+ { pinmux(17), 1, 2 },
+ { pinmux(17), 1, 3 },
+ { pinmux(17), 1, 4 },
+ { pinmux(17), 1, 5 },
+ { pinmux(17), 1, 6 },
+ { pinmux(17), 1, 7 },
+ { pinmux(18), 1, 0 },
+ { pinmux(18), 1, 1 },
+ { pinmux(18), 1, 2 },
+ { pinmux(18), 1, 3 },
+ { pinmux(18), 1, 4 },
+ { pinmux(18), 1, 5 },
+ { pinmux(18), 1, 6 },
+ { pinmux(18), 1, 7 },
+ { pinmux(10), 1, 0 }
+};
+#endif
+
+
/* USB0_DRVVBUS pin muxer settings */
static const struct pinmux_config usb_pins[] = {
{ pinmux(9), 1, 1 }
@@ -114,6 +166,7 @@ static const struct pinmux_resource pinmuxes[] = {
#endif
#ifdef CONFIG_USE_NAND
PINMUX_ITEM(emifa_nand_pins),
+ PINMUX_ITEM(aemif_pins),
#endif
#if defined(CONFIG_DRIVER_TI_EMAC)
PINMUX_ITEM(emac_pins),
@@ -184,6 +237,16 @@ int board_init(void)
return(0);
}
+
+#ifdef CONFIG_NAND_DAVINCI
+int board_nand_init(struct nand_chip *nand)
+{
+ davinci_nand_init(nand);
+
+ return 0;
+}
+#endif
+
#if defined(CONFIG_DRIVER_TI_EMAC)
#define PHY_SW_I2C_ADDR 0x5f /* Address of PHY on i2c bus */
diff --git a/board/davinci/da8xxevm/da850evm.c b/board/davinci/da8xxevm/da850evm.c
index 46924d3..e0a3bbe 100644
--- a/board/davinci/da8xxevm/da850evm.c
+++ b/board/davinci/da8xxevm/da850evm.c
@@ -278,6 +278,20 @@ u32 get_board_rev(void)
return rev;
}
+int board_early_init_f(void)
+{
+ /*
+ * Power on required peripherals
+ * ARM does not have access by default to PSC0 and PSC1
+ * assuming here that the DSP bootloader has set the IOPU
+ * such that PSC access is available to ARM
+ */
+ if (da8xx_configure_lpsc_items(lpsc, ARRAY_SIZE(lpsc)))
+ return 1;
+
+ return 0;
+}
+
int board_init(void)
{
#ifdef CONFIG_USE_NOR
@@ -310,15 +324,6 @@ int board_init(void)
/* address of boot parameters */
gd->bd->bi_boot_params = LINUX_BOOT_PARAM_ADDR;
- /*
- * Power on required peripherals
- * ARM does not have access by default to PSC0 and PSC1
- * assuming here that the DSP bootloader has set the IOPU
- * such that PSC access is available to ARM
- */
- if (da8xx_configure_lpsc_items(lpsc, ARRAY_SIZE(lpsc)))
- return 1;
-
/* setup the SUSPSRC for ARM to control emulation suspend */
writel(readl(&davinci_syscfg_regs->suspsrc) &
~(DAVINCI_SYSCFG_SUSPSRC_EMAC | DAVINCI_SYSCFG_SUSPSRC_I2C |
diff --git a/board/efikamx/efikamx.c b/board/efikamx/efikamx.c
index 0c4e24b..b78bf6c 100644
--- a/board/efikamx/efikamx.c
+++ b/board/efikamx/efikamx.c
@@ -34,6 +34,7 @@
#include <i2c.h>
#include <mmc.h>
#include <fsl_esdhc.h>
+#include <pmic.h>
#include <fsl_pmic.h>
#include <mc13892.h>
@@ -205,34 +206,38 @@ static void power_init(void)
{
unsigned int val;
struct mxc_ccm_reg *mxc_ccm = (struct mxc_ccm_reg *)MXC_CCM_BASE;
+ struct pmic *p;
+
+ pmic_init();
+ p = get_pmic();
/* Write needed to Power Gate 2 register */
- val = pmic_reg_read(REG_POWER_MISC);
+ pmic_reg_read(p, REG_POWER_MISC, &val);
val &= ~PWGT2SPIEN;
- pmic_reg_write(REG_POWER_MISC, val);
+ pmic_reg_write(p, REG_POWER_MISC, val);
/* Externally powered */
- val = pmic_reg_read(REG_CHARGE);
+ pmic_reg_read(p, REG_CHARGE, &val);
val |= ICHRG0 | ICHRG1 | ICHRG2 | ICHRG3 | CHGAUTOB;
- pmic_reg_write(REG_CHARGE, val);
+ pmic_reg_write(p, REG_CHARGE, val);
/* power up the system first */
- pmic_reg_write(REG_POWER_MISC, PWUP);
+ pmic_reg_write(p, REG_POWER_MISC, PWUP);
/* Set core voltage to 1.1V */
- val = pmic_reg_read(REG_SW_0);
+ pmic_reg_read(p, REG_SW_0, &val);
val = (val & ~SWx_VOLT_MASK) | SWx_1_100V;
- pmic_reg_write(REG_SW_0, val);
+ pmic_reg_write(p, REG_SW_0, val);
/* Setup VCC (SW2) to 1.25 */
- val = pmic_reg_read(REG_SW_1);
+ pmic_reg_read(p, REG_SW_1, &val);
val = (val & ~SWx_VOLT_MASK) | SWx_1_250V;
- pmic_reg_write(REG_SW_1, val);
+ pmic_reg_write(p, REG_SW_1, val);
/* Setup 1V2_DIG1 (SW3) to 1.25 */
- val = pmic_reg_read(REG_SW_2);
+ pmic_reg_read(p, REG_SW_2, &val);
val = (val & ~SWx_VOLT_MASK) | SWx_1_250V;
- pmic_reg_write(REG_SW_2, val);
+ pmic_reg_write(p, REG_SW_2, val);
udelay(50);
/* Raise the core frequency to 800MHz */
@@ -240,46 +245,46 @@ static void power_init(void)
/* Set switchers in Auto in NORMAL mode & STANDBY mode */
/* Setup the switcher mode for SW1 & SW2*/
- val = pmic_reg_read(REG_SW_4);
+ pmic_reg_read(p, REG_SW_4, &val);
val = (val & ~((SWMODE_MASK << SWMODE1_SHIFT) |
(SWMODE_MASK << SWMODE2_SHIFT)));
val |= (SWMODE_AUTO_AUTO << SWMODE1_SHIFT) |
(SWMODE_AUTO_AUTO << SWMODE2_SHIFT);
- pmic_reg_write(REG_SW_4, val);
+ pmic_reg_write(p, REG_SW_4, val);
/* Setup the switcher mode for SW3 & SW4 */
- val = pmic_reg_read(REG_SW_5);
+ pmic_reg_read(p, REG_SW_5, &val);
val = (val & ~((SWMODE_MASK << SWMODE3_SHIFT) |
(SWMODE_MASK << SWMODE4_SHIFT)));
val |= (SWMODE_AUTO_AUTO << SWMODE3_SHIFT) |
(SWMODE_AUTO_AUTO << SWMODE4_SHIFT);
- pmic_reg_write(REG_SW_5, val);
+ pmic_reg_write(p, REG_SW_5, val);
/* Set VDIG to 1.65V, VGEN3 to 1.8V, VCAM to 2.6V */
- val = pmic_reg_read(REG_SETTING_0);
+ pmic_reg_read(p, REG_SETTING_0, &val);
val &= ~(VCAM_MASK | VGEN3_MASK | VDIG_MASK);
val |= VDIG_1_65 | VGEN3_1_8 | VCAM_2_6;
- pmic_reg_write(REG_SETTING_0, val);
+ pmic_reg_write(p, REG_SETTING_0, val);
/* Set VVIDEO to 2.775V, VAUDIO to 3V, VSD to 3.15V */
- val = pmic_reg_read(REG_SETTING_1);
+ pmic_reg_read(p, REG_SETTING_1, &val);
val &= ~(VVIDEO_MASK | VSD_MASK | VAUDIO_MASK);
val |= VSD_3_15 | VAUDIO_3_0 | VVIDEO_2_775;
- pmic_reg_write(REG_SETTING_1, val);
+ pmic_reg_write(p, REG_SETTING_1, val);
/* Configure VGEN3 and VCAM regulators to use external PNP */
val = VGEN3CONFIG | VCAMCONFIG;
- pmic_reg_write(REG_MODE_1, val);
+ pmic_reg_write(p, REG_MODE_1, val);
udelay(200);
/* Enable VGEN3, VCAM, VAUDIO, VVIDEO, VSD regulators */
val = VGEN3EN | VGEN3CONFIG | VCAMEN | VCAMCONFIG |
VVIDEOEN | VAUDIOEN | VSDEN;
- pmic_reg_write(REG_MODE_1, val);
+ pmic_reg_write(p, REG_MODE_1, val);
- val = pmic_reg_read(REG_POWER_CTL2);
+ pmic_reg_read(p, REG_POWER_CTL2, &val);
val |= WDIRESET;
- pmic_reg_write(REG_POWER_CTL2, val);
+ pmic_reg_write(p, REG_POWER_CTL2, val);
udelay(2500);
}
diff --git a/board/freescale/mx31ads/mx31ads.c b/board/freescale/mx31ads/mx31ads.c
index 4dd1e63..1def0d9 100644
--- a/board/freescale/mx31ads/mx31ads.c
+++ b/board/freescale/mx31ads/mx31ads.c
@@ -25,6 +25,7 @@
#include <asm/io.h>
#include <asm/arch/clock.h>
#include <asm/arch/imx-regs.h>
+#include <asm/arch/sys_proto.h>
DECLARE_GLOBAL_DATA_PTR;
@@ -48,9 +49,16 @@ int board_early_init_f(void)
* the only non-zero field "Wait State Control" is set to half the
* default value.
*/
- __REG(CSCR_U(0)) = 0x00000f00;
- __REG(CSCR_L(0)) = 0x10000D03;
- __REG(CSCR_A(0)) = 0x00720900;
+ static const struct mxc_weimcs cs0 = {
+ /* sp wp bcd bcs psz pme sync dol cnc wsc ew wws edc */
+ CSCR_U(0, 0, 0, 0, 0, 0, 0, 0, 0, 15, 0, 0, 0),
+ /* oea oen ebwa ebwn csa ebc dsz csn psr cre wrap csen */
+ CSCR_L(1, 0, 0, 0, 0, 1, 5, 0, 0, 0, 1, 1),
+ /* ebra ebrn rwa rwn mum lah lbn lba dww dct wwu age cnc2 fce*/
+ CSCR_A(0, 0, 7, 2, 0, 0, 2, 1, 0, 0, 0, 0, 0, 0)
+ };
+
+ mxc_setup_weimcs(0, &cs0);
/* setup pins for UART1 */
mx31_gpio_mux(MUX_RXD1__UART1_RXD_MUX);
@@ -104,7 +112,7 @@ int board_init(void)
return 0;
}
-int checkboard (void)
+int checkboard(void)
{
printf("Board: MX31ADS\n");
return 0;
diff --git a/board/freescale/mx31pdk/mx31pdk.c b/board/freescale/mx31pdk/mx31pdk.c
index 276d451..0e7e0ce 100644
--- a/board/freescale/mx31pdk/mx31pdk.c
+++ b/board/freescale/mx31pdk/mx31pdk.c
@@ -28,6 +28,7 @@
#include <netdev.h>
#include <asm/arch/clock.h>
#include <asm/arch/imx-regs.h>
+#include <asm/arch/sys_proto.h>
#include <watchdog.h>
DECLARE_GLOBAL_DATA_PTR;
@@ -50,9 +51,16 @@ int dram_init(void)
int board_early_init_f(void)
{
/* CS5: CPLD incl. network controller */
- __REG(CSCR_U(5)) = 0x0000d843;
- __REG(CSCR_L(5)) = 0x22252521;
- __REG(CSCR_A(5)) = 0x22220a00;
+ static const struct mxc_weimcs cs5 = {
+ /* sp wp bcd bcs psz pme sync dol cnc wsc ew wws edc */
+ CSCR_U(0, 0, 0, 0, 0, 0, 0, 0, 3, 24, 0, 4, 3),
+ /* oea oen ebwa ebwn csa ebc dsz csn psr cre wrap csen */
+ CSCR_L(2, 2, 2, 5, 2, 0, 5, 2, 0, 0, 0, 1),
+ /* ebra ebrn rwa rwn mum lah lbn lba dww dct wwu age cnc2 fce*/
+ CSCR_A(2, 2, 2, 2, 0, 0, 2, 2, 0, 0, 0, 0, 0, 0)
+ };
+
+ mxc_setup_weimcs(5, &cs5);
/* Setup UART1 and SPI2 pins */
mx31_uart1_hw_init();
diff --git a/board/freescale/mx35pdk/mx35pdk.c b/board/freescale/mx35pdk/mx35pdk.c
index 2ce6e8e..a5b51a0 100644
--- a/board/freescale/mx35pdk/mx35pdk.c
+++ b/board/freescale/mx35pdk/mx35pdk.c
@@ -30,6 +30,7 @@
#include <asm/arch/mx35_pins.h>
#include <asm/arch/iomux.h>
#include <i2c.h>
+#include <pmic.h>
#include <fsl_pmic.h>
#include <mc9sdz60.h>
#include <mc13892.h>
@@ -202,9 +203,10 @@ int board_init(void)
static inline int pmic_detect(void)
{
- int id;
+ unsigned int id;
+ struct pmic *p = get_pmic();
- id = pmic_reg_read(REG_IDENTIFICATION);
+ pmic_reg_read(p, REG_IDENTIFICATION, &id);
id = (id >> 6) & 0x7;
if (id == 0x7)
@@ -225,15 +227,19 @@ int board_late_init(void)
{
u8 val;
u32 pmic_val;
+ struct pmic *p;
+ pmic_init();
if (pmic_detect()) {
+ p = get_pmic();
mxc_request_iomux(MX35_PIN_WATCHDOG_RST, MUX_CONFIG_SION |
MUX_CONFIG_ALT1);
- pmic_val = pmic_reg_read(REG_SETTING_0);
- pmic_reg_write(REG_SETTING_0, pmic_val | VO_1_30V | VO_1_50V);
- pmic_val = pmic_reg_read(REG_MODE_0);
- pmic_reg_write(REG_MODE_0, pmic_val | VGEN3EN);
+ pmic_reg_read(p, REG_SETTING_0, &pmic_val);
+ pmic_reg_write(p, REG_SETTING_0,
+ pmic_val | VO_1_30V | VO_1_50V);
+ pmic_reg_read(p, REG_MODE_0, &pmic_val);
+ pmic_reg_write(p, REG_MODE_0, pmic_val | VGEN3EN);
mxc_request_iomux(MX35_PIN_COMPARE, MUX_CONFIG_GPIO);
mxc_iomux_set_input(MUX_IN_GPIO1_IN_5, INPUT_CTL_PATH0);
diff --git a/board/freescale/mx51evk/mx51evk.c b/board/freescale/mx51evk/mx51evk.c
index f998610..2a0dad0 100644
--- a/board/freescale/mx51evk/mx51evk.c
+++ b/board/freescale/mx51evk/mx51evk.c
@@ -32,6 +32,7 @@
#include <i2c.h>
#include <mmc.h>
#include <fsl_esdhc.h>
+#include <pmic.h>
#include <fsl_pmic.h>
#include <mc13892.h>
@@ -182,34 +183,38 @@ static void power_init(void)
{
unsigned int val;
struct mxc_ccm_reg *mxc_ccm = (struct mxc_ccm_reg *)MXC_CCM_BASE;
+ struct pmic *p;
+
+ pmic_init();
+ p = get_pmic();
/* Write needed to Power Gate 2 register */
- val = pmic_reg_read(REG_POWER_MISC);
+ pmic_reg_read(p, REG_POWER_MISC, &val);
val &= ~PWGT2SPIEN;
- pmic_reg_write(REG_POWER_MISC, val);
+ pmic_reg_write(p, REG_POWER_MISC, val);
/* Externally powered */
- val = pmic_reg_read(REG_CHARGE);
+ pmic_reg_read(p, REG_CHARGE, &val);
val |= ICHRG0 | ICHRG1 | ICHRG2 | ICHRG3 | CHGAUTOB;
- pmic_reg_write(REG_CHARGE, val);
+ pmic_reg_write(p, REG_CHARGE, val);
/* power up the system first */
- pmic_reg_write(REG_POWER_MISC, PWUP);
+ pmic_reg_write(p, REG_POWER_MISC, PWUP);
/* Set core voltage to 1.1V */
- val = pmic_reg_read(REG_SW_0);
+ pmic_reg_read(p, REG_SW_0, &val);
val = (val & ~SWx_VOLT_MASK) | SWx_1_100V;
- pmic_reg_write(REG_SW_0, val);
+ pmic_reg_write(p, REG_SW_0, val);
/* Setup VCC (SW2) to 1.25 */
- val = pmic_reg_read(REG_SW_1);
+ pmic_reg_read(p, REG_SW_1, &val);
val = (val & ~SWx_VOLT_MASK) | SWx_1_250V;
- pmic_reg_write(REG_SW_1, val);
+ pmic_reg_write(p, REG_SW_1, val);
/* Setup 1V2_DIG1 (SW3) to 1.25 */
- val = pmic_reg_read(REG_SW_2);
+ pmic_reg_read(p, REG_SW_2, &val);
val = (val & ~SWx_VOLT_MASK) | SWx_1_250V;
- pmic_reg_write(REG_SW_2, val);
+ pmic_reg_write(p, REG_SW_2, val);
udelay(50);
/* Raise the core frequency to 800MHz */
@@ -217,36 +222,36 @@ static void power_init(void)
/* Set switchers in Auto in NORMAL mode & STANDBY mode */
/* Setup the switcher mode for SW1 & SW2*/
- val = pmic_reg_read(REG_SW_4);
+ pmic_reg_read(p, REG_SW_4, &val);
val = (val & ~((SWMODE_MASK << SWMODE1_SHIFT) |
(SWMODE_MASK << SWMODE2_SHIFT)));
val |= (SWMODE_AUTO_AUTO << SWMODE1_SHIFT) |
(SWMODE_AUTO_AUTO << SWMODE2_SHIFT);
- pmic_reg_write(REG_SW_4, val);
+ pmic_reg_write(p, REG_SW_4, val);
/* Setup the switcher mode for SW3 & SW4 */
- val = pmic_reg_read(REG_SW_5);
+ pmic_reg_read(p, REG_SW_5, &val);
val = (val & ~((SWMODE_MASK << SWMODE3_SHIFT) |
(SWMODE_MASK << SWMODE4_SHIFT)));
val |= (SWMODE_AUTO_AUTO << SWMODE3_SHIFT) |
(SWMODE_AUTO_AUTO << SWMODE4_SHIFT);
- pmic_reg_write(REG_SW_5, val);
+ pmic_reg_write(p, REG_SW_5, val);
/* Set VDIG to 1.65V, VGEN3 to 1.8V, VCAM to 2.6V */
- val = pmic_reg_read(REG_SETTING_0);
+ pmic_reg_read(p, REG_SETTING_0, &val);
val &= ~(VCAM_MASK | VGEN3_MASK | VDIG_MASK);
val |= VDIG_1_65 | VGEN3_1_8 | VCAM_2_6;
- pmic_reg_write(REG_SETTING_0, val);
+ pmic_reg_write(p, REG_SETTING_0, val);
/* Set VVIDEO to 2.775V, VAUDIO to 3V, VSD to 3.15V */
- val = pmic_reg_read(REG_SETTING_1);
+ pmic_reg_read(p, REG_SETTING_1, &val);
val &= ~(VVIDEO_MASK | VSD_MASK | VAUDIO_MASK);
val |= VSD_3_15 | VAUDIO_3_0 | VVIDEO_2_775;
- pmic_reg_write(REG_SETTING_1, val);
+ pmic_reg_write(p, REG_SETTING_1, val);
/* Configure VGEN3 and VCAM regulators to use external PNP */
val = VGEN3CONFIG | VCAMCONFIG;
- pmic_reg_write(REG_MODE_1, val);
+ pmic_reg_write(p, REG_MODE_1, val);
udelay(200);
gpio_direction_output(46, 0);
@@ -257,7 +262,7 @@ static void power_init(void)
/* Enable VGEN3, VCAM, VAUDIO, VVIDEO, VSD regulators */
val = VGEN3EN | VGEN3CONFIG | VCAMEN | VCAMCONFIG |
VVIDEOEN | VAUDIOEN | VSDEN;
- pmic_reg_write(REG_MODE_1, val);
+ pmic_reg_write(p, REG_MODE_1, val);
udelay(500);
diff --git a/board/freescale/mx53evk/mx53evk.c b/board/freescale/mx53evk/mx53evk.c
index fd821c0..eab9c5f 100644
--- a/board/freescale/mx53evk/mx53evk.c
+++ b/board/freescale/mx53evk/mx53evk.c
@@ -32,6 +32,7 @@
#include <i2c.h>
#include <mmc.h>
#include <fsl_esdhc.h>
+#include <pmic.h>
#include <fsl_pmic.h>
#include <asm/gpio.h>
#include <mc13892.h>
@@ -124,12 +125,16 @@ static void setup_i2c(unsigned int port_number)
void power_init(void)
{
unsigned int val;
+ struct pmic *p;
+
+ pmic_init();
+ p = get_pmic();
/* Set VDDA to 1.25V */
- val = pmic_reg_read(REG_SW_2);
+ pmic_reg_read(p, REG_SW_2, &val);
val &= ~SWX_OUT_MASK;
val |= SWX_OUT_1_25;
- pmic_reg_write(REG_SW_2, val);
+ pmic_reg_write(p, REG_SW_2, val);
/*
* Need increase VCC and VDDA to 1.3V
@@ -137,16 +142,16 @@ void power_init(void)
*/
if (is_soc_rev(CHIP_REV_2_0) == 0) {
/* Set VCC to 1.3V for TO2 */
- val = pmic_reg_read(REG_SW_1);
+ pmic_reg_read(p, REG_SW_1, &val);
val &= ~SWX_OUT_MASK;
val |= SWX_OUT_1_30;
- pmic_reg_write(REG_SW_1, val);
+ pmic_reg_write(p, REG_SW_1, val);
/* Set VDDA to 1.3V for TO2 */
- val = pmic_reg_read(REG_SW_2);
+ pmic_reg_read(p, REG_SW_2, &val);
val &= ~SWX_OUT_MASK;
val |= SWX_OUT_1_30;
- pmic_reg_write(REG_SW_2, val);
+ pmic_reg_write(p, REG_SW_2, val);
}
}
diff --git a/board/highbank/Makefile b/board/highbank/Makefile
new file mode 100644
index 0000000..d5b8362
--- /dev/null
+++ b/board/highbank/Makefile
@@ -0,0 +1,49 @@
+#
+# (C) Copyright 2000-2006
+# Wolfgang Denk, DENX Software Engineering, wd@denx.de.
+#
+# See file CREDITS for list of people who contributed to this
+# project.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2 of
+# the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA 02111-1307 USA
+#
+
+include $(TOPDIR)/config.mk
+
+LIB = $(obj)lib$(BOARD).o
+
+COBJS := highbank.o
+
+SRCS := $(COBJS:.o=.c)
+OBJS := $(addprefix $(obj),$(COBJS))
+
+$(LIB): $(obj).depend $(OBJS)
+ $(call cmd_link_o_target, $(OBJS))
+
+clean:
+ rm -f $(OBJS)
+
+distclean: clean
+ rm -f $(LIB) core *.bak $(obj).depend
+
+#########################################################################
+
+# defines $(obj).depend target
+include $(SRCTREE)/rules.mk
+
+sinclude $(obj).depend
+
+#########################################################################
diff --git a/board/highbank/highbank.c b/board/highbank/highbank.c
new file mode 100644
index 0000000..8db8a2b
--- /dev/null
+++ b/board/highbank/highbank.c
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2010-2011 Calxeda, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <common.h>
+#include <ahci.h>
+#include <scsi.h>
+
+#include <asm/sizes.h>
+
+DECLARE_GLOBAL_DATA_PTR;
+
+/*
+ * Miscellaneous platform dependent initialisations
+ */
+int board_init(void)
+{
+ icache_enable();
+
+ return 0;
+}
+
+int misc_init_r(void)
+{
+ ahci_init(0xffe08000);
+ scsi_scan(1);
+ return 0;
+}
+
+int dram_init(void)
+{
+ gd->ram_size = SZ_512M;
+ return 0;
+}
+
+void dram_init_banksize(void)
+{
+ gd->bd->bi_dram[0].start = CONFIG_SYS_SDRAM_BASE;
+ gd->bd->bi_dram[0].size = PHYS_SDRAM_1_SIZE;
+}
+
+void reset_cpu(ulong addr)
+{
+}
diff --git a/board/imx31_phycore/imx31_phycore.c b/board/imx31_phycore/imx31_phycore.c
index 47f1a8d..c165590 100644
--- a/board/imx31_phycore/imx31_phycore.c
+++ b/board/imx31_phycore/imx31_phycore.c
@@ -27,6 +27,7 @@
#include <netdev.h>
#include <asm/arch/clock.h>
#include <asm/arch/imx-regs.h>
+#include <asm/arch/sys_proto.h>
DECLARE_GLOBAL_DATA_PTR;
@@ -49,17 +50,39 @@ int board_init(void)
int board_early_init_f(void)
{
- __REG(CSCR_U(0)) = 0x0000cf03; /* CS0: Nor Flash */
- __REG(CSCR_L(0)) = 0x10000d03;
- __REG(CSCR_A(0)) = 0x00720900;
+ /* CS0: Nor Flash */
+ static const struct mxc_weimcs cs0 = {
+ /* sp wp bcd bcs psz pme sync dol cnc wsc ew wws edc */
+ CSCR_U(0, 0, 0, 0, 0, 0, 0, 0, 3, 15, 0, 0, 3),
+ /* oea oen ebwa ebwn csa ebc dsz csn psr cre wrap csen */
+ CSCR_L(1, 0, 0, 0, 0, 1, 5, 0, 0, 0, 1, 1),
+ /* ebra ebrn rwa rwn mum lah lbn lba dww dct wwu age cnc2 fce*/
+ CSCR_A(0, 0, 7, 2, 0, 0, 2, 1, 0, 0, 0, 0, 0, 0)
+ };
+
+ /* CS1: Network Controller */
+ static const struct mxc_weimcs cs1 = {
+ /* sp wp bcd bcs psz pme sync dol cnc wsc ew wws edc */
+ CSCR_U(0, 0, 0, 0, 0, 0, 0, 0, 3, 31, 0, 0, 6),
+ /* oea oen ebwa ebwn csa ebc dsz csn psr cre wrap csen */
+ CSCR_L(4, 4, 4, 10, 4, 0, 5, 4, 0, 0, 0, 1),
+ /* ebra ebrn rwa rwn mum lah lbn lba dww dct wwu age cnc2 fce*/
+ CSCR_A(4, 4, 4, 4, 0, 1, 4, 3, 0, 0, 0, 0, 1, 0)
+ };
- __REG(CSCR_U(1)) = 0x0000df06; /* CS1: Network Controller */
- __REG(CSCR_L(1)) = 0x444a4541;
- __REG(CSCR_A(1)) = 0x44443302;
+ /* CS4: SRAM */
+ static const struct mxc_weimcs cs4 = {
+ /* sp wp bcd bcs psz pme sync dol cnc wsc ew wws edc */
+ CSCR_U(0, 0, 0, 0, 0, 0, 0, 0, 3, 24, 0, 4, 3),
+ /* oea oen ebwa ebwn csa ebc dsz csn psr cre wrap csen */
+ CSCR_L(2, 2, 2, 5, 2, 0, 5, 2, 0, 0, 0, 1),
+ /* ebra ebrn rwa rwn mum lah lbn lba dww dct wwu age cnc2 fce*/
+ CSCR_A(2, 2, 2, 2, 0, 0, 2, 2, 0, 0, 0, 0, 0, 0)
+ };
- __REG(CSCR_U(4)) = 0x0000d843; /* CS4: SRAM */
- __REG(CSCR_L(4)) = 0x22252521;
- __REG(CSCR_A(4)) = 0x22220a00;
+ mxc_setup_weimcs(0, &cs0);
+ mxc_setup_weimcs(1, &cs1);
+ mxc_setup_weimcs(4, &cs4);
/* setup pins for UART1 */
mx31_gpio_mux(MUX_RXD1__UART1_RXD_MUX);
diff --git a/board/karo/tx25/tx25.c b/board/karo/tx25/tx25.c
index ec83f99..d3d8ea5 100644
--- a/board/karo/tx25/tx25.c
+++ b/board/karo/tx25/tx25.c
@@ -151,7 +151,7 @@ int board_late_init(void)
return 0;
}
-int dram_init (void)
+int dram_init(void)
{
/* dram_init must store complete ramsize in gd->ram_size */
gd->ram_size = get_ram_size((void *)PHYS_SDRAM_1,
diff --git a/board/keymile/km_arm/km_arm.c b/board/keymile/km_arm/km_arm.c
index 67f158c..6ef5e5d 100644
--- a/board/keymile/km_arm/km_arm.c
+++ b/board/keymile/km_arm/km_arm.c
@@ -34,6 +34,7 @@
#include <netdev.h>
#include <miiphy.h>
#include <asm/io.h>
+#include <asm/arch/cpu.h>
#include <asm/arch/kirkwood.h>
#include <asm/arch/mpp.h>
diff --git a/board/logicpd/imx27lite/imx27lite.c b/board/logicpd/imx27lite/imx27lite.c
index 2b273ac..8a5015c 100644
--- a/board/logicpd/imx27lite/imx27lite.c
+++ b/board/logicpd/imx27lite/imx27lite.c
@@ -26,7 +26,7 @@
DECLARE_GLOBAL_DATA_PTR;
-int board_init (void)
+int board_init(void)
{
struct gpio_regs *regs = (struct gpio_regs *)IMX_GPIO_BASE;
#if defined(CONFIG_SYS_NAND_LARGEPAGE)
@@ -64,7 +64,7 @@ int board_init (void)
return 0;
}
-int dram_init (void)
+int dram_init(void)
{
/* dram_init must store complete ramsize in gd->ram_size */
gd->ram_size = get_ram_size((void *)CONFIG_SYS_SDRAM_BASE,
@@ -86,7 +86,7 @@ void dram_init_banksize(void)
int checkboard(void)
{
- puts ("Board: ");
+ puts("Board: ");
puts(CONFIG_BOARDNAME);
return 0;
}
diff --git a/board/logicpd/imx31_litekit/imx31_litekit.c b/board/logicpd/imx31_litekit/imx31_litekit.c
index 7214008..b038e0d 100644
--- a/board/logicpd/imx31_litekit/imx31_litekit.c
+++ b/board/logicpd/imx31_litekit/imx31_litekit.c
@@ -26,6 +26,7 @@
#include <netdev.h>
#include <asm/arch/clock.h>
#include <asm/arch/imx-regs.h>
+#include <asm/arch/sys_proto.h>
DECLARE_GLOBAL_DATA_PTR;
@@ -39,13 +40,28 @@ int dram_init(void)
int board_early_init_f(void)
{
- __REG(CSCR_U(0)) = 0x0000cf03; /* CS0: Nor Flash */
- __REG(CSCR_L(0)) = 0xa0330d01;
- __REG(CSCR_A(0)) = 0x00220800;
+ /* CS0: Nor Flash */
+ static const struct mxc_weimcs cs0 = {
+ /* sp wp bcd bcs psz pme sync dol cnc wsc ew wws edc */
+ CSCR_U(0, 0, 0, 0, 0, 0, 0, 0, 3, 15, 0, 0, 3),
+ /* oea oen ebwa ebwn csa ebc dsz csn psr cre wrap csen */
+ CSCR_L(10, 0, 3, 3, 0, 1, 5, 0, 0, 0, 0, 1),
+ /* ebra ebrn rwa rwn mum lah lbn lba dww dct wwu age cnc2 fce*/
+ CSCR_A(0, 0, 2, 2, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0)
+ };
- __REG(CSCR_U(4)) = 0x0000dcf6; /* CS4: Network Controller */
- __REG(CSCR_L(4)) = 0x444a4541;
- __REG(CSCR_A(4)) = 0x44443302;
+ /* CS4: Network Controller */
+ static const struct mxc_weimcs cs4 = {
+ /* sp wp bcd bcs psz pme sync dol cnc wsc ew wws edc */
+ CSCR_U(0, 0, 0, 0, 0, 0, 0, 0, 3, 28, 1, 7, 6),
+ /* oea oen ebwa ebwn csa ebc dsz csn psr cre wrap csen */
+ CSCR_L(4, 4, 4, 10, 4, 0, 5, 4, 0, 0, 0, 1),
+ /* ebra ebrn rwa rwn mum lah lbn lba dww dct wwu age cnc2 fce*/
+ CSCR_A(4, 4, 4, 4, 0, 1, 4, 3, 0, 0, 0, 0, 1, 0)
+ };
+
+ mxc_setup_weimcs(0, &cs0);
+ mxc_setup_weimcs(4, &cs4);
/* setup pins for UART1 */
mx31_gpio_mux(MUX_RXD1__UART1_RXD_MUX);
@@ -75,7 +91,7 @@ int board_init(void)
return 0;
}
-int checkboard (void)
+int checkboard(void)
{
printf("Board: i.MX31 Litekit\n");
return 0;
diff --git a/board/logicpd/zoom2/debug_board.c b/board/logicpd/zoom2/debug_board.c
index 33aa600..071e7f9 100644
--- a/board/logicpd/zoom2/debug_board.c
+++ b/board/logicpd/zoom2/debug_board.c
@@ -40,7 +40,6 @@ static void zoom2_debug_board_detect (void)
*/
gpio_direction_input(158);
val = gpio_get_value(158);
- gpio_free(158);
}
if (!val)
diff --git a/board/logicpd/zoom2/zoom2.c b/board/logicpd/zoom2/zoom2.c
index 21964c2..be3083d 100644
--- a/board/logicpd/zoom2/zoom2.c
+++ b/board/logicpd/zoom2/zoom2.c
@@ -95,7 +95,6 @@ void zoom2_identify(void)
gpio_direction_input(94);
val = gpio_get_value(94);
- gpio_free(94);
if (val)
revision = ZOOM2_REVISION_BETA;
diff --git a/board/nvidia/common/board.c b/board/nvidia/common/board.c
index 160dac8..d13537d 100644
--- a/board/nvidia/common/board.c
+++ b/board/nvidia/common/board.c
@@ -43,24 +43,6 @@ const struct tegra2_sysinfo sysinfo = {
CONFIG_TEGRA2_BOARD_STRING
};
-#ifdef CONFIG_BOARD_EARLY_INIT_F
-int board_early_init_f(void)
-{
- /* Initialize periph clocks */
- clock_init();
-
- /* Initialize periph pinmuxes */
- pinmux_init();
-
- /* Initialize periph GPIOs */
- gpio_init();
-
- /* Init UART, scratch regs, and start CPU */
- tegra2_start();
- return 0;
-}
-#endif /* EARLY_INIT */
-
/*
* Routine: timer_init
* Description: init the timestamp and lastinc value
@@ -70,62 +52,31 @@ int timer_init(void)
return 0;
}
-/*
- * Routine: clock_init_uart
- * Description: init the PLL and clock for the UART(s)
- */
-static void clock_init_uart(void)
+static void enable_uart(enum periph_id pid)
{
- struct clk_rst_ctlr *clkrst = (struct clk_rst_ctlr *)NV_PA_CLK_RST_BASE;
- struct clk_pll *pll = &clkrst->crc_pll[CLOCK_PLL_ID_PERIPH];
- u32 reg;
-
- reg = readl(&pll->pll_base);
- if (!(reg & PLL_BASE_OVRRIDE_MASK)) {
- /* Override pllp setup for 216MHz operation. */
- reg = PLL_BYPASS_MASK | PLL_BASE_OVRRIDE_MASK |
- (1 << PLL_DIVP_SHIFT) | (0xc << PLL_DIVM_SHIFT);
- reg |= (NVRM_PLLP_FIXED_FREQ_KHZ / 500) << PLL_DIVN_SHIFT;
- writel(reg, &pll->pll_base);
-
- reg |= PLL_ENABLE_MASK;
- writel(reg, &pll->pll_base);
-
- reg &= ~PLL_BYPASS_MASK;
- writel(reg, &pll->pll_base);
- }
-
-#if defined(CONFIG_TEGRA2_ENABLE_UARTA)
/* Assert UART reset and enable clock */
- reset_set_enable(PERIPH_ID_UART1, 1);
- clock_enable(PERIPH_ID_UART1);
-
- /* Enable pllp_out0 to UART */
- reg = readl(&clkrst->crc_clk_src_uarta);
- reg &= 0x3FFFFFFF; /* UARTA_CLK_SRC = 00, PLLP_OUT0 */
- writel(reg, &clkrst->crc_clk_src_uarta);
+ reset_set_enable(pid, 1);
+ clock_enable(pid);
+ clock_ll_set_source(pid, 0); /* UARTx_CLK_SRC = 00, PLLP_OUT0 */
/* wait for 2us */
udelay(2);
/* De-assert reset to UART */
- reset_set_enable(PERIPH_ID_UART1, 0);
+ reset_set_enable(pid, 0);
+}
+
+/*
+ * Routine: clock_init_uart
+ * Description: init the PLL and clock for the UART(s)
+ */
+static void clock_init_uart(void)
+{
+#if defined(CONFIG_TEGRA2_ENABLE_UARTA)
+ enable_uart(PERIPH_ID_UART1);
#endif /* CONFIG_TEGRA2_ENABLE_UARTA */
#if defined(CONFIG_TEGRA2_ENABLE_UARTD)
- /* Assert UART reset and enable clock */
- reset_set_enable(PERIPH_ID_UART4, 1);
- clock_enable(PERIPH_ID_UART4);
-
- /* Enable pllp_out0 to UART */
- reg = readl(&clkrst->crc_clk_src_uartd);
- reg &= 0x3FFFFFFF; /* UARTD_CLK_SRC = 00, PLLP_OUT0 */
- writel(reg, &clkrst->crc_clk_src_uartd);
-
- /* wait for 2us */
- udelay(2);
-
- /* De-assert reset to UART */
- reset_set_enable(PERIPH_ID_UART4, 0);
+ enable_uart(PERIPH_ID_UART4);
#endif /* CONFIG_TEGRA2_ENABLE_UARTD */
}
@@ -135,66 +86,29 @@ static void clock_init_uart(void)
*/
static void pin_mux_uart(void)
{
- struct pmux_tri_ctlr *pmt = (struct pmux_tri_ctlr *)NV_PA_APB_MISC_BASE;
- u32 reg;
-
#if defined(CONFIG_TEGRA2_ENABLE_UARTA)
- reg = readl(&pmt->pmt_ctl_c);
- reg &= 0xFFF0FFFF; /* IRRX_/IRTX_SEL [19:16] = 00 UARTA */
- writel(reg, &pmt->pmt_ctl_c);
+ pinmux_set_func(PINGRP_IRRX, PMUX_FUNC_UARTA);
+ pinmux_set_func(PINGRP_IRTX, PMUX_FUNC_UARTA);
- pinmux_tristate_disable(PIN_IRRX);
- pinmux_tristate_disable(PIN_IRTX);
+ pinmux_tristate_disable(PINGRP_IRRX);
+ pinmux_tristate_disable(PINGRP_IRTX);
#endif /* CONFIG_TEGRA2_ENABLE_UARTA */
#if defined(CONFIG_TEGRA2_ENABLE_UARTD)
- reg = readl(&pmt->pmt_ctl_b);
- reg &= 0xFFFFFFF3; /* GMC_SEL [3:2] = 00, UARTD */
- writel(reg, &pmt->pmt_ctl_b);
+ pinmux_set_func(PINGRP_GMC, PMUX_FUNC_UARTD);
- pinmux_tristate_disable(PIN_GMC);
+ pinmux_tristate_disable(PINGRP_GMC);
#endif /* CONFIG_TEGRA2_ENABLE_UARTD */
}
+#ifdef CONFIG_TEGRA2_MMC
/*
* Routine: clock_init_mmc
* Description: init the PLL and clocks for the SDMMC controllers
*/
static void clock_init_mmc(void)
{
- struct clk_rst_ctlr *clkrst = (struct clk_rst_ctlr *)NV_PA_CLK_RST_BASE;
- u32 reg;
-
- /* Do the SDMMC resets/clock enables */
- reset_set_enable(PERIPH_ID_SDMMC4, 1);
- clock_enable(PERIPH_ID_SDMMC4);
-
- /* Enable pllp_out0 to SDMMC4 */
- reg = readl(&clkrst->crc_clk_src_sdmmc4);
- reg &= 0x3FFFFF00; /* SDMMC4_CLK_SRC = 00, PLLP_OUT0 */
- reg |= (10 << 1); /* n-1, 11-1 shl 1 */
- writel(reg, &clkrst->crc_clk_src_sdmmc4);
-
- /*
- * As per the Tegra2 TRM, section 5.3.4:
- * 'Wait 2 us for the clock to flush through the pipe/logic'
- */
- udelay(2);
-
- reset_set_enable(PERIPH_ID_SDMMC4, 1);
-
- reset_set_enable(PERIPH_ID_SDMMC3, 1);
- clock_enable(PERIPH_ID_SDMMC3);
-
- /* Enable pllp_out0 to SDMMC4, set divisor to 11 for 20MHz */
- reg = readl(&clkrst->crc_clk_src_sdmmc3);
- reg &= 0x3FFFFF00; /* SDMMC3_CLK_SRC = 00, PLLP_OUT0 */
- reg |= (10 << 1); /* n-1, 11-1 shl 1 */
- writel(reg, &clkrst->crc_clk_src_sdmmc3);
-
- /* wait for 2us */
- udelay(2);
-
- reset_set_enable(PERIPH_ID_SDMMC3, 0);
+ clock_start_periph_pll(PERIPH_ID_SDMMC4, CLOCK_ID_PERIPH, 20000000);
+ clock_start_periph_pll(PERIPH_ID_SDMMC3, CLOCK_ID_PERIPH, 20000000);
}
/*
@@ -203,65 +117,25 @@ static void clock_init_mmc(void)
*/
static void pin_mux_mmc(void)
{
- struct pmux_tri_ctlr *pmt = (struct pmux_tri_ctlr *)NV_PA_APB_MISC_BASE;
- u32 reg;
-
- /* SDMMC4 */
- /* config 2, x8 on 2nd set of pins */
- reg = readl(&pmt->pmt_ctl_a);
- reg |= (3 << 16); /* ATB_SEL [17:16] = 11 SDIO4 */
- writel(reg, &pmt->pmt_ctl_a);
- reg = readl(&pmt->pmt_ctl_b);
- reg |= (3 << 0); /* GMA_SEL [1:0] = 11 SDIO4 */
- writel(reg, &pmt->pmt_ctl_b);
- reg = readl(&pmt->pmt_ctl_d);
- reg |= (3 << 0); /* GME_SEL [1:0] = 11 SDIO4 */
- writel(reg, &pmt->pmt_ctl_d);
-
- pinmux_tristate_disable(PIN_ATB);
- pinmux_tristate_disable(PIN_GMA);
- pinmux_tristate_disable(PIN_GME);
-
- /* SDMMC3 */
- /* SDIO3_CLK, SDIO3_CMD, SDIO3_DAT[3:0] */
- reg = readl(&pmt->pmt_ctl_d);
- reg &= 0xFFFF03FF;
- reg |= (2 << 10); /* SDB_SEL [11:10] = 01 SDIO3 */
- reg |= (2 << 12); /* SDC_SEL [13:12] = 01 SDIO3 */
- reg |= (2 << 14); /* SDD_SEL [15:14] = 01 SDIO3 */
- writel(reg, &pmt->pmt_ctl_d);
-
- pinmux_tristate_disable(PIN_SDC);
- pinmux_tristate_disable(PIN_SDD);
- pinmux_tristate_disable(PIN_SDB);
-}
-
-/*
- * Routine: clock_init
- * Description: Do individual peripheral clock reset/enables
- */
-void clock_init(void)
-{
- clock_init_uart();
-}
-
-/*
- * Routine: pinmux_init
- * Description: Do individual peripheral pinmux configs
- */
-void pinmux_init(void)
-{
- pin_mux_uart();
-}
-
-/*
- * Routine: gpio_init
- * Description: Do individual peripheral GPIO configs
- */
-void gpio_init(void)
-{
- gpio_config_uart();
+ /* SDMMC4: config 3, x8 on 2nd set of pins */
+ pinmux_set_func(PINGRP_ATB, PMUX_FUNC_SDIO4);
+ pinmux_set_func(PINGRP_GMA, PMUX_FUNC_SDIO4);
+ pinmux_set_func(PINGRP_GME, PMUX_FUNC_SDIO4);
+
+ pinmux_tristate_disable(PINGRP_ATB);
+ pinmux_tristate_disable(PINGRP_GMA);
+ pinmux_tristate_disable(PINGRP_GME);
+
+ /* SDMMC3: SDIO3_CLK, SDIO3_CMD, SDIO3_DAT[3:0] */
+ pinmux_set_func(PINGRP_SDB, PMUX_FUNC_SDIO3);
+ pinmux_set_func(PINGRP_SDC, PMUX_FUNC_SDIO3);
+ pinmux_set_func(PINGRP_SDD, PMUX_FUNC_SDIO3);
+
+ pinmux_tristate_disable(PINGRP_SDC);
+ pinmux_tristate_disable(PINGRP_SDD);
+ pinmux_tristate_disable(PINGRP_SDB);
}
+#endif
/*
* Routine: board_init
@@ -269,6 +143,9 @@ void gpio_init(void)
*/
int board_init(void)
{
+ clock_init();
+ clock_verify();
+
/* boot param addr */
gd->bd->bi_boot_params = (NV_PA_SDRAM_BASE + 0x100);
@@ -283,6 +160,7 @@ int board_mmc_init(bd_t *bd)
/* Enable clocks, muxes, etc. for SDMMC controllers */
clock_init_mmc();
pin_mux_mmc();
+ gpio_config_mmc();
debug("board_mmc_init: init eMMC\n");
/* init dev 0, eMMC chip, with 4-bit bus */
@@ -294,16 +172,25 @@ int board_mmc_init(bd_t *bd)
return 0;
}
+#endif
-/* this is a weak define that we are overriding */
-int board_mmc_getcd(u8 *cd, struct mmc *mmc)
+#ifdef CONFIG_BOARD_EARLY_INIT_F
+int board_early_init_f(void)
{
- debug("board_mmc_getcd called\n");
- /*
- * Hard-code CD presence for now. Need to add GPIO inputs
- * for Seaboard & Harmony (& Kaen/Aebl/Wario?)
- */
- *cd = 1;
+ /* Initialize essential common plls */
+ clock_early_init();
+
+ /* Initialize UART clocks */
+ clock_init_uart();
+
+ /* Initialize periph pinmuxes */
+ pin_mux_uart();
+
+ /* Initialize periph GPIOs */
+ gpio_config_uart();
+
+ /* Init UART, scratch regs, and start CPU */
+ tegra2_start();
return 0;
}
-#endif
+#endif /* EARLY_INIT */
diff --git a/board/nvidia/common/board.h b/board/nvidia/common/board.h
index 4334c02..344e702 100644
--- a/board/nvidia/common/board.h
+++ b/board/nvidia/common/board.h
@@ -25,10 +25,8 @@
#define _BOARD_H_
void tegra2_start(void);
-void clock_init(void);
-void pinmux_init(void);
-void gpio_init(void);
void gpio_config_uart(void);
+void gpio_config_mmc(void);
int tegra2_mmc_init(int dev_index, int bus_width);
#endif /* BOARD_H */
diff --git a/board/nvidia/harmony/harmony.c b/board/nvidia/harmony/harmony.c
index f1ab050..cbb30d6 100644
--- a/board/nvidia/harmony/harmony.c
+++ b/board/nvidia/harmony/harmony.c
@@ -24,6 +24,9 @@
#include <common.h>
#include <asm/io.h>
#include <asm/arch/tegra2.h>
+#ifdef CONFIG_TEGRA2_MMC
+#include <mmc.h>
+#endif
/*
* Routine: gpio_config_uart
@@ -32,3 +35,26 @@
void gpio_config_uart(void)
{
}
+
+#ifdef CONFIG_TEGRA2_MMC
+/*
+ * Routine: gpio_config_mmc
+ * Description: Set GPIOs for SD card
+ */
+void gpio_config_mmc(void)
+{
+ /* Not implemented for now */
+}
+
+/* this is a weak define that we are overriding */
+int board_mmc_getcd(u8 *cd, struct mmc *mmc)
+{
+ debug("board_mmc_getcd called\n");
+ /*
+ * Hard-code CD presence for now. Need to add GPIO inputs
+ * for Harmony
+ */
+ *cd = 1;
+ return 0;
+}
+#endif
diff --git a/board/nvidia/seaboard/seaboard.c b/board/nvidia/seaboard/seaboard.c
index 4b9a8f3..bc67d0f 100644
--- a/board/nvidia/seaboard/seaboard.c
+++ b/board/nvidia/seaboard/seaboard.c
@@ -24,7 +24,10 @@
#include <common.h>
#include <asm/io.h>
#include <asm/arch/tegra2.h>
-#include <asm/arch/gpio.h>
+#include <asm/gpio.h>
+#ifdef CONFIG_TEGRA2_MMC
+#include <mmc.h>
+#endif
/*
* Routine: gpio_config_uart
@@ -50,3 +53,33 @@ void gpio_config_uart(void)
val |= 1 << GPIO_BIT(gp);
writel(val, &bank->gpio_dir_out[GPIO_PORT(gp)]);
}
+
+#ifdef CONFIG_TEGRA2_MMC
+/*
+ * Routine: gpio_config_mmc
+ * Description: Set GPIOs for SDMMC3 SDIO slot.
+ */
+void gpio_config_mmc(void)
+{
+ /* Set EN_VDDIO_SD (GPIO I6) */
+ gpio_direction_output(GPIO_PI6, 1);
+
+ /* Config pin as GPI for Card Detect (GPIO I5) */
+ gpio_direction_input(GPIO_PI5);
+}
+
+/* this is a weak define that we are overriding */
+int board_mmc_getcd(u8 *cd, struct mmc *mmc)
+{
+ debug("board_mmc_getcd called\n");
+ *cd = 1; /* Assume card is inserted, or eMMC */
+
+ if (IS_SD(mmc)) {
+ /* Seaboard SDMMC3 = SDIO3_CD = GPIO_PI5 */
+ if (gpio_get_value(GPIO_PI5))
+ *cd = 0;
+ }
+
+ return 0;
+}
+#endif
diff --git a/board/overo/overo.c b/board/overo/overo.c
index 850dfee..3c60b06 100644
--- a/board/overo/overo.c
+++ b/board/overo/overo.c
@@ -118,10 +118,6 @@ int get_board_revision(void)
revision = gpio_get_value(115) << 2 |
gpio_get_value(113) << 1 |
gpio_get_value(112);
-
- gpio_free(112);
- gpio_free(113);
- gpio_free(115);
} else {
printf("Error: unable to acquire board revision GPIOs\n");
revision = -1;
@@ -153,8 +149,7 @@ int get_sdio2_config(void)
sdio_direct = 0;
}
- gpio_free(130);
- gpio_free(139);
+ gpio_direction_input(130);
} else {
printf("Error: unable to acquire sdio2 clk GPIOs\n");
sdio_direct = -1;
@@ -233,6 +228,9 @@ int misc_init_r(void)
printf("Recognized Tobi Duo expansion board (rev %d %s)\n",
expansion_config.revision,
expansion_config.fab_revision);
+ /* second lan chip */
+ enable_gpmc_cs_config(gpmc_lan_config, &gpmc_cfg->cs[4],
+ 0x2B000000, GPMC_SIZE_16M);
break;
case GUMSTIX_PALO35:
printf("Recognized Palo35 expansion board (rev %d %s)\n",
@@ -310,10 +308,6 @@ static void setup_net_chip(void)
enable_gpmc_cs_config(gpmc_lan_config, &gpmc_cfg->cs[5], 0x2C000000,
GPMC_SIZE_16M);
- /* second lan chip */
- enable_gpmc_cs_config(gpmc_lan_config, &gpmc_cfg->cs[4], 0x2B000000,
- GPMC_SIZE_16M);
-
/* Enable off mode for NWE in PADCONF_GPMC_NWE register */
writew(readw(&ctrl_base ->gpmc_nwe) | 0x0E00, &ctrl_base->gpmc_nwe);
/* Enable off mode for NOE in PADCONF_GPMC_NADV_ALE register */
diff --git a/board/overo/overo.h b/board/overo/overo.h
index d394f90..915f15b 100644
--- a/board/overo/overo.h
+++ b/board/overo/overo.h
@@ -160,10 +160,10 @@ const omap3_sysinfo sysinfo = {
MUX_VAL(CP(DSS_DATA22), (IDIS | PTD | DIS | M0)) /*DSS_DATA22*/\
MUX_VAL(CP(DSS_DATA23), (IDIS | PTD | DIS | M0)) /*DSS_DATA23*/\
/*CAMERA*/\
- MUX_VAL(CP(CAM_HS), (IEN | PTU | EN | M0)) /*CAM_HS */\
- MUX_VAL(CP(CAM_VS), (IEN | PTU | EN | M0)) /*CAM_VS */\
+ MUX_VAL(CP(CAM_HS), (IEN | PTU | DIS | M0)) /*CAM_HS */\
+ MUX_VAL(CP(CAM_VS), (IEN | PTU | DIS | M0)) /*CAM_VS */\
MUX_VAL(CP(CAM_XCLKA), (IDIS | PTD | DIS | M0)) /*CAM_XCLKA*/\
- MUX_VAL(CP(CAM_PCLK), (IEN | PTU | EN | M0)) /*CAM_PCLK*/\
+ MUX_VAL(CP(CAM_PCLK), (IEN | PTU | DIS | M0)) /*CAM_PCLK*/\
MUX_VAL(CP(CAM_FLD), (IDIS | PTD | DIS | M4)) /*CAM_FLD*/\
MUX_VAL(CP(CAM_D0), (IEN | PTD | DIS | M0)) /*CAM_D0*/\
MUX_VAL(CP(CAM_D1), (IEN | PTD | DIS | M0)) /*CAM_D1*/\
@@ -290,7 +290,7 @@ const omap3_sysinfo sysinfo = {
MUX_VAL(CP(SYS_BOOT5), (IEN | PTD | DIS | M4)) /*GPIO_7*/\
MUX_VAL(CP(SYS_BOOT6), (IDIS | PTD | DIS | M4)) /*GPIO_8*/\
MUX_VAL(CP(SYS_OFF_MODE), (IEN | PTD | DIS | M0)) /*SYS_OFF_MODE*/\
- MUX_VAL(CP(SYS_CLKOUT1), (IEN | PTD | DIS | M0)) /*SYS_CLKOUT1*/\
+ MUX_VAL(CP(SYS_CLKOUT1), (IEN | PTU | EN | M4)) /*GPIO_10*/\
MUX_VAL(CP(SYS_CLKOUT2), (IEN | PTU | EN | M4)) /*GPIO_186*/\
MUX_VAL(CP(ETK_CLK_ES2), (IEN | PTU | EN | M2)) /*MMC3_CLK*/\
MUX_VAL(CP(ETK_CTL_ES2), (IEN | PTU | EN | M2)) /*MMC3_CMD*/\
diff --git a/board/samsung/goni/goni.c b/board/samsung/goni/goni.c
index e24cd29..e191bfb 100644
--- a/board/samsung/goni/goni.c
+++ b/board/samsung/goni/goni.c
@@ -25,6 +25,7 @@
#include <common.h>
#include <asm/arch/gpio.h>
#include <asm/arch/mmc.h>
+#include <pmic.h>
DECLARE_GLOBAL_DATA_PTR;
@@ -38,6 +39,9 @@ int board_init(void)
gd->bd->bi_arch_number = MACH_TYPE_GONI;
gd->bd->bi_boot_params = PHYS_SDRAM_1 + 0x100;
+#if defined(CONFIG_PMIC)
+ pmic_init();
+#endif
return 0;
}
diff --git a/board/ti/am335x/Makefile b/board/ti/am335x/Makefile
new file mode 100644
index 0000000..d58b185
--- /dev/null
+++ b/board/ti/am335x/Makefile
@@ -0,0 +1,43 @@
+#
+# Makefile
+#
+# Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2 of
+# the License, or (at your option) any later version.
+#
+# This program is distributed "as is" WITHOUT ANY WARRANTY of any
+# kind, whether express or implied; without even the implied warranty
+# of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+
+include $(TOPDIR)/config.mk
+
+LIB = $(obj)lib$(BOARD).o
+
+COBJS := evm.o mux.o
+
+SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
+OBJS := $(addprefix $(obj),$(COBJS))
+SOBJS := $(addprefix $(obj),$(SOBJS))
+
+$(LIB): $(obj).depend $(OBJS) $(SOBJS)
+ $(call cmd_link_o_target, $(OBJS) $(SOBJS))
+
+clean:
+ rm -f $(SOBJS) $(OBJS)
+
+distclean: clean
+ rm -f $(LIB) core *.bak $(obj).depend
+
+#########################################################################
+
+# defines $(obj).depend target
+include $(SRCTREE)/rules.mk
+
+sinclude $(obj).depend
+
+#########################################################################
diff --git a/board/ti/am335x/common_def.h b/board/ti/am335x/common_def.h
new file mode 100644
index 0000000..1696d60
--- /dev/null
+++ b/board/ti/am335x/common_def.h
@@ -0,0 +1,24 @@
+/*
+ * common_def.h
+ *
+ * Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation version 2.
+ *
+ * This program is distributed "as is" WITHOUT ANY WARRANTY of any
+ * kind, whether express or implied; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ */
+
+#ifndef __COMMON_DEF_H__
+#define __COMMON_DEF_H__
+
+extern void enable_uart0_pin_mux(void);
+extern void configure_evm_pin_mux(unsigned char daughter_board_id,
+ unsigned short daughter_board_profile,
+ unsigned char daughter_board_flag);
+
+#endif/*__COMMON_DEF_H__ */
diff --git a/board/ti/am335x/evm.c b/board/ti/am335x/evm.c
new file mode 100644
index 0000000..b4eddd8
--- /dev/null
+++ b/board/ti/am335x/evm.c
@@ -0,0 +1,48 @@
+/*
+ * evm.c
+ *
+ * Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation version 2.
+ *
+ * This program is distributed "as is" WITHOUT ANY WARRANTY of any
+ * kind, whether express or implied; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ */
+
+#include <common.h>
+#include <asm/arch/cpu.h>
+#include <asm/arch/hardware.h>
+#include "common_def.h"
+#include <serial.h>
+
+DECLARE_GLOBAL_DATA_PTR;
+
+#define UART_RESET (0x1 << 1)
+#define UART_CLK_RUNNING_MASK 0x1
+#define UART_SMART_IDLE_EN (0x1 << 0x3)
+
+/*
+ * Basic board specific setup
+ */
+int init_basic_setup(void)
+{
+ /* Initialize the Timer */
+ init_timer();
+
+ /* address of boot parameters */
+ gd->bd->bi_boot_params = PHYS_DRAM_1 + 0x100;
+
+ return 0;
+}
+
+int board_init(void)
+{
+ enable_uart0_pin_mux();
+ init_basic_setup();
+
+ return 0;
+}
diff --git a/board/ti/am335x/mux.c b/board/ti/am335x/mux.c
new file mode 100644
index 0000000..8f27409
--- /dev/null
+++ b/board/ti/am335x/mux.c
@@ -0,0 +1,278 @@
+/*
+ * mux.c
+ *
+ * Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation version 2.
+ *
+ * This program is distributed "as is" WITHOUT ANY WARRANTY of any
+ * kind, whether express or implied; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ */
+
+#include <config.h>
+#include "common_def.h"
+#include <asm/arch/hardware.h>
+#include <asm/io.h>
+
+#define MUX_CFG(value, offset) \
+ __raw_writel(value, (CTRL_BASE + offset));
+
+/* PAD Control Fields */
+#define SLEWCTRL (0x1 << 6)
+#define RXACTIVE (0x1 << 5)
+#define PULLUP_EN (0x1 << 4) /* Pull UP Selection */
+#define PULLUDEN (0x0 << 3) /* Pull up enabled */
+#define PULLUDDIS (0x1 << 3) /* Pull up disabled */
+#define MODE(val) val /* used for Readability */
+
+/*
+ * PAD CONTROL OFFSETS
+ * Field names corresponds to the pad signal name
+ */
+struct pad_signals {
+ int gpmc_ad0;
+ int gpmc_ad1;
+ int gpmc_ad2;
+ int gpmc_ad3;
+ int gpmc_ad4;
+ int gpmc_ad5;
+ int gpmc_ad6;
+ int gpmc_ad7;
+ int gpmc_ad8;
+ int gpmc_ad9;
+ int gpmc_ad10;
+ int gpmc_ad11;
+ int gpmc_ad12;
+ int gpmc_ad13;
+ int gpmc_ad14;
+ int gpmc_ad15;
+ int gpmc_a0;
+ int gpmc_a1;
+ int gpmc_a2;
+ int gpmc_a3;
+ int gpmc_a4;
+ int gpmc_a5;
+ int gpmc_a6;
+ int gpmc_a7;
+ int gpmc_a8;
+ int gpmc_a9;
+ int gpmc_a10;
+ int gpmc_a11;
+ int gpmc_wait0;
+ int gpmc_wpn;
+ int gpmc_be1n;
+ int gpmc_csn0;
+ int gpmc_csn1;
+ int gpmc_csn2;
+ int gpmc_csn3;
+ int gpmc_clk;
+ int gpmc_advn_ale;
+ int gpmc_oen_ren;
+ int gpmc_wen;
+ int gpmc_be0n_cle;
+ int lcd_data0;
+ int lcd_data1;
+ int lcd_data2;
+ int lcd_data3;
+ int lcd_data4;
+ int lcd_data5;
+ int lcd_data6;
+ int lcd_data7;
+ int lcd_data8;
+ int lcd_data9;
+ int lcd_data10;
+ int lcd_data11;
+ int lcd_data12;
+ int lcd_data13;
+ int lcd_data14;
+ int lcd_data15;
+ int lcd_vsync;
+ int lcd_hsync;
+ int lcd_pclk;
+ int lcd_ac_bias_en;
+ int mmc0_dat3;
+ int mmc0_dat2;
+ int mmc0_dat1;
+ int mmc0_dat0;
+ int mmc0_clk;
+ int mmc0_cmd;
+ int mii1_col;
+ int mii1_crs;
+ int mii1_rxerr;
+ int mii1_txen;
+ int mii1_rxdv;
+ int mii1_txd3;
+ int mii1_txd2;
+ int mii1_txd1;
+ int mii1_txd0;
+ int mii1_txclk;
+ int mii1_rxclk;
+ int mii1_rxd3;
+ int mii1_rxd2;
+ int mii1_rxd1;
+ int mii1_rxd0;
+ int rmii1_refclk;
+ int mdio_data;
+ int mdio_clk;
+ int spi0_sclk;
+ int spi0_d0;
+ int spi0_d1;
+ int spi0_cs0;
+ int spi0_cs1;
+ int ecap0_in_pwm0_out;
+ int uart0_ctsn;
+ int uart0_rtsn;
+ int uart0_rxd;
+ int uart0_txd;
+ int uart1_ctsn;
+ int uart1_rtsn;
+ int uart1_rxd;
+ int uart1_txd;
+ int i2c0_sda;
+ int i2c0_scl;
+ int mcasp0_aclkx;
+ int mcasp0_fsx;
+ int mcasp0_axr0;
+ int mcasp0_ahclkr;
+ int mcasp0_aclkr;
+ int mcasp0_fsr;
+ int mcasp0_axr1;
+ int mcasp0_ahclkx;
+ int xdma_event_intr0;
+ int xdma_event_intr1;
+ int nresetin_out;
+ int porz;
+ int nnmi;
+ int osc0_in;
+ int osc0_out;
+ int rsvd1;
+ int tms;
+ int tdi;
+ int tdo;
+ int tck;
+ int ntrst;
+ int emu0;
+ int emu1;
+ int osc1_in;
+ int osc1_out;
+ int pmic_power_en;
+ int rtc_porz;
+ int rsvd2;
+ int ext_wakeup;
+ int enz_kaldo_1p8v;
+ int usb0_dm;
+ int usb0_dp;
+ int usb0_ce;
+ int usb0_id;
+ int usb0_vbus;
+ int usb0_drvvbus;
+ int usb1_dm;
+ int usb1_dp;
+ int usb1_ce;
+ int usb1_id;
+ int usb1_vbus;
+ int usb1_drvvbus;
+ int ddr_resetn;
+ int ddr_csn0;
+ int ddr_cke;
+ int ddr_ck;
+ int ddr_nck;
+ int ddr_casn;
+ int ddr_rasn;
+ int ddr_wen;
+ int ddr_ba0;
+ int ddr_ba1;
+ int ddr_ba2;
+ int ddr_a0;
+ int ddr_a1;
+ int ddr_a2;
+ int ddr_a3;
+ int ddr_a4;
+ int ddr_a5;
+ int ddr_a6;
+ int ddr_a7;
+ int ddr_a8;
+ int ddr_a9;
+ int ddr_a10;
+ int ddr_a11;
+ int ddr_a12;
+ int ddr_a13;
+ int ddr_a14;
+ int ddr_a15;
+ int ddr_odt;
+ int ddr_d0;
+ int ddr_d1;
+ int ddr_d2;
+ int ddr_d3;
+ int ddr_d4;
+ int ddr_d5;
+ int ddr_d6;
+ int ddr_d7;
+ int ddr_d8;
+ int ddr_d9;
+ int ddr_d10;
+ int ddr_d11;
+ int ddr_d12;
+ int ddr_d13;
+ int ddr_d14;
+ int ddr_d15;
+ int ddr_dqm0;
+ int ddr_dqm1;
+ int ddr_dqs0;
+ int ddr_dqsn0;
+ int ddr_dqs1;
+ int ddr_dqsn1;
+ int ddr_vref;
+ int ddr_vtp;
+ int ddr_strben0;
+ int ddr_strben1;
+ int ain7;
+ int ain6;
+ int ain5;
+ int ain4;
+ int ain3;
+ int ain2;
+ int ain1;
+ int ain0;
+ int vrefp;
+ int vrefn;
+};
+
+struct module_pin_mux {
+ short reg_offset;
+ unsigned char val;
+};
+
+/* Pad control register offset */
+#define PAD_CTRL_BASE 0x800
+#define OFFSET(x) (unsigned int) (&((struct pad_signals *) \
+ (PAD_CTRL_BASE))->x)
+
+static struct module_pin_mux uart0_pin_mux[] = {
+ {OFFSET(uart0_rxd), (MODE(0) | PULLUP_EN | RXACTIVE)}, /* UART0_RXD */
+ {OFFSET(uart0_txd), (MODE(0) | PULLUDEN)}, /* UART0_TXD */
+ {-1},
+};
+
+/*
+ * Configure the pin mux for the module
+ */
+static void configure_module_pin_mux(struct module_pin_mux *mod_pin_mux)
+{
+ int i;
+
+ if (!mod_pin_mux)
+ return;
+
+ for (i = 0; mod_pin_mux[i].reg_offset != -1; i++)
+ MUX_CFG(mod_pin_mux[i].val, mod_pin_mux[i].reg_offset);
+}
+
+void enable_uart0_pin_mux(void)
+{
+ configure_module_pin_mux(uart0_pin_mux);
+}
diff --git a/board/ti/beagle/beagle.c b/board/ti/beagle/beagle.c
index aa5047c..9482c5e 100644
--- a/board/ti/beagle/beagle.c
+++ b/board/ti/beagle/beagle.c
@@ -127,10 +127,6 @@ int get_board_revision(void)
revision = gpio_get_value(173) << 2 |
gpio_get_value(172) << 1 |
gpio_get_value(171);
-
- gpio_free(171);
- gpio_free(172);
- gpio_free(173);
} else {
printf("Error: unable to acquire board revision GPIOs\n");
revision = -1;
@@ -522,8 +518,6 @@ int do_userbutton(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
printf("NOT pressed.\n");
}
- gpio_free(gpio);
-
return !button;
}
diff --git a/board/ti/panda/panda.c b/board/ti/panda/panda.c
index 9afed80..97320cb 100644
--- a/board/ti/panda/panda.c
+++ b/board/ti/panda/panda.c
@@ -71,9 +71,26 @@ void set_muxconf_regs_non_essential(void)
sizeof(core_padconf_array_non_essential) /
sizeof(struct pad_conf_entry));
+ if (omap_revision() < OMAP4460_ES1_0)
+ do_set_mux(CONTROL_PADCONF_CORE,
+ core_padconf_array_non_essential_4430,
+ sizeof(core_padconf_array_non_essential_4430) /
+ sizeof(struct pad_conf_entry));
+ else
+ do_set_mux(CONTROL_PADCONF_CORE,
+ core_padconf_array_non_essential_4460,
+ sizeof(core_padconf_array_non_essential_4460) /
+ sizeof(struct pad_conf_entry));
+
do_set_mux(CONTROL_PADCONF_WKUP, wkup_padconf_array_non_essential,
sizeof(wkup_padconf_array_non_essential) /
sizeof(struct pad_conf_entry));
+
+ if (omap_revision() < OMAP4460_ES1_0)
+ do_set_mux(CONTROL_PADCONF_WKUP,
+ wkup_padconf_array_non_essential_4430,
+ sizeof(wkup_padconf_array_non_essential_4430) /
+ sizeof(struct pad_conf_entry));
}
#ifdef CONFIG_GENERIC_MMC
diff --git a/board/ti/panda/panda_mux_data.h b/board/ti/panda/panda_mux_data.h
index 63448b6..83d0c3f 100644
--- a/board/ti/panda/panda_mux_data.h
+++ b/board/ti/panda/panda_mux_data.h
@@ -100,7 +100,6 @@ const struct pad_conf_entry core_padconf_array_non_essential[] = {
{USBB1_HSIC_STROBE, (IEN | OFF_EN | OFF_PD | OFF_IN | M0)}, /* usbb1_hsic_strobe */
{USBC1_ICUSB_DP, (IEN | M0)}, /* usbc1_icusb_dp */
{USBC1_ICUSB_DM, (IEN | M0)}, /* usbc1_icusb_dm */
- {ABE_MCBSP2_CLKX, (IEN | OFF_EN | OFF_PD | OFF_IN | M0)}, /* abe_mcbsp2_clkx */
{ABE_MCBSP2_DR, (IEN | OFF_EN | OFF_OUT_PTD | M0)}, /* abe_mcbsp2_dr */
{ABE_MCBSP2_DX, (OFF_EN | OFF_OUT_PTD | M0)}, /* abe_mcbsp2_dx */
{ABE_MCBSP2_FSX, (IEN | OFF_EN | OFF_PD | OFF_IN | M0)}, /* abe_mcbsp2_fsx */
@@ -202,6 +201,14 @@ const struct pad_conf_entry core_padconf_array_non_essential[] = {
{DPM_EMU19, (IEN | M5)}, /* dispc2_data0 */
};
+const struct pad_conf_entry core_padconf_array_non_essential_4430[] = {
+ {ABE_MCBSP2_CLKX, (IEN | OFF_EN | OFF_PD | OFF_IN | M0)}, /* abe_mcbsp2_clkx */
+};
+
+const struct pad_conf_entry core_padconf_array_non_essential_4460[] = {
+ {ABE_MCBSP2_CLKX, (PTU | OFF_EN | OFF_OUT_PTU | M3)}, /* led status_1 */
+};
+
const struct pad_conf_entry wkup_padconf_array_non_essential[] = {
{PAD0_SIM_IO, (IEN | M0)}, /* sim_io */
{PAD1_SIM_CLK, (M0)}, /* sim_clk */
@@ -214,7 +221,6 @@ const struct pad_conf_entry wkup_padconf_array_non_essential[] = {
{PAD0_FREF_CLK0_OUT, (M2)}, /* sys_drm_msecure */
{PAD1_FREF_CLK3_REQ, M7}, /* safe mode */
{PAD0_FREF_CLK3_OUT, (M0)}, /* fref_clk3_out */
- {PAD1_FREF_CLK4_REQ, (PTU | M3)}, /* led status_1 */
{PAD0_FREF_CLK4_OUT, (PTU | M3)}, /* led status_2 */
{PAD0_SYS_NRESPWRON, (M0)}, /* sys_nrespwron */
{PAD1_SYS_NRESWARM, (M0)}, /* sys_nreswarm */
@@ -224,4 +230,8 @@ const struct pad_conf_entry wkup_padconf_array_non_essential[] = {
{PAD1_SYS_BOOT7, (IEN | M3)}, /* gpio_wk10 */
};
+const struct pad_conf_entry wkup_padconf_array_non_essential_4430[] = {
+ {PAD1_FREF_CLK4_REQ, (PTU | M3)}, /* led status_1 */
+};
+
#endif /* _PANDA_MUX_DATA_H_ */
diff --git a/board/timll/devkit8000/devkit8000.c b/board/timll/devkit8000/devkit8000.c
index f50d113..fee0dff 100644
--- a/board/timll/devkit8000/devkit8000.c
+++ b/board/timll/devkit8000/devkit8000.c
@@ -120,7 +120,7 @@ void set_muxconf_regs(void)
MUX_DEVKIT8000();
}
-#ifdef CONFIG_GENERIC_MMC
+#if defined(CONFIG_GENERIC_MMC) && !defined(CONFIG_SPL_BUILD)
int board_mmc_init(bd_t *bis)
{
omap_mmc_init(0);
diff --git a/board/ttcontrol/vision2/vision2.c b/board/ttcontrol/vision2/vision2.c
index e496f64..d3815b2 100644
--- a/board/ttcontrol/vision2/vision2.c
+++ b/board/ttcontrol/vision2/vision2.c
@@ -34,6 +34,7 @@
#include <asm/errno.h>
#include <i2c.h>
#include <mmc.h>
+#include <pmic.h>
#include <fsl_esdhc.h>
#include <fsl_pmic.h>
#include <mc13892.h>
@@ -313,59 +314,63 @@ static void reset_peripherals(int reset)
static void power_init_mx51(void)
{
unsigned int val;
+ struct pmic *p;
+
+ pmic_init();
+ p = get_pmic();
/* Write needed to Power Gate 2 register */
- val = pmic_reg_read(REG_POWER_MISC);
+ pmic_reg_read(p, REG_POWER_MISC, &val);
/* enable VCAM with 2.775V to enable read from PMIC */
val = VCAMCONFIG | VCAMEN;
- pmic_reg_write(REG_MODE_1, val);
+ pmic_reg_write(p, REG_MODE_1, val);
/*
* Set switchers in Auto in NORMAL mode & STANDBY mode
* Setup the switcher mode for SW1 & SW2
*/
- val = pmic_reg_read(REG_SW_4);
+ pmic_reg_read(p, REG_SW_4, &val);
val = (val & ~((SWMODE_MASK << SWMODE1_SHIFT) |
(SWMODE_MASK << SWMODE2_SHIFT)));
val |= (SWMODE_AUTO_AUTO << SWMODE1_SHIFT) |
(SWMODE_AUTO_AUTO << SWMODE2_SHIFT);
- pmic_reg_write(REG_SW_4, val);
+ pmic_reg_write(p, REG_SW_4, val);
/* Setup the switcher mode for SW3 & SW4 */
- val = pmic_reg_read(REG_SW_5);
+ pmic_reg_read(p, REG_SW_5, &val);
val &= ~((SWMODE_MASK << SWMODE4_SHIFT) |
(SWMODE_MASK << SWMODE3_SHIFT));
val |= (SWMODE_AUTO_AUTO << SWMODE4_SHIFT) |
(SWMODE_AUTO_AUTO << SWMODE3_SHIFT);
- pmic_reg_write(REG_SW_5, val);
+ pmic_reg_write(p, REG_SW_5, val);
/* Set VGEN3 to 1.8V, VCAM to 3.0V */
- val = pmic_reg_read(REG_SETTING_0);
+ pmic_reg_read(p, REG_SETTING_0, &val);
val &= ~(VCAM_MASK | VGEN3_MASK);
val |= VCAM_3_0;
- pmic_reg_write(REG_SETTING_0, val);
+ pmic_reg_write(p, REG_SETTING_0, val);
/* Set VVIDEO to 2.775V, VAUDIO to 3V0, VSD to 1.8V */
- val = pmic_reg_read(REG_SETTING_1);
+ pmic_reg_read(p, REG_SETTING_1, &val);
val &= ~(VVIDEO_MASK | VSD_MASK | VAUDIO_MASK);
val |= VVIDEO_2_775 | VAUDIO_3_0 | VSD_1_8;
- pmic_reg_write(REG_SETTING_1, val);
+ pmic_reg_write(p, REG_SETTING_1, val);
/* Configure VGEN3 and VCAM regulators to use external PNP */
val = VGEN3CONFIG | VCAMCONFIG;
- pmic_reg_write(REG_MODE_1, val);
+ pmic_reg_write(p, REG_MODE_1, val);
udelay(200);
/* Enable VGEN3, VCAM, VAUDIO, VVIDEO, VSD regulators */
val = VGEN3EN | VGEN3CONFIG | VCAMEN | VCAMCONFIG |
VVIDEOEN | VAUDIOEN | VSDEN;
- pmic_reg_write(REG_MODE_1, val);
+ pmic_reg_write(p, REG_MODE_1, val);
- val = pmic_reg_read(REG_POWER_CTL2);
+ pmic_reg_read(p, REG_POWER_CTL2, &val);
val |= WDIRESET;
- pmic_reg_write(REG_POWER_CTL2, val);
+ pmic_reg_write(p, REG_POWER_CTL2, val);
udelay(2500);
diff --git a/boards.cfg b/boards.cfg
index bccb832..604becf 100644
--- a/boards.cfg
+++ b/boards.cfg
@@ -41,8 +41,7 @@ mx31ads arm arm1136 - freesca
imx31_litekit arm arm1136 - logicpd mx31
imx31_phycore arm arm1136 - - mx31
imx31_phycore_eet arm arm1136 imx31_phycore - mx31 imx31_phycore:IMX31_PHYCORE_EET
-mx31pdk_nand arm arm1136 mx31pdk freescale mx31 mx31pdk:NAND_U_BOOT
-mx31pdk arm arm1136 - freescale mx31 mx31pdk:SKIP_LOWLEVEL_INIT
+mx31pdk arm arm1136 - freescale mx31 mx31pdk:NAND_U_BOOT
mx35pdk arm arm1136 - freescale mx35
omap2420h4 arm arm1136 - ti omap24xx
tnetv107x_evm arm arm1176 tnetv107xevm ti tnetv107x
@@ -139,6 +138,7 @@ portl2 arm arm926ejs km_arm keymile
inetspace_v2 arm arm926ejs netspace_v2 LaCie kirkwood netspace_v2:INETSPACE_V2
netspace_v2 arm arm926ejs netspace_v2 LaCie kirkwood netspace_v2:NETSPACE_V2
netspace_max_v2 arm arm926ejs netspace_v2 LaCie kirkwood netspace_v2:NETSPACE_MAX_V2
+dreamplug arm arm926ejs - Marvell kirkwood
guruplug arm arm926ejs - Marvell kirkwood
mv88f6281gtw_ge arm arm926ejs - Marvell kirkwood
openrd_base arm arm926ejs openrd Marvell kirkwood openrd:BOARD_IS_OPENRD_BASE
@@ -161,6 +161,8 @@ dkb arm arm926ejs - Marvell pantheon
integratorap_cm946es arm arm946es integrator armltd - integratorap
integratorcp_cm946es arm arm946es integrator armltd - integratorcp
ca9x4_ct_vxp arm armv7 vexpress armltd
+highbank arm armv7 highbank - highbank
+am335x_evm arm armv7 am335x ti am33xx
efikamx arm armv7 efikamx - mx5 efikamx:MACH_TYPE=MACH_TYPE_MX51_EFIKAMX,IMX_CONFIG=board/efikamx/imximage_mx.cfg
efikasb arm armv7 efikamx - mx5 efikamx:MACH_TYPE=MACH_TYPE_MX51_EFIKASB,IMX_CONFIG=board/efikamx/imximage_sb.cfg
mx51evk arm armv7 mx51evk freescale mx5 mx51evk:IMX_CONFIG=board/freescale/mx51evk/imximage.cfg
diff --git a/common/Makefile b/common/Makefile
index ae795e0..1b672ad 100644
--- a/common/Makefile
+++ b/common/Makefile
@@ -187,6 +187,7 @@ COBJS-$(CONFIG_USB_KEYBOARD) += usb_kbd.o
endif
COBJS-y += console.o
+COBJS-y += dlmalloc.o
COBJS-y += memsize.o
COBJS-y += stdio.o
diff --git a/common/cmd_ide.c b/common/cmd_ide.c
index 74e6504..1fc0377 100644
--- a/common/cmd_ide.c
+++ b/common/cmd_ide.c
@@ -46,12 +46,6 @@
#include <mpc5xxx.h>
#endif
-#ifdef CONFIG_ORION5X
-#include <asm/arch/orion5x.h>
-#elif defined CONFIG_KIRKWOOD
-#include <asm/arch/kirkwood.h>
-#endif
-
#include <ide.h>
#include <ata.h>
diff --git a/common/cmd_log.c b/common/cmd_log.c
index 0e89357..249614f 100644
--- a/common/cmd_log.c
+++ b/common/cmd_log.c
@@ -68,7 +68,7 @@ static char *lbuf;
unsigned long __logbuffer_base(void)
{
- return CONFIG_SYS_SDRAM_BASE + gd->bd->bi_memsize - LOGBUFF_LEN;
+ return CONFIG_SYS_SDRAM_BASE + gd->ram_size - LOGBUFF_LEN;
}
unsigned long logbuffer_base (void) __attribute__((weak, alias("__logbuffer_base")));
diff --git a/doc/README.SPL b/doc/README.SPL
index d53ef9c..b4500fc 100644
--- a/doc/README.SPL
+++ b/doc/README.SPL
@@ -62,3 +62,4 @@ CONFIG_SPL_FAT_SUPPORT (fs/fat/libfat.o)
CONFIG_SPL_LIBGENERIC_SUPPORT (lib/libgeneric.o)
CONFIG_SPL_POWER_SUPPORT (drivers/power/libpower.o)
CONFIG_SPL_NAND_SUPPORT (drivers/mtd/nand/libnand.o)
+CONFIG_SPL_DMA_SUPPORT (drivers/dma/libdma.o)
diff --git a/doc/README.omap3 b/doc/README.omap3
index 1768cdd..2a3f46b 100644
--- a/doc/README.omap3
+++ b/doc/README.omap3
@@ -95,6 +95,7 @@ Interfaces
==========
gpio
+----
To set a bit :
@@ -122,6 +123,23 @@ To read a bit :
else
printf("GPIO N is clear\n");
+dma
+---
+void omap3_dma_init(void)
+ Init the DMA module
+int omap3_dma_get_conf_chan(uint32_t chan, struct dma4_chan *config);
+ Read config of the channel
+int omap3_dma_conf_chan(uint32_t chan, struct dma4_chan *config);
+ Write config to the channel
+int omap3_dma_conf_transfer(uint32_t chan, uint32_t *src, uint32_t *dst,
+ uint32_t sze)
+ Config source, destination and size of a transfer
+int omap3_dma_wait_for_transfer(uint32_t chan)
+ Wait for a transfer to end - this hast to be called before a channel
+ or the data the channel transferd are used.
+int omap3_dma_get_revision(uint32_t *minor, uint32_t *major)
+ Read silicon Revision of the DMA module
+
Acknowledgements
================
diff --git a/drivers/dma/Makefile b/drivers/dma/Makefile
index 9d945a0..3d9c9f1 100644
--- a/drivers/dma/Makefile
+++ b/drivers/dma/Makefile
@@ -27,6 +27,7 @@ LIB := $(obj)libdma.o
COBJS-$(CONFIG_FSLDMAFEC) += MCD_tasksInit.o MCD_dmaApi.o MCD_tasks.o
COBJS-$(CONFIG_FSL_DMA) += fsl_dma.o
+COBJS-$(CONFIG_OMAP3_DMA) += omap3_dma.o
COBJS := $(COBJS-y)
SRCS := $(COBJS:.o=.c)
diff --git a/drivers/dma/omap3_dma.c b/drivers/dma/omap3_dma.c
new file mode 100644
index 0000000..b98eca1
--- /dev/null
+++ b/drivers/dma/omap3_dma.c
@@ -0,0 +1,180 @@
+/* Copyright (C) 2011
+ * Corscience GmbH & Co. KG - Simon Schwarz <schwarz@corscience.de>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+/* This is a basic implementation of the SDMA/DMA4 controller of OMAP3
+ * Tested on Silicon Revision major:0x4 minor:0x0
+ */
+
+#include <common.h>
+#include <asm/arch/cpu.h>
+#include <asm/arch/omap3.h>
+#include <asm/arch/dma.h>
+#include <asm/io.h>
+#include <asm/errno.h>
+
+static struct dma4 *dma4_cfg = (struct dma4 *)OMAP34XX_DMA4_BASE;
+uint32_t dma_active; /* if a transfer is started the respective
+ bit is set for the logical channel */
+
+/* Check if we have the given channel
+ * PARAMETERS:
+ * chan: Channel number
+ *
+ * RETURN of non-zero means error */
+static inline int check_channel(uint32_t chan)
+{
+ if (chan < CHAN_NR_MIN || chan > CHAN_NR_MAX)
+ return -EINVAL;
+ return 0;
+}
+
+static inline void reset_irq(uint32_t chan)
+{
+ /* reset IRQ reason */
+ writel(0x1DFE, &dma4_cfg->chan[chan].csr);
+ /* reset IRQ */
+ writel((1 << chan), &dma4_cfg->irqstatus_l[0]);
+ dma_active &= ~(1 << chan);
+}
+
+/* Set Source, Destination and Size of DMA transfer for the
+ * specified channel.
+ * PARAMETERS:
+ * chan: channel to use
+ * src: source of the transfer
+ * dst: destination of the transfer
+ * sze: Size of the transfer
+ *
+ * RETURN of non-zero means error */
+int omap3_dma_conf_transfer(uint32_t chan, uint32_t *src, uint32_t *dst,
+ uint32_t sze)
+{
+ if (check_channel(chan))
+ return -EINVAL;
+ /* CDSA0 */
+ writel((uint32_t)src, &dma4_cfg->chan[chan].cssa);
+ writel((uint32_t)dst, &dma4_cfg->chan[chan].cdsa);
+ writel(sze, &dma4_cfg->chan[chan].cen);
+return 0;
+}
+
+/* Start the DMA transfer */
+int omap3_dma_start_transfer(uint32_t chan)
+{
+ uint32_t val;
+
+ if (check_channel(chan))
+ return -EINVAL;
+
+ val = readl(&dma4_cfg->chan[chan].ccr);
+ /* Test for channel already in use */
+ if (val & CCR_ENABLE_ENABLE)
+ return -EBUSY;
+
+ writel((val | CCR_ENABLE_ENABLE), &dma4_cfg->chan[chan].ccr);
+ dma_active |= (1 << chan);
+ debug("started transfer...\n");
+ return 0;
+}
+
+/* Busy-waiting for a DMA transfer
+ * This has to be called before another transfer is started
+ * PARAMETER
+ * chan: Channel to wait for
+ *
+ * RETURN of non-zero means error*/
+int omap3_dma_wait_for_transfer(uint32_t chan)
+{
+ uint32_t val;
+
+ if (!(dma_active & (1 << chan))) {
+ val = readl(&dma4_cfg->irqstatus_l[0]);
+ if (!(val & chan)) {
+ debug("dma: The channel you are trying to wait for "
+ "was never activated - ERROR\n");
+ return -1; /* channel was never active */
+ }
+ }
+
+ /* all irqs on line 0 */
+ while (!(readl(&dma4_cfg->irqstatus_l[0]) & (1 << chan)))
+ asm("nop");
+
+ val = readl(&dma4_cfg->chan[chan].csr);
+ if ((val & CSR_TRANS_ERR) | (val & CSR_SUPERVISOR_ERR) |
+ (val & CSR_MISALIGNED_ADRS_ERR)) {
+ debug("err code: %X\n", val);
+ debug("dma: transfer error detected\n");
+ reset_irq(chan);
+ return -1;
+ }
+ reset_irq(chan);
+ return 0;
+}
+
+/* Get the revision of the DMA module
+ * PARAMETER
+ * minor: Address of minor revision to write
+ * major: Address of major revision to write
+ *
+ * RETURN of non-zero means error
+ */
+int omap3_dma_get_revision(uint32_t *minor, uint32_t *major)
+{
+ uint32_t val;
+
+ /* debug information */
+ val = readl(&dma4_cfg->revision);
+ *major = (val & 0x000000F0) >> 4;
+ *minor = (val & 0x0000000F);
+ debug("DMA Silicon revision (maj/min): 0x%X/0x%X\n", *major, *minor);
+ return 0;
+}
+
+/* Initial config of omap dma
+ */
+void omap3_dma_init(void)
+{
+ dma_active = 0;
+ /* All interrupts on channel 0 */
+ writel(0xFFFFFFFF, &dma4_cfg->irqenable_l[0]);
+}
+
+/* set channel config to config
+ *
+ * RETURN of non-zero means error */
+int omap3_dma_conf_chan(uint32_t chan, struct dma4_chan *config)
+{
+ if (check_channel(chan))
+ return -EINVAL;
+
+ dma4_cfg->chan[chan] = *config;
+ return 0;
+}
+
+/* get channel config to config
+ *
+ * RETURN of non-zero means error */
+int omap3_dma_get_conf_chan(uint32_t chan, struct dma4_chan *config)
+{
+ if (check_channel(chan))
+ return -EINVAL;
+ *config = dma4_cfg->chan[chan];
+ return 0;
+}
diff --git a/drivers/gpio/kw_gpio.c b/drivers/gpio/kw_gpio.c
index 2de179e..51a826d 100644
--- a/drivers/gpio/kw_gpio.c
+++ b/drivers/gpio/kw_gpio.c
@@ -31,6 +31,7 @@
#include <common.h>
#include <asm/bitops.h>
+#include <asm/io.h>
#include <asm/arch/kirkwood.h>
#include <asm/arch/gpio.h>
diff --git a/drivers/gpio/mvmfp.c b/drivers/gpio/mvmfp.c
index e7830c6..f56c037 100644
--- a/drivers/gpio/mvmfp.c
+++ b/drivers/gpio/mvmfp.c
@@ -26,13 +26,6 @@
#include <asm/io.h>
#include <mvmfp.h>
#include <asm/arch/mfp.h>
-#ifdef CONFIG_ARMADA100
-#include <asm/arch/armada100.h>
-#elif defined(CONFIG_PANTHEON)
-#include <asm/arch/pantheon.h>
-#else
-#error Unsupported SoC...
-#endif
/*
* mfp_config
diff --git a/drivers/i2c/mxc_i2c.c b/drivers/i2c/mxc_i2c.c
index a805bf6..2869d7c 100644
--- a/drivers/i2c/mxc_i2c.c
+++ b/drivers/i2c/mxc_i2c.c
@@ -95,7 +95,7 @@ static u16 i2c_clk_div[50][2] = {
{ 3072, 0x1E }, { 3840, 0x1F }
};
-static u8 clk_idx;
+static u8 clk_div;
/*
* Calculate and set proper clock divider
@@ -105,7 +105,6 @@ static void i2c_imx_set_clk(unsigned int rate)
struct mxc_i2c_regs *i2c_regs = (struct mxc_i2c_regs *)I2C_BASE;
unsigned int i2c_clk_rate;
unsigned int div;
- int i;
#if defined(CONFIG_MX31)
struct clock_control_regs *sc_regs =
@@ -120,16 +119,15 @@ static void i2c_imx_set_clk(unsigned int rate)
i2c_clk_rate = mxc_get_clock(MXC_IPG_PERCLK);
div = (i2c_clk_rate + rate - 1) / rate;
if (div < i2c_clk_div[0][0])
- i = 0;
+ clk_div = 0;
else if (div > i2c_clk_div[ARRAY_SIZE(i2c_clk_div) - 1][0])
- i = ARRAY_SIZE(i2c_clk_div) - 1;
+ clk_div = ARRAY_SIZE(i2c_clk_div) - 1;
else
- for (i = 0; i2c_clk_div[i][0] < div; i++)
+ for (clk_div = 0; i2c_clk_div[clk_div][0] < div; clk_div++)
;
/* Store divider value */
- clk_idx = i2c_clk_div[i][1];
- writeb(clk_idx, &i2c_regs->ifdr);
+ writeb(i2c_clk_div[clk_div][1], &i2c_regs->ifdr);
}
/*
@@ -153,6 +151,23 @@ void i2c_init(int speed, int unused)
}
/*
+ * Set I2C Speed
+ */
+int i2c_set_bus_speed(unsigned int speed)
+{
+ i2c_init(speed, 0);
+ return 0;
+}
+
+/*
+ * Get I2C Speed
+ */
+unsigned int i2c_get_bus_speed(void)
+{
+ return mxc_get_clock(MXC_IPG_PERCLK) / i2c_clk_div[clk_div][0];
+}
+
+/*
* Wait for bus to be busy (or free if for_busy = 0)
*
* for_busy = 1: Wait for IBB to be asserted
@@ -218,7 +233,7 @@ int i2c_imx_start(void)
unsigned int temp = 0;
int result;
- writeb(clk_idx, &i2c_regs->ifdr);
+ writeb(i2c_clk_div[clk_div][1], &i2c_regs->ifdr);
/* Enable I2C controller */
writeb(0, &i2c_regs->i2sr);
diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile
index b152486..a709707 100644
--- a/drivers/misc/Makefile
+++ b/drivers/misc/Makefile
@@ -28,13 +28,17 @@ LIB := $(obj)libmisc.o
COBJS-$(CONFIG_ALI152X) += ali512x.o
COBJS-$(CONFIG_DS4510) += ds4510.o
COBJS-$(CONFIG_FSL_LAW) += fsl_law.o
-COBJS-$(CONFIG_FSL_PMIC) += fsl_pmic.o
COBJS-$(CONFIG_GPIO_LED) += gpio_led.o
COBJS-$(CONFIG_FSL_MC9SDZ60) += mc9sdz60.o
COBJS-$(CONFIG_NS87308) += ns87308.o
COBJS-$(CONFIG_PDSP188x) += pdsp188x.o
COBJS-$(CONFIG_STATUS_LED) += status_led.o
COBJS-$(CONFIG_TWL4030_LED) += twl4030_led.o
+COBJS-$(CONFIG_PMIC) += pmic_core.o
+COBJS-$(CONFIG_PMIC_FSL) += pmic_fsl.o
+COBJS-$(CONFIG_PMIC_I2C) += pmic_i2c.o
+COBJS-$(CONFIG_PMIC_SPI) += pmic_spi.o
+COBJS-$(CONFIG_PMIC_MAX8998) += pmic_max8998.o
COBJS := $(COBJS-y)
SRCS := $(COBJS:.o=.c)
diff --git a/drivers/misc/fsl_pmic.c b/drivers/misc/fsl_pmic.c
deleted file mode 100644
index 23255a5..0000000
--- a/drivers/misc/fsl_pmic.c
+++ /dev/null
@@ -1,235 +0,0 @@
-/*
- * (C) Copyright 2008-2009 Freescale Semiconductor, Inc.
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- */
-
-#include <config.h>
-#include <common.h>
-#include <asm/errno.h>
-#include <linux/types.h>
-#include <fsl_pmic.h>
-
-static int check_param(u32 reg, u32 write)
-{
- if (reg > 63 || write > 1) {
- printf("<reg num> = %d is invalid. Should be less then 63\n",
- reg);
- return -1;
- }
-
- return 0;
-}
-
-#ifdef CONFIG_FSL_PMIC_I2C
-#include <i2c.h>
-
-u32 pmic_reg(u32 reg, u32 val, u32 write)
-{
- unsigned char buf[4] = { 0 };
- u32 ret_val = 0;
-
- if (check_param(reg, write))
- return -1;
-
- if (write) {
- buf[0] = (val >> 16) & 0xff;
- buf[1] = (val >> 8) & 0xff;
- buf[2] = (val) & 0xff;
- if (i2c_write(CONFIG_SYS_FSL_PMIC_I2C_ADDR, reg, 1, buf, 3))
- return -1;
- } else {
- if (i2c_read(CONFIG_SYS_FSL_PMIC_I2C_ADDR, reg, 1, buf, 3))
- return -1;
- ret_val = buf[0] << 16 | buf[1] << 8 | buf[2];
- }
-
- return ret_val;
-}
-#else /* SPI interface */
-#include <spi.h>
-static struct spi_slave *slave;
-
-struct spi_slave *pmic_spi_probe(void)
-{
- return spi_setup_slave(CONFIG_FSL_PMIC_BUS,
- CONFIG_FSL_PMIC_CS,
- CONFIG_FSL_PMIC_CLK,
- CONFIG_FSL_PMIC_MODE);
-}
-
-void pmic_spi_free(struct spi_slave *slave)
-{
- if (slave)
- spi_free_slave(slave);
-}
-
-u32 pmic_reg(u32 reg, u32 val, u32 write)
-{
- u32 pmic_tx, pmic_rx;
- u32 tmp;
-
- if (!slave) {
- slave = pmic_spi_probe();
-
- if (!slave)
- return -1;
- }
-
- if (check_param(reg, write))
- return -1;
-
- if (spi_claim_bus(slave))
- return -1;
-
- pmic_tx = (write << 31) | (reg << 25) | (val & 0x00FFFFFF);
-
- tmp = cpu_to_be32(pmic_tx);
-
- if (spi_xfer(slave, 4 << 3, &tmp, &pmic_rx,
- SPI_XFER_BEGIN | SPI_XFER_END)) {
- spi_release_bus(slave);
- return -1;
- }
-
- if (write) {
- pmic_tx &= ~(1 << 31);
- tmp = cpu_to_be32(pmic_tx);
- if (spi_xfer(slave, 4 << 3, &tmp, &pmic_rx,
- SPI_XFER_BEGIN | SPI_XFER_END)) {
- spi_release_bus(slave);
- return -1;
- }
- }
-
- spi_release_bus(slave);
- return cpu_to_be32(pmic_rx);
-}
-#endif
-
-void pmic_reg_write(u32 reg, u32 value)
-{
- pmic_reg(reg, value, 1);
-}
-
-u32 pmic_reg_read(u32 reg)
-{
- return pmic_reg(reg, 0, 0);
-}
-
-void pmic_show_pmic_info(void)
-{
- u32 rev_id;
-
- rev_id = pmic_reg_read(REG_IDENTIFICATION);
- printf("PMIC ID: 0x%08x [Rev: ", rev_id);
- switch (rev_id & 0x1F) {
- case 0x1:
- puts("1.0");
- break;
- case 0x9:
- puts("1.1");
- break;
- case 0xA:
- puts("1.2");
- break;
- case 0x10:
- puts("2.0");
- break;
- case 0x11:
- puts("2.1");
- break;
- case 0x18:
- puts("3.0");
- break;
- case 0x19:
- puts("3.1");
- break;
- case 0x1A:
- puts("3.2");
- break;
- case 0x2:
- puts("3.2A");
- break;
- case 0x1B:
- puts("3.3");
- break;
- case 0x1D:
- puts("3.5");
- break;
- default:
- puts("unknown");
- break;
- }
- puts("]\n");
-}
-
-static void pmic_dump(int numregs)
-{
- u32 val;
- int i;
-
- pmic_show_pmic_info();
- for (i = 0; i < numregs; i++) {
- val = pmic_reg_read(i);
- if (!(i % 8))
- printf ("\n0x%02x: ", i);
- printf("%08x ", val);
- }
- puts("\n");
-}
-
-int do_pmic(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
-{
- char *cmd;
- int nregs;
- u32 val;
-
- /* at least two arguments please */
- if (argc < 2)
- return cmd_usage(cmdtp);
-
- cmd = argv[1];
- if (strcmp(cmd, "dump") == 0) {
- if (argc < 3)
- return cmd_usage(cmdtp);
-
- nregs = simple_strtoul(argv[2], NULL, 16);
- pmic_dump(nregs);
- return 0;
- }
- if (strcmp(cmd, "write") == 0) {
- if (argc < 4)
- return cmd_usage(cmdtp);
-
- nregs = simple_strtoul(argv[2], NULL, 16);
- val = simple_strtoul(argv[3], NULL, 16);
- pmic_reg_write(nregs, val);
- return 0;
- }
- /* No subcommand found */
- return 1;
-}
-
-U_BOOT_CMD(
- pmic, CONFIG_SYS_MAXARGS, 1, do_pmic,
- "Freescale PMIC (Atlas)",
- "dump [numregs] - dump registers\n"
- "pmic write <reg> <value> - write register"
-);
diff --git a/drivers/misc/pmic_core.c b/drivers/misc/pmic_core.c
new file mode 100644
index 0000000..5d62a56
--- /dev/null
+++ b/drivers/misc/pmic_core.c
@@ -0,0 +1,147 @@
+/*
+ * Copyright (C) 2011 Samsung Electronics
+ * Lukasz Majewski <l.majewski@samsung.com>
+ *
+ * (C) Copyright 2010
+ * Stefano Babic, DENX Software Engineering, sbabic@denx.de
+ *
+ * (C) Copyright 2008-2009 Freescale Semiconductor, Inc.
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+#include <common.h>
+#include <linux/types.h>
+#include <pmic.h>
+
+static struct pmic pmic;
+
+int check_reg(u32 reg)
+{
+ if (reg >= pmic.number_of_regs) {
+ printf("<reg num> = %d is invalid. Should be less than %d\n",
+ reg, pmic.number_of_regs);
+ return -1;
+ }
+ return 0;
+}
+
+int pmic_set_output(struct pmic *p, u32 reg, int out, int on)
+{
+ u32 val;
+
+ if (pmic_reg_read(p, reg, &val))
+ return -1;
+
+ if (on)
+ val |= out;
+ else
+ val &= ~out;
+
+ if (pmic_reg_write(p, reg, val))
+ return -1;
+
+ return 0;
+}
+
+static void pmic_show_info(struct pmic *p)
+{
+ printf("PMIC: %s\n", p->name);
+}
+
+static void pmic_dump(struct pmic *p)
+{
+ int i, ret;
+ u32 val;
+
+ pmic_show_info(p);
+ for (i = 0; i < p->number_of_regs; i++) {
+ ret = pmic_reg_read(p, i, &val);
+ if (ret)
+ puts("PMIC: Registers dump failed\n");
+
+ if (!(i % 8))
+ printf("\n0x%02x: ", i);
+
+ printf("%08x ", val);
+ }
+ puts("\n");
+}
+
+struct pmic *get_pmic(void)
+{
+ return &pmic;
+}
+
+int do_pmic(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+{
+ u32 ret, reg, val;
+ char *cmd;
+
+ struct pmic *p = &pmic;
+
+ /* at least two arguments please */
+ if (argc < 2)
+ return cmd_usage(cmdtp);
+
+ cmd = argv[1];
+ if (strcmp(cmd, "dump") == 0) {
+ pmic_dump(p);
+ return 0;
+ }
+
+ if (strcmp(cmd, "read") == 0) {
+ if (argc < 3)
+ return cmd_usage(cmdtp);
+
+ reg = simple_strtoul(argv[2], NULL, 16);
+
+ ret = pmic_reg_read(p, reg, &val);
+
+ if (ret)
+ puts("PMIC: Register read failed\n");
+
+ printf("\n0x%02x: 0x%08x\n", reg, val);
+
+ return 0;
+ }
+
+ if (strcmp(cmd, "write") == 0) {
+ if (argc < 4)
+ return cmd_usage(cmdtp);
+
+ reg = simple_strtoul(argv[2], NULL, 16);
+ val = simple_strtoul(argv[3], NULL, 16);
+
+ pmic_reg_write(p, reg, val);
+
+ return 0;
+ }
+
+ /* No subcommand found */
+ return 1;
+}
+
+U_BOOT_CMD(
+ pmic, CONFIG_SYS_MAXARGS, 1, do_pmic,
+ "PMIC",
+ "dump - dump PMIC registers\n"
+ "pmic read <reg> - read register\n"
+ "pmic write <reg> <value> - write register"
+);
diff --git a/drivers/misc/pmic_fsl.c b/drivers/misc/pmic_fsl.c
new file mode 100644
index 0000000..b6e809a
--- /dev/null
+++ b/drivers/misc/pmic_fsl.c
@@ -0,0 +1,66 @@
+/*
+ * Copyright (C) 2011 Samsung Electronics
+ * Lukasz Majewski <l.majewski@samsung.com>
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+#include <common.h>
+#include <spi.h>
+#include <pmic.h>
+#include <fsl_pmic.h>
+
+#if defined(CONFIG_PMIC_SPI)
+static u32 pmic_spi_prepare_tx(u32 reg, u32 *val, u32 write)
+{
+ if ((val == NULL) && (write))
+ return *val & ~(1 << 31);
+ else
+ return (write << 31) | (reg << 25) | (*val & 0x00FFFFFF);
+}
+#endif
+
+int pmic_init(void)
+{
+ struct pmic *p = get_pmic();
+ static const char name[] = "FSL_PMIC";
+
+ p->name = name;
+ p->number_of_regs = PMIC_NUM_OF_REGS;
+
+#if defined(CONFIG_PMIC_SPI)
+ p->interface = PMIC_SPI;
+ p->bus = CONFIG_FSL_PMIC_BUS;
+ p->hw.spi.cs = CONFIG_FSL_PMIC_CS;
+ p->hw.spi.clk = CONFIG_FSL_PMIC_CLK;
+ p->hw.spi.mode = CONFIG_FSL_PMIC_MODE;
+ p->hw.spi.bitlen = CONFIG_FSL_PMIC_BITLEN;
+ p->hw.spi.flags = SPI_XFER_BEGIN | SPI_XFER_END;
+ p->hw.spi.prepare_tx = pmic_spi_prepare_tx;
+#elif defined(CONFIG_PMIC_I2C)
+ p->interface = PMIC_I2C;
+ p->hw.i2c.addr = CONFIG_SYS_FSL_PMIC_I2C_ADDR;
+ p->hw.i2c.tx_num = 3;
+ p->bus = I2C_PMIC;
+#else
+#error "You must select CONFIG_PMIC_SPI or CONFIG_PMIC_I2C"
+#endif
+
+ return 0;
+}
diff --git a/drivers/misc/pmic_i2c.c b/drivers/misc/pmic_i2c.c
new file mode 100644
index 0000000..ad55d64
--- /dev/null
+++ b/drivers/misc/pmic_i2c.c
@@ -0,0 +1,92 @@
+/*
+ * Copyright (C) 2011 Samsung Electronics
+ * Lukasz Majewski <l.majewski@samsung.com>
+ *
+ * (C) Copyright 2010
+ * Stefano Babic, DENX Software Engineering, sbabic@denx.de
+ *
+ * (C) Copyright 2008-2009 Freescale Semiconductor, Inc.
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+#include <common.h>
+#include <linux/types.h>
+#include <pmic.h>
+#include <i2c.h>
+
+int pmic_reg_write(struct pmic *p, u32 reg, u32 val)
+{
+ unsigned char buf[4] = { 0 };
+
+ if (check_reg(reg))
+ return -1;
+
+ switch (pmic_i2c_tx_num) {
+ case 3:
+ buf[0] = (val >> 16) & 0xff;
+ buf[1] = (val >> 8) & 0xff;
+ buf[2] = val & 0xff;
+ break;
+ case 1:
+ buf[0] = val & 0xff;
+ break;
+ }
+
+ if (i2c_write(pmic_i2c_addr, reg, 1, buf, pmic_i2c_tx_num))
+ return -1;
+
+ return 0;
+}
+
+int pmic_reg_read(struct pmic *p, u32 reg, u32 *val)
+{
+ unsigned char buf[4] = { 0 };
+ u32 ret_val = 0;
+
+ if (check_reg(reg))
+ return -1;
+
+ if (i2c_read(pmic_i2c_addr, reg, 1, buf, pmic_i2c_tx_num))
+ return -1;
+
+ switch (pmic_i2c_tx_num) {
+ case 3:
+ ret_val = buf[0] << 16 | buf[1] << 8 | buf[2];
+ break;
+ case 1:
+ ret_val = buf[0];
+ break;
+ }
+ memcpy(val, &ret_val, sizeof(ret_val));
+
+ return 0;
+}
+
+int pmic_probe(struct pmic *p)
+{
+ I2C_SET_BUS(p->bus);
+ debug("PMIC:%s probed!\n", p->name);
+ if (i2c_probe(pmic_i2c_addr)) {
+ printf("Can't find PMIC:%s\n", p->name);
+ return -1;
+ }
+
+ return 0;
+}
diff --git a/drivers/misc/pmic_max8998.c b/drivers/misc/pmic_max8998.c
new file mode 100644
index 0000000..cc69fd7
--- /dev/null
+++ b/drivers/misc/pmic_max8998.c
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2011 Samsung Electronics
+ * Lukasz Majewski <l.majewski@samsung.com>
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+#include <common.h>
+#include <pmic.h>
+#include <max8998_pmic.h>
+
+int pmic_init(void)
+{
+ struct pmic *p = get_pmic();
+ static const char name[] = "MAX8998_PMIC";
+
+ puts("Board PMIC init\n");
+
+ p->name = name;
+ p->interface = PMIC_I2C;
+ p->number_of_regs = PMIC_NUM_OF_REGS;
+ p->hw.i2c.addr = MAX8998_I2C_ADDR;
+ p->hw.i2c.tx_num = 1;
+ p->bus = I2C_PMIC;
+
+ return 0;
+}
diff --git a/drivers/misc/pmic_spi.c b/drivers/misc/pmic_spi.c
new file mode 100644
index 0000000..ff35377
--- /dev/null
+++ b/drivers/misc/pmic_spi.c
@@ -0,0 +1,109 @@
+/*
+ * Copyright (C) 2011 Samsung Electronics
+ * Lukasz Majewski <l.majewski@samsung.com>
+ *
+ * (C) Copyright 2010
+ * Stefano Babic, DENX Software Engineering, sbabic@denx.de
+ *
+ * (C) Copyright 2008-2009 Freescale Semiconductor, Inc.
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+#include <common.h>
+#include <linux/types.h>
+#include <pmic.h>
+#include <spi.h>
+
+static struct spi_slave *slave;
+
+void pmic_spi_free(struct spi_slave *slave)
+{
+ if (slave)
+ spi_free_slave(slave);
+}
+
+struct spi_slave *pmic_spi_probe(struct pmic *p)
+{
+ return spi_setup_slave(p->bus,
+ p->hw.spi.cs,
+ p->hw.spi.clk,
+ p->hw.spi.mode);
+}
+
+static u32 pmic_reg(struct pmic *p, u32 reg, u32 *val, u32 write)
+{
+ u32 pmic_tx, pmic_rx;
+ u32 tmp;
+
+ if (!slave) {
+ slave = pmic_spi_probe(p);
+
+ if (!slave)
+ return -1;
+ }
+
+ if (check_reg(reg))
+ return -1;
+
+ if (spi_claim_bus(slave))
+ return -1;
+
+ pmic_tx = p->hw.spi.prepare_tx(reg, val, write);
+
+ tmp = cpu_to_be32(pmic_tx);
+
+ if (spi_xfer(slave, pmic_spi_bitlen, &tmp, &pmic_rx,
+ pmic_spi_flags)) {
+ spi_release_bus(slave);
+ return -1;
+ }
+
+ if (write) {
+ pmic_tx = p->hw.spi.prepare_tx(0, NULL, write);
+ pmic_tx &= ~(1 << 31);
+ tmp = cpu_to_be32(pmic_tx);
+ if (spi_xfer(slave, pmic_spi_bitlen, &tmp, &pmic_rx,
+ pmic_spi_flags)) {
+ spi_release_bus(slave);
+ return -1;
+ }
+ }
+
+ spi_release_bus(slave);
+ *val = cpu_to_be32(pmic_rx);
+
+ return 0;
+}
+
+int pmic_reg_write(struct pmic *p, u32 reg, u32 val)
+{
+ if (pmic_reg(p, reg, &val, 1))
+ return -1;
+
+ return 0;
+}
+
+int pmic_reg_read(struct pmic *p, u32 reg, u32 *val)
+{
+ if (pmic_reg(p, reg, val, 0))
+ return -1;
+
+ return 0;
+}
diff --git a/drivers/mmc/omap_hsmmc.c b/drivers/mmc/omap_hsmmc.c
index 5d4cf51..ebda980 100644
--- a/drivers/mmc/omap_hsmmc.c
+++ b/drivers/mmc/omap_hsmmc.c
@@ -475,12 +475,16 @@ int omap_mmc_init(int dev_index)
case 0:
mmc->priv = (hsmmc_t *)OMAP_HSMMC1_BASE;
break;
+#ifdef OMAP_HSMMC2_BASE
case 1:
mmc->priv = (hsmmc_t *)OMAP_HSMMC2_BASE;
break;
+#endif
+#ifdef OMAP_HSMMC3_BASE
case 2:
mmc->priv = (hsmmc_t *)OMAP_HSMMC3_BASE;
break;
+#endif
default:
mmc->priv = (hsmmc_t *)OMAP_HSMMC1_BASE;
return 1;
diff --git a/drivers/mmc/tegra2_mmc.c b/drivers/mmc/tegra2_mmc.c
index 8b6f829..9e741f2 100644
--- a/drivers/mmc/tegra2_mmc.c
+++ b/drivers/mmc/tegra2_mmc.c
@@ -23,36 +23,46 @@
#include <mmc.h>
#include <asm/io.h>
#include <asm/arch/clk_rst.h>
+#include <asm/arch/clock.h>
#include "tegra2_mmc.h"
/* support 4 mmc hosts */
struct mmc mmc_dev[4];
struct mmc_host mmc_host[4];
-static inline struct tegra2_mmc *tegra2_get_base_mmc(int dev_index)
+
+/**
+ * Get the host address and peripheral ID for a device. Devices are numbered
+ * from 0 to 3.
+ *
+ * @param host Structure to fill in (base, reg, mmc_id)
+ * @param dev_index Device index (0-3)
+ */
+static void tegra2_get_setup(struct mmc_host *host, int dev_index)
{
- unsigned long offset;
debug("tegra2_get_base_mmc: dev_index = %d\n", dev_index);
switch (dev_index) {
- case 0:
- offset = TEGRA2_SDMMC4_BASE;
- break;
case 1:
- offset = TEGRA2_SDMMC3_BASE;
+ host->base = TEGRA2_SDMMC3_BASE;
+ host->mmc_id = PERIPH_ID_SDMMC3;
break;
case 2:
- offset = TEGRA2_SDMMC2_BASE;
+ host->base = TEGRA2_SDMMC2_BASE;
+ host->mmc_id = PERIPH_ID_SDMMC2;
break;
case 3:
- offset = TEGRA2_SDMMC1_BASE;
+ host->base = TEGRA2_SDMMC1_BASE;
+ host->mmc_id = PERIPH_ID_SDMMC1;
break;
+ case 0:
default:
- offset = TEGRA2_SDMMC4_BASE;
+ host->base = TEGRA2_SDMMC4_BASE;
+ host->mmc_id = PERIPH_ID_SDMMC4;
break;
}
- return (struct tegra2_mmc *)(offset);
+ host->reg = (struct tegra2_mmc *)host->base;
}
static void mmc_prepare_data(struct mmc_host *host, struct mmc_data *data)
@@ -274,62 +284,24 @@ static int mmc_send_cmd(struct mmc *mmc, struct mmc_cmd *cmd,
static void mmc_change_clock(struct mmc_host *host, uint clock)
{
- int div, hw_div;
+ int div;
unsigned short clk;
unsigned long timeout;
- unsigned int reg, hostbase;
- struct clk_rst_ctlr *clkrst = (struct clk_rst_ctlr *)NV_PA_CLK_RST_BASE;
+
debug(" mmc_change_clock called\n");
- /* Change Tegra2 SDMMCx clock divisor here */
- /* Source is 216MHz, PLLP_OUT0 */
+ /*
+ * Change Tegra2 SDMMCx clock divisor here. Source is 216MHz,
+ * PLLP_OUT0
+ */
if (clock == 0)
goto out;
-
- div = 1;
- if (clock <= 400000) {
- hw_div = ((9-1)<<1); /* Best match is 375KHz */
- div = 64;
- } else if (clock <= 20000000)
- hw_div = ((11-1)<<1); /* Best match is 19.6MHz */
- else if (clock <= 26000000)
- hw_div = ((9-1)<<1); /* Use 24MHz */
- else
- hw_div = ((4-1)<<1) + 1; /* 4.5 divisor for 48MHz */
-
- debug("mmc_change_clock: hw_div = %d, card clock div = %d\n",
- hw_div, div);
-
- /* Change SDMMCx divisor */
-
- hostbase = readl(&host->base);
- debug("mmc_change_clock: hostbase = %08X\n", hostbase);
-
- if (hostbase == TEGRA2_SDMMC1_BASE) {
- reg = readl(&clkrst->crc_clk_src_sdmmc1);
- reg &= 0xFFFFFF00; /* divisor (7.1) = 00 */
- reg |= hw_div; /* n-1 */
- writel(reg, &clkrst->crc_clk_src_sdmmc1);
- } else if (hostbase == TEGRA2_SDMMC2_BASE) {
- reg = readl(&clkrst->crc_clk_src_sdmmc2);
- reg &= 0xFFFFFF00; /* divisor (7.1) = 00 */
- reg |= hw_div; /* n-1 */
- writel(reg, &clkrst->crc_clk_src_sdmmc2);
- } else if (hostbase == TEGRA2_SDMMC3_BASE) {
- reg = readl(&clkrst->crc_clk_src_sdmmc3);
- reg &= 0xFFFFFF00; /* divisor (7.1) = 00 */
- reg |= hw_div; /* n-1 */
- writel(reg, &clkrst->crc_clk_src_sdmmc3);
- } else {
- reg = readl(&clkrst->crc_clk_src_sdmmc4);
- reg &= 0xFFFFFF00; /* divisor (7.1) = 00 */
- reg |= hw_div; /* n-1 */
- writel(reg, &clkrst->crc_clk_src_sdmmc4);
- }
+ clock_adjust_periph_pll_div(host->mmc_id, CLOCK_ID_PERIPH, clock,
+ &div);
+ debug("div = %d\n", div);
writew(0, &host->reg->clkcon);
- div >>= 1;
/*
* CLKCON
* SELFREQ[15:8] : base clock divided by value
@@ -337,6 +309,7 @@ static void mmc_change_clock(struct mmc_host *host, uint clock)
* STBLINTCLK[1] : Internal Clock Stable
* ENINTCLK[0] : Internal Clock Enable
*/
+ div >>= 1;
clk = (div << 8) | (1 << 0);
writew(clk, &host->reg->clkcon);
@@ -355,7 +328,6 @@ static void mmc_change_clock(struct mmc_host *host, uint clock)
writew(clk, &host->reg->clkcon);
debug("mmc_change_clock: clkcon = %08X\n", clk);
- debug("mmc_change_clock: CLK_SOURCE_SDMMCx = %08X\n", reg);
out:
host->clock = clock;
@@ -370,7 +342,6 @@ static void mmc_set_ios(struct mmc *mmc)
debug("bus_width: %x, clock: %d\n", mmc->bus_width, mmc->clock);
/* Change clock first */
-
mmc_change_clock(host, mmc->clock);
ctrl = readb(&host->reg->hostctl);
@@ -481,7 +452,7 @@ static int tegra2_mmc_initialize(int dev_index, int bus_width)
mmc->host_caps = MMC_MODE_8BIT;
else
mmc->host_caps = MMC_MODE_4BIT;
- mmc->host_caps |= MMC_MODE_HS_52MHz | MMC_MODE_HS;
+ mmc->host_caps |= MMC_MODE_HS_52MHz | MMC_MODE_HS | MMC_MODE_HC;
/*
* min freq is for card identification, and is the highest
@@ -495,8 +466,7 @@ static int tegra2_mmc_initialize(int dev_index, int bus_width)
mmc->f_max = 48000000;
mmc_host[dev_index].clock = 0;
- mmc_host[dev_index].reg = tegra2_get_base_mmc(dev_index);
- mmc_host[dev_index].base = (unsigned int)mmc_host[dev_index].reg;
+ tegra2_get_setup(&mmc_host[dev_index], dev_index);
mmc_register(mmc);
return 0;
diff --git a/drivers/mmc/tegra2_mmc.h b/drivers/mmc/tegra2_mmc.h
index 4b80f9f..28698e0 100644
--- a/drivers/mmc/tegra2_mmc.h
+++ b/drivers/mmc/tegra2_mmc.h
@@ -73,6 +73,7 @@ struct mmc_host {
unsigned int version; /* SDHCI spec. version */
unsigned int clock; /* Current clock (MHz) */
unsigned int base; /* Base address, SDMMC1/2/3/4 */
+ enum periph_id mmc_id; /* Peripheral ID: PERIPH_ID_... */
};
int tegra2_mmc_init(int dev_index, int bus_width);
diff --git a/drivers/net/davinci_emac.c b/drivers/net/davinci_emac.c
index a8905b8..7dacb23 100644
--- a/drivers/net/davinci_emac.c
+++ b/drivers/net/davinci_emac.c
@@ -48,9 +48,9 @@ unsigned int emac_dbg = 0;
#define debug_emac(fmt,args...) if (emac_dbg) printf(fmt,##args)
#ifdef DAVINCI_EMAC_GIG_ENABLE
-#define emac_gigabit_enable() davinci_eth_gigabit_enable()
+#define emac_gigabit_enable(phy_addr) davinci_eth_gigabit_enable(phy_addr)
#else
-#define emac_gigabit_enable() /* no gigabit to enable */
+#define emac_gigabit_enable(phy_addr) /* no gigabit to enable */
#endif
static void davinci_eth_mdio_enable(void);
@@ -80,10 +80,15 @@ static int emac_rx_queue_active = 0;
/* Receive packet buffers */
static unsigned char emac_rx_buffers[EMAC_MAX_RX_BUFFERS * (EMAC_MAX_ETHERNET_PKT_SIZE + EMAC_PKT_ALIGN)];
+#define MAX_PHY 3
+
/* PHY address for a discovered PHY (0xff - not found) */
-static volatile u_int8_t active_phy_addr = 0xff;
+static u_int8_t active_phy_addr[MAX_PHY] = { 0xff, 0xff, 0xff };
+
+/* number of PHY found active */
+static u_int8_t num_phy;
-phy_t phy;
+phy_t phy[MAX_PHY];
static int davinci_eth_set_mac_addr(struct eth_device *dev)
{
@@ -147,27 +152,30 @@ static int davinci_eth_phy_detect(void)
{
u_int32_t phy_act_state;
int i;
+ int j;
+ unsigned int count = 0;
- active_phy_addr = 0xff;
+ active_phy_addr[0] = 0xff;
+ active_phy_addr[1] = 0xff;
+ active_phy_addr[2] = 0xff;
+
+ udelay(1000);
+ phy_act_state = readl(&adap_mdio->ALIVE);
- phy_act_state = readl(&adap_mdio->ALIVE) & EMAC_MDIO_PHY_MASK;
if (phy_act_state == 0)
- return(0); /* No active PHYs */
+ return 0; /* No active PHYs */
debug_emac("davinci_eth_phy_detect(), ALIVE = 0x%08x\n", phy_act_state);
- for (i = 0; i < 32; i++) {
+ for (i = 0, j = 0; i < 32; i++)
if (phy_act_state & (1 << i)) {
- if (phy_act_state & ~(1 << i))
- return(0); /* More than one PHY */
- else {
- active_phy_addr = i;
- return(1);
- }
+ count++;
+ active_phy_addr[j++] = i;
}
- }
- return(0); /* Just to make GCC happy */
+ num_phy = count;
+
+ return count;
}
@@ -236,7 +244,18 @@ static int gen_is_phy_connected(int phy_addr)
{
u_int16_t dummy;
- return(davinci_eth_phy_read(phy_addr, MII_PHYSID1, &dummy));
+ return davinci_eth_phy_read(phy_addr, MII_PHYSID1, &dummy);
+}
+
+static int get_active_phy(void)
+{
+ int i;
+
+ for (i = 0; i < num_phy; i++)
+ if (phy[i].get_link_speed(active_phy_addr[i]))
+ return i;
+
+ return -1; /* Return error if no link */
}
static int gen_get_link_speed(int phy_addr)
@@ -279,16 +298,42 @@ static int gen_get_link_speed(int phy_addr)
static int gen_auto_negotiate(int phy_addr)
{
u_int16_t tmp;
+ u_int16_t val;
+ unsigned long cntr = 0;
+
+ if (!davinci_eth_phy_read(phy_addr, MII_BMCR, &tmp))
+ return 0;
+
+ val = tmp | BMCR_FULLDPLX | BMCR_ANENABLE |
+ BMCR_SPEED100;
+ davinci_eth_phy_write(phy_addr, MII_BMCR, val);
+
+ if (!davinci_eth_phy_read(phy_addr, MII_ADVERTISE, &val))
+ return 0;
+
+ val |= (ADVERTISE_100FULL | ADVERTISE_100HALF | ADVERTISE_10FULL |
+ ADVERTISE_10HALF);
+ davinci_eth_phy_write(phy_addr, MII_ADVERTISE, val);
if (!davinci_eth_phy_read(phy_addr, MII_BMCR, &tmp))
return(0);
/* Restart Auto_negotiation */
- tmp |= BMCR_ANENABLE;
+ tmp |= BMCR_ANRESTART;
davinci_eth_phy_write(phy_addr, MII_BMCR, tmp);
/*check AutoNegotiate complete */
- udelay (10000);
+ do {
+ udelay(40000);
+ if (!davinci_eth_phy_read(phy_addr, MII_BMSR, &tmp))
+ return 0;
+
+ if (tmp & BMSR_ANEGCOMPLETE)
+ break;
+
+ cntr++;
+ } while (cntr < 200);
+
if (!davinci_eth_phy_read(phy_addr, MII_BMSR, &tmp))
return(0);
@@ -312,11 +357,11 @@ static int davinci_mii_phy_write(const char *devname, unsigned char addr, unsign
}
#endif
-static void __attribute__((unused)) davinci_eth_gigabit_enable(void)
+static void __attribute__((unused)) davinci_eth_gigabit_enable(int phy_addr)
{
u_int16_t data;
- if (davinci_eth_phy_read(EMAC_MDIO_PHY_NUM, 0, &data)) {
+ if (davinci_eth_phy_read(phy_addr, 0, &data)) {
if (data & (1 << 6)) { /* speed selection MSB */
/*
* Check if link detected is giga-bit
@@ -336,6 +381,7 @@ static int davinci_eth_open(struct eth_device *dev, bd_t *bis)
dv_reg_p addr;
u_int32_t clkdiv, cnt;
volatile emac_desc *rx_desc;
+ int index;
debug_emac("+ emac_open\n");
@@ -434,10 +480,11 @@ static int davinci_eth_open(struct eth_device *dev, bd_t *bis)
/* We need to wait for MDIO to start */
udelay(1000);
- if (!phy.get_link_speed(active_phy_addr))
+ index = get_active_phy();
+ if (index == -1)
return(0);
- emac_gigabit_enable();
+ emac_gigabit_enable(active_phy_addr[index]);
/* Start receive process */
writel((u_int32_t)emac_rx_desc, &adap_emac->RX0HDP);
@@ -533,16 +580,16 @@ static int davinci_eth_send_packet (struct eth_device *dev,
volatile void *packet, int length)
{
int ret_status = -1;
-
+ int index;
tx_send_loop = 0;
- /* Return error if no link */
- if (!phy.get_link_speed (active_phy_addr)) {
- printf ("WARN: emac_send_packet: No link\n");
+ index = get_active_phy();
+ if (index == -1) {
+ printf(" WARN: emac_send_packet: No link\n");
return (ret_status);
}
- emac_gigabit_enable();
+ emac_gigabit_enable(active_phy_addr[index]);
/* Check packet size and if < EMAC_MIN_ETHERNET_PKT_SIZE, pad it up */
if (length < EMAC_MIN_ETHERNET_PKT_SIZE) {
@@ -562,12 +609,12 @@ static int davinci_eth_send_packet (struct eth_device *dev,
/* Wait for packet to complete or link down */
while (1) {
- if (!phy.get_link_speed (active_phy_addr)) {
+ if (!phy[index].get_link_speed(active_phy_addr[index])) {
davinci_eth_ch_teardown (EMAC_CH_TX);
return (ret_status);
}
- emac_gigabit_enable();
+ emac_gigabit_enable(active_phy_addr[index]);
if (readl(&adap_emac->TXINTSTATRAW) & 0x01) {
ret_status = length;
@@ -659,6 +706,7 @@ int davinci_emac_initialize(void)
u_int32_t phy_id;
u_int16_t tmp;
int i;
+ int ret;
struct eth_device *dev;
dev = malloc(sizeof *dev);
@@ -686,7 +734,7 @@ int davinci_emac_initialize(void)
for (i = 0; i < 256; i++) {
if (readl(&adap_mdio->ALIVE))
break;
- udelay(10);
+ udelay(1000);
}
if (i >= 256) {
@@ -694,64 +742,77 @@ int davinci_emac_initialize(void)
return(0);
}
- /* Find if a PHY is connected and get it's address */
- if (!davinci_eth_phy_detect())
+ /* Find if PHY(s) is/are connected */
+ ret = davinci_eth_phy_detect();
+ if (!ret)
return(0);
+ else
+ printf(" %d ETH PHY detected\n", ret);
/* Get PHY ID and initialize phy_ops for a detected PHY */
- if (!davinci_eth_phy_read(active_phy_addr, MII_PHYSID1, &tmp)) {
- active_phy_addr = 0xff;
- return(0);
- }
+ for (i = 0; i < num_phy; i++) {
+ if (!davinci_eth_phy_read(active_phy_addr[i], MII_PHYSID1,
+ &tmp)) {
+ active_phy_addr[i] = 0xff;
+ continue;
+ }
- phy_id = (tmp << 16) & 0xffff0000;
+ phy_id = (tmp << 16) & 0xffff0000;
- if (!davinci_eth_phy_read(active_phy_addr, MII_PHYSID2, &tmp)) {
- active_phy_addr = 0xff;
- return(0);
- }
+ if (!davinci_eth_phy_read(active_phy_addr[i], MII_PHYSID2,
+ &tmp)) {
+ active_phy_addr[i] = 0xff;
+ continue;
+ }
- phy_id |= tmp & 0x0000ffff;
+ phy_id |= tmp & 0x0000ffff;
- switch (phy_id) {
- case PHY_KSZ8873:
- sprintf(phy.name, "KSZ8873 @ 0x%02x", active_phy_addr);
- phy.init = ksz8873_init_phy;
- phy.is_phy_connected = ksz8873_is_phy_connected;
- phy.get_link_speed = ksz8873_get_link_speed;
- phy.auto_negotiate = ksz8873_auto_negotiate;
- break;
+ switch (phy_id) {
+ case PHY_KSZ8873:
+ sprintf(phy[i].name, "KSZ8873 @ 0x%02x",
+ active_phy_addr[i]);
+ phy[i].init = ksz8873_init_phy;
+ phy[i].is_phy_connected = ksz8873_is_phy_connected;
+ phy[i].get_link_speed = ksz8873_get_link_speed;
+ phy[i].auto_negotiate = ksz8873_auto_negotiate;
+ break;
case PHY_LXT972:
- sprintf(phy.name, "LXT972 @ 0x%02x", active_phy_addr);
- phy.init = lxt972_init_phy;
- phy.is_phy_connected = lxt972_is_phy_connected;
- phy.get_link_speed = lxt972_get_link_speed;
- phy.auto_negotiate = lxt972_auto_negotiate;
+ sprintf(phy[i].name, "LXT972 @ 0x%02x",
+ active_phy_addr[i]);
+ phy[i].init = lxt972_init_phy;
+ phy[i].is_phy_connected = lxt972_is_phy_connected;
+ phy[i].get_link_speed = lxt972_get_link_speed;
+ phy[i].auto_negotiate = lxt972_auto_negotiate;
break;
case PHY_DP83848:
- sprintf(phy.name, "DP83848 @ 0x%02x", active_phy_addr);
- phy.init = dp83848_init_phy;
- phy.is_phy_connected = dp83848_is_phy_connected;
- phy.get_link_speed = dp83848_get_link_speed;
- phy.auto_negotiate = dp83848_auto_negotiate;
+ sprintf(phy[i].name, "DP83848 @ 0x%02x",
+ active_phy_addr[i]);
+ phy[i].init = dp83848_init_phy;
+ phy[i].is_phy_connected = dp83848_is_phy_connected;
+ phy[i].get_link_speed = dp83848_get_link_speed;
+ phy[i].auto_negotiate = dp83848_auto_negotiate;
break;
case PHY_ET1011C:
- sprintf(phy.name, "ET1011C @ 0x%02x", active_phy_addr);
- phy.init = gen_init_phy;
- phy.is_phy_connected = gen_is_phy_connected;
- phy.get_link_speed = et1011c_get_link_speed;
- phy.auto_negotiate = gen_auto_negotiate;
+ sprintf(phy[i].name, "ET1011C @ 0x%02x",
+ active_phy_addr[i]);
+ phy[i].init = gen_init_phy;
+ phy[i].is_phy_connected = gen_is_phy_connected;
+ phy[i].get_link_speed = et1011c_get_link_speed;
+ phy[i].auto_negotiate = gen_auto_negotiate;
break;
default:
- sprintf(phy.name, "GENERIC @ 0x%02x", active_phy_addr);
- phy.init = gen_init_phy;
- phy.is_phy_connected = gen_is_phy_connected;
- phy.get_link_speed = gen_get_link_speed;
- phy.auto_negotiate = gen_auto_negotiate;
- }
+ sprintf(phy[i].name, "GENERIC @ 0x%02x",
+ active_phy_addr[i]);
+ phy[i].init = gen_init_phy;
+ phy[i].is_phy_connected = gen_is_phy_connected;
+ phy[i].get_link_speed = gen_get_link_speed;
+ phy[i].auto_negotiate = gen_auto_negotiate;
+ }
- debug("Ethernet PHY: %s\n", phy.name);
+ debug("Ethernet PHY: %s\n", phy.name);
- miiphy_register(phy.name, davinci_mii_phy_read, davinci_mii_phy_write);
+ miiphy_register(phy[i].name, davinci_mii_phy_read,
+ davinci_mii_phy_write);
+ }
return(1);
}
diff --git a/drivers/net/mvgbe.c b/drivers/net/mvgbe.c
index c701f43..c7f7446 100644
--- a/drivers/net/mvgbe.c
+++ b/drivers/net/mvgbe.c
@@ -32,8 +32,10 @@
#include <net.h>
#include <malloc.h>
#include <miiphy.h>
+#include <asm/io.h>
#include <asm/errno.h>
#include <asm/types.h>
+#include <asm/system.h>
#include <asm/byteorder.h>
#if defined(CONFIG_KIRKWOOD)
diff --git a/drivers/rtc/mc13783-rtc.c b/drivers/rtc/mc13783-rtc.c
index 4e18f80..70ea8a1 100644
--- a/drivers/rtc/mc13783-rtc.c
+++ b/drivers/rtc/mc13783-rtc.c
@@ -23,24 +23,27 @@
#include <common.h>
#include <rtc.h>
#include <spi.h>
+#include <pmic.h>
#include <fsl_pmic.h>
int rtc_get(struct rtc_time *rtc)
{
u32 day1, day2, time;
int tim, i = 0;
+ struct pmic *p = get_pmic();
+ int ret;
do {
- day1 = pmic_reg_read(REG_RTC_DAY);
- if (day1 < 0)
+ ret = pmic_reg_read(p, REG_RTC_DAY, &day1);
+ if (ret < 0)
return -1;
- time = pmic_reg_read(REG_RTC_TIME);
- if (time < 0)
+ ret = pmic_reg_read(p, REG_RTC_TIME, &time);
+ if (ret < 0)
return -1;
- day2 = pmic_reg_read(REG_RTC_DAY);
- if (day2 < 0)
+ ret = pmic_reg_read(p, REG_RTC_DAY, &day2);
+ if (ret < 0)
return -1;
} while (day1 != day2 && i++ < 3);
@@ -58,14 +61,15 @@ int rtc_get(struct rtc_time *rtc)
int rtc_set(struct rtc_time *rtc)
{
u32 time, day;
+ struct pmic *p = get_pmic();
time = mktime(rtc->tm_year, rtc->tm_mon, rtc->tm_mday,
rtc->tm_hour, rtc->tm_min, rtc->tm_sec);
day = time / 86400;
time %= 86400;
- pmic_reg_write(REG_RTC_DAY, day);
- pmic_reg_write(REG_RTC_TIME, time);
+ pmic_reg_write(p, REG_RTC_DAY, day);
+ pmic_reg_write(p, REG_RTC_TIME, time);
return 0;
}
diff --git a/drivers/serial/ns16550.c b/drivers/serial/ns16550.c
index 056c25d..0c23955 100644
--- a/drivers/serial/ns16550.c
+++ b/drivers/serial/ns16550.c
@@ -37,7 +37,8 @@
void NS16550_init(NS16550_t com_port, int baud_divisor)
{
serial_out(CONFIG_SYS_NS16550_IER, &com_port->ier);
-#if defined(CONFIG_OMAP) && !defined(CONFIG_OMAP3_ZOOM2)
+#if (defined(CONFIG_OMAP) && !defined(CONFIG_OMAP3_ZOOM2)) || \
+ defined(CONFIG_AM33XX)
serial_out(0x7, &com_port->mdr1); /* mode select reset TL16C750*/
#endif
serial_out(UART_LCR_BKSE | UART_LCRVAL, (ulong)&com_port->lcr);
@@ -50,7 +51,9 @@ void NS16550_init(NS16550_t com_port, int baud_divisor)
serial_out(baud_divisor & 0xff, &com_port->dll);
serial_out((baud_divisor >> 8) & 0xff, &com_port->dlm);
serial_out(UART_LCRVAL, &com_port->lcr);
-#if defined(CONFIG_OMAP) && !defined(CONFIG_OMAP3_ZOOM2)
+#if (defined(CONFIG_OMAP) && !defined(CONFIG_OMAP3_ZOOM2)) || \
+ defined(CONFIG_AM33XX)
+
#if defined(CONFIG_APTIX)
/* /13 mode so Aptix 6MHz can hit 115200 */
serial_out(3, &com_port->mdr1);
diff --git a/drivers/serial/serial.c b/drivers/serial/serial.c
index 0d56e78..0d6ad62 100644
--- a/drivers/serial/serial.c
+++ b/drivers/serial/serial.c
@@ -28,15 +28,6 @@
#ifdef CONFIG_NS87308
#include <ns87308.h>
#endif
-#ifdef CONFIG_KIRKWOOD
-#include <asm/arch/kirkwood.h>
-#elif defined(CONFIG_ORION5X)
-#include <asm/arch/orion5x.h>
-#elif defined(CONFIG_ARMADA100)
-#include <asm/arch/armada100.h>
-#elif defined(CONFIG_PANTHEON)
-#include <asm/arch/pantheon.h>
-#endif
#if defined (CONFIG_SERIAL_MULTI)
#include <serial.h>
diff --git a/drivers/spi/Makefile b/drivers/spi/Makefile
index 96c9642..84ad6fa 100644
--- a/drivers/spi/Makefile
+++ b/drivers/spi/Makefile
@@ -27,6 +27,7 @@ LIB := $(obj)libspi.o
COBJS-$(CONFIG_ALTERA_SPI) += altera_spi.o
COBJS-$(CONFIG_ANDES_SPI) += andes_spi.o
+COBJS-$(CONFIG_ARMADA100_SPI) += armada100_spi.o
COBJS-$(CONFIG_ATMEL_DATAFLASH_SPI) += atmel_dataflash_spi.o
COBJS-$(CONFIG_ATMEL_SPI) += atmel_spi.o
COBJS-$(CONFIG_BFIN_SPI) += bfin_spi.o
diff --git a/drivers/spi/armada100_spi.c b/drivers/spi/armada100_spi.c
new file mode 100644
index 0000000..7384c9c
--- /dev/null
+++ b/drivers/spi/armada100_spi.c
@@ -0,0 +1,228 @@
+/*
+ * (C) Copyright 2011
+ * eInfochips Ltd. <www.einfochips.com>
+ * Written-by: Ajay Bhargav <ajay.bhargav@einfochips.com>
+ *
+ * (C) Copyright 2009
+ * Marvell Semiconductor <www.marvell.com>
+ * Based on SSP driver
+ * Written-by: Lei Wen <leiwen@marvell.com>
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301 USA
+ */
+
+
+#include <common.h>
+#include <malloc.h>
+#include <spi.h>
+
+#include <asm/io.h>
+#include <asm/arch/spi.h>
+#include <asm/gpio.h>
+
+#define to_armd_spi_slave(s) container_of(s, struct armd_spi_slave, slave)
+
+struct armd_spi_slave {
+ struct spi_slave slave;
+ struct ssp_reg *spi_reg;
+ u32 cr0, cr1;
+ u32 int_cr1;
+ u32 clear_sr;
+ const void *tx;
+ void *rx;
+ int gpio_cs_inverted;
+};
+
+static int spi_armd_write(struct armd_spi_slave *pss)
+{
+ int wait_timeout = SSP_FLUSH_NUM;
+ while (--wait_timeout && !(readl(&pss->spi_reg->sssr) & SSSR_TNF))
+ ;
+ if (!wait_timeout) {
+ debug("%s: timeout error\n", __func__);
+ return -1;
+ }
+
+ if (pss->tx != NULL) {
+ writel(*(u8 *)pss->tx, &pss->spi_reg->ssdr);
+ ++pss->tx;
+ } else {
+ writel(0, &pss->spi_reg->ssdr);
+ }
+ return 0;
+}
+
+static int spi_armd_read(struct armd_spi_slave *pss)
+{
+ int wait_timeout = SSP_FLUSH_NUM;
+ while (--wait_timeout && !(readl(&pss->spi_reg->sssr) & SSSR_RNE))
+ ;
+ if (!wait_timeout) {
+ debug("%s: timeout error\n", __func__);
+ return -1;
+ }
+
+ if (pss->rx != NULL) {
+ *(u8 *)pss->rx = readl(&pss->spi_reg->ssdr);
+ ++pss->rx;
+ } else {
+ readl(&pss->spi_reg->ssdr);
+ }
+ return 0;
+}
+
+static int spi_armd_flush(struct armd_spi_slave *pss)
+{
+ unsigned long limit = SSP_FLUSH_NUM;
+
+ do {
+ while (readl(&pss->spi_reg->sssr) & SSSR_RNE)
+ readl(&pss->spi_reg->ssdr);
+ } while ((readl(&pss->spi_reg->sssr) & SSSR_BSY) && limit--);
+
+ writel(SSSR_ROR, &pss->spi_reg->sssr);
+
+ return limit;
+}
+
+void spi_cs_activate(struct spi_slave *slave)
+{
+ struct armd_spi_slave *pss = to_armd_spi_slave(slave);
+
+ gpio_set_value(slave->cs, pss->gpio_cs_inverted);
+}
+
+void spi_cs_deactivate(struct spi_slave *slave)
+{
+ struct armd_spi_slave *pss = to_armd_spi_slave(slave);
+
+ gpio_set_value(slave->cs, !pss->gpio_cs_inverted);
+}
+
+struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs,
+ unsigned int max_hz, unsigned int mode)
+{
+ struct armd_spi_slave *pss;
+
+ pss = malloc(sizeof(*pss));
+ if (!pss)
+ return NULL;
+
+ pss->slave.bus = bus;
+ pss->slave.cs = cs;
+ pss->spi_reg = (struct ssp_reg *)SSP_REG_BASE(CONFIG_SYS_SSP_PORT);
+
+ pss->cr0 = SSCR0_MOTO | SSCR0_DATASIZE(DEFAULT_WORD_LEN) | SSCR0_SSE;
+
+ pss->cr1 = (SSCR1_RXTRESH(RX_THRESH_DEF) & SSCR1_RFT) |
+ (SSCR1_TXTRESH(TX_THRESH_DEF) & SSCR1_TFT);
+ pss->cr1 &= ~(SSCR1_SPO | SSCR1_SPH);
+ pss->cr1 |= (((mode & SPI_CPHA) != 0) ? SSCR1_SPH : 0)
+ | (((mode & SPI_CPOL) != 0) ? SSCR1_SPO : 0);
+
+ pss->int_cr1 = SSCR1_TIE | SSCR1_RIE | SSCR1_TINTE;
+ pss->clear_sr = SSSR_ROR | SSSR_TINT;
+
+ pss->gpio_cs_inverted = mode & SPI_CS_HIGH;
+ gpio_set_value(cs, !pss->gpio_cs_inverted);
+
+ return &pss->slave;
+}
+
+void spi_free_slave(struct spi_slave *slave)
+{
+ struct armd_spi_slave *pss = to_armd_spi_slave(slave);
+
+ free(pss);
+}
+
+int spi_claim_bus(struct spi_slave *slave)
+{
+ struct armd_spi_slave *pss = to_armd_spi_slave(slave);
+
+ debug("%s: bus:%i cs:%i\n", __func__, slave->bus, slave->cs);
+ if (spi_armd_flush(pss) == 0)
+ return -1;
+
+ return 0;
+}
+
+void spi_release_bus(struct spi_slave *slave)
+{
+}
+
+int spi_xfer(struct spi_slave *slave, unsigned int bitlen, const void *dout,
+ void *din, unsigned long flags)
+{
+ struct armd_spi_slave *pss = to_armd_spi_slave(slave);
+ uint bytes = bitlen / 8;
+ unsigned long limit;
+ int ret = 0;
+
+ if (bitlen == 0)
+ goto done;
+
+ /* we can only do 8 bit transfers */
+ if (bitlen % 8) {
+ flags |= SPI_XFER_END;
+ goto done;
+ }
+
+ if (dout)
+ pss->tx = dout;
+ else
+ pss->tx = NULL;
+
+ if (din)
+ pss->rx = din;
+ else
+ pss->rx = NULL;
+
+ if (flags & SPI_XFER_BEGIN) {
+ spi_cs_activate(slave);
+ writel(pss->cr1 | pss->int_cr1, &pss->spi_reg->sscr1);
+ writel(TIMEOUT_DEF, &pss->spi_reg->ssto);
+ writel(pss->cr0, &pss->spi_reg->sscr0);
+ }
+
+ while (bytes--) {
+ limit = SSP_FLUSH_NUM;
+ ret = spi_armd_write(pss);
+ if (ret)
+ break;
+
+ while ((readl(&pss->spi_reg->sssr) & SSSR_BSY) && limit--)
+ udelay(1);
+
+ ret = spi_armd_read(pss);
+ if (ret)
+ break;
+ }
+
+ done:
+ if (flags & SPI_XFER_END) {
+ /* Stop SSP */
+ writel(pss->clear_sr, &pss->spi_reg->sssr);
+ clrbits_le32(&pss->spi_reg->sscr1, pss->int_cr1);
+ writel(0, &pss->spi_reg->ssto);
+ spi_cs_deactivate(slave);
+ }
+
+ return ret;
+}
diff --git a/drivers/spi/kirkwood_spi.c b/drivers/spi/kirkwood_spi.c
index 135895f..dfe542d 100644
--- a/drivers/spi/kirkwood_spi.c
+++ b/drivers/spi/kirkwood_spi.c
@@ -27,6 +27,7 @@
#include <common.h>
#include <malloc.h>
#include <spi.h>
+#include <asm/io.h>
#include <asm/arch/kirkwood.h>
#include <asm/arch/spi.h>
#include <asm/arch/mpp.h>
@@ -106,6 +107,10 @@ int spi_cs_is_valid(unsigned int bus, unsigned int cs)
}
#endif
+void spi_init(void)
+{
+}
+
void spi_cs_activate(struct spi_slave *slave)
{
writel(readl(&spireg->ctrl) | KWSPI_IRQUNMASK, &spireg->ctrl);
diff --git a/drivers/usb/host/ehci-kirkwood.c b/drivers/usb/host/ehci-kirkwood.c
index 5570fc6..6300587 100644
--- a/drivers/usb/host/ehci-kirkwood.c
+++ b/drivers/usb/host/ehci-kirkwood.c
@@ -27,6 +27,7 @@
#include <usb.h>
#include "ehci.h"
#include "ehci-core.h"
+#include <asm/arch/cpu.h>
#include <asm/arch/kirkwood.h>
#define rdl(off) readl(KW_USB20_BASE + (off))
diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
new file mode 100644
index 0000000..b471c9b
--- /dev/null
+++ b/include/configs/am335x_evm.h
@@ -0,0 +1,122 @@
+/*
+ * am335x_evm.h
+ *
+ * Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation version 2.
+ *
+ * This program is distributed "as is" WITHOUT ANY WARRANTY of any
+ * kind, whether express or implied; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ */
+
+#ifndef __CONFIG_AM335X_EVM_H
+#define __CONFIG_AM335X_EVM_H
+
+#define CONFIG_AM335X
+#define CONFIG_CMD_MEMORY /* for mtest */
+#undef CONFIG_GZIP
+#undef CONFIG_ZLIB
+#undef CONFIG_SYS_HUSH_PARSER
+#undef CONFIG_CMD_NET
+
+#include <asm/arch/cpu.h>
+#include <asm/arch/hardware.h>
+
+#define CONFIG_SETUP_PLL
+#define CONFIG_AM335X_CONFIG_DDR
+#define CONFIG_ENV_SIZE 0x400
+#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (8 * 1024))
+#define CONFIG_SYS_PROMPT "AM335X# "
+#define CONFIG_SYS_NO_FLASH
+#define CONFIG_MACH_TYPE MACH_TYPE_TIAM335EVM
+
+#define CONFIG_CMD_ASKENV
+#define CONFIG_VERSION_VARIABLE
+
+/* set to negative value for no autoboot */
+#define CONFIG_BOOTDELAY 3
+#define CONFIG_SYS_AUTOLOAD "no"
+#define CONFIG_BOOTFILE "uImage"
+#define CONFIG_EXTRA_ENV_SETTINGS \
+ "verify=yes\0" \
+ "ramdisk_file=ramdisk.gz\0" \
+
+/* Clock Defines */
+#define V_OSCK 24000000 /* Clock output from T2 */
+#define V_SCLK (V_OSCK >> 1)
+
+#define CONFIG_SYS_GBL_DATA_SIZE 128 /* size in bytes reserved for
+ initial data */
+#define CONFIG_CMD_ECHO
+
+/* max number of command args */
+#define CONFIG_SYS_MAXARGS 32
+
+/* Console I/O Buffer Size */
+#define CONFIG_SYS_CBSIZE 512
+
+/* Print Buffer Size */
+#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE \
+ + sizeof(CONFIG_SYS_PROMPT) + 16)
+
+/* Boot Argument Buffer Size */
+#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
+
+/*
+ * memtest works on 8 MB in DRAM after skipping 32MB from
+ * start addr of ram disk
+ */
+#define CONFIG_SYS_MEMTEST_START (PHYS_DRAM_1 + (64 * 1024 * 1024))
+#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START \
+ + (8 * 1024 * 1024))
+
+#undef CONFIG_SYS_CLKS_IN_HZ /* everything, incl board info, in Hz */
+#define CONFIG_SYS_LOAD_ADDR 0x81000000 /* Default load address */
+#define CONFIG_SYS_HZ 1000 /* 1ms clock */
+
+ /* Physical Memory Map */
+#define CONFIG_NR_DRAM_BANKS 1 /* 1 bank of DRAM */
+#define PHYS_DRAM_1 0x80000000 /* DRAM Bank #1 */
+#define PHYS_DRAM_1_SIZE 0x10000000 /*(0x80000000 / 8) 256 MB */
+#define CONFIG_MAX_RAM_BANK_SIZE (1024 << 20) /* 1GB */
+
+#define CONFIG_SYS_SDRAM_BASE PHYS_DRAM_1
+#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + 0x1000 - \
+ GENERATED_GBL_DATA_SIZE)
+ /* Platform/Board specific defs */
+#define CONFIG_SYS_CLK_FREQ 24000000
+#define CONFIG_SYS_TIMERBASE 0x48040000 /* Use Timer2 */
+#define CONFIG_SYS_PTV 2 /* Divisor: 2^(PTV+1) => 8 */
+#define CONFIG_SYS_HZ 1000
+
+/* NS16550 Configuration */
+#define CONFIG_SYS_NS16550
+#define CONFIG_SYS_NS16550_SERIAL
+#define CONFIG_SYS_NS16550_REG_SIZE (-4)
+#define CONFIG_SYS_NS16550_CLK (48000000)
+#define CONFIG_SYS_NS16550_COM1 0x44e09000 /* Base EVM has UART0 */
+#define CONFIG_SYS_NS16550_COM4 0x481A6000 /* UART3 on IA BOard */
+
+#define CONFIG_BAUDRATE 115200
+#define CONFIG_SYS_BAUDRATE_TABLE { 110, 300, 600, 1200, 2400, \
+4800, 9600, 14400, 19200, 28800, 38400, 56000, 57600, 115200 }
+
+/*
+ * select serial console configuration
+ */
+#define CONFIG_SERIAL1 1
+#define CONFIG_CONS_INDEX 1
+#define CONFIG_SYS_CONSOLE_INFO_QUIET
+
+#define CONFIG_ENV_IS_NOWHERE
+
+#define CONFIG_SYS_TEXT_BASE 0x402f0400
+
+/* Unsupported features */
+#undef CONFIG_USE_IRQ
+
+#endif /* ! __CONFIG_AM335X_EVM_H */
diff --git a/include/configs/da830evm.h b/include/configs/da830evm.h
index c522af9..6ac25d2 100644
--- a/include/configs/da830evm.h
+++ b/include/configs/da830evm.h
@@ -87,7 +87,6 @@
* Network & Ethernet Configuration
*/
#ifdef CONFIG_DRIVER_TI_EMAC
-#define CONFIG_EMAC_MDIO_PHY_NUM 1
#define CONFIG_MII
#define CONFIG_BOOTP_DEFAULT
#define CONFIG_BOOTP_DNS
@@ -105,8 +104,10 @@
#define CONFIG_SYS_NO_FLASH
#define CONFIG_ENV_IS_IN_NAND /* U-Boot env in NAND Flash */
#define CONFIG_ENV_OFFSET (512 << 10)
-#define CONFIG_ENV_SIZE (512 << 10)
+#define CONFIG_ENV_SIZE (10 << 10) /* 10KB */
+#define CONFIG_SYS_NAND_USE_FLASH_BBT
#define CONFIG_SYS_NAND_4BIT_HW_ECC_OOBFIRST
+#define CONFIG_SYS_NAND_PAGE_2K
#define CONFIG_SYS_NAND_CS 3
#define CONFIG_SYS_NAND_BASE DAVINCI_ASYNC_EMIF_DATA_CE3_BASE
#define CONFIG_SYS_NAND_PAGE_2K
diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h
index cad5620..4c14370 100644
--- a/include/configs/da850evm.h
+++ b/include/configs/da850evm.h
@@ -121,7 +121,6 @@
* Network & Ethernet Configuration
*/
#ifdef CONFIG_DRIVER_TI_EMAC
-#define CONFIG_EMAC_MDIO_PHY_NUM 0
#define CONFIG_MII
#define CONFIG_BOOTP_DEFAULT
#define CONFIG_BOOTP_DNS
@@ -160,6 +159,7 @@
* U-Boot general configuration
*/
#define CONFIG_MISC_INIT_R
+#define CONFIG_BOARD_EARLY_INIT_F
#define CONFIG_BOOTFILE "uImage" /* Boot file name */
#define CONFIG_SYS_PROMPT "U-Boot > " /* Command Prompt */
#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */
diff --git a/include/configs/davinci_dm365evm.h b/include/configs/davinci_dm365evm.h
index 323c0b4..cb6ed24 100644
--- a/include/configs/davinci_dm365evm.h
+++ b/include/configs/davinci_dm365evm.h
@@ -33,9 +33,6 @@
#define CONFIG_SYS_HZ_CLOCK 24000000 /* timer0 freq */
#define CONFIG_SYS_HZ 1000
#define CONFIG_SOC_DM365
-#define CONFIG_SYS_ICACHE_OFF
-#define CONFIG_SYS_DCACHE_OFF
-#define CONFIG_SYS_L2CACHE_OFF
/* Memory Info */
#define CONFIG_NR_DRAM_BANKS 1
@@ -60,7 +57,6 @@
/* Network Configuration */
#define CONFIG_DRIVER_TI_EMAC
-#define CONFIG_EMAC_MDIO_PHY_NUM 0
#define CONFIG_MII
#define CONFIG_BOOTP_DEFAULT
#define CONFIG_BOOTP_DNS
diff --git a/include/configs/davinci_dm6467evm.h b/include/configs/davinci_dm6467evm.h
index d97c0f3..ec1c31c 100644
--- a/include/configs/davinci_dm6467evm.h
+++ b/include/configs/davinci_dm6467evm.h
@@ -84,7 +84,6 @@ extern unsigned int davinci_arm_clk_get(void);
/* Network & Ethernet Configuration */
#define CONFIG_DRIVER_TI_EMAC
-#define CONFIG_EMAC_MDIO_PHY_NUM 1
#define CONFIG_MII
#define CONFIG_BOOTP_DEFAULT
#define CONFIG_BOOTP_DNS
diff --git a/include/configs/davinci_dvevm.h b/include/configs/davinci_dvevm.h
index 88c6bee..c052517 100644
--- a/include/configs/davinci_dvevm.h
+++ b/include/configs/davinci_dvevm.h
@@ -60,9 +60,6 @@
#define CONFIG_SYS_HZ_CLOCK 27000000 /* Timer Input clock freq */
#define CONFIG_SYS_HZ 1000
#define CONFIG_SOC_DM644X
-#define CONFIG_SYS_ICACHE_OFF
-#define CONFIG_SYS_DCACHE_OFF
-#define CONFIG_SYS_L2CACHE_OFF
/*====================================================*/
/* EEPROM definitions for Atmel 24C256BN SEEPROM chip */
/* on Sonata/DV_EVM board. No EEPROM on schmoogie. */
@@ -105,7 +102,6 @@
/* Network & Ethernet Configuration */
/*==================================*/
#define CONFIG_DRIVER_TI_EMAC
-#define CONFIG_EMAC_MDIO_PHY_NUM 1
#define CONFIG_MII
#define CONFIG_BOOTP_DEFAULT
#define CONFIG_BOOTP_DNS
diff --git a/include/configs/davinci_schmoogie.h b/include/configs/davinci_schmoogie.h
index b6f61ee..5eaa198 100644
--- a/include/configs/davinci_schmoogie.h
+++ b/include/configs/davinci_schmoogie.h
@@ -68,7 +68,6 @@
/* Network & Ethernet Configuration */
/*==================================*/
#define CONFIG_DRIVER_TI_EMAC
-#define CONFIG_EMAC_MDIO_PHY_NUM 1
#define CONFIG_MII
#define CONFIG_BOOTP_DEFAULT
#define CONFIG_BOOTP_DNS
diff --git a/include/configs/davinci_sffsdr.h b/include/configs/davinci_sffsdr.h
index ce27212..0c65391 100644
--- a/include/configs/davinci_sffsdr.h
+++ b/include/configs/davinci_sffsdr.h
@@ -65,7 +65,6 @@
#define CONFIG_SYS_I2C_SLAVE 10 /* Bogus, master-only in U-Boot */
/* Network & Ethernet Configuration */
#define CONFIG_DRIVER_TI_EMAC
-#define CONFIG_EMAC_MDIO_PHY_NUM 1
#define CONFIG_MII
#define CONFIG_BOOTP_DEFAULT
#define CONFIG_BOOTP_DNS
diff --git a/include/configs/davinci_sonata.h b/include/configs/davinci_sonata.h
index 163f1a2..74530e8 100644
--- a/include/configs/davinci_sonata.h
+++ b/include/configs/davinci_sonata.h
@@ -101,7 +101,6 @@
/* Network & Ethernet Configuration */
/*==================================*/
#define CONFIG_DRIVER_TI_EMAC
-#define CONFIG_EMAC_MDIO_PHY_NUM 1
#define CONFIG_MII
#define CONFIG_BOOTP_DEFAULT
#define CONFIG_BOOTP_DNS
diff --git a/include/configs/devkit8000.h b/include/configs/devkit8000.h
index ba0d23e..6c51a27 100644
--- a/include/configs/devkit8000.h
+++ b/include/configs/devkit8000.h
@@ -322,7 +322,12 @@
#define CONFIG_SPL_SERIAL_SUPPORT
#define CONFIG_SPL_POWER_SUPPORT
#define CONFIG_SPL_NAND_SUPPORT
+#define CONFIG_SPL_MMC_SUPPORT
+#define CONFIG_SPL_FAT_SUPPORT
#define CONFIG_SPL_LDSCRIPT "$(CPUDIR)/omap-common/u-boot-spl.lds"
+#define CONFIG_SPL_FAT_LOAD_PAYLOAD_NAME "u-boot.img"
+#define CONFIG_SYS_MMC_SD_FAT_BOOT_PARTITION 1
+#define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR 0x300 /* address 0x60000 */
#define CONFIG_SPL_TEXT_BASE 0x40200000 /*CONFIG_SYS_SRAM_START*/
#define CONFIG_SPL_MAX_SIZE 0xB400 /* 45 K */
@@ -353,4 +358,7 @@
#define CONFIG_SYS_NAND_U_BOOT_OFFS 0x80000
#define CONFIG_SYS_NAND_U_BOOT_SIZE 0x200000
+#define CONFIG_SYS_SPL_MALLOC_START 0x80108000
+#define CONFIG_SYS_SPL_MALLOC_SIZE 0x100000 /* 1 MB */
+
#endif /* __CONFIG_H */
diff --git a/include/configs/dkb.h b/include/configs/dkb.h
index 3d27c58..fb02d92 100644
--- a/include/configs/dkb.h
+++ b/include/configs/dkb.h
@@ -47,6 +47,7 @@
#define CONFIG_SYS_NO_FLASH /* Declare no flash (NOR/SPI) */
#include <config_cmd_default.h>
#define CONFIG_CMD_I2C
+#define CONFIG_CMD_MMC
#undef CONFIG_CMD_NET
#undef CONFIG_CMD_NFS
/*
diff --git a/include/configs/dreamplug.h b/include/configs/dreamplug.h
new file mode 100644
index 0000000..0f2f9a2
--- /dev/null
+++ b/include/configs/dreamplug.h
@@ -0,0 +1,151 @@
+/*
+ * (C) Copyright 2011
+ * Jason Cooper <u-boot@lakedaemon.net>
+ *
+ * Based on work by:
+ * Marvell Semiconductor <www.marvell.com>
+ * Written-by: Siddarth Gore <gores@marvell.com>
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301 USA
+ */
+
+#ifndef _CONFIG_DREAMPLUG_H
+#define _CONFIG_DREAMPLUG_H
+
+/*
+ * FIXME: This belongs in mach-types.h. However, we only pull mach-types
+ * from Linus' kernel.org tree. This hasn't been updated primarily due to
+ * the recent arch/arm reshuffling. So, in the meantime, we'll place it
+ * here.
+ */
+#include <asm/mach-types.h>
+#ifdef MACH_TYPE_DREAMPLUG
+#error "MACH_TYPE_DREAMPLUG has been defined properly, please remove this."
+#else
+#define MACH_TYPE_DREAMPLUG 3550
+#endif
+
+/*
+ * Version number information
+ */
+#define CONFIG_IDENT_STRING "\nMarvell-DreamPlug"
+
+/*
+ * High Level Configuration Options (easy to change)
+ */
+#define CONFIG_SHEEVA_88SV131 1 /* CPU Core subversion */
+#define CONFIG_KIRKWOOD 1 /* SOC Family Name */
+#define CONFIG_KW88F6281 1 /* SOC Name */
+#define CONFIG_MACH_TYPE MACH_TYPE_DREAMPLUG
+#define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */
+
+/*
+ * Commands configuration
+ */
+#define CONFIG_SYS_NO_FLASH /* Declare no flash (NOR/SPI) */
+#include <config_cmd_default.h>
+#define CONFIG_CMD_DHCP
+#define CONFIG_CMD_ENV
+#define CONFIG_CMD_FAT
+#define CONFIG_CMD_SF
+#define CONFIG_CMD_PING
+#define CONFIG_CMD_USB
+#define CONFIG_CMD_IDE
+#define CONFIG_CMD_DATE
+
+/*
+ * mv-common.h should be defined after CMD configs since it used them
+ * to enable certain macros
+ */
+#include "mv-common.h"
+
+/*
+ * Environment variables configurations
+ */
+#ifdef CONFIG_SPI_FLASH
+#define CONFIG_ENV_IS_IN_SPI_FLASH 1
+#define CONFIG_ENV_SECT_SIZE 0x10000 /* 64k */
+#else
+#define CONFIG_ENV_IS_NOWHERE 1 /* if env in SDRAM */
+#endif
+
+#ifdef CONFIG_CMD_SF
+#define CONFIG_SPI_FLASH 1
+#define CONFIG_HARD_SPI 1
+#define CONFIG_KIRKWOOD_SPI 1
+#define CONFIG_SPI_FLASH_MACRONIX 1
+#define CONFIG_ENV_SPI_BUS 0
+#define CONFIG_ENV_SPI_CS 0
+#define CONFIG_ENV_SPI_MAX_HZ 50000000 /* 50 MHz */
+#endif
+
+/*
+ * max 4k env size is enough, but in case of nand
+ * it has to be rounded to sector size
+ */
+#define CONFIG_ENV_SIZE 0x1000 /* 4k */
+#define CONFIG_ENV_ADDR 0x100000
+#define CONFIG_ENV_OFFSET 0x100000 /* env starts here */
+
+/*
+ * Default environment variables
+ */
+#define CONFIG_BOOTCOMMAND "setenv ethact egiga0; " \
+ "${x_bootcmd_ethernet}; setenv ethact egiga1; " \
+ "${x_bootcmd_ethernet}; ${x_bootcmd_usb}; ${x_bootcmd_kernel}; "\
+ "setenv bootargs ${x_bootargs} ${x_bootargs_root}; " \
+ "bootm 0x6400000;"
+
+#define CONFIG_EXTRA_ENV_SETTINGS \
+ "x_bootcmd_ethernet=ping 192.168.2.1\0" \
+ "x_bootcmd_usb=usb start\0" \
+ "x_bootcmd_kernel=fatload usb 0 0x6400000 uImage\0" \
+ "x_bootargs=console=ttyS0,115200\0" \
+ "x_bootargs_root=root=/dev/sda2 rootdelay=10\0"
+
+/*
+ * Ethernet Driver configuration
+ */
+#ifdef CONFIG_CMD_NET
+#define CONFIG_MVGBE_PORTS {1, 1} /* enable both ports */
+#define CONFIG_PHY_BASE_ADR 0
+#endif /* CONFIG_CMD_NET */
+
+/*
+ * SATA Driver configuration
+ */
+#ifdef CONFIG_MVSATA_IDE
+#define CONFIG_SYS_ATA_IDE0_OFFSET MV_SATA_PORT0_OFFSET
+#endif /*CONFIG_MVSATA_IDE*/
+
+/*
+ * RTC driver configuration
+ */
+#ifdef CONFIG_CMD_DATE
+#define CONFIG_RTC_MV
+#endif /* CONFIG_CMD_DATE */
+
+#define CONFIG_SYS_ALT_MEMTEST
+
+/*
+ * display enhanced info about the cpu at boot.
+ */
+#define CONFIG_DISPLAY_CPUINFO
+
+#endif /* _CONFIG_DREAMPLUG_H */
diff --git a/include/configs/ea20.h b/include/configs/ea20.h
index a2e3178..201e6b5 100644
--- a/include/configs/ea20.h
+++ b/include/configs/ea20.h
@@ -86,7 +86,6 @@
* Network & Ethernet Configuration
*/
#ifdef CONFIG_DRIVER_TI_EMAC
-#define CONFIG_EMAC_MDIO_PHY_NUM 0
#define CONFIG_MII
#define CONFIG_BOOTP_DEFAULT
#define CONFIG_BOOTP_DNS
diff --git a/include/configs/edminiv2.h b/include/configs/edminiv2.h
index f8affa8..88d32b2 100644
--- a/include/configs/edminiv2.h
+++ b/include/configs/edminiv2.h
@@ -45,6 +45,7 @@
#define CONFIG_88F5182 1 /* SOC Name */
#define CONFIG_MACH_EDMINIV2 1 /* Machine type */
+#include <asm/arch/orion5x.h>
/*
* CLKs configurations
*/
diff --git a/include/configs/efikamx.h b/include/configs/efikamx.h
index ce96b78..b507786 100644
--- a/include/configs/efikamx.h
+++ b/include/configs/efikamx.h
@@ -124,11 +124,14 @@
#endif
/* SPI PMIC */
-#define CONFIG_FSL_PMIC
+#define CONFIG_PMIC
+#define CONFIG_PMIC_SPI
+#define CONFIG_PMIC_FSL
#define CONFIG_FSL_PMIC_BUS 0
#define CONFIG_FSL_PMIC_CS (0 | 120 << 8)
#define CONFIG_FSL_PMIC_CLK 25000000
#define CONFIG_FSL_PMIC_MODE (SPI_MODE_0 | SPI_CS_HIGH)
+#define CONFIG_FSL_PMIC_BITLEN 32
#define CONFIG_RTC_MC13783
#endif
diff --git a/include/configs/gplugd.h b/include/configs/gplugd.h
index a9f3b3b..24bf767 100644
--- a/include/configs/gplugd.h
+++ b/include/configs/gplugd.h
@@ -90,6 +90,15 @@
/* GPIO Configuration for PHY */
#define CONFIG_SYS_GPIO_PHY_RST 104 /* GPIO104 */
+/* SPI Support */
+#define CONFIG_ARMADA100_SPI
+#define CONFIG_ENV_SPI_CS 110
+#define CONFIG_SYS_SSP_PORT 2
+
+/* Flash Support */
+#define CONFIG_CMD_SF
+#define CONFIG_SPI_FLASH_ATMEL
+
/*
* mv-common.h should be defined after CMD configs since it used them
* to enable certain macros
@@ -106,7 +115,13 @@
/*
* Environment variables configurations
*/
-#define CONFIG_ENV_IS_NOWHERE 1 /* if env in SDRAM */
-#define CONFIG_ENV_SIZE 0x20000 /* 64k */
+#define CONFIG_ENV_IS_IN_SPI_FLASH
+#define CONFIG_ENV_SECT_SIZE 0x4000
+#define CONFIG_ENV_SIZE 0x4000
+#define CONFIG_ENV_OFFSET 0x07C000
+
+#define CONFIG_CMD_ASKENV
+#define CONFIG_CMD_EDITENV
+#define CONFIG_CMD_SAVEENV
#endif /* __CONFIG_GPLUGD_H */
diff --git a/include/configs/hawkboard.h b/include/configs/hawkboard.h
index 5f88d96..638643a 100644
--- a/include/configs/hawkboard.h
+++ b/include/configs/hawkboard.h
@@ -83,7 +83,6 @@
/*
* Network & Ethernet Configuration
*/
-#define CONFIG_EMAC_MDIO_PHY_NUM 0x7
#if !defined(CONFIG_NAND_SPL)
#define CONFIG_DRIVER_TI_EMAC
#endif
diff --git a/include/configs/highbank.h b/include/configs/highbank.h
new file mode 100644
index 0000000..9c85788
--- /dev/null
+++ b/include/configs/highbank.h
@@ -0,0 +1,113 @@
+/*
+ * Copyright 2010-2011 Calxeda, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __CONFIG_H
+#define __CONFIG_H
+
+#define CONFIG_L2_OFF
+
+#define CONFIG_SYS_NO_FLASH
+#define CFG_HZ 1000
+#define CONFIG_SYS_HZ CFG_HZ
+
+#define CONFIG_OF_LIBFDT
+#define CONFIG_FIT
+#define CONFIG_SYS_BOOTMAPSZ (16 << 20)
+
+/*
+ * Size of malloc() pool
+ */
+#define CONFIG_SYS_MALLOC_LEN (512 * 1024)
+
+#define CONFIG_PL011_SERIAL
+#define CONFIG_PL011_CLOCK 150000000
+#define CONFIG_PL01x_PORTS { (void *)(0xFFF36000) }
+#define CONFIG_CONS_INDEX 0
+
+#define CONFIG_BAUDRATE 38400
+#define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 }
+
+#define CONFIG_MISC_INIT_R
+#define CONFIG_SCSI_AHCI
+#define CONFIG_SCSI_AHCI_PLAT
+#define CONFIG_SYS_SCSI_MAX_SCSI_ID 5
+#define CONFIG_SYS_SCSI_MAX_LUN 1
+#define CONFIG_SYS_SCSI_MAX_DEVICE (CONFIG_SYS_SCSI_MAX_SCSI_ID * \
+ CONFIG_SYS_SCSI_MAX_LUN)
+
+#define CONFIG_DOS_PARTITION
+
+/*
+ * Command line configuration.
+ */
+#include <config_cmd_default.h>
+#undef CONFIG_CMD_NET
+#undef CONFIG_CMD_NFS
+
+#define CONFIG_CMD_BDI
+#define CONFIG_CMD_ELF
+#define CONFIG_CMD_MEMORY
+#define CONFIG_CMD_LOADS
+#define CONFIG_CMD_SCSI
+#define CONFIG_CMD_EXT2
+
+#define CONFIG_BOOTDELAY 2
+/*
+ * Miscellaneous configurable options
+ */
+#define CONFIG_CMDLINE_EDITING
+#define CONFIG_AUTO_COMPLETE
+#define CONFIG_SYS_LONGHELP /* undef to save memory */
+#define CONFIG_SYS_CBSIZE 256 /* Console I/O Buffer Size */
+#define CONFIG_SYS_MAXARGS 16 /* max number of cmd args */
+#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
+#define CONFIG_SYS_PROMPT "Highbank #"
+/* Print Buffer Size */
+#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \
+ sizeof(CONFIG_SYS_PROMPT)+16)
+
+#define CONFIG_SYS_LOAD_ADDR 0x800000
+
+/*-----------------------------------------------------------------------
+ * Stack sizes
+ *
+ * The stack sizes are set up in start.S using the settings below
+ */
+#define CONFIG_STACKSIZE (128*1024) /* regular stack */
+#ifdef CONFIG_USE_IRQ
+#define CONFIG_STACKSIZE_IRQ (4*1024) /* IRQ stack */
+#define CONFIG_STACKSIZE_FIQ (4*1024) /* FIQ stack */
+#endif
+
+/*-----------------------------------------------------------------------
+ * Physical Memory Map
+ */
+#define CONFIG_NR_DRAM_BANKS 1
+#define PHYS_SDRAM_1_SIZE (4089 << 20)
+#define CONFIG_SYS_MEMTEST_START 0x100000
+#define CONFIG_SYS_MEMTEST_END (PHYS_SDRAM_1_SIZE - 0x100000)
+
+/* Room required on the stack for the environment data */
+#define CONFIG_ENV_SIZE 0x2000
+#define CONFIG_ENV_IS_NOWHERE
+
+#define CONFIG_SYS_SDRAM_BASE 0x00000000
+#define CONFIG_SYS_TEXT_BASE 0x00001000
+#define CONFIG_SYS_INIT_SP_ADDR 0x01000000
+#define CONFIG_SKIP_LOWLEVEL_INIT
+
+#endif
diff --git a/include/configs/imx31_litekit.h b/include/configs/imx31_litekit.h
index 31f0513..89e71c0 100644
--- a/include/configs/imx31_litekit.h
+++ b/include/configs/imx31_litekit.h
@@ -72,13 +72,16 @@
#define CONFIG_DEFAULT_SPI_BUS 1
#define CONFIG_DEFAULT_SPI_MODE (SPI_MODE_0 | SPI_CS_HIGH)
-#define CONFIG_FSL_PMIC
+/* PMIC Controller */
+#define CONFIG_PMIC
+#define CONFIG_PMIC_SPI
+#define CONFIG_PMIC_FSL
#define CONFIG_FSL_PMIC_BUS 1
#define CONFIG_FSL_PMIC_CS 0
#define CONFIG_FSL_PMIC_CLK 1000000
#define CONFIG_FSL_PMIC_MODE (SPI_MODE_0 | SPI_CS_HIGH)
-
-#define CONFIG_RTC_MC13783 1
+#define CONFIG_FSL_PMIC_BITLEN 32
+#define CONFIG_RTC_MC13783
/* allow to overwrite serial and ethaddr */
#define CONFIG_ENV_OVERWRITE
diff --git a/include/configs/mx31ads.h b/include/configs/mx31ads.h
index 457a24a..c9d80ef 100644
--- a/include/configs/mx31ads.h
+++ b/include/configs/mx31ads.h
@@ -69,12 +69,16 @@
#define CONFIG_DEFAULT_SPI_MODE (SPI_MODE_0 | SPI_CS_HIGH)
#define CONFIG_MXC_GPIO
-#define CONFIG_FSL_PMIC
+/* PMIC Controller */
+#define CONFIG_PMIC
+#define CONFIG_PMIC_SPI
+#define CONFIG_PMIC_FSL
#define CONFIG_FSL_PMIC_BUS 1
#define CONFIG_FSL_PMIC_CS 0
#define CONFIG_FSL_PMIC_CLK 1000000
#define CONFIG_FSL_PMIC_MODE (SPI_MODE_0 | SPI_CS_HIGH)
-#define CONFIG_RTC_MC13783 1
+#define CONFIG_FSL_PMIC_BITLEN 32
+#define CONFIG_RTC_MC13783
/* allow to overwrite serial and ethaddr */
#define CONFIG_ENV_OVERWRITE
diff --git a/include/configs/mx31pdk.h b/include/configs/mx31pdk.h
index 044b766..2e5cde5 100644
--- a/include/configs/mx31pdk.h
+++ b/include/configs/mx31pdk.h
@@ -70,11 +70,15 @@
#define CONFIG_DEFAULT_SPI_BUS 1
#define CONFIG_DEFAULT_SPI_MODE (SPI_MODE_0 | SPI_CS_HIGH)
-#define CONFIG_FSL_PMIC
+/* PMIC Controller */
+#define CONFIG_PMIC
+#define CONFIG_PMIC_SPI
+#define CONFIG_PMIC_FSL
#define CONFIG_FSL_PMIC_BUS 1
#define CONFIG_FSL_PMIC_CS 2
#define CONFIG_FSL_PMIC_CLK 1000000
#define CONFIG_FSL_PMIC_MODE (SPI_MODE_0 | SPI_CS_HIGH)
+#define CONFIG_FSL_PMIC_BITLEN 32
#define CONFIG_RTC_MC13783
/* allow to overwrite serial and ethaddr */
diff --git a/include/configs/mx35pdk.h b/include/configs/mx35pdk.h
index 6f42fc7..79bae56 100644
--- a/include/configs/mx35pdk.h
+++ b/include/configs/mx35pdk.h
@@ -69,8 +69,9 @@
/*
* PMIC Configs
*/
-#define CONFIG_FSL_PMIC
-#define CONFIG_FSL_PMIC_I2C
+#define CONFIG_PMIC
+#define CONFIG_PMIC_I2C
+#define CONFIG_PMIC_FSL
#define CONFIG_SYS_FSL_PMIC_I2C_ADDR 0x08
/*
diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h
index fd7f4ce..028a842 100644
--- a/include/configs/mx51evk.h
+++ b/include/configs/mx51evk.h
@@ -70,11 +70,15 @@
#define CONFIG_MXC_SPI
-#define CONFIG_FSL_PMIC
+/* PMIC Controller */
+#define CONFIG_PMIC
+#define CONFIG_PMIC_SPI
+#define CONFIG_PMIC_FSL
#define CONFIG_FSL_PMIC_BUS 0
#define CONFIG_FSL_PMIC_CS 0
#define CONFIG_FSL_PMIC_CLK 2500000
#define CONFIG_FSL_PMIC_MODE (SPI_MODE_0 | SPI_CS_HIGH)
+#define CONFIG_FSL_PMIC_BITLEN 32
/*
* MMC Configs
diff --git a/include/configs/mx53evk.h b/include/configs/mx53evk.h
index 034fa87..4703248 100644
--- a/include/configs/mx53evk.h
+++ b/include/configs/mx53evk.h
@@ -59,8 +59,9 @@
#define CONFIG_SYS_I2C_SLAVE 0xfe
/* PMIC Configs */
-#define CONFIG_FSL_PMIC
-#define CONFIG_FSL_PMIC_I2C
+#define CONFIG_PMIC
+#define CONFIG_PMIC_I2C
+#define CONFIG_PMIC_FSL
#define CONFIG_SYS_FSL_PMIC_I2C_ADDR 8
/* MMC Configs */
diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h
index a026478..ebb572e 100644
--- a/include/configs/omap3_beagle.h
+++ b/include/configs/omap3_beagle.h
@@ -226,8 +226,8 @@
"mmcdev=0\0" \
"mmcroot=/dev/mmcblk0p2 rw\0" \
"mmcrootfstype=ext3 rootwait\0" \
- "nandroot=/dev/mtdblock4 rw\0" \
- "nandrootfstype=jffs2\0" \
+ "nandroot=ubi0:rootfs ubi.mtd=4\0" \
+ "nandrootfstype=ubifs\0" \
"ramroot=/dev/ram0 rw ramdisk_size=65536 initrd=0x81000000,64M\0" \
"ramrootfstype=ext2\0" \
"mmcargs=setenv bootargs console=${console} " \
diff --git a/include/configs/omap3_overo.h b/include/configs/omap3_overo.h
index 2f3743c..afdefd9 100644
--- a/include/configs/omap3_overo.h
+++ b/include/configs/omap3_overo.h
@@ -155,8 +155,9 @@
#define CONFIG_EXTRA_ENV_SETTINGS \
"loadaddr=0x82000000\0" \
- "console=ttyS2,115200n8\0" \
+ "console=ttyO2,115200n8\0" \
"mpurate=500\0" \
+ "optargs=\0" \
"vram=12M\0" \
"dvimode=1024x768MR-16@60\0" \
"defaultdisplay=dvi\0" \
@@ -166,6 +167,7 @@
"nandroot=/dev/mtdblock4 rw\0" \
"nandrootfstype=jffs2\0" \
"mmcargs=setenv bootargs console=${console} " \
+ "${optargs} " \
"mpurate=${mpurate} " \
"vram=${vram} " \
"omapfb.mode=dvi:${dvimode} " \
@@ -173,6 +175,7 @@
"root=${mmcroot} " \
"rootfstype=${mmcrootfstype}\0" \
"nandargs=setenv bootargs console=${console} " \
+ "${optargs} " \
"mpurate=${mpurate} " \
"vram=${vram} " \
"omapfb.mode=dvi:${dvimode} " \
diff --git a/include/configs/omap4_common.h b/include/configs/omap4_common.h
index 228eac5..f535769 100644
--- a/include/configs/omap4_common.h
+++ b/include/configs/omap4_common.h
@@ -238,6 +238,8 @@
#endif
/* Defines for SDRAM init */
+#define CONFIG_SYS_EMIF_PRECALCULATED_TIMING_REGS
+
#ifndef CONFIG_SYS_EMIF_PRECALCULATED_TIMING_REGS
#define CONFIG_SYS_AUTOMATIC_SDRAM_DETECTION
#define CONFIG_SYS_DEFAULT_LPDDR2_TIMINGS
@@ -251,6 +253,16 @@
#define CONFIG_SPL_BSS_START_ADDR 0x80000000
#define CONFIG_SPL_BSS_MAX_SIZE 0x80000 /* 512 KB */
+/*
+ * 1MB into the SDRAM to allow for SPL's bss at the beginning of SDRAM
+ * 64 bytes before this address should be set aside for u-boot.img's
+ * header. That is 0x800FFFC0--0x80100000 should not be used for any
+ * other needs.
+ */
+#define CONFIG_SYS_TEXT_BASE 0x80100000
+#define CONFIG_SYS_SPL_MALLOC_START 0x80200000
+#define CONFIG_SYS_SPL_MALLOC_SIZE 0x100000 /* 1 MB */
+
#define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR 0x300 /* address 0x60000 */
#define CONFIG_SYS_U_BOOT_MAX_SIZE_SECTORS 0x200 /* 256 KB */
@@ -266,12 +278,4 @@
#define CONFIG_SPL_SERIAL_SUPPORT
#define CONFIG_SPL_LDSCRIPT "arch/arm/cpu/armv7/omap-common/u-boot-spl.lds"
-/*
- * 1MB into the SDRAM to allow for SPL's bss at the beginning of SDRAM
- * 64 bytes before this address should be set aside for u-boot.img's
- * header. That is 0x800FFFC0--0x80100000 should not be used for any
- * other needs.
- */
-#define CONFIG_SYS_TEXT_BASE 0x80100000
-
#endif /* __CONFIG_OMAP4_COMMON_H */
diff --git a/include/configs/omap4_panda.h b/include/configs/omap4_panda.h
index 67da70e..e9ef2a3 100644
--- a/include/configs/omap4_panda.h
+++ b/include/configs/omap4_panda.h
@@ -35,6 +35,9 @@
#include <configs/omap4_common.h>
+/* GPIO */
+#define CONFIG_CMD_GPIO
+
/* ENV related config options */
#define CONFIG_ENV_IS_NOWHERE
diff --git a/include/configs/qong.h b/include/configs/qong.h
index 8c68d1e..c61a9b3 100644
--- a/include/configs/qong.h
+++ b/include/configs/qong.h
@@ -60,11 +60,14 @@
#define CONFIG_DEFAULT_SPI_MODE (SPI_MODE_0 | SPI_CS_HIGH)
#define CONFIG_RTC_MC13783
-#define CONFIG_FSL_PMIC
+#define CONFIG_PMIC
+#define CONFIG_PMIC_SPI
+#define CONFIG_PMIC_FSL
#define CONFIG_FSL_PMIC_BUS 1
#define CONFIG_FSL_PMIC_CS 0
#define CONFIG_FSL_PMIC_CLK 100000
#define CONFIG_FSL_PMIC_MODE (SPI_MODE_0 | SPI_CS_HIGH)
+#define CONFIG_FSL_PMIC_BITLEN 32
/* FPGA */
#define CONFIG_FPGA
diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h
index 6d0058f..a52b0a5 100644
--- a/include/configs/s5p_goni.h
+++ b/include/configs/s5p_goni.h
@@ -220,6 +220,10 @@
#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_LOAD_ADDR - 0x1000000)
+#define CONFIG_PMIC
+#define CONFIG_PMIC_I2C
+#define CONFIG_PMIC_MAX8998
+
#include <asm/arch/gpio.h>
/*
* I2C Settings
diff --git a/include/configs/vision2.h b/include/configs/vision2.h
index 56cbe3f..bee9e97 100644
--- a/include/configs/vision2.h
+++ b/include/configs/vision2.h
@@ -87,11 +87,14 @@
#define CONFIG_ENV_IS_IN_SPI_FLASH
/* PMIC Controller */
-#define CONFIG_FSL_PMIC
+#define CONFIG_PMIC
+#define CONFIG_PMIC_SPI
+#define CONFIG_PMIC_FSL
#define CONFIG_FSL_PMIC_BUS 0
#define CONFIG_FSL_PMIC_CS 0
#define CONFIG_FSL_PMIC_CLK 2500000
#define CONFIG_FSL_PMIC_MODE SPI_MODE_0
+#define CONFIG_FSL_PMIC_BITLEN 32
#define CONFIG_RTC_MC13783
/*
@@ -187,14 +190,15 @@
#define PHYS_SDRAM_1_SIZE (256 * 1024 * 1024)
#define PHYS_SDRAM_2 CSD1_BASE_ADDR
#define PHYS_SDRAM_2_SIZE (256 * 1024 * 1024)
-#define CONFIG_SYS_SDRAM_BASE 0x90000000
-#define CONFIG_SYS_INIT_RAM_ADDR 0x1FFE8000
-
-#define CONFIG_SYS_INIT_RAM_SIZE (64 * 1024)
-#define CONFIG_SYS_GBL_DATA_OFFSET (CONFIG_SYS_INIT_RAM_SIZE - \
- GENERATED_GBL_DATA_SIZE)
-#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_INIT_RAM_ADDR + \
- CONFIG_SYS_GBL_DATA_OFFSET)
+#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1
+#define CONFIG_SYS_INIT_RAM_ADDR IRAM_BASE_ADDR
+#define CONFIG_SYS_INIT_RAM_SIZE IRAM_SIZE
+
+#define CONFIG_SYS_INIT_SP_OFFSET \
+ (CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE)
+#define CONFIG_SYS_INIT_SP_ADDR \
+ (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
+
#define CONFIG_BOARD_EARLY_INIT_F
/* 166 MHz DDR RAM */
diff --git a/include/fsl_pmic.h b/include/fsl_pmic.h
index e3abde6..742f2e1 100644
--- a/include/fsl_pmic.h
+++ b/include/fsl_pmic.h
@@ -99,6 +99,7 @@ enum {
REG_TEST2,
REG_TEST3,
REG_TEST4,
+ PMIC_NUM_OF_REGS,
};
/* REG_POWER_MISC */
@@ -121,8 +122,4 @@ enum {
/* Interrupt status 1 */
#define RTCRSTI (1 << 7)
-void pmic_show_pmic_info(void);
-void pmic_reg_write(u32 reg, u32 value);
-u32 pmic_reg_read(u32 reg);
-
#endif
diff --git a/include/max8998_pmic.h b/include/max8998_pmic.h
new file mode 100644
index 0000000..bf28820
--- /dev/null
+++ b/include/max8998_pmic.h
@@ -0,0 +1,84 @@
+/*
+ * Copyright (C) 2011 Samsung Electronics
+ * Lukasz Majewski <l.majewski@samsung.com>
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+#ifndef __MAX8998_PMIC_H_
+#define __MAX8998_PMIC_H_
+
+/* MAX 8998 registers */
+enum {
+ MAX8998_REG_IRQ1,
+ MAX8998_REG_IRQ2,
+ MAX8998_REG_IRQ3,
+ MAX8998_REG_IRQ4,
+ MAX8998_REG_IRQM1,
+ MAX8998_REG_IRQM2,
+ MAX8998_REG_IRQM3,
+ MAX8998_REG_IRQM4,
+ MAX8998_REG_STATUS1,
+ MAX8998_REG_STATUS2,
+ MAX8998_REG_STATUSM1,
+ MAX8998_REG_STATUSM2,
+ MAX8998_REG_CHGR1,
+ MAX8998_REG_CHGR2,
+ MAX8998_REG_LDO_ACTIVE_DISCHARGE1,
+ MAX8998_REG_LDO_ACTIVE_DISCHARGE2,
+ MAX8998_REG_BUCK_ACTIVE_DISCHARGE3,
+ MAX8998_REG_ONOFF1,
+ MAX8998_REG_ONOFF2,
+ MAX8998_REG_ONOFF3,
+ MAX8998_REG_ONOFF4,
+ MAX8998_REG_BUCK1_VOLTAGE1,
+ MAX8998_REG_BUCK1_VOLTAGE2,
+ MAX8998_REG_BUCK1_VOLTAGE3,
+ MAX8998_REG_BUCK1_VOLTAGE4,
+ MAX8998_REG_BUCK2_VOLTAGE1,
+ MAX8998_REG_BUCK2_VOLTAGE2,
+ MAX8998_REG_BUCK3,
+ MAX8998_REG_BUCK4,
+ MAX8998_REG_LDO2_LDO3,
+ MAX8998_REG_LDO4,
+ MAX8998_REG_LDO5,
+ MAX8998_REG_LDO6,
+ MAX8998_REG_LDO7,
+ MAX8998_REG_LDO8_LDO9,
+ MAX8998_REG_LDO10_LDO11,
+ MAX8998_REG_LDO12,
+ MAX8998_REG_LDO13,
+ MAX8998_REG_LDO14,
+ MAX8998_REG_LDO15,
+ MAX8998_REG_LDO16,
+ MAX8998_REG_LDO17,
+ MAX8998_REG_BKCHR,
+ MAX8998_REG_LBCNFG1,
+ MAX8998_REG_LBCNFG2,
+ PMIC_NUM_OF_REGS,
+};
+
+#define MAX8998_LDO3 (1 << 2)
+#define MAX8998_LDO8 (1 << 5)
+
+#define MAX8998_I2C_ADDR (0xCC >> 1)
+
+enum { LDO_OFF, LDO_ON };
+
+#endif /* __MAX8998_PMIC_H_ */
diff --git a/include/pmic.h b/include/pmic.h
new file mode 100644
index 0000000..52a1526
--- /dev/null
+++ b/include/pmic.h
@@ -0,0 +1,71 @@
+/*
+ * Copyright (C) 2011 Samsung Electronics
+ * Lukasz Majewski <l.majewski@samsung.com>
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+#ifndef __CORE_PMIC_H_
+#define __CORE_PMIC_H_
+
+enum { PMIC_I2C, PMIC_SPI, };
+enum { I2C_PMIC, I2C_NUM, };
+enum { PMIC_READ, PMIC_WRITE, };
+
+struct p_i2c {
+ unsigned char addr;
+ unsigned char *buf;
+ unsigned char tx_num;
+};
+
+struct p_spi {
+ unsigned int cs;
+ unsigned int mode;
+ unsigned int bitlen;
+ unsigned int clk;
+ unsigned int flags;
+ u32 (*prepare_tx)(u32 reg, u32 *val, u32 write);
+};
+
+struct pmic {
+ const char *name;
+ unsigned char bus;
+ unsigned char interface;
+ unsigned char number_of_regs;
+ union hw {
+ struct p_i2c i2c;
+ struct p_spi spi;
+ } hw;
+};
+
+int pmic_init(void);
+int check_reg(u32 reg);
+struct pmic *get_pmic(void);
+int pmic_probe(struct pmic *p);
+int pmic_reg_read(struct pmic *p, u32 reg, u32 *val);
+int pmic_reg_write(struct pmic *p, u32 reg, u32 val);
+int pmic_set_output(struct pmic *p, u32 reg, int ldo, int on);
+
+#define pmic_i2c_addr (p->hw.i2c.addr)
+#define pmic_i2c_tx_num (p->hw.i2c.tx_num)
+
+#define pmic_spi_bitlen (p->hw.spi.bitlen)
+#define pmic_spi_flags (p->hw.spi.flags)
+
+#endif /* __CORE_PMIC_H_ */
diff --git a/post/post.c b/post/post.c
index 1ee0a29..dc9c0f2 100644
--- a/post/post.c
+++ b/post/post.c
@@ -40,7 +40,7 @@ DECLARE_GLOBAL_DATA_PTR;
#define BOOTMODE_MAGIC 0xDEAD0000
-int post_init_f (void)
+int post_init_f(void)
{
int res = 0;
unsigned int i;
@@ -55,9 +55,7 @@ int post_init_f (void)
gd->post_init_f_time = post_time_ms(0);
if (!gd->post_init_f_time)
- {
- printf("post/post.c: post_time_ms seems not to be implemented\n");
- }
+ printf("%s: post_time_ms not implemented\n", __FILE__);
return res;
}
@@ -95,66 +93,61 @@ int post_hotkeys_pressed(void)
__attribute__((weak, alias("__post_hotkeys_pressed")));
-void post_bootmode_init (void)
+void post_bootmode_init(void)
{
- int bootmode = post_bootmode_get (0);
+ int bootmode = post_bootmode_get(0);
int newword;
- if (post_hotkeys_pressed() && !(bootmode & POST_POWERTEST)) {
+ if (post_hotkeys_pressed() && !(bootmode & POST_POWERTEST))
newword = BOOTMODE_MAGIC | POST_SLOWTEST;
- } else if (bootmode == 0) {
+ else if (bootmode == 0)
newword = BOOTMODE_MAGIC | POST_POWERON;
- } else if (bootmode == POST_POWERON || bootmode == POST_SLOWTEST) {
+ else if (bootmode == POST_POWERON || bootmode == POST_SLOWTEST)
newword = BOOTMODE_MAGIC | POST_NORMAL;
- } else {
+ else
/* Use old value */
newword = post_word_load () & ~POST_COLDBOOT;
- }
if (bootmode == 0)
- {
/* We are booting after power-on */
newword |= POST_COLDBOOT;
- }
- post_word_store (newword);
+ post_word_store(newword);
/* Reset activity record */
gd->post_log_word = 0;
gd->post_log_res = 0;
}
-int post_bootmode_get (unsigned int *last_test)
+int post_bootmode_get(unsigned int *last_test)
{
- unsigned long word = post_word_load ();
+ unsigned long word = post_word_load();
int bootmode;
- if ((word & 0xFFFF0000) != BOOTMODE_MAGIC) {
+ if ((word & 0xFFFF0000) != BOOTMODE_MAGIC)
return 0;
- }
bootmode = word & 0x7F;
- if (last_test && (bootmode & POST_POWERTEST)) {
+ if (last_test && (bootmode & POST_POWERTEST))
*last_test = (word >> 8) & 0xFF;
- }
return bootmode;
}
/* POST tests run before relocation only mark status bits .... */
-static void post_log_mark_start ( unsigned long testid )
+static void post_log_mark_start(unsigned long testid)
{
gd->post_log_word |= testid;
}
-static void post_log_mark_succ ( unsigned long testid )
+static void post_log_mark_succ(unsigned long testid)
{
gd->post_log_res |= testid;
}
/* ... and the messages are output once we are relocated */
-void post_output_backlog ( void )
+void post_output_backlog(void)
{
int j;
@@ -164,31 +157,31 @@ void post_output_backlog ( void )
if (gd->post_log_res & post_list[j].testid)
post_log ("PASSED\n");
else {
- post_log ("FAILED\n");
- show_boot_progress (-31);
+ post_log("FAILED\n");
+ show_boot_progress(-31);
}
}
}
}
-static void post_bootmode_test_on (unsigned int last_test)
+static void post_bootmode_test_on(unsigned int last_test)
{
- unsigned long word = post_word_load ();
+ unsigned long word = post_word_load();
word |= POST_POWERTEST;
word |= (last_test & 0xFF) << 8;
- post_word_store (word);
+ post_word_store(word);
}
-static void post_bootmode_test_off (void)
+static void post_bootmode_test_off(void)
{
- unsigned long word = post_word_load ();
+ unsigned long word = post_word_load();
word &= ~POST_POWERTEST;
- post_word_store (word);
+ post_word_store(word);
}
#ifndef CONFIG_POST_SKIP_ENV_FLAGS
@@ -235,9 +228,8 @@ static void post_get_env_flags(int *test_flags)
}
}
- if (j == post_list_size) {
+ if (j == post_list_size)
printf ("No such test: %s\n", name);
- }
name = s + 1;
}
@@ -256,20 +248,18 @@ static void post_get_flags(int *test_flags)
post_get_env_flags(test_flags);
#endif
- for (j = 0; j < post_list_size; j++) {
- if (test_flags[j] & POST_POWERON) {
+ for (j = 0; j < post_list_size; j++)
+ if (test_flags[j] & POST_POWERON)
test_flags[j] |= POST_SLOWTEST;
- }
- }
}
-void __show_post_progress (unsigned int test_num, int before, int result)
+void __show_post_progress(unsigned int test_num, int before, int result)
{
}
-void show_post_progress (unsigned int, int, int)
+void show_post_progress(unsigned int, int, int)
__attribute__((weak, alias("__show_post_progress")));
-static int post_run_single (struct post_test *test,
+static int post_run_single(struct post_test *test,
int test_flags, int flags, unsigned int i)
{
if ((flags & test_flags & POST_ALWAYS) &&
@@ -277,23 +267,24 @@ static int post_run_single (struct post_test *test,
WATCHDOG_RESET ();
if (!(flags & POST_REBOOT)) {
- if ((test_flags & POST_REBOOT) && !(flags & POST_MANUAL)) {
- post_bootmode_test_on (
+ if ((test_flags & POST_REBOOT) &&
+ !(flags & POST_MANUAL)) {
+ post_bootmode_test_on(
(gd->flags & GD_FLG_POSTFAIL) ?
POST_FAIL_SAVE | i : i);
}
if (test_flags & POST_PREREL)
- post_log_mark_start ( test->testid );
+ post_log_mark_start(test->testid);
else
- post_log ("POST %s ", test->cmd);
+ post_log("POST %s ", test->cmd);
}
show_post_progress(i, POST_BEFORE, POST_FAILED);
if (test_flags & POST_PREREL) {
if ((*test->test) (flags) == 0) {
- post_log_mark_succ ( test->testid );
+ post_log_mark_succ(test->testid);
show_post_progress(i, POST_AFTER, POST_PASSED);
}
else {
@@ -319,7 +310,7 @@ static int post_run_single (struct post_test *test,
}
if ((test_flags & POST_REBOOT) && !(flags & POST_MANUAL)) {
- post_bootmode_test_off ();
+ post_bootmode_test_off();
}
return 0;
@@ -333,7 +324,7 @@ int post_run (char *name, int flags)
unsigned int i;
int test_flags[POST_MAX_NUMBER];
- post_get_flags (test_flags);
+ post_get_flags(test_flags);
if (name == NULL) {
unsigned int last;
@@ -341,7 +332,7 @@ int post_run (char *name, int flags)
if (gd->flags & GD_FLG_POSTSTOP)
return 0;
- if (post_bootmode_get (&last) & POST_POWERTEST) {
+ if (post_bootmode_get(&last) & POST_POWERTEST) {
if (last & POST_FAIL_SAVE) {
last &= ~POST_FAIL_SAVE;
gd->flags |= GD_FLG_POSTFAIL;
@@ -350,14 +341,14 @@ int post_run (char *name, int flags)
(flags & test_flags[last] & POST_ALWAYS) &&
(flags & test_flags[last] & POST_MEM)) {
- post_run_single (post_list + last,
+ post_run_single(post_list + last,
test_flags[last],
flags | POST_REBOOT, last);
for (i = last + 1; i < post_list_size; i++) {
if (gd->flags & GD_FLG_POSTSTOP)
break;
- post_run_single (post_list + i,
+ post_run_single(post_list + i,
test_flags[i],
flags, i);
}
@@ -366,7 +357,7 @@ int post_run (char *name, int flags)
for (i = 0; i < post_list_size; i++) {
if (gd->flags & GD_FLG_POSTSTOP)
break;
- post_run_single (post_list + i,
+ post_run_single(post_list + i,
test_flags[i],
flags, i);
}
@@ -381,7 +372,7 @@ int post_run (char *name, int flags)
if (i < post_list_size) {
WATCHDOG_RESET();
- return post_run_single (post_list + i,
+ return post_run_single(post_list + i,
test_flags[i],
flags, i);
} else {
@@ -390,14 +381,14 @@ int post_run (char *name, int flags)
}
}
-static int post_info_single (struct post_test *test, int full)
+static int post_info_single(struct post_test *test, int full)
{
if (test->flags & POST_MANUAL) {
if (full)
- printf ("%s - %s\n"
+ printf("%s - %s\n"
" %s\n", test->cmd, test->name, test->desc);
else
- printf (" %-15s - %s\n", test->cmd, test->name);
+ printf(" %-15s - %s\n", test->cmd, test->name);
return 0;
} else {
@@ -410,9 +401,8 @@ int post_info (char *name)
unsigned int i;
if (name == NULL) {
- for (i = 0; i < post_list_size; i++) {
- post_info_single (post_list + i, 0);
- }
+ for (i = 0; i < post_list_size; i++)
+ post_info_single(post_list + i, 0);
return 0;
} else {
@@ -422,14 +412,14 @@ int post_info (char *name)
}
if (i < post_list_size) {
- return post_info_single (post_list + i, 1);
+ return post_info_single(post_list + i, 1);
} else {
return -1;
}
}
}
-int post_log (char *format, ...)
+int post_log(char *format, ...)
{
va_list args;
uint i;
@@ -445,17 +435,17 @@ int post_log (char *format, ...)
#ifdef CONFIG_LOGBUFFER
/* Send to the logbuffer */
- logbuff_log (printbuffer);
+ logbuff_log(printbuffer);
#else
/* Send to the stdout file */
- puts (printbuffer);
+ puts(printbuffer);
#endif
return 0;
}
#ifdef CONFIG_NEEDS_MANUAL_RELOC
-void post_reloc (void)
+void post_reloc(void)
{
unsigned int i;
@@ -468,17 +458,17 @@ void post_reloc (void)
if (test->name) {
addr = (ulong) (test->name) + gd->reloc_off;
- test->name = (char *) addr;
+ test->name = (char *)addr;
}
if (test->cmd) {
addr = (ulong) (test->cmd) + gd->reloc_off;
- test->cmd = (char *) addr;
+ test->cmd = (char *)addr;
}
if (test->desc) {
addr = (ulong) (test->desc) + gd->reloc_off;
- test->desc = (char *) addr;
+ test->desc = (char *)addr;
}
if (test->test) {
@@ -508,10 +498,11 @@ void post_reloc (void)
*
* On PowerPC we implement it using the timebase register.
*/
-unsigned long post_time_ms (unsigned long base)
+unsigned long post_time_ms(unsigned long base)
{
-#ifdef CONFIG_PPC
- return (unsigned long)(get_ticks () / (get_tbclk () / CONFIG_SYS_HZ)) - base;
+#if defined(CONFIG_PPC) || defined(CONFIG_ARM)
+ return (unsigned long)(get_ticks() / (get_tbclk() / CONFIG_SYS_HZ))
+ - base;
#else
#warning "Not implemented yet"
return 0; /* Not implemented yet */
diff --git a/spl/Makefile b/spl/Makefile
index 91dd11a..ed1f770 100644
--- a/spl/Makefile
+++ b/spl/Makefile
@@ -54,6 +54,7 @@ LIBS-$(CONFIG_SPL_FAT_SUPPORT) += fs/fat/libfat.o
LIBS-$(CONFIG_SPL_LIBGENERIC_SUPPORT) += lib/libgeneric.o
LIBS-$(CONFIG_SPL_POWER_SUPPORT) += drivers/power/libpower.o
LIBS-$(CONFIG_SPL_NAND_SUPPORT) += drivers/mtd/nand/libnand.o
+LIBS-$(CONFIG_SPL_DMA_SUPPORT) += drivers/dma/libdma.o
ifeq ($(SOC),omap3)
LIBS-y += $(CPUDIR)/omap-common/libomap-common.o