[U-Boot] [PATCH 1/3] am43xx: Remove ethboot / usbhost_boot variants

[Lokesh Vutla]

+ Vignesh

On 7/26/2017 10:41 PM, Tom Rini wrote:
> The intention of having aaa_evm_xxx_defconfig variants is to allow
> building for useful but non-default cases that cannot be easily done
> with the standard aaa_evm_defconfig file.  In this case, we get rid of
> usbhost_boot as SPL_TEXT has been in OCMC RAM for a while now, so this

SPL_TEXT for default boot is 0x402f0400
SPL_TEXT for usb host boot is 0x40300350 as ROM uses the initial portion
for DMA when copying from USB. Initially we thought of moving SPL_TET
for default boot to 0x40300350 but this will break UART boot as it has
to be 0x402f0400 for it. So I guess we cannot remove usb host boot
defconfig.

> can be included in the default.  We get rid of ethboot as it's fine to
> have the environment in someplace that's not available and the default

With DM_ETH enabled, it enforces to have DM for usb peripheral for usb
rndis boot, which is not supported yet. Vignesh is currently working on
it. I guess once it is done, ethboot_defocnfig can be removed.

So $patch breaks both usb host and ethboot.

Thanks and regards,
Lokesh

> will be used.  Further, now that environment location is in Kconfig it's
> reasonable to expect a user of this feature to optimize their use-case
> if needed.
> 
> Cc: Lokesh Vutla <lokeshvutla at ti.com>
> Signed-off-by: Tom Rini <trini at konsulko.com>
> ---
>  configs/am43xx_evm_defconfig              |  7 +++
>  configs/am43xx_evm_ethboot_defconfig      | 63 --------------------------
>  configs/am43xx_evm_usbhost_boot_defconfig | 75 -------------------------------
>  3 files changed, 7 insertions(+), 138 deletions(-)
>  delete mode 100644 configs/am43xx_evm_ethboot_defconfig
>  delete mode 100644 configs/am43xx_evm_usbhost_boot_defconfig
> 
> diff --git a/configs/am43xx_evm_defconfig b/configs/am43xx_evm_defconfig
> index 7a7a0b0ea0ac..ae2ae1ae516a 100644
> --- a/configs/am43xx_evm_defconfig
> +++ b/configs/am43xx_evm_defconfig
> @@ -12,8 +12,15 @@ CONFIG_SYS_CONSOLE_INFO_QUIET=y
>  CONFIG_VERSION_VARIABLE=y
>  CONFIG_SPL=y
>  CONFIG_SPL_STACK_R=y
> +CONFIG_SPL_ETH_SUPPORT=y
>  CONFIG_SPL_MTD_SUPPORT=y
> +CONFIG_SPL_NET_SUPPORT=y
> +CONFIG_SPL_NET_VCI_STRING="AM43xx U-Boot SPL"
>  CONFIG_SPL_OS_BOOT=y
> +CONFIG_SPL_USB_HOST_SUPPORT=y
> +CONFIG_SPL_USB_SUPPORT=y
> +CONFIG_SPL_USB_GADGET_SUPPORT=y
> +CONFIG_SPL_USBETH_SUPPORT=y
>  CONFIG_HUSH_PARSER=y
>  # CONFIG_CMD_IMLS is not set
>  # CONFIG_CMD_FLASH is not set
> diff --git a/configs/am43xx_evm_ethboot_defconfig b/configs/am43xx_evm_ethboot_defconfig
> deleted file mode 100644
> index 9892653d27c3..000000000000
> --- a/configs/am43xx_evm_ethboot_defconfig
> +++ /dev/null
> @@ -1,63 +0,0 @@
> -CONFIG_ARM=y
> -CONFIG_ARCH_OMAP2PLUS=y
> -CONFIG_AM43XX=y
> -CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1,NAND"
> -CONFIG_ENV_IS_IN_FAT=y
> -CONFIG_SYS_CONSOLE_INFO_QUIET=y
> -CONFIG_VERSION_VARIABLE=y
> -CONFIG_SPL=y
> -# CONFIG_SPL_SYS_MALLOC_SIMPLE is not set
> -CONFIG_SPL_ETH_SUPPORT=y
> -CONFIG_SPL_MTD_SUPPORT=y
> -CONFIG_SPL_NET_SUPPORT=y
> -CONFIG_SPL_NET_VCI_STRING="AM43xx U-Boot SPL"
> -CONFIG_SPL_OS_BOOT=y
> -CONFIG_HUSH_PARSER=y
> -CONFIG_CMD_BOOTZ=y
> -# CONFIG_CMD_IMLS is not set
> -CONFIG_CMD_ASKENV=y
> -CONFIG_CMD_EEPROM=y
> -# CONFIG_CMD_FLASH is not set
> -CONFIG_CMD_GPT=y
> -CONFIG_CMD_MMC=y
> -CONFIG_CMD_PART=y
> -CONFIG_CMD_SF=y
> -CONFIG_CMD_SPI=y
> -CONFIG_CMD_I2C=y
> -CONFIG_CMD_USB=y
> -CONFIG_CMD_DFU=y
> -CONFIG_CMD_GPIO=y
> -# CONFIG_CMD_SETEXPR is not set
> -CONFIG_CMD_DHCP=y
> -CONFIG_CMD_MII=y
> -CONFIG_CMD_PING=y
> -CONFIG_CMD_EXT2=y
> -CONFIG_CMD_EXT4=y
> -CONFIG_CMD_EXT4_WRITE=y
> -CONFIG_CMD_FAT=y
> -CONFIG_CMD_FS_GENERIC=y
> -CONFIG_CMD_MTDPARTS=y
> -CONFIG_ISO_PARTITION=y
> -CONFIG_DFU_MMC=y
> -CONFIG_DFU_RAM=y
> -CONFIG_DFU_SF=y
> -CONFIG_MMC_OMAP_HS=y
> -CONFIG_SPI_FLASH=y
> -CONFIG_SPI_FLASH_MACRONIX=y
> -CONFIG_SYS_NS16550=y
> -CONFIG_TI_QSPI=y
> -CONFIG_USB=y
> -CONFIG_USB_XHCI_HCD=y
> -CONFIG_USB_XHCI_DWC3=y
> -CONFIG_USB_DWC3=y
> -CONFIG_USB_DWC3_GADGET=y
> -CONFIG_USB_DWC3_OMAP=y
> -CONFIG_USB_DWC3_PHY_OMAP=y
> -CONFIG_USB_STORAGE=y
> -CONFIG_USB_GADGET=y
> -CONFIG_USB_GADGET_DOWNLOAD=y
> -CONFIG_G_DNL_MANUFACTURER="Texas Instruments"
> -CONFIG_G_DNL_VENDOR_NUM=0x0403
> -CONFIG_G_DNL_PRODUCT_NUM=0xbd00
> -CONFIG_FAT_WRITE=y
> -CONFIG_OF_LIBFDT=y
> diff --git a/configs/am43xx_evm_usbhost_boot_defconfig b/configs/am43xx_evm_usbhost_boot_defconfig
> deleted file mode 100644
> index f4c0f8442a17..000000000000
> --- a/configs/am43xx_evm_usbhost_boot_defconfig
> +++ /dev/null
> @@ -1,75 +0,0 @@
> -CONFIG_ARM=y
> -CONFIG_ARCH_OMAP2PLUS=y
> -CONFIG_SYS_MALLOC_F_LEN=0x2000
> -CONFIG_AM43XX=y
> -CONFIG_ISW_ENTRY_ADDR=0x40300350
> -CONFIG_SPL_STACK_R_ADDR=0x82000000
> -CONFIG_DEFAULT_DEVICE_TREE="am437x-gp-evm"
> -CONFIG_SPL_LOAD_FIT=y
> -CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1,NAND"
> -CONFIG_ENV_IS_IN_FAT=y
> -CONFIG_SYS_CONSOLE_INFO_QUIET=y
> -CONFIG_VERSION_VARIABLE=y
> -CONFIG_SPL=y
> -CONFIG_SPL_STACK_R=y
> -CONFIG_SPL_MTD_SUPPORT=y
> -CONFIG_SPL_OS_BOOT=y
> -CONFIG_SPL_USB_HOST_SUPPORT=y
> -CONFIG_SPL_USB_SUPPORT=y
> -CONFIG_HUSH_PARSER=y
> -CONFIG_CMD_BOOTZ=y
> -# CONFIG_CMD_IMLS is not set
> -CONFIG_CMD_ASKENV=y
> -CONFIG_CMD_EEPROM=y
> -# CONFIG_CMD_FLASH is not set
> -CONFIG_CMD_GPT=y
> -CONFIG_CMD_MMC=y
> -CONFIG_CMD_PART=y
> -CONFIG_CMD_SF=y
> -CONFIG_CMD_SPI=y
> -CONFIG_CMD_I2C=y
> -CONFIG_CMD_USB=y
> -CONFIG_CMD_DFU=y
> -CONFIG_CMD_GPIO=y
> -# CONFIG_CMD_SETEXPR is not set
> -CONFIG_CMD_DHCP=y
> -CONFIG_CMD_MII=y
> -CONFIG_CMD_PING=y
> -CONFIG_CMD_EXT2=y
> -CONFIG_CMD_EXT4=y
> -CONFIG_CMD_EXT4_WRITE=y
> -CONFIG_CMD_FAT=y
> -CONFIG_CMD_FS_GENERIC=y
> -CONFIG_CMD_MTDPARTS=y
> -CONFIG_ISO_PARTITION=y
> -CONFIG_OF_CONTROL=y
> -CONFIG_OF_LIST="am437x-gp-evm am437x-sk-evm am43x-epos-evm am437x-idk-evm"
> -CONFIG_DM=y
> -# CONFIG_BLK is not set
> -CONFIG_DFU_MMC=y
> -CONFIG_DFU_RAM=y
> -CONFIG_DFU_SF=y
> -CONFIG_DM_GPIO=y
> -CONFIG_DM_MMC=y
> -CONFIG_MMC_OMAP_HS=y
> -CONFIG_SPI_FLASH=y
> -CONFIG_SPI_FLASH_MACRONIX=y
> -CONFIG_DM_SERIAL=y
> -CONFIG_SYS_NS16550=y
> -CONFIG_TI_QSPI=y
> -CONFIG_TIMER=y
> -CONFIG_OMAP_TIMER=y
> -CONFIG_USB=y
> -CONFIG_USB_XHCI_HCD=y
> -CONFIG_USB_XHCI_DWC3=y
> -CONFIG_USB_DWC3=y
> -CONFIG_USB_DWC3_GADGET=y
> -CONFIG_USB_DWC3_OMAP=y
> -CONFIG_USB_DWC3_PHY_OMAP=y
> -CONFIG_USB_STORAGE=y
> -CONFIG_USB_GADGET=y
> -CONFIG_USB_GADGET_DOWNLOAD=y
> -CONFIG_G_DNL_MANUFACTURER="Texas Instruments"
> -CONFIG_G_DNL_VENDOR_NUM=0x0403
> -CONFIG_G_DNL_PRODUCT_NUM=0xbd00
> -CONFIG_FAT_WRITE=y
>