diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-01-23 14:40:34 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-01-23 14:40:34 +0100 |
| commit | 060193e4c373e08fa7fecacbd678c4e1e90e50c7 (patch) | |
| tree | 27ac365ab636c36e897b652c13572d701764534d | |
| parent | f10d7b94548a788a40b08a50dcdc3209427fec38 (diff) | |
| parent | 40dcd6aa75ef95b490f342695f970910b82e392e (diff) | |
| download | u-boot-imx-060193e4c373e08fa7fecacbd678c4e1e90e50c7.zip u-boot-imx-060193e4c373e08fa7fecacbd678c4e1e90e50c7.tar.gz u-boot-imx-060193e4c373e08fa7fecacbd678c4e1e90e50c7.tar.bz2 | |
Merge ../custodians
36 files changed, 5362 insertions, 110 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 1f6ae6d..273bfac 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -557,6 +557,13 @@ Alex Züpke <azu@sysgo.de> lart SA1100 dnp1110 SA1110 +Michael Schwingen <michael@schwingen.org> + + actux1 xscale + actux2 xscale + actux3 xscale + actux4 xscale + ######################################################################### # x86 Systems: # # # @@ -521,6 +521,10 @@ LIST_pxa=" \ " LIST_ixp=" \ + actux1 \ + actux2 \ + actux3 \ + actux4 \ ixdp425 \ ixdpg425 \ pdnb3 \ @@ -2530,6 +2530,18 @@ SMN42_config : unconfig ## XScale Systems ######################################################################### +actux1_config : unconfig + @$(MKCONFIG) $(@:_config=) arm ixp actux1 + +actux2_config : unconfig + @$(MKCONFIG) $(@:_config=) arm ixp actux2 + +actux3_config : unconfig + @$(MKCONFIG) $(@:_config=) arm ixp actux3 + +actux4_config : unconfig + @$(MKCONFIG) $(@:_config=) arm ixp actux4 + adsvix_config : unconfig @$(MKCONFIG) $(@:_config=) arm pxa adsvix @@ -2713,6 +2713,9 @@ Some configuration options can be set using Environment Variables: Useful on scripts which control the retry operation themselves. + npe_ucode - see CONFIG_IXP4XX_NPE_EXT_UCOD + if set load address for the npe microcode + tftpsrcport - If this is set, the value is used for TFTP's UDP source port. diff --git a/board/actux1/Makefile b/board/actux1/Makefile new file mode 100644 index 0000000..83611e7 --- /dev/null +++ b/board/actux1/Makefile @@ -0,0 +1,50 @@ +# +# (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).a + +COBJS := actux1.o + +SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) +OBJS := $(addprefix $(obj),$(COBJS)) +SOBJS := $(addprefix $(obj),$(SOBJS)) + +$(LIB): $(obj).depend $(OBJS) + $(AR) $(ARFLAGS) $@ $(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/board/actux1/actux1.c b/board/actux1/actux1.c new file mode 100644 index 0000000..b555fdb --- /dev/null +++ b/board/actux1/actux1.c @@ -0,0 +1,161 @@ +/* + * (C) Copyright 2007 + * Michael Schwingen, michael@schwingen.org + * + * (C) Copyright 2006 + * Stefan Roese, DENX Software Engineering, sr@denx.de. + * + * (C) Copyright 2002 + * Kyle Harris, Nexus Technologies, Inc. kharris@nexus-tech.net + * + * (C) Copyright 2002 + * Sysgo Real-Time Solutions, GmbH <www.elinos.com> + * Marius Groeger <mgroeger@sysgo.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 <common.h> +#include <command.h> +#include <malloc.h> +#include <asm/arch/ixp425.h> +#include <asm/io.h> +#include <miiphy.h> + +#include "actux1_hw.h" + +DECLARE_GLOBAL_DATA_PTR; + +int board_init (void) +{ + gd->bd->bi_arch_number = MACH_TYPE_ACTUX1; + + /* adress of boot parameters */ + gd->bd->bi_boot_params = 0x00000100; + + GPIO_OUTPUT_CLEAR (CFG_GPIO_IORST); + GPIO_OUTPUT_ENABLE (CFG_GPIO_IORST); + + /* Setup GPIO's for PCI INTA */ + GPIO_OUTPUT_DISABLE (CFG_GPIO_PCI1_INTA); + GPIO_INT_ACT_LOW_SET (CFG_GPIO_PCI1_INTA); + + /* Setup GPIO's for 33MHz clock output */ + GPIO_OUTPUT_ENABLE (CFG_GPIO_PCI_CLK); + GPIO_OUTPUT_ENABLE (CFG_GPIO_EXTBUS_CLK); + *IXP425_GPIO_GPCLKR = 0x011001FF; + + /* CS5: Debug port */ + *IXP425_EXP_CS5 = 0x9d520003; + /* CS6: HwRel */ + *IXP425_EXP_CS6 = 0x81860001; + /* CS7: LEDs */ + *IXP425_EXP_CS7 = 0x80900003; + + udelay (533); + GPIO_OUTPUT_SET (CFG_GPIO_IORST); + + ACTUX1_LED1 (2); + ACTUX1_LED2 (2); + ACTUX1_LED3 (0); + ACTUX1_LED4 (0); + ACTUX1_LED5 (0); + ACTUX1_LED6 (0); + ACTUX1_LED7 (0); + + ACTUX1_HS (ACTUX1_HS_DCD); + + return 0; +} + +/* + * Check Board Identity + */ +int checkboard (void) +{ + char revision; + char *s = getenv ("serial#"); + + puts ("Board: AcTux-1 rev."); + putc (ACTUX1_BOARDREL + 'A' - 1); + + if (s != NULL) { + puts (", serial# "); + puts (s); + } + putc ('\n'); + + return (0); +} + +/************************************************************************* + * get_board_rev() - setup to pass kernel board revision information + * 0 = reserved + * 1 = Rev. A + * 2 = Rev. B + *************************************************************************/ +u32 get_board_rev (void) +{ + return ACTUX1_BOARDREL; +} + +int dram_init (void) +{ + gd->bd->bi_dram[0].start = PHYS_SDRAM_1; + gd->bd->bi_dram[0].size = PHYS_SDRAM_1_SIZE; + + return (0); +} + +#if defined(CONFIG_CMD_PCI) || defined(CONFIG_PCI) +extern struct pci_controller hose; +extern void pci_ixp_init (struct pci_controller *hose); + +void pci_init_board (void) +{ + extern void pci_ixp_init (struct pci_controller *hose); + pci_ixp_init (&hose); +} +#endif + +void reset_phy (void) +{ + u16 id1, id2; + + /* initialize the PHY */ + miiphy_reset ("NPE0", CONFIG_PHY_ADDR); + + miiphy_read ("NPE0", CONFIG_PHY_ADDR, PHY_PHYIDR1, &id1); + miiphy_read ("NPE0", CONFIG_PHY_ADDR, PHY_PHYIDR2, &id2); + + id2 &= 0xFFF0; /* mask out revision bits */ + + if (id1 == 0x13 && id2 == 0x78e0) { + /* + * LXT971/LXT972 PHY: set LED outputs: + * LED1(green) = Link/ACT, + * LED2 (unused) = LINK, + * LED3(red) = Coll + */ + miiphy_write ("NPE0", CONFIG_PHY_ADDR, 20, 0xD432); + } else if (id1 == 0x143 && id2 == 0xbc30) { + /* BCM5241: default values are OK */ + } else + printf ("unknown ethernet PHY ID: %x %x\n", id1, id2); +} diff --git a/board/actux1/actux1_hw.h b/board/actux1/actux1_hw.h new file mode 100644 index 0000000..bb3b7f9 --- /dev/null +++ b/board/actux1/actux1_hw.h @@ -0,0 +1,57 @@ +/* + * (C) Copyright 2007 + * Michael Schwingen, michael@schwingen.org + * + * hardware register definitions for the AcTux-1 board. + * + * 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 _ACTUX1_HW_H +#define _ACTUX1_HW_H + +/* 0 = LED off,1 = green, 2 = red, 3 = orange */ +#define ACTUX1_LED1(a) writeb((a), IXP425_EXP_BUS_CS7_BASE_PHYS + 0) +#define ACTUX1_LED2(a) writeb((a), IXP425_EXP_BUS_CS7_BASE_PHYS + 1) +#define ACTUX1_LED3(a) writeb((a), IXP425_EXP_BUS_CS7_BASE_PHYS + 2) +#define ACTUX1_LED4(a) writeb((a)^3, IXP425_EXP_BUS_CS7_BASE_PHYS + 3) +#define ACTUX1_LED5(a) writeb((a)^3, IXP425_EXP_BUS_CS7_BASE_PHYS + 4) +#define ACTUX1_LED6(a) writeb((a)^3, IXP425_EXP_BUS_CS7_BASE_PHYS + 5) +#define ACTUX1_LED7(a) writeb((a)^3, IXP425_EXP_BUS_CS7_BASE_PHYS + 6) +#define ACTUX1_HS(a) writeb((a), IXP425_EXP_BUS_CS7_BASE_PHYS + 7) +#define ACTUX1_HS_DCD 0x01 +#define ACTUX1_HS_DSR 0x02 + +#define ACTUX1_DBG_PORT IXP425_EXP_BUS_CS5_BASE_PHYS +#define ACTUX1_BOARDREL (readb(IXP425_EXP_BUS_CS6_BASE_PHYS) & 0x0F) + +/* GPIO settings */ +#define CFG_GPIO_PCI1_INTA 2 +#define CFG_GPIO_PCI2_INTA 3 +#define CFG_GPIO_I2C_SDA 4 +#define CFG_GPIO_I2C_SCL 5 +#define CFG_GPIO_DBGJUMPER 9 +#define CFG_GPIO_BUTTON1 10 +#define CFG_GPIO_DBGSENSE 11 +#define CFG_GPIO_DTR 12 +#define CFG_GPIO_IORST 13 /* Out */ +#define CFG_GPIO_PCI_CLK 14 /* Out */ +#define CFG_GPIO_EXTBUS_CLK 15 /* Out */ + +#endif diff --git a/board/actux1/config.mk b/board/actux1/config.mk new file mode 100644 index 0000000..9a634cd --- /dev/null +++ b/board/actux1/config.mk @@ -0,0 +1,4 @@ +TEXT_BASE = 0x00e00000 + +# include NPE ethernet driver +BOARDLIBS = cpu/ixp/npe/libnpe.a diff --git a/board/actux1/u-boot.lds b/board/actux1/u-boot.lds new file mode 100644 index 0000000..0de78d3 --- /dev/null +++ b/board/actux1/u-boot.lds @@ -0,0 +1,69 @@ +/* + * (C) Copyright 2000 + * 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 + */ + +OUTPUT_FORMAT ("elf32-bigarm", "elf32-bigarm", "elf32-bigarm") +OUTPUT_ARCH (arm) +ENTRY (_start) +SECTIONS +{ + . = 0x00000000; + + . = ALIGN (4); + .text : { + cpu/ixp/start.o(.text) + lib_generic/string.o(.text) + lib_generic/vsprintf.o(.text) + lib_arm/board.o(.text) + common/dlmalloc.o(.text) + cpu/ixp/cpu.o(.text) + . = env_offset; + common/environment.o(.ppcenv) + * (.text) + } + + . = ALIGN (4); + .rodata : { + *(.rodata) + } + . = ALIGN (4); + .data : { + *(.data) + } + . = ALIGN (4); + .got : { + *(.got) + } + . =.; + __u_boot_cmd_start =.; + .u_boot_cmd : { + *(.u_boot_cmd) + } + __u_boot_cmd_end =.; + + . = ALIGN (4); + __bss_start =.; + .bss (NOLOAD): { + *(.bss) + } + _end =.; +} diff --git a/board/actux2/Makefile b/board/actux2/Makefile new file mode 100644 index 0000000..37fd262 --- /dev/null +++ b/board/actux2/Makefile @@ -0,0 +1,50 @@ +# +# (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).a + +COBJS := actux2.o + +SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) +OBJS := $(addprefix $(obj),$(COBJS)) +SOBJS := $(addprefix $(obj),$(SOBJS)) + +$(LIB): $(obj).depend $(OBJS) + $(AR) $(ARFLAGS) $@ $(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/board/actux2/actux2.c b/board/actux2/actux2.c new file mode 100644 index 0000000..f3a81a8 --- /dev/null +++ b/board/actux2/actux2.c @@ -0,0 +1,134 @@ +/* + * (C) Copyright 2007 + * Michael Schwingen, michael@schwingen.org + * + * (C) Copyright 2006 + * Stefan Roese, DENX Software Engineering, sr@denx.de. + * + * (C) Copyright 2002 + * Kyle Harris, Nexus Technologies, Inc. kharris@nexus-tech.net + * + * (C) Copyright 2002 + * Sysgo Real-Time Solutions, GmbH <www.elinos.com> + * Marius Groeger <mgroeger@sysgo.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 <common.h> +#include <command.h> +#include <malloc.h> +#include <asm/arch/ixp425.h> +#include <asm/io.h> + +#include <miiphy.h> + +#include "actux2_hw.h" + +DECLARE_GLOBAL_DATA_PTR; + +int board_init (void) +{ + gd->bd->bi_arch_number = MACH_TYPE_ACTUX2; + + /* adress of boot parameters */ + gd->bd->bi_boot_params = 0x00000100; + + GPIO_OUTPUT_ENABLE (CFG_GPIO_IORST); + GPIO_OUTPUT_ENABLE (CFG_GPIO_ETHRST); + GPIO_OUTPUT_ENABLE (CFG_GPIO_DSR); + GPIO_OUTPUT_ENABLE (CFG_GPIO_DCD); + + GPIO_OUTPUT_CLEAR (CFG_GPIO_IORST); + GPIO_OUTPUT_CLEAR (CFG_GPIO_ETHRST); + + GPIO_OUTPUT_CLEAR (CFG_GPIO_DSR); + GPIO_OUTPUT_SET (CFG_GPIO_DCD); + + /* Setup GPIO's for Interrupt inputs */ + GPIO_OUTPUT_DISABLE (CFG_GPIO_DBGINT); + GPIO_OUTPUT_DISABLE (CFG_GPIO_ETHINT); + + /* Setup GPIO's for 33MHz clock output */ + GPIO_OUTPUT_ENABLE (CFG_GPIO_PCI_CLK); + GPIO_OUTPUT_ENABLE (CFG_GPIO_EXTBUS_CLK); + *IXP425_GPIO_GPCLKR = 0x011001FF; + + /* CS1: IPAC-X */ + *IXP425_EXP_CS1 = 0x94d10013; + /* CS5: Debug port */ + *IXP425_EXP_CS5 = 0x9d520003; + /* CS6: HW release register */ + *IXP425_EXP_CS6 = 0x81860001; + /* CS7: LEDs */ + *IXP425_EXP_CS7 = 0x80900003; + + udelay (533); + GPIO_OUTPUT_SET (CFG_GPIO_IORST); + GPIO_OUTPUT_SET (CFG_GPIO_ETHRST); + + ACTUX2_LED1 (1); + ACTUX2_LED2 (0); + ACTUX2_LED3 (0); + ACTUX2_LED4 (0); + + return 0; +} + +/* + * Check Board Identity + */ +int checkboard (void) +{ + char revision; + char *s = getenv ("serial#"); + + puts ("Board: AcTux-2 rev."); + putc (ACTUX2_BOARDREL + 'A' - 1); + putc ('\n'); + + return (0); +} + +int dram_init (void) +{ + gd->bd->bi_dram[0].start = PHYS_SDRAM_1; + gd->bd->bi_dram[0].size = PHYS_SDRAM_1_SIZE; + + return (0); +} + +/************************************************************************* + * get_board_rev() - setup to pass kernel board revision information + * 0 = reserved + * 1 = Rev. A + * 2 = Rev. B + *************************************************************************/ +u32 get_board_rev (void) +{ + return ACTUX2_BOARDREL; +} + +void reset_phy (void) +{ + int i; + + /* init IcPlus IP175C ethernet switch to native IP175C mode */ + miiphy_write ("NPE0", 29, 31, 0x175C); +} diff --git a/board/actux2/actux2_hw.h b/board/actux2/actux2_hw.h new file mode 100644 index 0000000..8ffb82a --- /dev/null +++ b/board/actux2/actux2_hw.h @@ -0,0 +1,59 @@ +/* + * (C) Copyright 2007 + * Michael Schwingen, michael@schwingen.org + * + * hardware register definitions for the AcTux-2 board. + * + * 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 _ACTUX2_HW_H +#define _ACTUX2_HW_H + +/* 0 = LED off,1 = green, 2 = red, 3 = orange */ +#define ACTUX2_LED1(a) writeb((a ? 2 : 0), IXP425_EXP_BUS_CS7_BASE_PHYS + 0) +#define ACTUX2_LED2(a) writeb((a ? 2 : 0), IXP425_EXP_BUS_CS7_BASE_PHYS + 1) +#define ACTUX2_LED3(a) writeb((a ? 0 : 2), IXP425_EXP_BUS_CS7_BASE_PHYS + 2) +#define ACTUX2_LED4(a) writeb((a ? 0 : 2), IXP425_EXP_BUS_CS7_BASE_PHYS + 3) + +#define ACTUX2_DBG_PORT IXP425_EXP_BUS_CS5_BASE_PHYS +#define ACTUX2_BOARDREL (readb(IXP425_EXP_BUS_CS6_BASE_PHYS) & 0x0F) +#define ACTUX2_OPTION (readb(IXP425_EXP_BUS_CS6_BASE_PHYS) & 0xF0) + +/* + * GPIO settings + */ +#define CFG_GPIO_DBGINT 0 +#define CFG_GPIO_ETHINT 1 +#define CFG_GPIO_ETHRST 2 /* Out */ +#define CFG_GPIO_LED5_GN 3 /* Out */ +#define CFG_GPIO_UNUSED4 4 +#define CFG_GPIO_UNUSED5 5 +#define CFG_GPIO_DSR 6 /* Out */ +#define CFG_GPIO_DCD 7 /* Out */ +#define CFG_GPIO_IPAC_INT 8 +#define CFG_GPIO_DBGJUMPER 9 +#define CFG_GPIO_BUTTON1 10 +#define CFG_GPIO_DBGSENSE 11 +#define CFG_GPIO_DTR 12 +#define CFG_GPIO_IORST 13 /* Out */ +#define CFG_GPIO_PCI_CLK 14 /* Out */ +#define CFG_GPIO_EXTBUS_CLK 15 /* Out */ + +#endif diff --git a/board/actux2/config.mk b/board/actux2/config.mk new file mode 100644 index 0000000..9a634cd --- /dev/null +++ b/board/actux2/config.mk @@ -0,0 +1,4 @@ +TEXT_BASE = 0x00e00000 + +# include NPE ethernet driver +BOARDLIBS = cpu/ixp/npe/libnpe.a diff --git a/board/actux2/u-boot.lds b/board/actux2/u-boot.lds new file mode 100644 index 0000000..90cafce --- /dev/null +++ b/board/actux2/u-boot.lds @@ -0,0 +1,74 @@ +/* + * (C) Copyright 2000 + * 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 + */ + +OUTPUT_FORMAT ("elf32-bigarm", "elf32-bigarm", "elf32-bigarm") +OUTPUT_ARCH (arm) +ENTRY (_start) +SECTIONS +{ + . = 0x00000000; + + . = ALIGN (4); + .text : { + cpu/ixp/start.o(.text) + lib_generic/string.o(.text) + lib_generic/vsprintf.o(.text) + lib_arm/board.o(.text) + common/dlmalloc.o(.text) + cpu/ixp/cpu.o(.text) + + . = env_offset; + common/environment.o (.ppcenv) + + * (.text) + } + + . = ALIGN (4); + .rodata : { + *(.rodata) + } + + . = ALIGN (4); + .data : { + *(.data) + } + + . = ALIGN (4); + .got : { + *(.got) + } + + . =.; + __u_boot_cmd_start =.; + .u_boot_cmd : { + *(.u_boot_cmd) + } + __u_boot_cmd_end =.; + + . = ALIGN (4); + __bss_start =.; + .bss (NOLOAD): { + *(.bss) + } + _end =.; +} diff --git a/board/actux3/Makefile b/board/actux3/Makefile new file mode 100644 index 0000000..f6168c3 --- /dev/null +++ b/board/actux3/Makefile @@ -0,0 +1,50 @@ +# +# (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).a + +COBJS := actux3.o + +SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) +OBJS := $(addprefix $(obj),$(COBJS)) +SOBJS := $(addprefix $(obj),$(SOBJS)) + +$(LIB): $(obj).depend $(OBJS) + $(AR) $(ARFLAGS) $@ $(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/board/actux3/actux3.c b/board/actux3/actux3.c new file mode 100644 index 0000000..647e4e7 --- /dev/null +++ b/board/actux3/actux3.c @@ -0,0 +1,165 @@ +/* + * (C) Copyright 2007 + * Michael Schwingen, michael@schwingen.org + * + * (C) Copyright 2006 + * Stefan Roese, DENX Software Engineering, sr@denx.de. + * + * (C) Copyright 2002 + * Kyle Harris, Nexus Technologies, Inc. kharris@nexus-tech.net + * + * (C) Copyright 2002 + * Sysgo Real-Time Solutions, GmbH <www.elinos.com> + * Marius Groeger <mgroeger@sysgo.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 <common.h> +#include <command.h> +#include <malloc.h> +#include <asm/arch/ixp425.h> +#include <asm/io.h> + +#include <miiphy.h> + +#include "actux3_hw.h" + +DECLARE_GLOBAL_DATA_PTR; + +int board_init (void) +{ + gd->bd->bi_arch_number = MACH_TYPE_ACTUX3; + + /* adress of boot parameters */ + gd->bd->bi_boot_params = 0x00000100; + + GPIO_OUTPUT_ENABLE (CFG_GPIO_IORST); + GPIO_OUTPUT_ENABLE (CFG_GPIO_ETHRST); + GPIO_OUTPUT_ENABLE (CFG_GPIO_DSR); + GPIO_OUTPUT_ENABLE (CFG_GPIO_DCD); + GPIO_OUTPUT_ENABLE (CFG_GPIO_LED5_GN); + GPIO_OUTPUT_ENABLE (CFG_GPIO_LED6_RT); + GPIO_OUTPUT_ENABLE (CFG_GPIO_LED6_GN); + + GPIO_OUTPUT_CLEAR (CFG_GPIO_IORST); + GPIO_OUTPUT_CLEAR (CFG_GPIO_ETHRST); + + GPIO_OUTPUT_CLEAR (CFG_GPIO_DSR); + GPIO_OUTPUT_SET (CFG_GPIO_DCD); + + GPIO_OUTPUT_CLEAR (CFG_GPIO_LED5_GN); + GPIO_OUTPUT_CLEAR (CFG_GPIO_LED6_RT); + GPIO_OUTPUT_CLEAR (CFG_GPIO_LED6_GN); + + /* + * Setup GPIO's for Interrupt inputs + */ + GPIO_OUTPUT_DISABLE (CFG_GPIO_DBGINT); + GPIO_OUTPUT_DISABLE (CFG_GPIO_ETHINT); + + /* + * Setup GPIO's for 33MHz clock output + */ + GPIO_OUTPUT_ENABLE (CFG_GPIO_PCI_CLK); + GPIO_OUTPUT_ENABLE (CFG_GPIO_EXTBUS_CLK); + *IXP425_GPIO_GPCLKR = 0x011001FF; + + /* CS1: IPAC-X */ + *IXP425_EXP_CS1 = 0x94d10013; + /* CS5: Debug port */ + *IXP425_EXP_CS5 = 0x9d520003; + /* CS6: Release/Option register */ + *IXP425_EXP_CS6 = 0x81860001; + /* CS7: LEDs */ + *IXP425_EXP_CS7 = 0x80900003; + + udelay (533); + GPIO_OUTPUT_SET (CFG_GPIO_IORST); + GPIO_OUTPUT_SET (CFG_GPIO_ETHRST); + + ACTUX3_LED1_RT (1); + ACTUX3_LED1_GN (0); + ACTUX3_LED2_RT (0); + ACTUX3_LED2_GN (0); + ACTUX3_LED3_RT (0); + ACTUX3_LED3_GN (0); + ACTUX3_LED4_GN (0); + ACTUX3_LED5_RT (0); + + return 0; +} + +/* + * Check Board Identity + */ +int checkboard (void) +{ + char revision; + char *s = getenv ("serial#"); + + puts ("Board: AcTux-3 rev."); + putc (ACTUX3_BOARDREL + 'A' - 1); + + if (s != NULL) { + puts (", serial# "); + puts (s); + } + putc ('\n'); + + return (0); +} + +/************************************************************************* + * get_board_rev() - setup to pass kernel board revision information + * 0 = reserved + * 1 = Rev. A + * 2 = Rev. B + *************************************************************************/ +u32 get_board_rev (void) +{ + return ACTUX3_BOARDREL; +} + +int dram_init (void) +{ + gd->bd->bi_dram[0].start = PHYS_SDRAM_1; + gd->bd->bi_dram[0].size = PHYS_SDRAM_1_SIZE; + + return (0); +} + +void reset_phy (void) +{ + int i; + + /* initialize the PHY */ + miiphy_reset ("NPE0", CONFIG_PHY_ADDR); + + /* all LED outputs = Link/Act */ + miiphy_write ("NPE0", CONFIG_PHY_ADDR, 0x16, 0x0AAA); + + /* + * The Marvell 88E6060 switch comes up with all ports disabled. + * set all ethernet switch ports to forwarding state + */ + for (i = 1; i <= 5; i++) + miiphy_write ("NPE0", CONFIG_PHY_ADDR + 8 + i, 0x04, 0x03); + +} diff --git a/board/actux3/actux3_hw.h b/board/actux3/actux3_hw.h new file mode 100644 index 0000000..9b7cbce --- /dev/null +++ b/board/actux3/actux3_hw.h @@ -0,0 +1,60 @@ +/* + * (C) Copyright 2007 + * Michael Schwingen, michael@schwingen.org + * + * hardware register definitions for the AcTux-3 board. + * + * 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 _ACTUX3_HW_H +#define _ACTUX3_HW_H + +/* 0 = LED off,1 = ON */ +#define ACTUX3_LED1_RT(a) writeb((a), IXP425_EXP_BUS_CS7_BASE_PHYS + 0) +#define ACTUX3_LED1_GN(a) writeb((a), IXP425_EXP_BUS_CS7_BASE_PHYS + 1) +#define ACTUX3_LED2_RT(a) writeb((a), IXP425_EXP_BUS_CS7_BASE_PHYS + 2) +#define ACTUX3_LED2_GN(a) writeb((a), IXP425_EXP_BUS_CS7_BASE_PHYS + 3) +#define ACTUX3_LED3_RT(a) writeb((a), IXP425_EXP_BUS_CS7_BASE_PHYS + 4) +#define ACTUX3_LED3_GN(a) writeb((a), IXP425_EXP_BUS_CS7_BASE_PHYS + 5) +#define ACTUX3_LED4_GN(a) writeb((a)^1, IXP425_EXP_BUS_CS7_BASE_PHYS + 6) +#define ACTUX3_LED5_RT(a) writeb((a), IXP425_EXP_BUS_CS7_BASE_PHYS + 7) + +#define ACTUX3_DBG_PORT IXP425_EXP_BUS_CS5_BASE_PHYS +#define ACTUX3_BOARDREL (readb(IXP425_EXP_BUS_CS6_BASE_PHYS) & 0x0F) +#define ACTUX3_OPTION (readb(IXP425_EXP_BUS_CS6_BASE_PHYS) & 0xF0) + +/* GPIO settings */ +#define CFG_GPIO_DBGINT 0 +#define CFG_GPIO_ETHINT 1 +#define CFG_GPIO_ETHRST 2 /* Out */ +#define CFG_GPIO_LED5_GN 3 /* Out */ +#define CFG_GPIO_LED6_RT 4 /* Out */ +#define CFG_GPIO_LED6_GN 5 /* Out */ +#define CFG_GPIO_DSR 6 /* Out */ +#define CFG_GPIO_DCD 7 /* Out */ +#define CFG_GPIO_DBGJUMPER 9 +#define CFG_GPIO_BUTTON1 10 +#define CFG_GPIO_DBGSENSE 11 +#define CFG_GPIO_DTR 12 +#define CFG_GPIO_IORST 13 /* Out */ +#define CFG_GPIO_PCI_CLK 14 /* Out */ +#define CFG_GPIO_EXTBUS_CLK 15 /* Out */ + +#endif diff --git a/board/actux3/config.mk b/board/actux3/config.mk new file mode 100644 index 0000000..9a634cd --- /dev/null +++ b/board/actux3/config.mk @@ -0,0 +1,4 @@ +TEXT_BASE = 0x00e00000 + +# include NPE ethernet driver +BOARDLIBS = cpu/ixp/npe/libnpe.a diff --git a/board/actux3/u-boot.lds b/board/actux3/u-boot.lds new file mode 100644 index 0000000..b9a9eb9 --- /dev/null +++ b/board/actux3/u-boot.lds @@ -0,0 +1,74 @@ +/* + * (C) Copyright 2000 + * 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 + */ + +OUTPUT_FORMAT ("elf32-bigarm", "elf32-bigarm", "elf32-bigarm") +OUTPUT_ARCH (arm) +ENTRY (_start) +SECTIONS +{ + . = 0x00000000; + + . = ALIGN (4); + .text : { + cpu/ixp/start.o (.text) + lib_generic/string.o (.text) + lib_generic/vsprintf.o (.text) + lib_arm/board.o (.text) + common/dlmalloc.o (.text) + cpu/ixp/cpu.o (.text) + + . = env_offset; + common/environment.o (.ppcenv) + + * (.text) + } + + . = ALIGN (4); + .rodata : { + *(.rodata) + } + + . = ALIGN (4); + .data : { + *(.data) + } + + . = ALIGN (4); + .got : { + *(.got) + } + + . =.; + __u_boot_cmd_start =.; + .u_boot_cmd : { + *(.u_boot_cmd) + } + __u_boot_cmd_end =.; + + . = ALIGN (4); + __bss_start =.; + .bss (NOLOAD): { + *(.bss) + } + _end =.; +} diff --git a/board/actux4/Makefile b/board/actux4/Makefile new file mode 100644 index 0000000..845af93 --- /dev/null +++ b/board/actux4/Makefile @@ -0,0 +1,50 @@ +# +# (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).a + +COBJS := actux4.o + +SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) +OBJS := $(addprefix $(obj),$(COBJS)) +SOBJS := $(addprefix $(obj),$(SOBJS)) + +$(LIB): $(obj).depend $(OBJS) + $(AR) $(ARFLAGS) $@ $(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/board/actux4/actux4.c b/board/actux4/actux4.c new file mode 100644 index 0000000..84037fa --- /dev/null +++ b/board/actux4/actux4.c @@ -0,0 +1,132 @@ +/* + * (C) Copyright 2007 + * Michael Schwingen, michael@schwingen.org + * + * (C) Copyright 2006 + * Stefan Roese, DENX Software Engineering, sr@denx.de. + * + * (C) Copyright 2002 + * Kyle Harris, Nexus Technologies, Inc. kharris@nexus-tech.net + * + * (C) Copyright 2002 + * Sysgo Real-Time Solutions, GmbH <www.elinos.com> + * Marius Groeger <mgroeger@sysgo.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 <common.h> +#include <command.h> +#include <malloc.h> +#include <asm/arch/ixp425.h> + +#include <miiphy.h> + +#include "actux4_hw.h" + +DECLARE_GLOBAL_DATA_PTR; + +int board_init (void) +{ + gd->bd->bi_arch_number = MACH_TYPE_ACTUX4; + + /* adress of boot parameters */ + gd->bd->bi_boot_params = 0x00000100; + + GPIO_OUTPUT_CLEAR (CFG_GPIO_nPWRON); + GPIO_OUTPUT_ENABLE (CFG_GPIO_nPWRON); + + GPIO_OUTPUT_CLEAR (CFG_GPIO_IORST); + GPIO_OUTPUT_ENABLE (CFG_GPIO_IORST); + + /* led not populated on board*/ + GPIO_OUTPUT_ENABLE (CFG_GPIO_LED3); + GPIO_OUTPUT_SET (CFG_GPIO_LED3); + + /* middle LED */ + GPIO_OUTPUT_ENABLE (CFG_GPIO_LED2); + GPIO_OUTPUT_SET (CFG_GPIO_LED2); + + /* right LED */ + /* weak pulldown = LED weak on */ + GPIO_OUTPUT_DISABLE (CFG_GPIO_LED1); + GPIO_OUTPUT_SET (CFG_GPIO_LED1); + + /* Setup GPIO's for Interrupt inputs */ + GPIO_OUTPUT_DISABLE (CFG_GPIO_USBINTA); + GPIO_OUTPUT_DISABLE (CFG_GPIO_USBINTB); + GPIO_OUTPUT_DISABLE (CFG_GPIO_USBINTC); + GPIO_OUTPUT_DISABLE (CFG_GPIO_RTCINT); + GPIO_OUTPUT_DISABLE (CFG_GPIO_PCI_INTA); + GPIO_OUTPUT_DISABLE (CFG_GPIO_PCI_INTB); + + GPIO_INT_ACT_LOW_SET (CFG_GPIO_USBINTA); + GPIO_INT_ACT_LOW_SET (CFG_GPIO_USBINTB); + GPIO_INT_ACT_LOW_SET (CFG_GPIO_USBINTC); + GPIO_INT_ACT_LOW_SET (CFG_GPIO_RTCINT); + GPIO_INT_ACT_LOW_SET (CFG_GPIO_PCI_INTA); + GPIO_INT_ACT_LOW_SET (CFG_GPIO_PCI_INTB); + + /* Setup GPIO's for 33MHz clock output */ + *IXP425_GPIO_GPCLKR = 0x011001FF; + GPIO_OUTPUT_ENABLE (CFG_GPIO_EXTBUS_CLK); + GPIO_OUTPUT_ENABLE (CFG_GPIO_PCI_CLK); + + *IXP425_EXP_CS1 = 0xbd113c42; + + udelay (10000); + GPIO_OUTPUT_SET (CFG_GPIO_IORST); + udelay (10000); + GPIO_OUTPUT_CLEAR (CFG_GPIO_IORST); + udelay (10000); + GPIO_OUTPUT_SET (CFG_GPIO_IORST); + + return 0; +} + +/* Check Board Identity */ +int checkboard (void) +{ + puts ("Board: AcTux-4\n"); + return (0); +} + +int dram_init (void) +{ + gd->bd->bi_dram[0].start = PHYS_SDRAM_1; + gd->bd->bi_dram[0].size = PHYS_SDRAM_1_SIZE; + + return (0); +} + +/* + * Hardcoded flash setup: + * Flash 0 is a non-CFI SST 39VF020 flash, 8 bit flash / 8 bit bus. + * Flash 1 is an Intel *16 flash using the CFI driver. + */ +ulong board_flash_get_legacy (ulong base, int banknum, flash_info_t * info) +{ + if (banknum == 0) { /* non-CFI boot flash */ + info->portwidth = 1; + info->chipwidth = 1; + info->interface = FLASH_CFI_X8; + return 1; + } else + return 0; +} diff --git a/board/actux4/actux4_hw.h b/board/actux4/actux4_hw.h new file mode 100644 index 0000000..8b3ecf3 --- /dev/null +++ b/board/actux4/actux4_hw.h @@ -0,0 +1,49 @@ +/* + * (C) Copyright 2007 + * Michael Schwingen, michael@schwingen.org + * + * hardware register definitions for the AcTux-4 board. + * + * 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 _ACTUX4_HW_H +#define _ACTUX4_HW_H + +/* + * GPIO settings + */ +#define CFG_GPIO_USBINTA 0 +#define CFG_GPIO_USBINTB 1 +#define CFG_GPIO_USBINTC 2 +#define CFG_GPIO_nPWRON 3 /* Out */ +#define CFG_GPIO_I2C_SCL 4 +#define CFG_GPIO_I2C_SDA 5 +#define CFG_GPIO_PCI_INTB 6 +#define CFG_GPIO_BUTTON1 7 +#define CFG_GPIO_LED1 8 /* Out */ +#define CFG_GPIO_RTCINT 9 +#define CFG_GPIO_LED2 10 /* Out */ +#define CFG_GPIO_PCI_INTA 11 +#define CFG_GPIO_IORST 12 /* Out */ +#define CFG_GPIO_LED3 13 /* Out */ +#define CFG_GPIO_PCI_CLK 14 /* Out */ +#define CFG_GPIO_EXTBUS_CLK 15 /* Out */ + +#endif diff --git a/board/actux4/config.mk b/board/actux4/config.mk new file mode 100644 index 0000000..9a634cd --- /dev/null +++ b/board/actux4/config.mk @@ -0,0 +1,4 @@ +TEXT_BASE = 0x00e00000 + +# include NPE ethernet driver +BOARDLIBS = cpu/ixp/npe/libnpe.a diff --git a/board/actux4/u-boot.lds b/board/actux4/u-boot.lds new file mode 100644 index 0000000..c8784a0 --- /dev/null +++ b/board/actux4/u-boot.lds @@ -0,0 +1,65 @@ +/* + * (C) Copyright 2000 + * 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 + */ + +OUTPUT_FORMAT ("elf32-bigarm", "elf32-bigarm", "elf32-bigarm") +OUTPUT_ARCH (arm) +ENTRY (_start) +SECTIONS +{ + . = 0x00000000; + + . = ALIGN (4); + .text : { + cpu/ixp/start.o(.text) + *(.text) + } + + . = ALIGN (4); + .rodata : { + *(.rodata) + } + + . = ALIGN (4); + .data : { + *(.data) + } + + . = ALIGN (4); + .got : { + *(.got) + } + + . =.; + __u_boot_cmd_start =.; + .u_boot_cmd : { + *(.u_boot_cmd) + } + __u_boot_cmd_end =.; + + . = ALIGN (4); + __bss_start =.; + .bss (NOLOAD): { + *(.bss) + } + _end =.; +} diff --git a/board/ixdp425/ixdp425.c b/board/ixdp425/ixdp425.c index 2a33d6d..e0d7637 100644 --- a/board/ixdp425/ixdp425.c +++ b/board/ixdp425/ixdp425.c @@ -38,11 +38,6 @@ DECLARE_GLOBAL_DATA_PTR; /* * Miscelaneous platform dependent initialisations */ -int board_post_init (void) -{ - return (0); -} - int board_init (void) { /* arch number of IXDP */ diff --git a/board/prodrive/pdnb3/pdnb3.c b/board/prodrive/pdnb3/pdnb3.c index a1a310a..3445a3a 100644 --- a/board/prodrive/pdnb3/pdnb3.c +++ b/board/prodrive/pdnb3/pdnb3.c @@ -48,11 +48,6 @@ static unsigned long old_val = 0; /* * Miscelaneous platform dependent initialisations */ -int board_post_init(void) -{ - return (0); -} - int board_init(void) { /* arch number of PDNB3 */ diff --git a/board/xm250/xm250.c b/board/xm250/xm250.c index 528d323..56b1cd4 100644 --- a/board/xm250/xm250.c +++ b/board/xm250/xm250.c @@ -52,14 +52,6 @@ sleep (int i) int /**********************************************************/ -board_post_init (void) -/**********************************************************/ -{ - return (0); -} - -int -/**********************************************************/ board_init (void) /**********************************************************/ { diff --git a/cpu/ixp/npe/IxNpeDl.c b/cpu/ixp/npe/IxNpeDl.c index ffe355c..3738337 100644 --- a/cpu/ixp/npe/IxNpeDl.c +++ b/cpu/ixp/npe/IxNpeDl.c @@ -109,38 +109,6 @@ PRIVATE IX_STATUS ixNpeDlNpeInitAndStartInternal (UINT32 *imageLibrary, UINT32 imageId); /* - * Function definition: ixNpeDlMicrocodeImageLibraryOverride - */ -PUBLIC IX_STATUS -ixNpeDlMicrocodeImageLibraryOverride (UINT32 *clientImageLibrary) -{ - IX_STATUS status = IX_SUCCESS; - - IX_NPEDL_TRACE0 (IX_NPEDL_FN_ENTRY_EXIT, - "Entering ixNpeDlMicrocodeImageLibraryOverride\n"); - - if (clientImageLibrary == NULL) - { - status = IX_NPEDL_PARAM_ERR; - IX_NPEDL_ERROR_REPORT ("ixNpeDlMicrocodeImageLibraryOverride - " - "invalid parameter\n"); - } - else - { - status = ixNpeDlImageMgrMicrocodeImageLibraryOverride (clientImageLibrary); - if (status != IX_SUCCESS) - { - status = IX_FAIL; - } - } /* end of if-else(clientImageLibrary) */ - - IX_NPEDL_TRACE1 (IX_NPEDL_FN_ENTRY_EXIT, - "Exiting ixNpeDlMicrocodeImageLibraryOverride : " - "status = %d\n", status); - return status; -} - -/* * Function definition: ixNpeDlImageDownload */ PUBLIC IX_STATUS diff --git a/cpu/ixp/npe/IxNpeDlImageMgr.c b/cpu/ixp/npe/IxNpeDlImageMgr.c index e05c228..75b42f2 100644 --- a/cpu/ixp/npe/IxNpeDlImageMgr.c +++ b/cpu/ixp/npe/IxNpeDlImageMgr.c @@ -134,12 +134,20 @@ typedef struct static IxNpeDlImageMgrStats ixNpeDlImageMgrStats; /* default image */ -#ifdef IX_NPEDL_READ_MICROCODE_FROM_FILE -static UINT32 *IxNpeMicroCodeImageLibrary = NULL; /* Gets set to proper value at runtime */ +#ifdef CONFIG_IXP4XX_NPE_EXT_UCODE_BASE +static UINT32 *IxNpeMicroCodeImageLibrary = (UINT32 *)CONFIG_IXP4XX_NPE_EXT_UCODE_BASE; #else static UINT32 *IxNpeMicroCodeImageLibrary = (UINT32 *)IxNpeMicrocode_array; #endif +static UINT32* getIxNpeMicroCodeImageLibrary(void) +{ + char *s; + if ((s = getenv("npe_ucode")) != NULL) + return (UINT32*) simple_strtoul(s, NULL, 16); + else + return IxNpeMicroCodeImageLibrary; +} /* * static function prototypes. @@ -158,6 +166,7 @@ PRIVATE BOOL ixNpeDlImageMgrNpeFunctionIdCompare (IxNpeDlImageId *imageIdA, IxNpeDlImageId *imageIdB); +#if 0 PRIVATE IX_STATUS ixNpeDlImageMgrImageFind_legacy (UINT32 *imageLibrary, UINT32 imageId, @@ -195,7 +204,7 @@ ixNpeDlImageMgrMicrocodeImageLibraryOverride ( status); return status; } - +#endif /* * Function definition: ixNpeDlImageMgrImageListExtract @@ -217,9 +226,9 @@ ixNpeDlImageMgrImageListExtract ( IX_NPEDL_TRACE0 (IX_NPEDL_FN_ENTRY_EXIT, "Entering ixNpeDlImageMgrImageListExtract\n"); - header = (IxNpeDlImageMgrImageLibraryHeader *) IxNpeMicroCodeImageLibrary; + header = (IxNpeDlImageMgrImageLibraryHeader *) getIxNpeMicroCodeImageLibrary(); - if (ixNpeDlImageMgrSignatureCheck (IxNpeMicroCodeImageLibrary)) + if (ixNpeDlImageMgrSignatureCheck (getIxNpeMicroCodeImageLibrary())) { /* for each image entry in the image header ... */ while (header->entry[imageCount].eohMarker != @@ -290,9 +299,9 @@ ixNpeDlImageMgrImageLocate ( IX_NPEDL_TRACE0 (IX_NPEDL_FN_ENTRY_EXIT, "Entering ixNpeDlImageMgrImageLocate\n"); - header = (IxNpeDlImageMgrImageLibraryHeader *) IxNpeMicroCodeImageLibrary; + header = (IxNpeDlImageMgrImageLibraryHeader *) getIxNpeMicroCodeImageLibrary(); - if (ixNpeDlImageMgrSignatureCheck (IxNpeMicroCodeImageLibrary)) + if (ixNpeDlImageMgrSignatureCheck (getIxNpeMicroCodeImageLibrary())) { /* for each image entry in the image library header ... */ while (header->entry[imageCount].eohMarker != @@ -307,8 +316,9 @@ ixNpeDlImageMgrImageLocate ( * get pointer to the image in the image library using offset from * 1st word in image library */ + UINT32 *tmp=getIxNpeMicroCodeImageLibrary(); imageOffset = header->entry[imageCount].image.offset; - *imagePtr = &IxNpeMicroCodeImageLibrary[imageOffset]; + *imagePtr = &tmp[imageOffset]; /* get the image size */ *imageSize = header->entry[imageCount].image.size; status = IX_SUCCESS; @@ -353,9 +363,9 @@ ixNpeDlImageMgrLatestImageExtract (IxNpeDlImageId *imageId) IX_NPEDL_TRACE0 (IX_NPEDL_FN_ENTRY_EXIT, "Entering ixNpeDlImageMgrLatestImageExtract\n"); - header = (IxNpeDlImageMgrImageLibraryHeader *) IxNpeMicroCodeImageLibrary; + header = (IxNpeDlImageMgrImageLibraryHeader *) getIxNpeMicroCodeImageLibrary(); - if (ixNpeDlImageMgrSignatureCheck (IxNpeMicroCodeImageLibrary)) + if (ixNpeDlImageMgrSignatureCheck (getIxNpeMicroCodeImageLibrary())) { /* for each image entry in the image library header ... */ while (header->entry[imageCount].eohMarker != @@ -527,6 +537,7 @@ ixNpeDlImageMgrStatsReset (void) } +#if 0 /* * Function definition: ixNpeDlImageMgrImageFind_legacy * @@ -600,7 +611,7 @@ ixNpeDlImageMgrImageFind_legacy ( "Exiting ixNpeDlImageMgrImageFind: status = %d\n", status); return status; } - +#endif /* * Function definition: ixNpeDlImageMgrImageFind @@ -631,10 +642,11 @@ ixNpeDlImageMgrImageFind ( imageLibrary = ixNpeMicrocode_binaryArray; } #else - imageLibrary = IxNpeMicroCodeImageLibrary; + imageLibrary = getIxNpeMicroCodeImageLibrary(); #endif /* IX_NPEDL_READ_MICROCODE_FROM_FILE */ } +#if 0 /* For backward's compatibility with previous image format */ if (ixNpeDlImageMgrSignatureCheck(imageLibrary)) { @@ -643,6 +655,7 @@ ixNpeDlImageMgrImageFind ( imagePtr, imageSize); } +#endif while (*(imageLibrary+offset) == NPE_IMAGE_MARKER) { diff --git a/cpu/ixp/npe/Makefile b/cpu/ixp/npe/Makefile index 7f020b5..25117d7 100644 --- a/cpu/ixp/npe/Makefile +++ b/cpu/ixp/npe/Makefile @@ -72,7 +72,6 @@ COBJS := npe.o \ IxNpeDlImageMgr.o \ IxNpeDlNpeMgr.o \ IxNpeDlNpeMgrUtils.o \ - IxNpeMicrocode.o \ IxNpeMh.o \ IxNpeMhConfig.o \ IxNpeMhReceive.o \ @@ -80,6 +79,9 @@ COBJS := npe.o \ IxNpeMhSolicitedCbMgr.o \ IxNpeMhUnsolicitedCbMgr.o +ifndef CONFIG_IXP4XX_NPE_EXT_UCODE_BASE +COBJS += IxNpeMicrocode.o +endif SRCS := $(START:.o=.S) $(SOBJS:.o=.S) $(COBJS:.o=.c) OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS)) diff --git a/cpu/ixp/serial.c b/cpu/ixp/serial.c index cf520b6..4549631 100644 --- a/cpu/ixp/serial.c +++ b/cpu/ixp/serial.c @@ -58,7 +58,11 @@ void serial_setbrg (void) DLL(uart) = quot & 0xff; DLH(uart) = quot >> 8; LCR(uart) = LCR_WLS0 | LCR_WLS1; - +#ifdef CONFIG_SERIAL_RTS_ACTIVE + MCR(uart) = MCR_RTS; /* set RTS active */ +#else + MCR(uart) = 0; /* set RTS inactive */ +#endif IER(uart) = IER_UUE; } diff --git a/include/asm-arm/mach-types.h b/include/asm-arm/mach-types.h index ef3dd65..aaf2ea2 100644 --- a/include/asm-arm/mach-types.h +++ b/include/asm-arm/mach-types.h @@ -262,7 +262,7 @@ extern unsigned int __machine_arch_type; #define MACH_TYPE_WISMO 249 #define MACH_TYPE_EZLINX 250 #define MACH_TYPE_AT91RM9200 251 -#define MACH_TYPE_ORION 252 +#define MACH_TYPE_ADTECH_ORION 252 #define MACH_TYPE_NEPTUNE 253 #define MACH_TYPE_HACKKIT 254 #define MACH_TYPE_PXA_WINS30 255 @@ -656,7 +656,6 @@ extern unsigned int __machine_arch_type; #define MACH_TYPE_PNX0105 646 #define MACH_TYPE_ADCPOECPU 647 #define MACH_TYPE_CSB637 648 -#define MACH_TYPE_ML69Q6203 649 #define MACH_TYPE_MB9200 650 #define MACH_TYPE_KULUN 651 #define MACH_TYPE_SNAPPER 652 @@ -948,7 +947,6 @@ extern unsigned int __machine_arch_type; #define MACH_TYPE_TTG_COLOR1 940 #define MACH_TYPE_NXEB500HMI 941 #define MACH_TYPE_NETDCU8 942 -#define MACH_TYPE_ML675050_CPU_BOA 943 #define MACH_TYPE_NG_FVX538 944 #define MACH_TYPE_NG_FVS338 945 #define MACH_TYPE_PNX4103 946 @@ -1143,7 +1141,7 @@ extern unsigned int __machine_arch_type; #define MACH_TYPE_REMA 1135 #define MACH_TYPE_BPS1000 1136 #define MACH_TYPE_HW90350 1137 -#define MACH_TYPE_OMAP_SDP3430 1138 +#define MACH_TYPE_OMAP_3430SDP 1138 #define MACH_TYPE_BLUETOUCH 1139 #define MACH_TYPE_VSTMS 1140 #define MACH_TYPE_XSBASE270 1141 @@ -1209,7 +1207,7 @@ extern unsigned int __machine_arch_type; #define MACH_TYPE_KBAT9261 1204 #define MACH_TYPE_CT1100 1205 #define MACH_TYPE_AKCPPXA 1206 -#define MACH_TYPE_ZEVIO_1020 1207 +#define MACH_TYPE_OCHAYA1020 1207 #define MACH_TYPE_HITRACK 1208 #define MACH_TYPE_SYME1 1209 #define MACH_TYPE_SYHL1 1210 @@ -1294,7 +1292,7 @@ extern unsigned int __machine_arch_type; #define MACH_TYPE_H4300 1291 #define MACH_TYPE_GORAMO_MLR 1292 #define MACH_TYPE_MXC30020EVB 1293 -#define MACH_TYPE_ADSBITSIMX 1294 +#define MACH_TYPE_ADSBITSYG5 1294 #define MACH_TYPE_ADSPORTALPLUS 1295 #define MACH_TYPE_MMSP2PLUS 1296 #define MACH_TYPE_EM_X270 1297 @@ -1362,6 +1360,241 @@ extern unsigned int __machine_arch_type; #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_DM350_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_XSCALE_PALMT700P 1421 +#define MACH_TYPE_XSCALE_PALMT700W 1422 +#define MACH_TYPE_XSCALE_PALMT750 1423 +#define MACH_TYPE_XSCALE_PALMT755P 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_HERMES 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_MEDINET 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_HNI_X270 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 #ifdef CONFIG_ARCH_EBSA110 # ifdef machine_arch_type @@ -4363,16 +4596,16 @@ extern unsigned int __machine_arch_type; # define machine_is_at91rm9200() (0) #endif -#ifdef CONFIG_ARCH_ORION +#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_ORION +# define machine_arch_type MACH_TYPE_ADTECH_ORION # endif -# define machine_is_orion() (machine_arch_type == MACH_TYPE_ORION) +# define machine_is_adtech_orion() (machine_arch_type == MACH_TYPE_ADTECH_ORION) #else -# define machine_is_orion() (0) +# define machine_is_adtech_orion() (0) #endif #ifdef CONFIG_ARCH_NEPTUNE @@ -9091,18 +9324,6 @@ extern unsigned int __machine_arch_type; # define machine_is_csb637() (0) #endif -#ifdef CONFIG_MACH_ML69Q6203 -# ifdef machine_arch_type -# undef machine_arch_type -# define machine_arch_type __machine_arch_type -# else -# define machine_arch_type MACH_TYPE_ML69Q6203 -# endif -# define machine_is_ml69q6203() (machine_arch_type == MACH_TYPE_ML69Q6203) -#else -# define machine_is_ml69q6203() (0) -#endif - #ifdef CONFIG_MACH_MB9200 # ifdef machine_arch_type # undef machine_arch_type @@ -12595,18 +12816,6 @@ extern unsigned int __machine_arch_type; # define machine_is_netdcu8() (0) #endif -#ifdef CONFIG_MACH_ML675050_CPU_BOA -# ifdef machine_arch_type -# undef machine_arch_type -# define machine_arch_type __machine_arch_type -# else -# define machine_arch_type MACH_TYPE_ML675050_CPU_BOA -# endif -# define machine_is_ml675050_cpu_boa() (machine_arch_type == MACH_TYPE_ML675050_CPU_BOA) -#else -# define machine_is_ml675050_cpu_boa() (0) -#endif - #ifdef CONFIG_MACH_NG_FVX538 # ifdef machine_arch_type # undef machine_arch_type @@ -14935,16 +15144,16 @@ extern unsigned int __machine_arch_type; # define machine_is_hw90350() (0) #endif -#ifdef CONFIG_MACH_OMAP_SDP3430 +#ifdef CONFIG_MACH_OMAP_3430SDP # ifdef machine_arch_type # undef machine_arch_type # define machine_arch_type __machine_arch_type # else -# define machine_arch_type MACH_TYPE_OMAP_SDP3430 +# define machine_arch_type MACH_TYPE_OMAP_3430SDP # endif -# define machine_is_omap_sdp3430() (machine_arch_type == MACH_TYPE_OMAP_SDP3430) +# define machine_is_omap_3430sdp() (machine_arch_type == MACH_TYPE_OMAP_3430SDP) #else -# define machine_is_omap_sdp3430() (0) +# define machine_is_omap_3430sdp() (0) #endif #ifdef CONFIG_MACH_BLUETOUCH @@ -15727,16 +15936,16 @@ extern unsigned int __machine_arch_type; # define machine_is_akcppxa() (0) #endif -#ifdef CONFIG_MACH_ZEVIO_1020 +#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_ZEVIO_1020 +# define machine_arch_type MACH_TYPE_OCHAYA1020 # endif -# define machine_is_zevio_1020() (machine_arch_type == MACH_TYPE_ZEVIO_1020) +# define machine_is_ochaya1020() (machine_arch_type == MACH_TYPE_OCHAYA1020) #else -# define machine_is_zevio_1020() (0) +# define machine_is_ochaya1020() (0) #endif #ifdef CONFIG_MACH_HITRACK @@ -16747,16 +16956,16 @@ extern unsigned int __machine_arch_type; # define machine_is_mxc30020evb() (0) #endif -#ifdef CONFIG_MACH_ADSBITSIMX +#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_ADSBITSIMX +# define machine_arch_type MACH_TYPE_ADSBITSYG5 # endif -# define machine_is_adsbitsymx() (machine_arch_type == MACH_TYPE_ADSBITSIMX) +# define machine_is_adsbitsyg5() (machine_arch_type == MACH_TYPE_ADSBITSYG5) #else -# define machine_is_adsbitsymx() (0) +# define machine_is_adsbitsyg5() (0) #endif #ifdef CONFIG_MACH_ADSPORTALPLUS @@ -17563,6 +17772,2826 @@ extern unsigned int __machine_arch_type; # 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 +# define machine_arch_type __machine_arch_type +# else +# define machine_arch_type MACH_TYPE_DAVINCI_DM6467_EVM +# endif +# define machine_is_davinci_dm6467_evm() (machine_arch_type == MACH_TYPE_DAVINCI_DM6467_EVM) +#else +# define machine_is_davinci_dm6467_evm() (0) +#endif + +#ifdef CONFIG_MACH_DAVINCI_DM350_EVM +# ifdef machine_arch_type +# undef machine_arch_type +# define machine_arch_type __machine_arch_type +# else +# define machine_arch_type MACH_TYPE_DAVINCI_DM350_EVM +# endif +# define machine_is_davinci_dm355_evm() (machine_arch_type == MACH_TYPE_DAVINCI_DM350_EVM) +#else +# 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 +# define machine_arch_type __machine_arch_type +# else +# define machine_arch_type MACH_TYPE_LITTLETON +# endif +# define machine_is_littleton() (machine_arch_type == MACH_TYPE_LITTLETON) +#else +# 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 +# define machine_arch_type __machine_arch_type +# else +# define machine_arch_type MACH_TYPE_REALVIEW_PB11MP +# endif +# define machine_is_realview_pb11mp() (machine_arch_type == MACH_TYPE_REALVIEW_PB11MP) +#else +# 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_XSCALE_PALMT700P +# ifdef machine_arch_type +# undef machine_arch_type +# define machine_arch_type __machine_arch_type +# else +# define machine_arch_type MACH_TYPE_XSCALE_PALMT700P +# endif +# define machine_is_xscale_palmt700p() (machine_arch_type == MACH_TYPE_XSCALE_PALMT700P) +#else +# define machine_is_xscale_palmt700p() (0) +#endif + +#ifdef CONFIG_MACH_XSCALE_PALMT700W +# ifdef machine_arch_type +# undef machine_arch_type +# define machine_arch_type __machine_arch_type +# else +# define machine_arch_type MACH_TYPE_XSCALE_PALMT700W +# endif +# define machine_is_xscale_palmt700w() (machine_arch_type == MACH_TYPE_XSCALE_PALMT700W) +#else +# define machine_is_xscale_palmt700w() (0) +#endif + +#ifdef CONFIG_MACH_XSCALE_PALMT750 +# ifdef machine_arch_type +# undef machine_arch_type +# define machine_arch_type __machine_arch_type +# else +# define machine_arch_type MACH_TYPE_XSCALE_PALMT750 +# endif +# define machine_is_xscale_palmt750() (machine_arch_type == MACH_TYPE_XSCALE_PALMT750) +#else +# define machine_is_xscale_palmt750() (0) +#endif + +#ifdef CONFIG_MACH_XSCALE_PALMT755P +# ifdef machine_arch_type +# undef machine_arch_type +# define machine_arch_type __machine_arch_type +# else +# define machine_arch_type MACH_TYPE_XSCALE_PALMT755P +# endif +# define machine_is_xscale_palmt755p() (machine_arch_type == MACH_TYPE_XSCALE_PALMT755P) +#else +# define machine_is_xscale_palmt755p() (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 +# define machine_arch_type __machine_arch_type +# else +# define machine_arch_type MACH_TYPE_MX27_3DS +# endif +# define machine_is_mx27_3ds() (machine_arch_type == MACH_TYPE_MX27_3DS) +#else +# 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 +# define machine_arch_type __machine_arch_type +# else +# define machine_arch_type MACH_TYPE_HALIBUT +# endif +# define machine_is_halibut() (machine_arch_type == MACH_TYPE_HALIBUT) +#else +# define machine_is_halibut() (0) +#endif + +#ifdef CONFIG_MACH_TROUT +# ifdef machine_arch_type +# undef machine_arch_type +# define machine_arch_type __machine_arch_type +# else +# define machine_arch_type MACH_TYPE_TROUT +# endif +# define machine_is_trout() (machine_arch_type == MACH_TYPE_TROUT) +#else +# 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 +# define machine_arch_type __machine_arch_type +# else +# define machine_arch_type MACH_TYPE_TCT_HAMMER +# endif +# define machine_is_tct_hammer() (machine_arch_type == MACH_TYPE_TCT_HAMMER) +#else +# define machine_is_tct_hammer() (0) +#endif + +#ifdef CONFIG_MACH_HERMES +# ifdef machine_arch_type +# undef machine_arch_type +# define machine_arch_type __machine_arch_type +# else +# define machine_arch_type MACH_TYPE_HERMES +# endif +# define machine_is_herald() (machine_arch_type == MACH_TYPE_HERMES) +#else +# 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_MEDINET +# ifdef machine_arch_type +# undef machine_arch_type +# define machine_arch_type __machine_arch_type +# else +# define machine_arch_type MACH_TYPE_ADX_MEDINET +# endif +# define machine_is_adx_medinet() (machine_arch_type == MACH_TYPE_ADX_MEDINET) +#else +# define machine_is_adx_medinet() (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 +# define machine_arch_type __machine_arch_type +# else +# define machine_arch_type MACH_TYPE_SIM_ONE +# endif +# define machine_is_sim_one() (machine_arch_type == MACH_TYPE_SIM_ONE) +#else +# 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 +# define machine_arch_type __machine_arch_type +# else +# define machine_arch_type MACH_TYPE_JIVE +# endif +# define machine_is_jive() (machine_arch_type == MACH_TYPE_JIVE) +#else +# 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 +# define machine_arch_type __machine_arch_type +# else +# define machine_arch_type MACH_TYPE_SAM9_L9260 +# endif +# define machine_is_sam9_l9260() (machine_arch_type == MACH_TYPE_SAM9_L9260) +#else +# 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 +# define machine_arch_type __machine_arch_type +# else +# define machine_arch_type MACH_TYPE_REALVIEW_PB1176 +# endif +# define machine_is_realview_pb1176() (machine_arch_type == MACH_TYPE_REALVIEW_PB1176) +#else +# 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 +# define machine_arch_type __machine_arch_type +# else +# define machine_arch_type MACH_TYPE_YL9200 +# endif +# define machine_is_yl9200() (machine_arch_type == MACH_TYPE_YL9200) +#else +# define machine_is_yl9200() (0) +#endif + +#ifdef CONFIG_MACH_RD88F5182 +# ifdef machine_arch_type +# undef machine_arch_type +# define machine_arch_type __machine_arch_type +# else +# define machine_arch_type MACH_TYPE_RD88F5182 +# endif +# define machine_is_rd88f5182() (machine_arch_type == MACH_TYPE_RD88F5182) +#else +# define machine_is_rd88f5182() (0) +#endif + +#ifdef CONFIG_MACH_KUROBOX_PRO +# ifdef machine_arch_type +# undef machine_arch_type +# define machine_arch_type __machine_arch_type +# else +# define machine_arch_type MACH_TYPE_KUROBOX_PRO +# endif +# define machine_is_kurobox_pro() (machine_arch_type == MACH_TYPE_KUROBOX_PRO) +#else +# 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 +# define machine_arch_type __machine_arch_type +# else +# define machine_arch_type MACH_TYPE_MX31_3DS +# endif +# define machine_is_mx31_3ds() (machine_arch_type == MACH_TYPE_MX31_3DS) +#else +# 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_HNI_X270 +# ifdef machine_arch_type +# undef machine_arch_type +# define machine_arch_type __machine_arch_type +# else +# define machine_arch_type MACH_TYPE_HNI_X270 +# endif +# define machine_is_hni270() (machine_arch_type == MACH_TYPE_HNI_X270) +#else +# define machine_is_hni270() (0) +#endif + +#ifdef CONFIG_MACH_QONG +# ifdef machine_arch_type +# undef machine_arch_type +# define machine_arch_type __machine_arch_type +# else +# define machine_arch_type MACH_TYPE_QONG +# endif +# define machine_is_qong() (machine_arch_type == MACH_TYPE_QONG) +#else +# 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 +# define machine_arch_type __machine_arch_type +# else +# define machine_arch_type MACH_TYPE_OMAP2EVM +# endif +# define machine_is_omap2evm() (machine_arch_type == MACH_TYPE_OMAP2EVM) +#else +# define machine_is_omap2evm() (0) +#endif + +#ifdef CONFIG_MACH_OMAP3EVM +# ifdef machine_arch_type +# undef machine_arch_type +# define machine_arch_type __machine_arch_type +# else +# define machine_arch_type MACH_TYPE_OMAP3EVM +# endif +# define machine_is_omap3evm() (machine_arch_type == MACH_TYPE_OMAP3EVM) +#else +# 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 +# define machine_arch_type __machine_arch_type +# else +# define machine_arch_type MACH_TYPE_DNS323 +# endif +# define machine_is_dns323() (machine_arch_type == MACH_TYPE_DNS323) +#else +# 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 +# define machine_arch_type __machine_arch_type +# else +# define machine_arch_type MACH_TYPE_OMAP3_BEAGLE +# endif +# define machine_is_omap3_beagle() (machine_arch_type == MACH_TYPE_OMAP3_BEAGLE) +#else +# 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 +# define machine_arch_type __machine_arch_type +# else +# define machine_arch_type MACH_TYPE_NOKIA_N810 +# endif +# define machine_is_nokia_n810() (machine_arch_type == MACH_TYPE_NOKIA_N810) +#else +# 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 +# define machine_arch_type __machine_arch_type +# else +# define machine_arch_type MACH_TYPE_PCM038 +# endif +# define machine_is_pcm038() (machine_arch_type == MACH_TYPE_PCM038) +#else +# 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 +# define machine_arch_type __machine_arch_type +# else +# define machine_arch_type MACH_TYPE_TS209 +# endif +# define machine_is_ts_x09() (machine_arch_type == MACH_TYPE_TS209) +#else +# define machine_is_ts_x09() (0) +#endif + +#ifdef CONFIG_MACH_AT91CAP9ADK +# ifdef machine_arch_type +# undef machine_arch_type +# define machine_arch_type __machine_arch_type +# else +# define machine_arch_type MACH_TYPE_AT91CAP9ADK +# endif +# define machine_is_at91cap9adk() (machine_arch_type == MACH_TYPE_AT91CAP9ADK) +#else +# 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 +# define machine_arch_type __machine_arch_type +# else +# define machine_arch_type MACH_TYPE_MX31MOBOARD +# endif +# define machine_is_mx31moboard() (machine_arch_type == MACH_TYPE_MX31MOBOARD) +#else +# 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 +# define machine_arch_type __machine_arch_type +# else +# define machine_arch_type MACH_TYPE_TERASTATION_PRO2 +# endif +# define machine_is_terastation_pro2() (machine_arch_type == MACH_TYPE_TERASTATION_PRO2) +#else +# define machine_is_terastation_pro2() (0) +#endif + +#ifdef CONFIG_MACH_LINKSTATION_PRO +# ifdef machine_arch_type +# undef machine_arch_type +# define machine_arch_type __machine_arch_type +# else +# define machine_arch_type MACH_TYPE_LINKSTATION_PRO +# endif +# define machine_is_linkstation_pro() (machine_arch_type == MACH_TYPE_LINKSTATION_PRO) +#else +# 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 +# define machine_arch_type __machine_arch_type +# else +# define machine_arch_type MACH_TYPE_E350 +# endif +# define machine_is_e350() (machine_arch_type == MACH_TYPE_E350) +#else +# 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 +# define machine_arch_type __machine_arch_type +# else +# define machine_arch_type MACH_TYPE_TS409 +# endif +# define machine_is_ts409() (machine_arch_type == MACH_TYPE_TS409) +#else +# 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 + /* * These have not yet been registered */ diff --git a/include/configs/actux1.h b/include/configs/actux1.h new file mode 100644 index 0000000..4c4b1d1 --- /dev/null +++ b/include/configs/actux1.h @@ -0,0 +1,247 @@ +/* + * (C) Copyright 2007 + * Michael Schwingen, michael@schwingen.org + * + * Configuration settings for the AcTux-1 board. + * + * 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 __CONFIG_H +#define __CONFIG_H + +/* 1: modified board with 32MB DRAM */ +#define CONFIG_ACTUX1_32MB 0 +/* 1: 2*2MB FLASH (standard) */ +#define CONFIG_ACTUX1_FLASH2X2 1 +/* 1: 1*8MB FLASH (upgraded boards) */ +#define CONFIG_ACTUX1_FLASH1X8 0 + +#define CONFIG_IXP425 1 +#define CONFIG_ACTUX1 1 + +#define CONFIG_DISPLAY_CPUINFO 1 +#define CONFIG_DISPLAY_BOARDINFO 1 + +#define CFG_IXP425_CONSOLE IXP425_UART2 +#define CONFIG_BAUDRATE 115200 +#define CONFIG_BOOTDELAY 3 +#define CONFIG_ZERO_BOOTDELAY_CHECK /* check for keypress on bootdelay==0 */ + +/*************************************************************** + * U-boot generic defines start here. + ***************************************************************/ +#undef CONFIG_USE_IRQ + +/* + * Size of malloc() pool + */ +#define CFG_MALLOC_LEN (CFG_ENV_SIZE + 128*1024) +/* size in bytes reserved for initial data */ +#define CFG_GBL_DATA_SIZE 128 + +/* allow to overwrite serial and ethaddr */ +#define CONFIG_ENV_OVERWRITE + +/* Command line configuration. */ +#include <config_cmd_default.h> + +#define CONFIG_CMD_ELF +#undef CONFIG_CMD_PCI +#undef CONFIG_PCI + +#define CONFIG_BOOTCOMMAND "run boot_flash" +/* enable passing of ATAGs */ +#define CONFIG_CMDLINE_TAG 1 +#define CONFIG_SETUP_MEMORY_TAGS 1 +#define CONFIG_INITRD_TAG 1 +#define CONFIG_REVISION_TAG 1 + +#if defined(CONFIG_CMD_KGDB) +# define CONFIG_KGDB_BAUDRATE 230400 +/* which serial port to use */ +# define CONFIG_KGDB_SER_INDEX 1 +#endif + +/* Miscellaneous configurable options */ +#define CFG_LONGHELP +#define CFG_PROMPT "=> " +/* Console I/O Buffer Size */ +#define CFG_CBSIZE 256 +/* Print Buffer Size */ +#define CFG_PBSIZE (CFG_CBSIZE+sizeof(CFG_PROMPT)+16) +/* max number of command args */ +#define CFG_MAXARGS 16 +/* Boot Argument Buffer Size */ +#define CFG_BARGSIZE CFG_CBSIZE + +#define CFG_MEMTEST_START 0x00400000 +#define CFG_MEMTEST_END 0x00800000 + +/* everything, incl board info, in Hz */ +#undef CFG_CLKS_IN_HZ +/* spec says 66.666 MHz, but it appears to be 33 */ +#define CFG_HZ 3333333 + +/* default load address */ +#define CFG_LOAD_ADDR 0x00010000 + +/* valid baudrates */ +#define CFG_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, \ + 115200, 230400 } +#define CONFIG_SERIAL_RTS_ACTIVE 1 + +/* + * 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 + +/* Expansion bus settings */ +#define CFG_EXP_CS0 0xbd113842 + +/* SDRAM settings */ +#define CONFIG_NR_DRAM_BANKS 1 +#define PHYS_SDRAM_1 0x00000000 +#define CFG_DRAM_BASE 0x00000000 + +#if CONFIG_ACTUX1_32MB +# define CFG_SDR_CONFIG 0x18 +# define PHYS_SDRAM_1_SIZE 0x02000000 +# define CFG_SDRAM_REFRESH_CNT 0x81a +# define CFG_SDR_MODE_CONFIG 0x1 +# define CFG_DRAM_SIZE 0x02000000 +#else /* 16MB SDRAM */ +# define CFG_SDR_CONFIG 0x3A +# define PHYS_SDRAM_1_SIZE 0x01000000 +# define CFG_SDRAM_REFRESH_CNT 0x81a +# define CFG_SDR_MODE_CONFIG 0x1 +# define CFG_DRAM_SIZE 0x01000000 +#endif + +/* FLASH organization */ +#if CONFIG_ACTUX1_FLASH2X2 +# define CFG_MAX_FLASH_BANKS 2 +/* max number of sectors on one chip */ +# define CFG_MAX_FLASH_SECT 40 +# define PHYS_FLASH_1 0x50000000 +# define PHYS_FLASH_2 0x50200000 +# define CFG_FLASH_BANKS_LIST { PHYS_FLASH_1, PHYS_FLASH_2 } +#endif +#if CONFIG_ACTUX1_FLASH1X8 +# define CFG_MAX_FLASH_BANKS 1 +/* max number of sectors on one chip */ +# define CFG_MAX_FLASH_SECT 140 +# define PHYS_FLASH_1 0x50000000 +# define CFG_FLASH_BANKS_LIST { PHYS_FLASH_1 } +#endif + +#define CFG_FLASH_BASE PHYS_FLASH_1 +#define CFG_MONITOR_BASE PHYS_FLASH_1 +#define CFG_MONITOR_LEN (256 << 10) + +/* Use common CFI driver */ +#define CFG_FLASH_CFI +#define CFG_FLASH_CFI_DRIVER +/* no byte writes on IXP4xx */ +#define CFG_FLASH_CFI_WIDTH FLASH_CFI_16BIT +/* print 'E' for empty sector on flinfo */ +#define CFG_FLASH_EMPTY_INFO + +/* Ethernet */ + +/* include IXP4xx NPE support */ +#define CONFIG_IXP4XX_NPE 1 +/* use separate flash sector with ucode images */ +#define CONFIG_IXP4XX_NPE_EXT_UCODE_BASE 0x50040000 +#define CONFIG_NET_MULTI 1 +/* NPE0 PHY address */ +#define CONFIG_PHY_ADDR 0 +/* MII PHY management */ +#define CONFIG_MII 1 +/* Number of ethernet rx buffers & descriptors */ +#define CFG_RX_ETH_BUFFER 16 +#define CONFIG_RESET_PHY_R 1 + +#define CONFIG_CMD_DHCP +#define CONFIG_CMD_NET +#define CONFIG_CMD_MII +#define CONFIG_CMD_PING +#undef CONFIG_CMD_NFS + +/* BOOTP options */ +#define CONFIG_BOOTP_BOOTFILESIZE +#define CONFIG_BOOTP_BOOTPATH +#define CONFIG_BOOTP_GATEWAY +#define CONFIG_BOOTP_HOSTNAME + +/* Cache Configuration */ +#define CFG_CACHELINE_SIZE 32 + +/* + * environment organization: + * one flash sector, embedded in uboot area (bottom bootblock flash) + */ +#define CFG_ENV_IS_IN_FLASH 1 +#define CFG_ENV_SIZE 0x2000 +#define CFG_ENV_ADDR (PHYS_FLASH_1 + 0x4000) +#define CFG_USE_PPCENV 1 + +#define CONFIG_EXTRA_ENV_SETTINGS \ + "mtd=IXP4XX-Flash.0:256k(uboot),64k(ucode),1152k(linux),-(root)\0" \ + "kerneladdr=50050000\0" \ + "rootaddr=50170000\0" \ + "loadaddr=10000\0" \ + "updateboot_ser=mw.b 10000 ff 40000;" \ + " loady ${loadaddr};" \ + " run eraseboot writeboot\0" \ + "updateboot_net=mw.b 10000 ff 40000;" \ + " tftp ${loadaddr} u-boot.bin;" \ + " run eraseboot writeboot\0" \ + "eraseboot=protect off 50000000 50003fff;" \ + " protect off 50006000 5003ffff;" \ + " erase 50000000 50003fff;" \ + " erase 50006000 5003ffff\0" \ + "writeboot=cp.b 10000 50000000 4000;" \ + " cp.b 16000 50006000 3a000\0" \ + "eraseenv=protect off 50004000 50005fff;" \ + " erase 50004000 50005fff\0" \ + "updateroot=tftp ${loadaddr} ${rootfile};" \ + " era ${rootaddr} +${filesize};" \ + " cp.b ${loadaddr} ${rootaddr} ${filesize}\0" \ + "updatekern=tftp ${loadaddr} ${kernelfile};" \ + " era ${kerneladdr} +${filesize};" \ + " cp.b ${loadaddr} ${kerneladdr} ${filesize}\0" \ + "flashargs=setenv bootargs mtdparts=${mtd} root=/dev/mtdblock3" \ + " rootfstype=squashfs,jffs2 init=/etc/preinit\0" \ + "netargs=setenv bootargs mtdparts=${mtd} root=/dev/mtdblock3" \ + " rootfstype=squashfs,jffs2 init=/etc/preinit\0" \ + "addtty=setenv bootargs ${bootargs} console=ttyS0,${baudrate}\0" \ + "addeth=setenv bootargs ${bootargs} ethaddr=${ethaddr}\0" \ + "boot_flash=run flashargs addtty addeth;" \ + " bootm ${kerneladdr}\0" \ + "boot_net=run netargs addtty addeth;" \ + " tftpboot ${loadaddr} ${kernelfile};" \ + " bootm\0" + +#endif /* __CONFIG_H */ diff --git a/include/configs/actux2.h b/include/configs/actux2.h new file mode 100644 index 0000000..873fced --- /dev/null +++ b/include/configs/actux2.h @@ -0,0 +1,224 @@ +/* + * (C) Copyright 2007 + * Michael Schwingen, michael@schwingen.org + * + * Configuration settings for the AcTux-2 board. + * + * 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 __CONFIG_H +#define __CONFIG_H + +#define CONFIG_IXP425 1 +#define CONFIG_ACTUX2 1 + +#define CONFIG_DISPLAY_CPUINFO 1 +#define CONFIG_DISPLAY_BOARDINFO 1 + +#define CFG_IXP425_CONSOLE IXP425_UART2 +#define CONFIG_BAUDRATE 115200 +#define CONFIG_BOOTDELAY 5 +#define CONFIG_ZERO_BOOTDELAY_CHECK /* check for keypress on bootdelay==0 */ + +/*************************************************************** + * U-boot generic defines start here. + ***************************************************************/ +#undef CONFIG_USE_IRQ + +/* Size of malloc() pool */ +#define CFG_MALLOC_LEN (CFG_ENV_SIZE + 128*1024) +/* size in bytes reserved for initial data */ +#define CFG_GBL_DATA_SIZE 128 + +/* allow to overwrite serial and ethaddr */ +#define CONFIG_ENV_OVERWRITE + +/* Command line configuration. */ +#include <config_cmd_default.h> + +#define CONFIG_CMD_ELF +#undef CONFIG_CMD_PCI +#undef CONFIG_PCI + +#define CONFIG_BOOTCOMMAND "run boot_flash" +/* enable passing of ATAGs */ +#define CONFIG_CMDLINE_TAG 1 +#define CONFIG_SETUP_MEMORY_TAGS 1 +#define CONFIG_INITRD_TAG 1 +#define CONFIG_REVISION_TAG 1 + +#if defined(CONFIG_CMD_KGDB) +# define CONFIG_KGDB_BAUDRATE 230400 +/* which serial port to use */ +# define CONFIG_KGDB_SER_INDEX 1 +#endif + +/* Miscellaneous configurable options */ +#define CFG_LONGHELP +#define CFG_PROMPT "=> " +/* Console I/O Buffer Size */ +#define CFG_CBSIZE 256 +/* Print Buffer Size */ +#define CFG_PBSIZE (CFG_CBSIZE+sizeof(CFG_PROMPT)+16) +/* max number of command args */ +#define CFG_MAXARGS 16 +/* Boot Argument Buffer Size */ +#define CFG_BARGSIZE CFG_CBSIZE + +#define CFG_MEMTEST_START 0x00400000 +#define CFG_MEMTEST_END 0x00800000 + +/* everything, incl board info, in Hz */ +#undef CFG_CLKS_IN_HZ +/* spec says 66.666 MHz, but it appears to be 33 */ +#define CFG_HZ 3333333 + +/* default load address */ +#define CFG_LOAD_ADDR 0x00010000 + +/* valid baudrates */ +#define CFG_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, \ + 115200, 230400 } +#define CONFIG_SERIAL_RTS_ACTIVE 1 + +/* + * 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 + +/* Expansion bus settings */ +#define CFG_EXP_CS0 0xbd113042 + +/* SDRAM settings */ +#define CONFIG_NR_DRAM_BANKS 1 +#define PHYS_SDRAM_1 0x00000000 +#define CFG_DRAM_BASE 0x00000000 + +/* 16MB SDRAM */ +#define CFG_SDR_CONFIG 0x3A +#define PHYS_SDRAM_1_SIZE 0x01000000 +#define CFG_SDRAM_REFRESH_CNT 0x81a +#define CFG_SDR_MODE_CONFIG 0x1 +#define CFG_DRAM_SIZE 0x01000000 + +/* FLASH organization */ +#define CFG_MAX_FLASH_BANKS 1 +/* max number of sectors on one chip */ +#define CFG_MAX_FLASH_SECT 140 +#define PHYS_FLASH_1 0x50000000 +#define CFG_FLASH_BANKS_LIST { PHYS_FLASH_1 } + +#define CFG_FLASH_BASE PHYS_FLASH_1 +#define CFG_MONITOR_BASE PHYS_FLASH_1 +#define CFG_MONITOR_LEN (256 << 10) + +/* Use common CFI driver */ +#define CFG_FLASH_CFI +#define CFG_FLASH_CFI_DRIVER +/* no byte writes on IXP4xx */ +#define CFG_FLASH_CFI_WIDTH FLASH_CFI_16BIT + +/* print 'E' for empty sector on flinfo */ +#define CFG_FLASH_EMPTY_INFO + +/* Ethernet */ + +/* include IXP4xx NPE support */ +#define CONFIG_IXP4XX_NPE 1 +/* use separate flash sector with ucode images */ +#define CONFIG_IXP4XX_NPE_EXT_UCODE_BASE 0x50040000 +#define CONFIG_NET_MULTI 1 +/* NPE0 PHY address */ +#define CONFIG_PHY_ADDR 0x00 +/* MII PHY management */ +#define CONFIG_MII 1 +/* Number of ethernet rx buffers & descriptors */ +#define CFG_RX_ETH_BUFFER 16 +#define CONFIG_RESET_PHY_R 1 +/* ethernet switch connected to MII port */ +#define CONFIG_MII_ETHSWITCH 1 + +#define CONFIG_CMD_DHCP +#define CONFIG_CMD_NET +#define CONFIG_CMD_MII +#define CONFIG_CMD_PING +#undef CONFIG_CMD_NFS + +/* BOOTP options */ +#define CONFIG_BOOTP_BOOTFILESIZE +#define CONFIG_BOOTP_BOOTPATH +#define CONFIG_BOOTP_GATEWAY +#define CONFIG_BOOTP_HOSTNAME + +/* Cache Configuration */ +#define CFG_CACHELINE_SIZE 32 + +/* + * environment organization: + * one flash sector, embedded in uboot area (bottom bootblock flash) + */ +#define CFG_ENV_IS_IN_FLASH 1 +#define CFG_ENV_SIZE 0x2000 +#define CFG_ENV_ADDR (PHYS_FLASH_1 + 0x4000) +#define CFG_USE_PPCENV 1 + +#define CONFIG_EXTRA_ENV_SETTINGS \ + "mtd=IXP4XX-Flash.0:256k(uboot),64k(ucode),1152k(linux),-(root)\0" \ + "kerneladdr=50050000\0" \ + "rootaddr=50170000\0" \ + "loadaddr=10000\0" \ + "updateboot_ser=mw.b 10000 ff 40000;" \ + " loady ${loadaddr};" \ + " run eraseboot writeboot\0" \ + "updateboot_net=mw.b 10000 ff 40000;" \ + " tftp ${loadaddr} u-boot.bin;" \ + " run eraseboot writeboot\0" \ + "eraseboot=protect off 50000000 50003fff;" \ + " protect off 50006000 5003ffff;" \ + " erase 50000000 50003fff;" \ + " erase 50006000 5003ffff\0" \ + "writeboot=cp.b 10000 50000000 4000;" \ + " cp.b 16000 50006000 3a000\0" \ + "eraseenv=protect off 50004000 50005fff;" \ + " erase 50004000 50005fff\0" \ + "updateroot=tftp ${loadaddr} ${rootfile};" \ + " era ${rootaddr} +${filesize};" \ + " cp.b ${loadaddr} ${rootaddr} ${filesize}\0" \ + "updatekern=tftp ${loadaddr} ${kernelfile};" \ + " era ${kerneladdr} +${filesize};" \ + " cp.b ${loadaddr} ${kerneladdr} ${filesize}\0" \ + "flashargs=setenv bootargs mtdparts=${mtd} root=/dev/mtdblock3" \ + " rootfstype=squashfs,jffs2 init=/etc/preinit\0" \ + "netargs=setenv bootargs mtdparts=${mtd} root=/dev/mtdblock3" \ + " rootfstype=squashfs,jffs2 init=/etc/preinit\0" \ + "addtty=setenv bootargs ${bootargs} console=ttyS0,${baudrate}\0" \ + "addeth=setenv bootargs ${bootargs} ethaddr=${ethaddr}\0" \ + "boot_flash=run flashargs addtty addeth;" \ + " bootm ${kerneladdr}\0" \ + "boot_net=run netargs addtty addeth;" \ + " tftpboot ${loadaddr} ${kernelfile};" \ + " bootm\0" + +#endif /* __CONFIG_H */ diff --git a/include/configs/actux3.h b/include/configs/actux3.h new file mode 100644 index 0000000..5e468e6 --- /dev/null +++ b/include/configs/actux3.h @@ -0,0 +1,224 @@ +/* + * (C) Copyright 2007 + * Michael Schwingen, michael@schwingen.org + * + * Configuration settings for the AcTux-3 board. + * + * 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 __CONFIG_H +#define __CONFIG_H + +#define CONFIG_IXP425 1 +#define CONFIG_ACTUX3 1 + +#define CONFIG_DISPLAY_CPUINFO 1 +#define CONFIG_DISPLAY_BOARDINFO 1 + +#define CFG_IXP425_CONSOLE IXP425_UART2 +#define CONFIG_BAUDRATE 115200 +#define CONFIG_BOOTDELAY 3 +#define CONFIG_ZERO_BOOTDELAY_CHECK /* check for keypress on bootdelay==0 */ + +/*************************************************************** + * U-boot generic defines start here. + ***************************************************************/ +#undef CONFIG_USE_IRQ + +/* Size of malloc() pool */ +#define CFG_MALLOC_LEN (CFG_ENV_SIZE + 128*1024) +/* size in bytes reserved for initial data */ +#define CFG_GBL_DATA_SIZE 128 + +/* allow to overwrite serial and ethaddr */ +#define CONFIG_ENV_OVERWRITE + +/* Command line configuration. */ +#include <config_cmd_default.h> + +#define CONFIG_CMD_ELF + +#define CONFIG_BOOTCOMMAND "run boot_flash" +/* enable passing of ATAGs */ +#define CONFIG_CMDLINE_TAG 1 +#define CONFIG_SETUP_MEMORY_TAGS 1 +#define CONFIG_INITRD_TAG 1 +#define CONFIG_REVISION_TAG 1 + +#if defined(CONFIG_CMD_KGDB) +# define CONFIG_KGDB_BAUDRATE 230400 +/* which serial port to use */ +# define CONFIG_KGDB_SER_INDEX 1 +#endif + +/* Miscellaneous configurable options */ +#define CFG_LONGHELP +#define CFG_PROMPT "=> " +/* Console I/O Buffer Size */ +#define CFG_CBSIZE 256 +/* Print Buffer Size */ +#define CFG_PBSIZE (CFG_CBSIZE+sizeof(CFG_PROMPT)+16) +/* max number of command args */ +#define CFG_MAXARGS 16 +/* Boot Argument Buffer Size */ +#define CFG_BARGSIZE CFG_CBSIZE + +#define CFG_MEMTEST_START 0x00400000 +#define CFG_MEMTEST_END 0x00800000 + +/* everything, incl board info, in Hz */ +#undef CFG_CLKS_IN_HZ +/* spec says 66.666 MHz, but it appears to be 33 */ +#define CFG_HZ 3333333 + +/* default load address */ +#define CFG_LOAD_ADDR 0x00010000 + +/* valid baudrates */ +#define CFG_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, \ + 115200, 230400 } +#define CONFIG_SERIAL_RTS_ACTIVE 1 + +/* + * 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 + +/* Expansion bus settings */ +#define CFG_EXP_CS0 0xbd113442 + +/* SDRAM settings */ +#define CONFIG_NR_DRAM_BANKS 1 +#define PHYS_SDRAM_1 0x00000000 +#define CFG_DRAM_BASE 0x00000000 + +/* 16MB SDRAM */ +#define CFG_SDR_CONFIG 0x3A +#define PHYS_SDRAM_1_SIZE 0x01000000 +#define CFG_SDRAM_REFRESH_CNT 0x81a +#define CFG_SDR_MODE_CONFIG 0x1 +#define CFG_DRAM_SIZE 0x01000000 + +/* FLASH organization */ +#define CFG_MAX_FLASH_BANKS 1 +/* max number of sectors on one chip */ +#define CFG_MAX_FLASH_SECT 140 +#define PHYS_FLASH_1 0x50000000 +#define CFG_FLASH_BANKS_LIST { PHYS_FLASH_1 } + +#define CFG_FLASH_BASE PHYS_FLASH_1 +#define CFG_MONITOR_BASE PHYS_FLASH_1 +#define CFG_MONITOR_LEN (256 << 10) + +/* Use common CFI driver */ +#define CFG_FLASH_CFI +#define CFG_FLASH_CFI_DRIVER +/* no byte writes on IXP4xx */ +#define CFG_FLASH_CFI_WIDTH FLASH_CFI_16BIT + +/* print 'E' for empty sector on flinfo */ +#define CFG_FLASH_EMPTY_INFO + +/* Ethernet */ + +/* include IXP4xx NPE support */ +#define CONFIG_IXP4XX_NPE 1 +/* use separate flash sector with ucode images */ +#define CONFIG_IXP4XX_NPE_EXT_UCODE_BASE 0x50040000 + +#define CONFIG_NET_MULTI 1 +/* NPE0 PHY address */ +#define CONFIG_PHY_ADDR 0x10 +/* MII PHY management */ +#define CONFIG_MII 1 +/* Number of ethernet rx buffers & descriptors */ +#define CFG_RX_ETH_BUFFER 16 +#define CONFIG_RESET_PHY_R 1 +/* ethernet switch connected to MII port */ +#define CONFIG_MII_ETHSWITCH 1 + +#define CONFIG_CMD_DHCP +#define CONFIG_CMD_NET +#define CONFIG_CMD_MII +#define CONFIG_CMD_PING +#undef CONFIG_CMD_NFS + +/* BOOTP options */ +#define CONFIG_BOOTP_BOOTFILESIZE +#define CONFIG_BOOTP_BOOTPATH +#define CONFIG_BOOTP_GATEWAY +#define CONFIG_BOOTP_HOSTNAME + +/* Cache Configuration */ +#define CFG_CACHELINE_SIZE 32 + +/* + * environment organization: + * one flash sector, embedded in uboot area (bottom bootblock flash) + */ +#define CFG_ENV_IS_IN_FLASH 1 +#define CFG_ENV_SIZE 0x2000 +#define CFG_ENV_ADDR (PHYS_FLASH_1 + 0x4000) +#define CFG_USE_PPCENV 1 + +#define CONFIG_EXTRA_ENV_SETTINGS \ + "mtd=IXP4XX-Flash.0:256k(uboot),64k(ucode),1152k(linux),-(root)\0" \ + "kerneladdr=50050000\0" \ + "rootaddr=50170000\0" \ + "loadaddr=10000\0" \ + "updateboot_ser=mw.b 10000 ff 40000;" \ + " loady ${loadaddr};" \ + " run eraseboot writeboot\0" \ + "updateboot_net=mw.b 10000 ff 40000;" \ + " tftp ${loadaddr} u-boot.bin;" \ + " run eraseboot writeboot\0" \ + "eraseboot=protect off 50000000 50003fff;" \ + " protect off 50006000 5003ffff;" \ + " erase 50000000 50003fff;" \ + " erase 50006000 5003ffff\0" \ + "writeboot=cp.b 10000 50000000 4000;" \ + " cp.b 16000 50006000 3a000\0" \ + "eraseenv=protect off 50004000 50005fff;" \ + " erase 50004000 50005fff\0" \ + "updateroot=tftp ${loadaddr} ${rootfile};" \ + " era ${rootaddr} +${filesize};" \ + " cp.b ${loadaddr} ${rootaddr} ${filesize}\0" \ + "updatekern=tftp ${loadaddr} ${kernelfile};" \ + " era ${kerneladdr} +${filesize};" \ + " cp.b ${loadaddr} ${kerneladdr} ${filesize}\0" \ + "flashargs=setenv bootargs mtdparts=${mtd} root=/dev/mtdblock3" \ + " rootfstype=squashfs,jffs2 init=/etc/preinit\0" \ + "netargs=setenv bootargs mtdparts=${mtd} root=/dev/mtdblock3" \ + " rootfstype=squashfs,jffs2 init=/etc/preinit\0" \ + "addtty=setenv bootargs ${bootargs} console=ttyS0,${baudrate}\0" \ + "addeth=setenv bootargs ${bootargs} ethaddr=${ethaddr}\0" \ + "boot_flash=run flashargs addtty addeth;" \ + " bootm ${kerneladdr}\0" \ + "boot_net=run netargs addtty addeth;" \ + " tftpboot ${loadaddr} ${kernelfile};" \ + " bootm\0" + +#endif /* __CONFIG_H */ diff --git a/include/configs/actux4.h b/include/configs/actux4.h new file mode 100644 index 0000000..e4dca2a --- /dev/null +++ b/include/configs/actux4.h @@ -0,0 +1,218 @@ +/* + * (C) Copyright 2007 + * Michael Schwingen, michael@schwingen.org + * + * Configuration settings for the AcTux-4 board. + * + * 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 __CONFIG_H +#define __CONFIG_H + +#define CONFIG_IXP425 1 +#define CONFIG_ACTUX4 1 + +#define CONFIG_DISPLAY_CPUINFO 1 +#define CONFIG_DISPLAY_BOARDINFO 1 + +#define CFG_IXP425_CONSOLE IXP425_UART1 +#define CONFIG_BAUDRATE 115200 +#define CONFIG_BOOTDELAY 3 +#define CONFIG_ZERO_BOOTDELAY_CHECK /* check for keypress on bootdelay==0 */ + +/*************************************************************** + * U-boot generic defines start here. + ***************************************************************/ +#undef CONFIG_USE_IRQ + +/* Size of malloc() pool */ +#define CFG_MALLOC_LEN (CFG_ENV_SIZE + 128*1024) +/* size in bytes reserved for initial data */ +#define CFG_GBL_DATA_SIZE 128 + +/* allow to overwrite serial and ethaddr */ +#define CONFIG_ENV_OVERWRITE + +/* Command line configuration */ +#include <config_cmd_default.h> + +#define CONFIG_CMD_ELF + +#define CONFIG_BOOTCOMMAND "run boot_flash" +/* enable passing of ATAGs */ +#define CONFIG_CMDLINE_TAG 1 +#define CONFIG_SETUP_MEMORY_TAGS 1 +#define CONFIG_INITRD_TAG 1 + +#if defined(CONFIG_CMD_KGDB) +# define CONFIG_KGDB_BAUDRATE 230400 +/* which serial port to use */ +# define CONFIG_KGDB_SER_INDEX 1 +#endif + +/* Miscellaneous configurable options */ +#define CFG_LONGHELP +#define CFG_PROMPT "=> " +/* Console I/O Buffer Size */ +#define CFG_CBSIZE 256 +/* Print Buffer Size */ +#define CFG_PBSIZE (CFG_CBSIZE+sizeof(CFG_PROMPT)+16) +/* max number of command args */ +#define CFG_MAXARGS 16 +/* Boot Argument Buffer Size */ +#define CFG_BARGSIZE CFG_CBSIZE + +#define CFG_MEMTEST_START 0x00400000 +#define CFG_MEMTEST_END 0x00800000 + +/* everything, incl board info, in Hz */ +#undef CFG_CLKS_IN_HZ +/* spec says 66.666 MHz, but it appears to be 33 */ +#define CFG_HZ 3333333 + +/* default load address */ +#define CFG_LOAD_ADDR 0x00010000 + +/* valid baudrates */ +#define CFG_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, \ + 115200, 230400 } +#define CONFIG_SERIAL_RTS_ACTIVE 1 + +/* + * 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 + +/* Expansion bus settings */ +#define CFG_EXP_CS0 0xbd113003 + +/* SDRAM settings */ +#define CONFIG_NR_DRAM_BANKS 1 +#define PHYS_SDRAM_1 0x00000000 +#define CFG_DRAM_BASE 0x00000000 + +/* 32MB SDRAM */ +#define CFG_SDR_CONFIG 0x18 +#define PHYS_SDRAM_1_SIZE 0x02000000 +#define CFG_SDRAM_REFRESH_CNT 0x81a +#define CFG_SDR_MODE_CONFIG 0x1 +#define CFG_DRAM_SIZE 0x02000000 + +/* FLASH organization */ +#define CFG_MAX_FLASH_BANKS 2 +/* max # of sectors per chip */ +#define CFG_MAX_FLASH_SECT 70 +#define PHYS_FLASH_1 0x50000000 +#define PHYS_FLASH_2 0x51000000 +#define CFG_FLASH_BANKS_LIST { PHYS_FLASH_1, PHYS_FLASH_2 } + +#define CFG_FLASH_BASE PHYS_FLASH_1 +#define CFG_MONITOR_BASE PHYS_FLASH_1 +#define CFG_MONITOR_LEN (252 << 10) + +/* Use common CFI driver */ +#define CFG_FLASH_CFI +#define CFG_FLASH_CFI_DRIVER +/* board provides its own flash_init code */ +#define CONFIG_FLASH_CFI_LEGACY 1 +/* no byte writes on IXP4xx */ +#define CFG_FLASH_CFI_WIDTH FLASH_CFI_16BIT +/* SST 39VF020 etc. support */ +#define CFG_FLASH_LEGACY_256Kx8 1 + +/* print 'E' for empty sector on flinfo */ +#define CFG_FLASH_EMPTY_INFO + +/* Ethernet */ + +/* include IXP4xx NPE support */ +#define CONFIG_IXP4XX_NPE 1 +/* use separate flash sector with ucode images */ +#define CONFIG_IXP4XX_NPE_EXT_UCODE_BASE 0x51000000 + +#define CONFIG_NET_MULTI 1 +/* NPE0 PHY address */ +#define CONFIG_PHY_ADDR 0x1C +/* MII PHY management */ +#define CONFIG_MII 1 +/* Number of ethernet rx buffers & descriptors */ +#define CFG_RX_ETH_BUFFER 16 + +#define CONFIG_CMD_DHCP +#define CONFIG_CMD_NET +#define CONFIG_CMD_MII +#define CONFIG_CMD_PING +#undef CONFIG_CMD_NFS + +/* BOOTP options */ +#define CONFIG_BOOTP_BOOTFILESIZE +#define CONFIG_BOOTP_BOOTPATH +#define CONFIG_BOOTP_GATEWAY +#define CONFIG_BOOTP_HOSTNAME + +/* Cache Configuration */ +#define CFG_CACHELINE_SIZE 32 + +/* environment organization: one complete 4k flash sector */ +#define CFG_ENV_IS_IN_FLASH 1 +#define CFG_ENV_SIZE 0x1000 +#define CFG_ENV_ADDR (PHYS_FLASH_1 + 0x3f000) + +#define CONFIG_EXTRA_ENV_SETTINGS \ + "mtd=IXP4XX-Flash.0:252k(uboot),4k(uboot_env);" \ + "IXP4XX-Flash.1:128k(ucode),1280k(linux),-(root)\0" \ + "kerneladdr=51020000\0" \ + "rootaddr=51160000\0" \ + "loadaddr=10000\0" \ + "updateboot_ser=mw.b 10000 ff 40000;" \ + " loady ${loadaddr};" \ + " run eraseboot writeboot\0" \ + "updateboot_net=mw.b 10000 ff 40000;" \ + " tftp ${loadaddr} u-boot.bin;" \ + " run eraseboot writeboot\0" \ + "eraseboot=protect off 50000000 5003efff;" \ + " erase 50000000 +${filesize}\0" \ + "writeboot=cp.b 10000 50000000 ${filesize}\0" \ + "eraseenv=protect off 5003f000 5003ffff;" \ + " erase 5003f000 5003ffff\0" \ + "updateroot=tftp ${loadaddr} ${rootfile};" \ + " era ${rootaddr} +${filesize};" \ + " cp.b ${loadaddr} ${rootaddr} ${filesize}\0" \ + "updatekern=tftp ${loadaddr} ${kernelfile};" \ + " era ${kerneladdr} +${filesize};" \ + " cp.b ${loadaddr} ${kerneladdr} ${filesize}\0" \ + "flashargs=setenv bootargs mtdparts=${mtd} root=/dev/mtdblock4" \ + " rootfstype=squashfs,jffs2 init=/etc/preinit\0" \ + "netargs=setenv bootargs mtdparts=${mtd} root=/dev/mtdblock4" \ + " rootfstype=squashfs,jffs2 init=/etc/preinit\0" \ + "addtty=setenv bootargs ${bootargs} console=ttyS0,${baudrate}\0" \ + "addeth=setenv bootargs ${bootargs} ethaddr=${ethaddr}\0" \ + "boot_flash=run flashargs addtty addeth;" \ + " bootm ${kerneladdr}\0" \ + "boot_net=run netargs addtty addeth;" \ + " tftpboot ${loadaddr} ${kernelfile};" \ + " bootm\0" + +#endif /* __CONFIG_H */ |