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 76da6d911ed6029c60a3da3f875a9a7e76c4fd95..4d47d09637ad0189f71e851ff4288d84637d1759 100644 (file)
--- a/arch/arm/mach-omap2/am33xx/Kconfig
+++ b/arch/arm/mach-omap2/am33xx/Kconfig
@@ -31,12 +31,15 @@ config TARGET_AM335X_EVM
        bool "Support am335x_evm"
        select BOARD_LATE_INIT
        select DM
-       select DM_SERIAL
        select DM_GPIO
+       select DM_SERIAL
        select TI_I2C_BOARD_DETECT
+       imply CMD_DM
+       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
@@ -44,15 +47,13 @@ config TARGET_AM335X_EVM
        imply SPL_LIBGENERIC_SUPPORT
        imply SPL_MMC_SUPPORT
        imply SPL_NAND_SUPPORT
+       imply SPL_OF_LIBFDT
        imply SPL_POWER_SUPPORT
+       imply SPL_SEPARATE_BSS
        imply SPL_SERIAL_SUPPORT
+       imply SPL_SYS_MALLOC_SIMPLE
        imply SPL_WATCHDOG_SUPPORT
        imply SPL_YMODEM_SUPPORT
-       imply SPL_SYS_MALLOC_SIMPLE
-       imply SPL_SEPARATE_BSS
-       imply SPL_DM
-       imply SPL_DM_SEQ_ALIAS
-       imply SPL_OF_LIBFDT
        help
          This option specifies support for the AM335x
          GP and HS EVM development platforms. The AM335x
@@ -65,36 +66,41 @@ config TARGET_AM335X_BALTOS
        bool "Support am335x_baltos"
        select BOARD_LATE_INIT
        select DM
-       select DM_SERIAL
        select DM_GPIO
+       select DM_SERIAL
+       imply CMD_DM
 
 config TARGET_AM335X_IGEP003X
        bool "Support am335x_igep003x"
        select BOARD_LATE_INIT
        select DM
-       select DM_SERIAL
        select DM_GPIO
+       select DM_SERIAL
+       imply CMD_DM
 
 config TARGET_AM335X_SHC
        bool "Support am335x based shc board from bosch"
        select BOARD_LATE_INIT
        select DM
-       select DM_SERIAL
        select DM_GPIO
+       select DM_SERIAL
+       imply CMD_DM
        imply CMD_SPL
 
 config TARGET_AM335X_SL50
        bool "Support am335x_sl50"
        select BOARD_LATE_INIT
        select DM
-       select DM_SERIAL
        select DM_GPIO
+       select DM_SERIAL
+       imply CMD_DM
 
 config TARGET_BAV335X
        bool "Support bav335x"
        select BOARD_LATE_INIT
        select DM
        select DM_SERIAL
+       imply CMD_DM
        help
          The BAV335x OEM Network Processor integrates all the functions of an
          embedded network computer in a small, easy to use SODIMM module which
@@ -118,77 +124,90 @@ config TARGET_CHILIBOARD
        select BOARD_LATE_INIT
        select DM
        select DM_SERIAL
+       imply CMD_DM
 
 config TARGET_CM_T335
        bool "Support cm_t335"
        select DM
-       select DM_SERIAL
        select DM_GPIO
+       select DM_SERIAL
+       imply CMD_DM
 
 config TARGET_DRACO
        bool "Support draco"
        select BOARD_LATE_INIT
        select DM
-       select DM_SERIAL
        select DM_GPIO
+       select DM_SERIAL
+       imply CMD_DM
 
 config TARGET_ETAMIN
        bool "Support etamin"
        select BOARD_LATE_INIT
        select DM
-       select DM_SERIAL
        select DM_GPIO
+       select DM_SERIAL
+       imply CMD_DM
 
 config TARGET_PCM051
        bool "Support pcm051"
        select DM
-       select DM_SERIAL
        select DM_GPIO
+       select DM_SERIAL
+       imply CMD_DM
 
 config TARGET_PENGWYN
        bool "Support pengwyn"
        select DM
-       select DM_SERIAL
        select DM_GPIO
+       select DM_SERIAL
+       imply CMD_DM
 
 config TARGET_PEPPER
        bool "Support pepper"
        select DM
-       select DM_SERIAL
        select DM_GPIO
+       select DM_SERIAL
+       imply CMD_DM
 
 config TARGET_PXM2
        bool "Support pxm2"
        select BOARD_LATE_INIT
        select DM
-       select DM_SERIAL
        select DM_GPIO
+       select DM_SERIAL
+       imply CMD_DM
 
 config TARGET_RASTABAN
        bool "Support rastaban"
        select BOARD_LATE_INIT
        select DM
-       select DM_SERIAL
        select DM_GPIO
+       select DM_SERIAL
+       imply CMD_DM
 
 config TARGET_RUT
        bool "Support rut"
        select BOARD_LATE_INIT
        select DM
-       select DM_SERIAL
        select DM_GPIO
+       select DM_SERIAL
+       imply CMD_DM
 
 config TARGET_THUBAN
        bool "Support thuban"
        select BOARD_LATE_INIT
        select DM
-       select DM_SERIAL
        select DM_GPIO
+       select DM_SERIAL
+       imply CMD_DM
 
 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.
          The PDU001 is a processor and display unit developed around
@@ -213,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
@@ -256,23 +275,9 @@ config SPL_RTC_DDR_SUPPORT
 endif
 
 if AM43XX || AM33XX
-config ISW_ENTRY_ADDR
-       hex "Address in memory or XIP flash of bootloader entry point"
-       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.
-       default 0x402F4000 if AM43XX
-       default 0x402F0400 if AM33XX
-
 config PUB_ROM_DATA_SIZE
        hex "Size in bytes of the L3 SRAM reserved by ROM to store data"
+       default 0x8400
        help
          During the device boot, the public ROM uses the top of
          the public L3 OCMC RAM to store r/w data like stack,
@@ -283,5 +288,4 @@ config PUB_ROM_DATA_SIZE
          boot image. Once the ROM transfers control to the boot
          image, this area is no longer used, and can be reclaimed
          for run time use by the boot image.
-       default 0x8400
 endif