Skip to content

L
linux
Commit a65b5f4c authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files
Options

Merge branch 'cleanup/kconfig' into next/drivers 

This resolves a conflict between the new sti reset
controller driver and the Kconfig cleanup.
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 9ad2a24f 4b8b5f25
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 228 deletions
arch/arm/Kconfig
View file @ a65b5f4c
...@@ -306,9 +306,11 @@ choice ...@@ -306,9 +306,11 @@ choice
config ARCH_MULTIPLATFORM config ARCH_MULTIPLATFORM
bool "Allow multiple platforms to be selected" bool "Allow multiple platforms to be selected"
depends on MMU depends on MMU
select ARCH_WANT_OPTIONAL_GPIOLIB
select ARM_PATCH_PHYS_VIRT select ARM_PATCH_PHYS_VIRT
select AUTO_ZRELADDR select AUTO_ZRELADDR
select COMMON_CLK select COMMON_CLK
select GENERIC_CLOCKEVENTS
select MULTI_IRQ_HANDLER select MULTI_IRQ_HANDLER
select SPARSE_IRQ select SPARSE_IRQ
select USE_OF select USE_OF
...@@ -907,16 +909,18 @@ config ARCH_MULTI_V4_V5 ...@@ -907,16 +909,18 @@ config ARCH_MULTI_V4_V5
config ARCH_MULTI_V6 config ARCH_MULTI_V6
bool "ARMv6 based platforms (ARM11)" bool "ARMv6 based platforms (ARM11)"
select ARCH_MULTI_V6_V7 select ARCH_MULTI_V6_V7
select CPU_V6 select CPU_V6K
config ARCH_MULTI_V7 config ARCH_MULTI_V7
bool "ARMv7 based platforms (Cortex-A, PJ4, Scorpion, Krait)" bool "ARMv7 based platforms (Cortex-A, PJ4, Scorpion, Krait)"
default y default y
select ARCH_MULTI_V6_V7 select ARCH_MULTI_V6_V7
select CPU_V7 select CPU_V7
select HAVE_SMP
config ARCH_MULTI_V6_V7 config ARCH_MULTI_V6_V7
bool bool
select MIGHT_HAVE_CACHE_L2X0
config ARCH_MULTI_CPU_AUTO config ARCH_MULTI_CPU_AUTO
def_bool !(ARCH_MULTI_V4 || ARCH_MULTI_V4T || ARCH_MULTI_V6_V7) def_bool !(ARCH_MULTI_V4 || ARCH_MULTI_V4T || ARCH_MULTI_V6_V7)
...@@ -924,6 +928,13 @@ config ARCH_MULTI_CPU_AUTO ...@@ -924,6 +928,13 @@ config ARCH_MULTI_CPU_AUTO
endmenu endmenu
config ARCH_VIRT
bool "Dummy Virtual Machine" if ARCH_MULTI_V7
select ARM_AMBA
select ARM_GIC
select ARM_PSCI
select HAVE_ARM_ARCH_TIMER
# #
# This is sorted alphabetically by mach-* pathname. However, plat-* # This is sorted alphabetically by mach-* pathname. However, plat-*
# Kconfigs may be included either alphabetically (according to the # Kconfigs may be included either alphabetically (according to the
...@@ -1049,8 +1060,6 @@ source "arch/arm/mach-versatile/Kconfig" ...@@ -1049,8 +1060,6 @@ source "arch/arm/mach-versatile/Kconfig"
source "arch/arm/mach-vexpress/Kconfig" source "arch/arm/mach-vexpress/Kconfig"
source "arch/arm/plat-versatile/Kconfig" source "arch/arm/plat-versatile/Kconfig"
source "arch/arm/mach-virt/Kconfig"
source "arch/arm/mach-vt8500/Kconfig" source "arch/arm/mach-vt8500/Kconfig"
source "arch/arm/mach-w90x900/Kconfig" source "arch/arm/mach-w90x900/Kconfig"
......
arch/arm/Makefile
View file @ a65b5f4c
...@@ -200,7 +200,6 @@ machine-$(CONFIG_ARCH_U300) += u300 ...@@ -200,7 +200,6 @@ machine-$(CONFIG_ARCH_U300) += u300
machine-$(CONFIG_ARCH_U8500) += ux500 machine-$(CONFIG_ARCH_U8500) += ux500
machine-$(CONFIG_ARCH_VERSATILE) += versatile machine-$(CONFIG_ARCH_VERSATILE) += versatile
machine-$(CONFIG_ARCH_VEXPRESS) += vexpress machine-$(CONFIG_ARCH_VEXPRESS) += vexpress
machine-$(CONFIG_ARCH_VIRT) += virt
machine-$(CONFIG_ARCH_VT8500) += vt8500 machine-$(CONFIG_ARCH_VT8500) += vt8500
machine-$(CONFIG_ARCH_W90X900) += w90x900 machine-$(CONFIG_ARCH_W90X900) += w90x900
machine-$(CONFIG_ARCH_ZYNQ) += zynq machine-$(CONFIG_ARCH_ZYNQ) += zynq
......
arch/arm/mach-bcm/Kconfig
View file @ a65b5f4c
...@@ -16,12 +16,7 @@ config ARCH_BCM_MOBILE ...@@ -16,12 +16,7 @@ config ARCH_BCM_MOBILE
select ARM_ERRATA_754322 select ARM_ERRATA_754322
select ARM_ERRATA_764369 if SMP select ARM_ERRATA_764369 if SMP
select ARM_GIC select ARM_GIC
select CPU_V7
select CLKSRC_OF
select GENERIC_CLOCKEVENTS
select GENERIC_TIME
select GPIO_BCM_KONA select GPIO_BCM_KONA
select SPARSE_IRQ
select TICK_ONESHOT select TICK_ONESHOT
select CACHE_L2X0 select CACHE_L2X0
select HAVE_ARM_ARCH_TIMER select HAVE_ARM_ARCH_TIMER
......
arch/arm/mach-bcm2835/Kconfig
View file @ a65b5f4c
...@@ -4,10 +4,6 @@ config ARCH_BCM2835 ...@@ -4,10 +4,6 @@ config ARCH_BCM2835
select ARM_AMBA select ARM_AMBA
select ARM_ERRATA_411920 select ARM_ERRATA_411920
select ARM_TIMER_SP804 select ARM_TIMER_SP804
select CLKDEV_LOOKUP
select CLKSRC_OF
select CPU_V6
select GENERIC_CLOCKEVENTS
select PINCTRL select PINCTRL
select PINCTRL_BCM2835 select PINCTRL_BCM2835
help help
......
arch/arm/mach-berlin/Kconfig
View file @ a65b5f4c
config ARCH_BERLIN config ARCH_BERLIN
bool "Marvell Berlin SoCs" if ARCH_MULTI_V7 bool "Marvell Berlin SoCs" if ARCH_MULTI_V7
select ARM_GIC select ARM_GIC
select GENERIC_CLOCKEVENTS
select GENERIC_IRQ_CHIP select GENERIC_IRQ_CHIP
select COMMON_CLK
select DW_APB_ICTL select DW_APB_ICTL
select DW_APB_TIMER_OF select DW_APB_TIMER_OF
...@@ -16,12 +14,10 @@ config MACH_BERLIN_BG2 ...@@ -16,12 +14,10 @@ config MACH_BERLIN_BG2
select CACHE_L2X0 select CACHE_L2X0
select CPU_PJ4B select CPU_PJ4B
select HAVE_ARM_TWD if SMP select HAVE_ARM_TWD if SMP
select HAVE_SMP
config MACH_BERLIN_BG2CD config MACH_BERLIN_BG2CD
bool "Marvell Armada 1500-mini (BG2CD)" bool "Marvell Armada 1500-mini (BG2CD)"
select CACHE_L2X0 select CACHE_L2X0
select CPU_V7
select HAVE_ARM_TWD if SMP select HAVE_ARM_TWD if SMP
endmenu endmenu
......
arch/arm/mach-cns3xxx/Kconfig
View file @ a65b5f4c
config ARCH_CNS3XXX config ARCH_CNS3XXX
bool "Cavium Networks CNS3XXX family" if ARCH_MULTI_V6 bool "Cavium Networks CNS3XXX family" if ARCH_MULTI_V6
select ARM_GIC select ARM_GIC
select CPU_V6K
select GENERIC_CLOCKEVENTS
select MIGHT_HAVE_CACHE_L2X0
select MIGHT_HAVE_PCI select MIGHT_HAVE_PCI
select PCI_DOMAINS if PCI select PCI_DOMAINS if PCI
help help
......
arch/arm/mach-highbank/Kconfig
View file @ a65b5f4c
...@@ -5,7 +5,6 @@ config ARCH_HIGHBANK ...@@ -5,7 +5,6 @@ config ARCH_HIGHBANK
select ARCH_HAS_HOLES_MEMORYMODEL select ARCH_HAS_HOLES_MEMORYMODEL
select ARCH_HAS_OPP select ARCH_HAS_OPP
select ARCH_SUPPORTS_BIG_ENDIAN select ARCH_SUPPORTS_BIG_ENDIAN
select ARCH_WANT_OPTIONAL_GPIOLIB
select ARM_AMBA select ARM_AMBA
select ARM_ERRATA_764369 if SMP select ARM_ERRATA_764369 if SMP
select ARM_ERRATA_775420 select ARM_ERRATA_775420
...@@ -14,14 +13,8 @@ config ARCH_HIGHBANK ...@@ -14,14 +13,8 @@ config ARCH_HIGHBANK
select ARM_PSCI select ARM_PSCI
select ARM_TIMER_SP804 select ARM_TIMER_SP804
select CACHE_L2X0 select CACHE_L2X0
select COMMON_CLK
select CPU_V7
select GENERIC_CLOCKEVENTS
select HAVE_ARM_SCU select HAVE_ARM_SCU
select HAVE_ARM_TWD if SMP select HAVE_ARM_TWD if SMP
select HAVE_SMP
select MAILBOX select MAILBOX
select PL320_MBOX select PL320_MBOX
select SPARSE_IRQ
select USE_OF
select ZONE_DMA if ARM_LPAE select ZONE_DMA if ARM_LPAE
arch/arm/mach-hisi/Kconfig
View file @ a65b5f4c
...@@ -3,13 +3,9 @@ config ARCH_HI3xxx ...@@ -3,13 +3,9 @@ config ARCH_HI3xxx
select ARM_AMBA select ARM_AMBA
select ARM_GIC select ARM_GIC
select ARM_TIMER_SP804 select ARM_TIMER_SP804
select ARCH_WANT_OPTIONAL_GPIOLIB
select CACHE_L2X0 select CACHE_L2X0
select CLKSRC_OF
select GENERIC_CLOCKEVENTS
select HAVE_ARM_SCU select HAVE_ARM_SCU
select HAVE_ARM_TWD if SMP select HAVE_ARM_TWD if SMP
select HAVE_SMP
select PINCTRL select PINCTRL
select PINCTRL_SINGLE select PINCTRL_SINGLE
help help
......
arch/arm/mach-imx/Kconfig
View file @ a65b5f4c
...@@ -2,18 +2,11 @@ config ARCH_MXC ...@@ -2,18 +2,11 @@ config ARCH_MXC
bool "Freescale i.MX family" if ARCH_MULTI_V4_V5 || ARCH_MULTI_V6_V7 bool "Freescale i.MX family" if ARCH_MULTI_V4_V5 || ARCH_MULTI_V6_V7
select ARCH_REQUIRE_GPIOLIB select ARCH_REQUIRE_GPIOLIB
select ARM_CPU_SUSPEND if PM select ARM_CPU_SUSPEND if PM
select ARM_PATCH_PHYS_VIRT
select CLKSRC_MMIO select CLKSRC_MMIO
select COMMON_CLK
select GENERIC_ALLOCATOR select GENERIC_ALLOCATOR
select GENERIC_CLOCKEVENTS
select GENERIC_IRQ_CHIP select GENERIC_IRQ_CHIP
select MIGHT_HAVE_CACHE_L2X0 if ARCH_MULTI_V6_V7
select MULTI_IRQ_HANDLER
select PINCTRL select PINCTRL
select SOC_BUS select SOC_BUS
select SPARSE_IRQ
select USE_OF
help help
Support for Freescale MXC/iMX-based family of processors Support for Freescale MXC/iMX-based family of processors
...@@ -121,7 +114,6 @@ config SOC_IMX31 ...@@ -121,7 +114,6 @@ config SOC_IMX31
config SOC_IMX35 config SOC_IMX35
bool bool
select ARCH_MXC_IOMUX_V3 select ARCH_MXC_IOMUX_V3
select CPU_V6K
select HAVE_EPIT select HAVE_EPIT
select MXC_AVIC select MXC_AVIC
select SMP_ON_UP if SMP select SMP_ON_UP if SMP
...@@ -132,7 +124,6 @@ config SOC_IMX5 ...@@ -132,7 +124,6 @@ config SOC_IMX5
select ARCH_HAS_CPUFREQ select ARCH_HAS_CPUFREQ
select ARCH_HAS_OPP select ARCH_HAS_OPP
select ARCH_MXC_IOMUX_V3 select ARCH_MXC_IOMUX_V3
select CPU_V7
select MXC_TZIC select MXC_TZIC
config SOC_IMX51 config SOC_IMX51
...@@ -792,14 +783,12 @@ config SOC_IMX6Q ...@@ -792,14 +783,12 @@ config SOC_IMX6Q
select ARM_ERRATA_764369 if SMP select ARM_ERRATA_764369 if SMP
select ARM_ERRATA_775420 select ARM_ERRATA_775420
select ARM_GIC select ARM_GIC
select CPU_V7
select HAVE_ARM_SCU if SMP select HAVE_ARM_SCU if SMP
select HAVE_ARM_TWD if SMP select HAVE_ARM_TWD if SMP
select HAVE_IMX_ANATOP select HAVE_IMX_ANATOP
select HAVE_IMX_GPC select HAVE_IMX_GPC
select HAVE_IMX_MMDC select HAVE_IMX_MMDC
select HAVE_IMX_SRC select HAVE_IMX_SRC
select HAVE_SMP
select MFD_SYSCON select MFD_SYSCON
select MIGHT_HAVE_PCI select MIGHT_HAVE_PCI
select PCI_DOMAINS if PCI select PCI_DOMAINS if PCI
...@@ -817,7 +806,6 @@ config SOC_IMX6SL ...@@ -817,7 +806,6 @@ config SOC_IMX6SL
select ARM_ERRATA_754322 select ARM_ERRATA_754322
select ARM_ERRATA_775420 select ARM_ERRATA_775420
select ARM_GIC select ARM_GIC
select CPU_V7
select HAVE_IMX_ANATOP select HAVE_IMX_ANATOP
select HAVE_IMX_GPC select HAVE_IMX_GPC
select HAVE_IMX_MMDC select HAVE_IMX_MMDC
...@@ -833,9 +821,7 @@ config SOC_IMX6SL ...@@ -833,9 +821,7 @@ config SOC_IMX6SL
config SOC_VF610 config SOC_VF610
bool "Vybrid Family VF610 support" bool "Vybrid Family VF610 support"
select CPU_V7
select ARM_GIC select ARM_GIC
select CLKSRC_OF
select PINCTRL_VF610 select PINCTRL_VF610
select VF_PIT_TIMER select VF_PIT_TIMER
select PL310_ERRATA_588369 if CACHE_PL310 select PL310_ERRATA_588369 if CACHE_PL310
......
arch/arm/mach-keystone/Kconfig
View file @ a65b5f4c
config ARCH_KEYSTONE config ARCH_KEYSTONE
bool "Texas Instruments Keystone Devices" bool "Texas Instruments Keystone Devices"
depends on ARCH_MULTI_V7 depends on ARCH_MULTI_V7
select CPU_V7
select ARM_GIC select ARM_GIC
select HAVE_ARM_ARCH_TIMER select HAVE_ARM_ARCH_TIMER
select HAVE_SMP
select CLKSRC_MMIO select CLKSRC_MMIO
select GENERIC_CLOCKEVENTS
select ARCH_WANT_OPTIONAL_GPIOLIB
select ARM_ERRATA_798181 if SMP select ARM_ERRATA_798181 if SMP
select COMMON_CLK_KEYSTONE select COMMON_CLK_KEYSTONE
select ARCH_SUPPORTS_BIG_ENDIAN select ARCH_SUPPORTS_BIG_ENDIAN
......
arch/arm/mach-moxart/Kconfig
View file @ a65b5f4c
...@@ -2,14 +2,9 @@ config ARCH_MOXART ...@@ -2,14 +2,9 @@ config ARCH_MOXART
bool "MOXA ART SoC" if ARCH_MULTI_V4T bool "MOXA ART SoC" if ARCH_MULTI_V4T
select CPU_FA526 select CPU_FA526
select ARM_DMA_MEM_BUFFERABLE select ARM_DMA_MEM_BUFFERABLE
select USE_OF
select CLKSRC_OF
select CLKSRC_MMIO select CLKSRC_MMIO
select HAVE_CLK
select COMMON_CLK
select GENERIC_IRQ_CHIP select GENERIC_IRQ_CHIP
select ARCH_REQUIRE_GPIOLIB select ARCH_REQUIRE_GPIOLIB
select GENERIC_CLOCKEVENTS
select PHYLIB if NETDEVICES select PHYLIB if NETDEVICES
help help
Say Y here if you want to run your kernel on hardware with a Say Y here if you want to run your kernel on hardware with a
......
arch/arm/mach-mvebu/Kconfig
View file @ a65b5f4c
...@@ -2,15 +2,10 @@ config ARCH_MVEBU ...@@ -2,15 +2,10 @@ config ARCH_MVEBU
bool "Marvell SOCs with Device Tree support" if ARCH_MULTI_V7 bool "Marvell SOCs with Device Tree support" if ARCH_MULTI_V7
select ARCH_SUPPORTS_BIG_ENDIAN select ARCH_SUPPORTS_BIG_ENDIAN
select CLKSRC_MMIO select CLKSRC_MMIO
select COMMON_CLK
select GENERIC_CLOCKEVENTS
select GENERIC_IRQ_CHIP select GENERIC_IRQ_CHIP
select IRQ_DOMAIN select IRQ_DOMAIN
select MULTI_IRQ_HANDLER
select PINCTRL select PINCTRL
select PLAT_ORION select PLAT_ORION
select SPARSE_IRQ
select CLKDEV_LOOKUP
select MVEBU_MBUS select MVEBU_MBUS
select ZONE_DMA if ARM_LPAE select ZONE_DMA if ARM_LPAE
select ARCH_REQUIRE_GPIOLIB select ARCH_REQUIRE_GPIOLIB
...@@ -24,7 +19,6 @@ menu "Marvell SOC with device tree" ...@@ -24,7 +19,6 @@ menu "Marvell SOC with device tree"
config MACH_ARMADA_370_XP config MACH_ARMADA_370_XP
bool bool
select ARMADA_370_XP_TIMER select ARMADA_370_XP_TIMER
select HAVE_SMP
select CACHE_L2X0 select CACHE_L2X0
select CPU_PJ4B select CPU_PJ4B
......
arch/arm/mach-mxs/Kconfig
View file @ a65b5f4c
...@@ -16,11 +16,7 @@ config ARCH_MXS ...@@ -16,11 +16,7 @@ config ARCH_MXS
bool "Freescale MXS (i.MX23, i.MX28) support" bool "Freescale MXS (i.MX23, i.MX28) support"
depends on ARCH_MULTI_V5 depends on ARCH_MULTI_V5
select ARCH_REQUIRE_GPIOLIB select ARCH_REQUIRE_GPIOLIB
select CLKDEV_LOOKUP
select CLKSRC_MMIO select CLKSRC_MMIO
select CLKSRC_OF
select GENERIC_CLOCKEVENTS
select HAVE_CLK_PREPARE
select PINCTRL select PINCTRL
select SOC_BUS select SOC_BUS
select SOC_IMX23 select SOC_IMX23
......
arch/arm/mach-nomadik/Kconfig
View file @ a65b5f4c
...@@ -6,16 +6,11 @@ config ARCH_NOMADIK ...@@ -6,16 +6,11 @@ config ARCH_NOMADIK
select ARM_VIC select ARM_VIC
select CLKSRC_NOMADIK_MTU select CLKSRC_NOMADIK_MTU
select CLKSRC_NOMADIK_MTU_SCHED_CLOCK select CLKSRC_NOMADIK_MTU_SCHED_CLOCK
select CLKSRC_OF
select COMMON_CLK
select CPU_ARM926T select CPU_ARM926T
select GENERIC_CLOCKEVENTS
select MIGHT_HAVE_CACHE_L2X0 select MIGHT_HAVE_CACHE_L2X0
select PINCTRL select PINCTRL
select PINCTRL_NOMADIK select PINCTRL_NOMADIK
select PINCTRL_STN8815 select PINCTRL_STN8815
select SPARSE_IRQ
select USE_OF
help help
Support for the Nomadik platform by ST-Ericsson Support for the Nomadik platform by ST-Ericsson
......
arch/arm/mach-nspire/Kconfig
View file @ a65b5f4c
...@@ -3,14 +3,9 @@ config ARCH_NSPIRE ...@@ -3,14 +3,9 @@ config ARCH_NSPIRE
depends on ARCH_MULTI_V4_V5 depends on ARCH_MULTI_V4_V5
depends on MMU depends on MMU
select CPU_ARM926T select CPU_ARM926T
select COMMON_CLK
select GENERIC_CLOCKEVENTS
select GENERIC_IRQ_CHIP select GENERIC_IRQ_CHIP
select SPARSE_IRQ
select ARM_AMBA select ARM_AMBA
select ARM_VIC select ARM_VIC
select ARM_TIMER_SP804 select ARM_TIMER_SP804
select USE_OF
select CLKSRC_OF
help help
This enables support for systems using the TI-NSPIRE CPU This enables support for systems using the TI-NSPIRE CPU
arch/arm/mach-omap2/Kconfig
View file @ a65b5f4c
...@@ -6,7 +6,6 @@ config ARCH_OMAP2 ...@@ -6,7 +6,6 @@ config ARCH_OMAP2
depends on ARCH_MULTI_V6 depends on ARCH_MULTI_V6
select ARCH_OMAP2PLUS select ARCH_OMAP2PLUS
select CPU_V6 select CPU_V6
select MULTI_IRQ_HANDLER
select SOC_HAS_OMAP2_SDRC select SOC_HAS_OMAP2_SDRC
config ARCH_OMAP3 config ARCH_OMAP3
...@@ -15,8 +14,6 @@ config ARCH_OMAP3 ...@@ -15,8 +14,6 @@ config ARCH_OMAP3
select ARCH_OMAP2PLUS select ARCH_OMAP2PLUS
select ARCH_HAS_OPP select ARCH_HAS_OPP
select ARM_CPU_SUSPEND if PM select ARM_CPU_SUSPEND if PM
select CPU_V7
select MULTI_IRQ_HANDLER
select OMAP_INTERCONNECT select OMAP_INTERCONNECT
select PM_OPP if PM select PM_OPP if PM
select PM_RUNTIME if CPU_IDLE select PM_RUNTIME if CPU_IDLE
...@@ -33,10 +30,8 @@ config ARCH_OMAP4 ...@@ -33,10 +30,8 @@ config ARCH_OMAP4
select ARM_ERRATA_720789 select ARM_ERRATA_720789
select ARM_GIC select ARM_GIC
select CACHE_L2X0 select CACHE_L2X0
select CPU_V7
select HAVE_ARM_SCU if SMP select HAVE_ARM_SCU if SMP
select HAVE_ARM_TWD if SMP select HAVE_ARM_TWD if SMP
select HAVE_SMP
select OMAP_INTERCONNECT select OMAP_INTERCONNECT
select PL310_ERRATA_588369 select PL310_ERRATA_588369
select PL310_ERRATA_727915 select PL310_ERRATA_727915
...@@ -52,10 +47,8 @@ config SOC_OMAP5 ...@@ -52,10 +47,8 @@ config SOC_OMAP5
select ARCH_OMAP2PLUS select ARCH_OMAP2PLUS
select ARM_CPU_SUSPEND if PM select ARM_CPU_SUSPEND if PM
select ARM_GIC select ARM_GIC
select CPU_V7
select HAVE_ARM_SCU if SMP select HAVE_ARM_SCU if SMP
select HAVE_ARM_TWD if SMP select HAVE_ARM_TWD if SMP
select HAVE_SMP
select HAVE_ARM_ARCH_TIMER select HAVE_ARM_ARCH_TIMER
select ARM_ERRATA_798181 if SMP select ARM_ERRATA_798181 if SMP
...@@ -64,15 +57,11 @@ config SOC_AM33XX ...@@ -64,15 +57,11 @@ config SOC_AM33XX
depends on ARCH_MULTI_V7 depends on ARCH_MULTI_V7
select ARCH_OMAP2PLUS select ARCH_OMAP2PLUS
select ARM_CPU_SUSPEND if PM select ARM_CPU_SUSPEND if PM
select CPU_V7
select MULTI_IRQ_HANDLER
config SOC_AM43XX config SOC_AM43XX
bool "TI AM43x" bool "TI AM43x"
depends on ARCH_MULTI_V7 depends on ARCH_MULTI_V7
select CPU_V7
select ARCH_OMAP2PLUS select ARCH_OMAP2PLUS
select MULTI_IRQ_HANDLER
select ARM_GIC select ARM_GIC
select MACH_OMAP_GENERIC select MACH_OMAP_GENERIC
...@@ -82,8 +71,6 @@ config SOC_DRA7XX ...@@ -82,8 +71,6 @@ config SOC_DRA7XX
select ARCH_OMAP2PLUS select ARCH_OMAP2PLUS
select ARM_CPU_SUSPEND if PM select ARM_CPU_SUSPEND if PM
select ARM_GIC select ARM_GIC
select CPU_V7
select HAVE_SMP
select HAVE_ARM_ARCH_TIMER select HAVE_ARM_ARCH_TIMER
select IRQ_CROSSBAR select IRQ_CROSSBAR
...@@ -95,17 +82,13 @@ config ARCH_OMAP2PLUS ...@@ -95,17 +82,13 @@ config ARCH_OMAP2PLUS
select ARCH_OMAP select ARCH_OMAP
select ARCH_REQUIRE_GPIOLIB select ARCH_REQUIRE_GPIOLIB
select CLKSRC_MMIO select CLKSRC_MMIO
select COMMON_CLK
select GENERIC_CLOCKEVENTS
select GENERIC_IRQ_CHIP select GENERIC_IRQ_CHIP
select MACH_OMAP_GENERIC select MACH_OMAP_GENERIC
select OMAP_DM_TIMER select OMAP_DM_TIMER
select PINCTRL select PINCTRL
select PROC_DEVICETREE if PROC_FS select PROC_DEVICETREE if PROC_FS
select SOC_BUS select SOC_BUS
select SPARSE_IRQ
select TI_PRIV_EDMA select TI_PRIV_EDMA
select USE_OF
help help
Systems based on OMAP2, OMAP3, OMAP4 or OMAP5 Systems based on OMAP2, OMAP3, OMAP4 or OMAP5
......
arch/arm/mach-picoxcell/Kconfig
View file @ a65b5f4c
config ARCH_PICOXCELL config ARCH_PICOXCELL
bool "Picochip PicoXcell" if ARCH_MULTI_V6 bool "Picochip PicoXcell" if ARCH_MULTI_V6
select ARCH_REQUIRE_GPIOLIB select ARCH_REQUIRE_GPIOLIB
select ARM_PATCH_PHYS_VIRT
select ARM_VIC select ARM_VIC
select CPU_V6K
select DW_APB_TIMER_OF select DW_APB_TIMER_OF
select GENERIC_CLOCKEVENTS
select HAVE_TCM select HAVE_TCM
select NO_IOPORT select NO_IOPORT
select SPARSE_IRQ
select USE_OF
arch/arm/mach-prima2/Kconfig
View file @ a65b5f4c
config ARCH_SIRF config ARCH_SIRF
bool "CSR SiRF" if ARCH_MULTI_V7 bool "CSR SiRF" if ARCH_MULTI_V7
select ARCH_REQUIRE_GPIOLIB select ARCH_REQUIRE_GPIOLIB
select GENERIC_CLOCKEVENTS
select GENERIC_IRQ_CHIP select GENERIC_IRQ_CHIP
select MIGHT_HAVE_CACHE_L2X0
select NO_IOPORT select NO_IOPORT
select PINCTRL select PINCTRL
select PINCTRL_SIRF select PINCTRL_SIRF
...@@ -17,7 +15,6 @@ menu "CSR SiRF atlas6/primaII/Marco/Polo Specific Features" ...@@ -17,7 +15,6 @@ menu "CSR SiRF atlas6/primaII/Marco/Polo Specific Features"
config ARCH_ATLAS6 config ARCH_ATLAS6
bool "CSR SiRFSoC ATLAS6 ARM Cortex A9 Platform" bool "CSR SiRFSoC ATLAS6 ARM Cortex A9 Platform"
default y default y
select CPU_V7
select SIRF_IRQ select SIRF_IRQ
help help
Support for CSR SiRFSoC ARM Cortex A9 Platform Support for CSR SiRFSoC ARM Cortex A9 Platform
...@@ -25,7 +22,6 @@ config ARCH_ATLAS6 ...@@ -25,7 +22,6 @@ config ARCH_ATLAS6
config ARCH_PRIMA2 config ARCH_PRIMA2
bool "CSR SiRFSoC PRIMA2 ARM Cortex A9 Platform" bool "CSR SiRFSoC PRIMA2 ARM Cortex A9 Platform"
default y default y
select CPU_V7
select SIRF_IRQ select SIRF_IRQ
select ZONE_DMA select ZONE_DMA
help help
...@@ -35,9 +31,7 @@ config ARCH_MARCO ...@@ -35,9 +31,7 @@ config ARCH_MARCO
bool "CSR SiRFSoC MARCO ARM Cortex A9 Platform" bool "CSR SiRFSoC MARCO ARM Cortex A9 Platform"
default y default y
select ARM_GIC select ARM_GIC
select CPU_V7
select HAVE_ARM_SCU if SMP select HAVE_ARM_SCU if SMP
select HAVE_SMP
select SMP_ON_UP if SMP select SMP_ON_UP if SMP
help help
Support for CSR SiRFSoC ARM Cortex A9 Platform Support for CSR SiRFSoC ARM Cortex A9 Platform
......
arch/arm/mach-rockchip/Kconfig
View file @ a65b5f4c
...@@ -6,9 +6,6 @@ config ARCH_ROCKCHIP ...@@ -6,9 +6,6 @@ config ARCH_ROCKCHIP
select ARM_GIC select ARM_GIC
select CACHE_L2X0 select CACHE_L2X0
select HAVE_ARM_TWD if SMP select HAVE_ARM_TWD if SMP
select HAVE_SMP
select COMMON_CLK
select GENERIC_CLOCKEVENTS
select DW_APB_TIMER_OF select DW_APB_TIMER_OF
select ARM_GLOBAL_TIMER select ARM_GLOBAL_TIMER
select CLKSRC_ARM_GLOBAL_TIMER_SCHED_CLOCK select CLKSRC_ARM_GLOBAL_TIMER_SCHED_CLOCK
......
arch/arm/mach-shmobile/Kconfig
View file @ a65b5f4c
...@@ -5,18 +5,13 @@ config ARCH_SHMOBILE_MULTI ...@@ -5,18 +5,13 @@ config ARCH_SHMOBILE_MULTI
bool "Renesas ARM SoCs" if ARCH_MULTI_V7 bool "Renesas ARM SoCs" if ARCH_MULTI_V7
depends on MMU depends on MMU
select ARCH_SHMOBILE select ARCH_SHMOBILE
select CPU_V7
select GENERIC_CLOCKEVENTS
select HAVE_ARM_SCU if SMP select HAVE_ARM_SCU if SMP
select HAVE_ARM_TWD if SMP select HAVE_ARM_TWD if SMP
select HAVE_SMP
select ARM_GIC select ARM_GIC
select MIGHT_HAVE_CACHE_L2X0
select MIGHT_HAVE_PCI select MIGHT_HAVE_PCI
select NO_IOPORT select NO_IOPORT
select PINCTRL select PINCTRL
select ARCH_REQUIRE_GPIOLIB select ARCH_REQUIRE_GPIOLIB
select CLKDEV_LOOKUP
if ARCH_SHMOBILE_MULTI if ARCH_SHMOBILE_MULTI
......
arch/arm/mach-socfpga/Kconfig
View file @ a65b5f4c
config ARCH_SOCFPGA config ARCH_SOCFPGA
bool "Altera SOCFPGA family" if ARCH_MULTI_V7 bool "Altera SOCFPGA family" if ARCH_MULTI_V7
select ARCH_WANT_OPTIONAL_GPIOLIB
select ARM_AMBA select ARM_AMBA
select ARM_GIC select ARM_GIC
select CACHE_L2X0 select CACHE_L2X0
select COMMON_CLK
select CPU_V7
select DW_APB_TIMER_OF select DW_APB_TIMER_OF
select GENERIC_CLOCKEVENTS
select GPIO_PL061 if GPIOLIB select GPIO_PL061 if GPIOLIB
select HAVE_ARM_SCU select HAVE_ARM_SCU
select HAVE_ARM_TWD if SMP select HAVE_ARM_TWD if SMP
select HAVE_SMP
select MFD_SYSCON select MFD_SYSCON
select SPARSE_IRQ
select USE_OF
arch/arm/mach-spear/Kconfig
View file @ a65b5f4c
...@@ -8,8 +8,6 @@ menuconfig PLAT_SPEAR ...@@ -8,8 +8,6 @@ menuconfig PLAT_SPEAR
select ARCH_REQUIRE_GPIOLIB select ARCH_REQUIRE_GPIOLIB
select ARM_AMBA select ARM_AMBA
select CLKSRC_MMIO select CLKSRC_MMIO
select COMMON_CLK
select GENERIC_CLOCKEVENTS
if PLAT_SPEAR if PLAT_SPEAR
...@@ -18,14 +16,10 @@ config ARCH_SPEAR13XX ...@@ -18,14 +16,10 @@ config ARCH_SPEAR13XX
depends on ARCH_MULTI_V7 || PLAT_SPEAR_SINGLE depends on ARCH_MULTI_V7 || PLAT_SPEAR_SINGLE
select ARCH_HAS_CPUFREQ select ARCH_HAS_CPUFREQ
select ARM_GIC select ARM_GIC
select CPU_V7
select GPIO_SPEAR_SPICS select GPIO_SPEAR_SPICS
select HAVE_ARM_SCU if SMP select HAVE_ARM_SCU if SMP
select HAVE_ARM_TWD if SMP select HAVE_ARM_TWD if SMP
select HAVE_SMP
select MIGHT_HAVE_CACHE_L2X0
select PINCTRL select PINCTRL
select USE_OF
help help
Supports for ARM's SPEAR13XX family Supports for ARM's SPEAR13XX family
...@@ -50,9 +44,7 @@ config ARCH_SPEAR3XX ...@@ -50,9 +44,7 @@ config ARCH_SPEAR3XX
depends on ARCH_MULTI_V5 || PLAT_SPEAR_SINGLE depends on ARCH_MULTI_V5 || PLAT_SPEAR_SINGLE
depends on !ARCH_SPEAR13XX depends on !ARCH_SPEAR13XX
select ARM_VIC select ARM_VIC
select CPU_ARM926T
select PINCTRL select PINCTRL
select USE_OF
help help
Supports for ARM's SPEAR3XX family Supports for ARM's SPEAR3XX family
...@@ -83,14 +75,12 @@ config ARCH_SPEAR6XX ...@@ -83,14 +75,12 @@ config ARCH_SPEAR6XX
depends on ARCH_MULTI_V5 || PLAT_SPEAR_SINGLE depends on ARCH_MULTI_V5 || PLAT_SPEAR_SINGLE
depends on !ARCH_SPEAR13XX depends on !ARCH_SPEAR13XX
select ARM_VIC select ARM_VIC
select CPU_ARM926T
help help
Supports for ARM's SPEAR6XX family Supports for ARM's SPEAR6XX family
config MACH_SPEAR600 config MACH_SPEAR600
def_bool y def_bool y
depends on ARCH_SPEAR6XX depends on ARCH_SPEAR6XX
select USE_OF
help help
Supports ST SPEAr600 boards configured via the device-treesource "arch/arm/mach-spear6xx/Kconfig" Supports ST SPEAr600 boards configured via the device-treesource "arch/arm/mach-spear6xx/Kconfig"
......
arch/arm/mach-sti/Kconfig
View file @ a65b5f4c
menuconfig ARCH_STI menuconfig ARCH_STI
bool "STMicroelectronics Consumer Electronics SOCs with Device Trees" if ARCH_MULTI_V7 bool "STMicroelectronics Consumer Electronics SOCs with Device Trees" if ARCH_MULTI_V7
select GENERIC_CLOCKEVENTS
select CLKDEV_LOOKUP
select ARM_GIC select ARM_GIC
select ARM_GLOBAL_TIMER select ARM_GLOBAL_TIMER
select PINCTRL select PINCTRL
select PINCTRL_ST select PINCTRL_ST
select MFD_SYSCON select MFD_SYSCON
select ARCH_HAS_RESET_CONTROLLER select ARCH_HAS_RESET_CONTROLLER
select MIGHT_HAVE_CACHE_L2X0
select HAVE_SMP
select HAVE_ARM_SCU if SMP select HAVE_ARM_SCU if SMP
select ARCH_REQUIRE_GPIOLIB select ARCH_REQUIRE_GPIOLIB
select ARM_ERRATA_754322 select ARM_ERRATA_754322
......
arch/arm/mach-sunxi/Kconfig
View file @ a65b5f4c
...@@ -5,14 +5,9 @@ config ARCH_SUNXI ...@@ -5,14 +5,9 @@ config ARCH_SUNXI
select ARM_GIC select ARM_GIC
select ARM_PSCI select ARM_PSCI
select CLKSRC_MMIO select CLKSRC_MMIO
select CLKSRC_OF
select COMMON_CLK
select GENERIC_CLOCKEVENTS
select GENERIC_IRQ_CHIP select GENERIC_IRQ_CHIP
select HAVE_SMP
select PINCTRL select PINCTRL
select PINCTRL_SUNXI select PINCTRL_SUNXI
select RESET_CONTROLLER select RESET_CONTROLLER
select SPARSE_IRQ
select SUN4I_TIMER select SUN4I_TIMER
select SUN5I_HSTIMER select SUN5I_HSTIMER
arch/arm/mach-tegra/Kconfig
View file @ a65b5f4c
...@@ -5,24 +5,16 @@ config ARCH_TEGRA ...@@ -5,24 +5,16 @@ config ARCH_TEGRA
select ARCH_SUPPORTS_TRUSTED_FOUNDATIONS select ARCH_SUPPORTS_TRUSTED_FOUNDATIONS
select ARM_GIC select ARM_GIC
select CLKSRC_MMIO select CLKSRC_MMIO
select CLKSRC_OF
select COMMON_CLK
select CPU_V7
select GENERIC_CLOCKEVENTS
select HAVE_ARM_SCU if SMP select HAVE_ARM_SCU if SMP
select HAVE_ARM_TWD if SMP select HAVE_ARM_TWD if SMP
select HAVE_SMP
select MIGHT_HAVE_CACHE_L2X0
select MIGHT_HAVE_PCI select MIGHT_HAVE_PCI
select PINCTRL select PINCTRL
select ARCH_HAS_RESET_CONTROLLER select ARCH_HAS_RESET_CONTROLLER
select RESET_CONTROLLER select RESET_CONTROLLER
select SOC_BUS select SOC_BUS
select SPARSE_IRQ
select USB_ARCH_HAS_EHCI if USB_SUPPORT select USB_ARCH_HAS_EHCI if USB_SUPPORT
select USB_ULPI if USB_PHY select USB_ULPI if USB_PHY
select USB_ULPI_VIEWPORT if USB_PHY select USB_ULPI_VIEWPORT if USB_PHY
select USE_OF
help help
This enables support for NVIDIA Tegra based systems. This enables support for NVIDIA Tegra based systems.
......
arch/arm/mach-u300/Kconfig
View file @ a65b5f4c
...@@ -3,20 +3,14 @@ config ARCH_U300 ...@@ -3,20 +3,14 @@ config ARCH_U300
depends on MMU depends on MMU
select ARCH_REQUIRE_GPIOLIB select ARCH_REQUIRE_GPIOLIB
select ARM_AMBA select ARM_AMBA
select ARM_PATCH_PHYS_VIRT
select ARM_VIC select ARM_VIC
select CLKSRC_MMIO select CLKSRC_MMIO
select CLKSRC_OF
select COMMON_CLK
select CPU_ARM926T select CPU_ARM926T
select GENERIC_CLOCKEVENTS
select HAVE_TCM select HAVE_TCM
select PINCTRL select PINCTRL
select PINCTRL_COH901 select PINCTRL_COH901
select PINCTRL_U300 select PINCTRL_U300
select SPARSE_IRQ
select MFD_SYSCON select MFD_SYSCON
select USE_OF
help help
Support for ST-Ericsson U300 series mobile platforms. Support for ST-Ericsson U300 series mobile platforms.
......
arch/arm/mach-ux500/Kconfig
View file @ a65b5f4c
...@@ -11,13 +11,8 @@ config ARCH_U8500 ...@@ -11,13 +11,8 @@ config ARCH_U8500
select ARM_GIC select ARM_GIC
select CACHE_L2X0 select CACHE_L2X0
select CLKSRC_NOMADIK_MTU select CLKSRC_NOMADIK_MTU
select COMMON_CLK
select CPU_V7
select GENERIC_CLOCKEVENTS
select HAVE_ARM_SCU if SMP select HAVE_ARM_SCU if SMP
select HAVE_ARM_TWD if SMP select HAVE_ARM_TWD if SMP
select HAVE_SMP
select MIGHT_HAVE_CACHE_L2X0
select PINCTRL select PINCTRL
select PINCTRL_ABX500 select PINCTRL_ABX500
select PINCTRL_NOMADIK select PINCTRL_NOMADIK
...@@ -76,7 +71,6 @@ config UX500_AUTO_PLATFORM ...@@ -76,7 +71,6 @@ config UX500_AUTO_PLATFORM
config MACH_UX500_DT config MACH_UX500_DT
bool "Generic U8500 support using device tree" bool "Generic U8500 support using device tree"
depends on MACH_MOP500 depends on MACH_MOP500
select USE_OF
endmenu endmenu
......
arch/arm/mach-vexpress/Kconfig
View file @ a65b5f4c
...@@ -5,16 +5,11 @@ config ARCH_VEXPRESS ...@@ -5,16 +5,11 @@ config ARCH_VEXPRESS
select ARM_AMBA select ARM_AMBA
select ARM_GIC select ARM_GIC
select ARM_TIMER_SP804 select ARM_TIMER_SP804
select COMMON_CLK
select COMMON_CLK_VERSATILE select COMMON_CLK_VERSATILE
select CPU_V7
select GENERIC_CLOCKEVENTS
select HAVE_ARM_SCU if SMP select HAVE_ARM_SCU if SMP
select HAVE_ARM_TWD if SMP select HAVE_ARM_TWD if SMP
select HAVE_PATA_PLATFORM select HAVE_PATA_PLATFORM
select HAVE_SMP
select ICST select ICST
select MIGHT_HAVE_CACHE_L2X0
select NO_IOPORT select NO_IOPORT
select PLAT_VERSATILE select PLAT_VERSATILE
select PLAT_VERSATILE_CLCD select PLAT_VERSATILE_CLCD
......
arch/arm/mach-virt/Kconfig deleted 100644 → 0
View file @ 9ad2a24f
config ARCH_VIRT
bool "Dummy Virtual Machine" if ARCH_MULTI_V7
select ARCH_WANT_OPTIONAL_GPIOLIB
select ARM_GIC
select HAVE_ARM_ARCH_TIMER
select ARM_PSCI
select HAVE_SMP
select CPU_V7
select SPARSE_IRQ
select USE_OF
arch/arm/mach-virt/Makefile deleted 100644 → 0
View file @ 9ad2a24f
#
# Makefile for the linux kernel.
#
obj-y := virt.o
arch/arm/mach-virt/virt.c deleted 100644 → 0
View file @ 9ad2a24f
/*
* Dummy Virtual Machine - does what it says on the tin.
*
* Copyright (C) 2012 ARM Ltd
* Authors: Will Deacon <will.deacon@arm.com>,
* Marc Zyngier <marc.zyngier@arm.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <linux/of_irq.h>
#include <linux/of_platform.h>
#include <linux/smp.h>
#include <asm/mach/arch.h>
static void __init virt_init(void)
{
of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
}
static const char *virt_dt_match[] = {
"linux,dummy-virt",
"xen,xenvm",
NULL
};
DT_MACHINE_START(VIRT, "Dummy Virtual Machine")
.init_machine = virt_init,
.dt_compat = virt_dt_match,
MACHINE_END
arch/arm/mach-vt8500/Kconfig
View file @ a65b5f4c
...@@ -3,8 +3,6 @@ config ARCH_VT8500 ...@@ -3,8 +3,6 @@ config ARCH_VT8500
select ARCH_HAS_CPUFREQ select ARCH_HAS_CPUFREQ
select ARCH_REQUIRE_GPIOLIB select ARCH_REQUIRE_GPIOLIB
select CLKDEV_LOOKUP select CLKDEV_LOOKUP
select CLKSRC_OF
select GENERIC_CLOCKEVENTS
select VT8500_TIMER select VT8500_TIMER
select PINCTRL select PINCTRL
help help
...@@ -21,7 +19,6 @@ config ARCH_WM8750 ...@@ -21,7 +19,6 @@ config ARCH_WM8750
bool "WonderMedia WM8750" bool "WonderMedia WM8750"
depends on ARCH_MULTI_V6 depends on ARCH_MULTI_V6
select ARCH_VT8500 select ARCH_VT8500
select CPU_V6
help help
Support for WonderMedia WM8750 System-on-Chip. Support for WonderMedia WM8750 System-on-Chip.
...@@ -29,6 +26,5 @@ config ARCH_WM8850 ...@@ -29,6 +26,5 @@ config ARCH_WM8850
bool "WonderMedia WM8850" bool "WonderMedia WM8850"
depends on ARCH_MULTI_V7 depends on ARCH_MULTI_V7
select ARCH_VT8500 select ARCH_VT8500
select CPU_V7
help help
Support for WonderMedia WM8850 System-on-Chip. Support for WonderMedia WM8850 System-on-Chip.
arch/arm/mach-zynq/Kconfig
View file @ a65b5f4c
...@@ -2,16 +2,9 @@ config ARCH_ZYNQ ...@@ -2,16 +2,9 @@ config ARCH_ZYNQ
bool "Xilinx Zynq ARM Cortex A9 Platform" if ARCH_MULTI_V7 bool "Xilinx Zynq ARM Cortex A9 Platform" if ARCH_MULTI_V7
select ARM_AMBA select ARM_AMBA
select ARM_GIC select ARM_GIC
select COMMON_CLK
select CPU_V7
select GENERIC_CLOCKEVENTS
select HAVE_ARM_SCU if SMP select HAVE_ARM_SCU if SMP
select HAVE_ARM_TWD if SMP select HAVE_ARM_TWD if SMP
select ICST select ICST
select MIGHT_HAVE_CACHE_L2X0
select USE_OF
select HAVE_SMP
select SPARSE_IRQ
select CADENCE_TTC_TIMER select CADENCE_TTC_TIMER
select ARM_GLOBAL_TIMER select ARM_GLOBAL_TIMER
help help
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7