ARM: IXP: Remove actux1 board
authorMarek Vasut <marex@denx.de>
Mon, 27 Jan 2014 23:04:58 +0000 (00:04 +0100)
committerMarek Vasut <marex@denx.de>
Thu, 6 Feb 2014 01:51:51 +0000 (02:51 +0100)
The board is unmaintained, just like the rest of the IXP.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Albert Aribaud <albert.u.boot@aribaud.net>
Cc: Michael Schwingen <michael@schwingen.org>
Cc: Tom Rini <trini@ti.com>
board/actux1/Makefile [deleted file]
board/actux1/actux1.c [deleted file]
board/actux1/actux1_hw.h [deleted file]
board/actux1/u-boot.lds [deleted file]
boards.cfg
doc/README.scrapyard
include/configs/actux1.h [deleted file]

diff --git a/board/actux1/Makefile b/board/actux1/Makefile
deleted file mode 100644 (file)
index 05a8669..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# (C) Copyright 2000-2006
-# Wolfgang Denk, DENX Software Engineering, wd@denx.de.
-#
-# SPDX-License-Identifier:     GPL-2.0+
-#
-
-obj-y  := actux1.o
diff --git a/board/actux1/actux1.c b/board/actux1/actux1.c
deleted file mode 100644 (file)
index 03ccd93..0000000
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
- * (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>
- *
- * SPDX-License-Identifier:    GPL-2.0+
- */
-
-#include <common.h>
-#include <command.h>
-#include <malloc.h>
-#include <asm/arch/ixp425.h>
-#include <asm/io.h>
-#include <miiphy.h>
-#ifdef CONFIG_PCI
-#include <pci.h>
-#include <asm/arch/ixp425pci.h>
-#endif
-
-#include "actux1_hw.h"
-
-DECLARE_GLOBAL_DATA_PTR;
-
-int board_early_init_f(void)
-{
-       /* CS5: Debug port */
-       writel(0x9d520003, IXP425_EXP_CS5);
-       /* CS6: HwRel */
-       writel(0x81860001, IXP425_EXP_CS6);
-       /* CS7: LEDs */
-       writel(0x80900003, IXP425_EXP_CS7);
-       return 0;
-}
-
-int board_init(void)
-{
-       /* adress of boot parameters */
-       gd->bd->bi_boot_params = 0x00000100;
-
-       GPIO_OUTPUT_CLEAR(CONFIG_SYS_GPIO_IORST);
-       GPIO_OUTPUT_ENABLE(CONFIG_SYS_GPIO_IORST);
-
-       /* Setup GPIOs for PCI INTA */
-       GPIO_OUTPUT_DISABLE(CONFIG_SYS_GPIO_PCI1_INTA);
-       GPIO_INT_ACT_LOW_SET(CONFIG_SYS_GPIO_PCI1_INTA);
-
-       /* Setup GPIOs for 33MHz clock output */
-       GPIO_OUTPUT_ENABLE(CONFIG_SYS_GPIO_PCI_CLK);
-       GPIO_OUTPUT_ENABLE(CONFIG_SYS_GPIO_EXTBUS_CLK);
-       writel(0x011001FF, IXP425_GPIO_GPCLKR);
-
-       udelay(533);
-       GPIO_OUTPUT_SET(CONFIG_SYS_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 buf[64];
-       int i = getenv_f("serial#", buf, sizeof(buf));
-
-       puts("Board: AcTux-1 rev.");
-       putc(ACTUX1_BOARDREL + 'A' - 1);
-
-       if (i > 0) {
-               puts(", serial# ");
-               puts(buf);
-       }
-       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->ram_size = get_ram_size(CONFIG_SYS_SDRAM_BASE, 128<<20);
-       return 0;
-}
-
-
-#ifdef CONFIG_PCI
-struct pci_controller hose;
-
-void pci_init_board(void)
-{
-       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, MII_PHYSID1, &id1);
-       miiphy_read("NPE0", CONFIG_PHY_ADDR, MII_PHYSID2, &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
deleted file mode 100644 (file)
index 5627f24..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * (C) Copyright 2007
- * Michael Schwingen, michael@schwingen.org
- *
- * hardware register definitions for the AcTux-1 board.
- *
- * SPDX-License-Identifier:    GPL-2.0+
- */
-
-#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 CONFIG_SYS_GPIO_PCI1_INTA              2
-#define CONFIG_SYS_GPIO_PCI2_INTA              3
-#define CONFIG_SYS_GPIO_I2C_SDA                4
-#define CONFIG_SYS_GPIO_I2C_SCL                5
-#define CONFIG_SYS_GPIO_DBGJUMPER              9
-#define CONFIG_SYS_GPIO_BUTTON1                10
-#define CONFIG_SYS_GPIO_DBGSENSE               11
-#define CONFIG_SYS_GPIO_DTR                    12
-#define CONFIG_SYS_GPIO_IORST                  13      /* Out */
-#define CONFIG_SYS_GPIO_PCI_CLK                14      /* Out */
-#define CONFIG_SYS_GPIO_EXTBUS_CLK             15      /* Out */
-
-#endif
diff --git a/board/actux1/u-boot.lds b/board/actux1/u-boot.lds
deleted file mode 100644 (file)
index 4716e4f..0000000
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * (C) Copyright 2000
- * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * SPDX-License-Identifier:    GPL-2.0+
- */
-
-OUTPUT_FORMAT ("elf32-bigarm", "elf32-bigarm", "elf32-bigarm")
-OUTPUT_ARCH (arm)
-ENTRY (_start)
-SECTIONS
-{
-       . = 0x00000000;
-
-       . = ALIGN (4);
-       .text : {
-               *(.__image_copy_start)
-               arch/arm/cpu/ixp/start.o(.text*)
-               net/built-in.o(.text*)
-               board/actux1/built-in.o(.text*)
-               arch/arm/cpu/ixp/built-in.o(.text*)
-               drivers/input/built-in.o(.text*)
-
-               . = env_offset;
-               common/env_embedded.o(.ppcenv)
-               *(.text*)
-       }
-
-       . = ALIGN(4);
-       .rodata : {
-               *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*)))
-       }
-       . = ALIGN(4);
-       .data : {
-               *(.data*)
-       }
-       . = ALIGN(4);
-       .got : {
-               *(.got)
-       }
-       . =.;
-
-       . = ALIGN(4);
-       .u_boot_list : {
-               KEEP(*(SORT(.u_boot_list*)));
-       }
-
-       . = ALIGN (4);
-
-       .image_copy_end :
-       {
-               *(.__image_copy_end)
-       }
-
-       .rel_dyn_start :
-       {
-               *(.__rel_dyn_start)
-       }
-
-       .rel.dyn : {
-               *(.rel*)
-       }
-
-       .rel_dyn_end :
-       {
-               *(.__rel_dyn_end)
-       }
-
-       _end = .;
-
-/*
- * Compiler-generated __bss_start and __bss_end, see arch/arm/lib/bss.c
- * __bss_base and __bss_limit are for linker only (overlay ordering)
- */
-
-       .bss_start __rel_dyn_start (OVERLAY) : {
-               KEEP(*(.__bss_start));
-               __bss_base = .;
-       }
-
-       .bss __bss_base (OVERLAY) : {
-               *(.bss*)
-                . = ALIGN(4);
-                __bss_limit = .;
-       }
-       .bss_end __bss_limit (OVERLAY) : {
-               KEEP(*(.__bss_end));
-       }
-
-       .dynsym _end : { *(.dynsym) }
-       .dynbss : { *(.dynbss) }
-       .dynstr : { *(.dynstr*) }
-       .dynamic : { *(.dynamic*) }
-       .hash : { *(.hash*) }
-       .plt : { *(.plt*) }
-       .interp : { *(.interp*) }
-       .gnu : { *(.gnu*) }
-       .ARM.exidx : { *(.ARM.exidx*) }
-}
index 2dfd2b479c558b7b2bab5f9cc6fa0cf5cfdb4597..b3faeb4c4550025c84765696e39687ef13a0caf3 100644 (file)
@@ -381,10 +381,6 @@ Active  arm         ixp            -           -               -
 Active  arm         ixp            -           -               -                   actux3                               -                                                                                                                                 Michael Schwingen <michael@schwingen.org>
 Active  arm         ixp            -           -               -                   actux4                               -                                                                                                                                 Michael Schwingen <michael@schwingen.org>
 Active  arm         ixp            -           -               -                   dvlhost                              -                                                                                                                                 Michael Schwingen <michael@schwingen.org>
-Active  arm         ixp            -           -               actux1              actux1_4_16                          actux1:FLASH2X2                                                                                                                   Michael Schwingen <michael@schwingen.org>
-Active  arm         ixp            -           -               actux1              actux1_4_32                          actux1:FLASH2X2,RAM_32MB                                                                                                          Michael Schwingen <michael@schwingen.org>
-Active  arm         ixp            -           -               actux1              actux1_8_16                          actux1:FLASH1X8                                                                                                                   Michael Schwingen <michael@schwingen.org>
-Active  arm         ixp            -           -               actux1              actux1_8_32                          actux1:FLASH1X8,RAM_32MB                                                                                                          Michael Schwingen <michael@schwingen.org>
 Active  arm         pxa            -           -               -                   balloon3                             -                                                                                                                                 Marek Vasut <marek.vasut@gmail.com>
 Active  arm         pxa            -           -               -                   h2200                                -                                                                                                                                 Lukasz Dalek <luk0104@gmail.com>
 Active  arm         pxa            -           -               -                   palmld                               -                                                                                                                                 Marek Vasut <marek.vasut@gmail.com>
index 2aed8559939e542072056fed8f046c50967be1aa..0ae5e4de3f8d9f45f8756f9d8e0a24d1449774e4 100644 (file)
@@ -11,6 +11,7 @@ easily if here is something they might want to dig for...
 
 Board            Arch        CPU            Commit      Removed     Last known maintainer/contact
 =================================================================================================
+actux1           arm         ixp            -           2014-01-28  Michael Schwingen <michael@schwingen.org>
 mx1ads           arm         arm920t        -           2014-01-13
 mini2440         arm         arm920t        -           2014-01-13  Gabriel Huau <contact@huau-gabriel.fr>
 omap730p2        arm         arm926ejs      79c5c08d    2013-11-11
diff --git a/include/configs/actux1.h b/include/configs/actux1.h
deleted file mode 100644 (file)
index 9b8bd78..0000000
+++ /dev/null
@@ -1,226 +0,0 @@
-/*
- * (C) Copyright 2007
- * Michael Schwingen, michael@schwingen.org
- *
- * Configuration settings for the AcTux-1 board.
- *
- * SPDX-License-Identifier:    GPL-2.0+
- */
-
-#ifndef __CONFIG_H
-#define __CONFIG_H
-
-#define CONFIG_IXP425                  1
-#define CONFIG_ACTUX1                  1
-
-#define        CONFIG_MACH_TYPE                1479
-
-#define CONFIG_DISPLAY_CPUINFO         1
-#define CONFIG_DISPLAY_BOARDINFO       1
-
-#define CONFIG_IXP_SERIAL
-#define CONFIG_SYS_IXP425_CONSOLE              IXP425_UART2
-#define CONFIG_BAUDRATE                        115200
-#define CONFIG_BOOTDELAY               3
-#define CONFIG_ZERO_BOOTDELAY_CHECK    /* check for keypress on bootdelay==0 */
-#define CONFIG_BOARD_EARLY_INIT_F      1
-#define CONFIG_SYS_LDSCRIPT    "board/actux1/u-boot.lds"
-
-/***************************************************************
- * U-boot generic defines start here.
- ***************************************************************/
-/*
- * Size of malloc() pool
- */
-#define CONFIG_SYS_MALLOC_LEN                  (CONFIG_ENV_SIZE + 128*1024)
-
-/* allow to overwrite serial and ethaddr */
-#define CONFIG_ENV_OVERWRITE
-
-/* Command line configuration. */
-#include <config_cmd_default.h>
-
-#define CONFIG_CMD_ELF
-#ifdef CONFIG_PCI
-#define CONFIG_CMD_PCI
-#define CONFIG_PCI_PNP
-#define CONFIG_IXP_PCI
-#define CONFIG_PCI_SCAN_SHOW
-#define CONFIG_CMD_PCI_ENUM
-#endif
-
-#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
-#endif
-
-/* Miscellaneous configurable options */
-#define CONFIG_SYS_LONGHELP
-/* Console I/O Buffer Size */
-#define CONFIG_SYS_CBSIZE                      256
-/* Print Buffer Size */
-#define CONFIG_SYS_PBSIZE                      (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)
-/* max number of command args */
-#define CONFIG_SYS_MAXARGS                     16
-/* Boot Argument Buffer Size */
-#define CONFIG_SYS_BARGSIZE                    CONFIG_SYS_CBSIZE
-
-#define CONFIG_SYS_MEMTEST_START               0x00400000
-#define CONFIG_SYS_MEMTEST_END                 0x00800000
-
-/* timer clock - 2* OSC_IN system clock */
-#define CONFIG_IXP425_TIMER_CLK                 66666666
-
-/* default load address */
-#define CONFIG_SYS_LOAD_ADDR                   0x00010000
-
-/* valid baudrates */
-#define CONFIG_SYS_BAUDRATE_TABLE              { 9600, 19200, 38400, 57600,    \
-                                         115200, 230400 }
-#define CONFIG_SERIAL_RTS_ACTIVE       1
-
-/* Expansion bus settings */
-#define CONFIG_SYS_EXP_CS0                     0xbd113842
-
-/* SDRAM settings */
-#define CONFIG_NR_DRAM_BANKS           1
-#define PHYS_SDRAM_1                   0x00000000
-#define CONFIG_SYS_SDRAM_BASE                  0x00000000
-
-#ifdef CONFIG_RAM_32MB
-# define CONFIG_SYS_SDR_CONFIG                 0x18
-# define PHYS_SDRAM_1_SIZE             0x02000000
-# define CONFIG_SYS_SDRAM_REFRESH_CNT          0x81a
-# define CONFIG_SYS_SDR_MODE_CONFIG            0x1
-# define CONFIG_SYS_DRAM_SIZE                  0x02000000
-#else /* 16MB SDRAM */
-# define CONFIG_SYS_SDR_CONFIG                 0x3A
-# define PHYS_SDRAM_1_SIZE             0x01000000
-# define CONFIG_SYS_SDRAM_REFRESH_CNT          0x81a
-# define CONFIG_SYS_SDR_MODE_CONFIG            0x1
-# define CONFIG_SYS_DRAM_SIZE                  0x01000000
-#endif
-
-/* FLASH organization */
-#define CONFIG_SYS_TEXT_BASE           0x50000000
-#ifdef CONFIG_FLASH2X2
-# define CONFIG_SYS_MAX_FLASH_BANKS            2
-/* max number of sectors on one chip */
-# define CONFIG_SYS_MAX_FLASH_SECT             40
-# define PHYS_FLASH_1                  0x50000000
-# define PHYS_FLASH_2                  0x50200000
-# define CONFIG_SYS_FLASH_BANKS_LIST           { PHYS_FLASH_1, PHYS_FLASH_2 }
-#endif
-#ifdef CONFIG_FLASH1X8
-# define CONFIG_SYS_MAX_FLASH_BANKS            1
-/* max number of sectors on one chip */
-# define CONFIG_SYS_MAX_FLASH_SECT             140
-# define PHYS_FLASH_1                  0x50000000
-# define CONFIG_SYS_FLASH_BANKS_LIST           { PHYS_FLASH_1 }
-#endif
-
-#define CONFIG_SYS_FLASH_BASE                  PHYS_FLASH_1
-#define CONFIG_SYS_MONITOR_BASE                PHYS_FLASH_1
-#define CONFIG_SYS_MONITOR_LEN                 (256 << 10)
-#define CONFIG_BOARD_SIZE_LIMIT                        262144
-
-/* Use common CFI driver */
-#define CONFIG_SYS_FLASH_CFI
-#define CONFIG_FLASH_CFI_DRIVER
-/* no byte writes on IXP4xx */
-#define CONFIG_SYS_FLASH_CFI_WIDTH             FLASH_CFI_16BIT
-/* print 'E' for empty sector on flinfo */
-#define CONFIG_SYS_FLASH_EMPTY_INFO
-
-/* Ethernet */
-
-/* include IXP4xx NPE support */
-#define CONFIG_IXP4XX_NPE              1
-/* NPE0 PHY address */
-#define        CONFIG_PHY_ADDR                 0
-/* NPE1 PHY address (HW Release E only) */
-#define        CONFIG_PHY1_ADDR                1
-/* MII PHY management */
-#define CONFIG_MII                     1
-/* Number of ethernet rx buffers & descriptors */
-#define CONFIG_SYS_RX_ETH_BUFFER               16
-#define CONFIG_RESET_PHY_R             1
-
-#define CONFIG_HAS_ETH1                        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 CONFIG_SYS_CACHELINE_SIZE              32
-
-/*
- * environment organization:
- * one flash sector, embedded in uboot area (bottom bootblock flash)
- */
-#define        CONFIG_ENV_IS_IN_FLASH          1
-#define CONFIG_ENV_SIZE                        0x2000
-#define CONFIG_ENV_ADDR                        (PHYS_FLASH_1 + 0x4000)
-#define CONFIG_SYS_USE_PPCENV                  1
-
-#define CONFIG_EXTRA_ENV_SETTINGS                                      \
-       "npe_ucode=50040000\0"                                          \
-       "mtd=IXP4XX-Flash.0:256k(uboot),64k(ucode),1152k(linux),-(root)\0" \
-       "kerneladdr=50050000\0"                                         \
-       "kernelfile=actux1/uImage\0"                                    \
-       "rootfile=actux1/rootfs\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} actux1/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"                                  \
-       "updateucode=loady;"                                            \
-       " era ${npe_ucode} +${filesize};"                               \
-       " cp.b ${loadaddr} ${npe_ucode} ${filesize}\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=ttyS1,${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"
-
-/* additions for new relocation code, must be added to all boards */
-#define CONFIG_SYS_INIT_SP_ADDR                                                \
-       (CONFIG_SYS_SDRAM_BASE + 0x1000 - GENERATED_GBL_DATA_SIZE)
-
-#endif /* __CONFIG_H */