Hi Jagan,
On 27/05/20 6:26 pm, Jagan Teki wrote:
DM, DM_SPI and other driver model migration deadlines are expired for this board.
Drop it.
Cc: Lokesh Vutla lokeshvutla@ti.com Signed-off-by: Jagan Teki jagan@amarulasolutions.com
Please hold this patch. I see patches in ML for converting to DM https://patchwork.ozlabs.org/project/uboot/list/?series=180914
Thanks and regards, Lokesh
Changes for v2:
- none
arch/arm/mach-omap2/omap5/Kconfig | 4 - board/ti/omap5_uevm/Kconfig | 12 -- board/ti/omap5_uevm/MAINTAINERS | 6 - board/ti/omap5_uevm/Makefile | 6 - board/ti/omap5_uevm/README | 25 --- board/ti/omap5_uevm/evm.c | 283 ------------------------------ board/ti/omap5_uevm/mux_data.h | 57 ------ configs/omap5_uevm_defconfig | 55 ------ include/configs/omap5_uevm.h | 62 ------- 9 files changed, 510 deletions(-) delete mode 100644 board/ti/omap5_uevm/Kconfig delete mode 100644 board/ti/omap5_uevm/MAINTAINERS delete mode 100644 board/ti/omap5_uevm/Makefile delete mode 100644 board/ti/omap5_uevm/README delete mode 100644 board/ti/omap5_uevm/evm.c delete mode 100644 board/ti/omap5_uevm/mux_data.h delete mode 100644 configs/omap5_uevm_defconfig delete mode 100644 include/configs/omap5_uevm.h
diff --git a/arch/arm/mach-omap2/omap5/Kconfig b/arch/arm/mach-omap2/omap5/Kconfig index a0c0b93a00..e73106e321 100644 --- a/arch/arm/mach-omap2/omap5/Kconfig +++ b/arch/arm/mach-omap2/omap5/Kconfig @@ -9,9 +9,6 @@ choice prompt "OMAP5 board select" optional
-config TARGET_OMAP5_UEVM
- bool "TI OMAP5 uEVM board"
config TARGET_DRA7XX_EVM bool "TI DRA7XX" select BOARD_LATE_INIT @@ -153,7 +150,6 @@ endchoice endmenu endif
-source "board/ti/omap5_uevm/Kconfig" source "board/ti/dra7xx/Kconfig" source "board/ti/am57xx/Kconfig"
diff --git a/board/ti/omap5_uevm/Kconfig b/board/ti/omap5_uevm/Kconfig deleted file mode 100644 index aa13844544..0000000000 --- a/board/ti/omap5_uevm/Kconfig +++ /dev/null @@ -1,12 +0,0 @@ -if TARGET_OMAP5_UEVM
-config SYS_BOARD
- default "omap5_uevm"
-config SYS_VENDOR
- default "ti"
-config SYS_CONFIG_NAME
- default "omap5_uevm"
-endif diff --git a/board/ti/omap5_uevm/MAINTAINERS b/board/ti/omap5_uevm/MAINTAINERS deleted file mode 100644 index 280ea2f91f..0000000000 --- a/board/ti/omap5_uevm/MAINTAINERS +++ /dev/null @@ -1,6 +0,0 @@ -OMAP5_UEVM BOARD -M: Lokesh Vutla lokeshvutla@ti.com -S: Maintained -F: board/ti/omap5_uevm/ -F: include/configs/omap5_uevm.h -F: configs/omap5_uevm_defconfig diff --git a/board/ti/omap5_uevm/Makefile b/board/ti/omap5_uevm/Makefile deleted file mode 100644 index 17ee516d26..0000000000 --- a/board/ti/omap5_uevm/Makefile +++ /dev/null @@ -1,6 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0+ -# -# (C) Copyright 2000, 2001, 2002 -# Wolfgang Denk, DENX Software Engineering, wd@denx.de.
-obj-y := evm.o diff --git a/board/ti/omap5_uevm/README b/board/ti/omap5_uevm/README deleted file mode 100644 index 970e2eceb7..0000000000 --- a/board/ti/omap5_uevm/README +++ /dev/null @@ -1,25 +0,0 @@
-Summary
-This document covers various features of the 'omap5_uevm' build and some -related uses.
-eMMC boot partition use
-It is possible, depending on SYSBOOT configuration to boot from the eMMC -boot partitions using (name depending on documentation referenced) -Alternative Boot operation mode or Boot Sequence Option 1/2. In this -example we load MLO and u-boot.img from the build into DDR and then use -'mmc bootbus' to set the required rate (see TRM) and 'mmc partconfig' to -set boot0 as the boot device. -U-Boot # setenv autoload no -U-Boot # usb start -U-Boot # dhcp -U-Boot # mmc dev 1 1 -U-Boot # tftp ${loadaddr} omap5uevm/MLO -U-Boot # mmc write ${loadaddr} 0 100 -U-Boot # tftp ${loadaddr} omap5uevm/u-boot.img -U-Boot # mmc write ${loadaddr} 300 400 -U-Boot # mmc bootbus 1 2 0 2 -U-Boot # mmc partconf 1 1 1 0 diff --git a/board/ti/omap5_uevm/evm.c b/board/ti/omap5_uevm/evm.c deleted file mode 100644 index e35f319b46..0000000000 --- a/board/ti/omap5_uevm/evm.c +++ /dev/null @@ -1,283 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/*
- (C) Copyright 2010
- Texas Instruments Incorporated, <www.ti.com>
- Aneesh V aneesh@ti.com
- Steve Sakoman steve@sakoman.com
- */
-#include <common.h> -#include <init.h> -#include <net.h> -#include <palmas.h> -#include <asm/arch/omap.h> -#include <asm/arch/sys_proto.h> -#include <asm/arch/mmc_host_def.h> -#include <tca642x.h> -#include <usb.h> -#include <linux/delay.h> -#include <linux/usb/gadget.h> -#include <dwc3-uboot.h> -#include <dwc3-omap-uboot.h> -#include <ti-usb-phy-uboot.h>
-#include "mux_data.h"
-#if defined(CONFIG_USB_EHCI_HCD) || defined(CONFIG_USB_XHCI_OMAP) -#include <sata.h> -#include <usb.h> -#include <asm/gpio.h> -#include <asm/mach-types.h> -#include <asm/arch/clock.h> -#include <asm/arch/ehci.h> -#include <asm/ehci-omap.h> -#include <asm/arch/sata.h>
-#define DIE_ID_REG_BASE (OMAP54XX_L4_CORE_BASE + 0x2000) -#define DIE_ID_REG_OFFSET 0x200
-#endif
-DECLARE_GLOBAL_DATA_PTR;
-const struct omap_sysinfo sysinfo = {
- "Board: OMAP5432 uEVM\n"
-};
-/**
- @brief tca642x_init - uEVM default values for the GPIO expander
- input reg, output reg, polarity reg, configuration reg
- */
-struct tca642x_bank_info tca642x_init[] = {
- { .input_reg = 0x00,
.output_reg = 0x04,.polarity_reg = 0x00,.configuration_reg = 0x80 },- { .input_reg = 0x00,
.output_reg = 0x00,.polarity_reg = 0x00,.configuration_reg = 0xff },- { .input_reg = 0x00,
.output_reg = 0x00,.polarity_reg = 0x00,.configuration_reg = 0x40 },-};
-#ifdef CONFIG_USB_DWC3 -static struct dwc3_device usb_otg_ss = {
- .maximum_speed = USB_SPEED_SUPER,
- .base = OMAP5XX_USB_OTG_SS_BASE,
- .tx_fifo_resize = false,
- .index = 0,
-};
-static struct dwc3_omap_device usb_otg_ss_glue = {
- .base = (void *)OMAP5XX_USB_OTG_SS_GLUE_BASE,
- .utmi_mode = DWC3_OMAP_UTMI_MODE_SW,
- .index = 0,
-};
-static struct ti_usb_phy_device usb_phy_device = {
- .pll_ctrl_base = (void *)OMAP5XX_USB3_PHY_PLL_CTRL,
- .usb2_phy_power = (void *)OMAP5XX_USB2_PHY_POWER,
- .usb3_phy_power = (void *)OMAP5XX_USB3_PHY_POWER,
- .index = 0,
-};
-int board_usb_init(int index, enum usb_init_type init) -{
- if (index) {
printf("Invalid Controller Index\n");return -EINVAL;- }
- if (init == USB_INIT_DEVICE) {
usb_otg_ss.dr_mode = USB_DR_MODE_PERIPHERAL;usb_otg_ss_glue.vbus_id_status = OMAP_DWC3_VBUS_VALID;- } else {
usb_otg_ss.dr_mode = USB_DR_MODE_HOST;usb_otg_ss_glue.vbus_id_status = OMAP_DWC3_ID_GROUND;- }
- enable_usb_clocks(index);
- ti_usb_phy_uboot_init(&usb_phy_device);
- dwc3_omap_uboot_init(&usb_otg_ss_glue);
- dwc3_uboot_init(&usb_otg_ss);
- return 0;
-}
-int board_usb_cleanup(int index, enum usb_init_type init) -{
- if (index) {
printf("Invalid Controller Index\n");return -EINVAL;- }
- ti_usb_phy_uboot_exit(index);
- dwc3_uboot_exit(index);
- dwc3_omap_uboot_exit(index);
- disable_usb_clocks(index);
- return 0;
-}
-int usb_gadget_handle_interrupts(int index) -{
- u32 status;
- status = dwc3_omap_uboot_interrupt_status(index);
- if (status)
dwc3_uboot_handle_interrupt(index);- return 0;
-} -#endif
-/**
- @brief board_init
- @return 0
- */
-int board_init(void) -{
- gpmc_init();
- gd->bd->bi_arch_number = MACH_TYPE_OMAP5_SEVM;
- gd->bd->bi_boot_params = (0x80000000 + 0x100); /* boot param addr */
- tca642x_set_inital_state(CONFIG_SYS_I2C_TCA642X_ADDR, tca642x_init);
- return 0;
-}
-int board_eth_init(bd_t *bis) -{
- return 0;
-}
-#if defined(CONFIG_USB_EHCI_HCD) || defined(CONFIG_USB_XHCI_OMAP) -static void enable_host_clocks(void) -{
- int auxclk;
- int hs_clk_ctrl_val = (OPTFCLKEN_HSIC60M_P3_CLK |
OPTFCLKEN_HSIC480M_P3_CLK |OPTFCLKEN_HSIC60M_P2_CLK |OPTFCLKEN_HSIC480M_P2_CLK |OPTFCLKEN_UTMI_P3_CLK | OPTFCLKEN_UTMI_P2_CLK);- /* Enable port 2 and 3 clocks*/
- setbits_le32((*prcm)->cm_l3init_hsusbhost_clkctrl, hs_clk_ctrl_val);
- /* Enable port 2 and 3 usb host ports tll clocks*/
- setbits_le32((*prcm)->cm_l3init_hsusbtll_clkctrl,
(OPTFCLKEN_USB_CH1_CLK_ENABLE | OPTFCLKEN_USB_CH2_CLK_ENABLE));-#ifdef CONFIG_USB_XHCI_OMAP
- /* Enable the USB OTG Super speed clocks */
- setbits_le32((*prcm)->cm_l3init_usb_otg_ss_clkctrl,
(OPTFCLKEN_REFCLK960M | OTG_SS_CLKCTRL_MODULEMODE_HW));-#endif
- auxclk = readl((*prcm)->scrm_auxclk1);
- /* Request auxilary clock */
- auxclk |= AUXCLK_ENABLE_MASK;
- writel(auxclk, (*prcm)->scrm_auxclk1);
-} -#endif
-/**
- @brief misc_init_r - Configure EVM board specific configurations
- such as power configurations, ethernet initialization as phase2 of
- boot sequence
- @return 0
- */
-int misc_init_r(void) -{ -#ifdef CONFIG_PALMAS_POWER
- palmas_init_settings();
-#endif
- omap_die_id_usbethaddr();
- return 0;
-}
-void set_muxconf_regs(void) -{
- do_set_mux((*ctrl)->control_padconf_core_base,
core_padconf_array_essential,sizeof(core_padconf_array_essential) /sizeof(struct pad_conf_entry));- do_set_mux((*ctrl)->control_padconf_wkup_base,
wkup_padconf_array_essential,sizeof(wkup_padconf_array_essential) /sizeof(struct pad_conf_entry));-}
-#if defined(CONFIG_MMC) -int board_mmc_init(bd_t *bis) -{
- omap_mmc_init(0, 0, 0, -1, -1);
- omap_mmc_init(1, 0, 0, -1, -1);
- return 0;
-} -#endif
-#ifdef CONFIG_USB_EHCI_HCD -static struct omap_usbhs_board_data usbhs_bdata = {
- .port_mode[0] = OMAP_USBHS_PORT_MODE_UNUSED,
- .port_mode[1] = OMAP_EHCI_PORT_MODE_HSIC,
- .port_mode[2] = OMAP_EHCI_PORT_MODE_HSIC,
-};
-int ehci_hcd_init(int index, enum usb_init_type init,
struct ehci_hccr **hccr, struct ehci_hcor **hcor)-{
- int ret;
- enable_host_clocks();
- ret = omap_ehci_hcd_init(index, &usbhs_bdata, hccr, hcor);
- if (ret < 0) {
puts("Failed to initialize ehci\n");return ret;- }
- return 0;
-}
-int ehci_hcd_stop(void) -{
- return omap_ehci_hcd_stop();
-}
-void usb_hub_reset_devices(struct usb_hub_device *hub, int port) -{
- /* The LAN9730 needs to be reset after the port power has been set. */
- if (port == 3) {
gpio_direction_output(CONFIG_OMAP_EHCI_PHY3_RESET_GPIO, 0);udelay(10);gpio_direction_output(CONFIG_OMAP_EHCI_PHY3_RESET_GPIO, 1);- }
-} -#endif
-#ifdef CONFIG_USB_XHCI_OMAP -/**
- @brief board_usb_init - Configure EVM board specific configurations
- for the LDO's and clocks for the USB blocks.
- @return 0
- */
-int board_usb_init(int index, enum usb_init_type init) -{
- int ret;
-#ifdef CONFIG_PALMAS_USB_SS_PWR
- ret = palmas_enable_ss_ldo();
-#endif
- enable_host_clocks();
- return 0;
-} -#endif diff --git a/board/ti/omap5_uevm/mux_data.h b/board/ti/omap5_uevm/mux_data.h deleted file mode 100644 index 3c4ba47497..0000000000 --- a/board/ti/omap5_uevm/mux_data.h +++ /dev/null @@ -1,57 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/*
- (C) Copyright 2010
- Texas Instruments Incorporated, <www.ti.com>
- Sricharan R r.sricharan@ti.com
- */
-#ifndef _EVM5430_MUX_DATA_H -#define _EVM5430_MUX_DATA_H
-#include <asm/arch/mux_omap5.h>
-const struct pad_conf_entry core_padconf_array_essential[] = {
- {EMMC_CLK, (PTU | IEN | M0)}, /* EMMC_CLK */
- {EMMC_CMD, (PTU | IEN | M0)}, /* EMMC_CMD */
- {EMMC_DATA0, (PTU | IEN | M0)}, /* EMMC_DATA0 */
- {EMMC_DATA1, (PTU | IEN | M0)}, /* EMMC_DATA1 */
- {EMMC_DATA2, (PTU | IEN | M0)}, /* EMMC_DATA2 */
- {EMMC_DATA3, (PTU | IEN | M0)}, /* EMMC_DATA3 */
- {EMMC_DATA4, (PTU | IEN | M0)}, /* EMMC_DATA4 */
- {EMMC_DATA5, (PTU | IEN | M0)}, /* EMMC_DATA5 */
- {EMMC_DATA6, (PTU | IEN | M0)}, /* EMMC_DATA6 */
- {EMMC_DATA7, (PTU | IEN | M0)}, /* EMMC_DATA7 */
- {SDCARD_CLK, (PTU | IEN | M0)}, /* SDCARD_CLK */
- {SDCARD_CMD, (PTU | IEN | M0)}, /* SDCARD_CMD */
- {SDCARD_DATA0, (PTU | IEN | M0)}, /* SDCARD_DATA0*/
- {SDCARD_DATA1, (PTU | IEN | M0)}, /* SDCARD_DATA1*/
- {SDCARD_DATA2, (PTU | IEN | M0)}, /* SDCARD_DATA2*/
- {SDCARD_DATA3, (PTU | IEN | M0)}, /* SDCARD_DATA3*/
- {UART3_RX_IRRX, (PTU | IEN | M0)}, /* UART3_RX_IRRX */
- {UART3_TX_IRTX, (M0)}, /* UART3_TX_IRTX */
- {USBB1_HSIC_STROBE, (PTU | IEN | M0)}, /* USBB1_HSIC_STROBE */
- {USBB1_HSIC_DATA, (PTU | IEN | M0)}, /* USBB1_HSIC_DATA */
- {USBB2_HSIC_STROBE, (PTU | IEN | M0)}, /* USBB2_HSIC_STROBE */
- {USBB2_HSIC_DATA, (PTU | IEN | M0)}, /* USBB2_HSIC_DATA */
- {USBB3_HSIC_STROBE, (PTU | IEN | M0)}, /* USBB3_HSIC_STROBE*/
- {USBB3_HSIC_DATA, (PTU | IEN | M0)}, /* USBB3_HSIC_DATA */
- {USBD0_HS_DP, (IEN | M0)}, /* USBD0_HS_DP */
- {USBD0_HS_DM, (IEN | M0)}, /* USBD0_HS_DM */
- {USBD0_SS_RX, (IEN | M0)}, /* USBD0_SS_RX */
- {I2C5_SCL, (IEN | M0)}, /* I2C5_SCL */
- {I2C5_SDA, (IEN | M0)}, /* I2C5_SDA */
- {HSI2_ACWAKE, (PTU | M6)}, /* HSI2_ACWAKE */
- {HSI2_CAFLAG, (PTU | M6)}, /* HSI2_CAFLAG */
-};
-const struct pad_conf_entry wkup_padconf_array_essential[] = {
- {SR_PMIC_SCL, (PTU | IEN | M0)}, /* SR_PMIC_SCL */
- {SR_PMIC_SDA, (PTU | IEN | M0)}, /* SR_PMIC_SDA */
- {SYS_32K, (IEN | M0)}, /* SYS_32K */
- {FREF_CLK1_OUT, (PTD | IEN | M0)}, /* FREF_CLK1_OUT */
-};
-#endif /* _EVM4430_MUX_DATA_H */ diff --git a/configs/omap5_uevm_defconfig b/configs/omap5_uevm_defconfig deleted file mode 100644 index 487f7f305c..0000000000 --- a/configs/omap5_uevm_defconfig +++ /dev/null @@ -1,55 +0,0 @@ -CONFIG_ARM=y -CONFIG_ARCH_OMAP2PLUS=y -CONFIG_OMAP54XX=y -CONFIG_TARGET_OMAP5_UEVM=y -CONFIG_OMAP_PLATFORM_RESET_TIME_MAX_USEC=16296 -CONFIG_SPL=y -CONFIG_ENV_OFFSET_REDUND=0x280000 -CONFIG_ARMV7_LPAE=y -CONFIG_SPL_TEXT_BASE=0x40300000 -CONFIG_DISTRO_DEFAULTS=y -# CONFIG_USE_BOOTCOMMAND is not set -CONFIG_SYS_CONSOLE_INFO_QUIET=y -CONFIG_VERSION_VARIABLE=y -# CONFIG_SPL_NAND_SUPPORT is not set -CONFIG_SPL_OS_BOOT=y -CONFIG_CMD_SPL=y -CONFIG_CMD_ASKENV=y -CONFIG_CMD_DFU=y -CONFIG_CMD_GPIO=y -CONFIG_CMD_GPT=y -CONFIG_CMD_I2C=y -CONFIG_CMD_MMC=y -CONFIG_CMD_SPI=y -CONFIG_CMD_USB=y -# CONFIG_CMD_SETEXPR is not set -CONFIG_CMD_EXT4_WRITE=y -CONFIG_ENV_IS_IN_MMC=y -CONFIG_SYS_REDUNDAND_ENVIRONMENT=y -CONFIG_SYS_RELOC_GD_ENV_ADDR=y -CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y -CONFIG_SCSI_AHCI=y -CONFIG_DFU_MMC=y -CONFIG_DFU_RAM=y -CONFIG_CMD_TCA642X=y -CONFIG_SUPPORT_EMMC_BOOT=y -CONFIG_MMC_OMAP_HS=y -CONFIG_SCSI=y -CONFIG_CONS_INDEX=3 -CONFIG_SYS_NS16550=y -CONFIG_SPI=y -CONFIG_OMAP3_SPI=y -CONFIG_USB=y -CONFIG_USB_EHCI_HCD=y -CONFIG_USB_DWC3=y -CONFIG_USB_DWC3_OMAP=y -CONFIG_USB_DWC3_PHY_OMAP=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_HOST_ETHER=y -CONFIG_USB_ETHER_SMSC95XX=y -CONFIG_FAT_WRITE=y -CONFIG_OF_LIBFDT=y diff --git a/include/configs/omap5_uevm.h b/include/configs/omap5_uevm.h deleted file mode 100644 index 53589c03ea..0000000000 --- a/include/configs/omap5_uevm.h +++ /dev/null @@ -1,62 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/*
- (C) Copyright 2013
- Texas Instruments Incorporated.
- Sricharan R r.sricharan@ti.com
- Configuration settings for the TI EVM5430 board.
- See ti_omap5_common.h for omap5 common settings.
- */
-#ifndef __CONFIG_OMAP5_EVM_H -#define __CONFIG_OMAP5_EVM_H
-#include <environment/ti/dfu.h>
-#ifndef CONFIG_SPL_BUILD -/* Define the default GPT table for eMMC */ -#define PARTS_DEFAULT \
- "uuid_disk=${uuid_gpt_disk};" \
- "name=rootfs,start=2MiB,size=-,uuid=${uuid_gpt_rootfs}"
-#endif
-#define DFUARGS \
- "dfu_bufsiz=0x10000\0" \
- DFU_ALT_INFO_MMC \
- DFU_ALT_INFO_EMMC \
- DFU_ALT_INFO_RAM
-#include <configs/ti_omap5_common.h>
-#define CONFIG_SYS_NS16550_COM3 UART3_BASE
-/* MMC ENV related defines */ -#define CONFIG_SYS_MMC_ENV_DEV 1 /* SLOT2: eMMC(1) */
-/* Enhance our eMMC support / experience. */ -#define CONFIG_HSMMC2_8BIT
-/* Required support for the TCA642X GPIO we have on the uEVM */ -#define CONFIG_TCA642X -#define CONFIG_SYS_I2C_TCA642X_BUS_NUM 4 -#define CONFIG_SYS_I2C_TCA642X_ADDR 0x22
-/* USB UHH support options */ -#define CONFIG_EHCI_HCD_INIT_AFTER_RESET
-#define CONFIG_OMAP_EHCI_PHY2_RESET_GPIO 80 -#define CONFIG_OMAP_EHCI_PHY3_RESET_GPIO 79
-/* Enabled commands */
-/* USB Networking options */
-#define CONSOLEDEV "ttyS2"
-#define CONFIG_SCSI_AHCI_PLAT -#define CONFIG_SYS_SCSI_MAX_SCSI_ID 1 -#define CONFIG_SYS_SCSI_MAX_LUN 1 -#define CONFIG_SYS_SCSI_MAX_DEVICE (CONFIG_SYS_SCSI_MAX_SCSI_ID * \
CONFIG_SYS_SCSI_MAX_LUN)-#endif /* __CONFIG_OMAP5_EVM_H */