ea20: remove board
authorBartosz Golaszewski <bgolaszewski@baylibre.com>
Fri, 17 May 2019 09:17:14 +0000 (11:17 +0200)
committerTom Rini <trini@konsulko.com>
Tue, 28 May 2019 17:58:06 +0000 (13:58 -0400)
This board still doesn't select CONFIG_DM and seems to be umaintained.
As it makes progress on modernizing several DaVinci drivers more
difficult and the maintainer has not expressed interest in updating
it, this patch proposes to remove it.

Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
Acked-by: Stefano Babic <sbabic@denx.de>
arch/arm/include/asm/mach-types.h
arch/arm/mach-davinci/Kconfig
board/davinci/ea20/Kconfig [deleted file]
board/davinci/ea20/MAINTAINERS [deleted file]
board/davinci/ea20/Makefile [deleted file]
board/davinci/ea20/ea20.c [deleted file]
configs/ea20_defconfig [deleted file]
include/configs/ea20.h [deleted file]

index da2cc565f29d4434a98389870de347922268938d..d882f19b814a798277eef256928c7601fb590fcc 100644 (file)
 #define MACH_TYPE_AX8008               2999
 #define MACH_TYPE_GNET_SGCE            3000
 #define MACH_TYPE_PXWNAS_500_1000      3001
-#define MACH_TYPE_EA20                 3002
 #define MACH_TYPE_AWM2                 3003
 #define MACH_TYPE_TI8148EVM            3004
 #define MACH_TYPE_SEABOARD             3005
index 6031a0c0c78925179d67598750fca827886122a2..c2a5759f4550ff5e70e3b7cb7d49c446c422932f 100644 (file)
@@ -16,12 +16,6 @@ config TARGET_DA850EVM
        select SOC_DA850
        select SUPPORT_SPL
 
-config TARGET_EA20
-       bool "EA20 board"
-       select BOARD_LATE_INIT
-       select MACH_DAVINCI_DA850_EVM
-       select SOC_DA850
-
 config TARGET_OMAPL138_LCDK
        bool "OMAPL138 LCDK"
        select SOC_DA8XX
@@ -144,7 +138,6 @@ endif
 
 source "board/Barix/ipam390/Kconfig"
 source "board/davinci/da8xxevm/Kconfig"
-source "board/davinci/ea20/Kconfig"
 source "board/lego/ev3/Kconfig"
 
 config SPL_LDSCRIPT
diff --git a/board/davinci/ea20/Kconfig b/board/davinci/ea20/Kconfig
deleted file mode 100644 (file)
index ae5b16e..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-if TARGET_EA20
-
-config SYS_BOARD
-       default "ea20"
-
-config SYS_VENDOR
-       default "davinci"
-
-config SYS_CONFIG_NAME
-       default "ea20"
-
-endif
diff --git a/board/davinci/ea20/MAINTAINERS b/board/davinci/ea20/MAINTAINERS
deleted file mode 100644 (file)
index 5c300a3..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-EA20 BOARD
-M:     Stefano Babic <sbabic@denx.de>
-S:     Maintained
-F:     board/davinci/ea20/
-F:     include/configs/ea20.h
-F:     configs/ea20_defconfig
diff --git a/board/davinci/ea20/Makefile b/board/davinci/ea20/Makefile
deleted file mode 100644 (file)
index 2ea42d9..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0+
-#
-# (C) Copyright 2000, 2001, 2002
-# Wolfgang Denk, DENX Software Engineering, wd@denx.de.
-#
-# Copyright (C) 2007 Sergey Kubushyn <ksi@koi8.net>
-
-obj-y  += ea20.o
diff --git a/board/davinci/ea20/ea20.c b/board/davinci/ea20/ea20.c
deleted file mode 100644 (file)
index 573e0ae..0000000
+++ /dev/null
@@ -1,337 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * (C) Copyright 2010
- * Stefano Babic, DENX Software Engineering, sbabic@denx.de
- *
- * Based on da850evm.c, original Copyrights follow:
- *
- * Copyright (C) 2010 Texas Instruments Incorporated - http://www.ti.com/
- *
- * Based on da830evm.c. Original Copyrights follow:
- *
- * Copyright (C) 2009 Nick Thompson, GE Fanuc, Ltd. <nick.thompson@gefanuc.com>
- * Copyright (C) 2007 Sergey Kubushyn <ksi@koi8.net>
- */
-
-#include <common.h>
-#include <i2c.h>
-#include <net.h>
-#include <netdev.h>
-#include <asm/mach-types.h>
-#include <asm/arch/hardware.h>
-#include <asm/ti-common/davinci_nand.h>
-#include <asm/arch/emac_defs.h>
-#include <asm/io.h>
-#include <asm/arch/davinci_misc.h>
-#include <asm/gpio.h>
-#include "../../../drivers/video/da8xx-fb.h"
-
-DECLARE_GLOBAL_DATA_PTR;
-
-static const struct da8xx_panel lcd_panel = {
-       /* Casio COM57H531x */
-       .name = "Casio_COM57H531x",
-       .width = 640,
-       .height = 480,
-       .hfp = 12,
-       .hbp = 144,
-       .hsw = 30,
-       .vfp = 10,
-       .vbp = 35,
-       .vsw = 3,
-       .pxl_clk = 25000000,
-       .invert_pxl_clk = 0,
-};
-
-static const struct display_panel disp_panel = {
-       QVGA,
-       16,
-       16,
-       COLOR_ACTIVE,
-};
-
-static const struct lcd_ctrl_config lcd_cfg = {
-       &disp_panel,
-       .ac_bias                = 255,
-       .ac_bias_intrpt         = 0,
-       .dma_burst_sz           = 16,
-       .bpp                    = 16,
-       .fdd                    = 255,
-       .tft_alt_mode           = 0,
-       .stn_565_mode           = 0,
-       .mono_8bit_mode         = 0,
-       .invert_line_clock      = 1,
-       .invert_frm_clock       = 1,
-       .sync_edge              = 0,
-       .sync_ctrl              = 1,
-       .raster_order           = 0,
-};
-
-/* SPI0 pin muxer settings */
-static const struct pinmux_config spi1_pins[] = {
-       { pinmux(5), 1, 1 },
-       { pinmux(5), 1, 2 },
-       { pinmux(5), 1, 4 },
-       { pinmux(5), 1, 5 }
-};
-
-/* I2C pin muxer settings */
-static const struct pinmux_config i2c_pins[] = {
-       { pinmux(4), 2, 2 },
-       { pinmux(4), 2, 3 }
-};
-
-/* UART0 pin muxer settings */
-static const struct pinmux_config uart_pins[] = {
-       { pinmux(3), 2, 7 },
-       { pinmux(3), 2, 6 },
-       { pinmux(3), 2, 4 },
-       { pinmux(3), 2, 5 }
-};
-
-#ifdef CONFIG_DRIVER_TI_EMAC
-#define HAS_RMII 1
-static const struct pinmux_config emac_pins[] = {
-       { pinmux(14), 8, 2 },
-       { pinmux(14), 8, 3 },
-       { pinmux(14), 8, 4 },
-       { pinmux(14), 8, 5 },
-       { pinmux(14), 8, 6 },
-       { pinmux(14), 8, 7 },
-       { pinmux(15), 8, 1 },
-       { pinmux(4), 8, 0 },
-       { pinmux(4), 8, 1 }
-};
-#endif
-
-#ifdef CONFIG_NAND_DAVINCI
-const struct pinmux_config nand_pins[] = {
-       { pinmux(7), 1, 0},     /* CS2 */
-       { pinmux(7), 0, 1},     /* CS3  in three state*/
-       { pinmux(7), 1, 4 },    /* EMA_WE */
-       { pinmux(7), 1, 5 },    /* EMA_OE */
-       { pinmux(9), 1, 0 },    /* EMA_D[7] */
-       { pinmux(9), 1, 1 },    /* EMA_D[6] */
-       { pinmux(9), 1, 2 },    /* EMA_D[5] */
-       { pinmux(9), 1, 3 },    /* EMA_D[4] */
-       { pinmux(9), 1, 4 },    /* EMA_D[3] */
-       { pinmux(9), 1, 5 },    /* EMA_D[2] */
-       { pinmux(9), 1, 6 },    /* EMA_D[1] */
-       { pinmux(9), 1, 7 },    /* EMA_D[0] */
-       { pinmux(12), 1, 5 },   /* EMA_A[2] */
-       { pinmux(12), 1, 6 },   /* EMA_A[1] */
-       { pinmux(6), 1, 0 }     /* EMA_CLK */
-};
-#endif
-
-const struct pinmux_config gpio_pins[] = {
-       { pinmux(13), 8, 0 }, /* GPIO6[15] RESETOUTn on SOM*/
-       { pinmux(13), 8, 5 }, /* GPIO6[10] U0_SW0 on EA20-00101_2*/
-       { pinmux(13), 8, 3 }, /* GPIO6[12] U0_SW1 on EA20-00101_2*/
-       { pinmux(19), 8, 5 }, /* GPIO6[1]  DISP_ON */
-       { pinmux(14), 8, 1 }  /* GPIO6[6]  LCD_B_PWR*/
-};
-
-const struct pinmux_config lcd_pins[] = {
-       { pinmux(17), 2, 1 }, /* LCD_D_0 */
-       { pinmux(17), 2, 0 }, /* LCD_D_1 */
-       { pinmux(16), 2, 7 }, /* LCD_D_2 */
-       { pinmux(16), 2, 6 }, /* LCD_D_3 */
-       { pinmux(16), 2, 5 }, /* LCD_D_4 */
-       { pinmux(16), 2, 4 }, /* LCD_D_5 */
-       { pinmux(16), 2, 3 }, /* LCD_D_6 */
-       { pinmux(16), 2, 2 }, /* LCD_D_7 */
-       { pinmux(18), 2, 1 }, /* LCD_D_8 */
-       { pinmux(18), 2, 0 }, /* LCD_D_9 */
-       { pinmux(17), 2, 7 }, /* LCD_D_10 */
-       { pinmux(17), 2, 6 }, /* LCD_D_11 */
-       { pinmux(17), 2, 5 }, /* LCD_D_12 */
-       { pinmux(17), 2, 4 }, /* LCD_D_13 */
-       { pinmux(17), 2, 3 }, /* LCD_D_14 */
-       { pinmux(17), 2, 2 }, /* LCD_D_15 */
-       { pinmux(18), 2, 6 }, /* LCD_PCLK */
-       { pinmux(19), 2, 0 }, /* LCD_HSYNC */
-       { pinmux(19), 2, 1 }, /* LCD_VSYNC */
-       { pinmux(19), 2, 6 }, /* DA850_NLCD_AC_ENB_CS */
-};
-
-const struct pinmux_config halten_pin[] = {
-       { pinmux(3),  4, 2 } /* GPIO8[6] HALTEN */
-};
-
-static const struct pinmux_resource pinmuxes[] = {
-#ifdef CONFIG_SPI_FLASH
-       PINMUX_ITEM(spi1_pins),
-#endif
-       PINMUX_ITEM(uart_pins),
-       PINMUX_ITEM(i2c_pins),
-#ifdef CONFIG_NAND_DAVINCI
-       PINMUX_ITEM(nand_pins),
-#endif
-#ifdef CONFIG_VIDEO
-       PINMUX_ITEM(lcd_pins),
-#endif
-};
-
-static const struct lpsc_resource lpsc[] = {
-       { DAVINCI_LPSC_AEMIF }, /* NAND, NOR */
-       { DAVINCI_LPSC_SPI1 },  /* Serial Flash */
-       { DAVINCI_LPSC_EMAC },  /* image download */
-       { DAVINCI_LPSC_UART0 }, /* console */
-       { DAVINCI_LPSC_GPIO },
-       { DAVINCI_LPSC_LCDC }, /* LCD */
-};
-
-int board_early_init_f(void)
-{
-       /* PinMux for GPIO */
-       if (davinci_configure_pin_mux(gpio_pins, ARRAY_SIZE(gpio_pins)) != 0)
-               return 1;
-
-       /* Set DISP_ON high to enable LCD output*/
-       gpio_direction_output(97, 1);
-
-       /* Set the RESETOUTn low */
-       gpio_direction_output(111, 0);
-
-       /* Set U0_SW0 low for UART0 as console*/
-       gpio_direction_output(106, 0);
-
-       /* Set U0_SW1 low for UART0 as console*/
-       gpio_direction_output(108, 0);
-
-       /* Set LCD_B_PWR low to power down LCD Backlight*/
-       gpio_direction_output(102, 0);
-
-       irq_init();
-
-       /*
-        * NAND CS setup - cycle counts based on da850evm NAND timings in the
-        * Linux kernel @ 25MHz EMIFA
-        */
-#ifdef CONFIG_NAND_DAVINCI
-       writel((DAVINCI_ABCR_WSETUP(0) |
-               DAVINCI_ABCR_WSTROBE(1) |
-               DAVINCI_ABCR_WHOLD(0) |
-               DAVINCI_ABCR_RSETUP(0) |
-               DAVINCI_ABCR_RSTROBE(1) |
-               DAVINCI_ABCR_RHOLD(0) |
-               DAVINCI_ABCR_TA(0) |
-               DAVINCI_ABCR_ASIZE_8BIT),
-              &davinci_emif_regs->ab1cr); /* CS2 */
-#endif
-
-       /*
-        * Power on required peripherals
-        * ARM does not have access by default to PSC0 and PSC1
-        * assuming here that the DSP bootloader has set the IOPU
-        * such that PSC access is available to ARM
-        */
-       if (da8xx_configure_lpsc_items(lpsc, ARRAY_SIZE(lpsc)))
-               return 1;
-
-       /* setup the SUSPSRC for ARM to control emulation suspend */
-       writel(readl(&davinci_syscfg_regs->suspsrc) &
-              ~(DAVINCI_SYSCFG_SUSPSRC_EMAC | DAVINCI_SYSCFG_SUSPSRC_I2C |
-                DAVINCI_SYSCFG_SUSPSRC_SPI1 | DAVINCI_SYSCFG_SUSPSRC_TIMER0 |
-                DAVINCI_SYSCFG_SUSPSRC_UART0),
-              &davinci_syscfg_regs->suspsrc);
-
-       /* configure pinmux settings */
-       if (davinci_configure_pin_mux_items(pinmuxes, ARRAY_SIZE(pinmuxes)))
-               return 1;
-
-#ifdef CONFIG_DRIVER_TI_EMAC
-       if (davinci_configure_pin_mux(emac_pins, ARRAY_SIZE(emac_pins)) != 0)
-               return 1;
-
-       davinci_emac_mii_mode_sel(HAS_RMII);
-#endif /* CONFIG_DRIVER_TI_EMAC */
-
-       /* enable the console UART */
-       writel((DAVINCI_UART_PWREMU_MGMT_FREE | DAVINCI_UART_PWREMU_MGMT_URRST |
-               DAVINCI_UART_PWREMU_MGMT_UTRST),
-              &davinci_uart0_ctrl_regs->pwremu_mgmt);
-
-       /*
-        * Reconfigure the LCDC priority to the highest to ensure that
-        * the throughput/latency requirements for the LCDC are met.
-        */
-       writel(readl(&davinci_syscfg_regs->mstpri[2]) & 0x0fffffff,
-              &davinci_syscfg_regs->mstpri[2]);
-
-
-       return 0;
-}
-
-/*
- * Do not overwrite the console
- * Use always serial for U-Boot console
- */
-int overwrite_console(void)
-{
-       return 1;
-}
-
-int board_init(void)
-{
-       /* arch number of the board */
-       gd->bd->bi_arch_number = MACH_TYPE_EA20;
-
-       /* address of boot parameters */
-       gd->bd->bi_boot_params = LINUX_BOOT_PARAM_ADDR;
-
-       da8xx_video_init(&lcd_panel, &lcd_cfg, 16);
-
-       return 0;
-}
-
-#ifdef CONFIG_BOARD_LATE_INIT
-
-int board_late_init(void)
-{
-       unsigned char buf[2];
-       int ret;
-
-       /* PinMux for HALTEN */
-       if (davinci_configure_pin_mux(halten_pin, ARRAY_SIZE(halten_pin)) != 0)
-               return 1;
-
-       /* Set HALTEN to high */
-       gpio_direction_output(134, 1);
-
-       /* Set fixed contrast settings for LCD via I2C potentiometer */
-       buf[0] = 0x00;
-       buf[1] = 0xd7;
-       ret = i2c_write(0x2e, 6, 1, buf, 2);
-       if (ret)
-               puts("\nContrast Settings FAILED\n");
-
-       /* Set LCD_B_PWR high to power up LCD Backlight*/
-       gpio_set_value(102, 1);
-       return 0;
-}
-#endif /* CONFIG_BOARD_LATE_INIT */
-
-#ifdef CONFIG_DRIVER_TI_EMAC
-
-/*
- * Initializes on-board ethernet controllers.
- */
-int board_eth_init(bd_t *bis)
-{
-       if (!davinci_emac_initialize()) {
-               printf("Error: Ethernet init failed!\n");
-               return -1;
-       }
-
-       /*
-        * This board has a RMII PHY. However, the MDC line on the SOM
-        * must not be disabled (there is no MII PHY on the
-        * baseboard) via the GPIO2[6], because this pin
-        * disables at the same time the SPI flash.
-        */
-
-       return 0;
-}
-#endif /* CONFIG_DRIVER_TI_EMAC */
diff --git a/configs/ea20_defconfig b/configs/ea20_defconfig
deleted file mode 100644 (file)
index ceab73d..0000000
+++ /dev/null
@@ -1,48 +0,0 @@
-CONFIG_ARM=y
-CONFIG_ARCH_DAVINCI=y
-CONFIG_SYS_TEXT_BASE=0xc1080000
-CONFIG_TARGET_EA20=y
-CONFIG_NR_DRAM_BANKS=1
-CONFIG_BOOTDELAY=3
-# CONFIG_CONSOLE_MUX is not set
-CONFIG_SYS_CONSOLE_IS_IN_ENV=y
-CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
-CONFIG_SYS_CONSOLE_INFO_QUIET=y
-CONFIG_VERSION_VARIABLE=y
-# CONFIG_DISPLAY_CPUINFO is not set
-# CONFIG_DISPLAY_BOARDINFO is not set
-CONFIG_BOARD_EARLY_INIT_F=y
-CONFIG_HUSH_PARSER=y
-CONFIG_SYS_PROMPT="ea20 > "
-CONFIG_CMD_ASKENV=y
-CONFIG_CRC32_VERIFY=y
-# CONFIG_CMD_FLASH is not set
-CONFIG_CMD_GPIO=y
-CONFIG_CMD_I2C=y
-CONFIG_CMD_NAND=y
-CONFIG_CMD_SF=y
-CONFIG_CMD_SPI=y
-# CONFIG_CMD_SETEXPR is not set
-CONFIG_CMD_DHCP=y
-CONFIG_CMD_MII=y
-CONFIG_CMD_PING=y
-CONFIG_CMD_BMP=y
-CONFIG_CMD_MTDPARTS=y
-CONFIG_CMD_DIAG=y
-CONFIG_CMD_UBI=y
-CONFIG_ENV_IS_IN_SPI_FLASH=y
-CONFIG_DA8XX_GPIO=y
-CONFIG_SYS_I2C_DAVINCI=y
-# CONFIG_MMC is not set
-CONFIG_NAND=y
-CONFIG_NAND_DAVINCI=y
-CONFIG_SPI_FLASH=y
-CONFIG_SF_DEFAULT_SPEED=30000000
-CONFIG_SPI_FLASH_STMICRO=y
-CONFIG_MII=y
-CONFIG_DRIVER_TI_EMAC=y
-CONFIG_SYS_NS16550=y
-CONFIG_SPI=y
-CONFIG_DAVINCI_SPI=y
-CONFIG_VIDEO=y
-# CONFIG_VIDEO_SW_CURSOR is not set
diff --git a/include/configs/ea20.h b/include/configs/ea20.h
deleted file mode 100644 (file)
index 88f2e17..0000000
+++ /dev/null
@@ -1,227 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * Copyright (C) 2010 Texas Instruments Incorporated - http://www.ti.com/
- *
- * Based on davinci_dvevm.h. Original Copyrights follow:
- *
- * Copyright (C) 2007 Sergey Kubushyn <ksi@koi8.net>
- */
-
-#ifndef __CONFIG_H
-#define __CONFIG_H
-
-/*
- * Board
- */
-#define CONFIG_USE_SPIFLASH
-#define        CONFIG_SYS_USE_NAND
-#define CONFIG_DRIVER_TI_EMAC_USE_RMII
-#define CONFIG_DRIVER_TI_EMAC_RMII_NO_NEGOTIATE
-#define CONFIG_PREBOOT
-
-/*
- * SoC Configuration
- */
-#define CONFIG_SYS_CLK_FREQ            clk_get(DAVINCI_ARM_CLKID)
-#define CONFIG_SYS_OSCIN_FREQ          24000000
-#define CONFIG_SYS_TIMERBASE           DAVINCI_TIMER0_BASE
-#define CONFIG_SYS_HZ_CLOCK            clk_get(DAVINCI_AUXCLK_CLKID)
-#define CONFIG_SKIP_LOWLEVEL_INIT
-
-/*
- * Memory Info
- */
-#define CONFIG_SYS_MALLOC_LEN  (0x10000 + 4*1024*1024) /* malloc() len */
-#define PHYS_SDRAM_1           DAVINCI_DDR_EMIF_DATA_BASE /* DDR Start */
-#define PHYS_SDRAM_1_SIZE      (64 << 20) /* SDRAM size 64MB */
-#define CONFIG_MAX_RAM_BANK_SIZE (512 << 20) /* max size from SPRS586*/
-
-/* memtest start addr */
-#define CONFIG_SYS_MEMTEST_START       (PHYS_SDRAM_1 + 0x2000000)
-
-/* memtest will be run on 16MB */
-#define CONFIG_SYS_MEMTEST_END (PHYS_SDRAM_1 + 0x2000000 + 16*1024*1024)
-
-/*
- * Serial Driver info
- */
-#define CONFIG_SYS_NS16550_SERIAL
-#define CONFIG_SYS_NS16550_REG_SIZE    -4      /* NS16550 register size */
-#define CONFIG_SYS_NS16550_COM1        DAVINCI_UART0_BASE /* Base address of UART0 */
-#define CONFIG_SYS_NS16550_CLK clk_get(DAVINCI_UART2_CLKID)
-
-#define CONFIG_SYS_SPI_BASE            DAVINCI_SPI1_BASE
-#define CONFIG_SYS_SPI_CLK             clk_get(DAVINCI_SPI1_CLKID)
-
-/*
- * I2C Configuration
- */
-#define CONFIG_SYS_I2C
-#define CONFIG_SYS_DAVINCI_I2C_SPEED           100000
-#define CONFIG_SYS_DAVINCI_I2C_SLAVE   10 /* Bogus, master-only in U-Boot */
-
-/*
- * Network & Ethernet Configuration
- */
-#ifdef CONFIG_DRIVER_TI_EMAC
-#define CONFIG_BOOTP_DNS2
-#define CONFIG_BOOTP_SEND_HOSTNAME
-#define CONFIG_NET_RETRY_COUNT 10
-#endif
-
-#ifdef CONFIG_USE_SPIFLASH
-#define CONFIG_ENV_SIZE                        (8 << 10)
-#define CONFIG_ENV_OFFSET              0x80000
-#define CONFIG_ENV_SECT_SIZE           (64 << 10)
-#endif
-
-#if defined(CONFIG_VIDEO)
-#define CONFIG_VIDEO_DA8XX
-#define CONFIG_SPLASH_SCREEN_ALIGN
-#define CONFIG_VIDEO_LOGO
-#define CONFIG_VIDEO_BMP_RLE8
-#define CONFIG_VIDEO_BMP_LOGO
-#endif
-
-/*
- * U-Boot general configuration
- */
-#define CONFIG_BOOTFILE                "uImage" /* Boot file name */
-#define CONFIG_SYS_CBSIZE      1024 /* Console I/O Buffer Size */
-#define CONFIG_SYS_BARGSIZE    CONFIG_SYS_CBSIZE /* Boot Args Buffer Size */
-#define CONFIG_SYS_LOAD_ADDR   (PHYS_SDRAM_1 + 0x700000)
-#define CONFIG_MX_CYCLIC
-
-/*
- * Linux Information
- */
-#define LINUX_BOOT_PARAM_ADDR  (PHYS_SDRAM_1 + 0x100)
-#define CONFIG_CMDLINE_TAG
-#define CONFIG_SETUP_MEMORY_TAGS
-
-#ifdef CONFIG_CMD_BDI
-#define CONFIG_CLOCKS
-#endif
-
-/* NAND Setup */
-#ifdef CONFIG_SYS_USE_NAND
-#define        CONFIG_SYS_NAND_PAGE_2K
-#define CONFIG_SYS_NAND_NO_SUBPAGE
-#define CONFIG_SYS_NAND_CS             2
-#define CONFIG_SYS_NAND_BASE           DAVINCI_ASYNC_EMIF_DATA_CE2_BASE
-#undef CONFIG_SYS_NAND_HW_ECC
-#define CONFIG_SYS_NAND_4BIT_HW_ECC_OOBFIRST
-#define        CONFIG_SYS_NAND_USE_FLASH_BBT
-#define CONFIG_SYS_MAX_NAND_DEVICE     1 /* Max number of NAND devices */
-#endif
-
-#if !defined(CONFIG_SYS_USE_NAND) && \
-       !defined(CONFIG_USE_NOR) && \
-       !defined(CONFIG_USE_SPIFLASH)
-#define CONFIG_ENV_SIZE                (16 << 10)
-#endif
-
-/* additions for new relocation code, must added to all boards */
-#define CONFIG_SYS_SDRAM_BASE          0xc0000000
-#define CONFIG_SYS_INIT_SP_ADDR                (CONFIG_SYS_SDRAM_BASE + 0x1000 - \
-                                       GENERATED_GBL_DATA_SIZE)
-/*
- * Default environment and default scripts
- * to update uboot and load kernel
- */
-
-#define CONFIG_HOSTNAME "ea20"
-#define        CONFIG_EXTRA_ENV_SETTINGS                               \
-       "as=3\0"                                                        \
-       "netdev=eth0\0"                                         \
-       "nfsargs=setenv bootargs root=/dev/nfs rw "                     \
-               "nfsroot=${serverip}:${rootpath}\0"                     \
-       "rfsbargs=setenv bootargs root=/dev/nfs rw "                    \
-       "nfsroot=${serverip}:${rfsbpath}\0"                             \
-       "testrfsargs=setenv bootargs root=/dev/nfs rw "         \
-       "nfsroot=${serverip}:${testrfspath}\0"                          \
-       "ramargs=setenv bootargs root=/dev/ram rw initrd="              \
-       "0x${ramdisk_addr_r},4M\0"                                      \
-       "mtdids=nand0=davinci_nand.0\0"                         \
-       "serverip=192.168.5.249\0"                                      \
-       "ipaddr=192.168.5.248\0"                                        \
-       "rootpath=/opt/eldk/arm\0"                                      \
-       "splashpos=230,180\0"                                           \
-       "testrfspath=/opt/eldk/test_arm\0"                              \
-       "nandargs=setenv bootargs rootfstype=ubifs ro chk_data_crc "    \
-       "ubi.mtd=${as} root=ubi0:rootfs\0"                              \
-       "nandrwargs=setenv bootargs rootfstype=ubifs rw chk_data_crc "  \
-       "ubi.mtd=${as} root=ubi0:rootfs\0"                              \
-       "addip_sta=setenv bootargs ${bootargs} "                        \
-               "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}"      \
-               ":${hostname}:${netdev}:off panic=1\0"                  \
-       "addip_dyn=setenv bootargs ${bootargs} ip=dhcp\0"               \
-       "addip=if test -n ${ipdyn};then run addip_dyn;"         \
-               "else run addip_sta;fi\0"                               \
-       "addmtd=setenv bootargs ${bootargs} ${mtdparts}\0"              \
-       "addtty=setenv bootargs ${bootargs}"                            \
-               " console=${consoledev},${baudrate}n8\0"                \
-       "addmisc=setenv bootargs ${bootargs} ${misc}\0"         \
-       "addmem=setenv bootargs ${bootargs} mem=${memory}\0"            \
-       "consoledev=ttyS0\0"                                            \
-       "loadaddr=c0000014\0"                                           \
-       "memory=32M\0"                                                  \
-       "kernel_addr_r=c0700000\0"                                      \
-       "hostname=" CONFIG_HOSTNAME "\0"                        \
-       "bootfile=" CONFIG_HOSTNAME "/uImage\0"         \
-       "ramdisk_file=" CONFIG_HOSTNAME "/image.ext2\0" \
-       "flash_self=run ramargs addip addtty addmtd addmisc addmem;"    \
-                       "bootm ${kernel_addr_r}\0"                      \
-       "flash_nfs=run nfsargs addip addtty addmtd addmisc addmem;"     \
-               "bootm ${kernel_addr}\0"                                \
-       "net_nfs=tftp ${kernel_addr_r} ${bootfile}; "                   \
-               "run nfsargs addip addtty addmtd addmisc addmem;"       \
-               "bootm ${kernel_addr_r}\0"                              \
-       "net_rfsb=tftp ${kernel_addr_r} ${bootfile}; "                  \
-               "run rfsbargs addip addtty addmtd addmisc addmem; "     \
-               "bootm ${kernel_addr_r}\0"                              \
-       "net_testrfs=tftp ${kernel_addr_r} ${bootfile}; "               \
-               "run testrfsargs addip addtty addmtd addmisc addmem; "  \
-               "bootm ${kernel_addr_r}\0"                              \
-       "net_self_load=tftp ${kernel_addr_r} ${bootfile};"              \
-               "tftp ${ramdisk_addr_r} ${ramdisk_file};\0"             \
-       "nand_nand=ubi part nand0,${as};ubifsmount ubi:rootfs;"         \
-               "ubifsload ${kernel_addr_r} /boot/uImage;"              \
-               "ubifsumount; run nandargs addip addtty "               \
-               "addmtd addmisc addmem;clrlogo;"                        \
-               "bootm ${kernel_addr_r}\0"                              \
-       "nand_nandrw=ubi part nand0,${as};ubifsmount ubi:rootfs;"       \
-               "ubifsload ${kernel_addr_r} /boot/uImage;"              \
-               "ubifsumount; run nandrwargs addip addtty "             \
-               "addmtd addmisc addmem;clrlogo;"                        \
-               "bootm ${kernel_addr_r}\0"                              \
-       "net_nandrw=tftp ${kernel_addr_r} ${bootfile}; run nandrwargs"  \
-               " addip addtty addmtd addmisc addmem;"                  \
-               "clrlogo;bootm ${kernel_addr_r}\0"                      \
-       "u-boot=" CONFIG_HOSTNAME "/u-boot.bin\0"               \
-       "load_magic=if sf probe 0;then sf "                             \
-               "read c0000000 0x10000 0x60000;fi\0"                    \
-       "load_nand=ubi part nand0,${as};ubifsmount ubi:rootfs;"         \
-               "if ubifsload c0000014 /boot/u-boot.bin;"               \
-               "then mw c0000008 ${filesize};else echo Error reading"  \
-               " u-boot from nand!;fi\0"                               \
-       "load_net=if sf probe 0;then sf read c0000000 0x10000 " \
-               "0x60000;tftp c0000014 ${u-boot};"                      \
-               "mw c0000008 ${filesize};fi\0"                          \
-       "upd=if sf probe 0;then sf erase 10000 60000;"                  \
-               "sf write c0000000 10000 60000;fi\0"                    \
-       "ublupdate=if tftp C0700000 ${ublname};then sf probe 0; "       \
-               "sf erase 0 10000;"                                     \
-               "sf write 0xc0700000 0 ${filesize};fi\0"                \
-       "ubootupd_net=if run load_net;then echo Updating u-boot;"       \
-               "if run upd; then echo U-Boot updated;"         \
-                       "else echo Error updating u-boot !;"            \
-                       "echo Board without bootloader !!;"             \
-               "fi;"                                                   \
-               "else echo U-Boot not downloaded..exiting;fi\0" \
-       "ubootupd_nand=echo run load_magic,run load_nand,run upd;\0"    \
-       "bootcmd=run net_testrfs\0"
-
-#include <asm/arch/hardware.h>
-
-#endif /* __CONFIG_H */