Merge tag 'mips-pull-2019-02-01' of git://git.denx.de/u-boot-mips

[oweals/u-boot.git] / arch / arm / mach-omap2 / am33xx / Kconfig

diff --git a/arch/arm/mach-omap2/am33xx/Kconfig b/arch/arm/mach-omap2/am33xx/Kconfig
index 3529607479d2b2d9ad18feb007c85d72873a1057..4d47d09637ad0189f71e851ff4288d84637d1759 100644 (file)
--- a/arch/arm/mach-omap2/am33xx/Kconfig
+++ b/arch/arm/mach-omap2/am33xx/Kconfig
@@ -38,8 +38,8 @@ config TARGET_AM335X_EVM
        imply SPL_DM
        imply SPL_DM_SEQ_ALIAS
        imply SPL_ENV_SUPPORT
-       imply SPL_EXT_SUPPORT
-       imply SPL_FAT_SUPPORT
+       imply SPL_FS_EXT4
+       imply SPL_FS_FAT
        imply SPL_GPIO_SUPPORT
        imply SPL_I2C_SUPPORT
        imply SPL_LIBCOMMON_SUPPORT
@@ -206,6 +206,7 @@ config TARGET_PDU001
        bool "Support PDU001"
        select DM
        select DM_SERIAL
+       imply SPL_SEPARATE_BSS
        imply CMD_DM
        help
          Support for PDU001 platform developed by EETS GmbH.
@@ -231,8 +232,8 @@ config TARGET_AM43XX_EVM
        imply DM_SPI_FLASH
        imply SPI_FLASH_BAR
        imply SPL_ENV_SUPPORT
-       imply SPL_EXT_SUPPORT
-       imply SPL_FAT_SUPPORT
+       imply SPL_FS_EXT4
+       imply SPL_FS_FAT
        imply SPL_GPIO_SUPPORT
        imply SPL_I2C_SUPPORT
        imply SPL_LIBCOMMON_SUPPORT
@@ -274,21 +275,6 @@ config SPL_RTC_DDR_SUPPORT
 endif
 
 if AM43XX || AM33XX
-config ISW_ENTRY_ADDR
-       hex "Address in memory or XIP flash of bootloader entry point"
-       default 0x402F4000 if AM43XX
-       default 0x402F0400 if AM33XX
-       help
-         After any reset, the boot ROM on the AM43XX SOC
-         searches the boot media for a valid boot image.
-         For non-XIP devices, the ROM then copies the
-         image into internal memory.
-         For all boot modes, after the ROM processes the
-         boot image it eventually computes the entry
-         point address depending on the device type
-         (secure/non-secure), boot media (xip/non-xip) and
-         image headers.
-
 config PUB_ROM_DATA_SIZE
        hex "Size in bytes of the L3 SRAM reserved by ROM to store data"
        default 0x8400