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

[platform/kernel/u-boot.git] / arch / arm / Kconfig

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index ccf2a84..cefa8f4 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
@@ -538,6 +528,12 @@ config ARCH_BCM283X
        imply CMD_DM
        imply FAT_WRITE
 
+config ARCH_BCM6858
+       bool "Broadcom BCM6858 family"
+       select DM
+       select OF_CONTROL
+       imply CMD_DM
+
 config TARGET_VEXPRESS_CA15_TC2
        bool "Support vexpress_ca15_tc2"
        select CPU_V7A
@@ -611,6 +607,7 @@ config ARCH_EXYNOS
        select DM_SPI
        select DM_SPI_FLASH
        select SPI
+       imply SYS_THUMB_BUILD
        imply CMD_DM
        imply FAT_WRITE
 
@@ -668,7 +665,37 @@ config ARCH_MESON
          targeted at media players and tablet computers. We currently
          support the S905 (GXBaby) 64-bit SoC.
 
-config ARCH_MX8M
+config ARCH_MEDIATEK
+       bool "MediaTek SoCs"
+       select BINMAN
+       select DM
+       select OF_CONTROL
+       select SPL_DM if SPL
+       select SPL_LIBCOMMON_SUPPORT if SPL
+       select SPL_LIBGENERIC_SUPPORT if SPL
+       select SPL_OF_CONTROL if SPL
+       select SUPPORT_SPL
+       help
+         Support for the MediaTek SoCs family developed by MediaTek Inc.
+         Please refer to doc/README.mediatek for more information.
+
+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_IMX8M
        bool "NXP i.MX8M platform"
        select ARM64
        select DM
@@ -758,6 +785,7 @@ config ARCH_RMOBILE
        imply CMD_DM
        imply FAT_WRITE
        imply SYS_THUMB_BUILD
+       imply ARCH_MISC_INIT if DISPLAY_CPUINFO
 
 config TARGET_S32V234EVB
        bool "Support s32v234evb"
@@ -790,18 +818,13 @@ config ARCH_SOCFPGA
        select SPL_DM_RESET if DM_RESET
        select SPL_DM_SERIAL
        select SPL_LIBCOMMON_SUPPORT
-       select SPL_LIBDISK_SUPPORT
        select SPL_LIBGENERIC_SUPPORT
-       select SPL_MMC_SUPPORT if DM_MMC
        select SPL_NAND_SUPPORT if SPL_NAND_DENALI
        select SPL_OF_CONTROL
        select SPL_SEPARATE_BSS if TARGET_SOCFPGA_STRATIX10
        select SPL_SERIAL_SUPPORT
-       select SPL_SPI_FLASH_SUPPORT if SPL_SPI_SUPPORT
-       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
@@ -810,7 +833,12 @@ config ARCH_SOCFPGA
        imply DM_SPI
        imply DM_SPI_FLASH
        imply FAT_WRITE
+       imply SPL_LIBDISK_SUPPORT
+       imply SPL_MMC_SUPPORT
        imply SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION
+       imply SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION_TYPE
+       imply SPL_SPI_FLASH_SUPPORT
+       imply SPL_SPI_SUPPORT
 
 config ARCH_SUNXI
        bool "Support sunxi (Allwinner) SoCs"
@@ -818,6 +846,7 @@ config ARCH_SUNXI
        select CMD_GPIO
        select CMD_MMC if MMC
        select CMD_USB if DISTRO_DEFAULTS
+       select CLK
        select DM
        select DM_ETH
        select DM_GPIO
@@ -842,17 +871,27 @@ config ARCH_SUNXI
        imply CMD_UBI if NAND
        imply DISTRO_DEFAULTS
        imply FAT_WRITE
+       imply FIT
        imply OF_LIBFDT_OVERLAY
        imply PRE_CONSOLE_BUFFER
        imply SPL_GPIO_SUPPORT
        imply SPL_LIBCOMMON_SUPPORT
-       imply SPL_LIBDISK_SUPPORT
        imply SPL_LIBGENERIC_SUPPORT
        imply SPL_MMC_SUPPORT if MMC
        imply SPL_POWER_SUPPORT
        imply SPL_SERIAL_SUPPORT
        imply USB_GADGET
 
+config ARCH_VERSAL
+       bool "Support Xilinx Versal Platform"
+       select ARM64
+       select CLK
+       select DM
+       select DM_ETH if NET
+       select DM_MMC if MMC
+       select DM_SERIAL
+       select OF_CONTROL
+
 config ARCH_VF610
        bool "Freescale Vybrid"
        select CPU_V7A
@@ -893,24 +932,34 @@ config ARCH_ZYNQMP_R5
        select CLK
        select CPU_V7R
        select DM
+       select DM_ETH if NET
+       select DM_MMC if MMC
        select DM_SERIAL
        select OF_CONTROL
        imply CMD_DM
+       imply DM_USB_GADGET
 
 config ARCH_ZYNQMP
        bool "Xilinx ZynqMP based platform"
        select ARM64
        select CLK
        select DM
+       select DM_ETH if NET
+       select DM_MMC if MMC
        select DM_SERIAL
+       select DM_SPI if SPI
+       select DM_SPI_FLASH if DM_SPI
        select DM_USB if USB
        select OF_CONTROL
        select SPL_BOARD_INIT if SPL
        select SPL_CLK if SPL
+       select SPL_SEPARATE_BSS if SPL
        select SUPPORT_SPL
        imply BOARD_LATE_INIT
        imply CMD_DM
        imply FAT_WRITE
+       imply MP
+       imply DM_USB_GADGET
 
 config TEGRA
        bool "NVIDIA Tegra"
@@ -1391,6 +1440,8 @@ 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"
@@ -1407,7 +1458,9 @@ source "arch/arm/mach-imx/mx7/Kconfig"
 
 source "arch/arm/mach-imx/mx7ulp/Kconfig"
 
-source "arch/arm/mach-imx/mx8m/Kconfig"
+source "arch/arm/mach-imx/imx8/Kconfig"
+
+source "arch/arm/mach-imx/imx8m/Kconfig"
 
 source "arch/arm/mach-imx/mxs/Kconfig"
 
@@ -1423,6 +1476,8 @@ source "arch/arm/mach-rmobile/Kconfig"
 
 source "arch/arm/mach-meson/Kconfig"
 
+source "arch/arm/mach-mediatek/Kconfig"
+
 source "arch/arm/mach-qemu/Kconfig"
 
 source "arch/arm/mach-rockchip/Kconfig"
@@ -1449,12 +1504,14 @@ source "arch/arm/cpu/armv7/vf610/Kconfig"
 
 source "arch/arm/mach-zynq/Kconfig"
 
+source "arch/arm/mach-zynqmp/Kconfig"
+
+source "arch/arm/mach-versal/Kconfig"
+
 source "arch/arm/mach-zynqmp-r5/Kconfig"
 
 source "arch/arm/cpu/armv7/Kconfig"
 
-source "arch/arm/cpu/armv8/zynqmp/Kconfig"
-
 source "arch/arm/cpu/armv8/Kconfig"
 
 source "arch/arm/mach-imx/Kconfig"
@@ -1468,12 +1525,14 @@ source "board/armltd/vexpress/Kconfig"
 source "board/armltd/vexpress64/Kconfig"
 source "board/broadcom/bcm23550_w1d/Kconfig"
 source "board/broadcom/bcm28155_ap/Kconfig"
+source "board/broadcom/bcm968580xref/Kconfig"
 source "board/broadcom/bcmcygnus/Kconfig"
 source "board/broadcom/bcmnsp/Kconfig"
 source "board/broadcom/bcmns2/Kconfig"
 source "board/cavium/thunderx/Kconfig"
 source "board/cirrus/edb93xx/Kconfig"
 source "board/eets/pdu001/Kconfig"
+source "board/emulation/qemu-arm/Kconfig"
 source "board/freescale/ls2080a/Kconfig"
 source "board/freescale/ls2080aqds/Kconfig"
 source "board/freescale/ls2080ardb/Kconfig"
@@ -1507,11 +1566,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"