[v2,18/23] birdland: Drop bav335x
diff mbox series

Message ID 20200527125637.149189-19-jagan@amarulasolutions.com
State New
Headers show
Series
  • spi: dm-conversion (part1)
Related show

Commit Message

Jagan Teki May 27, 2020, 12:56 p.m. UTC 
OF_CONTROL, DM_SPI and other driver model migration deadlines
are expired for this board.

Drop it.

Cc: Gilles Gameiro <gilles@gigadevices.com>
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
---
Changes for v2:
- new patch

 arch/arm/Kconfig                   |   1 -
 arch/arm/mach-omap2/am33xx/Kconfig |  15 -
 board/birdland/bav335x/Kconfig     |  23 --
 board/birdland/bav335x/MAINTAINERS |  13 -
 board/birdland/bav335x/Makefile    |  11 -
 board/birdland/bav335x/README      |  31 --
 board/birdland/bav335x/board.c     | 432 --------------------------
 board/birdland/bav335x/board.h     |  58 ----
 board/birdland/bav335x/mux.c       | 190 ------------
 board/birdland/bav335x/u-boot.lds  | 115 -------
 configs/birdland_bav335a_defconfig |  69 -----
 configs/birdland_bav335b_defconfig |  69 -----
 include/configs/bav335x.h          | 475 -----------------------------
 13 files changed, 1502 deletions(-)
 delete mode 100644 board/birdland/bav335x/Kconfig
 delete mode 100644 board/birdland/bav335x/MAINTAINERS
 delete mode 100644 board/birdland/bav335x/Makefile
 delete mode 100644 board/birdland/bav335x/README
 delete mode 100644 board/birdland/bav335x/board.c
 delete mode 100644 board/birdland/bav335x/board.h
 delete mode 100644 board/birdland/bav335x/mux.c
 delete mode 100644 board/birdland/bav335x/u-boot.lds
 delete mode 100644 configs/birdland_bav335a_defconfig
 delete mode 100644 configs/birdland_bav335b_defconfig
 delete mode 100644 include/configs/bav335x.h

Comments

Jagan Teki June 13, 2020, 6:26 p.m. UTC | #1 
On Wed, May 27, 2020 at 6:27 PM Jagan Teki <jagan@amarulasolutions.com> wrote:
>
> OF_CONTROL, DM_SPI and other driver model migration deadlines
> are expired for this board.
>
> Drop it.
>
> Cc: Gilles Gameiro <gilles@gigadevices.com>

Any comments?
Jagan Teki July 7, 2020, 3:51 p.m. UTC | #2 
On Sat, Jun 13, 2020 at 11:56 PM Jagan Teki <jagan@amarulasolutions.com> wrote:
>
> On Wed, May 27, 2020 at 6:27 PM Jagan Teki <jagan@amarulasolutions.com> wrote:
> >
> > OF_CONTROL, DM_SPI and other driver model migration deadlines
> > are expired for this board.
> >
> > Drop it.
> >
> > Cc: Gilles Gameiro <gilles@gigadevices.com>
>
> Any comments?

Applied to u-boot-spi/master

Patch
diff mbox series 

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 21df1c415f..3dbde6fc45 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1914,7 +1914,6 @@  source "board/spear/spear600/Kconfig"
 source "board/spear/x600/Kconfig"
 source "board/st/stv0991/Kconfig"
 source "board/tcl/sl50/Kconfig"
-source "board/birdland/bav335x/Kconfig"
 source "board/toradex/colibri_pxa270/Kconfig"
 source "board/variscite/dart_6ul/Kconfig"
 source "board/vscom/baltos/Kconfig"
diff --git a/arch/arm/mach-omap2/am33xx/Kconfig b/arch/arm/mach-omap2/am33xx/Kconfig
index 39d9c2873b..a93fbf4ea0 100644
--- a/arch/arm/mach-omap2/am33xx/Kconfig
+++ b/arch/arm/mach-omap2/am33xx/Kconfig
@@ -103,21 +103,6 @@  config TARGET_AM335X_SL50
 	select DM_SERIAL
 	imply CMD_DM
 
-config TARGET_BAV335X
-	bool "Support bav335x"
-	select BOARD_LATE_INIT
-	select DM
-	select DM_SERIAL
-	imply CMD_DM
-	help
-	  The BAV335x OEM Network Processor integrates all the functions of an
-	  embedded network computer in a small, easy to use SODIMM module which
-	  incorporates the popular Texas Instruments Sitara 32bit ARM Coretex-A8
-	  processor, with fast DDR3 512MB SDRAM, 4GB of embedded MMC and a Gigabit
-	  ethernet with simple connection to external connectors.
-
-	  For more information, visit: http://birdland.com/oem
-
 config TARGET_BRXRE1
 	bool "Support BRXRE1"
 	select BOARD_LATE_INIT
diff --git a/board/birdland/bav335x/Kconfig b/board/birdland/bav335x/Kconfig
deleted file mode 100644
index 40053665aa..0000000000
--- a/board/birdland/bav335x/Kconfig
+++ /dev/null
@@ -1,23 +0,0 @@ 
-if TARGET_BAV335X
-
-config SYS_BOARD
-	default "bav335x"
-
-config SYS_VENDOR
-	default "birdland"
-
-config SYS_SOC
-	default "am33xx"
-
-config SYS_CONFIG_NAME
-	default "bav335x"
-
-config BAV_VERSION
-	int "BAV335x Version (1=A, 2=B)"
-	range 1 2
-	help
-	  The BAV335x has various version of the board. Rev.A (mostly obsolete)
-	  used 10/100 Ethernet PHY while Rev.B uses a Gigabit Ethernet PHY.
-	  Overwrite this if you have an older Rev.A and want ethernet support.
-
-endif
diff --git a/board/birdland/bav335x/MAINTAINERS b/board/birdland/bav335x/MAINTAINERS
deleted file mode 100644
index 45dcfcb1e6..0000000000
--- a/board/birdland/bav335x/MAINTAINERS
+++ /dev/null
@@ -1,13 +0,0 @@ 
-BAV335x BOARD
-M:	Gilles Gameiro <gilles@gigadevices.com>
-S:	Maintained
-F:	include/configs/bav335x.h
-F:	board/birdland/bav335x/Kconfig
-F:	board/birdland/bav335x/Makefile
-F:	board/birdland/bav335x/README
-F:	board/birdland/bav335x/board.c
-F:	board/birdland/bav335x/board.h
-F:	board/birdland/bav335x/mux.c
-F:	board/birdland/bav335x/u-boot.lds
-F:	configs/birdland_bav335a_defconfig
-F:	configs/birdland_bav335b_defconfig
diff --git a/board/birdland/bav335x/Makefile b/board/birdland/bav335x/Makefile
deleted file mode 100644
index 42cefa1f85..0000000000
--- a/board/birdland/bav335x/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@ 
-# SPDX-License-Identifier: GPL-2.0+
-#
-# Makefile
-#
-# Copyright (C) 2012-2014, Birdland Audio - http://birdland.com/oem
-
-ifeq ($(CONFIG_SKIP_LOWLEVEL_INIT),)
-obj-y	:= mux.o
-endif
-
-obj-y	+= board.o
diff --git a/board/birdland/bav335x/README b/board/birdland/bav335x/README
deleted file mode 100644
index 08c73eee0c..0000000000
--- a/board/birdland/bav335x/README
+++ /dev/null
@@ -1,31 +0,0 @@ 
-Summary
-=======
-
-This document covers various features of the 'BAV335x' board build.
-For more information about this board, visit http://birdland.com/oem
-
-
-Hardware
-========
-
-The binary produced supports the bav335x Rev.A with 10/100 MB PHY
-and Rev.B (default) with GB ethernet PHY.
-If the BAV335x EEPROM is populated and programmed, the board will
-automatically detect the version and extract proper serial# and
-mac address from the EE.
-
-
-Customization
-=============
-
-The following blocks are required:
-- I2C, to talk with the PMIC and ensure that we do not run afoul of
-  errata 1.0.24.
-
-When removing options as part of customization,
-CONFIG_EXTRA_ENV_SETTINGS will need additional care to update for your
-needs and to remove no longer relevant options as in some cases we
-define additional text blocks (such as for NAND or DFU strings).  Also
-note that all of the SPL options are grouped together, rather than with
-the IP blocks, so both areas will need their choices updated to reflect
-the custom design.
diff --git a/board/birdland/bav335x/board.c b/board/birdland/bav335x/board.c
deleted file mode 100644
index 5900e65466..0000000000
--- a/board/birdland/bav335x/board.c
+++ /dev/null
@@ -1,432 +0,0 @@ 
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * board.c
- *
- * Board functions for Birdland Audio BAV335x Network Processor
- *
- * Copyright (c) 2012-2014 Birdland Audio - http://birdland.com/oem
- */
-
-#include <common.h>
-#include <env.h>
-#include <errno.h>
-#include <init.h>
-#include <net.h>
-#include <serial.h>
-#include <spl.h>
-#include <asm/arch/cpu.h>
-#include <asm/arch/hardware.h>
-#include <asm/arch/omap.h>
-#include <asm/arch/ddr_defs.h>
-#include <asm/arch/clock.h>
-#include <asm/arch/gpio.h>
-#include <asm/arch/mmc_host_def.h>
-#include <asm/arch/sys_proto.h>
-#include <asm/arch/mem.h>
-#include <asm/io.h>
-#include <asm/emif.h>
-#include <asm/gpio.h>
-#include <i2c.h>
-#include <miiphy.h>
-#include <cpsw.h>
-#include <power/tps65217.h>
-#include <power/tps65910.h>
-#include <env_internal.h>
-#include <watchdog.h>
-#include "board.h"
-
-DECLARE_GLOBAL_DATA_PTR;
-
-/* GPIO that controls power to DDR on EVM-SK */
-#define GPIO_DDR_VTT_EN		7
-
-static __maybe_unused struct ctrl_dev *cdev =
-		(struct ctrl_dev *)CTRL_DEVICE_BASE;
-
-
-
-/*
- * Read header information from EEPROM into global structure.
- */
-static int read_eeprom(struct board_eeconfig *header)
-{
-	/* Check if baseboard eeprom is available */
-	if (i2c_probe(CONFIG_SYS_I2C_EEPROM_ADDR))
-		return -ENODEV;
-
-	/* read the eeprom using i2c */
-	if (i2c_read(CONFIG_SYS_I2C_EEPROM_ADDR, 0, 2, (uchar *)header,
-		     sizeof(struct board_eeconfig)))
-		return -EIO;
-
-	if (header->magic != BOARD_MAGIC) {
-		/* read the i2c eeprom again using only a 1 byte address */
-		if (i2c_read(CONFIG_SYS_I2C_EEPROM_ADDR, 0, 1, (uchar *)header,
-			     sizeof(struct board_eeconfig)))
-			return -EIO;
-
-		if (header->magic != BOARD_MAGIC)
-			return -EINVAL;
-	}
-	return 0;
-}
-
-
-
-
-enum board_type get_board_type(bool debug)
-{
-	int ecode;
-	struct board_eeconfig header;
-
-	ecode = read_eeprom(&header);
-	if (ecode == 0) {
-		if (header.version[1] == 'A') {
-			if (debug)
-				puts("=== Detected Board model BAV335x Rev.A");
-			return BAV335A;
-		} else if (header.version[1] == 'B') {
-			if (debug)
-				puts("=== Detected Board model BAV335x Rev.B");
-			return BAV335B;
-		} else if (debug) {
-			puts("### Un-known board model in serial-EE\n");
-		}
-	} else if (debug) {
-		switch (ecode) {
-		case -ENODEV:
-			puts("### Board doesn't have a serial-EE\n");
-			break;
-		case -EINVAL:
-			puts("### Board serial-EE signature is incorrect.\n");
-			break;
-		default:
-			puts("### IO Error reading serial-EE.\n");
-			break;
-		}
-	}
-
-#if (CONFIG_BAV_VERSION == 1)
-	if (debug)
-		puts("### Selecting BAV335A as per config\n");
-	return BAV335A;
-#elif (CONFIG_BAV_VERSION == 2)
-	if (debug)
-		puts("### Selecting BAV335B as per config\n");
-	return BAV335B;
-#endif
-#if (NOT_DEFINED == 2)
-#error "SHOULD NEVER DISPLAY THIS"
-#endif
-
-	if (debug)
-		puts("### Defaulting to model BAV335x Rev.B\n");
-	return BAV335B;
-}
-
-
-
-#ifndef CONFIG_SKIP_LOWLEVEL_INIT
-static const struct ddr_data ddr3_bav335x_data = {
-	.datardsratio0 = MT41K256M16HA125E_RD_DQS,
-	.datawdsratio0 = MT41K256M16HA125E_WR_DQS,
-	.datafwsratio0 = MT41K256M16HA125E_PHY_FIFO_WE,
-	.datawrsratio0 = MT41K256M16HA125E_PHY_WR_DATA,
-};
-
-static const struct cmd_control ddr3_bav335x_cmd_ctrl_data = {
-	.cmd0csratio = MT41K256M16HA125E_RATIO,
-	.cmd0iclkout = MT41K256M16HA125E_INVERT_CLKOUT,
-	.cmd1csratio = MT41K256M16HA125E_RATIO,
-	.cmd1iclkout = MT41K256M16HA125E_INVERT_CLKOUT,
-	.cmd2csratio = MT41K256M16HA125E_RATIO,
-	.cmd2iclkout = MT41K256M16HA125E_INVERT_CLKOUT,
-};
-
-
-static struct emif_regs ddr3_bav335x_emif_reg_data = {
-	.sdram_config = MT41K256M16HA125E_EMIF_SDCFG,
-	.ref_ctrl = MT41K256M16HA125E_EMIF_SDREF,
-	.sdram_tim1 = MT41K256M16HA125E_EMIF_TIM1,
-	.sdram_tim2 = MT41K256M16HA125E_EMIF_TIM2,
-	.sdram_tim3 = MT41K256M16HA125E_EMIF_TIM3,
-	.zq_config = MT41K256M16HA125E_ZQ_CFG,
-	.emif_ddr_phy_ctlr_1 = MT41K256M16HA125E_EMIF_READ_LATENCY,
-};
-
-
-#ifdef CONFIG_SPL_OS_BOOT
-int spl_start_uboot(void)
-{
-	/* break into full u-boot on 'c' */
-	if (serial_tstc() && serial_getc() == 'c')
-		return 1;
-
-#ifdef CONFIG_SPL_ENV_SUPPORT
-	env_init();
-	env_load();
-	if (env_get_yesno("boot_os") != 1)
-		return 1;
-#endif
-
-	return 0;
-}
-#endif
-
-#define OSC	(V_OSCK/1000000)
-const struct dpll_params dpll_ddr = {
-		266, OSC-1, 1, -1, -1, -1, -1};
-const struct dpll_params dpll_ddr_evm_sk = {
-		303, OSC-1, 1, -1, -1, -1, -1};
-const struct dpll_params dpll_ddr_bone_black = {
-		400, OSC-1, 1, -1, -1, -1, -1};
-
-void am33xx_spl_board_init(void)
-{
-	/* debug print detect status */
-	(void)get_board_type(true);
-
-	/* Get the frequency */
-	/* dpll_mpu_opp100.m = am335x_get_efuse_mpu_max_freq(cdev); */
-	dpll_mpu_opp100.m = MPUPLL_M_1000;
-
-	if (i2c_probe(TPS65217_CHIP_PM))
-		return;
-
-	/* Set the USB Current Limit */
-	if (tps65217_reg_write(TPS65217_PROT_LEVEL_NONE, TPS65217_POWER_PATH,
-			       TPS65217_USB_INPUT_CUR_LIMIT_1800MA,
-			       TPS65217_USB_INPUT_CUR_LIMIT_MASK))
-		puts("! tps65217_reg_write: could not set USB limit\n");
-
-	/* Set the Core Voltage (DCDC3) to 1.125V */
-	if (tps65217_voltage_update(TPS65217_DEFDCDC3,
-				    TPS65217_DCDC_VOLT_SEL_1125MV)) {
-		puts("! tps65217_reg_write: could not set Core Voltage\n");
-		return;
-	}
-
-	/* Set CORE Frequencies to OPP100 */
-	do_setup_dpll(&dpll_core_regs, &dpll_core_opp100);
-
-	/* Set the MPU Voltage (DCDC2) */
-	if (tps65217_voltage_update(TPS65217_DEFDCDC2,
-				    TPS65217_DCDC_VOLT_SEL_1325MV)) {
-		puts("! tps65217_reg_write: could not set MPU Voltage\n");
-		return;
-	}
-
-	/*
-	 * Set LDO3, LDO4 output voltage to 3.3V for Beaglebone.
-	 * Set LDO3 to 1.8V and LDO4 to 3.3V for Beaglebone Black.
-	 */
-	if (tps65217_reg_write(TPS65217_PROT_LEVEL_2, TPS65217_DEFLS1,
-			       TPS65217_LDO_VOLTAGE_OUT_1_8, TPS65217_LDO_MASK))
-		puts("! tps65217_reg_write: could not set LDO3\n");
-
-	if (tps65217_reg_write(TPS65217_PROT_LEVEL_2, TPS65217_DEFLS2,
-			       TPS65217_LDO_VOLTAGE_OUT_3_3, TPS65217_LDO_MASK))
-		puts("! tps65217_reg_write: could not set LDO4\n");
-
-	/* Set MPU Frequency to what we detected now that voltages are set */
-	do_setup_dpll(&dpll_mpu_regs, &dpll_mpu_opp100);
-}
-
-const struct dpll_params *get_dpll_ddr_params(void)
-{
-	enable_i2c0_pin_mux();
-	i2c_init(CONFIG_SYS_OMAP24_I2C_SPEED, CONFIG_SYS_OMAP24_I2C_SLAVE);
-
-	return &dpll_ddr_bone_black;
-}
-
-void set_uart_mux_conf(void)
-{
-#if CONFIG_CONS_INDEX == 1
-	enable_uart0_pin_mux();
-#elif CONFIG_CONS_INDEX == 2
-	enable_uart1_pin_mux();
-#elif CONFIG_CONS_INDEX == 3
-	enable_uart2_pin_mux();
-#elif CONFIG_CONS_INDEX == 4
-	enable_uart3_pin_mux();
-#elif CONFIG_CONS_INDEX == 5
-	enable_uart4_pin_mux();
-#elif CONFIG_CONS_INDEX == 6
-	enable_uart5_pin_mux();
-#endif
-}
-
-void set_mux_conf_regs(void)
-{
-	enum board_type board;
-
-	board = get_board_type(false);
-	enable_board_pin_mux(board);
-}
-
-const struct ctrl_ioregs ioregs_bonelt = {
-	.cm0ioctl		= MT41K256M16HA125E_IOCTRL_VALUE,
-	.cm1ioctl		= MT41K256M16HA125E_IOCTRL_VALUE,
-	.cm2ioctl		= MT41K256M16HA125E_IOCTRL_VALUE,
-	.dt0ioctl		= MT41K256M16HA125E_IOCTRL_VALUE,
-	.dt1ioctl		= MT41K256M16HA125E_IOCTRL_VALUE,
-};
-
-
-void sdram_init(void)
-{
-	config_ddr(400, &ioregs_bonelt,
-		   &ddr3_bav335x_data,
-		   &ddr3_bav335x_cmd_ctrl_data,
-		   &ddr3_bav335x_emif_reg_data, 0);
-}
-#endif
-
-/*
- * Basic board specific setup.  Pinmux has been handled already.
- */
-int board_init(void)
-{
-#if defined(CONFIG_HW_WATCHDOG)
-	hw_watchdog_init();
-#endif
-
-	gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
-#if defined(CONFIG_NOR) || defined(CONFIG_MTD_RAW_NAND)
-	gpmc_init();
-#endif
-	return 0;
-}
-
-#ifdef CONFIG_BOARD_LATE_INIT
-int board_late_init(void)
-{
-#ifdef CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
-	env_set("board_name", "BAV335xB");
-	env_set("board_rev", "B"); /* Fix me, but why bother.. */
-#endif
-	return 0;
-}
-#endif
-
-
-#if (defined(CONFIG_DRIVER_TI_CPSW) && !defined(CONFIG_SPL_BUILD)) || \
-	(defined(CONFIG_SPL_ETH_SUPPORT) && defined(CONFIG_SPL_BUILD))
-static void cpsw_control(int enabled)
-{
-	/* VTP can be added here */
-	return;
-}
-
-static struct cpsw_slave_data cpsw_slaves[] = {
-	{
-		.slave_reg_ofs	= 0x208,
-		.sliver_reg_ofs	= 0xd80,
-		.phy_addr	= 0,
-	},
-	{
-		.slave_reg_ofs	= 0x308,
-		.sliver_reg_ofs	= 0xdc0,
-		.phy_addr	= 1,
-	},
-};
-
-static struct cpsw_platform_data cpsw_data = {
-	.mdio_base		= CPSW_MDIO_BASE,
-	.cpsw_base		= CPSW_BASE,
-	.mdio_div		= 0xff,
-	.channels		= 8,
-	.cpdma_reg_ofs	= 0x800,
-	.slaves			= 1,
-	.slave_data		= cpsw_slaves,
-	.ale_reg_ofs	= 0xd00,
-	.ale_entries	= 1024,
-	.host_port_reg_ofs	= 0x108,
-	.hw_stats_reg_ofs	= 0x900,
-	.bd_ram_ofs		= 0x2000,
-	.mac_control	= (1 << 5),
-	.control		= cpsw_control,
-	.host_port_num	= 0,
-	.version		= CPSW_CTRL_VERSION_2,
-};
-#endif
-
-
-/*
- * This function will:
- * Perform fixups to the PHY present on certain boards.  We only need this
- * function in:
- * - SPL with either CPSW or USB ethernet support
- * - Full U-Boot, with either CPSW or USB ethernet
- * Build in only these cases to avoid warnings about unused variables
- * when we build an SPL that has neither option but full U-Boot will.
- */
-#if ((defined(CONFIG_SPL_ETH_SUPPORT) || defined(CONFIG_SPL_USB_ETHER)) &&\
-		defined(CONFIG_SPL_BUILD)) || \
-	((defined(CONFIG_DRIVER_TI_CPSW) || \
-	  defined(CONFIG_USB_ETHER) && defined(CONFIG_USB_MUSB_GADGET)) && \
-	 !defined(CONFIG_SPL_BUILD))
-int board_eth_init(bd_t *bis)
-{
-	int ecode, rv, n;
-	uint8_t mac_addr[6];
-	struct board_eeconfig header;
-	__maybe_unused enum board_type board;
-
-	/* Default manufacturing address; used when no EE or invalid */
-	n = 0;
-	mac_addr[0] = 0;
-	mac_addr[1] = 0x20;
-	mac_addr[2] = 0x18;
-	mac_addr[3] = 0x1C;
-	mac_addr[4] = 0x00;
-	mac_addr[5] = 0x01;
-
-	ecode = read_eeprom(&header);
-	/* if we have a valid EE, get mac address from there */
-	if ((ecode == 0) &&
-	    is_valid_ethaddr((const u8 *)&header.mac_addr[0][0])) {
-		memcpy(mac_addr, (const void *)&header.mac_addr[0][0], 6);
-	}
-
-
-#if (defined(CONFIG_DRIVER_TI_CPSW) && !defined(CONFIG_SPL_BUILD)) || \
-	(defined(CONFIG_SPL_ETH_SUPPORT) && defined(CONFIG_SPL_BUILD))
-
-	if (!env_get("ethaddr")) {
-		printf("<ethaddr> not set. Validating first E-fuse MAC\n");
-
-		if (is_valid_ethaddr(mac_addr))
-			eth_env_set_enetaddr("ethaddr", mac_addr);
-	}
-
-#ifdef CONFIG_DRIVER_TI_CPSW
-
-	board = get_board_type(false);
-
-	/* Rev.A uses 10/100 PHY in mii mode */
-	if (board == BAV335A) {
-		writel(MII_MODE_ENABLE, &cdev->miisel);
-		cpsw_slaves[0].phy_if = PHY_INTERFACE_MODE_MII;
-		cpsw_slaves[1].phy_if = PHY_INTERFACE_MODE_MII;
-	}
-	/* Rev.B (default) uses GB PHY in rmii mode */
-	else {
-		writel((RGMII_MODE_ENABLE | RGMII_INT_DELAY), &cdev->miisel);
-		cpsw_slaves[0].phy_if = cpsw_slaves[1].phy_if
-				= PHY_INTERFACE_MODE_RGMII;
-	}
-
-	rv = cpsw_register(&cpsw_data);
-	if (rv < 0)
-		printf("Error %d registering CPSW switch\n", rv);
-	else
-		n += rv;
-#endif
-
-#endif
-
-	return n;
-}
-#endif
diff --git a/board/birdland/bav335x/board.h b/board/birdland/bav335x/board.h
deleted file mode 100644
index ddbd5d0459..0000000000
--- a/board/birdland/bav335x/board.h
+++ /dev/null
@@ -1,58 +0,0 @@ 
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * board.c
- *
- * Board functions for Birdland Audio BAV335x Network Processor
- *
- * Copyright (c) 2012-2014, Birdland Audio - http://birdland.com/oem
- *
- */
-
-#ifndef _BOARD_H_
-#define _BOARD_H_
-
-/* Serial MagicE: AA 55 BA BE */
-#define BOARD_MAGIC  0xBEBA55AA
-enum board_type {UNKNOWN, BAV335A, BAV335B};
-
-
-/*
- * The BAV335x may use a built-in read-only serial EEProm.
- * The Evaluation board, disables the write-protect so the Serial-EE
- * Can be programmed during manufacturing to store fields such as
- * a board serial number, ethernet mac address and other user fields.
- * Additionally, the Serial-EE can store the specific version of the
- * board it runs on, and overwrite the defaults in _defconfig
- */
-#define HDR_NO_OF_MAC_ADDR	3
-#define HDR_ETH_ALEN		6
-#define HDR_NAME_LEN		8
-
-struct board_eeconfig {
-	unsigned int  magic;
-	char name[HDR_NAME_LEN];	/* BAV3354 */
-	char version[4];		/* 0B20 - Rev.B2 */
-	char serial[16];
-	char config[32];
-	char mac_addr[HDR_NO_OF_MAC_ADDR][HDR_ETH_ALEN];
-};
-
-enum board_type get_board_type(bool verbose_debug_output);
-
-
-/*
- * We have three pin mux functions that must exist.  We must be able to enable
- * uart0, for initial output and i2c0 to read the main EEPROM.  We then have a
- * main pinmux function that can be overridden to enable all other pinmux that
- * is required on the board.
- */
-void enable_uart0_pin_mux(void);
-void enable_uart1_pin_mux(void);
-void enable_uart2_pin_mux(void);
-void enable_uart3_pin_mux(void);
-void enable_uart4_pin_mux(void);
-void enable_uart5_pin_mux(void);
-void enable_i2c0_pin_mux(void);
-void enable_board_pin_mux(enum board_type board);
-
-#endif
diff --git a/board/birdland/bav335x/mux.c b/board/birdland/bav335x/mux.c
deleted file mode 100644
index f18bfa4f60..0000000000
--- a/board/birdland/bav335x/mux.c
+++ /dev/null
@@ -1,190 +0,0 @@ 
-/*
- * mux.c
- *
- * Copyright (c) 2012-2014 Birdland Audio - http://birdland.com/oem
- * Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation version 2.
- *
- * This program is distributed "as is" WITHOUT ANY WARRANTY of any
- * kind, whether express or implied; without even the implied warranty
- * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- */
-
-#include <common.h>
-#include <asm/arch/sys_proto.h>
-#include <asm/arch/hardware.h>
-#include <asm/arch/mux.h>
-#include <asm/io.h>
-#include <i2c.h>
-#include "board.h"
-
-static struct module_pin_mux uart0_pin_mux[] = {
-	{OFFSET(uart0_rxd), (MODE(0) | PULLUP_EN | RXACTIVE)},	/* UART0_RXD */
-	{OFFSET(uart0_txd), (MODE(0) | PULLUDEN)},		/* UART0_TXD */
-	{-1},
-};
-
-static struct module_pin_mux uart1_pin_mux[] = {
-	{OFFSET(uart1_rxd), (MODE(0) | PULLUP_EN | RXACTIVE)},	/* UART1_RXD */
-	{OFFSET(uart1_txd), (MODE(0) | PULLUDEN)},		/* UART1_TXD */
-	{-1},
-};
-
-static struct module_pin_mux uart2_pin_mux[] = {
-	{OFFSET(spi0_sclk), (MODE(1) | PULLUP_EN | RXACTIVE)},	/* UART2_RXD */
-	{OFFSET(spi0_d0), (MODE(1) | PULLUDEN)},		/* UART2_TXD */
-	{-1},
-};
-
-static struct module_pin_mux uart3_pin_mux[] = {
-	{OFFSET(spi0_cs1), (MODE(1) | PULLUP_EN | RXACTIVE)},	/* UART3_RXD */
-	{OFFSET(ecap0_in_pwm0_out), (MODE(1) | PULLUDEN)},	/* UART3_TXD */
-	{-1},
-};
-
-static struct module_pin_mux uart4_pin_mux[] = {
-	{OFFSET(gpmc_wait0), (MODE(6) | PULLUP_EN | RXACTIVE)},	/* UART4_RXD */
-	{OFFSET(gpmc_wpn), (MODE(6) | PULLUDEN)},		/* UART4_TXD */
-	{-1},
-};
-
-static struct module_pin_mux uart5_pin_mux[] = {
-	{OFFSET(lcd_data9), (MODE(4) | PULLUP_EN | RXACTIVE)},	/* UART5_RXD */
-	{OFFSET(lcd_data8), (MODE(4) | PULLUDEN)},		/* UART5_TXD */
-	{-1},
-};
-
-static struct module_pin_mux mmc0_pin_mux[] = {
-	{OFFSET(mmc0_dat3), (MODE(0) | RXACTIVE | PULLUP_EN)},	/* MMC0_DAT3 */
-	{OFFSET(mmc0_dat2), (MODE(0) | RXACTIVE | PULLUP_EN)},	/* MMC0_DAT2 */
-	{OFFSET(mmc0_dat1), (MODE(0) | RXACTIVE | PULLUP_EN)},	/* MMC0_DAT1 */
-	{OFFSET(mmc0_dat0), (MODE(0) | RXACTIVE | PULLUP_EN)},	/* MMC0_DAT0 */
-	{OFFSET(mmc0_clk), (MODE(0) | RXACTIVE | PULLUP_EN)},	/* MMC0_CLK */
-	{OFFSET(mmc0_cmd), (MODE(0) | RXACTIVE | PULLUP_EN)},	/* MMC0_CMD */
-	{OFFSET(mcasp0_aclkr), (MODE(4) | RXACTIVE)},		/* MMC0_WP */
-	{OFFSET(spi0_cs1), (MODE(5) | RXACTIVE | PULLUP_EN)},	/* MMC0_CD */
-	{-1},
-};
-
-static struct module_pin_mux mmc1_pin_mux[] = {
-	{OFFSET(gpmc_ad3), (MODE(1) | RXACTIVE | PULLUP_EN)},	/* MMC1_DAT3 */
-	{OFFSET(gpmc_ad2), (MODE(1) | RXACTIVE | PULLUP_EN)},	/* MMC1_DAT2 */
-	{OFFSET(gpmc_ad1), (MODE(1) | RXACTIVE | PULLUP_EN)},	/* MMC1_DAT1 */
-	{OFFSET(gpmc_ad0), (MODE(1) | RXACTIVE | PULLUP_EN)},	/* MMC1_DAT0 */
-	{OFFSET(gpmc_csn1), (MODE(2) | RXACTIVE | PULLUP_EN)},	/* MMC1_CLK */
-	{OFFSET(gpmc_csn2), (MODE(2) | RXACTIVE | PULLUP_EN)},	/* MMC1_CMD */
-	{OFFSET(gpmc_csn0), (MODE(7) | RXACTIVE | PULLUP_EN)},	/* MMC1_WP */
-	{OFFSET(gpmc_advn_ale), (MODE(7) | RXACTIVE | PULLUP_EN)},/* MMC1_CD */
-	{-1},
-};
-
-static struct module_pin_mux i2c0_pin_mux[] = {
-	{OFFSET(i2c0_sda), (MODE(0) | RXACTIVE |
-			PULLUDEN | SLEWCTRL)}, /* I2C_DATA */
-	{OFFSET(i2c0_scl), (MODE(0) | RXACTIVE |
-			PULLUDEN | SLEWCTRL)}, /* I2C_SCLK */
-	{-1},
-};
-
-static struct module_pin_mux i2c1_pin_mux[] = {
-	{OFFSET(spi0_d1), (MODE(2) | RXACTIVE |
-			PULLUDEN | SLEWCTRL)},	/* I2C_DATA */
-	{OFFSET(spi0_cs0), (MODE(2) | RXACTIVE |
-			PULLUDEN | SLEWCTRL)},	/* I2C_SCLK */
-	{-1},
-};
-
-static struct module_pin_mux rgmii1_pin_mux[] = {
-	{OFFSET(mii1_txen), MODE(2)},			/* RGMII1_TCTL */
-	{OFFSET(mii1_rxdv), MODE(2) | RXACTIVE},	/* RGMII1_RCTL */
-	{OFFSET(mii1_txd3), MODE(2)},			/* RGMII1_TD3 */
-	{OFFSET(mii1_txd2), MODE(2)},			/* RGMII1_TD2 */
-	{OFFSET(mii1_txd1), MODE(2)},			/* RGMII1_TD1 */
-	{OFFSET(mii1_txd0), MODE(2)},			/* RGMII1_TD0 */
-	{OFFSET(mii1_txclk), MODE(2)},			/* RGMII1_TCLK */
-	{OFFSET(mii1_rxclk), MODE(2) | RXACTIVE},	/* RGMII1_RCLK */
-	{OFFSET(mii1_rxd3), MODE(2) | RXACTIVE},	/* RGMII1_RD3 */
-	{OFFSET(mii1_rxd2), MODE(2) | RXACTIVE},	/* RGMII1_RD2 */
-	{OFFSET(mii1_rxd1), MODE(2) | RXACTIVE},	/* RGMII1_RD1 */
-	{OFFSET(mii1_rxd0), MODE(2) | RXACTIVE},	/* RGMII1_RD0 */
-	{OFFSET(mdio_data), MODE(0) | RXACTIVE | PULLUP_EN},/* MDIO_DATA */
-	{OFFSET(mdio_clk), MODE(0) | PULLUP_EN},	/* MDIO_CLK */
-	{-1},
-};
-
-static struct module_pin_mux mii1_pin_mux[] = {
-	{OFFSET(mii1_rxerr), MODE(0) | RXACTIVE},	/* MII1_RXERR */
-	{OFFSET(mii1_txen), MODE(0)},			/* MII1_TXEN */
-	{OFFSET(mii1_rxdv), MODE(0) | RXACTIVE},	/* MII1_RXDV */
-	{OFFSET(mii1_txd3), MODE(0)},			/* MII1_TXD3 */
-	{OFFSET(mii1_txd2), MODE(0)},			/* MII1_TXD2 */
-	{OFFSET(mii1_txd1), MODE(0)},			/* MII1_TXD1 */
-	{OFFSET(mii1_txd0), MODE(0)},			/* MII1_TXD0 */
-	{OFFSET(mii1_txclk), MODE(0) | RXACTIVE},	/* MII1_TXCLK */
-	{OFFSET(mii1_rxclk), MODE(0) | RXACTIVE},	/* MII1_RXCLK */
-	{OFFSET(mii1_rxd3), MODE(0) | RXACTIVE},	/* MII1_RXD3 */
-	{OFFSET(mii1_rxd2), MODE(0) | RXACTIVE},	/* MII1_RXD2 */
-	{OFFSET(mii1_rxd1), MODE(0) | RXACTIVE},	/* MII1_RXD1 */
-	{OFFSET(mii1_rxd0), MODE(0) | RXACTIVE},	/* MII1_RXD0 */
-	{OFFSET(mdio_data), MODE(0) | RXACTIVE | PULLUP_EN}, /* MDIO_DATA */
-	{OFFSET(mdio_clk), MODE(0) | PULLUP_EN},	/* MDIO_CLK */
-	{-1},
-};
-
-
-void enable_uart0_pin_mux(void)
-{
-	configure_module_pin_mux(uart0_pin_mux);
-}
-
-void enable_uart1_pin_mux(void)
-{
-	configure_module_pin_mux(uart1_pin_mux);
-}
-
-void enable_uart2_pin_mux(void)
-{
-	configure_module_pin_mux(uart2_pin_mux);
-}
-
-void enable_uart3_pin_mux(void)
-{
-	configure_module_pin_mux(uart3_pin_mux);
-}
-
-void enable_uart4_pin_mux(void)
-{
-	configure_module_pin_mux(uart4_pin_mux);
-}
-
-void enable_uart5_pin_mux(void)
-{
-	configure_module_pin_mux(uart5_pin_mux);
-}
-
-void enable_i2c0_pin_mux(void)
-{
-	configure_module_pin_mux(i2c0_pin_mux);
-}
-
-
-/* CPLD registers */
-#define I2C_CPLD_ADDR	0x35
-#define CFG_REG		0x10
-
-
-void enable_board_pin_mux(enum board_type board)
-{
-	configure_module_pin_mux(i2c1_pin_mux);
-	if (board == BAV335A)
-		configure_module_pin_mux(mii1_pin_mux); /* MII Mode: 10/100MB */
-	else
-		configure_module_pin_mux(rgmii1_pin_mux); /* RGMII Mode: GB */
-
-	configure_module_pin_mux(mmc0_pin_mux);
-	configure_module_pin_mux(mmc1_pin_mux);
-}
diff --git a/board/birdland/bav335x/u-boot.lds b/board/birdland/bav335x/u-boot.lds
deleted file mode 100644
index 5d0c5cf27e..0000000000
--- a/board/birdland/bav335x/u-boot.lds
+++ /dev/null
@@ -1,115 +0,0 @@ 
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * Copyright (c) 2012-2014 Birdland Audio - http://birdland.com/oem
- * Copyright (c) 2004-2008 Texas Instruments
- *
- * (C) Copyright 2002
- * Gary Jennejohn, DENX Software Engineering, <garyj@denx.de>
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- */
-
-OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm")
-OUTPUT_ARCH(arm)
-ENTRY(_start)
-SECTIONS
-{
-	. = 0x00000000;
-
-	. = ALIGN(4);
-	.text :
-	{
-		*(.__image_copy_start)
-		*(.vectors)
-		CPUDIR/start.o (.text*)
-		board/birdland/bav335x/built-in.o (.text*)
-		*(.text*)
-	}
-
-	. = ALIGN(4);
-	.rodata : { *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*))) }
-
-	. = ALIGN(4);
-	.data : {
-		*(.data*)
-	}
-
-	. = ALIGN(4);
-
-	. = .;
-
-	. = 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)
-	}
-
-	.hash : { *(.hash*) }
-
-	.end :
-	{
-		*(.__end)
-	}
-
-	_image_binary_end = .;
-
-	/*
-	 * Deprecated: this MMU section is used by pxa at present but
-	 * should not be used by new boards/CPUs.
-	 */
-	. = ALIGN(4096);
-	.mmutable : {
-		*(.mmutable)
-	}
-
-/*
- * 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 _image_binary_end : { *(.dynsym) }
-	.dynbss : { *(.dynbss) }
-	.dynstr : { *(.dynstr*) }
-	.dynamic : { *(.dynamic*) }
-	.gnu.hash : { *(.gnu.hash) }
-	.plt : { *(.plt*) }
-	.interp : { *(.interp*) }
-	.gnu : { *(.gnu*) }
-	.ARM.exidx : { *(.ARM.exidx*) }
-}
diff --git a/configs/birdland_bav335a_defconfig b/configs/birdland_bav335a_defconfig
deleted file mode 100644
index 87dae5950b..0000000000
--- a/configs/birdland_bav335a_defconfig
+++ /dev/null
@@ -1,69 +0,0 @@ 
-CONFIG_ARM=y
-CONFIG_ARCH_CPU_INIT=y
-CONFIG_ARCH_OMAP2PLUS=y
-CONFIG_SPL_GPIO_SUPPORT=y
-CONFIG_SPL_LIBCOMMON_SUPPORT=y
-CONFIG_SPL_LIBGENERIC_SUPPORT=y
-CONFIG_AM33XX=y
-CONFIG_TARGET_BAV335X=y
-CONFIG_SPL_MMC_SUPPORT=y
-CONFIG_SPL_SERIAL_SUPPORT=y
-CONFIG_SPL=y
-CONFIG_SPL_FS_FAT=y
-CONFIG_SPL_LIBDISK_SUPPORT=y
-CONFIG_BAV_VERSION=1
-CONFIG_DISTRO_DEFAULTS=y
-CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=1"
-# CONFIG_USE_BOOTCOMMAND is not set
-CONFIG_SYS_CONSOLE_INFO_QUIET=y
-CONFIG_VERSION_VARIABLE=y
-CONFIG_ARCH_MISC_INIT=y
-CONFIG_SPL_FS_EXT4=y
-CONFIG_SPL_I2C_SUPPORT=y
-CONFIG_SPL_MUSB_NEW_SUPPORT=y
-# CONFIG_SPL_NAND_SUPPORT is not set
-CONFIG_SPL_OS_BOOT=y
-CONFIG_SPL_POWER_SUPPORT=y
-CONFIG_SPL_WATCHDOG_SUPPORT=y
-CONFIG_SPL_YMODEM_SUPPORT=y
-CONFIG_CMD_SPL=y
-CONFIG_CMD_ASKENV=y
-CONFIG_CMD_EEPROM=y
-CONFIG_CMD_DFU=y
-CONFIG_CMD_GPIO=y
-CONFIG_CMD_GPT=y
-CONFIG_CMD_I2C=y
-CONFIG_CMD_MMC=y
-CONFIG_CMD_SF=y
-CONFIG_CMD_SPI=y
-CONFIG_CMD_USB=y
-CONFIG_CMD_USB_MASS_STORAGE=y
-# CONFIG_CMD_SETEXPR is not set
-CONFIG_CMD_EXT4_WRITE=y
-CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
-CONFIG_BOOTCOUNT_LIMIT=y
-CONFIG_DFU_MMC=y
-CONFIG_DFU_RAM=y
-CONFIG_USB_FUNCTION_FASTBOOT=y
-CONFIG_FASTBOOT_BUF_ADDR=0x82000000
-CONFIG_MMC_OMAP_HS=y
-CONFIG_SPI_FLASH=y
-CONFIG_SF_DEFAULT_SPEED=24000000
-CONFIG_SPI_FLASH_WINBOND=y
-CONFIG_PHY_SMSC=y
-CONFIG_MII=y
-CONFIG_DRIVER_TI_CPSW=y
-CONFIG_SPI=y
-CONFIG_OMAP3_SPI=y
-CONFIG_USB=y
-CONFIG_USB_MUSB_HOST=y
-CONFIG_USB_MUSB_GADGET=y
-CONFIG_USB_MUSB_DSPS=y
-CONFIG_USB_GADGET=y
-CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
-CONFIG_USB_GADGET_VENDOR_NUM=0x0451
-CONFIG_USB_GADGET_PRODUCT_NUM=0xd022
-CONFIG_FAT_WRITE=y
-CONFIG_LZO=y
-CONFIG_OF_LIBFDT=y
diff --git a/configs/birdland_bav335b_defconfig b/configs/birdland_bav335b_defconfig
deleted file mode 100644
index 5ee9878a55..0000000000
--- a/configs/birdland_bav335b_defconfig
+++ /dev/null
@@ -1,69 +0,0 @@ 
-CONFIG_ARM=y
-CONFIG_ARCH_CPU_INIT=y
-CONFIG_ARCH_OMAP2PLUS=y
-CONFIG_SPL_GPIO_SUPPORT=y
-CONFIG_SPL_LIBCOMMON_SUPPORT=y
-CONFIG_SPL_LIBGENERIC_SUPPORT=y
-CONFIG_AM33XX=y
-CONFIG_TARGET_BAV335X=y
-CONFIG_SPL_MMC_SUPPORT=y
-CONFIG_SPL_SERIAL_SUPPORT=y
-CONFIG_SPL=y
-CONFIG_SPL_FS_FAT=y
-CONFIG_SPL_LIBDISK_SUPPORT=y
-CONFIG_BAV_VERSION=2
-CONFIG_DISTRO_DEFAULTS=y
-CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=1"
-# CONFIG_USE_BOOTCOMMAND is not set
-CONFIG_SYS_CONSOLE_INFO_QUIET=y
-CONFIG_VERSION_VARIABLE=y
-CONFIG_ARCH_MISC_INIT=y
-CONFIG_SPL_FS_EXT4=y
-CONFIG_SPL_I2C_SUPPORT=y
-CONFIG_SPL_MUSB_NEW_SUPPORT=y
-# CONFIG_SPL_NAND_SUPPORT is not set
-CONFIG_SPL_OS_BOOT=y
-CONFIG_SPL_POWER_SUPPORT=y
-CONFIG_SPL_WATCHDOG_SUPPORT=y
-CONFIG_SPL_YMODEM_SUPPORT=y
-CONFIG_CMD_SPL=y
-CONFIG_CMD_ASKENV=y
-CONFIG_CMD_EEPROM=y
-CONFIG_CMD_DFU=y
-CONFIG_CMD_GPIO=y
-CONFIG_CMD_GPT=y
-CONFIG_CMD_I2C=y
-CONFIG_CMD_MMC=y
-CONFIG_CMD_SF=y
-CONFIG_CMD_SPI=y
-CONFIG_CMD_USB=y
-CONFIG_CMD_USB_MASS_STORAGE=y
-# CONFIG_CMD_SETEXPR is not set
-CONFIG_CMD_EXT4_WRITE=y
-CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
-CONFIG_BOOTCOUNT_LIMIT=y
-CONFIG_DFU_MMC=y
-CONFIG_DFU_RAM=y
-CONFIG_USB_FUNCTION_FASTBOOT=y
-CONFIG_FASTBOOT_BUF_ADDR=0x82000000
-CONFIG_MMC_OMAP_HS=y
-CONFIG_SPI_FLASH=y
-CONFIG_SF_DEFAULT_SPEED=24000000
-CONFIG_SPI_FLASH_WINBOND=y
-CONFIG_PHY_SMSC=y
-CONFIG_MII=y
-CONFIG_DRIVER_TI_CPSW=y
-CONFIG_SPI=y
-CONFIG_OMAP3_SPI=y
-CONFIG_USB=y
-CONFIG_USB_MUSB_HOST=y
-CONFIG_USB_MUSB_GADGET=y
-CONFIG_USB_MUSB_DSPS=y
-CONFIG_USB_GADGET=y
-CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
-CONFIG_USB_GADGET_VENDOR_NUM=0x0451
-CONFIG_USB_GADGET_PRODUCT_NUM=0xd022
-CONFIG_FAT_WRITE=y
-CONFIG_LZO=y
-CONFIG_OF_LIBFDT=y
diff --git a/include/configs/bav335x.h b/include/configs/bav335x.h
deleted file mode 100644
index c51b850f6d..0000000000
--- a/include/configs/bav335x.h
+++ /dev/null
@@ -1,475 +0,0 @@ 
-/*
- * bav335x.h
- *
- * Copyright (c) 2012-2014 Birdland Audio - http://birdland.com/oem
- * Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation version 2.
- *
- * This program is distributed "as is" WITHOUT ANY WARRANTY of any
- * kind, whether express or implied; without even the implied warranty
- * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-#ifndef __CONFIG_BAV335X_H
-#define __CONFIG_BAV335X_H
-
-#include <configs/ti_am335x_common.h>
-
-#ifndef CONFIG_SPL_BUILD
-# define CONFIG_TIMESTAMP
-#endif
-
-#define CONFIG_SYS_BOOTM_LEN		(16 << 20)
-
-#define CONFIG_MACH_TYPE		MACH_TYPE_AM335XEVM
-
-/* Clock Defines */
-#define V_OSCK				24000000  /* Clock output from T2 */
-#define V_SCLK				(V_OSCK)
-
-#ifdef CONFIG_MTD_RAW_NAND
-#define NANDARGS \
-	"mtdids=" CONFIG_MTDIDS_DEFAULT "\0" \
-	"mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \
-	"nandargs=setenv bootargs console=${console} " \
-		"${optargs} " \
-		"root=${nandroot} " \
-		"rootfstype=${nandrootfstype}\0" \
-	"nandroot=ubi0:rootfs rw ubi.mtd=9,2048\0" \
-	"nandrootfstype=ubifs rootwait=1\0" \
-	"nandboot=echo Booting from nand ...; " \
-		"run nandargs; " \
-		"nand read ${fdtaddr} u-boot-spl-os; " \
-		"nand read ${loadaddr} kernel; " \
-		"bootz ${loadaddr} - ${fdtaddr}\0"
-#else
-#define NANDARGS ""
-#endif
-
-#ifndef CONFIG_SPL_BUILD
-#define CONFIG_EXTRA_ENV_SETTINGS \
-DEFAULT_LINUX_BOOT_ENV \
-"boot_fdt=try\0" \
-"bootpart=0:2\0" \
-"bootdir=\0" \
-"fdtdir=/dtbs\0" \
-"bootfile=zImage\0" \
-"fdtfile=undefined\0" \
-"console=ttyO0,115200n8\0" \
-"loadaddr=0x82000000\0" \
-"fdtaddr=0x88000000\0" \
-"rdaddr=0x88080000\0" \
-"initrd_high=0xffffffff\0" \
-"fdt_high=0xffffffff\0" \
-"partitions=" \
-	"uuid_disk=${uuid_gpt_disk};" \
-	"name=rootfs,start=2MiB,size=-,uuid=${uuid_gpt_rootfs}\0" \
-"optargs=\0" \
-"cmdline=\0" \
-"mmcdev=0\0" \
-"mmcpart=1\0" \
-"mmcroot=/dev/mmcblk0p2 ro\0" \
-"mmcrootfstype=ext4 rootwait fixrtc\0" \
-"rootpath=/export/rootfs\0" \
-"nfsopts=nolock\0" \
-"static_ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}::off\0" \
-"ramroot=/dev/ram0 rw\0" \
-"ramrootfstype=ext2\0" \
-"mmcargs=setenv bootargs console=${console} ${optargs} " \
-	"root=${mmcroot} rootfstype=${mmcrootfstype} ${cmdline}\0" \
-"server_ip=192.168.1.100\0" \
-"gw_ip=192.168.1.1\0" \
-"netmask=255.255.255.0\0" \
-"hostname=\0" \
-"device=eth0\0" \
-"autoconf=off\0" \
-"root_dir=/home/userid/targetNFS\0" \
-"nfs_options=,vers=3\0" \
-"nfsrootfstype=ext4 rootwait fixrtc\0" \
-"nfsargs=setenv bootargs console=${console} ${optargs} " \
-	"root=/dev/nfs rw rootfstype=${nfsrootfstype} " \
-	"nfsroot=${nfsroot} ip=${ip} ${cmdline}\0" \
-"netargs=setenv bootargs console=${console} " \
-	"${optargs} root=/dev/nfs " \
-	"nfsroot=${serverip}:${rootpath},${nfsopts} rw ip=dhcp\0" \
-"bootenv=uEnv.txt\0" \
-"script=boot.scr\0" \
-"scriptfile=${script}\0" \
-"loadbootscript=load mmc ${bootpart} ${loadaddr} ${scriptfile};\0" \
-"bootscript=echo Running bootscript from mmc${bootpart} ...; " \
-	"source ${loadaddr}\0" \
-	"loadbootenv=load mmc ${bootpart} ${loadaddr} ${bootenv}\0" \
-"importbootenv=echo Importing environment from mmc ...; " \
-	"env import -t -r $loadaddr $filesize\0" \
-"ramargs=setenv bootargs console=${console} " \
-	"${optargs} root=${ramroot} rootfstype=${ramrootfstype}\0" \
-"loadramdisk=load mmc ${mmcdev} ${rdaddr} ramdisk.gz\0" \
-"loadimage=load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootfile}\0" \
-	"loadrd=load mmc ${bootpart} ${rdaddr} " \
-	"${bootdir}/${rdfile}; setenv rdsize ${filesize}\0" \
-"loadfdt=echo loading ${fdtdir}/${fdtfile} ...; " \
-	"load mmc ${bootpart} ${fdtaddr} ${fdtdir}/${fdtfile}\0" \
-"mmcboot=mmc dev ${mmcdev}; " \
-	"if mmc rescan; then " \
-		"gpio set 54;" \
-		"setenv bootpart ${mmcdev}:1; " \
-		"if test -e mmc ${bootpart} /etc/fstab; then " \
-			"setenv mmcpart 1;" \
-		"fi; " \
-		"echo Checking for: /uEnv.txt ...;" \
-		"if test -e mmc ${bootpart} /uEnv.txt; then " \
-			"if run loadbootenv; then " \
-				"gpio set 55;" \
-				"echo Loaded environment from ${bootenv};" \
-				"run importbootenv;" \
-			"fi;" \
-			"echo Checking if uenvcmd is set ...;" \
-			"if test -n ${uenvcmd}; then " \
-				"gpio set 56; " \
-				"echo Running uenvcmd ...;" \
-				"run uenvcmd;" \
-			"fi;" \
-			"echo Checking if client_ip is set ...;" \
-			"if test -n ${client_ip}; then " \
-				"if test -n ${dtb}; then " \
-					"setenv fdtfile ${dtb};" \
-					"echo using ${fdtfile} ...;" \
-				"fi;" \
-				"gpio set 56; " \
-				"if test -n ${uname_r}; then " \
-					"echo Running nfsboot_uname_r ...;" \
-					"run nfsboot_uname_r;" \
-				"fi;" \
-				"echo Running nfsboot ...;" \
-				"run nfsboot;" \
-			"fi;" \
-		"fi; " \
-		"echo Checking for: /${script} ...;" \
-		"if test -e mmc ${bootpart} /${script}; then " \
-			"gpio set 55;" \
-			"setenv scriptfile ${script};" \
-			"run loadbootscript;" \
-			"echo Loaded script from ${scriptfile};" \
-			"gpio set 56; " \
-			"run bootscript;" \
-		"fi; " \
-		"echo Checking for: /boot/${script} ...;" \
-		"if test -e mmc ${bootpart} /boot/${script}; then " \
-			"gpio set 55;" \
-			"setenv scriptfile /boot/${script};" \
-			"run loadbootscript;" \
-			"echo Loaded script from ${scriptfile};" \
-			"gpio set 56; " \
-			"run bootscript;" \
-		"fi; " \
-		"echo Checking for: /boot/uEnv.txt ...;" \
-		"for i in 1 2 3 4 5 6 7 ; do " \
-			"setenv mmcpart ${i};" \
-			"setenv bootpart ${mmcdev}:${mmcpart};" \
-			"if test -e mmc ${bootpart} /boot/uEnv.txt; then " \
-				"gpio set 55;" \
-				"load mmc ${bootpart} ${loadaddr} " \
-						"/boot/uEnv.txt;" \
-				"env import -t ${loadaddr} ${filesize};" \
-				"echo Loaded environment from /boot/uEnv.txt;" \
-				"if test -n ${dtb}; then " \
-					"setenv fdtfile ${dtb};" \
-					"echo Using: dtb=${fdtfile} ...;" \
-				"fi;" \
-				"echo Checking if uname_r is set in " \
-						"/boot/uEnv.txt...;" \
-				"if test -n ${uname_r}; then " \
-					"gpio set 56; " \
-					"echo Running uname_boot ...;" \
-					"setenv mmcroot /dev/mmcblk${mmcdev}" \
-							"p${mmcpart} ro;" \
-					"run uname_boot;" \
-				"fi;" \
-			"fi;" \
-		"done;" \
-	"fi;\0" \
-"netboot=echo Booting from network ...; " \
-	"setenv autoload no; " \
-	"dhcp; " \
-	"tftp ${loadaddr} ${bootfile}; " \
-	"tftp ${fdtaddr} ${fdtfile}; " \
-	"run netargs; " \
-	"bootz ${loadaddr} - ${fdtaddr}\0" \
-"nfsboot=echo Booting from ${server_ip} ...; " \
-	"setenv nfsroot ${server_ip}:${root_dir}${nfs_options}; " \
-	"setenv ip ${client_ip}:${server_ip}:${gw_ip}:${netmask}:${hostname}" \
-	":${device}:${autoconf}; " \
-	"setenv autoload no; " \
-	"setenv serverip ${server_ip}; " \
-	"setenv ipaddr ${client_ip}; " \
-	"tftp ${loadaddr} ${bootfile}; " \
-	"tftp ${fdtaddr} dtbs/${fdtfile}; " \
-	"run nfsargs; " \
-	"bootz ${loadaddr} - ${fdtaddr}\0" \
-"nfsboot_uname_r=echo Booting from ${server_ip} ...; " \
-	"setenv nfsroot ${server_ip}:${root_dir}${nfs_options}; " \
-	"setenv ip ${client_ip}:${server_ip}:${gw_ip}:${netmask}:${hostname}" \
-			":${device}:${autoconf}; " \
-	"setenv autoload no; " \
-	"setenv serverip ${server_ip}; " \
-	"setenv ipaddr ${client_ip}; " \
-	"tftp ${loadaddr} vmlinuz-${uname_r}; " \
-	"tftp ${fdtaddr} dtbs/${uname_r}/${fdtfile}; " \
-	"run nfsargs; " \
-	"bootz ${loadaddr} - ${fdtaddr}\0" \
-"ramboot=echo Booting from ramdisk ...; " \
-	"run ramargs; " \
-	"bootz ${loadaddr} ${rdaddr} ${fdtaddr}\0" \
-"findfdt="\
-	"if test $board_rev = B; then " \
-		"setenv fdtfile birdland_bav335b.dtb; " \
-		"setenv fdtbase am335x-boneblack; fi; " \
-	"if test $board_rev = A; then " \
-		"setenv fdtfile birdland_bav335a.dtb; " \
-		"setenv fdtbase am335x-boneblack; fi; " \
-	"if test $fdtfile = undefined; then " \
-		"echo WARNING: Could not determine device tree to use; fi; \0" \
-"uname_boot="\
-	"setenv bootdir /boot; " \
-	"setenv bootfile vmlinuz-${uname_r}; " \
-	"if test -e mmc ${bootpart} ${bootdir}/${bootfile}; then " \
-		"echo loading ${bootdir}/${bootfile} ...; "\
-		"run loadimage;" \
-		"setenv fdtdir /boot/dtbs/${uname_r}; " \
-		"if test -e mmc ${bootpart} ${fdtdir}/${fdtfile}; then " \
-			"run loadfdt;" \
-		"else " \
-			"setenv fdtdir /lib/firmware/${uname_r}/device-tree; " \
-			"if test -e mmc ${bootpart} ${fdtdir}/" \
-					"${fdtfile}; then " \
-				"run loadfdt;" \
-			"else " \
-				"setenv fdtdir /boot/dtb-${uname_r}; " \
-				"if test -e mmc ${bootpart} ${fdtdir}" \
-						"/${fdtfile}; then " \
-					"run loadfdt;" \
-				"else " \
-					"setenv fdtdir /boot/dtbs; " \
-					"if test -e mmc ${bootpart} ${fdtdir}" \
-							"/${fdtfile}; then " \
-						"run loadfdt;" \
-					"else " \
-						"echo; echo unable to find " \
-							"[${fdtfile}] " \
-						"did you name it correctly?" \
-						"echo booting fallback " \
-							"[/boot/dtbs/" \
-							"${uname_r}" \
-							"/${fdtbase}.dtb]...;" \
-						"setenv fdtdir /boot/dtbs/" \
-							"${uname_r}; " \
-						"setenv fdtfile " \
-							"${fdtbase}.dtb; " \
-						"run loadfdt;" \
-					"fi;" \
-				"fi;" \
-			"fi;" \
-		"fi;" \
-	"fi; " \
-	"setenv rdfile initrd.img-${uname_r}; " \
-	"if test -e mmc ${bootpart} ${bootdir}/${rdfile}; then " \
-		"echo loading ${bootdir}/${rdfile} ...; "\
-		"run loadrd;" \
-		"if test -n ${uuid}; then " \
-			"setenv mmcroot UUID=${uuid} ro;" \
-		"fi;" \
-		"run mmcargs;" \
-		"echo debug: [${bootargs}] ... ;" \
-		"echo debug: [bootz ${loadaddr} ${rdaddr}:${rdsize} " \
-					"${fdtaddr}] ... ;" \
-		"bootz ${loadaddr} ${rdaddr}:${rdsize} ${fdtaddr}; " \
-	"else " \
-		"run mmcargs;" \
-		"echo debug: [${bootargs}] ... ;" \
-		"echo debug: [bootz ${loadaddr} - ${fdtaddr}] ... ;" \
-		"bootz ${loadaddr} - ${fdtaddr}; " \
-	"fi;" \
-"fi;\0" \
-	NANDARGS \
-	DFUARGS
-#endif
-
-#define CONFIG_BOOTCOMMAND \
-	"gpio set 53; " \
-	"i2c mw 0x24 1 0x3e; " \
-	"run findfdt; " \
-	"setenv mmcdev 0; " \
-	"setenv bootpart 0:1; " \
-	"run mmcboot;" \
-	"gpio clear 56; " \
-	"gpio clear 55; " \
-	"gpio clear 54; " \
-	"setenv mmcdev 1; " \
-	"setenv bootpart 1:1; " \
-	"run mmcboot;"
-
-/* NS16550 Configuration */
-#define CONFIG_SYS_NS16550_COM1		0x44e09000	/* UART0 */
-#define CONFIG_SYS_NS16550_COM2		0x48022000	/* UART1 */
-#define CONFIG_SYS_NS16550_COM3		0x48024000	/* UART2 */
-#define CONFIG_SYS_NS16550_COM4		0x481a6000	/* UART3 */
-#define CONFIG_SYS_NS16550_COM5		0x481a8000	/* UART4 */
-#define CONFIG_SYS_NS16550_COM6		0x481aa000	/* UART5 */
-
-#define CONFIG_ENV_EEPROM_IS_ON_I2C
-#define CONFIG_SYS_I2C_EEPROM_ADDR	0x50	/* Main EEPROM */
-#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN	2
-
-/* PMIC support */
-#define CONFIG_POWER_TPS65217
-#define CONFIG_POWER_TPS65910
-
-/* SPL */
-#ifndef CONFIG_NOR_BOOT
-/* Bootcount using the RTC block */
-#define CONFIG_SYS_BOOTCOUNT_BE
-
-/* USB gadget RNDIS */
-#endif
-
-#ifdef CONFIG_MTD_RAW_NAND
-/* NAND: device related configs */
-#define CONFIG_SYS_NAND_5_ADDR_CYCLE
-#define CONFIG_SYS_NAND_PAGE_COUNT	(CONFIG_SYS_NAND_BLOCK_SIZE / \
-					 CONFIG_SYS_NAND_PAGE_SIZE)
-#define CONFIG_SYS_NAND_PAGE_SIZE	2048
-#define CONFIG_SYS_NAND_OOBSIZE		64
-#define CONFIG_SYS_NAND_BLOCK_SIZE	(128*1024)
-/* NAND: driver related configs */
-#define CONFIG_SYS_NAND_BAD_BLOCK_POS	NAND_LARGE_BADBLOCK_POS
-#define CONFIG_SYS_NAND_ECCPOS	{ \
-	2, 3, 4, 5, 6, 7, 8, 9, \
-	10, 11, 12, 13, 14, 15, 16, 17, \
-	18, 19, 20, 21, 22, 23, 24, 25, \
-	26, 27, 28, 29, 30, 31, 32, 33, \
-	34, 35, 36, 37, 38, 39, 40, 41, \
-	42, 43, 44, 45, 46, 47, 48, 49, \
-	50, 51, 52, 53, 54, 55, 56, 57, }
-
-#define CONFIG_SYS_NAND_ECCSIZE		512
-#define CONFIG_SYS_NAND_ECCBYTES	14
-#define CONFIG_SYS_NAND_ONFI_DETECTION
-#define CONFIG_NAND_OMAP_ECCSCHEME	OMAP_ECC_BCH8_CODE_HW
-#define CONFIG_SYS_NAND_U_BOOT_OFFS	0x000c0000
-#define CONFIG_SYS_ENV_SECT_SIZE	CONFIG_SYS_NAND_BLOCK_SIZE
-/* NAND: SPL related configs */
-#ifdef CONFIG_SPL_OS_BOOT
-#define CONFIG_SYS_NAND_SPL_KERNEL_OFFS	0x00200000 /* kernel offset */
-#endif
-#endif /* !CONFIG_MTD_RAW_NAND */
-
-/*
- * For NOR boot, we must set this to the start of where NOR is mapped
- * in memory.
- */
-
-/*
- * USB configuration.  We enable MUSB support, both for host and for
- * gadget.  We set USB0 as peripheral and USB1 as host, based on the
- * board schematic and physical port wired to each.  Then for host we
- * add mass storage support and for gadget we add both RNDIS ethernet
- * and DFU.
- */
-#define CONFIG_AM335X_USB0
-#define CONFIG_AM335X_USB0_MODE	MUSB_PERIPHERAL
-#define CONFIG_AM335X_USB1
-#define CONFIG_AM335X_USB1_MODE MUSB_HOST
-
-#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_USB_ETHER)
-/* disable host part of MUSB in SPL */
-/* disable EFI partitions and partition UUID support */
-#endif
-
-/* USB Device Firmware Update support */
-#ifndef CONFIG_SPL_BUILD
-#define DFU_ALT_INFO_MMC \
-	"dfu_alt_info_mmc=" \
-	"boot part 0 1;" \
-	"rootfs part 0 2;" \
-	"MLO fat 0 1;" \
-	"MLO.raw raw 0x100 0x100;" \
-	"u-boot.img.raw raw 0x300 0x400;" \
-	"spl-os-args.raw raw 0x80 0x80;" \
-	"spl-os-image.raw raw 0x900 0x2000;" \
-	"spl-os-args fat 0 1;" \
-	"spl-os-image fat 0 1;" \
-	"u-boot.img fat 0 1;" \
-	"uEnv.txt fat 0 1\0"
-#ifdef CONFIG_MTD_RAW_NAND
-#define DFU_ALT_INFO_NAND \
-	"dfu_alt_info_nand=" \
-	"SPL part 0 1;" \
-	"SPL.backup1 part 0 2;" \
-	"SPL.backup2 part 0 3;" \
-	"SPL.backup3 part 0 4;" \
-	"u-boot part 0 5;" \
-	"u-boot-spl-os part 0 6;" \
-	"kernel part 0 8;" \
-	"rootfs part 0 9\0"
-#else
-#define DFU_ALT_INFO_NAND ""
-#endif
-#define DFU_ALT_INFO_RAM \
-	"dfu_alt_info_ram=" \
-	"kernel ram 0x80200000 0xD80000;" \
-	"fdt ram 0x80F80000 0x80000;" \
-	"ramdisk ram 0x81000000 0x4000000\0"
-#define DFUARGS \
-	"dfu_alt_info_emmc=rawemmc raw 0 3751936\0" \
-	DFU_ALT_INFO_MMC \
-	DFU_ALT_INFO_RAM \
-	DFU_ALT_INFO_NAND
-#endif
-
-/*
- * Default to using SPI for environment, etc.
- * 0x000000 - 0x020000 : SPL (128KiB)
- * 0x020000 - 0x0A0000 : U-Boot (512KiB)
- * 0x0A0000 - 0x0BFFFF : First copy of U-Boot Environment (128KiB)
- * 0x0C0000 - 0x0DFFFF : Second copy of U-Boot Environment (128KiB)
- * 0x0E0000 - 0x442000 : Linux Kernel
- * 0x442000 - 0x800000 : Userland
- */
-#if defined(CONFIG_SPI_BOOT)
-/* SPL related */
-#elif defined(CONFIG_EMMC_BOOT)
-#define CONFIG_SYS_MMC_ENV_DEV		1
-#define CONFIG_SYS_MMC_ENV_PART		2
-#endif
-
-/* SPI flash. */
-
-/* Network. */
-
-/*
- * NOR Size = 16 MiB
- * Number of Sectors/Blocks = 128
- * Sector Size = 128 KiB
- * Word length = 16 bits
- * Default layout:
- * 0x000000 - 0x07FFFF : U-Boot (512 KiB)
- * 0x080000 - 0x09FFFF : First copy of U-Boot Environment (128 KiB)
- * 0x0A0000 - 0x0BFFFF : Second copy of U-Boot Environment (128 KiB)
- * 0x0C0000 - 0x4BFFFF : Linux Kernel (4 MiB)
- * 0x4C0000 - 0xFFFFFF : Userland (11 MiB + 256 KiB)
- */
-#if defined(CONFIG_NOR)
-#define CONFIG_SYS_MAX_FLASH_SECT	128
-#define CONFIG_SYS_MAX_FLASH_BANKS	1
-#define CONFIG_SYS_FLASH_BASE		(0x08000000)
-#define CONFIG_SYS_FLASH_CFI_WIDTH	FLASH_CFI_16BIT
-#define CONFIG_SYS_FLASH_SIZE		0x01000000
-#define CONFIG_SYS_MONITOR_BASE		CONFIG_SYS_FLASH_BASE
-/* Reduce SPL size by removing unlikey targets */
-#endif  /* NOR support */
-
-#endif	/* ! __CONFIG_AM335X_EVM_H */