Merge tag 'u-boot-atmel-fixes-2020.07-a' of https://gitlab.denx.de/u-boot/custodians...

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

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 5d367888d8a5488fe224b2694d627afd4955a248..21df1c415f58897caa6575c14057612669d6a9d1 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -340,6 +340,34 @@ config SYS_CACHELINE_SIZE
        default 64 if SYS_CACHE_SHIFT_6
        default 32 if SYS_CACHE_SHIFT_5
 
+choice
+       prompt "Select the ARM data write cache policy"
+       default SYS_ARM_CACHE_WRITETHROUGH if TARGET_BCMCYGNUS || \
+                                             TARGET_BCMNSP || CPU_PXA || RZA1
+       default SYS_ARM_CACHE_WRITEBACK
+
+config SYS_ARM_CACHE_WRITEBACK
+       bool "Write-back (WB)"
+       help
+         A write updates the cache only and marks the cache line as dirty.
+         External memory is updated only when the line is evicted or explicitly
+         cleaned.
+
+config SYS_ARM_CACHE_WRITETHROUGH
+       bool "Write-through (WT)"
+       help
+         A write updates both the cache and the external memory system.
+         This does not mark the cache line as dirty.
+
+config SYS_ARM_CACHE_WRITEALLOC
+       bool "Write allocation (WA)"
+       help
+         A cache line is allocated on a write miss. This means that executing a
+         store instruction on the processor might cause a burst read to occur.
+         There is a linefill to obtain the data for the cache line, before the
+         write is performed.
+endchoice
+
 config ARCH_CPU_INIT
        bool "Enable ARCH_CPU_INIT"
        help
@@ -475,7 +503,7 @@ config TPL_USE_ARCH_MEMSET
 
 config SET_STACK_SIZE
        bool "Enable an option to set max stack size that can be used"
-       default y if ARCH_VERSAL || ARCH_ZYNQMP
+       default y if ARCH_VERSAL || ARCH_ZYNQMP || ARCH_ZYNQ
        help
          This will enable an option to set max stack size that can be
          used by U-Boot.
@@ -484,6 +512,7 @@ config STACK_SIZE
        hex "Define max stack size that can be used by U-Boot"
        depends on SET_STACK_SIZE
        default 0x4000000 if ARCH_VERSAL || ARCH_ZYNQMP
+       default 0x1000000 if ARCH_ZYNQ
        help
          Define Max stack size that can be used by U-Boot so that the
          initrd_high will be calculated as base stack pointer minus this
@@ -524,7 +553,7 @@ config ARCH_DAVINCI
        help
          Support for TI's DaVinci platform.
 
-config KIRKWOOD
+config ARCH_KIRKWOOD
        bool "Marvell Kirkwood"
        select ARCH_MISC_INIT
        select BOARD_EARLY_INIT_F
@@ -547,7 +576,7 @@ config TARGET_APF27
        select CPU_ARM926EJS
        select SUPPORT_SPL
 
-config ORION5X
+config ARCH_ORION5X
        bool "Marvell Orion"
        select CPU_ARM926EJS
 
@@ -762,6 +791,7 @@ config ARCH_OMAP2PLUS
 config ARCH_MESON
        bool "Amlogic Meson"
        imply DISTRO_DEFAULTS
+       imply DM_RNG
        help
          Support for the Meson SoC family developed by Amlogic Inc.,
          targeted at media players and tablet computers. We currently
@@ -873,10 +903,13 @@ config ARCH_MX5
 
 config ARCH_OWL
        bool "Actions Semi OWL SoCs"
-       select ARM64
        select DM
        select DM_SERIAL
+       select OWL_SERIAL
+       select CLK
+       select CLK_OWL
        select OF_CONTROL
+       select SYS_RELOC_GD_ENV_ADDR
        imply CMD_DM
 
 config ARCH_QEMU
@@ -989,6 +1022,8 @@ config ARCH_SUNXI
        select USB_KEYBOARD if DISTRO_DEFAULTS
        select USB_STORAGE if DISTRO_DEFAULTS
        select SPL_USE_TINY_PRINTF
+       select USE_PREBOOT
+       select SYS_RELOC_GD_ENV_ADDR
        imply CMD_DM
        imply CMD_GPT
        imply CMD_UBI if MTD_RAW_NAND
@@ -1107,7 +1142,7 @@ config ARCH_ZYNQMP
        imply MP
        imply DM_USB_GADGET
 
-config TEGRA
+config ARCH_TEGRA
        bool "NVIDIA Tegra"
        imply DISTRO_DEFAULTS
        imply FAT_WRITE
@@ -1127,6 +1162,17 @@ config TARGET_VEXPRESS64_JUNO
        bool "Support Versatile Express Juno Development Platform"
        select ARM64
        select PL01X_SERIAL
+       select DM
+       select OF_CONTROL
+       select OF_BOARD
+       select CLK
+       select DM_SERIAL
+       select ARM_PSCI_FW
+       select PSCI_RESET
+       select DM
+       select BLK
+       select USB
+       select DM_USB
 
 config TARGET_LS2080A_EMU
        bool "Support ls2080a_emu"
@@ -1366,6 +1412,7 @@ config TARGET_LS1028ARDB
        select ARM64
        select ARMV8_MULTIENTRY
        select ARCH_SUPPORT_TFABOOT
+       select BOARD_LATE_INIT
        help
          Support for Freescale LS1028ARDB platform
          The LS1028A Development System (RDB) is a high-performance
@@ -1535,6 +1582,7 @@ config ARCH_UNIPHIER
        bool "Socionext UniPhier SoCs"
        select BOARD_LATE_INIT
        select DM
+       select DM_ETH
        select DM_GPIO
        select DM_I2C
        select DM_MMC
@@ -1560,7 +1608,7 @@ config ARCH_UNIPHIER
          Support for UniPhier SoC family developed by Socionext Inc.
          (formerly, System LSI Business Division of Panasonic Corporation)
 
-config STM32
+config ARCH_STM32
        bool "Support STMicroelectronics STM32 MCU with cortex M"
        select CPU_V7M
        select DM
@@ -1583,6 +1631,7 @@ config ARCH_STI
 config ARCH_STM32MP
        bool "Support STMicroelectronics STM32MP Socs with cortex A"
        select ARCH_MISC_INIT
+       select ARCH_SUPPORT_TFABOOT
        select BOARD_LATE_INIT
        select CLK
        select DM
@@ -1729,7 +1778,7 @@ source "arch/arm/mach-keystone/Kconfig"
 
 source "arch/arm/mach-kirkwood/Kconfig"
 
-source "arch/arm/cpu/arm926ejs/lpc32xx/Kconfig"
+source "arch/arm/mach-lpc32xx/Kconfig"
 
 source "arch/arm/mach-mvebu/Kconfig"
 
@@ -1865,7 +1914,6 @@ source "board/spear/spear600/Kconfig"
 source "board/spear/x600/Kconfig"
 source "board/st/stv0991/Kconfig"
 source "board/tcl/sl50/Kconfig"
-source "board/ucRobotics/bubblegum_96/Kconfig"
 source "board/birdland/bav335x/Kconfig"
 source "board/toradex/colibri_pxa270/Kconfig"
 source "board/variscite/dart_6ul/Kconfig"