Merge tag 'arm-multiplatform-5.19-2' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-block.git] / arch / arm / Kconfig

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 001f77e0058cecc2353854c87ca3dcec8d24de8d..41b8b28b7a2dca906e18f3cfe7613ac377bb3085 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -347,22 +347,9 @@ config ARCH_MULTIPLATFORM
        select SPARSE_IRQ
        select USE_OF
 
-config ARCH_EP93XX
-       bool "EP93xx-based"
-       select ARCH_SPARSEMEM_ENABLE
-       select ARM_AMBA
-       imply ARM_PATCH_PHYS_VIRT
-       select ARM_VIC
-       select AUTO_ZRELADDR
-       select CLKSRC_MMIO
-       select CPU_ARM920T
-       select GPIOLIB
-       select COMMON_CLK
-       help
-         This enables support for the Cirrus EP93xx series of CPUs.
-
 config ARCH_FOOTBRIDGE
        bool "FootBridge"
+       depends on CPU_LITTLE_ENDIAN
        select CPU_SA110
        select FOOTBRIDGE
        select NEED_MACH_MEMORY_H
@@ -370,50 +357,10 @@ config ARCH_FOOTBRIDGE
          Support for systems based on the DC21285 companion chip
          ("FootBridge"), such as the Simtec CATS and the Rebel NetWinder.
 
-config ARCH_IOP32X
-       bool "IOP32x-based"
-       select CPU_XSCALE
-       select GPIO_IOP
-       select GPIOLIB
-       select FORCE_PCI
-       select PLAT_IOP
-       help
-         Support for Intel's 80219 and IOP32X (XScale) family of
-         processors.
-
-config ARCH_IXP4XX
-       bool "IXP4xx-based"
-       select ARCH_SUPPORTS_BIG_ENDIAN
-       select ARM_PATCH_PHYS_VIRT
-       select CPU_XSCALE
-       select GPIO_IXP4XX
-       select GPIOLIB
-       select HAVE_PCI
-       select IXP4XX_IRQ
-       select IXP4XX_TIMER
-       select SPARSE_IRQ
-       select USB_EHCI_BIG_ENDIAN_DESC
-       select USB_EHCI_BIG_ENDIAN_MMIO
-       help
-         Support for Intel's IXP4XX (XScale) family of processors.
-
-config ARCH_DOVE
-       bool "Marvell Dove"
-       select CPU_PJ4
-       select GPIOLIB
-       select HAVE_PCI
-       select MVEBU_MBUS
-       select PINCTRL
-       select PINCTRL_DOVE
-       select PLAT_ORION_LEGACY
-       select SPARSE_IRQ
-       select PM_GENERIC_DOMAINS if PM
-       help
-         Support for the Marvell Dove SoC 88AP510
-
 config ARCH_RPC
        bool "RiscPC"
        depends on !CC_IS_CLANG && GCC_VERSION < 90100 && GCC_VERSION >= 60000
+       depends on CPU_LITTLE_ENDIAN
        select ARCH_ACORN
        select ARCH_MAY_HAVE_PC_FDC
        select ARCH_SPARSEMEM_ENABLE
@@ -432,6 +379,7 @@ config ARCH_RPC
 
 config ARCH_SA1100
        bool "SA1100-based"
+       depends on CPU_LITTLE_ENDIAN
        select ARCH_MTD_XIP
        select ARCH_SPARSEMEM_ENABLE
        select CLKSRC_MMIO
@@ -448,33 +396,15 @@ config ARCH_SA1100
        help
          Support for StrongARM 11x0 based boards.
 
-config ARCH_S3C24XX
-       bool "Samsung S3C24XX SoCs"
-       select ATAGS
-       select CLKSRC_SAMSUNG_PWM
-       select GPIO_SAMSUNG
-       select GPIOLIB
-       select NEED_MACH_IO_H
-       select S3C2410_WATCHDOG
-       select SAMSUNG_ATAGS
-       select USE_OF
-       select WATCHDOG
-       help
-         Samsung S3C2410, S3C2412, S3C2413, S3C2416, S3C2440, S3C2442, S3C2443
-         and S3C2450 SoCs based systems, such as the Simtec Electronics BAST
-         (<http://www.simtec.co.uk/products/EB110ITX/>), the IPAQ 1940 or the
-         Samsung SMDK2410 development board (and derivatives).
-
 config ARCH_OMAP1
        bool "TI OMAP1"
-       select ARCH_OMAP
+       depends on CPU_LITTLE_ENDIAN
        select CLKSRC_MMIO
+       select FORCE_PCI if PCCARD
        select GENERIC_IRQ_CHIP
        select GPIOLIB
        select HAVE_LEGACY_CLK
        select IRQ_DOMAIN
-       select NEED_MACH_IO_H if PCCARD
-       select NEED_MACH_MEMORY_H
        select SPARSE_IRQ
        help
          Support for older TI OMAP1 (omap7xx, omap15xx or omap16xx)
@@ -543,7 +473,6 @@ config ARCH_VIRT
        select ARM_GIC_V3_ITS if PCI
        select ARM_PSCI
        select HAVE_ARM_ARCH_TIMER
-       select ARCH_SUPPORTS_BIG_ENDIAN
 
 config ARCH_AIROHA
        bool "Airoha SoC Support"
@@ -604,8 +533,6 @@ source "arch/arm/mach-hisi/Kconfig"
 
 source "arch/arm/mach-imx/Kconfig"
 
-source "arch/arm/mach-integrator/Kconfig"
-
 source "arch/arm/mach-iop32x/Kconfig"
 
 source "arch/arm/mach-ixp4xx/Kconfig"
@@ -638,8 +565,6 @@ source "arch/arm/mach-npcm/Kconfig"
 
 source "arch/arm/mach-nspire/Kconfig"
 
-source "arch/arm/plat-omap/Kconfig"
-
 source "arch/arm/mach-omap1/Kconfig"
 
 source "arch/arm/mach-omap2/Kconfig"
@@ -656,8 +581,6 @@ source "arch/arm/mach-rda/Kconfig"
 
 source "arch/arm/mach-realtek/Kconfig"
 
-source "arch/arm/mach-realview/Kconfig"
-
 source "arch/arm/mach-rockchip/Kconfig"
 
 source "arch/arm/mach-s3c/Kconfig"
@@ -686,8 +609,6 @@ source "arch/arm/mach-ux500/Kconfig"
 
 source "arch/arm/mach-versatile/Kconfig"
 
-source "arch/arm/mach-vexpress/Kconfig"
-
 source "arch/arm/mach-vt8500/Kconfig"
 
 source "arch/arm/mach-zynq/Kconfig"
@@ -720,9 +641,6 @@ config ARCH_MPS2
 config ARCH_ACORN
        bool
 
-config PLAT_IOP
-       bool
-
 config PLAT_ORION
        bool
        select CLKSRC_MMIO
@@ -950,6 +868,17 @@ config ARM_ERRATA_764369
          relevant cache maintenance functions and sets a specific bit
          in the diagnostic control register of the SCU.
 
+config ARM_ERRATA_764319
+       bool "ARM errata: Read to DBGPRSR and DBGOSLSR may generate Undefined instruction"
+       depends on CPU_V7
+       help
+         This option enables the workaround for the 764319 Cortex A-9 erratum.
+         CP14 read accesses to the DBGPRSR and DBGOSLSR registers generate an
+         unexpected Undefined Instruction exception when the DBGSWENABLE
+         external pin is set to 0, even when the CP14 accesses are performed
+         from a privileged mode. This work around catches the exception in a
+         way the kernel does not stop execution.
+
 config ARM_ERRATA_775420
        bool "ARM errata: A data cache maintenance operation which aborts, might lead to deadlock"
        depends on CPU_V7