dm: Move towards completing CONFIG_BLK migration

Quoted 4 lines · Simon Glass

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

NAK. I disagree with your assessment.

make imx6q_logic_defconfig
cat .config | grep BLK
CONFIG_BLK=y
CONFIG_SPL_BLK=y

Like the other board, I think you're looking for CONFIG_DM_BLK when you should be looking for CONFIG_BLK which is dependent on DM

adam

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

Quoted 3 lines · Simon Glass

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

It is CONFIG_BLK right? which is driver model block layer and it's already enabled. Did I missed anything?

₹ ls drivers/block/*.o
drivers/block/blkcache.o drivers/block/blk-uclass.o drivers/block/built-in.o

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

Signed-off-by Simon Glass <[email protected]>

---

 arch/arm/mach-omap2/omap3/Kconfig    |   1 -
 board/logicpd/omap3som/Kconfig       |  14 --
 board/logicpd/omap3som/MAINTAINERS   |   9 -
 board/logicpd/omap3som/Makefile      |   6 -
 board/logicpd/omap3som/README        |  56 -----
 board/logicpd/omap3som/omap3logic.c  | 329 ---------------------------
 board/logicpd/omap3som/omap3logic.h  | 236 -------------------
 configs/omap35_logic_defconfig       |  72 ------
 configs/omap35_logic_somlv_defconfig |  78 -------
 configs/omap3_logic_defconfig        |  73 ------
 configs/omap3_logic_somlv_defconfig  |  78 -------
 include/configs/omap3_logic.h        | 210 -----------------
 12 files changed, 1162 deletions(-)
 delete mode 100644 board/logicpd/omap3som/Kconfig
 delete mode 100644 board/logicpd/omap3som/MAINTAINERS
 delete mode 100644 board/logicpd/omap3som/Makefile
 delete mode 100644 board/logicpd/omap3som/README
 delete mode 100644 board/logicpd/omap3som/omap3logic.c
 delete mode 100644 board/logicpd/omap3som/omap3logic.h
 delete mode 100644 configs/omap35_logic_defconfig
 delete mode 100644 configs/omap35_logic_somlv_defconfig
 delete mode 100644 configs/omap3_logic_defconfig
 delete mode 100644 configs/omap3_logic_somlv_defconfig
 delete mode 100644 include/configs/omap3_logic.h

arch/arm/mach-omap2/omap3/Kconfig +0 -1

index edd5e3f255b..6e3942ad2d3 100644
@@ -203,7 +203,6 @@ source "board/ti/am3517crane/Kconfig"
 source "board/8dtech/eco5pk/Kconfig"
 source "board/corscience/tricorder/Kconfig"
 source "board/htkw/mcx/Kconfig"
-source "board/logicpd/omap3som/Kconfig"
 source "board/nokia/rx51/Kconfig"
 source "board/technexion/tao3530/Kconfig"
 source "board/technexion/twister/Kconfig"

board/logicpd/omap3som/Kconfig deleted +0 -14

deleted file mode 100644
index 68d40dcd62d..00000000000
@@ -1,14 +0,0 @@
-if TARGET_OMAP3_LOGIC
-
-config SYS_BOARD
-       default "omap3som"
-
-config SYS_VENDOR
-       default "logicpd"
-
-config SYS_CONFIG_NAME
-       default "omap3_logic"
-
-source "board/ti/common/Kconfig"
-
-endif

board/logicpd/omap3som/MAINTAINERS deleted +0 -9

deleted file mode 100644
index 459393cf54c..00000000000
@@ -1,9 +0,0 @@
-OMAP3SOM BOARD
-M:     Adam Ford <[email protected]>
-S:     Maintained
-F:     board/logicpd/omap3som/
-F:     include/configs/omap3_logic.h
-F:     configs/omap3_logic_defconfig
-F:     configs/omap35_logic_defconfig
-F:     configs/omap35_logic_somlv_defconfig
-F:     configs/omap3_logic_somlv_defconfig

board/logicpd/omap3som/Makefile deleted +0 -6

deleted file mode 100644
index 61ef14e87a0..00000000000
@@ -1,6 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0+
-#
-# (C) Copyright 2000, 2001, 2002
-# Wolfgang Denk, DENX Software Engineering, wd at denx.de.
-
-obj-y  := omap3logic.o

board/logicpd/omap3som/README deleted +0 -56

deleted file mode 100644
index 5aaf58f0a69..00000000000
@@ -1,56 +0,0 @@
-Summary
-=======
-
-The source for omap3logic.c encompases the OMAP35 and DM3730 SOM-LV and DM3730 Torpedo platforms, but there are device trees custom taylored to each board.
-
-omap3_logic_defconfig = DM37 Torpedo / Torpedo + Wireless
-omap35_logic_defconfig = OMAP35 Torpedo
-omap3_logic_somlv_defconfig = DM37 SOM-LV
-omap35_logic_somlv_defconfig = OMAP35 SOM-LV
-
-The device tree included with each of the defconfig files will also direct the board as to which dtb file to load when loading the kernel, so it is not
-recomended to mix and match the defconfig files.
-
-Falcon Mode: FAT SD cards
-=========================
-
-In this case the additional file is written to the filesystem.  In this
-example we assume that the uImage and device tree to be used are already on
-the FAT filesystem (only the uImage MUST be for this to function
-afterwards) along with a Falcon Mode aware MLO and the FAT partition has
-already been created and marked bootable:
-
-U-Boot # mmc rescan
-# Load kernel and device tree into memory, perform export
-U-Boot # fatload mmc 0 ${loadaddr} uImage
-U-Boot # run loadfdt
-U-Boot # setenv optargs quiet
-U-Boot # run mmcargs
-U-Boot # run common_bootargs
-U-Boot # spl export fdt ${loadaddr} - ${fdtaddr}
-
-This will print a number of lines and then end with something like:
-   Loading Device Tree to 8dec9000, end 8dee0295 ... OK
-
-So then note the starting address and write the args to mmc/sd:
-
-U-Boot # fatwrite mmc 0:1 0x8dec9000 args 0x20000
-
-The size of 0x20000 matches the CMD_SPL_WRITE_SIZE.
-
-Falcon Mode: NAND
-=================
-
-In this case the additional data is written to another partition of the
-NAND.  In this example we assume that the uImage and device tree to be are
-already located on the NAND somewhere (such as filesystem or mtd partition)
-along with a Falcon Mode aware MLO written to the correct locations for
-booting and mtdparts have been configured correctly for the board:
-
-U-Boot # nand read ${loadaddr} kernel
-U-Boot # load nand rootfs ${fdtaddr} /boot/am335x-evm.dtb
-U-Boot # run nandargs
-U-Boot # run common_bootargs
-U-Boot # spl export fdt ${loadaddr} - ${fdtaddr}
-U-Boot # nand erase.part u-boot-spl-os
-U-Boot # nand write ${fdtaddr} u-boot-spl-os

board/logicpd/omap3som/omap3logic.c deleted +0 -329

deleted file mode 100644
index 691d38fdf27..00000000000
@@ -1,329 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * (C) Copyright 2011
- * Logic Product Development <www.logicpd.com>
- *
- * Author :
- *     Peter Barada <[email protected]>
- *
- * Derived from Beagle Board and 3430 SDP code by
- *     Richard Woodruff <[email protected]>
- *     Syed Mohammed Khasim <[email protected]>
- */
-#include <common.h>
-#include <dm.h>
-#include <ns16550.h>
-#include <netdev.h>
-#include <flash.h>
-#include <nand.h>
-#include <i2c.h>
-#include <twl4030.h>
-#include <asm/io.h>
-#include <asm/arch/mmc_host_def.h>
-#include <asm/arch/mux.h>
-#include <asm/arch/mem.h>
-#include <asm/arch/sys_proto.h>
-#include <asm/gpio.h>
-#include <asm/omap_mmc.h>
-#include <asm/mach-types.h>
-#include <linux/mtd/rawnand.h>
-#include <asm/omap_musb.h>
-#include <linux/errno.h>
-#include <linux/usb/ch9.h>
-#include <linux/usb/gadget.h>
-#include <linux/usb/musb.h>
-#include "omap3logic.h"
-#ifdef CONFIG_USB_EHCI_HCD
-#include <usb.h>
-#include <asm/ehci-omap.h>
-#endif
-
-DECLARE_GLOBAL_DATA_PTR;
-
-#define LOGIC_MT28_DM37_ASYNC_GPMC_CONFIG1     0x00011203
-#define LOGIC_MT28_DM37_ASYNC_GPMC_CONFIG2     0x000A1302
-#define LOGIC_MT28_DM37_ASYNC_GPMC_CONFIG3     0x000F1302
-#define LOGIC_MT28_DM37_ASYNC_GPMC_CONFIG4     0x0A021303
-#define LOGIC_MT28_DM37_ASYNC_GPMC_CONFIG5     0x00120F18
-#define LOGIC_MT28_DM37_ASYNC_GPMC_CONFIG6     0x0A030000
-#define LOGIC_MT28_DM37_ASYNC_GPMC_CONFIG7     0x00000C50
-
-#define LOGIC_MT28_OMAP35_ASYNC_GPMC_CONFIG1   0x00011203
-#define LOGIC_MT28_OMAP35_ASYNC_GPMC_CONFIG2   0x00091102
-#define LOGIC_MT28_OMAP35_ASYNC_GPMC_CONFIG3   0x000D1102
-#define LOGIC_MT28_OMAP35_ASYNC_GPMC_CONFIG4   0x09021103
-#define LOGIC_MT28_OMAP35_ASYNC_GPMC_CONFIG5   0x00100D15
-#define LOGIC_MT28_OMAP35_ASYNC_GPMC_CONFIG6   0x09030000
-#define LOGIC_MT28_OMAP35_ASYNC_GPMC_CONFIG7   0x00000C50
-
-/* This is only needed until SPL gets OF support */
-#ifdef CONFIG_SPL_BUILD
-static const struct ns16550_platdata omap3logic_serial = {
-       .base = OMAP34XX_UART1,
-       .reg_shift = 2,
-       .clock = V_NS16550_CLK,
-       .fcr = UART_FCR_DEFVAL,
-};
-
-U_BOOT_DEVICE(omap3logic_uart) = {
-       "omap_serial",
-       &omap3logic_serial
-};
-
-static const struct omap_hsmmc_plat omap3_logic_mmc0_platdata = {
-       .base_addr = (struct hsmmc *)OMAP_HSMMC1_BASE,
-       .cfg.host_caps = MMC_MODE_HS_52MHz | MMC_MODE_HS | MMC_MODE_4BIT,
-       .cfg.f_min = 400000,
-       .cfg.f_max = 52000000,
-       .cfg.voltages = MMC_VDD_32_33 | MMC_VDD_33_34 | MMC_VDD_165_195,
-       .cfg.b_max = CONFIG_SYS_MMC_MAX_BLK_COUNT,
-};
-
-U_BOOT_DEVICE(omap3_logic_mmc0) = {
-       .name = "omap_hsmmc",
-       .platdata = &omap3_logic_mmc0_platdata,
-};
-
-#endif
-
-#ifdef CONFIG_SPL_OS_BOOT
-int spl_start_uboot(void)
-{
-       /* break into full u-boot on 'c' */
-       return serial_tstc() && serial_getc() == 'c';
-}
-#endif
-
-#if defined(CONFIG_SPL_BUILD)
-/*
- * Routine: get_board_mem_timings
- * Description: If we use SPL then there is no x-loader nor config header
- * so we have to setup the DDR timings ourself on the first bank.  This
- * provides the timing values back to the function that configures
- * the memory.
- */
-void get_board_mem_timings(struct board_sdrc_timings *timings)
-{
-       timings->mr = MICRON_V_MR_165;
-
-       if (get_cpu_family() == CPU_OMAP36XX) {
-               /* 200 MHz works for OMAP36/DM37 */
-               /* 256MB DDR */
-               timings->mcfg = MICRON_V_MCFG_200(256 << 20);
-               timings->ctrla = MICRON_V_ACTIMA_200;
-               timings->ctrlb = MICRON_V_ACTIMB_200;
-               timings->rfr_ctrl = SDP_3430_SDRC_RFR_CTRL_200MHz;
-       } else {
-               /* 165 MHz works for OMAP35 */
-               timings->mcfg = MICRON_V_MCFG_165(256 << 20);
-               timings->ctrla = MICRON_V_ACTIMA_165;
-               timings->ctrlb = MICRON_V_ACTIMB_165;
-               timings->rfr_ctrl = SDP_3430_SDRC_RFR_CTRL_165MHz;
-       }
-}
-
-#define GPMC_NAND_COMMAND_0 (OMAP34XX_GPMC_BASE + 0x7c)
-#define GPMC_NAND_DATA_0 (OMAP34XX_GPMC_BASE + 0x84)
-#define GPMC_NAND_ADDRESS_0 (OMAP34XX_GPMC_BASE + 0x80)
-
-void spl_board_prepare_for_linux(void)
-{
-       /* The Micron NAND starts locked which
-        * prohibits mounting the NAND as RW
-        * The following commands are what unlocks
-        * the NAND to become RW Falcon Mode does not
-        * have as many smarts as U-Boot, but Logic PD
-        * only makes NAND with 512MB so these hard coded
-        * values should work for all current models
-        */
-
-       writeb(0x70, GPMC_NAND_COMMAND_0);
-       writeb(-1, GPMC_NAND_DATA_0);
-       writeb(0x7a, GPMC_NAND_COMMAND_0);
-       writeb(0x00, GPMC_NAND_ADDRESS_0);
-       writeb(0x00, GPMC_NAND_ADDRESS_0);
-       writeb(0x00, GPMC_NAND_ADDRESS_0);
-       writeb(-1, GPMC_NAND_COMMAND_0);
-
-       /* Begin address 0 */
-       writeb(NAND_CMD_UNLOCK1, 0x6e00007c);
-       writeb(0x00, GPMC_NAND_ADDRESS_0);
-       writeb(0x00, GPMC_NAND_ADDRESS_0);
-       writeb(0x00, GPMC_NAND_ADDRESS_0);
-       writeb(-1, GPMC_NAND_DATA_0);
-
-       /* Ending address at the end of Flash */
-       writeb(NAND_CMD_UNLOCK2, GPMC_NAND_COMMAND_0);
-       writeb(0xc0, GPMC_NAND_ADDRESS_0);
-       writeb(0xff, GPMC_NAND_ADDRESS_0);
-       writeb(0x03, GPMC_NAND_ADDRESS_0);
-       writeb(-1, GPMC_NAND_DATA_0);
-       writeb(0x79, GPMC_NAND_COMMAND_0);
-       writeb(-1, GPMC_NAND_DATA_0);
-       writeb(-1, GPMC_NAND_DATA_0);
-}
-#endif
-
-#if !CONFIG_IS_ENABLED(DM_USB)
-#ifdef CONFIG_USB_MUSB_OMAP2PLUS
-static struct musb_hdrc_config musb_config = {
-       .multipoint     = 1,
-       .dyn_fifo       = 1,
-       .num_eps        = 16,
-       .ram_bits       = 12,
-};
-
-static struct omap_musb_board_data musb_board_data = {
-       .interface_type = MUSB_INTERFACE_ULPI,
-};
-
-static struct musb_hdrc_platform_data musb_plat = {
-#if defined(CONFIG_USB_MUSB_HOST)
-       .mode           = MUSB_HOST,
-#elif defined(CONFIG_USB_MUSB_GADGET)
-       .mode           = MUSB_PERIPHERAL,
-#else
-#error "Please define either CONFIG_USB_MUSB_HOST or CONFIG_USB_MUSB_GADGET"
-#endif
-       .config         = &musb_config,
-       .power          = 100,
-       .platform_ops   = &omap2430_ops,
-       .board_data     = &musb_board_data,
-};
-#endif
-
-#if defined(CONFIG_USB_EHCI_HCD) && !defined(CONFIG_SPL_BUILD)
-/* Call usb_stop() before starting the kernel */
-void show_boot_progress(int val)
-{
-       if (val == BOOTSTAGE_ID_RUN_OS)
-               usb_stop();
-}
-
-static struct omap_usbhs_board_data usbhs_bdata = {
-       .port_mode[0] = OMAP_EHCI_PORT_MODE_PHY,
-       .port_mode[1] = OMAP_EHCI_PORT_MODE_PHY,
-       .port_mode[2] = OMAP_USBHS_PORT_MODE_UNUSED
-};
-
-int ehci_hcd_init(int index, enum usb_init_type init,
-               struct ehci_hccr **hccr, struct ehci_hcor **hcor)
-{
-       return omap_ehci_hcd_init(index, &usbhs_bdata, hccr, hcor);
-}
-
-int ehci_hcd_stop(int index)
-{
-       return omap_ehci_hcd_stop();
-}
-
-#endif /* CONFIG_USB_EHCI_HCD */
-#endif /* !DM_USB*/
-/*
- * Routine: misc_init_r
- * Description: Configure board specific parts
- */
-int misc_init_r(void)
-{
-       twl4030_power_init();
-       omap_die_id_display();
-
-#if !CONFIG_IS_ENABLED(DM_USB)
-#ifdef CONFIG_USB_MUSB_OMAP2PLUS
-       musb_register(&musb_plat, &musb_board_data, (void *)MUSB_BASE);
-#endif
-#endif
-       return 0;
-}
-
-#if defined(CONFIG_FLASH_CFI_DRIVER)
-static const u32 gpmc_dm37_c2nor_config[] = {
-       LOGIC_MT28_DM37_ASYNC_GPMC_CONFIG1,
-       LOGIC_MT28_DM37_ASYNC_GPMC_CONFIG2,
-       LOGIC_MT28_DM37_ASYNC_GPMC_CONFIG3,
-       LOGIC_MT28_DM37_ASYNC_GPMC_CONFIG4,
-       LOGIC_MT28_DM37_ASYNC_GPMC_CONFIG5,
-       LOGIC_MT28_DM37_ASYNC_GPMC_CONFIG6,
-       LOGIC_MT28_DM37_ASYNC_GPMC_CONFIG7
-};
-
-static const u32 gpmc_omap35_c2nor_config[] = {
-       LOGIC_MT28_OMAP35_ASYNC_GPMC_CONFIG1,
-       LOGIC_MT28_OMAP35_ASYNC_GPMC_CONFIG2,
-       LOGIC_MT28_OMAP35_ASYNC_GPMC_CONFIG3,
-       LOGIC_MT28_OMAP35_ASYNC_GPMC_CONFIG4,
-       LOGIC_MT28_OMAP35_ASYNC_GPMC_CONFIG5,
-       LOGIC_MT28_OMAP35_ASYNC_GPMC_CONFIG6,
-       LOGIC_MT28_OMAP35_ASYNC_GPMC_CONFIG7
-};
-#endif
-
-/*
- * Routine: board_init
- * Description: Early hardware init.
- */
-int board_init(void)
-{
-       gpmc_init(); /* in SRAM or SDRAM, finish GPMC */
-
-       /* boot param addr */
-       gd->bd->bi_boot_params = (OMAP34XX_SDRC_CS0 + 0x100);
-#if defined(CONFIG_FLASH_CFI_DRIVER)
-       if (get_cpu_family() == CPU_OMAP36XX) {
-               /* Enable CS2 for NOR Flash */
-               enable_gpmc_cs_config(gpmc_dm37_c2nor_config, &gpmc_cfg->cs[2],
-                                     0x10000000, GPMC_SIZE_64M);
-       } else {
-               enable_gpmc_cs_config(gpmc_omap35_c2nor_config, &gpmc_cfg->cs[2],
-                                     0x10000000, GPMC_SIZE_64M);
-       }
-#endif
-       return 0;
-}
-
-#ifdef CONFIG_BOARD_LATE_INIT
-
-static void unlock_nand(void)
-{
-       int dev = nand_curr_device;
-       struct mtd_info *mtd;
-
-       mtd = get_nand_dev_by_index(dev);
-       nand_unlock(mtd, 0, mtd->size, 0);
-}
-
-int board_late_init(void)
-{
-#ifdef CONFIG_CMD_NAND_LOCK_UNLOCK
-       unlock_nand();
-#endif
-       return 0;
-}
-#endif
-
-#if defined(CONFIG_MMC)
-void board_mmc_power_init(void)
-{
-       twl4030_power_mmc_init(0);
-}
-#endif
-
-#ifdef CONFIG_SMC911X
-/* GPMC CS1 settings for Logic SOM LV/Torpedo LAN92xx Ethernet chip */
-static const u32 gpmc_lan92xx_config[] = {
-       NET_LAN92XX_GPMC_CONFIG1,
-       NET_LAN92XX_GPMC_CONFIG2,
-       NET_LAN92XX_GPMC_CONFIG3,
-       NET_LAN92XX_GPMC_CONFIG4,
-       NET_LAN92XX_GPMC_CONFIG5,
-       NET_LAN92XX_GPMC_CONFIG6,
-};
-
-int board_eth_init(bd_t *bis)
-{
-       enable_gpmc_cs_config(gpmc_lan92xx_config, &gpmc_cfg->cs[1],
-                       CONFIG_SMC911X_BASE, GPMC_SIZE_16M);
-
-       return smc911x_initialize(0, CONFIG_SMC911X_BASE);
-}
-#endif

board/logicpd/omap3som/omap3logic.h deleted +0 -236

deleted file mode 100644
index aeb26b90d71..00000000000
@@ -1,236 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * (C) Copyright 2011
- * Logic Product Development <www.logicpd.com>
- *
- * Author:
- * Peter Barada <[email protected]>
- */
-#ifndef _OMAP3LOGIC_H_
-#define _OMAP3LOGIC_H_
-
-/*
- * OMAP3 GPMC register settings for CS1 LAN922x
- */
-#define NET_LAN92XX_GPMC_CONFIG1       0x00001000
-#define NET_LAN92XX_GPMC_CONFIG2       0x00080801
-#define NET_LAN92XX_GPMC_CONFIG3       0x00000000
-#define NET_LAN92XX_GPMC_CONFIG4       0x08010801
-#define NET_LAN92XX_GPMC_CONFIG5       0x00080a0a
-#define NET_LAN92XX_GPMC_CONFIG6       0x03000280
-
-
-const omap3_sysinfo sysinfo = {
-       DDR_DISCRETE,
-       "Logic DM37x/OMAP35x reference board",
-       "NAND",
-};
-
-/*
- * IEN  - Input Enable
- * IDIS - Input Disable
- * PTD  - Pull type Down
- * PTU  - Pull type Up
- * DIS  - Pull type selection is inactive
- * EN   - Pull type selection is active
- * M0   - Mode 0
- * The commented string gives the final mux configuration for that pin
- */
-
-/*
- * Routine: set_muxconf_regs
- * Description: Setting up the configuration Mux registers specific to the
- *             hardware. Many pins need to be moved from protect to primary
- *             mode.
- */
-void set_muxconf_regs(void)
-{
-       MUX_VAL(CP(SDRC_D0), (IEN  | PTD | DIS | M0)); /*SDRC_D0*/
-       MUX_VAL(CP(SDRC_D1), (IEN  | PTD | DIS | M0)); /*SDRC_D1*/
-       MUX_VAL(CP(SDRC_D2), (IEN  | PTD | DIS | M0)); /*SDRC_D2*/
-       MUX_VAL(CP(SDRC_D3), (IEN  | PTD | DIS | M0)); /*SDRC_D3*/
-       MUX_VAL(CP(SDRC_D4), (IEN  | PTD | DIS | M0)); /*SDRC_D4*/
-       MUX_VAL(CP(SDRC_D5), (IEN  | PTD | DIS | M0)); /*SDRC_D5*/
-       MUX_VAL(CP(SDRC_D6), (IEN  | PTD | DIS | M0)); /*SDRC_D6*/
-       MUX_VAL(CP(SDRC_D7), (IEN  | PTD | DIS | M0)); /*SDRC_D7*/
-       MUX_VAL(CP(SDRC_D8), (IEN  | PTD | DIS | M0)); /*SDRC_D8*/
-       MUX_VAL(CP(SDRC_D9), (IEN  | PTD | DIS | M0)); /*SDRC_D9*/
-       MUX_VAL(CP(SDRC_D10), (IEN  | PTD | DIS | M0)); /*SDRC_D10*/
-       MUX_VAL(CP(SDRC_D11), (IEN  | PTD | DIS | M0)); /*SDRC_D11*/
-       MUX_VAL(CP(SDRC_D12), (IEN  | PTD | DIS | M0)); /*SDRC_D12*/
-       MUX_VAL(CP(SDRC_D13), (IEN  | PTD | DIS | M0)); /*SDRC_D13*/
-       MUX_VAL(CP(SDRC_D14), (IEN  | PTD | DIS | M0)); /*SDRC_D14*/
-       MUX_VAL(CP(SDRC_D15), (IEN  | PTD | DIS | M0)); /*SDRC_D15*/
-       MUX_VAL(CP(SDRC_D16), (IEN  | PTD | DIS | M0)); /*SDRC_D16*/
-       MUX_VAL(CP(SDRC_D17), (IEN  | PTD | DIS | M0)); /*SDRC_D17*/
-       MUX_VAL(CP(SDRC_D18), (IEN  | PTD | DIS | M0)); /*SDRC_D18*/
-       MUX_VAL(CP(SDRC_D19), (IEN  | PTD | DIS | M0)); /*SDRC_D19*/
-       MUX_VAL(CP(SDRC_D20), (IEN  | PTD | DIS | M0)); /*SDRC_D20*/
-       MUX_VAL(CP(SDRC_D21), (IEN  | PTD | DIS | M0)); /*SDRC_D21*/
-       MUX_VAL(CP(SDRC_D22), (IEN  | PTD | DIS | M0)); /*SDRC_D22*/
-       MUX_VAL(CP(SDRC_D23), (IEN  | PTD | DIS | M0)); /*SDRC_D23*/
-       MUX_VAL(CP(SDRC_D24), (IEN  | PTD | DIS | M0)); /*SDRC_D24*/
-       MUX_VAL(CP(SDRC_D25), (IEN  | PTD | DIS | M0)); /*SDRC_D25*/
-       MUX_VAL(CP(SDRC_D26), (IEN  | PTD | DIS | M0)); /*SDRC_D26*/
-       MUX_VAL(CP(SDRC_D27), (IEN  | PTD | DIS | M0)); /*SDRC_D27*/
-       MUX_VAL(CP(SDRC_D28), (IEN  | PTD | DIS | M0)); /*SDRC_D28*/
-       MUX_VAL(CP(SDRC_D29), (IEN  | PTD | DIS | M0)); /*SDRC_D29*/
-       MUX_VAL(CP(SDRC_D30), (IEN  | PTD | DIS | M0)); /*SDRC_D30*/
-       MUX_VAL(CP(SDRC_D31), (IEN  | PTD | DIS | M0)); /*SDRC_D31*/
-       MUX_VAL(CP(SDRC_CLK), (IEN  | PTD | DIS | M0)); /*SDRC_CLK*/
-       MUX_VAL(CP(SDRC_DQS0), (IEN  | PTD | DIS | M0)); /*SDRC_DQS0*/
-       MUX_VAL(CP(SDRC_DQS1), (IEN  | PTD | DIS | M0)); /*SDRC_DQS1*/
-       MUX_VAL(CP(SDRC_DQS2), (IEN  | PTD | DIS | M0)); /*SDRC_DQS2*/
-       MUX_VAL(CP(SDRC_DQS3), (IEN  | PTD | DIS | M0)); /*SDRC_DQS3*/
-       MUX_VAL(CP(SDRC_CKE0), (IDIS | PTU | EN  | M0)); /*SDRC_CKE0*/
-       MUX_VAL(CP(SDRC_CKE1), (IDIS | PTU | DIS | M0)); /*SDRC_CKE1*/
-
-       MUX_VAL(CP(GPMC_A1), (IDIS | PTU | EN  | M0)); /*GPMC_A1*/
-       MUX_VAL(CP(GPMC_A2), (IDIS | PTU | EN  | M0)); /*GPMC_A2*/
-       MUX_VAL(CP(GPMC_A3), (IDIS | PTU | EN  | M0)); /*GPMC_A3*/
-       MUX_VAL(CP(GPMC_A4), (IDIS | PTU | EN  | M0)); /*GPMC_A4*/
-       MUX_VAL(CP(GPMC_A5), (IDIS | PTU | EN  | M0)); /*GPMC_A5*/
-       MUX_VAL(CP(GPMC_A6), (IDIS | PTU | EN  | M0)); /*GPMC_A6*/
-       MUX_VAL(CP(GPMC_A7), (IDIS | PTU | EN  | M0)); /*GPMC_A7*/
-       MUX_VAL(CP(GPMC_A8), (IDIS | PTU | EN  | M0)); /*GPMC_A8*/
-       MUX_VAL(CP(GPMC_A9), (IDIS | PTU | EN  | M0)); /*GPMC_A9*/
-       MUX_VAL(CP(GPMC_A10), (IDIS | PTU | EN  | M0)); /*GPMC_A10*/
-       MUX_VAL(CP(GPMC_D0), (IEN  | PTU | EN  | M0)); /*GPMC_D0*/
-       MUX_VAL(CP(GPMC_D1), (IEN  | PTU | EN  | M0)); /*GPMC_D1*/
-       MUX_VAL(CP(GPMC_D2), (IEN  | PTU | EN  | M0)); /*GPMC_D2*/
-       MUX_VAL(CP(GPMC_D3), (IEN  | PTU | EN  | M0)); /*GPMC_D3*/
-       MUX_VAL(CP(GPMC_D4),  (IEN  | PTU | EN  | M0)); /*GPMC_D4*/
-       MUX_VAL(CP(GPMC_D5),  (IEN  | PTU | EN  | M0)); /*GPMC_D5*/
-       MUX_VAL(CP(GPMC_D6),  (IEN  | PTU | EN  | M0)); /*GPMC_D6*/
-       MUX_VAL(CP(GPMC_D7),   (IEN  | PTU | EN  | M0)); /*GPMC_D7*/
-       MUX_VAL(CP(GPMC_D8),  (IEN  | PTU | EN  | M0)); /*GPMC_D8*/
-       MUX_VAL(CP(GPMC_D9),  (IEN  | PTU | EN  | M0)); /*GPMC_D9*/
-       MUX_VAL(CP(GPMC_D10), (IEN  | PTU | EN  | M0)); /*GPMC_D10*/
-       MUX_VAL(CP(GPMC_D11), (IEN  | PTU | EN  | M0)); /*GPMC_D11*/
-       MUX_VAL(CP(GPMC_D12), (IEN  | PTU | EN  | M0)); /*GPMC_D12*/
-       MUX_VAL(CP(GPMC_D13), (IEN  | PTU | EN  | M0)); /*GPMC_D13*/
-       MUX_VAL(CP(GPMC_D14), (IEN  | PTU | EN  | M0)); /*GPMC_D14*/
-       MUX_VAL(CP(GPMC_D15), (IEN  | PTU | EN  | M0)); /*GPMC_D15*/
-       MUX_VAL(CP(GPMC_NCS0), (IDIS | PTU | EN  | M0)); /*GPMC_nCS0*/
-       MUX_VAL(CP(GPMC_NCS1), (IDIS | PTU | EN  | M0)); /*GPMC_nCS1*/
-       MUX_VAL(CP(GPMC_NCS2), (IDIS | PTU | EN  | M0)); /*GPMC_nCS2*/
-       MUX_VAL(CP(GPMC_NCS3), (IDIS | PTU | EN  | M0)); /*GPMC_nCS3*/
-       MUX_VAL(CP(GPMC_NCS4), (IEN  | PTU | EN  | M0)); /*GPMC_nCS4*/
-       MUX_VAL(CP(GPMC_NCS5), (IDIS | PTU | EN  | M0)); /*GPMC_nCS5*/
-       MUX_VAL(CP(GPMC_NCS6), (IEN  | PTU | EN | M0)); /*GPMC_nCS6*/
-       MUX_VAL(CP(GPMC_NCS7), (IEN  | PTU | EN  | M0)); /*GPMC_nCS7*/
-       MUX_VAL(CP(GPMC_CLK),  (IDIS | PTU | EN  | M0)); /*GPMC_CLK*/
-       MUX_VAL(CP(GPMC_NADV_ALE), (IDIS | PTD | DIS | M0)); /*GPMC_nADV_ALE*/
-       MUX_VAL(CP(GPMC_NOE), (IDIS | PTD | DIS | M0)); /*GPMC_nOE*/
-       MUX_VAL(CP(GPMC_NWE), (IDIS | PTD | DIS | M0)); /*GPMC_nWE*/
-       MUX_VAL(CP(GPMC_NBE0_CLE), (IDIS | PTU | EN  | M0)); /*GPMC_nBE0_CLE*/
-       MUX_VAL(CP(GPMC_NBE1), (IEN  | PTU | EN  | M0)); /*GPMC_nBE1*/
-       MUX_VAL(CP(GPMC_NWP),  (IEN  | PTD | DIS | M0)); /*GPMC_nWP*/
-       MUX_VAL(CP(GPMC_WAIT0), (IEN  | PTU | EN  | M0)); /*GPMC_WAIT0*/
-       MUX_VAL(CP(GPMC_WAIT1), (IEN  | PTU | EN  | M0)); /*GPMC_WAIT1*/
-       MUX_VAL(CP(GPMC_WAIT2), (IEN  | PTU | EN  | M4)); /*GPIO_64*/
-       MUX_VAL(CP(GPMC_WAIT3), (IEN  | PTU | EN  | M0)); /*GPMC_WAIT3*/
-
-       MUX_VAL(CP(MMC1_CLK), (IDIS | PTU | EN  | M0)); /*MMC1_CLK*/
-       MUX_VAL(CP(MMC1_CMD), (IEN  | PTU | EN  | M0)); /*MMC1_CMD*/
-       MUX_VAL(CP(MMC1_DAT0), (IEN  | PTU | EN  | M0)); /*MMC1_DAT0*/
-       MUX_VAL(CP(MMC1_DAT1), (IEN  | PTU | EN  | M0)); /*MMC1_DAT1*/
-       MUX_VAL(CP(MMC1_DAT2), (IEN  | PTU | EN  | M0)); /*MMC1_DAT2*/
-       MUX_VAL(CP(MMC1_DAT3), (IEN  | PTU | EN  | M0)); /*MMC1_DAT3*/
-
-       MUX_VAL(CP(UART1_TX), (IDIS | PTD | DIS | M0)); /*UART1_TX*/
-       MUX_VAL(CP(UART1_RTS), (IDIS | PTD | DIS | M0)); /*UART1_RTS*/
-       MUX_VAL(CP(UART1_CTS), (IEN  | PTU | DIS | M0)); /*UART1_CTS*/
-       MUX_VAL(CP(UART1_RX), (IEN  | PTD | DIS | M0)); /*UART1_RX*/
-
-       MUX_VAL(CP(JTAG_TCK), (IEN  | PTD | DIS | M0)); /*JTAG_TCK*/
-       MUX_VAL(CP(JTAG_TMS), (IEN  | PTD | DIS | M0)); /*JTAG_TMS*/
-       MUX_VAL(CP(JTAG_TDI), (IEN  | PTD | DIS | M0)); /*JTAG_TDI*/
-       MUX_VAL(CP(JTAG_EMU0), (IEN  | PTD | DIS | M0)); /*JTAG_EMU0*/
-       MUX_VAL(CP(JTAG_EMU1), (IEN  | PTD | DIS | M0)); /*JTAG_EMU1*/
-
-       MUX_VAL(CP(ETK_CLK_ES2), (IDIS | PTU | EN  | M0)); /*ETK_CLK*/
-       MUX_VAL(CP(ETK_CTL_ES2), (IDIS | PTD | DIS | M0)); /*ETK_CTL*/
-       MUX_VAL(CP(ETK_D0_ES2), (IEN  | PTD | DIS | M0)); /*ETK_D0*/
-       MUX_VAL(CP(ETK_D1_ES2), (IEN  | PTD | DIS | M0)); /*ETK_D1*/
-       MUX_VAL(CP(ETK_D2_ES2), (IEN  | PTD | EN  | M0)); /*ETK_D2*/
-       MUX_VAL(CP(ETK_D3_ES2), (IEN  | PTD | DIS | M0)); /*ETK_D3*/
-       MUX_VAL(CP(ETK_D4_ES2), (IEN  | PTD | DIS | M0)); /*ETK_D4*/
-       MUX_VAL(CP(ETK_D5_ES2), (IEN  | PTD | DIS | M0)); /*ETK_D5*/
-       MUX_VAL(CP(ETK_D6_ES2), (IEN  | PTD | DIS | M0)); /*ETK_D6*/
-       MUX_VAL(CP(ETK_D7_ES2), (IEN  | PTD | DIS | M0)); /*ETK_D7*/
-       MUX_VAL(CP(ETK_D8_ES2), (IEN  | PTD | DIS | M0)); /*ETK_D8*/
-       MUX_VAL(CP(ETK_D9_ES2), (IEN  | PTD | DIS | M0)); /*ETK_D9*/
-       MUX_VAL(CP(ETK_D10_ES2), (IEN  | PTD | DIS | M0)); /*ETK_D10*/
-       MUX_VAL(CP(ETK_D11_ES2), (IEN  | PTD | DIS | M0)); /*ETK_D11*/
-       MUX_VAL(CP(ETK_D12_ES2), (IEN  | PTD | DIS | M0)); /*ETK_D12*/
-       MUX_VAL(CP(ETK_D13_ES2), (IEN  | PTD | DIS | M0)); /*ETK_D13*/
-       MUX_VAL(CP(ETK_D14_ES2), (IEN  | PTD | DIS | M0)); /*ETK_D14*/
-       MUX_VAL(CP(ETK_D15_ES2), (IEN  | PTD | DIS | M0)); /*ETK_D15*/
-
-       MUX_VAL(CP(D2D_MCAD1), (IEN  | PTD | EN  | M0)); /*d2d_mcad1*/
-       MUX_VAL(CP(D2D_MCAD2), (IEN  | PTD | EN  | M0)); /*d2d_mcad2*/
-       MUX_VAL(CP(D2D_MCAD3), (IEN  | PTD | EN  | M0)); /*d2d_mcad3*/
-       MUX_VAL(CP(D2D_MCAD4), (IEN  | PTD | EN  | M0)); /*d2d_mcad4*/
-       MUX_VAL(CP(D2D_MCAD5), (IEN  | PTD | EN  | M0)); /*d2d_mcad5*/
-       MUX_VAL(CP(D2D_MCAD6), (IEN  | PTD | EN  | M0)); /*d2d_mcad6*/
-       MUX_VAL(CP(D2D_MCAD7), (IEN  | PTD | EN  | M0)); /*d2d_mcad7*/
-       MUX_VAL(CP(D2D_MCAD8), (IEN  | PTD | EN  | M0)); /*d2d_mcad8*/
-       MUX_VAL(CP(D2D_MCAD9), (IEN  | PTD | EN  | M0)); /*d2d_mcad9*/
-       MUX_VAL(CP(D2D_MCAD10), (IEN  | PTD | EN  | M0)); /*d2d_mcad10*/
-       MUX_VAL(CP(D2D_MCAD11), (IEN  | PTD | EN  | M0)); /*d2d_mcad11*/
-       MUX_VAL(CP(D2D_MCAD12), (IEN  | PTD | EN  | M0)); /*d2d_mcad12*/
-       MUX_VAL(CP(D2D_MCAD13), (IEN  | PTD | EN  | M0)); /*d2d_mcad13*/
-       MUX_VAL(CP(D2D_MCAD14), (IEN  | PTD | EN  | M0)); /*d2d_mcad14*/
-       MUX_VAL(CP(D2D_MCAD15), (IEN  | PTD | EN  | M0)); /*d2d_mcad15*/
-       MUX_VAL(CP(D2D_MCAD16), (IEN  | PTD | EN  | M0)); /*d2d_mcad16*/
-       MUX_VAL(CP(D2D_MCAD17), (IEN  | PTD | EN  | M0)); /*d2d_mcad17*/
-       MUX_VAL(CP(D2D_MCAD18), (IEN  | PTD | EN  | M0)); /*d2d_mcad18*/
-       MUX_VAL(CP(D2D_MCAD19), (IEN  | PTD | EN  | M0)); /*d2d_mcad19*/
-       MUX_VAL(CP(D2D_MCAD20), (IEN  | PTD | EN  | M0)); /*d2d_mcad20*/
-       MUX_VAL(CP(D2D_MCAD21), (IEN  | PTD | EN  | M0)); /*d2d_mcad21*/
-       MUX_VAL(CP(D2D_MCAD22), (IEN  | PTD | EN  | M0)); /*d2d_mcad22*/
-       MUX_VAL(CP(D2D_MCAD23), (IEN  | PTD | EN  | M0)); /*d2d_mcad23*/
-       MUX_VAL(CP(D2D_MCAD24), (IEN  | PTD | EN  | M0)); /*d2d_mcad24*/
-       MUX_VAL(CP(D2D_MCAD25), (IEN  | PTD | EN  | M0)); /*d2d_mcad25*/
-       MUX_VAL(CP(D2D_MCAD26), (IEN  | PTD | EN  | M0)); /*d2d_mcad26*/
-       MUX_VAL(CP(D2D_MCAD27), (IEN  | PTD | EN  | M0)); /*d2d_mcad27*/
-       MUX_VAL(CP(D2D_MCAD28), (IEN  | PTD | EN  | M0)); /*d2d_mcad28*/
-       MUX_VAL(CP(D2D_MCAD29), (IEN  | PTD | EN  | M0)); /*d2d_mcad29*/
-       MUX_VAL(CP(D2D_MCAD30), (IEN  | PTD | EN  | M0)); /*d2d_mcad30*/
-       MUX_VAL(CP(D2D_MCAD31), (IEN  | PTD | EN  | M0)); /*d2d_mcad31*/
-       MUX_VAL(CP(D2D_MCAD32), (IEN  | PTD | EN  | M0)); /*d2d_mcad32*/
-       MUX_VAL(CP(D2D_MCAD33), (IEN  | PTD | EN  | M0)); /*d2d_mcad33*/
-       MUX_VAL(CP(D2D_MCAD34), (IEN  | PTD | EN  | M0)); /*d2d_mcad34*/
-       MUX_VAL(CP(D2D_MCAD35), (IEN  | PTD | EN  | M0)); /*d2d_mcad35*/
-       MUX_VAL(CP(D2D_MCAD36), (IEN  | PTD | EN  | M0)); /*d2d_mcad36*/
-       MUX_VAL(CP(D2D_CLK26MI), (IEN  | PTD | DIS | M0)); /*d2d_clk26mi*/
-       MUX_VAL(CP(D2D_NRESPWRON), (IEN  | PTD | EN  | M0)); /*d2d_nrespwron*/
-       MUX_VAL(CP(D2D_NRESWARM), (IEN  | PTU | EN  | M0)); /*d2d_nreswarm */
-       MUX_VAL(CP(D2D_ARM9NIRQ), (IEN  | PTD | DIS | M0)); /*d2d_arm9nirq */
-       MUX_VAL(CP(D2D_UMA2P6FIQ), (IEN  | PTD | DIS | M0)); /*d2d_uma2p6fiq*/
-       MUX_VAL(CP(D2D_SPINT), (IEN  | PTD | EN  | M0)); /*d2d_spint*/
-       MUX_VAL(CP(D2D_FRINT), (IEN  | PTD | EN  | M0)); /*d2d_frint*/
-       MUX_VAL(CP(D2D_DMAREQ0), (IEN  | PTD | DIS | M0)); /*d2d_dmareq0*/
-       MUX_VAL(CP(D2D_DMAREQ1), (IEN  | PTD | DIS | M0)); /*d2d_dmareq1*/
-       MUX_VAL(CP(D2D_DMAREQ2), (IEN  | PTD | DIS | M0)); /*d2d_dmareq2*/
-       MUX_VAL(CP(D2D_DMAREQ3), (IEN  | PTD | DIS | M0)); /*d2d_dmareq3*/
-       MUX_VAL(CP(D2D_N3GTRST), (IEN  | PTD | DIS | M0)); /*d2d_n3gtrst*/
-       MUX_VAL(CP(D2D_N3GTDI),  (IEN  | PTD | DIS | M0)); /*d2d_n3gtdi*/
-       MUX_VAL(CP(D2D_N3GTDO),  (IEN  | PTD | DIS | M0)); /*d2d_n3gtdo*/
-       MUX_VAL(CP(D2D_N3GTMS),  (IEN  | PTD | DIS | M0)); /*d2d_n3gtms*/
-       MUX_VAL(CP(D2D_N3GTCK),  (IEN  | PTD | DIS | M0)); /*d2d_n3gtck*/
-       MUX_VAL(CP(D2D_N3GRTCK), (IEN  | PTD | DIS | M0)); /*d2d_n3grtck*/
-       MUX_VAL(CP(D2D_MSTDBY),  (IEN  | PTU | EN  | M0)); /*d2d_mstdby*/
-       MUX_VAL(CP(D2D_SWAKEUP), (IEN  | PTD | EN  | M0)); /*d2d_swakeup*/
-       MUX_VAL(CP(D2D_IDLEREQ), (IEN  | PTD | DIS | M0)); /*d2d_idlereq*/
-       MUX_VAL(CP(D2D_IDLEACK), (IEN  | PTU | EN  | M0)); /*d2d_idleack*/
-       MUX_VAL(CP(D2D_MWRITE),  (IEN  | PTD | DIS | M0)); /*d2d_mwrite*/
-       MUX_VAL(CP(D2D_SWRITE),  (IEN  | PTD | DIS | M0)); /*d2d_swrite*/
-       MUX_VAL(CP(D2D_MREAD),   (IEN  | PTD | DIS | M0)); /*d2d_mread*/
-       MUX_VAL(CP(D2D_SREAD),   (IEN  | PTD | DIS | M0)); /*d2d_sread*/
-       MUX_VAL(CP(D2D_MBUSFLAG), (IEN  | PTD | DIS | M0)); /*d2d_mbusflag*/
-       MUX_VAL(CP(D2D_SBUSFLAG), (IEN  | PTD | DIS | M0)); /*d2d_sbusflag*/
-}
-
-#endif

configs/omap35_logic_defconfig deleted +0 -72

deleted file mode 100644
index 80219eeacfa..00000000000
@@ -1,72 +0,0 @@
-CONFIG_ARM=y
-CONFIG_ARCH_OMAP2PLUS=y
-CONFIG_SYS_TEXT_BASE=0x80100000
-CONFIG_TI_COMMON_CMD_OPTIONS=y
-# CONFIG_SPL_GPIO_SUPPORT is not set
-CONFIG_SYS_MALLOC_F_LEN=0x2000
-CONFIG_TARGET_OMAP3_LOGIC=y
-# CONFIG_SPL_OMAP3_ID_NAND is not set
-CONFIG_SPL=y
-CONFIG_DISTRO_DEFAULTS=y
-CONFIG_NR_DRAM_BANKS=2
-# CONFIG_USE_BOOTCOMMAND is not set
-CONFIG_SYS_CONSOLE_INFO_QUIET=y
-CONFIG_VERSION_VARIABLE=y
-CONFIG_SPL_SYS_MALLOC_SIMPLE=y
-CONFIG_SPL_MTD_SUPPORT=y
-CONFIG_SPL_OS_BOOT=y
-CONFIG_SYS_PROMPT="OMAP Logic # "
-# CONFIG_CMD_IMI is not set
-CONFIG_CMD_SPL=y
-CONFIG_CMD_SPL_NAND_OFS=0x240000
-CONFIG_CMD_SPL_WRITE_SIZE=0x20000
-# CONFIG_CMD_EEPROM is not set
-# CONFIG_CMD_FLASH is not set
-CONFIG_CMD_NAND=y
-CONFIG_CMD_NAND_LOCK_UNLOCK=y
-CONFIG_CMD_CACHE=y
-CONFIG_CMD_MTDPARTS=y
-CONFIG_MTDIDS_DEFAULT="nand0=omap2-nand.0"
-CONFIG_MTDPARTS_DEFAULT="mtdparts=omap2-nand.0:512k(MLO),1792k(u-boot),128k(spl-os),128k(u-boot-env),6m(kernel),-(fs)"
-CONFIG_CMD_UBI=y
-CONFIG_OF_CONTROL=y
-CONFIG_DEFAULT_DEVICE_TREE="logicpd-torpedo-35xx-devkit"
-# CONFIG_ENV_IS_IN_FAT is not set
-CONFIG_ENV_IS_IN_NAND=y
-CONFIG_SPL_DM=y
-CONFIG_USB_FUNCTION_FASTBOOT=y
-CONFIG_FASTBOOT_BUF_ADDR=0x82000000
-CONFIG_DM_I2C=y
-CONFIG_DM_MMC=y
-CONFIG_MMC_OMAP_HS=y
-CONFIG_NAND=y
-CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
-CONFIG_SYS_NAND_U_BOOT_LOCATIONS=y
-CONFIG_SYS_NAND_U_BOOT_OFFS=0x80000
-CONFIG_SPL_NAND_SIMPLE=y
-CONFIG_SMC911X=y
-CONFIG_SMC911X_BASE=0x08000000
-CONFIG_SMC911X_32_BIT=y
-CONFIG_PINCTRL=y
-CONFIG_PINCTRL_SINGLE=y
-CONFIG_DM_PMIC=y
-# CONFIG_SPL_PMIC_CHILDREN is not set
-CONFIG_DM_REGULATOR=y
-CONFIG_DM_REGULATOR_FIXED=y
-CONFIG_DM_REGULATOR_GPIO=y
-CONFIG_SPECIFY_CONSOLE_INDEX=y
-CONFIG_SPI=y
-CONFIG_DM_SPI=y
-CONFIG_OMAP3_SPI=y
-CONFIG_USB=y
-CONFIG_USB_EHCI_HCD=y
-CONFIG_USB_MUSB_GADGET=y
-CONFIG_USB_MUSB_OMAP2PLUS=y
-CONFIG_TWL4030_USB=y
-CONFIG_USB_GADGET=y
-CONFIG_USB_GADGET_MANUFACTURER="TI"
-CONFIG_USB_GADGET_VENDOR_NUM=0x0451
-CONFIG_USB_GADGET_PRODUCT_NUM=0xd022
-CONFIG_USB_ETHER=y
-CONFIG_BCH=y
-# CONFIG_SPL_OF_LIBFDT is not set

configs/omap35_logic_somlv_defconfig deleted +0 -78

deleted file mode 100644
index 8a8c7147c3a..00000000000
@@ -1,78 +0,0 @@
-CONFIG_ARM=y
-CONFIG_ARCH_OMAP2PLUS=y
-CONFIG_SYS_TEXT_BASE=0x80100000
-CONFIG_TI_COMMON_CMD_OPTIONS=y
-# CONFIG_SPL_GPIO_SUPPORT is not set
-CONFIG_SYS_MALLOC_F_LEN=0x2000
-CONFIG_TARGET_OMAP3_LOGIC=y
-# CONFIG_SPL_OMAP3_ID_NAND is not set
-CONFIG_SPL=y
-CONFIG_DISTRO_DEFAULTS=y
-CONFIG_NR_DRAM_BANKS=2
-# CONFIG_USE_BOOTCOMMAND is not set
-CONFIG_SYS_CONSOLE_INFO_QUIET=y
-CONFIG_VERSION_VARIABLE=y
-CONFIG_SPL_SYS_MALLOC_SIMPLE=y
-CONFIG_SPL_MTD_SUPPORT=y
-CONFIG_SPL_OS_BOOT=y
-CONFIG_SYS_PROMPT="OMAP Logic # "
-# CONFIG_CMD_IMI is not set
-CONFIG_CMD_SPL=y
-CONFIG_CMD_SPL_NAND_OFS=0x240000
-CONFIG_CMD_SPL_WRITE_SIZE=0x20000
-# CONFIG_CMD_EEPROM is not set
-# CONFIG_CMD_FLASH is not set
-CONFIG_CMD_NAND=y
-CONFIG_CMD_NAND_LOCK_UNLOCK=y
-CONFIG_CMD_CACHE=y
-CONFIG_CMD_MTDPARTS=y
-CONFIG_MTDIDS_DEFAULT="nand0=omap2-nand.0,nor0=physmap-flash.0"
-CONFIG_MTDPARTS_DEFAULT="mtdparts=omap2-nand.0:512k(MLO),1792k(u-boot),128k(spl-os),128k(u-boot-env),6m(kernel),-(fs);physmap-flash.0:-(nor)"
-CONFIG_CMD_UBI=y
-CONFIG_OF_CONTROL=y
-CONFIG_DEFAULT_DEVICE_TREE="logicpd-som-lv-35xx-devkit"
-# CONFIG_ENV_IS_IN_FAT is not set
-CONFIG_ENV_IS_IN_NAND=y
-CONFIG_SPL_DM=y
-CONFIG_USB_FUNCTION_FASTBOOT=y
-CONFIG_FASTBOOT_BUF_ADDR=0x82000000
-CONFIG_DM_I2C=y
-CONFIG_DM_MMC=y
-CONFIG_MMC_OMAP_HS=y
-CONFIG_MTD_NOR_FLASH=y
-CONFIG_FLASH_CFI_DRIVER=y
-CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
-CONFIG_FLASH_CFI_MTD=y
-CONFIG_SYS_FLASH_PROTECTION=y
-CONFIG_SYS_FLASH_CFI=y
-CONFIG_NAND=y
-CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
-CONFIG_SYS_NAND_U_BOOT_LOCATIONS=y
-CONFIG_SYS_NAND_U_BOOT_OFFS=0x80000
-CONFIG_SPL_NAND_SIMPLE=y
-CONFIG_SMC911X=y
-CONFIG_SMC911X_BASE=0x08000000
-CONFIG_SMC911X_32_BIT=y
-CONFIG_PINCTRL=y
-CONFIG_PINCTRL_SINGLE=y
-CONFIG_DM_PMIC=y
-# CONFIG_SPL_PMIC_CHILDREN is not set
-CONFIG_DM_REGULATOR=y
-CONFIG_DM_REGULATOR_FIXED=y
-CONFIG_DM_REGULATOR_GPIO=y
-CONFIG_SPECIFY_CONSOLE_INDEX=y
-CONFIG_SPI=y
-CONFIG_DM_SPI=y
-CONFIG_OMAP3_SPI=y
-CONFIG_USB=y
-CONFIG_USB_EHCI_HCD=y
-CONFIG_USB_MUSB_GADGET=y
-CONFIG_USB_MUSB_OMAP2PLUS=y
-CONFIG_TWL4030_USB=y
-CONFIG_USB_GADGET=y
-CONFIG_USB_GADGET_MANUFACTURER="TI"
-CONFIG_USB_GADGET_VENDOR_NUM=0x0451
-CONFIG_USB_GADGET_PRODUCT_NUM=0xd022
-CONFIG_USB_ETHER=y
-CONFIG_BCH=y
-# CONFIG_SPL_OF_LIBFDT is not set

configs/omap3_logic_defconfig deleted +0 -73

deleted file mode 100644
index 969387a37cb..00000000000
@@ -1,73 +0,0 @@
-CONFIG_ARM=y
-CONFIG_ARCH_OMAP2PLUS=y
-CONFIG_SYS_TEXT_BASE=0x80100000
-CONFIG_TI_COMMON_CMD_OPTIONS=y
-# CONFIG_SPL_GPIO_SUPPORT is not set
-CONFIG_SYS_MALLOC_F_LEN=0x2000
-CONFIG_TARGET_OMAP3_LOGIC=y
-# CONFIG_SPL_OMAP3_ID_NAND is not set
-CONFIG_SPL=y
-CONFIG_DISTRO_DEFAULTS=y
-CONFIG_NR_DRAM_BANKS=2
-# CONFIG_USE_BOOTCOMMAND is not set
-CONFIG_SYS_CONSOLE_INFO_QUIET=y
-CONFIG_VERSION_VARIABLE=y
-CONFIG_SPL_SYS_MALLOC_SIMPLE=y
-CONFIG_SPL_MTD_SUPPORT=y
-CONFIG_SPL_OS_BOOT=y
-CONFIG_SYS_PROMPT="OMAP Logic # "
-# CONFIG_CMD_IMI is not set
-CONFIG_CMD_SPL=y
-CONFIG_CMD_SPL_NAND_OFS=0x240000
-CONFIG_CMD_SPL_WRITE_SIZE=0x20000
-# CONFIG_CMD_EEPROM is not set
-# CONFIG_CMD_FLASH is not set
-CONFIG_CMD_NAND=y
-CONFIG_CMD_NAND_LOCK_UNLOCK=y
-CONFIG_CMD_CACHE=y
-CONFIG_CMD_MTDPARTS=y
-CONFIG_MTDIDS_DEFAULT="nand0=omap2-nand.0"
-CONFIG_MTDPARTS_DEFAULT="mtdparts=omap2-nand.0:512k(MLO),1792k(u-boot),128k(spl-os),128k(u-boot-env),6m(kernel),-(fs)"
-CONFIG_CMD_UBI=y
-CONFIG_OF_CONTROL=y
-CONFIG_DEFAULT_DEVICE_TREE="logicpd-torpedo-37xx-devkit"
-# CONFIG_ENV_IS_IN_FAT is not set
-CONFIG_ENV_IS_IN_NAND=y
-CONFIG_SPL_DM=y
-CONFIG_USB_FUNCTION_FASTBOOT=y
-CONFIG_FASTBOOT_BUF_ADDR=0x82000000
-CONFIG_DM_I2C=y
-CONFIG_DM_MMC=y
-CONFIG_MMC_OMAP_HS=y
-CONFIG_MMC_OMAP36XX_PINS=y
-CONFIG_NAND=y
-CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
-CONFIG_SYS_NAND_U_BOOT_LOCATIONS=y
-CONFIG_SYS_NAND_U_BOOT_OFFS=0x80000
-CONFIG_SPL_NAND_SIMPLE=y
-CONFIG_SMC911X=y
-CONFIG_SMC911X_BASE=0x08000000
-CONFIG_SMC911X_32_BIT=y
-CONFIG_PINCTRL=y
-CONFIG_PINCTRL_SINGLE=y
-CONFIG_DM_PMIC=y
-# CONFIG_SPL_PMIC_CHILDREN is not set
-CONFIG_DM_REGULATOR=y
-CONFIG_DM_REGULATOR_FIXED=y
-CONFIG_DM_REGULATOR_GPIO=y
-CONFIG_SPECIFY_CONSOLE_INDEX=y
-CONFIG_SPI=y
-CONFIG_DM_SPI=y
-CONFIG_OMAP3_SPI=y
-CONFIG_USB=y
-CONFIG_USB_EHCI_HCD=y
-CONFIG_USB_MUSB_GADGET=y
-CONFIG_USB_MUSB_OMAP2PLUS=y
-CONFIG_TWL4030_USB=y
-CONFIG_USB_GADGET=y
-CONFIG_USB_GADGET_MANUFACTURER="TI"
-CONFIG_USB_GADGET_VENDOR_NUM=0x0451
-CONFIG_USB_GADGET_PRODUCT_NUM=0xd022
-CONFIG_USB_ETHER=y
-CONFIG_BCH=y
-# CONFIG_SPL_OF_LIBFDT is not set

configs/omap3_logic_somlv_defconfig deleted +0 -78

deleted file mode 100644
index 396543e56bc..00000000000
@@ -1,78 +0,0 @@
-CONFIG_ARM=y
-CONFIG_ARCH_OMAP2PLUS=y
-CONFIG_SYS_TEXT_BASE=0x80100000
-CONFIG_TI_COMMON_CMD_OPTIONS=y
-# CONFIG_SPL_GPIO_SUPPORT is not set
-CONFIG_SYS_MALLOC_F_LEN=0x2000
-CONFIG_TARGET_OMAP3_LOGIC=y
-# CONFIG_SPL_OMAP3_ID_NAND is not set
-CONFIG_SPL=y
-CONFIG_DISTRO_DEFAULTS=y
-CONFIG_NR_DRAM_BANKS=2
-# CONFIG_USE_BOOTCOMMAND is not set
-CONFIG_SYS_CONSOLE_INFO_QUIET=y
-CONFIG_VERSION_VARIABLE=y
-CONFIG_SPL_SYS_MALLOC_SIMPLE=y
-CONFIG_SPL_MTD_SUPPORT=y
-CONFIG_SPL_OS_BOOT=y
-CONFIG_SYS_PROMPT="OMAP Logic # "
-# CONFIG_CMD_IMI is not set
-CONFIG_CMD_SPL=y
-CONFIG_CMD_SPL_NAND_OFS=0x240000
-CONFIG_CMD_SPL_WRITE_SIZE=0x20000
-# CONFIG_CMD_EEPROM is not set
-CONFIG_CMD_NAND=y
-CONFIG_CMD_NAND_LOCK_UNLOCK=y
-CONFIG_CMD_CACHE=y
-CONFIG_CMD_MTDPARTS=y
-CONFIG_MTDIDS_DEFAULT="nand0=omap2-nand.0,nor0=physmap-flash.0"
-CONFIG_MTDPARTS_DEFAULT="mtdparts=omap2-nand.0:512k(MLO),1792k(u-boot),128k(spl-os),128k(u-boot-env),6m(kernel),-(fs);physmap-flash.0:-(nor)"
-CONFIG_CMD_UBI=y
-CONFIG_OF_CONTROL=y
-CONFIG_DEFAULT_DEVICE_TREE="logicpd-som-lv-37xx-devkit"
-# CONFIG_ENV_IS_IN_FAT is not set
-CONFIG_ENV_IS_IN_NAND=y
-CONFIG_SPL_DM=y
-CONFIG_USB_FUNCTION_FASTBOOT=y
-CONFIG_FASTBOOT_BUF_ADDR=0x82000000
-CONFIG_DM_I2C=y
-CONFIG_DM_MMC=y
-CONFIG_MMC_OMAP_HS=y
-CONFIG_MMC_OMAP36XX_PINS=y
-CONFIG_MTD_NOR_FLASH=y
-CONFIG_FLASH_CFI_DRIVER=y
-CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
-CONFIG_FLASH_CFI_MTD=y
-CONFIG_SYS_FLASH_PROTECTION=y
-CONFIG_SYS_FLASH_CFI=y
-CONFIG_NAND=y
-CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
-CONFIG_SYS_NAND_U_BOOT_LOCATIONS=y
-CONFIG_SYS_NAND_U_BOOT_OFFS=0x80000
-CONFIG_SPL_NAND_SIMPLE=y
-CONFIG_SMC911X=y
-CONFIG_SMC911X_BASE=0x08000000
-CONFIG_SMC911X_32_BIT=y
-CONFIG_PINCTRL=y
-CONFIG_PINCTRL_SINGLE=y
-CONFIG_DM_PMIC=y
-# CONFIG_SPL_PMIC_CHILDREN is not set
-CONFIG_DM_REGULATOR=y
-CONFIG_DM_REGULATOR_FIXED=y
-CONFIG_DM_REGULATOR_GPIO=y
-CONFIG_SPECIFY_CONSOLE_INDEX=y
-CONFIG_SPI=y
-CONFIG_DM_SPI=y
-CONFIG_OMAP3_SPI=y
-CONFIG_USB=y
-CONFIG_USB_EHCI_HCD=y
-CONFIG_USB_MUSB_GADGET=y
-CONFIG_USB_MUSB_OMAP2PLUS=y
-CONFIG_TWL4030_USB=y
-CONFIG_USB_GADGET=y
-CONFIG_USB_GADGET_MANUFACTURER="TI"
-CONFIG_USB_GADGET_VENDOR_NUM=0x0451
-CONFIG_USB_GADGET_PRODUCT_NUM=0xd022
-CONFIG_USB_ETHER=y
-CONFIG_BCH=y
-# CONFIG_SPL_OF_LIBFDT is not set

include/configs/omap3_logic.h deleted +0 -211

deleted file mode 100644
index fe557f91caa..00000000000
@@ -1,210 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * (C) Copyright 2011 Logic Product Development <www.logicpd.com>
- *     Peter Barada <[email protected]>
- *
- * Configuration settings for the Logic OMAP35x/DM37x SOM LV/Torpedo
- * reference boards.
- */
-
-#ifndef __CONFIG_H
-#define __CONFIG_H
-
-/* High Level Configuration Options */
-
-#include <configs/ti_omap3_common.h>
-
-/*
- * We are only ever GP parts and will utilize all of the "downloaded image"
- * area in SRAM which starts at 0x40200000 and ends at 0x4020FFFF (64KB) in
- * order to allow for BCH8 to fit in.
- */
-#undef CONFIG_SPL_TEXT_BASE
-#define CONFIG_SPL_TEXT_BASE           0x40200000
-
-#define CONFIG_CMDLINE_TAG             /* enable passing of ATAGs */
-#define CONFIG_SETUP_MEMORY_TAGS
-#define CONFIG_INITRD_TAG
-#define CONFIG_REVISION_TAG
-
-/* Hardware drivers */
-
-/* I2C */
-#define CONFIG_SYS_I2C_EEPROM_ADDR     0x50    /* EEPROM AT24C64      */
-
-/* Board NAND Info. */
-#ifdef CONFIG_NAND
-#define CONFIG_SYS_MAX_NAND_DEVICE     1         /* Max number of */
-                                                 /* NAND devices */
-#define CONFIG_SYS_NAND_5_ADDR_CYCLE
-#define CONFIG_SYS_NAND_PAGE_COUNT     64
-#define CONFIG_SYS_NAND_PAGE_SIZE      2048
-#define CONFIG_SYS_NAND_OOBSIZE                64
-#define CONFIG_SYS_NAND_BLOCK_SIZE     (128 * 1024)
-#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, 16, 17, 18, 19, 20, 21, 22, \
-                                        23, 24, 25, 26, 27, 28, 30, 31, 32, \
-                                        33, 34, 35, 36, 37, 38, 39, 40, 41, \
-                                        42, 44, 45, 46, 47, 48, 49, 50, 51, \
-                                        52, 53, 54, 55, 56}
-
-#define CONFIG_SYS_NAND_ECCSIZE                512
-#define CONFIG_SYS_NAND_ECCBYTES       13
-#define CONFIG_NAND_OMAP_ECCSCHEME     OMAP_ECC_BCH8_CODE_HW_DETECTION_SW
-#define CONFIG_SYS_NAND_MAX_OOBFREE    2
-#define CONFIG_SYS_NAND_MAX_ECCPOS     56
-#endif
-
-/* Environment information */
-
-#define CONFIG_PREBOOT \
-       "setenv preboot;"                                               \
-       "saveenv;"
-
-#define CONFIG_EXTRA_ENV_SETTINGS \
-       DEFAULT_LINUX_BOOT_ENV \
-       "mtdids=" CONFIG_MTDIDS_DEFAULT "\0"    \
-       "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \
-       "mmcdev=0\0" \
-       "mmcroot=/dev/mmcblk0p2 rw\0" \
-       "mmcrootfstype=ext4 rootwait\0" \
-       "nandroot=ubi0:rootfs rw ubi.mtd=fs noinitrd\0" \
-       "nandrootfstype=ubifs rootwait\0" \
-       "autoboot=mmc dev ${mmcdev}; if mmc rescan; then " \
-                       "if run loadbootscript; then " \
-                               "run bootscript; " \
-                       "else " \
-                               "run defaultboot;" \
-                       "fi; " \
-               "else run defaultboot; fi\0" \
-       "defaultboot=run mmcramboot\0" \
-       "consoledevice=ttyS0\0" \
-       "setconsole=setenv console ${consoledevice},${baudrate}n8\0" \
-       "dump_bootargs=echo 'Bootargs: '; echo $bootargs\0" \
-       "rotation=0\0" \
-       "vrfb_arg=if itest ${rotation} -ne 0; then " \
-               "setenv bootargs ${bootargs} omapfb.vrfb=y " \
-               "omapfb.rotate=${rotation}; " \
-               "fi\0" \
-       "optargs=ignore_loglevel early_printk no_console_suspend\0" \
-       "common_bootargs=run setconsole; setenv bootargs " \
-               "${bootargs} "\
-               "console=${console} " \
-               "${mtdparts} "\
-               "${optargs}; " \
-               "run vrfb_arg\0" \
-       "loadbootscript=load mmc ${mmcdev} ${loadaddr} boot.scr\0" \
-       "bootscript=echo 'Running bootscript from mmc ...'; " \
-               "source ${loadaddr}\0" \
-       "loadimage=mmc rescan; " \
-               "load mmc ${mmcdev} ${loadaddr} ${bootfile}\0" \
-       "ramdisksize=64000\0" \
-       "ramdiskimage=rootfs.ext2.gz.uboot\0" \
-       "loadramdisk=mmc rescan; " \
-               "load mmc ${mmcdev} ${rdaddr} ${ramdiskimage}\0" \
-       "ramargs=setenv bootargs "\
-               "root=/dev/ram rw ramdisk_size=${ramdisksize}\0" \
-       "mmcargs=setenv bootargs "\
-               "root=${mmcroot} rootfstype=${mmcrootfstype}\0" \
-       "nandargs=setenv bootargs "\
-               "root=${nandroot} " \
-               "rootfstype=${nandrootfstype}\0" \
-       "nfsargs=setenv serverip ${tftpserver}; " \
-               "setenv bootargs root=/dev/nfs " \
-               "nfsroot=${nfsrootpath} " \
-               "ip=${ipaddr}:${tftpserver}:${gatewayip}:${netmask}::eth0:off\0" \
-       "nfsrootpath=/opt/nfs-exports/omap\0" \
-       "autoload=no\0" \
-       "fdtimage=" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0" \
-       "loadfdt=mmc rescan; " \
-               "load mmc ${mmcdev} ${fdtaddr} ${fdtimage}\0" \
-       "mmcbootcommon=echo Booting with DT from mmc${mmcdev} ...; " \
-               "run mmcargs; " \
-               "run common_bootargs; " \
-               "run dump_bootargs; " \
-               "run loadimage; " \
-               "run loadfdt;\0 " \
-       "mmcbootz=setenv bootfile zImage; " \
-               "run mmcbootcommon; "\
-               "bootz ${loadaddr} - ${fdtaddr}\0" \
-       "mmcboot=setenv bootfile uImage; "\
-               "run mmcbootcommon; "\
-               "bootm ${loadaddr} - ${fdtaddr}\0" \
-       "mmcrambootcommon=echo 'Booting kernel from MMC w/ramdisk...'; " \
-               "run ramargs; " \
-               "run common_bootargs; " \
-               "run dump_bootargs; " \
-               "run loadimage; " \
-               "run loadfdt; " \
-               "run loadramdisk\0" \
-       "mmcramboot=setenv bootfile uImage; " \
-               "run mmcrambootcommon; " \
-               "bootm ${loadaddr} ${rdaddr} ${fdtaddr}\0" \
-       "mmcrambootz=setenv bootfile zImage; " \
-               "run mmcrambootcommon; " \
-               "bootz ${loadaddr} ${rdaddr} ${fdtaddr}\0" \
-       "tftpboot=echo 'Booting kernel/ramdisk rootfs from tftp...'; " \
-               "run ramargs; " \
-               "run common_bootargs; " \
-               "run dump_bootargs; " \
-               "tftpboot ${loadaddr} ${zimage}; " \
-               "tftpboot ${rdaddr} ${ramdiskimage}; " \
-               "bootm ${loadaddr} ${rdaddr}\0" \
-       "tftpbootz=echo 'Booting kernel NFS rootfs...'; " \
-               "dhcp;" \
-               "run nfsargs;" \
-               "run common_bootargs;" \
-               "run dump_bootargs;" \
-               "tftpboot $loadaddr zImage;" \
-               "bootz $loadaddr\0" \
-       "nandbootcommon=echo 'Booting kernel from NAND...';" \
-               "run nandargs;" \
-               "run common_bootargs;" \
-               "run dump_bootargs;" \
-               "nand read ${loadaddr} kernel;" \
-               "nand read ${fdtaddr} spl-os;\0" \
-       "nandbootz=run nandbootcommon; "\
-               "bootz ${loadaddr} - ${fdtaddr}\0"\
-       "nandboot=run nandbootcommon; "\
-               "bootm ${loadaddr} - ${fdtaddr}\0"\
-
-#define CONFIG_BOOTCOMMAND \
-       "run autoboot"
-
-/* Miscellaneous configurable options */
-
-/* memtest works on */
-#define CONFIG_SYS_MEMTEST_START       (OMAP34XX_SDRC_CS0)
-#define CONFIG_SYS_MEMTEST_END         (OMAP34XX_SDRC_CS0 + \
-                                       0x01F00000) /* 31MB */
-
-/* FLASH and environment organization */
-
-/* **** PISMO SUPPORT *** */
-#if defined(CONFIG_CMD_NAND)
-#define CONFIG_SYS_FLASH_BASE          0x10000000
-#endif
-
-#define CONFIG_SYS_MAX_FLASH_SECT      256
-#define CONFIG_SYS_MAX_FLASH_BANKS     1
-#define CONFIG_SYS_FLASH_CFI_WIDTH     FLASH_CFI_16BIT
-#define CONFIG_SYS_FLASH_SIZE          0x4000000
-
-/* Monitor at start of flash */
-#define CONFIG_SYS_MONITOR_BASE                CONFIG_SYS_FLASH_BASE
-
-#define CONFIG_ENV_SIZE                        (128 << 10)     /* 128 KiB */
-
-#define CONFIG_SYS_ENV_SECT_SIZE       (128 << 10)     /* 128 KiB */
-#define CONFIG_ENV_OFFSET              0x260000
-#define CONFIG_ENV_ADDR                        0x260000
-
-/* Defines for SPL */
-
-/* NAND: SPL falcon mode configs */
-#ifdef CONFIG_SPL_OS_BOOT
-#define CONFIG_SYS_NAND_SPL_KERNEL_OFFS        0x280000
-#endif
-
-#endif /* __CONFIG_H */
--

2.19.1.1215.g8438c0b245-goog

Quoted 3 lines · Simon Glass

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

NAK! This board does support BLK. I think your algorithm is looking for CONFIG_DM_BLK when it should be looking for CONFIG_BLK which depends on DM.

make omap3_logic_somlv_defconfig
cat .config | grep BLK

CONFIG_BLK=y
CONFIG_SPL_BLK=y

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

Hi Simon, All,

Quoted 2 lines · Simon Glass

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

I just got my hands on chiliboard to start using device-model drivers. Unfortunately this board does not boot already on master branch. git bisect returned d0851c8937067ad396f2bdafc46d0326bf3317db ("blk: Call part_init() in the post_probe() method") as the first bad commit. It would not be a big problem if we would switch after 1-2 weeks anyway, but I am not sure that will happen based on the discussions. Anyway, it is better you know about that problem. Below you can find logs from boot process.

After bad commit:

U-Boot SPL 2018.11 (Nov 21 2018 - 13:35:44 +0100) Trying to boot from MMC1

U-Boot 2018.11 (Nov 21 2018 - 13:35:44 +0100)

CPU : AM335X-GP rev 2.1

  I2C:   ready
  DRAM:  256 MiB
  NAND:  256 MiB
  MMC:   OMAP SD/MMC: 0, OMAP SD/MMC: 1

Loading Environment from MMC... *** Warning - bad CRC, using default environment

<ethaddr> not set. Validating first E-fuse MAC
Net: cpsw
Hit any key to stop autoboot: 0
switch to partitions #0, OK
mmc0 is current device
SD/MMC found on device 0
** No partition table - mmc 0 **
** No partition table - mmc 0 **
Booting from nand ...

Before bad commit:

U-Boot SPL 2018.11 (Nov 21 2018 - 13:36:26 +0100) Trying to boot from MMC1

U-Boot 2018.11 (Nov 21 2018 - 13:36:26 +0100)

CPU : AM335X-GP rev 2.1

  I2C:   ready
  DRAM:  256 MiB
  NAND:  256 MiB
  MMC:   OMAP SD/MMC: 0, OMAP SD/MMC: 1

Loading Environment from MMC... *** Warning - bad CRC, using default environment

<ethaddr> not set. Validating first E-fuse MAC
Net: cpsw
Hit any key to stop autoboot: 0
switch to partitions #0, OK
mmc0 is current device
SD/MMC found on device 0
5892272 bytes read in 370 ms (15.2 MiB/s) 32494 bytes read in 4 ms (7.7 MiB/s)
## Flattened Device Tree blob at 87800000
Booting using the fdt blob at 0x87800000 Loading Device Tree to 8df48000, end 8df52eed ... OK

Starting kernel ...

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

Signed-off-by Simon Glass <[email protected]>

---

 arch/arm/Kconfig                |   1 -
 board/vscom/baltos/Kconfig      |  15 -
 board/vscom/baltos/MAINTAINERS  |   6 -
 board/vscom/baltos/Makefile     |  11 -
 board/vscom/baltos/README       |   1 -
 board/vscom/baltos/board.c      | 493 --------------------------------
 board/vscom/baltos/board.h      |  34 ---
 board/vscom/baltos/mux.c        | 125 --------
 board/vscom/baltos/u-boot.lds   | 128 ---------
 configs/am335x_baltos_defconfig |  65 -----
 include/configs/baltos.h        | 276 ------------------
 11 files changed, 1155 deletions(-)
 delete mode 100644 board/vscom/baltos/Kconfig
 delete mode 100644 board/vscom/baltos/MAINTAINERS
 delete mode 100644 board/vscom/baltos/Makefile
 delete mode 100644 board/vscom/baltos/README
 delete mode 100644 board/vscom/baltos/board.c
 delete mode 100644 board/vscom/baltos/board.h
 delete mode 100644 board/vscom/baltos/mux.c
 delete mode 100644 board/vscom/baltos/u-boot.lds
 delete mode 100644 configs/am335x_baltos_defconfig
 delete mode 100644 include/configs/baltos.h

arch/arm/Kconfig +0 -1

index b1eeb39d919..6cadd96378b 100644
@@ -1528,7 +1528,6 @@ source "board/spear/x600/Kconfig"
 source "board/st/stv0991/Kconfig"
 source "board/tcl/sl50/Kconfig"
 source "board/ucRobotics/bubblegum_96/Kconfig"
-source "board/vscom/baltos/Kconfig"
 source "board/woodburn/Kconfig"
 source "board/xilinx/Kconfig"
 source "board/xilinx/zynq/Kconfig"

board/vscom/baltos/Kconfig deleted +0 -15

deleted file mode 100644
index b721ed19d80..00000000000
@@ -1,15 +0,0 @@
-if TARGET_AM335X_BALTOS
-
-config SYS_BOARD
-       default "baltos"
-
-config SYS_VENDOR
-       default "vscom"
-
-config SYS_SOC
-       default "am33xx"
-
-config SYS_CONFIG_NAME
-       default "baltos"
-
-endif

board/vscom/baltos/MAINTAINERS deleted +0 -6

deleted file mode 100644
index e82acfed161..00000000000
@@ -1,6 +0,0 @@
-BALTOS BOARD
-M:     Yegor Yefremov <[email protected]>
-S:     Maintained
-F:     board/vscom/baltos/
-F:     include/configs/baltos.h
-F:     configs/am335x_baltos_defconfig

board/vscom/baltos/Makefile deleted +0 -11

deleted file mode 100644
index c34b9b1dd8a..00000000000
@@ -1,11 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0+
-#
-# Makefile
-#
-# Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/
-
-ifeq ($(CONFIG_SKIP_LOWLEVEL_INIT),)
-obj-y  := mux.o
-endif
-
-obj-y  += board.o

board/vscom/baltos/README deleted +0 -1

deleted file mode 100644
index f744ace9972..00000000000
@@ -1 +0,0 @@
-BSP for VScom OnRISC Balios family devices, like Balios iR 5221.

board/vscom/baltos/board.c deleted +0 -493

deleted file mode 100644
index df0a2d2b7a6..00000000000
@@ -1,493 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * board.c
- *
- * Board functions for TI AM335X based boards
- *
- * Copyright (C) 2011, Texas Instruments, Incorporated - http://www.ti.com/
- */
-
-#include <common.h>
-#include <errno.h>
-#include <linux/libfdt.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/arch/mux.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 <environment.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
-#define DIP_S1                 44
-#define MPCIE_SW               100
-
-static struct ctrl_dev *cdev = (struct ctrl_dev *)CTRL_DEVICE_BASE;
-
-static int baltos_set_console(void)
-{
-       int val, i, dips = 0;
-       char buf[7];
-
-       for (i = 0; i < 4; i++) {
-               sprintf(buf, "dip_s%d", i + 1);
-
-               if (gpio_request(DIP_S1 + i, buf)) {
-                       printf("failed to export GPIO %d\n", DIP_S1 + i);
-                       return 0;
-               }
-
-               if (gpio_direction_input(DIP_S1 + i)) {
-                       printf("failed to set GPIO %d direction\n", DIP_S1 + i);
-                       return 0;
-               }
-
-               val = gpio_get_value(DIP_S1 + i);
-               dips |= val << i;
-       }
-
-       printf("DIPs: 0x%1x\n", (~dips) & 0xf);
-
-       if ((dips & 0xf) == 0xe)
-               env_set("console", "ttyUSB0,115200n8");
-
-       return 0;
-}
-
-static int read_eeprom(BSP_VS_HWPARAM *header)
-{
-       i2c_set_bus_num(1);
-
-       /* Check if baseboard eeprom is available */
-       if (i2c_probe(CONFIG_SYS_I2C_EEPROM_ADDR)) {
-               puts("Could not probe the EEPROM; something fundamentally "
-                       "wrong on the I2C bus.\n");
-               return -ENODEV;
-       }
-
-       /* read the eeprom using i2c */
-       if (i2c_read(CONFIG_SYS_I2C_EEPROM_ADDR, 0, 1, (uchar *)header,
-                    sizeof(BSP_VS_HWPARAM))) {
-               puts("Could not read the EEPROM; something fundamentally"
-                       " wrong on the I2C bus.\n");
-               return -EIO;
-       }
-
-       if (header->Magic != 0xDEADBEEF) {
-
-               printf("Incorrect magic number (0x%x) in EEPROM\n",
-                               header->Magic);
-
-               /* fill default values */
-               header->SystemId = 211;
-               header->MAC1[0] = 0x00;
-               header->MAC1[1] = 0x00;
-               header->MAC1[2] = 0x00;
-               header->MAC1[3] = 0x00;
-               header->MAC1[4] = 0x00;
-               header->MAC1[5] = 0x01;
-
-               header->MAC2[0] = 0x00;
-               header->MAC2[1] = 0x00;
-               header->MAC2[2] = 0x00;
-               header->MAC2[3] = 0x00;
-               header->MAC2[4] = 0x00;
-               header->MAC2[5] = 0x02;
-
-               header->MAC3[0] = 0x00;
-               header->MAC3[1] = 0x00;
-               header->MAC3[2] = 0x00;
-               header->MAC3[3] = 0x00;
-               header->MAC3[4] = 0x00;
-               header->MAC3[5] = 0x03;
-       }
-
-       return 0;
-}
-
-#if defined(CONFIG_SPL_BUILD) || defined(CONFIG_NOR_BOOT)
-
-static const struct ddr_data ddr3_baltos_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_baltos_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_baltos_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' */
-       return (serial_tstc() && serial_getc() == 'c');
-}
-#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_baltos = {
-               400, OSC-1, 1, -1, -1, -1, -1};
-
-void am33xx_spl_board_init(void)
-{
-       int mpu_vdd;
-       int sil_rev;
-
-       /* Get the frequency */
-       dpll_mpu_opp100.m = am335x_get_efuse_mpu_max_freq(cdev);
-
-       /*
-        * The GP EVM, IDK and EVM SK use a TPS65910 PMIC.  For all
-        * MPU frequencies we support we use a CORE voltage of
-        * 1.1375V.  For MPU voltage we need to switch based on
-        * the frequency we are running at.
-        */
-       i2c_set_bus_num(1);
-
-       printf("I2C speed: %d Hz\n", CONFIG_SYS_OMAP24_I2C_SPEED);
-
-       if (i2c_probe(TPS65910_CTRL_I2C_ADDR)) {
-               puts("i2c: cannot access TPS65910\n");
-               return;
-       }
-
-       /*
-        * Depending on MPU clock and PG we will need a different
-        * VDD to drive at that speed.
-        */
-       sil_rev = readl(&cdev->deviceid) >> 28;
-       mpu_vdd = am335x_get_tps65910_mpu_vdd(sil_rev,
-                                             dpll_mpu_opp100.m);
-
-       /* Tell the TPS65910 to use i2c */
-       tps65910_set_i2c_control();
-
-       /* First update MPU voltage. */
-       if (tps65910_voltage_update(MPU, mpu_vdd))
-               return;
-
-       /* Second, update the CORE voltage. */
-       if (tps65910_voltage_update(CORE, TPS65910_OP_REG_SEL_1_1_3))
-               return;
-
-       /* Set CORE Frequencies to OPP100 */
-       do_setup_dpll(&dpll_core_regs, &dpll_core_opp100);
-
-       /* Set MPU Frequency to what we detected now that voltages are set */
-       do_setup_dpll(&dpll_mpu_regs, &dpll_mpu_opp100);
-
-       writel(0x000010ff, PRM_DEVICE_INST + 4);
-}
-
-const struct dpll_params *get_dpll_ddr_params(void)
-{
-       enable_i2c1_pin_mux();
-       i2c_set_bus_num(1);
-
-       return &dpll_ddr_baltos;
-}
-
-void set_uart_mux_conf(void)
-{
-       enable_uart0_pin_mux();
-}
-
-void set_mux_conf_regs(void)
-{
-       enable_board_pin_mux();
-}
-
-const struct ctrl_ioregs ioregs_baltos = {
-       .cm0ioctl               = MT41K256M16HA125E_IOCTRL_VALUE,
-       .cm1ioctl               = MT41K256M16HA125E_IOCTRL_VALUE,
-       .cm2ioctl               = MT41K256M16HA125E_IOCTRL_VALUE,
-       .dt0ioctl               = MT41K256M16HA125E_IOCTRL_VALUE,
-       .dt1ioctl               = MT41K256M16HA125E_IOCTRL_VALUE,
-};
-
-void sdram_init(void)
-{
-       gpio_request(GPIO_DDR_VTT_EN, "ddr_vtt_en");
-       gpio_direction_output(GPIO_DDR_VTT_EN, 1);
-
-       config_ddr(400, &ioregs_baltos,
-                  &ddr3_baltos_data,
-                  &ddr3_baltos_cmd_ctrl_data,
-                  &ddr3_baltos_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_NAND)
-       gpmc_init();
-#endif
-       return 0;
-}
-
-int ft_board_setup(void *blob, bd_t *bd)
-{
-       int node, ret;
-       unsigned char mac_addr[6];
-       BSP_VS_HWPARAM header;
-
-       /* get production data */
-       if (read_eeprom(&header))
-               return 0;
-
-       /* setup MAC1 */
-       mac_addr[0] = header.MAC1[0];
-       mac_addr[1] = header.MAC1[1];
-       mac_addr[2] = header.MAC1[2];
-       mac_addr[3] = header.MAC1[3];
-       mac_addr[4] = header.MAC1[4];
-       mac_addr[5] = header.MAC1[5];
-
-
-       node = fdt_path_offset(blob, "/ocp/ethernet/slave at 4a100200");
-       if (node < 0) {
-               printf("no /soc/fman/ethernet path offset\n");
-               return -ENODEV;
-       }
-
-       ret = fdt_setprop(blob, node, "mac-address", &mac_addr, 6);
-       if (ret) {
-               printf("error setting local-mac-address property\n");
-               return -ENODEV;
-       }
-
-       /* setup MAC2 */
-       mac_addr[0] = header.MAC2[0];
-       mac_addr[1] = header.MAC2[1];
-       mac_addr[2] = header.MAC2[2];
-       mac_addr[3] = header.MAC2[3];
-       mac_addr[4] = header.MAC2[4];
-       mac_addr[5] = header.MAC2[5];
-
-       node = fdt_path_offset(blob, "/ocp/ethernet/slave at 4a100300");
-       if (node < 0) {
-               printf("no /soc/fman/ethernet path offset\n");
-               return -ENODEV;
-       }
-
-       ret = fdt_setprop(blob, node, "mac-address", &mac_addr, 6);
-       if (ret) {
-               printf("error setting local-mac-address property\n");
-               return -ENODEV;
-       }
-
-       printf("\nFDT was successfully setup\n");
-
-       return 0;
-}
-
-static struct module_pin_mux pcie_sw_pin_mux[] = {
-       {OFFSET(mii1_rxdv), (MODE(7) | PULLUDEN )},     /* GPIO3_4 */
-       {-1},
-};
-
-static struct module_pin_mux dip_pin_mux[] = {
-       {OFFSET(gpmc_ad12), (MODE(7) | RXACTIVE )},     /* GPIO1_12 */
-       {OFFSET(gpmc_ad13), (MODE(7)  | RXACTIVE )},    /* GPIO1_13 */
-       {OFFSET(gpmc_ad14), (MODE(7)  | RXACTIVE )},    /* GPIO1_14 */
-       {OFFSET(gpmc_ad15), (MODE(7)  | RXACTIVE )},    /* GPIO1_15 */
-       {-1},
-};
-
-#ifdef CONFIG_BOARD_LATE_INIT
-int board_late_init(void)
-{
-#ifdef CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
-       BSP_VS_HWPARAM header;
-       char model[4];
-
-       /* get production data */
-       if (read_eeprom(&header)) {
-               strcpy(model, "211");
-       } else {
-               sprintf(model, "%d", header.SystemId);
-               if (header.SystemId == 215) {
-                       configure_module_pin_mux(dip_pin_mux);
-                       baltos_set_console();
-               }
-       }
-
-       /* turn power for the mPCIe slot */
-       configure_module_pin_mux(pcie_sw_pin_mux);
-       if (gpio_request(MPCIE_SW, "mpcie_sw")) {
-               printf("failed to export GPIO %d\n", MPCIE_SW);
-               return -ENODEV;
-       }
-       if (gpio_direction_output(MPCIE_SW, 1)) {
-               printf("failed to set GPIO %d direction\n", MPCIE_SW);
-               return -ENODEV;
-       }
-
-       env_set("board_name", model);
-#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       = 7,
-       },
-};
-
-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                 = 2,
-       .slave_data             = cpsw_slaves,
-       .active_slave           = 1,
-       .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
-
-#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 rv, n = 0;
-       uint8_t mac_addr[6];
-       uint32_t mac_hi, mac_lo;
-
-       /*
-        * Note here that we're using CPSW1 since that has a 1Gbit PHY while
-        * CSPW0 has a 100Mbit PHY.
-        *
-        * On product, CPSW1 maps to port labeled WAN.
-        */
-
-       /* try reading mac address from efuse */
-       mac_lo = readl(&cdev->macid1l);
-       mac_hi = readl(&cdev->macid1h);
-       mac_addr[0] = mac_hi & 0xFF;
-       mac_addr[1] = (mac_hi & 0xFF00) >> 8;
-       mac_addr[2] = (mac_hi & 0xFF0000) >> 16;
-       mac_addr[3] = (mac_hi & 0xFF000000) >> 24;
-       mac_addr[4] = mac_lo & 0xFF;
-       mac_addr[5] = (mac_lo & 0xFF00) >> 8;
-
-#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
-       writel((GMII1_SEL_RMII | GMII2_SEL_RGMII | RGMII2_IDMODE), &cdev->miisel);
-       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
-
-       /*
-        *
-        * CPSW RGMII Internal Delay Mode is not supported in all PVT
-        * operating points.  So we must set the TX clock delay feature
-        * in the AR8051 PHY.  Since we only support a single ethernet
-        * device in U-Boot, we only do this for the first instance.
-        */
-#define AR8051_PHY_DEBUG_ADDR_REG      0x1d
-#define AR8051_PHY_DEBUG_DATA_REG      0x1e
-#define AR8051_DEBUG_RGMII_CLK_DLY_REG 0x5
-#define AR8051_RGMII_TX_CLK_DLY                0x100
-       const char *devname;
-       devname = miiphy_get_current_dev();
-
-       miiphy_write(devname, 0x7, AR8051_PHY_DEBUG_ADDR_REG,
-                       AR8051_DEBUG_RGMII_CLK_DLY_REG);
-       miiphy_write(devname, 0x7, AR8051_PHY_DEBUG_DATA_REG,
-                       AR8051_RGMII_TX_CLK_DLY);
-#endif
-       return n;
-}
-#endif

board/vscom/baltos/board.h deleted +0 -34

deleted file mode 100644
index 630c9bba73b..00000000000
@@ -1,34 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * board.h
- *
- * TI AM335x boards information header
- *
- * Copyright (C) 2011, Texas Instruments, Incorporated - http://www.ti.com/
- */
-
-#ifndef _BOARD_H_
-#define _BOARD_H_
-
-typedef struct _BSP_VS_HWPARAM    // v1.0
-{
-       uint32_t Magic;
-       uint32_t HwRev;
-       uint32_t SerialNumber;
-       char PrdDate[11];    // as a string ie. "01.01.2006"
-       uint16_t SystemId;
-       uint8_t MAC1[6];        // internal EMAC
-       uint8_t MAC2[6];        // SMSC9514
-       uint8_t MAC3[6];        // WL1271 WLAN
-} __attribute__ ((packed)) BSP_VS_HWPARAM;
-
-/*
- * 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_i2c1_pin_mux(void);
-void enable_board_pin_mux(void);
-#endif

board/vscom/baltos/mux.c deleted +0 -125

deleted file mode 100644
index 94410ae35e6..00000000000
@@ -1,125 +0,0 @@
-/*
- * mux.c
- *
- * 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 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(spi0_cs1), (MODE(5) | RXACTIVE | PULLUP_EN)}, /* MMC0_CD */
-       {-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 gpio0_7_pin_mux[] = {
-       {OFFSET(ecap0_in_pwm0_out), (MODE(7) | PULLUDEN)},      /* GPIO0_7 */
-       {-1},
-};
-
-static struct module_pin_mux rmii1_pin_mux[] = {
-       {OFFSET(mii1_crs), MODE(1) | RXACTIVE},                 /* RGMII1_TCTL */
-       {OFFSET(mii1_txen), MODE(1)},                   /* RGMII1_TCTL */
-       {OFFSET(mii1_txd1), MODE(1)},                   /* RGMII1_TCTL */
-       {OFFSET(mii1_txd0), MODE(1)},                   /* RGMII1_TCTL */
-       {OFFSET(mii1_rxd1), MODE(1) | RXACTIVE},                        /* RGMII1_TCTL */
-       {OFFSET(mii1_rxd0), MODE(1) | RXACTIVE},                        /* RGMII1_TCTL */
-       {OFFSET(rmii1_refclk), MODE(0) | RXACTIVE},                     /* RGMII1_TCTL */
-       {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 rgmii2_pin_mux[] = {
-       {OFFSET(gpmc_a0), MODE(2)},                     /* RGMII1_TCTL */
-       {OFFSET(gpmc_a1), MODE(2) | RXACTIVE},  /* RGMII1_RCTL */
-       {OFFSET(gpmc_a2), MODE(2)},                     /* RGMII1_TD3 */
-       {OFFSET(gpmc_a3), MODE(2)},                     /* RGMII1_TD2 */
-       {OFFSET(gpmc_a4), MODE(2)},                     /* RGMII1_TD1 */
-       {OFFSET(gpmc_a5), MODE(2)},                     /* RGMII1_TD0 */
-       {OFFSET(gpmc_a6), MODE(2)},                     /* RGMII1_TCLK */
-       {OFFSET(gpmc_a7), MODE(2) | RXACTIVE},  /* RGMII1_RCLK */
-       {OFFSET(gpmc_a8), MODE(2) | RXACTIVE},  /* RGMII1_RD3 */
-       {OFFSET(gpmc_a9), MODE(2) | RXACTIVE},  /* RGMII1_RD2 */
-       {OFFSET(gpmc_a10), MODE(2) | RXACTIVE}, /* RGMII1_RD1 */
-       {OFFSET(gpmc_a11), 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 nand_pin_mux[] = {
-       {OFFSET(gpmc_ad0), (MODE(0) | PULLUP_EN | RXACTIVE)},   /* NAND AD0 */
-       {OFFSET(gpmc_ad1), (MODE(0) | PULLUP_EN | RXACTIVE)},   /* NAND AD1 */
-       {OFFSET(gpmc_ad2), (MODE(0) | PULLUP_EN | RXACTIVE)},   /* NAND AD2 */
-       {OFFSET(gpmc_ad3), (MODE(0) | PULLUP_EN | RXACTIVE)},   /* NAND AD3 */
-       {OFFSET(gpmc_ad4), (MODE(0) | PULLUP_EN | RXACTIVE)},   /* NAND AD4 */
-       {OFFSET(gpmc_ad5), (MODE(0) | PULLUP_EN | RXACTIVE)},   /* NAND AD5 */
-       {OFFSET(gpmc_ad6), (MODE(0) | PULLUP_EN | RXACTIVE)},   /* NAND AD6 */
-       {OFFSET(gpmc_ad7), (MODE(0) | PULLUP_EN | RXACTIVE)},   /* NAND AD7 */
-       {OFFSET(gpmc_wait0), (MODE(0) | RXACTIVE | PULLUP_EN)}, /* NAND WAIT */
-       {OFFSET(gpmc_wpn), (MODE(7) | PULLUP_EN | RXACTIVE)},   /* NAND_WPN */
-       {OFFSET(gpmc_csn0), (MODE(0) | PULLUDEN)},      /* NAND_CS0 */
-       {OFFSET(gpmc_advn_ale), (MODE(0) | PULLUDEN)}, /* NAND_ADV_ALE */
-       {OFFSET(gpmc_oen_ren), (MODE(0) | PULLUDEN)},   /* NAND_OE */
-       {OFFSET(gpmc_wen), (MODE(0) | PULLUDEN)},       /* NAND_WEN */
-       {OFFSET(gpmc_be0n_cle), (MODE(0) | PULLUDEN)},  /* NAND_BE_CLE */
-       {-1},
-};
-
-void enable_uart0_pin_mux(void)
-{
-       configure_module_pin_mux(uart0_pin_mux);
-}
-
-void enable_i2c1_pin_mux(void)
-{
-       configure_module_pin_mux(i2c1_pin_mux);
-}
-
-void enable_board_pin_mux()
-{
-       configure_module_pin_mux(i2c1_pin_mux);
-       configure_module_pin_mux(gpio0_7_pin_mux);
-       configure_module_pin_mux(rgmii2_pin_mux);
-       configure_module_pin_mux(rmii1_pin_mux);
-       configure_module_pin_mux(mmc0_pin_mux);
-
-#if defined(CONFIG_NAND)
-       configure_module_pin_mux(nand_pin_mux);
-#endif
-}

board/vscom/baltos/u-boot.lds deleted +0 -128

deleted file mode 100644
index 315ba5b99a7..00000000000
@@ -1,128 +0,0 @@
-/*
- * Copyright (c) 2004-2008 Texas Instruments
- *
- * (C) Copyright 2002
- * Gary Jennejohn, DENX Software Engineering, <[email protected]>
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- */
-
-OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm")
-OUTPUT_ARCH(arm)
-ENTRY(_start)
-SECTIONS
-{
-       . = 0x00000000;
-
-       . = ALIGN(4);
-       .text :
-       {
-               *(.__image_copy_start)
-               *(.vectors)
-               CPUDIR/start.o (.text*)
-               board/vscom/baltos/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*) }
-}

configs/am335x_baltos_defconfig deleted +0 -65

deleted file mode 100644
index a61b13b6fc9..00000000000
@@ -1,65 +0,0 @@
-CONFIG_ARM=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_AM335X_BALTOS=y
-CONFIG_SPL_MMC_SUPPORT=y
-CONFIG_SPL_SERIAL_SUPPORT=y
-CONFIG_SPL=y
-CONFIG_SPL_FAT_SUPPORT=y
-CONFIG_SPL_LIBDISK_SUPPORT=y
-CONFIG_DISTRO_DEFAULTS=y
-CONFIG_FIT_VERBOSE=y
-CONFIG_OF_BOARD_SETUP=y
-# CONFIG_USE_BOOTCOMMAND is not set
-CONFIG_SYS_CONSOLE_INFO_QUIET=y
-CONFIG_VERSION_VARIABLE=y
-CONFIG_ARCH_MISC_INIT=y
-CONFIG_SPL_EXT_SUPPORT=y
-CONFIG_SPL_I2C_SUPPORT=y
-CONFIG_SPL_MTD_SUPPORT=y
-CONFIG_SPL_POWER_SUPPORT=y
-CONFIG_SPL_WATCHDOG_SUPPORT=y
-CONFIG_SPL_YMODEM_SUPPORT=y
-CONFIG_CMD_ASKENV=y
-CONFIG_CMD_EEPROM=y
-# CONFIG_CMD_FLASH is not set
-CONFIG_CMD_GPIO=y
-CONFIG_CMD_GPT=y
-CONFIG_CMD_I2C=y
-CONFIG_CMD_MMC=y
-CONFIG_CMD_NAND=y
-CONFIG_CMD_SPI=y
-CONFIG_CMD_USB=y
-# CONFIG_CMD_SETEXPR is not set
-CONFIG_CMD_EXT4_WRITE=y
-CONFIG_CMD_MTDPARTS=y
-CONFIG_MTDIDS_DEFAULT="nand0=omap2-nand.0"
-CONFIG_MTDPARTS_DEFAULT="mtdparts=omap2-nand.0:128k(SPL),128k(SPL.backup1),128k(SPL.backup2),128k(SPL.backup3),1920k(u-boot),-(UBI)"
-CONFIG_CMD_UBI=y
-CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
-CONFIG_BOOTCOUNT_LIMIT=y
-CONFIG_SYS_OMAP24_I2C_SPEED=1000
-CONFIG_MMC_OMAP_HS=y
-CONFIG_NAND=y
-CONFIG_PHY_ADDR_ENABLE=y
-CONFIG_DRIVER_TI_CPSW=y
-CONFIG_MII=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_STORAGE=y
-CONFIG_USB_GADGET=y
-CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
-CONFIG_USB_GADGET_VENDOR_NUM=0x0403
-CONFIG_USB_GADGET_PRODUCT_NUM=0xbd00
-CONFIG_USB_GADGET_DOWNLOAD=y
-CONFIG_USB_ETHER=y
-CONFIG_USBNET_HOST_ADDR="de:ad:be:af:00:00"
-CONFIG_FAT_WRITE=y
-CONFIG_OF_LIBFDT=y

include/configs/baltos.h deleted +0 -277

deleted file mode 100644
index 006b049d09d..00000000000
@@ -1,276 +0,0 @@
-/*
- * am335x_evm.h
- *
- * 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_BALTOS_H
-#define __CONFIG_BALTOS_H
-
-#include <linux/sizes.h>
-#include <configs/ti_am335x_common.h>
-
-#define CONFIG_MACH_TYPE               MACH_TYPE_AM335XEVM
-
-/* Clock Defines */
-#define V_OSCK                         24000000  /* Clock output from T2 */
-#define V_SCLK                         (V_OSCK)
-
-/* Custom script for NOR */
-#define CONFIG_SYS_LDSCRIPT            "board/vscom/baltos/u-boot.lds"
-
-/* Always 128 KiB env size */
-#define CONFIG_ENV_SIZE                        (128 << 10)
-
-/* FIT support */
-#define CONFIG_SYS_BOOTM_LEN         SZ_64M
-
-/* UBI Support */
-
-/* I2C configuration */
-
-#ifdef CONFIG_NAND
-#define CONFIG_SYS_NAND_U_BOOT_OFFS    0x00080000
-#ifdef CONFIG_SPL_OS_BOOT
-#define CONFIG_SYS_NAND_SPL_KERNEL_OFFS 0x00200000 /* kernel offset */
-#endif
-#define NANDARGS \
-       "mtdids=" CONFIG_MTDIDS_DEFAULT "\0" \
-       "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \
-       "nandargs=setenv bootargs console=${console} " \
-               "${optargs} " \
-               "${mtdparts} " \
-               "root=${nandroot} " \
-               "rootfstype=${nandrootfstype}\0" \
-       "nandroot=ubi0:rootfs rw ubi.mtd=5\0" \
-       "nandrootfstype=ubifs rootwait=1\0" \
-       "nandboot=echo Booting from nand ...; " \
-               "run nandargs; " \
-               "setenv loadaddr 0x84000000; " \
-               "ubi part UBI; " \
-               "ubifsmount ubi0:kernel; " \
-               "ubifsload $loadaddr kernel-fit.itb;" \
-               "ubifsumount; " \
-               "bootm ${loadaddr}#conf${board_name}; " \
-               "if test $? -ne 0; then echo Using default FIT config; " \
-               "bootm ${loadaddr}; fi;\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=/boot\0" \
-       "bootfile=zImage\0" \
-       "fdtfile=undefined\0" \
-       "console=ttyO0,115200n8\0" \
-       "partitions=" \
-               "uuid_disk=${uuid_gpt_disk};" \
-               "name=rootfs,start=2MiB,size=-,uuid=${uuid_gpt_rootfs}\0" \
-       "optargs=\0" \
-       "mmcdev=0\0" \
-       "mmcroot=/dev/mmcblk0p2 ro\0" \
-       "usbroot=/dev/sda2 ro\0" \
-       "mmcrootfstype=ext4 rootwait\0" \
-       "usbrootfstype=ext4 rootwait\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} " \
-               "${mtdparts} " \
-               "root=${mmcroot} " \
-               "rootfstype=${mmcrootfstype}\0" \
-       "usbargs=setenv bootargs console=${console} " \
-               "${optargs} " \
-               "${mtdparts} " \
-               "root=${usbroot} " \
-               "rootfstype=${usbrootfstype}\0" \
-       "spiroot=/dev/mtdblock4 rw\0" \
-       "spirootfstype=jffs2\0" \
-       "spisrcaddr=0xe0000\0" \
-       "spiimgsize=0x362000\0" \
-       "spibusno=0\0" \
-       "spiargs=setenv bootargs console=${console} " \
-               "${optargs} " \
-               "root=${spiroot} " \
-               "rootfstype=${spirootfstype}\0" \
-       "netargs=setenv bootargs console=${console} " \
-               "${optargs} " \
-               "root=/dev/nfs " \
-               "nfsroot=${serverip}:${rootpath},${nfsopts} rw " \
-               "ip=dhcp\0" \
-       "bootenv=uEnv.txt\0" \
-       "loadbootenv=load mmc ${mmcdev} ${loadaddr} ${bootenv}\0" \
-       "usbloadbootenv=load usb 0:1 ${loadaddr} ${bootenv}\0" \
-       "importbootenv=echo Importing environment from mmc ...; " \
-               "env import -t $loadaddr $filesize\0" \
-       "usbimportbootenv=echo Importing environment from USB ...; " \
-               "env import -t $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" \
-       "usbloadimage=load usb 0:1 ${loadaddr} kernel-fit.itb\0" \
-       "loadfdt=load mmc ${bootpart} ${fdtaddr} ${bootdir}/${fdtfile}\0" \
-       "usbloados=run usbargs; " \
-               "bootm ${loadaddr}#conf${board_name}; " \
-               "if test $? -ne 0; then " \
-                       "echo Using default FIT configuration; " \
-                       "bootm ${loadaddr}; " \
-               "fi;\0" \
-       "mmcloados=run mmcargs; " \
-               "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
-                       "if run loadfdt; then " \
-                               "bootz ${loadaddr} - ${fdtaddr}; " \
-                       "else " \
-                               "if test ${boot_fdt} = try; then " \
-                                       "bootz; " \
-                               "else " \
-                                       "echo WARN: Cannot load the DT; " \
-                               "fi; " \
-                       "fi; " \
-               "else " \
-                       "bootz; " \
-               "fi;\0" \
-       "usbboot=usb reset; " \
-               "if usb storage; then " \
-                       "echo USB drive found;" \
-                       "if run usbloadbootenv; then " \
-                               "echo Loaded environment from ${bootenv};" \
-                               "run usbimportbootenv;" \
-                       "fi;" \
-                       "if test -n $uenvcmd; then " \
-                               "echo Running uenvcmd ...;" \
-                               "run uenvcmd;" \
-                       "fi;" \
-                       "if run usbloadimage; then " \
-                               "run usbloados;" \
-                       "fi;" \
-               "fi;\0" \
-       "mmcboot=mmc dev ${mmcdev}; " \
-               "if mmc rescan; then " \
-                       "echo SD/MMC found on device ${mmcdev};" \
-                       "if run loadbootenv; then " \
-                               "echo Loaded environment from ${bootenv};" \
-                               "run importbootenv;" \
-                       "fi;" \
-                       "if test -n $uenvcmd; then " \
-                               "echo Running uenvcmd ...;" \
-                               "run uenvcmd;" \
-                       "fi;" \
-                       "if run loadimage; then " \
-                               "run mmcloados;" \
-                       "fi;" \
-               "fi;\0" \
-       "spiboot=echo Booting from spi ...; " \
-               "run spiargs; " \
-               "sf probe ${spibusno}:0; " \
-               "sf read ${loadaddr} ${spisrcaddr} ${spiimgsize}; " \
-               "bootz ${loadaddr}\0" \
-       "netboot=echo Booting from network ...; " \
-               "setenv autoload no; " \
-               "dhcp; " \
-               "tftp ${loadaddr} ${bootfile}; " \
-               "tftp ${fdtaddr} ${fdtfile}; " \
-               "run netargs; " \
-               "bootz ${loadaddr} - ${fdtaddr}\0" \
-       "ramboot=echo Booting from ramdisk ...; " \
-               "run ramargs; " \
-               "bootz ${loadaddr} ${rdaddr} ${fdtaddr}\0" \
-       "findfdt=setenv fdtfile am335x-baltos.dtb\0" \
-       NANDARGS
-       /*DFUARGS*/
-#endif
-
-#define CONFIG_BOOTCOMMAND \
-       "run findfdt; " \
-       "run usbboot;" \
-       "run mmcboot;" \
-       "setenv mmcdev 1; " \
-       "setenv bootpart 1:2; " \
-       "run mmcboot;" \
-       "run nandboot;"
-
-/* NS16550 Configuration */
-#define CONFIG_SYS_NS16550_COM1                0x44e09000      /* Base EVM has 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_TPS65910
-
-/* SPL */
-#ifndef CONFIG_NOR_BOOT
-
-#ifdef CONFIG_NAND
-#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)
-#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_START   CONFIG_SYS_TEXT_BASE
-#endif
-#endif
-
-/*
- * 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_USB_MUSB_DISABLE_BULK_COMBINE_SPLIT
-#define CONFIG_AM335X_USB0
-#define CONFIG_AM335X_USB0_MODE        MUSB_HOST
-#define CONFIG_AM335X_USB1
-#define CONFIG_AM335X_USB1_MODE MUSB_OTG
-
-/* Network. */
-#define CONFIG_PHY_SMSC
-#define CONFIG_PHY_ATHEROS
-
-/* NAND support */
-#ifdef CONFIG_NAND
-#define GPMC_NAND_ECC_LP_x8_LAYOUT     1
-#endif
-
-#endif /* ! __CONFIG_BALTOS_H */
--

2.19.1.1215.g8438c0b245-goog