Merge branch 'master' of git://git.denx.de/u-boot-sh

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

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index a047552ed322c3a33c4433725b67992cdf016fe3..1f3fa1575a31e95022573c65d928fd999a1b0a5a 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -443,16 +443,6 @@ config ARCH_MVEBU
        select SPI
        imply CMD_DM
 
-config TARGET_DEVKIT3250
-       bool "Support devkit3250"
-       select CPU_ARM926EJS
-       select SUPPORT_SPL
-
-config TARGET_WORK_92105
-       bool "Support work_92105"
-       select CPU_ARM926EJS
-       select SUPPORT_SPL
-
 config TARGET_APF27
        bool "Support apf27"
        select CPU_ARM926EJS
@@ -646,6 +636,12 @@ config ARCH_KEYSTONE
        imply CMD_SAVES
        imply FIT
 
+config ARCH_K3
+       bool "Texas Instruments' K3 Architecture"
+       select SPL
+       select SUPPORT_SPL
+       select FIT
+
 config ARCH_OMAP2PLUS
        bool "TI OMAP2+"
        select CPU_V7A
@@ -662,6 +658,22 @@ config ARCH_MESON
          targeted at media players and tablet computers. We currently
          support the S905 (GXBaby) 64-bit SoC.
 
+config ARCH_LPC32XX
+       bool "NXP LPC32xx platform"
+       select CPU_ARM926EJS
+       select DM
+       select DM_GPIO
+       select DM_SERIAL
+       select SPL_DM if SPL
+       select SUPPORT_SPL
+       imply CMD_DM
+
+config ARCH_IMX8
+       bool "NXP i.MX8 platform"
+       select ARM64
+       select DM
+       select OF_CONTROL
+
 config ARCH_MX8M
        bool "NXP i.MX8M platform"
        select ARM64
@@ -741,6 +753,8 @@ config ARCH_QEMU
        select OF_CONTROL
        select PL01X_SERIAL
        imply CMD_DM
+       imply DM_RTC
+       imply RTC_PL031
 
 config ARCH_RMOBILE
        bool "Renesas ARM SoCs"
@@ -772,7 +786,7 @@ config ARCH_SNAPDRAGON
 config ARCH_SOCFPGA
        bool "Altera SOCFPGA family"
        select ARCH_EARLY_INIT_R
-       select ARCH_MISC_INIT
+       select ARCH_MISC_INIT if !TARGET_SOCFPGA_ARRIA10
        select ARM64 if TARGET_SOCFPGA_STRATIX10
        select CPU_V7A if TARGET_SOCFPGA_GEN5 || TARGET_SOCFPGA_ARRIA10
        select DM
@@ -793,7 +807,6 @@ config ARCH_SOCFPGA
        select SPL_SPI_SUPPORT if DM_SPI
        select SPL_WATCHDOG_SUPPORT
        select SUPPORT_SPL
-       select SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION_TYPE
        select SYS_NS16550
        select SYS_THUMB_BUILD if TARGET_SOCFPGA_GEN5 || TARGET_SOCFPGA_ARRIA10
        imply CMD_DM
@@ -803,6 +816,7 @@ config ARCH_SOCFPGA
        imply DM_SPI_FLASH
        imply FAT_WRITE
        imply SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION
+       imply SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION_TYPE
 
 config ARCH_SUNXI
        bool "Support sunxi (Allwinner) SoCs"
@@ -831,6 +845,7 @@ config ARCH_SUNXI
        select USE_TINY_PRINTF
        imply CMD_DM
        imply CMD_GPT
+       imply CMD_UBI if NAND
        imply DISTRO_DEFAULTS
        imply FAT_WRITE
        imply OF_LIBFDT_OVERLAY
@@ -844,6 +859,14 @@ config ARCH_SUNXI
        imply SPL_SERIAL_SUPPORT
        imply USB_GADGET
 
+config ARCH_VERSAL
+       bool "Support Xilinx Versal Platform"
+       select ARM64
+       select CLK
+       select DM
+       select DM_SERIAL
+       select OF_CONTROL
+
 config ARCH_VF610
        bool "Freescale Vybrid"
        select CPU_V7A
@@ -854,7 +877,6 @@ config ARCH_VF610
 config ARCH_ZYNQ
        bool "Xilinx Zynq based platform"
        select BOARD_EARLY_INIT_F if WDT
-       select BOARD_LATE_INIT
        select CLK
        select CLK_ZYNQ
        select CPU_V7A
@@ -874,6 +896,7 @@ config ARCH_ZYNQ
        select SPL_SEPARATE_BSS if SPL
        select SUPPORT_SPL
        imply ARCH_EARLY_INIT_R
+       imply BOARD_LATE_INIT
        imply CMD_CLK
        imply CMD_DM
        imply CMD_SPL
@@ -891,7 +914,6 @@ config ARCH_ZYNQMP_R5
 config ARCH_ZYNQMP
        bool "Xilinx ZynqMP based platform"
        select ARM64
-       select BOARD_LATE_INIT
        select CLK
        select DM
        select DM_SERIAL
@@ -900,8 +922,10 @@ config ARCH_ZYNQMP
        select SPL_BOARD_INIT if SPL
        select SPL_CLK if SPL
        select SUPPORT_SPL
+       imply BOARD_LATE_INIT
        imply CMD_DM
        imply FAT_WRITE
+       imply MP
 
 config TEGRA
        bool "NVIDIA Tegra"
@@ -1265,7 +1289,6 @@ config STM32
        select CPU_V7M
        select DM
        select DM_SERIAL
-       select SYS_THUMB_BUILD
        imply CMD_DM
 
 config ARCH_STI
@@ -1377,10 +1400,14 @@ source "arch/arm/mach-highbank/Kconfig"
 
 source "arch/arm/mach-integrator/Kconfig"
 
+source "arch/arm/mach-k3/Kconfig"
+
 source "arch/arm/mach-keystone/Kconfig"
 
 source "arch/arm/mach-kirkwood/Kconfig"
 
+source "arch/arm/cpu/arm926ejs/lpc32xx/Kconfig"
+
 source "arch/arm/mach-mvebu/Kconfig"
 
 source "arch/arm/cpu/armv7/ls102xa/Kconfig"
@@ -1397,6 +1424,8 @@ source "arch/arm/mach-imx/mx7/Kconfig"
 
 source "arch/arm/mach-imx/mx7ulp/Kconfig"
 
+source "arch/arm/mach-imx/imx8/Kconfig"
+
 source "arch/arm/mach-imx/mx8m/Kconfig"
 
 source "arch/arm/mach-imx/mxs/Kconfig"
@@ -1439,6 +1468,8 @@ source "arch/arm/cpu/armv7/vf610/Kconfig"
 
 source "arch/arm/mach-zynq/Kconfig"
 
+source "arch/arm/mach-versal/Kconfig"
+
 source "arch/arm/mach-zynqmp-r5/Kconfig"
 
 source "arch/arm/cpu/armv7/Kconfig"
@@ -1480,7 +1511,6 @@ source "board/freescale/ls1012ardb/Kconfig"
 source "board/freescale/ls1012afrdm/Kconfig"
 source "board/freescale/mx35pdk/Kconfig"
 source "board/freescale/s32v234evb/Kconfig"
-source "board/gdsys/a38x/Kconfig"
 source "board/grinn/chiliboard/Kconfig"
 source "board/gumstix/pepper/Kconfig"
 source "board/h2200/Kconfig"
@@ -1498,11 +1528,9 @@ source "board/st/stv0991/Kconfig"
 source "board/tcl/sl50/Kconfig"
 source "board/ucRobotics/bubblegum_96/Kconfig"
 source "board/birdland/bav335x/Kconfig"
-source "board/timll/devkit3250/Kconfig"
 source "board/toradex/colibri_pxa270/Kconfig"
 source "board/vscom/baltos/Kconfig"
 source "board/woodburn/Kconfig"
-source "board/work-microwave/work_92105/Kconfig"
 source "board/xilinx/Kconfig"
 source "board/xilinx/zynq/Kconfig"
 source "board/xilinx/zynqmp/Kconfig"