arm: Remove enbw_cmc board

This board has not been converted to generic board by the deadline.
Remove it.

Signed-off-by: Simon Glass <sjg@chromium.org>

arch/arm/mach-davinci/Kconfig

@@ -4,9 +4,6 @@ choice
 	prompt "DaVinci board select"
 	optional
 
-config TARGET_ENBW_CMC
-	bool "EnBW CMC board"
-
 config TARGET_IPAM390
 	bool "IPAM390 board"
 	select SUPPORT_SPL
@@ -33,7 +30,6 @@ endchoice
 config SYS_SOC
 	default "davinci"
 
-source "board/enbw/enbw_cmc/Kconfig"
 source "board/Barix/ipam390/Kconfig"
 source "board/davinci/da8xxevm/Kconfig"
 source "board/davinci/ea20/Kconfig"

board/enbw/enbw_cmc/Kconfig

@@ -1,12 +0,0 @@
-if TARGET_ENBW_CMC
-
-config SYS_BOARD
-	default "enbw_cmc"
-
-config SYS_VENDOR
-	default "enbw"
-
-config SYS_CONFIG_NAME
-	default "enbw_cmc"
-
-endif

board/enbw/enbw_cmc/MAINTAINERS

@@ -1,6 +0,0 @@
-ENBW_CMC BOARD
-M:	Heiko Schocher <hs@denx.de>
-S:	Maintained
-F:	board/enbw/enbw_cmc/
-F:	include/configs/enbw_cmc.h
-F:	configs/enbw_cmc_defconfig

board/enbw/enbw_cmc/Makefile

@@ -1,10 +0,0 @@
-#
-# (C) Copyright 2000, 2001, 2002
-# Wolfgang Denk, DENX Software Engineering, wd@denx.de.
-#
-# Copyright (C) 2007 Sergey Kubushyn <ksi@koi8.net>
-#
-# SPDX-License-Identifier:	GPL-2.0+
-#
-
-obj-y   := enbw_cmc.o

board/enbw/enbw_cmc/enbw_cmc.c

@@ -1,893 +0,0 @@
-/*
- * (C) Copyright 2011
- * Heiko Schocher, DENX Software Engineering, hs@denx.de.
- *
- * Based on:
- * 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>
- *
- * SPDX-License-Identifier:	GPL-2.0+
- */
-
-#include <common.h>
-#include <command.h>
-#include <environment.h>
-#include <hwconfig.h>
-#include <i2c.h>
-#include <malloc.h>
-#include <miiphy.h>
-#include <mmc.h>
-#include <net.h>
-#include <netdev.h>
-#include <spi.h>
-#include <linux/ctype.h>
-#include <asm/gpio.h>
-#include <asm/io.h>
-#include <asm/arch/da850_lowlevel.h>
-#include <asm/arch/davinci_misc.h>
-#include <asm/ti-common/davinci_nand.h>
-#include <asm/arch/emac_defs.h>
-#include <asm/arch/gpio.h>
-#include <asm/arch/pinmux_defs.h>
-#include <asm/arch/hardware.h>
-#include <asm/arch/sdmmc_defs.h>
-#include <asm/arch/timer_defs.h>
-#include <asm/davinci_rtc.h>
-
-DECLARE_GLOBAL_DATA_PTR;
-
-const struct lpsc_resource lpsc[] = {
-	{ DAVINCI_LPSC_AEMIF },
-	{ DAVINCI_LPSC_SPI1 },
-	{ DAVINCI_LPSC_ARM_RAM_ROM },
-	{ DAVINCI_LPSC_UART0 },
-	{ DAVINCI_LPSC_EMAC },
-	{ DAVINCI_LPSC_UART0 },
-	{ DAVINCI_LPSC_GPIO },
-	{ DAVINCI_LPSC_DDR_EMIF },
-	{ DAVINCI_LPSC_UART1 },
-	{ DAVINCI_LPSC_UART2 },
-	{ DAVINCI_LPSC_MMC_SD1 },
-	{ DAVINCI_LPSC_USB20 },
-	{ DAVINCI_LPSC_USB11 },
-};
-
-const int lpsc_size = ARRAY_SIZE(lpsc);
-
-static const struct pinmux_config enbw_pins[] = {
-	{ pinmux(0), 8, 0 },
-	{ pinmux(0), 8, 1 },
-	{ pinmux(0), 8, 2 },
-	{ pinmux(0), 8, 3 },
-	{ pinmux(0), 8, 4 },
-	{ pinmux(0), 8, 5 },
-	{ pinmux(1), 4, 0 },
-	{ pinmux(1), 8, 1 },
-	{ pinmux(1), 8, 2 },
-	{ pinmux(1), 8, 3 },
-	{ pinmux(1), 8, 4 },
-	{ pinmux(1), 8, 5 },
-	{ pinmux(1), 8, 6 },
-	{ pinmux(1), 4, 7 },
-	{ pinmux(2), 8, 0 },
-	{ pinmux(5), 1, 0 },
-	{ pinmux(5), 1, 3 },
-	{ pinmux(5), 1, 7 },
-	{ pinmux(5), 1, 5 },
-	{ pinmux(5), 1, 4 },
-	{ pinmux(5), 1, 3 },
-	{ pinmux(5), 1, 2 },
-	{ pinmux(5), 1, 1 },
-	{ pinmux(5), 1, 0 },
-	{ pinmux(6), 8, 0 },
-	{ pinmux(6), 8, 1 },
-	{ pinmux(6), 8, 2 },
-	{ pinmux(6), 8, 3 },
-	{ pinmux(6), 8, 4 },
-	{ pinmux(6), 8, 5 },
-	{ pinmux(6), 1, 7 },
-	{ pinmux(7), 8, 2 },
-	{ pinmux(7), 1, 3 },
-	{ pinmux(7), 8, 6 },
-	{ pinmux(7), 1, 7 },
-	{ pinmux(13), 8, 2 },
-	{ pinmux(13), 8, 3 },
-	{ pinmux(13), 8, 4 },
-	{ pinmux(13), 8, 5 },
-	{ pinmux(13), 8, 6 },
-	{ pinmux(13), 8, 7 },
-	{ pinmux(14), 8, 0 },
-	{ pinmux(14), 8, 1 },
-	{ pinmux(16), 8, 1 },
-	{ pinmux(16), 8, 2 },
-	{ pinmux(16), 8, 3 },
-	{ pinmux(16), 8, 4 },
-	{ pinmux(16), 8, 5 },
-	{ pinmux(16), 8, 6 },
-	{ pinmux(16), 8, 7 },
-	{ pinmux(17), 1, 0 },
-	{ pinmux(17), 1, 1 },
-	{ pinmux(17), 1, 2 },
-	{ pinmux(17), 8, 3 },
-	{ pinmux(17), 8, 4 },
-	{ pinmux(17), 8, 5 },
-	{ pinmux(17), 8, 6 },
-	{ pinmux(17), 8, 7 },
-	{ pinmux(18), 8, 0 },
-	{ pinmux(18), 8, 1 },
-	{ pinmux(18), 2, 2 },
-	{ pinmux(18), 2, 3 },
-	{ pinmux(18), 2, 4 },
-	{ pinmux(18), 8, 6 },
-	{ pinmux(18), 8, 7 },
-	{ pinmux(19), 8, 0 },
-	{ pinmux(19), 2, 1 },
-	{ pinmux(19), 2, 2 },
-	{ pinmux(19), 2, 3 },
-	{ pinmux(19), 2, 4 },
-	{ pinmux(19), 8, 5 },
-	{ pinmux(19), 8, 6 },
-};
-
-const struct pinmux_resource pinmuxes[] = {
-	PINMUX_ITEM(emac_pins_mii),
-	PINMUX_ITEM(emac_pins_mdio),
-	PINMUX_ITEM(i2c0_pins),
-	PINMUX_ITEM(emifa_pins_cs2),
-	PINMUX_ITEM(emifa_pins_cs3),
-	PINMUX_ITEM(emifa_pins_cs4),
-	PINMUX_ITEM(emifa_pins_nand),
-	PINMUX_ITEM(emifa_pins_nor),
-	PINMUX_ITEM(spi1_pins_base),
-	PINMUX_ITEM(spi1_pins_scs0),
-	PINMUX_ITEM(uart1_pins_txrx),
-	PINMUX_ITEM(uart2_pins_txrx),
-	PINMUX_ITEM(uart2_pins_rtscts),
-	PINMUX_ITEM(enbw_pins),
-};
-
-const int pinmuxes_size = ARRAY_SIZE(pinmuxes);
-
-struct gpio_config {
-	char name[GPIO_NAME_SIZE];
-	unsigned char bank;
-	unsigned char gpio;
-	unsigned char out;
-	unsigned char value;
-};
-
-static const struct gpio_config enbw_gpio_config_hut[] = {
-	{ "RS485 enable",	8, 11, 1, 0 },
-	{ "RS485 iso",		8, 10, 1, 1 },
-	{ "W2HUT RS485 Rx ena",	8,  9, 1, 0 },
-	{ "W2HUT RS485 iso",	8,  8, 1, 1 },
-};
-
-static const struct gpio_config enbw_gpio_config_w[] = {
-	{ "RS485 enable",	8, 11, 1, 0 },
-	{ "RS485 iso",		8, 10, 1, 0 },
-	{ "W2HUT RS485 Rx ena",	8,  9, 1, 0 },
-	{ "W2HUT RS485 iso",	8,  8, 1, 0 },
-};
-
-static const struct gpio_config enbw_gpio_config[] = {
-	{ "LAN reset",		7, 15, 1, 1 },
-	{ "ena 11V PLC",	7, 14, 1, 0 },
-	{ "ena 1.5V PLC",	7, 13, 1, 0 },
-	{ "disable VBUS",	7, 12, 1, 1 },
-	{ "PLC reset",		6, 13, 1, 0 },
-	{ "LCM RS",		6, 12, 1, 0 },
-	{ "LCM R/W",		6, 11, 1, 0 },
-	{ "PLC pairing",	6, 10, 1, 1 },
-	{ "PLC MDIO CLK",	6,  9, 1, 0 },
-	{ "HK218",		6,  8, 1, 0 },
-	{ "HK218 Rx",		6,  1, 1, 1 },
-	{ "TPM reset",		6,  0, 1, 0 },
-	{ "Board-Type",		3,  9, 0, 0 },
-	{ "HW-ID0",		2,  7, 0, 0 },
-	{ "HW-ID1",		2,  6, 0, 0 },
-	{ "HW-ID2",		2,  3, 0, 0 },
-	{ "PV-IF RxD ena",	0, 15, 1, 1 },
-	{ "LED1",		1, 15, 1, 1 },
-	{ "LED2",		0,  1, 1, 1 },
-	{ "LED3",		0,  2, 1, 1 },
-	{ "LED4",		0,  3, 1, 1 },
-	{ "LED5",		0,  4, 1, 1 },
-	{ "LED6",		0,  5, 1, 0 },
-	{ "LED7",		0,  6, 1, 0 },
-	{ "LED8",		0, 14, 1, 0 },
-	{ "USER1",		0, 12, 0, 0 },
-	{ "USER2",		0, 13, 0, 0 },
-};
-
-#define PHY_POWER	0x0800
-
-static void enbw_cmc_switch(int port, int on)
-{
-	const char	*devname;
-	unsigned char phyaddr = 3;
-	unsigned char	reg = 0;
-	unsigned short	data;
-
-	if (port == 1)
-		phyaddr = 2;
-
-	devname = miiphy_get_current_dev();
-	if (!devname) {
-		printf("Error: no mii device\n");
-		return;
-	}
-	if (miiphy_read(devname, phyaddr, reg, &data) != 0) {
-		printf("Error reading from the PHY addr=%02x reg=%02x\n",
-			phyaddr, reg);
-		return;
-	}
-
-	if (on)
-		data &= ~PHY_POWER;
-	else
-		data |= PHY_POWER;
-
-	if (miiphy_write(devname, phyaddr, reg, data) != 0) {
-		printf("Error writing to the PHY addr=%02x reg=%02x\n",
-			phyaddr, reg);
-		return;
-	}
-}
-
-static int enbw_cmc_init_gpio(const struct gpio_config *conf, int sz)
-{
-	int i, ret;
-
-	for (i = 0; i < sz; i++) {
-		int gpio = conf[i].bank * 16 +
-			conf[i].gpio;
-
-		ret = gpio_request(gpio, conf[i].name);
-		if (ret) {
-			printf("%s: Could not get %s gpio\n", __func__,
-				conf[i].name);
-			return ret;
-		}
-
-		if (conf[i].out)
-			gpio_direction_output(gpio,
-				conf[i].value);
-		else
-			gpio_direction_input(gpio);
-	}
-
-	return 0;
-}
-
-int board_init(void)
-{
-	int board_type, hw_id;
-
-#ifndef CONFIG_USE_IRQ
-	irq_init();
-#endif
-	/* address of boot parameters, not used as booting with DTT */
-	gd->bd->bi_boot_params = 0;
-
-	enbw_cmc_init_gpio(enbw_gpio_config, ARRAY_SIZE(enbw_gpio_config));
-
-	/* detect HW version */
-	board_type = gpio_get_value(CONFIG_ENBW_CMC_BOARD_TYPE);
-	hw_id = gpio_get_value(CONFIG_ENBW_CMC_HW_ID_BIT0) +
-		(gpio_get_value(CONFIG_ENBW_CMC_HW_ID_BIT1) << 1) +
-		(gpio_get_value(CONFIG_ENBW_CMC_HW_ID_BIT2) << 2);
-	printf("BOARD: CMC-%s hw id: %d\n", (board_type ? "w2" : "hut"),
-		hw_id);
-	if (board_type)
-		enbw_cmc_init_gpio(enbw_gpio_config_w,
-			ARRAY_SIZE(enbw_gpio_config_w));
-	else
-		enbw_cmc_init_gpio(enbw_gpio_config_hut,
-			ARRAY_SIZE(enbw_gpio_config_hut));
-
-	/* setup the SUSPSRC for ARM to control emulation suspend */
-	clrbits_le32(&davinci_syscfg_regs->suspsrc,
-		(DAVINCI_SYSCFG_SUSPSRC_EMAC | DAVINCI_SYSCFG_SUSPSRC_I2C |
-		DAVINCI_SYSCFG_SUSPSRC_SPI1 | DAVINCI_SYSCFG_SUSPSRC_TIMER0 |
-		DAVINCI_SYSCFG_SUSPSRC_UART2));
-
-	return 0;
-}
-
-#ifdef CONFIG_DRIVER_TI_EMAC
-
-#define KSZ_CMD_READ	0x03
-#define KSZ_CMD_WRITE	0x02
-#define KSZ_ID		0x95
-
-static int enbw_cmc_switch_read(struct spi_slave *spi, u8 reg, u8 *val)
-{
-	unsigned long flags = SPI_XFER_BEGIN;
-	int ret;
-	int cmd_len;
-	u8 cmd[2];
-
-	cmd[0] = KSZ_CMD_READ;
-	cmd[1] = reg;
-	cmd_len = 2;
-
-	ret = spi_xfer(spi, cmd_len * 8, cmd, NULL, flags);
-	if (ret) {
-		debug("Failed to send command (%zu bytes): %d\n",
-				cmd_len, ret);
-		return -EINVAL;
-	}
-	flags |= SPI_XFER_END;
-	*val = 0;
-	cmd_len = 1;
-	ret = spi_xfer(spi, cmd_len * 8, NULL, val, flags);
-	if (ret) {
-		debug("Failed to read (%zu bytes): %d\n",
-				cmd_len, ret);
-		return -EINVAL;
-	}
-
-	return 0;
-}
-
-static int enbw_cmc_switch_read_ident(struct spi_slave *spi)
-{
-	int ret;
-	u8 val;
-
-	ret = enbw_cmc_switch_read(spi, 0, &val);
-	if (ret) {
-		debug("Failed to read\n");
-		return -EINVAL;
-	}
-
-	if (val != KSZ_ID)
-		return -EINVAL;
-
-	return 0;
-}
-
-static int enbw_cmc_switch_write(struct spi_slave *spi, unsigned long reg,
-		unsigned long val)
-{
-	unsigned long flags = SPI_XFER_BEGIN;
-	int ret;
-	int cmd_len;
-	u8 cmd[3];
-
-	cmd[0] = KSZ_CMD_WRITE;
-	cmd[1] = reg;
-	cmd[2] = val;
-	cmd_len = 3;
-	flags |= SPI_XFER_END;
-
-	ret = spi_xfer(spi, cmd_len * 8, cmd, NULL, flags);
-	if (ret) {
-		debug("Failed to send command (%zu bytes): %d\n",
-				cmd_len, ret);
-		return -EINVAL;
-	}
-
-	udelay(1000);
-	ret = enbw_cmc_switch_read(spi, reg, &cmd[0]);
-	if (ret) {
-		debug("Failed to read\n");
-		return -EINVAL;
-	}
-	if (val != cmd[0])
-		debug("warning: reg: %lx va: %x soll: %lx\n",
-			reg, cmd[0], val);
-
-	return 0;
-}
-
-static int enbw_cmc_eof(unsigned char *ptr)
-{
-	if (*ptr == 0xff)
-		return 1;
-
-	return 0;
-}
-
-static char *enbw_cmc_getnewline(char *ptr)
-{
-	while (*ptr != 0x0a) {
-		ptr++;
-		if (enbw_cmc_eof((unsigned char *)ptr))
-			return NULL;
-	}
-
-	ptr++;
-	return ptr;
-}
-
-static char *enbw_cmc_getvalue(char *ptr, int *value)
-{
-	int	end = 0;
-
-	*value = -EINVAL;
-
-	if (!isxdigit(*ptr))
-		end = 1;
-
-	while (end) {
-		if ((*ptr == '#') || (*ptr == ';')) {
-			ptr = enbw_cmc_getnewline(ptr);
-			return ptr;
-		}
-		if (ptr != NULL) {
-			if (isxdigit(*ptr)) {
-				end = 0;
-			} else if (*ptr == 0x0a) {
-				ptr++;
-				return ptr;
-			} else {
-				ptr++;
-				if (enbw_cmc_eof((unsigned char *)ptr))
-					return NULL;
-			}
-		} else {
-			return NULL;
-		}
-	}
-	*value = (int)simple_strtoul((const char *)ptr, &ptr, 16);
-	ptr++;
-	return ptr;
-}
-
-static struct spi_slave *enbw_cmc_init_spi(void)
-{
-	struct spi_slave *spi;
-	int ret;
-
-	spi = spi_setup_slave(0, 0, 1000000, 0);
-	if (!spi) {
-		printf("Failed to set up slave\n");
-		return NULL;
-	}
-
-	ret = spi_claim_bus(spi);
-	if (ret) {
-		debug("Failed to claim SPI bus: %d\n", ret);
-		goto err_claim_bus;
-	}
-
-	ret = enbw_cmc_switch_read_ident(spi);
-	if (ret)
-		goto err_read;
-
-	return spi;
-err_read:
-	spi_release_bus(spi);
-err_claim_bus:
-	spi_free_slave(spi);
-	return NULL;
-}
-
-static int enbw_cmc_config_switch(unsigned long addr)
-{
-	struct spi_slave *spi;
-	char *ptr = (char *)addr;
-	int value, reg;
-	int ret = 0;
-
-	debug("configure switch with file on addr: 0x%lx\n", addr);
-
-	spi = enbw_cmc_init_spi();
-	if (!spi)
-		return -EINVAL;
-
-	while (ptr != NULL) {
-		ptr = enbw_cmc_getvalue(ptr, &reg);
-		if (ptr != NULL) {
-			ptr = enbw_cmc_getvalue(ptr, &value);
-			if ((ptr != NULL) && (value >= 0))
-				if (enbw_cmc_switch_write(spi, reg, value)) {
-					/* error writing to switch */
-					ptr = NULL;
-					ret = -EINVAL;
-				}
-		}
-	}
-
-	spi_release_bus(spi);
-	spi_free_slave(spi);
-	return ret;
-}
-
-static int do_switch(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
-{
-	unsigned long addr;
-
-	if (argc < 2)
-		return cmd_usage(cmdtp);
-
-	addr = simple_strtoul(argv[1], NULL, 16);
-	enbw_cmc_config_switch(addr);
-
-	return 0;
-}
-
-U_BOOT_CMD(switch, 3, 1, do_switch,
-	"switch addr",
-	"[addr]"
-);
-
-/*
- * Initializes on-board ethernet controllers.
- */
-int board_eth_init(bd_t *bis)
-{
-	struct spi_slave *spi;
-	const char *s;
-	size_t len = 0;
-	int config = 1;
-
-	davinci_emac_mii_mode_sel(0);
-
-	/* send a config file to the switch */
-	s = hwconfig_subarg("switch", "config", &len);
-	if (len) {
-		unsigned long addr = simple_strtoul(s, NULL, 16);
-
-		config = enbw_cmc_config_switch(addr);
-	}
-
-	if (config) {
-		/*
-		 * no valid config file -> do we have some args in
-		 * hwconfig ?
-		 */
-		if ((hwconfig_subarg("switch", "lan", &len)) ||
-		    (hwconfig_subarg("switch", "lmn", &len))) {
-			/* If so start switch */
-			spi = enbw_cmc_init_spi();
-			if (spi) {
-				if (enbw_cmc_switch_write(spi, 1, 0))
-					config = 0;
-				udelay(10000);
-				if (enbw_cmc_switch_write(spi, 1, 1))
-					config = 0;
-				spi_release_bus(spi);
-				spi_free_slave(spi);
-			}
-		} else {
-			config = 0;
-		}
-	}
-	if (!davinci_emac_initialize()) {
-		printf("Error: Ethernet init failed!\n");
-		return -1;
-	}
-
-	if (config) {
-		if (hwconfig_subarg_cmp("switch", "lan", "on"))
-			/* Switch port lan on */
-			enbw_cmc_switch(1, 1);
-		else
-			enbw_cmc_switch(1, 0);
-
-		if (hwconfig_subarg_cmp("switch", "lmn", "on"))
-			/* Switch port pwl on */
-			enbw_cmc_switch(2, 1);
-		else
-			enbw_cmc_switch(2, 0);
-	}
-
-	return 0;
-}
-#endif /* CONFIG_DRIVER_TI_EMAC */
-
-#ifdef CONFIG_PREBOOT
-static uchar kbd_magic_prefix[]		= "key_magic_";
-static uchar kbd_command_prefix[]	= "key_cmd_";
-
-struct kbd_data_t {
-	char s1;
-};
-
-struct kbd_data_t *get_keys(struct kbd_data_t *kbd_data)
-{
-	/* read SW1 + SW2 */
-	kbd_data->s1 = gpio_get_value(12) +
-		(gpio_get_value(13) << 1);
-	return kbd_data;
-}
-
-static int compare_magic(const struct kbd_data_t *kbd_data, char *str)
-{
-	char s1 = str[0];
-
-	if (s1 >= '0' && s1 <= '9')
-		s1 -= '0';
-	else if (s1 >= 'a' && s1 <= 'f')
-		s1 = s1 - 'a' + 10;
-	else if (s1 >= 'A' && s1 <= 'F')
-		s1 = s1 - 'A' + 10;
-	else
-		return -1;
-
-	if (s1 != kbd_data->s1)
-		return -1;
-
-	return 0;
-}
-
-static char *key_match(const struct kbd_data_t *kbd_data)
-{
-	char magic[sizeof(kbd_magic_prefix) + 1];
-	char *suffix;
-	char *kbd_magic_keys;
-
-	/*
-	 * The following string defines the characters that can be appended
-	 * to "key_magic" to form the names of environment variables that
-	 * hold "magic" key codes, i. e. such key codes that can cause
-	 * pre-boot actions. If the string is empty (""), then only
-	 * "key_magic" is checked (old behaviour); the string "125" causes
-	 * checks for "key_magic1", "key_magic2" and "key_magic5", etc.
-	 */
-	kbd_magic_keys = getenv("magic_keys");
-	if (kbd_magic_keys == NULL)
-		kbd_magic_keys = "";
-
-	/*
-	 * loop over all magic keys;
-	 * use '\0' suffix in case of empty string
-	 */
-	for (suffix = kbd_magic_keys; *suffix ||
-		suffix == kbd_magic_keys; ++suffix) {
-		sprintf(magic, "%s%c", kbd_magic_prefix, *suffix);
-
-		if (compare_magic(kbd_data, getenv(magic)) == 0) {
-			char cmd_name[sizeof(kbd_command_prefix) + 1];
-			char *cmd;
-
-			sprintf(cmd_name, "%s%c", kbd_command_prefix, *suffix);
-			cmd = getenv(cmd_name);
-
-			return cmd;
-		}
-	}
-
-	return NULL;
-}
-#endif /* CONFIG_PREBOOT */
-
-int misc_init_r(void)
-{
-	char *s, buf[32];
-#ifdef CONFIG_PREBOOT
-	struct kbd_data_t kbd_data;
-	/* Decode keys */
-	char *str = strdup(key_match(get_keys(&kbd_data)));
-	/* Set or delete definition */
-	setenv("preboot", str);
-	free(str);
-#endif /* CONFIG_PREBOOT */
-
-	/* count all restarts, and save this in an environment var */
-	s = getenv("restartcount");
-
-	if (s)
-		sprintf(buf, "%ld", simple_strtoul(s, NULL, 10) + 1);
-	else
-		strcpy(buf, "1");
-
-	setenv("restartcount", buf);
-	saveenv();
-
-#ifdef CONFIG_HW_WATCHDOG
-	davinci_hw_watchdog_enable();
-#endif
-
-	return 0;
-}
-
-struct cmc_led {
-	char name[20];
-	unsigned char bank;
-	unsigned char gpio;
-};
-
-struct cmc_led led_table[] = {
-	{"led1", 1, 15},
-	{"led2", 0, 1},
-	{"led3", 0, 2},
-	{"led4", 0, 3},
-	{"led5", 0, 4},
-	{"led6", 0, 5},
-	{"led7", 0, 6},
-	{"led8", 0, 14},
-};
-
-static int cmc_get_led_state(struct cmc_led *led)
-{
-	int value;
-	int gpio = led->bank * 16 + led->gpio;
-
-	value = gpio_get_value(gpio);
-
-	return value;
-}
-
-static int cmc_set_led_state(struct cmc_led *led, int state)
-{
-	int gpio = led->bank * 16 + led->gpio;
-
-	gpio_set_value(gpio, state);
-	return 0;
-}
-
-static int do_led(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
-{
-	struct cmc_led *led;
-	int found = 0;
-	int i = 0;
-	int only_print = 0;
-	int len = ARRAY_SIZE(led_table);
-
-	if (argc < 2)
-		return cmd_usage(cmdtp);
-
-	if (argc < 3)
-		only_print = 1;
-
-	led = led_table;
-	while ((!found) && (i < len)) {
-		if (strcmp(argv[1], led->name) == 0) {
-			found = 1;
-		} else {
-			led++;
-			i++;
-		}
-	}
-	if (!found)
-		return cmd_usage(cmdtp);
-
-	if (only_print) {
-		if (cmc_get_led_state(led))
-			printf("on\n");
-		else
-			printf("off\n");
-
-		return 0;
-	}
-	if (strcmp(argv[2], "on") == 0)
-		cmc_set_led_state(led, 1);
-	else
-		cmc_set_led_state(led, 0);
-
-	return 0;
-}
-
-U_BOOT_CMD(led, 3, 1, do_led,
-	"switch on/off board led",
-	"[name] [on/off]"
-);
-
-#ifdef CONFIG_HW_WATCHDOG
-void hw_watchdog_reset(void)
-{
-	davinci_hw_watchdog_reset();
-}
-#endif
-
-#if defined(CONFIG_POST)
-void arch_memory_failure_handle(void)
-{
-	struct davinci_gpio *gpio = davinci_gpio_bank01;
-	int state = 1;
-
-	/*
-	 * if memor< failure blink with the LED 1,2 and 3
-	 * as we running from flash, we cannot use the gpio
-	 * api here, so access the gpio pin direct through
-	 * the gpio register.
-	 */
-	while (1) {
-		if (state) {
-			clrbits_le32(&gpio->out_data, 0x80000006);
-			state = 0;
-		} else {
-			setbits_le32(&gpio->out_data, 0x80000006);
-			state = 1;
-		}
-		udelay(500);
-	}
-}
-#endif
-
-ulong post_word_load(void)
-{
-	struct davinci_rtc *reg =
-		(struct davinci_rtc *)CONFIG_SYS_POST_WORD_ADDR;
-
-	return in_be32(&reg->scratch2);
-}
-
-void post_word_store(ulong value)
-{
-	struct davinci_rtc *reg =
-		(struct davinci_rtc *)CONFIG_SYS_POST_WORD_ADDR;
-
-	/*
-	 * write RTC kick register to enable write
-	 * for RTC Scratch registers. Cratch0 and 1 are
-	 * used for bootcount values.
-	 */
-	writel(RTC_KICK0R_WE, &reg->kick0r);
-	writel(RTC_KICK1R_WE, &reg->kick1r);
-	out_be32(&reg->scratch2, value);
-}
-
-void board_gpio_init(void)
-{
-	struct davinci_gpio *gpio = davinci_gpio_bank01;
-
-	/*
-	 * set LED (gpio Interface not usable here)
-	 * set LED pins to output and state 0
-	 */
-	clrbits_le32(&gpio->dir, 0x8000407e);
-	clrbits_le32(&gpio->out_data, 0x8000407e);
-	/* set LED 1 - 5 to state on */
-	setbits_le32(&gpio->out_data, 0x8000001e);
-
-	/*
-	 * set some gpio pins to low, this is needed early,
-	 * so we have no gpio Interface here
-	 * gpios:
-	 * 8[8]  Mode PV select  low
-	 * 8[9]  Debug Rx Enable low
-	 * 8[10] Mode Select PV  low
-	 * 8[11] Counter Interface RS485 Rx-Enable low
-	 */
-	gpio = davinci_gpio_bank8;
-	clrbits_le32(&gpio->dir, 0x00000f00);
-	clrbits_le32(&gpio->out_data, 0x0f00);
-}
-
-int board_late_init(void)
-{
-	cmc_set_led_state(&led_table[4], 0);
-
-	return 0;
-}
-
-void show_boot_progress(int val)
-{
-	switch (val) {
-	case 1:
-		cmc_set_led_state(&led_table[4], 1);
-		break;
-	case 4:
-		cmc_set_led_state(&led_table[4], 0);
-		break;
-	case 15:
-		cmc_set_led_state(&led_table[4], 1);
-		break;
-	}
-}
-
-#ifdef CONFIG_DAVINCI_MMC
-static struct davinci_mmc mmc_sd1 = {
-	.reg_base	= (struct davinci_mmc_regs *)DAVINCI_MMC_SD1_BASE,
-	.input_clk	= 228000000,
-	.host_caps	= MMC_MODE_4BIT,
-	.voltages	= MMC_VDD_32_33 | MMC_VDD_33_34,
-	.version	= MMC_CTLR_VERSION_2,
-};
-
-int board_mmc_init(bd_t *bis)
-{
-	mmc_sd1.input_clk = clk_get(DAVINCI_MMC_CLKID);
-	/* Add slot-0 to mmc subsystem */
-	return davinci_mmc_init(bis, &mmc_sd1);
-}
-#endif

configs/enbw_cmc_defconfig

@@ -1,5 +0,0 @@
-CONFIG_ARM=y
-CONFIG_ARCH_DAVINCI=y
-CONFIG_TARGET_ENBW_CMC=y
-# CONFIG_CMD_IMLS is not set
-# CONFIG_CMD_SETEXPR is not set

doc/README.switch_config

@@ -1,25 +0,0 @@
-On the enbw_cmc board is a KSZ8864RMN switch which needs
-configured through spi before working. This is done on
-startup from u-boot through a config file stored at an
-address specified in the "hwconfig" environment variable,
-subcommand "config".
-
-For example on the enbw_cmc board:
-
-hwconfig=switch:lan=on,pwl=off,config=0x60160000
-
-The file has the following structure:
-
-- a comment starts with a '#' or a ';' and ends with a newline
-- The switch needs for its config a reg/value pair, so we
-  have two columns in the file:
-    reg  : contains the register address
-    value: contains a 8 bit register value
-  This 2 columns are seperated through space or tab.
-
-example (minimal configuration on the enbw_cmc board):
-
-;reg    value   comment
-;-----------------------------------------
-0x01	0x00
-0x01	0x01    ; Start Switch with this configuration

include/configs/enbw_cmc.h

@@ -1,440 +0,0 @@
-/*
- * (C) Copyright 2011
- * Heiko Schocher, DENX Software Engineering, hs@denx.de.
- *
- * Based on:
- * 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>
- *
- * SPDX-License-Identifier:	GPL-2.0+
- */
-
-#ifndef __CONFIG_H
-#define __CONFIG_H
-
-/*
- * Board
- */
-#define CONFIG_DRIVER_TI_EMAC
-#define CONFIG_SYS_DAVINCI_EMAC_PHY_COUNT 7
-#define CONFIG_USE_NAND
-
-/*
- * SoC Configuration
- */
-#define CONFIG_SOC_DA8XX		/* TI DA8xx SoC */
-#define CONFIG_SOC_DA850		/* TI DA850 SoC */
-#define CONFIG_SYS_EXCEPTION_VECTORS_HIGH
-#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_DA850_LOWLEVEL
-#define CONFIG_ARCH_CPU_INIT
-#define CONFIG_SYS_DA850_PLL_INIT
-#define CONFIG_SYS_DA850_DDR_INIT
-#define CONFIG_DA8XX_GPIO
-#define CONFIG_HOSTNAME		enbw_cmc
-
-#define MACH_TYPE_ENBW_CMC	3585
-#define CONFIG_MACH_TYPE	MACH_TYPE_ENBW_CMC
-
-/*
- * Memory Info
- */
-#define CONFIG_SYS_MALLOC_LEN	(0x10000 + 1*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)
-
-#define CONFIG_NR_DRAM_BANKS	1 /* we have 1 bank of DRAM */
-
-/*
- * Serial Driver info
- */
-#define CONFIG_SYS_NS16550
-#define CONFIG_SYS_NS16550_SERIAL
-#define CONFIG_SYS_NS16550_REG_SIZE	-4	/* NS16550 register size */
-#define CONFIG_SYS_NS16550_COM1	DAVINCI_UART2_BASE /* Base address of UART2 */
-#define CONFIG_SYS_NS16550_CLK	clk_get(DAVINCI_UART2_CLKID)
-#define CONFIG_CONS_INDEX	1		/* use UART0 for console */
-#define CONFIG_BAUDRATE		115200		/* Default baud rate */
-
-/*
- * I2C Configuration
- */
-#define CONFIG_SYS_I2C
-#define CONFIG_SYS_I2C_DAVINCI
-#define CONFIG_SYS_DAVINCI_I2C_SPEED		80000
-#define CONFIG_SYS_DAVINCI_I2C_SLAVE   10 /* Bogus, master-only in U-Boot */
-#define CONFIG_SYS_I2C_EXPANDER_ADDR   0x20
-#define CONFIG_CMD_I2C
-
-#define CONFIG_CMD_DTT
-#define CONFIG_DTT_LM75
-#define CONFIG_DTT_SENSORS	{0}	/* Sensor addresses		*/
-#define CONFIG_SYS_DTT_MAX_TEMP	70
-#define CONFIG_SYS_DTT_LOW_TEMP	-30
-#define CONFIG_SYS_DTT_HYSTERESIS	3
-
-/*
- * SPI Configuration
- */
-#define CONFIG_DAVINCI_SPI
-#define CONFIG_SYS_SPI_BASE		DAVINCI_SPI1_BASE
-#define CONFIG_SYS_SPI_CLK		clk_get(DAVINCI_SPI1_CLKID)
-#define CONFIG_CMD_SPI
-
-/*
- * Flash & Environment
- */
-#ifdef CONFIG_USE_NAND
-#define CONFIG_NAND_DAVINCI
-#define CONFIG_SYS_NAND_USE_FLASH_BBT
-#define CONFIG_SYS_NAND_4BIT_HW_ECC_OOBFIRST
-#define CONFIG_SYS_NAND_PAGE_2K
-#define CONFIG_SYS_NAND_CS		3
-#define CONFIG_SYS_NAND_BASE		DAVINCI_ASYNC_EMIF_DATA_CE3_BASE
-#define CONFIG_SYS_NAND_MASK_CLE		0x10
-#define CONFIG_SYS_NAND_MASK_ALE		0x8
-#undef CONFIG_SYS_NAND_HW_ECC
-#define CONFIG_SYS_MAX_NAND_DEVICE	1 /* Max number of NAND devices */
-
-#define MTDIDS_DEFAULT		"nor0=physmap-flash.0,nand0=davinci_nand.1"
-#define MTDPARTS_DEFAULT			\
-	"mtdparts="				\
-		"physmap-flash.0:"		\
-			"512k(U-Boot),"		\
-			"64k(env1),"		\
-			"64k(env2),"		\
-			"-(rest);"		\
-		"davinci_nand.1:"		\
-			"128k(dtb),"		\
-			"3m(kernel),"		\
-			"4m(rootfs),"		\
-			"-(userfs)"
-
-
-#define CONFIG_CMD_MTDPARTS
-
-#endif
-
-/*
- * Network & Ethernet Configuration
- */
-#ifdef CONFIG_DRIVER_TI_EMAC
-#define CONFIG_MII
-#define CONFIG_BOOTP_DNS
-#define CONFIG_BOOTP_DNS2
-#define CONFIG_BOOTP_SEND_HOSTNAME
-#define CONFIG_NET_RETRY_COUNT	10
-#endif
-
-/*
- * Flash configuration
- */
-#define CONFIG_SYS_FLASH_CFI
-#define CONFIG_FLASH_CFI_DRIVER
-#define CONFIG_FLASH_CFI_MTD
-#define CONFIG_SYS_FLASH_BASE           0x60000000
-#define CONFIG_SYS_FLASH_SIZE           0x01000000
-#define CONFIG_SYS_MAX_FLASH_BANKS      1       /* max num of memory banks */
-#define CONFIG_SYS_FLASH_BANKS_LIST     { CONFIG_SYS_FLASH_BASE }
-#define CONFIG_SYS_MAX_FLASH_SECT       128
-#define CONFIG_FLASH_16BIT              /* Flash is 16-bit */
-
-#define CONFIG_ENV_IS_IN_FLASH
-#define CONFIG_SYS_MONITOR_LEN	0x80000
-#define CONFIG_ENV_ADDR		(CONFIG_SYS_FLASH_BASE + \
-					CONFIG_SYS_MONITOR_LEN)
-#define CONFIG_ENV_SECT_SIZE	(64 << 10)
-#define CONFIG_ENV_SIZE		(16 << 10)	/* 16 KiB */
-#define CONFIG_ENV_ADDR_REDUND	(CONFIG_ENV_ADDR + \
-					CONFIG_ENV_SECT_SIZE)
-#define CONFIG_ENV_SIZE_REDUND		(CONFIG_ENV_SIZE)
-#undef CONFIG_ENV_IS_IN_NAND
-#define CONFIG_DEFAULT_SETTINGS_ADDR	(CONFIG_ENV_ADDR_REDUND + \
-						CONFIG_ENV_SECT_SIZE)
-
-#define	CONFIG_EXTRA_ENV_SETTINGS					\
-	"u-boot_addr_r=c0000000\0"					\
-	"u-boot=" __stringify(CONFIG_HOSTNAME) "/u-boot.bin\0"		\
-	"load=tftp ${u-boot_addr_r} ${u-boot}\0"			\
-	"update=protect off " __stringify(CONFIG_SYS_FLASH_BASE) " +${filesize};"\
-		"erase " __stringify(CONFIG_SYS_FLASH_BASE) " +${filesize};"	\
-		"cp.b ${u-boot_addr_r} " __stringify(CONFIG_SYS_FLASH_BASE)	\
-		" ${filesize};"						\
-		"protect on " __stringify(CONFIG_SYS_FLASH_BASE) " +${filesize}\0"\
-	"netdev=eth0\0"							\
-	"rootpath=/opt/eldk-arm/arm\0"					\
-	"nfsargs=setenv bootargs root=/dev/nfs rw "			\
-		"nfsroot=${serverip}:${rootpath}\0"			\
-	"ramargs=setenv bootargs root=/dev/ram rw\0"			\
-	"addip=setenv bootargs ${bootargs} "				\
-		"ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}"	\
-		":${hostname}:${netdev}:off panic=1\0"			\
-	"kernel_addr_r=c0700000\0"					\
-	"fdt_addr_r=c0600000\0"						\
-	"ramdisk_addr_r=c0b00000\0"					\
-	"fdt_file=" __stringify(CONFIG_HOSTNAME) "/"			\
-		__stringify(CONFIG_HOSTNAME) ".dtb\0"			\
-	"kernel_file=" __stringify(CONFIG_HOSTNAME) "/uImage \0"	\
-	"nand_ld_ramdsk=nand read ${ramdisk_addr_r} 320000 400000\0"	\
-	"nand_ld_kernel=nand read ${kernel_addr_r} 20000 300000\0"	\
-	"nand_ld_fdt=nand read ${fdt_addr_r} 0 2000\0"			\
-	"load_kernel=tftp ${kernel_addr_r} ${kernel_file}\0"		\
-	"load_fdt=tftp ${fdt_addr_r} ${fdt_file}\0"			\
-	"load_nand=run nand_ld_ramdsk nand_ld_kernel nand_ld_fdt\0"	\
-	"addcon=setenv bootargs ${bootargs} console=ttyS2,"		\
-		"${baudrate}n8\0"					\
-	"net_nfs=run load_fdt load_kernel; "				\
-		"run nfsargs addip addcon addmtd addmisc;"		\
-		"bootm ${kernel_addr_r} - ${fdt_addr_r}\0"		\
-	"nand_selfnand=run load_nand ramargs addip addcon addmisc;bootm "\
-		"${kernel_addr_r} ${ramdisk_addr_r} ${fdt_addr_r}\0"	\
-	"bootcmd=run net_nfs\0"						\
-	"machid=e01\0"							\
-	"key_cmd_0=echo key:   0\0"					\
-	"key_cmd_1=echo key:   1\0"					\
-	"key_cmd_2=echo key:   2\0"					\
-	"key_cmd_3=echo key:   3\0"					\
-	"key_magic_0=0\0"						\
-	"key_magic_1=1\0"						\
-	"key_magic_2=2\0"						\
-	"key_magic_3=3\0"						\
-	"magic_keys=0123\0"						\
-	"hwconfig=switch:lan=on,pwl=off,config=0x60100000\0"		\
-	"addmtd=setenv bootargs ${bootargs} ${mtdparts}\0"		\
-	"addmisc=setenv bootargs ${bootargs}\0"				\
-	"mtdids=" MTDIDS_DEFAULT "\0"					\
-	"mtdparts=" MTDPARTS_DEFAULT "\0"				\
-	"logversion=2\0"						\
-	"\0"
-
-/*
- * U-Boot general configuration
- */
-#define CONFIG_BOOTFILE		"uImage" /* Boot file name */
-#define CONFIG_SYS_CBSIZE	1024 /* Console I/O Buffer Size	*/
-#define CONFIG_SYS_PBSIZE	(CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)
-#define CONFIG_SYS_MAXARGS	16 /* max number of command args */
-#define CONFIG_SYS_BARGSIZE	CONFIG_SYS_CBSIZE /* Boot Args Buffer Size */
-#define CONFIG_SYS_LOAD_ADDR	(PHYS_SDRAM_1 + 0x700000)
-#define CONFIG_VERSION_VARIABLE
-#define CONFIG_AUTO_COMPLETE
-#define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_CMDLINE_EDITING
-#define CONFIG_SYS_LONGHELP
-#define CONFIG_CRC32_VERIFY
-#define CONFIG_MX_CYCLIC
-#define CONFIG_BOOTDELAY	3
-#define CONFIG_HWCONFIG
-#define CONFIG_SHOW_BOOT_PROGRESS
-#define CONFIG_BOARD_LATE_INIT
-
-/*
- * U-Boot commands
- */
-#define CONFIG_CMD_ENV
-#define CONFIG_CMD_ASKENV
-#define CONFIG_CMD_DHCP
-#define CONFIG_CMD_DIAG
-#define CONFIG_CMD_MII
-#define CONFIG_CMD_PING
-#define CONFIG_CMD_SAVES
-#define CONFIG_CMD_CACHE
-
-#ifdef CONFIG_CMD_BDI
-#define CONFIG_CLOCKS
-#endif
-
-#ifndef CONFIG_DRIVER_TI_EMAC
-#undef CONFIG_CMD_DHCP
-#undef CONFIG_CMD_MII
-#undef CONFIG_CMD_PING
-#endif
-
-#ifdef CONFIG_USE_NAND
-#define CONFIG_CMD_NAND
-
-#define CONFIG_CMD_MTDPARTS
-#define CONFIG_MTD_DEVICE
-#define CONFIG_MTD_PARTITIONS
-#define CONFIG_LZO
-#define CONFIG_RBTREE
-#define CONFIG_CMD_UBI
-#define CONFIG_CMD_UBIFS
-#endif
-
-#if !defined(CONFIG_USE_NAND) && \
-	!defined(CONFIG_USE_NOR) && \
-	!defined(CONFIG_USE_SPIFLASH)
-#define CONFIG_ENV_IS_NOWHERE
-#define CONFIG_SYS_NO_FLASH
-#define CONFIG_ENV_SIZE		(16 << 10)
-#undef CONFIG_CMD_ENV
-#endif
-
-#define CONFIG_SYS_TEXT_BASE		0x60000000
-#define CONFIG_SYS_MONITOR_BASE		CONFIG_SYS_TEXT_BASE
-#define CONFIG_SYS_SDRAM_BASE		0xc0000000
-#define CONFIG_SYS_INIT_SP_ADDR		(0x8001ff00)
-
-#define CONFIG_VERSION_VARIABLE
-#define CONFIG_ENV_OVERWRITE
-
-#define CONFIG_PREBOOT	"echo;" \
-	"echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;" \
-	"echo"
-#define CONFIG_MISC_INIT_R
-
-#define CONFIG_CMC_RESET_PIN	0x04000000
-#define CONFIG_CMC_RESET_TIMEOUT	3
-
-#define CONFIG_HW_WATCHDOG
-#define CONFIG_SYS_WDTTIMERBASE		DAVINCI_TIMER1_BASE
-#define CONFIG_SYS_WDT_PERIOD_LOW	0x0c000000
-#define CONFIG_SYS_WDT_PERIOD_HIGH	0x0
-
-#define CONFIG_CMD_DATE
-#define CONFIG_RTC_DAVINCI
-
-/* SD/MMC */
-#define CONFIG_MMC
-#define CONFIG_GENERIC_MMC
-#define CONFIG_DAVINCI_MMC
-#define CONFIG_MMC_MBLOCK
-#define CONFIG_DOS_PARTITION
-#define CONFIG_CMD_FAT
-#define CONFIG_CMD_MMC
-
-/* GPIO */
-#define CONFIG_ENBW_CMC_BOARD_TYPE	57
-#define CONFIG_ENBW_CMC_HW_ID_BIT0	39
-#define CONFIG_ENBW_CMC_HW_ID_BIT1	38
-#define CONFIG_ENBW_CMC_HW_ID_BIT2	35
-
-/* FDT support */
-#define CONFIG_OF_LIBFDT
-
-/* LowLevel Init */
-/* PLL */
-#define CONFIG_SYS_DV_CLKMODE		0
-#define CONFIG_SYS_DA850_PLL0_POSTDIV	0
-#define CONFIG_SYS_DA850_PLL0_PLLDIV1	0x8000
-#define CONFIG_SYS_DA850_PLL0_PLLDIV2	0x8001
-#define CONFIG_SYS_DA850_PLL0_PLLDIV3	0x8002 /* 150MHz */
-#define CONFIG_SYS_DA850_PLL0_PLLDIV4	0x8003
-#define CONFIG_SYS_DA850_PLL0_PLLDIV5	0x8002
-#define CONFIG_SYS_DA850_PLL0_PLLDIV6	CONFIG_SYS_DA850_PLL0_PLLDIV1
-#define CONFIG_SYS_DA850_PLL0_PLLDIV7	0x8005
-
-#define CONFIG_SYS_DA850_PLL1_POSTDIV	1
-#define CONFIG_SYS_DA850_PLL1_PLLDIV1	0x8000
-#define CONFIG_SYS_DA850_PLL1_PLLDIV2	0x8001
-#define CONFIG_SYS_DA850_PLL1_PLLDIV3	0x8002
-
-#define CONFIG_SYS_DA850_PLL0_PLLM	18	/* PLL0 -> 456 MHz */
-#define CONFIG_SYS_DA850_PLL1_PLLM	24	/* PLL1 -> 300 MHz */
-
-/* DDR RAM */
-#define CONFIG_SYS_DA850_DDR2_DDRPHYCR (DV_DDR_PHY_PWRDNEN | \
-			DV_DDR_PHY_EXT_STRBEN   | \
-			(0x4 << DV_DDR_PHY_RD_LATENCY_SHIFT))
-
-#define CONFIG_SYS_DA850_DDR2_SDBCR (0 | \
-		  (0 << DV_DDR_SDCR_DDR2TERM1_SHIFT) | \
-		  (0 << DV_DDR_SDCR_MSDRAMEN_SHIFT) | \
-		  (1 << DV_DDR_SDCR_DDR2EN_SHIFT) | \
-		  (0x1 << DV_DDR_SDCR_DDREN_SHIFT)	| \
-		  (0x1 << DV_DDR_SDCR_SDRAMEN_SHIFT)	| \
-		  (0x1 << DV_DDR_SDCR_TIMUNLOCK_SHIFT)	| \
-		  (0x1 << DV_DDR_SDCR_BUS_WIDTH_SHIFT)	| \
-		  (0x3 << DV_DDR_SDCR_CL_SHIFT)		| \
-		  (0x2 << DV_DDR_SDCR_IBANK_SHIFT)		| \
-		  (0x2 << DV_DDR_SDCR_PAGESIZE_SHIFT))
-
-#define CONFIG_SYS_DA850_DDR2_SDBCR2 4 /* 13 row address bits */
-
-/*
- * freq = 150MHz -> t = 7ns
- */
-#define CONFIG_SYS_DA850_DDR2_SDTIMR (0 | \
-		(0x0d << DV_DDR_SDTMR1_RFC_SHIFT)	| \
-		(1 << DV_DDR_SDTMR1_RP_SHIFT)		| \
-		(1 << DV_DDR_SDTMR1_RCD_SHIFT)		| \
-		(1 << DV_DDR_SDTMR1_WR_SHIFT)		| \
-		(5 << DV_DDR_SDTMR1_RAS_SHIFT)		| \
-		(7 << DV_DDR_SDTMR1_RC_SHIFT)		| \
-		(1 << DV_DDR_SDTMR1_RRD_SHIFT)		| \
-		(readl(&dv_ddr2_regs_ctrl->sdtimr) & 0x4) |  /* Reserved */ \
-		((2 - 1) << DV_DDR_SDTMR1_WTR_SHIFT))
-
-/*
- * freq = 150MHz -> t=7ns
- */
-#define CONFIG_SYS_DA850_DDR2_SDTIMR2 (0 | \
-	(readl(&dv_ddr2_regs_ctrl->sdtimr2) & 0x80000000) | /* Reserved */ \
-	(8 << DV_DDR_SDTMR2_RASMAX_SHIFT)		| \
-	(2 << DV_DDR_SDTMR2_XP_SHIFT)			| \
-	(0 << DV_DDR_SDTMR2_ODT_SHIFT)			| \
-	(15 << DV_DDR_SDTMR2_XSNR_SHIFT)		| \
-	(27 << DV_DDR_SDTMR2_XSRD_SHIFT)		| \
-	(0 << DV_DDR_SDTMR2_RTP_SHIFT)			| \
-	(2 << DV_DDR_SDTMR2_CKE_SHIFT))
-
-#define CONFIG_SYS_DA850_DDR2_SDRCR	0x00000407
-#define CONFIG_SYS_DA850_DDR2_PBBPR	0x30
-#define CONFIG_SYS_DA850_SYSCFG_SUSPSRC (DAVINCI_SYSCFG_SUSPSRC_TIMER0 | \
-					DAVINCI_SYSCFG_SUSPSRC_SPI1 | \
-					DAVINCI_SYSCFG_SUSPSRC_UART2 | \
-					DAVINCI_SYSCFG_SUSPSRC_EMAC |\
-					DAVINCI_SYSCFG_SUSPSRC_I2C)
-
-#define CONFIG_SYS_DA850_CS2CFG	(DAVINCI_ABCR_WSETUP(2)	| \
-				DAVINCI_ABCR_WSTROBE(6)	| \
-				DAVINCI_ABCR_WHOLD(1)	| \
-				DAVINCI_ABCR_RSETUP(2)	| \
-				DAVINCI_ABCR_RSTROBE(6)	| \
-				DAVINCI_ABCR_RHOLD(1)	| \
-				DAVINCI_ABCR_ASIZE_16BIT)
-
-#define CONFIG_SYS_DA850_CS3CFG	(DAVINCI_ABCR_WSETUP(1)	| \
-				DAVINCI_ABCR_WSTROBE(2)	| \
-				DAVINCI_ABCR_WHOLD(1)	| \
-				DAVINCI_ABCR_RSETUP(1)	| \
-				DAVINCI_ABCR_RSTROBE(6)	| \
-				DAVINCI_ABCR_RHOLD(1)	| \
-				DAVINCI_ABCR_ASIZE_8BIT)
-
-/*
- * NOR Bootconfiguration word:
- * Method: Direc boot
- * EMIFA access mode: 16 Bit
- */
-#define CONFIG_SYS_DV_NOR_BOOT_CFG	(0x11)
-
-#define CONFIG_POST	(CONFIG_SYS_POST_MEMORY)
-#define CONFIG_POST_EXTERNAL_WORD_FUNCS
-#define CONFIG_SYS_POST_WORD_ADDR DAVINCI_RTC_BASE
-#define CONFIG_LOGBUFFER
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV
-
-#define CONFIG_BOOTCOUNT_LIMIT
-#define CONFIG_SYS_BOOTCOUNT_ADDR	DAVINCI_RTC_BASE
-#define CONFIG_SYS_BOOTCOUNT_BE
-
-#define CONFIG_SYS_NAND_U_BOOT_DST	0xc0080000
-#define CONFIG_SYS_NAND_U_BOOT_OFFS	0x60004000
-#define CONFIG_SYS_NAND_U_BOOT_SIZE	0x70000
-#define CONFIG_SYS_NAND_U_BOOT_START	CONFIG_SYS_NAND_U_BOOT_DST
-#endif /* __CONFIG_H */