ARM: multi-platform kconfig cleanup and mach-virt removal
Subsystems (22)
v2 cover ARM: multi-platform kconfig cleanup and mach-virt removal
From: Rob Herring <[email protected]>
This series removes common kconfig options required by multi-platform builds out of individual platforms as they are redundant. Patches 2 and 3 make SMP and CACHE_L2X0 config options visible on MULTI_V7 builds as most platforms enable these options and all platforms can run with them enabled.
The previous version [1] was mainly a discussion about v6 vs. v6K. Several platforms have this wrong and incorrectly select v6 when the more optimal v6K option could be used. After more research, my memory about i.MX31 was wrong and it does need to remain v6. I've tested the v6K change on Rasp Pi. The default change to v6K for MULTI_V6 does not switch any platforms. I don't plan to submit the v6K changes for platforms without platform maintainers acks or testing.
Finally, patch 8 removes mach-virt as it is no longer needed. The core ARM code can handle all the necessary initialization and mach-virt is left as a kconfig option. Although not really related to this series, it would otherwise conflict with it.
Rob
[1] http://lists.infradead.org/pipermail/linux-arm-kernel/2013-December/216631.html
Rob Herring (9):
ARM: centralize common multi-platform kconfig options
ARM: select HAVE_SMP for V7 multi-platform
ARM: select MIGHT_HAVE_CACHE_L2X0 for V7 multi-platform
ARM: Select V6K instead of V6 by default for multi-platform
ARM: bcm2835: enable V6K instead of plain V6
ARM: cns3xxx: enable V6K instead of plain V6
ARM: vt8500: enable V6K instead of plain V6
ARM: virt: make mach-virt just a kconfig option
ARM: virt: select ARM_AMBA
arch/arm/Kconfig | 15 ++++++++++++--- arch/arm/Makefile | 1 - arch/arm/mach-bcm/Kconfig | 5 ----- arch/arm/mach-bcm2835/Kconfig | 4 ---- arch/arm/mach-berlin/Kconfig | 4 ---- arch/arm/mach-cns3xxx/Kconfig | 3 --- arch/arm/mach-highbank/Kconfig | 7 ------- arch/arm/mach-hisi/Kconfig | 4 ---- arch/arm/mach-imx/Kconfig | 14 -------------- arch/arm/mach-keystone/Kconfig | 4 ---- arch/arm/mach-moxart/Kconfig | 5 ----- arch/arm/mach-mvebu/Kconfig | 6 ------ arch/arm/mach-mxs/Kconfig | 4 ---- arch/arm/mach-nomadik/Kconfig | 5 ----- arch/arm/mach-nspire/Kconfig | 5 ----- arch/arm/mach-omap2/Kconfig | 17 ----------------- arch/arm/mach-picoxcell/Kconfig | 5 ----- arch/arm/mach-prima2/Kconfig | 6 ------ arch/arm/mach-rockchip/Kconfig | 3 --- arch/arm/mach-shmobile/Kconfig | 5 ----- arch/arm/mach-socfpga/Kconfig | 7 ------- arch/arm/mach-spear/Kconfig | 10 ---------- arch/arm/mach-sti/Kconfig | 4 ---- arch/arm/mach-sunxi/Kconfig | 5 ----- arch/arm/mach-tegra/Kconfig | 8 -------- arch/arm/mach-u300/Kconfig | 6 ------ arch/arm/mach-ux500/Kconfig | 6 ------ arch/arm/mach-vexpress/Kconfig | 5 ----- arch/arm/mach-virt/Kconfig | 10 ---------- arch/arm/mach-virt/Makefile | 5 ----- arch/arm/mach-virt/virt.c | 41 ----------------------------------------- arch/arm/mach-vt8500/Kconfig | 4 ---- arch/arm/mach-zynq/Kconfig | 7 ------- 33 files changed, 12 insertions(+), 228 deletions(-) delete mode 100644 arch/arm/mach-virt/Kconfig delete mode 100644 arch/arm/mach-virt/Makefile delete mode 100644 arch/arm/mach-virt/virt.c
Signature · 1 line
1.8.3.2
PATCH v2 1/9 ARM: centralize common multi-platform kconfig options
From: Rob Herring <[email protected]>
Multi-platform requires various kconfig options to be selected, so platforms don't need to select them individually.
--- arch/arm/Kconfig | 2 ++ arch/arm/mach-bcm/Kconfig | 5 ----- arch/arm/mach-bcm2835/Kconfig | 3 --- arch/arm/mach-berlin/Kconfig | 3 --- arch/arm/mach-cns3xxx/Kconfig | 1 - arch/arm/mach-highbank/Kconfig | 6 ------ arch/arm/mach-hisi/Kconfig | 3 --- arch/arm/mach-imx/Kconfig | 11 ----------- arch/arm/mach-keystone/Kconfig | 3 --- arch/arm/mach-moxart/Kconfig | 5 ----- arch/arm/mach-mvebu/Kconfig | 5 ----- arch/arm/mach-mxs/Kconfig | 4 ---- arch/arm/mach-nomadik/Kconfig | 5 ----- arch/arm/mach-nspire/Kconfig | 5 ----- arch/arm/mach-omap2/Kconfig | 15 --------------- arch/arm/mach-picoxcell/Kconfig | 4 ---- arch/arm/mach-prima2/Kconfig | 4 ---- arch/arm/mach-rockchip/Kconfig | 2 -- arch/arm/mach-shmobile/Kconfig | 3 --- arch/arm/mach-socfpga/Kconfig | 6 ------ arch/arm/mach-spear/Kconfig | 8 -------- arch/arm/mach-sti/Kconfig | 2 -- arch/arm/mach-sunxi/Kconfig | 4 ---- arch/arm/mach-tegra/Kconfig | 6 ------ arch/arm/mach-u300/Kconfig | 6 ------ arch/arm/mach-ux500/Kconfig | 4 ---- arch/arm/mach-vexpress/Kconfig | 3 --- arch/arm/mach-virt/Kconfig | 4 ---- arch/arm/mach-vt8500/Kconfig | 3 --- arch/arm/mach-zynq/Kconfig | 5 ----- 30 files changed, 2 insertions(+), 138 deletions(-)
arch/arm/Kconfig +2 -0
@@ -306,9 +306,11 @@ choice config ARCH_MULTIPLATFORM bool "Allow multiple platforms to be selected" depends on MMU + select ARCH_WANT_OPTIONAL_GPIOLIB select ARM_PATCH_PHYS_VIRT select AUTO_ZRELADDR select COMMON_CLK + select GENERIC_CLOCKEVENTS select MULTI_IRQ_HANDLER select SPARSE_IRQ select USE_OF
arch/arm/mach-bcm/Kconfig +0 -5
@@ -16,12 +16,7 @@ config ARCH_BCM_MOBILE select ARM_ERRATA_754322 select ARM_ERRATA_764369 if SMP select ARM_GIC - select CPU_V7 - select CLKSRC_OF - select GENERIC_CLOCKEVENTS - select GENERIC_TIME select GPIO_BCM_KONA - select SPARSE_IRQ select TICK_ONESHOT select CACHE_L2X0 select HAVE_ARM_ARCH_TIMER
arch/arm/mach-bcm2835/Kconfig +0 -3
@@ -4,10 +4,7 @@ config ARCH_BCM2835 select ARM_AMBA select ARM_ERRATA_411920 select ARM_TIMER_SP804 - select CLKDEV_LOOKUP - select CLKSRC_OF select CPU_V6 - select GENERIC_CLOCKEVENTS select PINCTRL select PINCTRL_BCM2835 help
arch/arm/mach-berlin/Kconfig +0 -3
@@ -1,9 +1,7 @@ config ARCH_BERLIN bool "Marvell Berlin SoCs" if ARCH_MULTI_V7 select ARM_GIC - select GENERIC_CLOCKEVENTS select GENERIC_IRQ_CHIP - select COMMON_CLK select DW_APB_ICTL select DW_APB_TIMER_OF
@@ -21,7 +19,6 @@ config MACH_BERLIN_BG2 config MACH_BERLIN_BG2CD bool "Marvell Armada 1500-mini (BG2CD)" select CACHE_L2X0 - select CPU_V7 select HAVE_ARM_TWD if SMP endmenu
arch/arm/mach-cns3xxx/Kconfig +0 -1
@@ -2,7 +2,6 @@ config ARCH_CNS3XXX bool "Cavium Networks CNS3XXX family" if ARCH_MULTI_V6 select ARM_GIC select CPU_V6K - select GENERIC_CLOCKEVENTS select MIGHT_HAVE_CACHE_L2X0 select MIGHT_HAVE_PCI select PCI_DOMAINS if PCI
arch/arm/mach-highbank/Kconfig +0 -6
@@ -5,7 +5,6 @@ config ARCH_HIGHBANK select ARCH_HAS_HOLES_MEMORYMODEL select ARCH_HAS_OPP select ARCH_SUPPORTS_BIG_ENDIAN - select ARCH_WANT_OPTIONAL_GPIOLIB select ARM_AMBA select ARM_ERRATA_764369 if SMP select ARM_ERRATA_775420
@@ -14,14 +13,9 @@ config ARCH_HIGHBANK select ARM_PSCI select ARM_TIMER_SP804 select CACHE_L2X0 - select COMMON_CLK - select CPU_V7 - select GENERIC_CLOCKEVENTS select HAVE_ARM_SCU select HAVE_ARM_TWD if SMP select HAVE_SMP select MAILBOX select PL320_MBOX - select SPARSE_IRQ - select USE_OF select ZONE_DMA if ARM_LPAE
arch/arm/mach-hisi/Kconfig +0 -3
@@ -3,10 +3,7 @@ config ARCH_HI3xxx select ARM_AMBA select ARM_GIC select ARM_TIMER_SP804 - select ARCH_WANT_OPTIONAL_GPIOLIB select CACHE_L2X0 - select CLKSRC_OF - select GENERIC_CLOCKEVENTS select HAVE_ARM_SCU select HAVE_ARM_TWD if SMP select HAVE_SMP
arch/arm/mach-imx/Kconfig +0 -11
@@ -2,18 +2,12 @@ config ARCH_MXC bool "Freescale i.MX family" if ARCH_MULTI_V4_V5 || ARCH_MULTI_V6_V7 select ARCH_REQUIRE_GPIOLIB select ARM_CPU_SUSPEND if PM - select ARM_PATCH_PHYS_VIRT select CLKSRC_MMIO - select COMMON_CLK select GENERIC_ALLOCATOR - select GENERIC_CLOCKEVENTS select GENERIC_IRQ_CHIP select MIGHT_HAVE_CACHE_L2X0 if ARCH_MULTI_V6_V7 - select MULTI_IRQ_HANDLER select PINCTRL select SOC_BUS - select SPARSE_IRQ - select USE_OF help Support for Freescale MXC/iMX-based family of processors
@@ -132,7 +126,6 @@ config SOC_IMX5 select ARCH_HAS_CPUFREQ select ARCH_HAS_OPP select ARCH_MXC_IOMUX_V3 - select CPU_V7 select MXC_TZIC config SOC_IMX51
@@ -792,7 +785,6 @@ config SOC_IMX6Q select ARM_ERRATA_764369 if SMP select ARM_ERRATA_775420 select ARM_GIC - select CPU_V7 select HAVE_ARM_SCU if SMP select HAVE_ARM_TWD if SMP select HAVE_IMX_ANATOP
@@ -817,7 +809,6 @@ config SOC_IMX6SL select ARM_ERRATA_754322 select ARM_ERRATA_775420 select ARM_GIC - select CPU_V7 select HAVE_IMX_ANATOP select HAVE_IMX_GPC select HAVE_IMX_MMDC
@@ -833,9 +824,7 @@ config SOC_IMX6SL config SOC_VF610 bool "Vybrid Family VF610 support" - select CPU_V7 select ARM_GIC - select CLKSRC_OF select PINCTRL_VF610 select VF_PIT_TIMER select PL310_ERRATA_588369 if CACHE_PL310
arch/arm/mach-keystone/Kconfig +0 -3
@@ -1,13 +1,10 @@ config ARCH_KEYSTONE bool "Texas Instruments Keystone Devices" depends on ARCH_MULTI_V7 - select CPU_V7 select ARM_GIC select HAVE_ARM_ARCH_TIMER select HAVE_SMP select CLKSRC_MMIO - select GENERIC_CLOCKEVENTS - select ARCH_WANT_OPTIONAL_GPIOLIB select ARM_ERRATA_798181 if SMP select COMMON_CLK_KEYSTONE select ARCH_SUPPORTS_BIG_ENDIAN
arch/arm/mach-moxart/Kconfig +0 -5
@@ -2,14 +2,9 @@ config ARCH_MOXART bool "MOXA ART SoC" if ARCH_MULTI_V4T select CPU_FA526 select ARM_DMA_MEM_BUFFERABLE - select USE_OF - select CLKSRC_OF select CLKSRC_MMIO - select HAVE_CLK - select COMMON_CLK select GENERIC_IRQ_CHIP select ARCH_REQUIRE_GPIOLIB - select GENERIC_CLOCKEVENTS select PHYLIB if NETDEVICES help Say Y here if you want to run your kernel on hardware with a
arch/arm/mach-mvebu/Kconfig +0 -5
@@ -2,15 +2,10 @@ config ARCH_MVEBU bool "Marvell SOCs with Device Tree support" if ARCH_MULTI_V7 select ARCH_SUPPORTS_BIG_ENDIAN select CLKSRC_MMIO - select COMMON_CLK - select GENERIC_CLOCKEVENTS select GENERIC_IRQ_CHIP select IRQ_DOMAIN - select MULTI_IRQ_HANDLER select PINCTRL select PLAT_ORION - select SPARSE_IRQ - select CLKDEV_LOOKUP select MVEBU_MBUS select ZONE_DMA if ARM_LPAE select ARCH_REQUIRE_GPIOLIB
arch/arm/mach-mxs/Kconfig +0 -4
@@ -16,11 +16,7 @@ config ARCH_MXS bool "Freescale MXS (i.MX23, i.MX28) support" depends on ARCH_MULTI_V5 select ARCH_REQUIRE_GPIOLIB - select CLKDEV_LOOKUP select CLKSRC_MMIO - select CLKSRC_OF - select GENERIC_CLOCKEVENTS - select HAVE_CLK_PREPARE select PINCTRL select SOC_BUS select SOC_IMX23
arch/arm/mach-nomadik/Kconfig +0 -5
@@ -6,16 +6,11 @@ config ARCH_NOMADIK select ARM_VIC select CLKSRC_NOMADIK_MTU select CLKSRC_NOMADIK_MTU_SCHED_CLOCK - select CLKSRC_OF - select COMMON_CLK select CPU_ARM926T - select GENERIC_CLOCKEVENTS select MIGHT_HAVE_CACHE_L2X0 select PINCTRL select PINCTRL_NOMADIK select PINCTRL_STN8815 - select SPARSE_IRQ - select USE_OF help Support for the Nomadik platform by ST-Ericsson
arch/arm/mach-nspire/Kconfig +0 -5
@@ -3,14 +3,9 @@ config ARCH_NSPIRE depends on ARCH_MULTI_V4_V5 depends on MMU select CPU_ARM926T - select COMMON_CLK - select GENERIC_CLOCKEVENTS select GENERIC_IRQ_CHIP - select SPARSE_IRQ select ARM_AMBA select ARM_VIC select ARM_TIMER_SP804 - select USE_OF - select CLKSRC_OF help This enables support for systems using the TI-NSPIRE CPU
arch/arm/mach-omap2/Kconfig +0 -15
@@ -6,7 +6,6 @@ config ARCH_OMAP2 depends on ARCH_MULTI_V6 select ARCH_OMAP2PLUS select CPU_V6 - select MULTI_IRQ_HANDLER select SOC_HAS_OMAP2_SDRC config ARCH_OMAP3
@@ -15,8 +14,6 @@ config ARCH_OMAP3 select ARCH_OMAP2PLUS select ARCH_HAS_OPP select ARM_CPU_SUSPEND if PM - select CPU_V7 - select MULTI_IRQ_HANDLER select OMAP_INTERCONNECT select PM_OPP if PM select PM_RUNTIME if CPU_IDLE
@@ -33,7 +30,6 @@ config ARCH_OMAP4 select ARM_ERRATA_720789 select ARM_GIC select CACHE_L2X0 - select CPU_V7 select HAVE_ARM_SCU if SMP select HAVE_ARM_TWD if SMP select HAVE_SMP
@@ -52,7 +48,6 @@ config SOC_OMAP5 select ARCH_OMAP2PLUS select ARM_CPU_SUSPEND if PM select ARM_GIC - select CPU_V7 select HAVE_ARM_SCU if SMP select HAVE_ARM_TWD if SMP select HAVE_SMP
@@ -64,15 +59,11 @@ config SOC_AM33XX depends on ARCH_MULTI_V7 select ARCH_OMAP2PLUS select ARM_CPU_SUSPEND if PM - select CPU_V7 - select MULTI_IRQ_HANDLER config SOC_AM43XX bool "TI AM43x" depends on ARCH_MULTI_V7 - select CPU_V7 select ARCH_OMAP2PLUS - select MULTI_IRQ_HANDLER select ARM_GIC select MACH_OMAP_GENERIC
@@ -82,8 +73,6 @@ config SOC_DRA7XX select ARCH_OMAP2PLUS select ARM_CPU_SUSPEND if PM select ARM_GIC - select CPU_V7 - select HAVE_SMP select HAVE_ARM_ARCH_TIMER config ARCH_OMAP2PLUS
@@ -94,17 +83,13 @@ config ARCH_OMAP2PLUS select ARCH_OMAP select ARCH_REQUIRE_GPIOLIB select CLKSRC_MMIO - select COMMON_CLK - select GENERIC_CLOCKEVENTS select GENERIC_IRQ_CHIP select MACH_OMAP_GENERIC select OMAP_DM_TIMER select PINCTRL select PROC_DEVICETREE if PROC_FS select SOC_BUS - select SPARSE_IRQ select TI_PRIV_EDMA - select USE_OF help Systems based on OMAP2, OMAP3, OMAP4 or OMAP5
arch/arm/mach-picoxcell/Kconfig +0 -4
@@ -1,12 +1,8 @@ config ARCH_PICOXCELL bool "Picochip PicoXcell" if ARCH_MULTI_V6 select ARCH_REQUIRE_GPIOLIB - select ARM_PATCH_PHYS_VIRT select ARM_VIC select CPU_V6K select DW_APB_TIMER_OF - select GENERIC_CLOCKEVENTS select HAVE_TCM select NO_IOPORT - select SPARSE_IRQ - select USE_OF
arch/arm/mach-prima2/Kconfig +0 -4
@@ -1,7 +1,6 @@ config ARCH_SIRF bool "CSR SiRF" if ARCH_MULTI_V7 select ARCH_REQUIRE_GPIOLIB - select GENERIC_CLOCKEVENTS select GENERIC_IRQ_CHIP select MIGHT_HAVE_CACHE_L2X0 select NO_IOPORT
@@ -17,7 +16,6 @@ menu "CSR SiRF atlas6/primaII/Marco/Polo Specific Features" config ARCH_ATLAS6 bool "CSR SiRFSoC ATLAS6 ARM Cortex A9 Platform" default y - select CPU_V7 select SIRF_IRQ help Support for CSR SiRFSoC ARM Cortex A9 Platform
@@ -25,7 +23,6 @@ config ARCH_ATLAS6 config ARCH_PRIMA2 bool "CSR SiRFSoC PRIMA2 ARM Cortex A9 Platform" default y - select CPU_V7 select SIRF_IRQ select ZONE_DMA help
@@ -35,7 +32,6 @@ config ARCH_MARCO bool "CSR SiRFSoC MARCO ARM Cortex A9 Platform" default y select ARM_GIC - select CPU_V7 select HAVE_ARM_SCU if SMP select HAVE_SMP select SMP_ON_UP if SMP
arch/arm/mach-rockchip/Kconfig +0 -2
@@ -7,8 +7,6 @@ config ARCH_ROCKCHIP select CACHE_L2X0 select HAVE_ARM_TWD if SMP select HAVE_SMP - select COMMON_CLK - select GENERIC_CLOCKEVENTS select DW_APB_TIMER_OF select ARM_GLOBAL_TIMER select CLKSRC_ARM_GLOBAL_TIMER_SCHED_CLOCK
arch/arm/mach-shmobile/Kconfig +0 -3
@@ -5,8 +5,6 @@ config ARCH_SHMOBILE_MULTI bool "Renesas ARM SoCs" if ARCH_MULTI_V7 depends on MMU select ARCH_SHMOBILE - select CPU_V7 - select GENERIC_CLOCKEVENTS select HAVE_ARM_SCU if SMP select HAVE_ARM_TWD if SMP select HAVE_SMP
@@ -16,7 +14,6 @@ config ARCH_SHMOBILE_MULTI select NO_IOPORT select PINCTRL select ARCH_REQUIRE_GPIOLIB - select CLKDEV_LOOKUP if ARCH_SHMOBILE_MULTI
arch/arm/mach-socfpga/Kconfig +0 -6
@@ -1,17 +1,11 @@ config ARCH_SOCFPGA bool "Altera SOCFPGA family" if ARCH_MULTI_V7 - select ARCH_WANT_OPTIONAL_GPIOLIB select ARM_AMBA select ARM_GIC select CACHE_L2X0 - select COMMON_CLK - select CPU_V7 select DW_APB_TIMER_OF - select GENERIC_CLOCKEVENTS select GPIO_PL061 if GPIOLIB select HAVE_ARM_SCU select HAVE_ARM_TWD if SMP select HAVE_SMP select MFD_SYSCON - select SPARSE_IRQ - select USE_OF
arch/arm/mach-spear/Kconfig +0 -8
@@ -8,8 +8,6 @@ menuconfig PLAT_SPEAR select ARCH_REQUIRE_GPIOLIB select ARM_AMBA select CLKSRC_MMIO - select COMMON_CLK - select GENERIC_CLOCKEVENTS if PLAT_SPEAR
@@ -18,14 +16,12 @@ config ARCH_SPEAR13XX depends on ARCH_MULTI_V7 || PLAT_SPEAR_SINGLE select ARCH_HAS_CPUFREQ select ARM_GIC - select CPU_V7 select GPIO_SPEAR_SPICS select HAVE_ARM_SCU if SMP select HAVE_ARM_TWD if SMP select HAVE_SMP select MIGHT_HAVE_CACHE_L2X0 select PINCTRL - select USE_OF help Supports for ARM's SPEAR13XX family
@@ -50,9 +46,7 @@ config ARCH_SPEAR3XX depends on ARCH_MULTI_V5 || PLAT_SPEAR_SINGLE depends on !ARCH_SPEAR13XX select ARM_VIC - select CPU_ARM926T select PINCTRL - select USE_OF help Supports for ARM's SPEAR3XX family
@@ -83,14 +77,12 @@ config ARCH_SPEAR6XX depends on ARCH_MULTI_V5 || PLAT_SPEAR_SINGLE depends on !ARCH_SPEAR13XX select ARM_VIC - select CPU_ARM926T help Supports for ARM's SPEAR6XX family config MACH_SPEAR600 def_bool y depends on ARCH_SPEAR6XX - select USE_OF help Supports ST SPEAr600 boards configured via the device-treesource "arch/arm/mach-spear6xx/Kconfig"
arch/arm/mach-sti/Kconfig +0 -2
@@ -1,7 +1,5 @@ menuconfig ARCH_STI bool "STMicroelectronics Consumer Electronics SOCs with Device Trees" if ARCH_MULTI_V7 - select GENERIC_CLOCKEVENTS - select CLKDEV_LOOKUP select ARM_GIC select ARM_GLOBAL_TIMER select PINCTRL
arch/arm/mach-sunxi/Kconfig +0 -4
@@ -5,14 +5,10 @@ config ARCH_SUNXI select ARM_GIC select ARM_PSCI select CLKSRC_MMIO - select CLKSRC_OF - select COMMON_CLK - select GENERIC_CLOCKEVENTS select GENERIC_IRQ_CHIP select HAVE_SMP select PINCTRL select PINCTRL_SUNXI select RESET_CONTROLLER - select SPARSE_IRQ select SUN4I_TIMER select SUN5I_HSTIMER
arch/arm/mach-tegra/Kconfig +0 -6
@@ -5,10 +5,6 @@ config ARCH_TEGRA select ARCH_SUPPORTS_TRUSTED_FOUNDATIONS select ARM_GIC select CLKSRC_MMIO - select CLKSRC_OF - select COMMON_CLK - select CPU_V7 - select GENERIC_CLOCKEVENTS select HAVE_ARM_SCU if SMP select HAVE_ARM_TWD if SMP select HAVE_SMP
@@ -18,11 +14,9 @@ config ARCH_TEGRA select ARCH_HAS_RESET_CONTROLLER select RESET_CONTROLLER select SOC_BUS - select SPARSE_IRQ select USB_ARCH_HAS_EHCI if USB_SUPPORT select USB_ULPI if USB_PHY select USB_ULPI_VIEWPORT if USB_PHY - select USE_OF help This enables support for NVIDIA Tegra based systems.
arch/arm/mach-u300/Kconfig +0 -6
@@ -3,20 +3,14 @@ config ARCH_U300 depends on MMU select ARCH_REQUIRE_GPIOLIB select ARM_AMBA - select ARM_PATCH_PHYS_VIRT select ARM_VIC select CLKSRC_MMIO - select CLKSRC_OF - select COMMON_CLK select CPU_ARM926T - select GENERIC_CLOCKEVENTS select HAVE_TCM select PINCTRL select PINCTRL_COH901 select PINCTRL_U300 - select SPARSE_IRQ select MFD_SYSCON - select USE_OF help Support for ST-Ericsson U300 series mobile platforms.
arch/arm/mach-ux500/Kconfig +0 -4
@@ -11,9 +11,6 @@ config ARCH_U8500 select ARM_GIC select CACHE_L2X0 select CLKSRC_NOMADIK_MTU - select COMMON_CLK - select CPU_V7 - select GENERIC_CLOCKEVENTS select HAVE_ARM_SCU if SMP select HAVE_ARM_TWD if SMP select HAVE_SMP
@@ -76,7 +73,6 @@ config UX500_AUTO_PLATFORM config MACH_UX500_DT bool "Generic U8500 support using device tree" depends on MACH_MOP500 - select USE_OF endmenu
arch/arm/mach-vexpress/Kconfig +0 -3
@@ -5,10 +5,7 @@ config ARCH_VEXPRESS select ARM_AMBA select ARM_GIC select ARM_TIMER_SP804 - select COMMON_CLK select COMMON_CLK_VERSATILE - select CPU_V7 - select GENERIC_CLOCKEVENTS select HAVE_ARM_SCU if SMP select HAVE_ARM_TWD if SMP select HAVE_PATA_PLATFORM
arch/arm/mach-virt/Kconfig +0 -4
@@ -1,10 +1,6 @@ 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-vt8500/Kconfig +0 -3
@@ -3,8 +3,6 @@ config ARCH_VT8500 select ARCH_HAS_CPUFREQ select ARCH_REQUIRE_GPIOLIB select CLKDEV_LOOKUP - select CLKSRC_OF - select GENERIC_CLOCKEVENTS select VT8500_TIMER select PINCTRL help
@@ -29,6 +27,5 @@ config ARCH_WM8850 bool "WonderMedia WM8850" depends on ARCH_MULTI_V7 select ARCH_VT8500 - select CPU_V7 help Support for WonderMedia WM8850 System-on-Chip.
arch/arm/mach-zynq/Kconfig +0 -5
@@ -2,16 +2,11 @@ config ARCH_ZYNQ bool "Xilinx Zynq ARM Cortex A9 Platform" if ARCH_MULTI_V7 select ARM_AMBA select ARM_GIC - select COMMON_CLK - select CPU_V7 - select GENERIC_CLOCKEVENTS select HAVE_ARM_SCU if SMP select HAVE_ARM_TWD if SMP select ICST select MIGHT_HAVE_CACHE_L2X0 - select USE_OF select HAVE_SMP - select SPARSE_IRQ select CADENCE_TTC_TIMER select ARM_GLOBAL_TIMER help
Signature · 1 line
1.8.3.2
PATCH v2 1/9 ARM: centralize common multi-platform kconfig options
Quoted 8 lines · Rob Herring
From: Rob Herring <[email protected]>
Multi-platform requires various kconfig options to be selected, so platforms don't need to select them individually.
Signed-off-by Rob Herring <[email protected]>Cc Linus Walleij <[email protected]>Cc Russell King <[email protected]>
OK makes sense. Maybe a bit unintuitive that multiplat make gpiolib wanted optional and then platforms override this by requiring it, but whatever, I cannot think of anything better.
Yours,
Linus Walleij
PATCH v2 1/9 ARM: centralize common multi-platform kconfig options
Quoted 11 lines · Linus Walleij
Quoted 8 lines · Rob Herring
From: Rob Herring <[email protected]>
Multi-platform requires various kconfig options to be selected, so platforms don't need to select them individually.
Signed-off-by Rob Herring <[email protected]>Cc Linus Walleij <[email protected]>Cc Russell King <[email protected]>
Quoted 5 lines
OK makes sense. Maybe a bit unintuitive that multiplat make gpiolib wanted optional and then platforms override this by requiring it, but whatever, I cannot think of anything better.
Acked-by Linus Walleij <[email protected]>
It's really just about making gpiolib visible. Can we just kill the symbol or there are still non-gpiolib users that would conflict?
Rob
PATCH v2 1/9 ARM: centralize common multi-platform kconfig options
Quoted 12 lines · Rob Herring
Quoted 11 lines · Linus Walleij
Quoted 8 lines · Rob Herring
From: Rob Herring <[email protected]>
Multi-platform requires various kconfig options to be selected, so platforms don't need to select them individually.
Signed-off-by Rob Herring <[email protected]>Cc Linus Walleij <[email protected]>Cc Russell King <[email protected]>
Quoted 8 lines
Quoted 5 lines
OK makes sense. Maybe a bit unintuitive that multiplat make gpiolib wanted optional and then platforms override this by requiring it, but whatever, I cannot think of anything better.
Acked-by Linus Walleij <[email protected]>It's really just about making gpiolib visible. Can we just kill the symbol or there are still non-gpiolib users that would conflict?
Oh no and yes. I'm working on trying to get rid of that old cruft, but the problem is that I basically have to acquire or delete these platforms to get them off the "generic GPIO" API (i.e. just a set of functions with certain names).
Old habits die hard you know.
Having the symbol default-selected by multiplatform definately puts up a roadblock stopping new platforms from doing anything like that again so at second thought I really like this patch:
Yours,
Linus Walleij
PATCH v2 1/9 ARM: centralize common multi-platform kconfig options
In reply to Rob HerringQuoted 8 lines · Rob Herring
From: Rob Herring <[email protected]>
Multi-platform requires various kconfig options to be selected, so platforms don't need to select them individually.
Signed-off-by Rob Herring <[email protected]>Cc Linus Walleij <[email protected]>Cc Russell King <[email protected]>
FYI... this recently hit arm-soc/for-next and according to my bisect, is the cause for two new boot failures[1] for sunxi_defconfig on cubieboard and cubie2. The previous build/boot passed on both
boards[2]. Interestingly, both boards boot fine withmulti_v7_defconfig though.
There's zero console output on the boards, and I haven't dug further since I still have to pack for a trip tomorrow.
Kevin
[1] http://lists.linaro.org/pipermail/kernel-build-reports/2014-February/002615.html
[2] http://lists.linaro.org/pipermail/kernel-build-reports/2014-February/002613.html
PATCH v2 1/9 ARM: centralize common multi-platform kconfig options
Quoted 16 lines · Kevin Hilman
Quoted 8 lines · Rob Herring
From: Rob Herring <[email protected]>
Multi-platform requires various kconfig options to be selected, so platforms don't need to select them individually.
Signed-off-by Rob Herring <[email protected]>Cc Linus Walleij <[email protected]>Cc Russell King <[email protected]>FYI... this recently hit arm-soc/for-next and according to my bisect, is the cause for two new boot failures[1] for
sunxi_defconfigon cubieboard and cubie2. The previous build/boot passed on both
boards[2]. Interestingly, both boards boot fine withmulti_v7_defconfigthough.
Quoted 7 lines
There's zero console output on the boards, and I haven't dug further since I still have to pack for a trip tomorrow.
Kevin
[1] http://lists.linaro.org/pipermail/kernel-build-reports/2014-February/002615.html
[2] http://lists.linaro.org/pipermail/kernel-build-reports/2014-February/002613.html
I suspect we want this one:
arch/arm/Kconfig +1 -0
@@ -304,6 +304,7 @@ config ARCH_MULTIPLATFORM bool "Allow multiple platforms to be selected" select ARCH_WANT_OPTIONAL_GPIOLIB select AUTO_ZRELADDR + select CLKSRC_OF select COMMON_CLK select GENERIC_CLOCKEVENTS select MULTI_IRQ_HANDLER
PATCH v2 1/9 ARM: centralize common multi-platform kconfig options
Quoted 32 lines · Arnd Bergmann
Quoted 16 lines · Kevin Hilman
Quoted 8 lines · Rob Herring
From: Rob Herring <[email protected]>
Multi-platform requires various kconfig options to be selected, so platforms don't need to select them individually.
Signed-off-by Rob Herring <[email protected]>Cc Linus Walleij <[email protected]>Cc Russell King <[email protected]>FYI... this recently hit arm-soc/for-next and according to my bisect, is the cause for two new boot failures[1] for
sunxi_defconfigon cubieboard and cubie2. The previous build/boot passed on both
boards[2]. Interestingly, both boards boot fine withmulti_v7_defconfigthough.Quoted 7 lines
There's zero console output on the boards, and I haven't dug further since I still have to pack for a trip tomorrow.
Kevin
[1] http://lists.linaro.org/pipermail/kernel-build-reports/2014-February/002615.html
[2] http://lists.linaro.org/pipermail/kernel-build-reports/2014-February/002613.htmlI suspect we want this one:
arch/arm/Kconfig +0
-0
arch/arm/Kconfig config ARCH_MULTIPLATFORM · line 310
Quoted 7 lines
arch/arm/Kconfig +1
-0@@ -304,6 +304,7 @@ config ARCH_MULTIPLATFORM bool "Allow multiple platforms to be selected" select ARCH_WANT_OPTIONAL_GPIOLIB select AUTO_ZRELADDR + select CLKSRC_OF select COMMON_CLK select GENERIC_CLOCKEVENTS select MULTI_IRQ_HANDLER
Yup, that's it. With that, sunxi_defconfig is booting again.
PATCH v2 1/9 ARM: centralize common multi-platform kconfig options
Quoted 15 lines · Kevin Hilman
arch/arm/Kconfig config ARCH_MULTIPLATFORM · line 310
Quoted 12 lines
arch/arm/Kconfig +1
-0@@ -304,6 +304,7 @@ config ARCH_MULTIPLATFORM bool "Allow multiple platforms to be selected" select ARCH_WANT_OPTIONAL_GPIOLIB select AUTO_ZRELADDR + select CLKSRC_OF select COMMON_CLK select GENERIC_CLOCKEVENTS select MULTI_IRQ_HANDLERYup, that's it. With that,
sunxi_defconfigis booting again.
Quoted 1 line
Tested-by Kevin Hilman <[email protected]>
I've added this patch on the *for-next* branch for now, while we still decide whether it is the correct solution. The alternative would be to only select it from the clocksource drivers that want it.
Arnd
PATCH v2 1/9 ARM: centralize common multi-platform kconfig options
Quoted 16 lines · Arnd Bergmann
Quoted 15 lines · Kevin Hilman
arch/arm/Kconfig config ARCH_MULTIPLATFORM · line 310
Quoted 12 lines
arch/arm/Kconfig +1
-0@@ -304,6 +304,7 @@ config ARCH_MULTIPLATFORM bool "Allow multiple platforms to be selected" select ARCH_WANT_OPTIONAL_GPIOLIB select AUTO_ZRELADDR + select CLKSRC_OF select COMMON_CLK select GENERIC_CLOCKEVENTS select MULTI_IRQ_HANDLERYup, that's it. With that,
sunxi_defconfigis booting again.
Quoted 5 lines
Quoted 1 line
Tested-by Kevin Hilman <[email protected]>I've added this patch on the *for-next* branch for now, while we still decide whether it is the correct solution. The alternative would be to only select it from the clocksource drivers that want
I see the same lockup with v3.15-rc1 on an imx233 board (olinuxino nano) and this patch also fixes the issues I see.
Regards,
Daniel Willmann
PATCH v2 2/9 ARM: select HAVE_SMP for V7 multi-platform
In reply to Rob HerringFrom: Rob Herring <[email protected]>
All V7 platforms can run SMP kernels, so make CONFIG_SMP visible for V7 multi-platform builds.
--- arch/arm/Kconfig | 1 + arch/arm/mach-berlin/Kconfig | 1 - arch/arm/mach-highbank/Kconfig | 1 - arch/arm/mach-hisi/Kconfig | 1 - arch/arm/mach-imx/Kconfig | 1 - arch/arm/mach-keystone/Kconfig | 1 - arch/arm/mach-mvebu/Kconfig | 1 - arch/arm/mach-omap2/Kconfig | 2 -- arch/arm/mach-prima2/Kconfig | 1 - arch/arm/mach-rockchip/Kconfig | 1 - arch/arm/mach-shmobile/Kconfig | 1 - arch/arm/mach-socfpga/Kconfig | 1 - arch/arm/mach-spear/Kconfig | 1 - arch/arm/mach-sti/Kconfig | 1 - arch/arm/mach-sunxi/Kconfig | 1 - arch/arm/mach-tegra/Kconfig | 1 - arch/arm/mach-ux500/Kconfig | 1 - arch/arm/mach-vexpress/Kconfig | 1 - arch/arm/mach-zynq/Kconfig | 1 - 19 files changed, 1 insertion(+), 19 deletions(-)
arch/arm/Kconfig +1 -0
@@ -917,6 +917,7 @@ config ARCH_MULTI_V7 default y select ARCH_MULTI_V6_V7 select CPU_V7 + select HAVE_SMP config ARCH_MULTI_V6_V7 bool
arch/arm/mach-berlin/Kconfig +0 -1
@@ -14,7 +14,6 @@ config MACH_BERLIN_BG2 select CACHE_L2X0 select CPU_PJ4B select HAVE_ARM_TWD if SMP - select HAVE_SMP config MACH_BERLIN_BG2CD bool "Marvell Armada 1500-mini (BG2CD)"
arch/arm/mach-highbank/Kconfig +0 -1
@@ -15,7 +15,6 @@ config ARCH_HIGHBANK select CACHE_L2X0 select HAVE_ARM_SCU select HAVE_ARM_TWD if SMP - select HAVE_SMP select MAILBOX select PL320_MBOX select ZONE_DMA if ARM_LPAE
arch/arm/mach-hisi/Kconfig +0 -1
@@ -6,7 +6,6 @@ config ARCH_HI3xxx select CACHE_L2X0 select HAVE_ARM_SCU select HAVE_ARM_TWD if SMP - select HAVE_SMP select PINCTRL select PINCTRL_SINGLE help
arch/arm/mach-imx/Kconfig +0 -1
@@ -791,7 +791,6 @@ config SOC_IMX6Q select HAVE_IMX_GPC select HAVE_IMX_MMDC select HAVE_IMX_SRC - select HAVE_SMP select MFD_SYSCON select MIGHT_HAVE_PCI select PCI_DOMAINS if PCI
arch/arm/mach-keystone/Kconfig +0 -1
@@ -3,7 +3,6 @@ config ARCH_KEYSTONE depends on ARCH_MULTI_V7 select ARM_GIC select HAVE_ARM_ARCH_TIMER - select HAVE_SMP select CLKSRC_MMIO select ARM_ERRATA_798181 if SMP select COMMON_CLK_KEYSTONE
arch/arm/mach-mvebu/Kconfig +0 -1
@@ -19,7 +19,6 @@ menu "Marvell SOC with device tree" config MACH_ARMADA_370_XP bool select ARMADA_370_XP_TIMER - select HAVE_SMP select CACHE_L2X0 select CPU_PJ4B
arch/arm/mach-omap2/Kconfig +0 -2
@@ -32,7 +32,6 @@ config ARCH_OMAP4 select CACHE_L2X0 select HAVE_ARM_SCU if SMP select HAVE_ARM_TWD if SMP - select HAVE_SMP select OMAP_INTERCONNECT select PL310_ERRATA_588369 select PL310_ERRATA_727915
@@ -50,7 +49,6 @@ config SOC_OMAP5 select ARM_GIC select HAVE_ARM_SCU if SMP select HAVE_ARM_TWD if SMP - select HAVE_SMP select HAVE_ARM_ARCH_TIMER select ARM_ERRATA_798181 if SMP
arch/arm/mach-prima2/Kconfig +0 -1
@@ -33,7 +33,6 @@ config ARCH_MARCO default y select ARM_GIC select HAVE_ARM_SCU if SMP - select HAVE_SMP select SMP_ON_UP if SMP help Support for CSR SiRFSoC ARM Cortex A9 Platform
arch/arm/mach-rockchip/Kconfig +0 -1
@@ -6,7 +6,6 @@ config ARCH_ROCKCHIP select ARM_GIC select CACHE_L2X0 select HAVE_ARM_TWD if SMP - select HAVE_SMP select DW_APB_TIMER_OF select ARM_GLOBAL_TIMER select CLKSRC_ARM_GLOBAL_TIMER_SCHED_CLOCK
arch/arm/mach-shmobile/Kconfig +0 -1
@@ -7,7 +7,6 @@ config ARCH_SHMOBILE_MULTI select ARCH_SHMOBILE select HAVE_ARM_SCU if SMP select HAVE_ARM_TWD if SMP - select HAVE_SMP select ARM_GIC select MIGHT_HAVE_CACHE_L2X0 select MIGHT_HAVE_PCI
arch/arm/mach-socfpga/Kconfig +0 -1
@@ -7,5 +7,4 @@ config ARCH_SOCFPGA select GPIO_PL061 if GPIOLIB select HAVE_ARM_SCU select HAVE_ARM_TWD if SMP - select HAVE_SMP select MFD_SYSCON
arch/arm/mach-spear/Kconfig +0 -1
@@ -19,7 +19,6 @@ config ARCH_SPEAR13XX select GPIO_SPEAR_SPICS select HAVE_ARM_SCU if SMP select HAVE_ARM_TWD if SMP - select HAVE_SMP select MIGHT_HAVE_CACHE_L2X0 select PINCTRL help
arch/arm/mach-sti/Kconfig +0 -1
@@ -6,7 +6,6 @@ menuconfig ARCH_STI select PINCTRL_ST select MFD_SYSCON select MIGHT_HAVE_CACHE_L2X0 - select HAVE_SMP select HAVE_ARM_SCU if SMP select ARCH_REQUIRE_GPIOLIB select ARM_ERRATA_754322
arch/arm/mach-sunxi/Kconfig +0 -1
@@ -6,7 +6,6 @@ config ARCH_SUNXI select ARM_PSCI select CLKSRC_MMIO select GENERIC_IRQ_CHIP - select HAVE_SMP select PINCTRL select PINCTRL_SUNXI select RESET_CONTROLLER
arch/arm/mach-tegra/Kconfig +0 -1
@@ -7,7 +7,6 @@ config ARCH_TEGRA select CLKSRC_MMIO select HAVE_ARM_SCU if SMP select HAVE_ARM_TWD if SMP - select HAVE_SMP select MIGHT_HAVE_CACHE_L2X0 select MIGHT_HAVE_PCI select PINCTRL
arch/arm/mach-ux500/Kconfig +0 -1
@@ -13,7 +13,6 @@ config ARCH_U8500 select CLKSRC_NOMADIK_MTU select HAVE_ARM_SCU if SMP select HAVE_ARM_TWD if SMP - select HAVE_SMP select MIGHT_HAVE_CACHE_L2X0 select PINCTRL select PINCTRL_ABX500
arch/arm/mach-vexpress/Kconfig +0 -1
@@ -9,7 +9,6 @@ config ARCH_VEXPRESS select HAVE_ARM_SCU if SMP select HAVE_ARM_TWD if SMP select HAVE_PATA_PLATFORM - select HAVE_SMP select ICST select MIGHT_HAVE_CACHE_L2X0 select NO_IOPORT
arch/arm/mach-zynq/Kconfig +0 -1
@@ -6,7 +6,6 @@ config ARCH_ZYNQ select HAVE_ARM_TWD if SMP select ICST select MIGHT_HAVE_CACHE_L2X0 - select HAVE_SMP select CADENCE_TTC_TIMER select ARM_GLOBAL_TIMER help
Signature · 1 line
1.8.3.2
PATCH 2/9 ARM: select HAVE_SMP for V7 multi-platform
Quoted 6 lines · Rob Herring
From: Rob Herring <[email protected]>
All V7 platforms can run SMP kernels, so make
CONFIG_SMPvisible for V7 multi-platform builds.Signed-off-by Rob Herring <[email protected]>
Yours,
Linus Walleij
PATCH v2 3/9 ARM: select MIGHT_HAVE_CACHE_L2X0 for V7 multi-platform
In reply to Rob HerringFrom: Rob Herring <[email protected]>
Many V7 platforms have an L2x0 cache, so make CONFIG_MIGHT_HAVE_CACHE_L2X0 visible for V7 multi-platform builds.
--- arch/arm/Kconfig | 1 + arch/arm/mach-cns3xxx/Kconfig | 1 - arch/arm/mach-imx/Kconfig | 1 - arch/arm/mach-prima2/Kconfig | 1 - arch/arm/mach-shmobile/Kconfig | 1 - arch/arm/mach-spear/Kconfig | 1 - arch/arm/mach-sti/Kconfig | 1 - arch/arm/mach-tegra/Kconfig | 1 - arch/arm/mach-ux500/Kconfig | 1 - arch/arm/mach-vexpress/Kconfig | 1 - arch/arm/mach-zynq/Kconfig | 1 - 11 files changed, 1 insertion(+), 10 deletions(-)
arch/arm/Kconfig +1 -0
@@ -921,6 +921,7 @@ config ARCH_MULTI_V7 config ARCH_MULTI_V6_V7 bool + select MIGHT_HAVE_CACHE_L2X0 config ARCH_MULTI_CPU_AUTO def_bool !(ARCH_MULTI_V4 || ARCH_MULTI_V4T || ARCH_MULTI_V6_V7)
arch/arm/mach-cns3xxx/Kconfig +0 -1
@@ -2,7 +2,6 @@ config ARCH_CNS3XXX bool "Cavium Networks CNS3XXX family" if ARCH_MULTI_V6 select ARM_GIC select CPU_V6K - select MIGHT_HAVE_CACHE_L2X0 select MIGHT_HAVE_PCI select PCI_DOMAINS if PCI help
arch/arm/mach-imx/Kconfig +0 -1
@@ -5,7 +5,6 @@ config ARCH_MXC select CLKSRC_MMIO select GENERIC_ALLOCATOR select GENERIC_IRQ_CHIP - select MIGHT_HAVE_CACHE_L2X0 if ARCH_MULTI_V6_V7 select PINCTRL select SOC_BUS help
arch/arm/mach-prima2/Kconfig +0 -1
@@ -2,7 +2,6 @@ config ARCH_SIRF bool "CSR SiRF" if ARCH_MULTI_V7 select ARCH_REQUIRE_GPIOLIB select GENERIC_IRQ_CHIP - select MIGHT_HAVE_CACHE_L2X0 select NO_IOPORT select PINCTRL select PINCTRL_SIRF
arch/arm/mach-shmobile/Kconfig +0 -1
@@ -8,7 +8,6 @@ config ARCH_SHMOBILE_MULTI select HAVE_ARM_SCU if SMP select HAVE_ARM_TWD if SMP select ARM_GIC - select MIGHT_HAVE_CACHE_L2X0 select MIGHT_HAVE_PCI select NO_IOPORT select PINCTRL
arch/arm/mach-spear/Kconfig +0 -1
@@ -19,7 +19,6 @@ config ARCH_SPEAR13XX select GPIO_SPEAR_SPICS select HAVE_ARM_SCU if SMP select HAVE_ARM_TWD if SMP - select MIGHT_HAVE_CACHE_L2X0 select PINCTRL help Supports for ARM's SPEAR13XX family
arch/arm/mach-sti/Kconfig +0 -1
@@ -5,7 +5,6 @@ menuconfig ARCH_STI select PINCTRL select PINCTRL_ST select MFD_SYSCON - select MIGHT_HAVE_CACHE_L2X0 select HAVE_ARM_SCU if SMP select ARCH_REQUIRE_GPIOLIB select ARM_ERRATA_754322
arch/arm/mach-tegra/Kconfig +0 -1
@@ -7,7 +7,6 @@ config ARCH_TEGRA select CLKSRC_MMIO select HAVE_ARM_SCU if SMP select HAVE_ARM_TWD if SMP - select MIGHT_HAVE_CACHE_L2X0 select MIGHT_HAVE_PCI select PINCTRL select ARCH_HAS_RESET_CONTROLLER
arch/arm/mach-ux500/Kconfig +0 -1
@@ -13,7 +13,6 @@ config ARCH_U8500 select CLKSRC_NOMADIK_MTU select HAVE_ARM_SCU if SMP select HAVE_ARM_TWD if SMP - select MIGHT_HAVE_CACHE_L2X0 select PINCTRL select PINCTRL_ABX500 select PINCTRL_NOMADIK
arch/arm/mach-vexpress/Kconfig +0 -1
@@ -10,7 +10,6 @@ config ARCH_VEXPRESS select HAVE_ARM_TWD if SMP select HAVE_PATA_PLATFORM select ICST - select MIGHT_HAVE_CACHE_L2X0 select NO_IOPORT select PLAT_VERSATILE select PLAT_VERSATILE_CLCD
arch/arm/mach-zynq/Kconfig +0 -1
@@ -5,7 +5,6 @@ config ARCH_ZYNQ select HAVE_ARM_SCU if SMP select HAVE_ARM_TWD if SMP select ICST - select MIGHT_HAVE_CACHE_L2X0 select CADENCE_TTC_TIMER select ARM_GLOBAL_TIMER help
Signature · 1 line
1.8.3.2
PATCH v2 3/9 ARM: select MIGHT_HAVE_CACHE_L2X0 for V7 multi-platform
arch/arm/Kconfig config ARCH_MULTI_V7 · line 924
Quoted 8 lines · Rob Herring
Many V7 platforms have an L2x0 cache, so make
CONFIG_MIGHT_HAVE_CACHE_L2X0visible for V7 multi-platform builds.arch/arm/Kconfig +1
-0config ARCH_MULTI_V6_V7 bool + select MIGHT_HAVE_CACHE_L2X0
The commit description says "V7", whereas the select got added to "V6_V7" rather then "V7". Was that intentional?
PATCH v2 3/9 ARM: select MIGHT_HAVE_CACHE_L2X0 for V7 multi-platform
Quoted 4 lines · Stephen Warren
Quoted 2 lines · Rob Herring
Many V7 platforms have an L2x0 cache, so make
CONFIG_MIGHT_HAVE_CACHE_L2X0visible for V7 multi-platform builds.
Quoted 8 lines
arch/arm/Kconfig config ARCH_MULTI_V7 · line 924
Quoted 5 lines
arch/arm/Kconfig +1
-0config ARCH_MULTI_V6_V7 bool + select MIGHT_HAVE_CACHE_L2X0The commit description says "V7", whereas the select got added to "
V6_V7" rather then "V7". Was that intentional?
I'll fix the commit text. Given that most ARM11 platforms have an L2x0, we should enable for both.
Rob
PATCH v2 4/9 ARM: Select V6K instead of V6 by default for multi-platform
In reply to Rob HerringFrom: Rob Herring <[email protected]>
MULTI_V6 should default to V6K as it is more optimal than V6. Any platform which is not V6K should select CPU_V6 which will enable the less optimal code paths.
--- arch/arm/Kconfig | 2 +- arch/arm/mach-cns3xxx/Kconfig | 2 +- arch/arm/mach-imx/Kconfig | 1 - arch/arm/mach-picoxcell/Kconfig | 1 - 4 files changed, 2 insertions(+), 4 deletions(-)
arch/arm/Kconfig +1 -1
@@ -910,7 +910,7 @@ config ARCH_MULTI_V4_V5 config ARCH_MULTI_V6 bool "ARMv6 based platforms (ARM11)" select ARCH_MULTI_V6_V7 - select CPU_V6 + select CPU_V6K config ARCH_MULTI_V7 bool "ARMv7 based platforms (Cortex-A, PJ4, Scorpion, Krait)"
arch/arm/mach-cns3xxx/Kconfig +1 -1
@@ -1,9 +1,9 @@ config ARCH_CNS3XXX bool "Cavium Networks CNS3XXX family" if ARCH_MULTI_V6 select ARM_GIC - select CPU_V6K select MIGHT_HAVE_PCI select PCI_DOMAINS if PCI + select CPU_V6 help Support for Cavium Networks CNS3XXX platform.
arch/arm/mach-imx/Kconfig +0 -1
@@ -114,7 +114,6 @@ config SOC_IMX31 config SOC_IMX35 bool select ARCH_MXC_IOMUX_V3 - select CPU_V6K select HAVE_EPIT select MXC_AVIC select SMP_ON_UP if SMP
arch/arm/mach-picoxcell/Kconfig +0 -1
@@ -2,7 +2,6 @@ config ARCH_PICOXCELL bool "Picochip PicoXcell" if ARCH_MULTI_V6 select ARCH_REQUIRE_GPIOLIB select ARM_VIC - select CPU_V6K select DW_APB_TIMER_OF select HAVE_TCM select NO_IOPORT
Signature · 1 line
1.8.3.2
PATCH v2 4/9 ARM: Select V6K instead of V6 by default for multi-platform
arch/arm/mach-cns3xxx/Kconfig line 8
Quoted 10 lines · On Tuesday 11 February 2014 15:11:54 Rob Herring wrote:
arch/arm/mach-cns3xxx/Kconfig +1
-1@@ -1,9 +1,9 @@ config ARCH_CNS3XXX bool "Cavium Networks CNS3XXX family" if ARCH_MULTI_V6 select ARM_GIC - select CPU_V6K select MIGHT_HAVE_PCI select PCI_DOMAINS if PCI + select CPU_V6 help Support for Cavium Networks CNS3XXX platform.
I thought we had concluded that CNS3xxx is V6K as well. Do you have newer information? Maybe Anton remembers.
Arnd
PATCH v2 4/9 ARM: Select V6K instead of V6 by default for multi-platform
Quoted 14 lines · Arnd Bergmann
arch/arm/mach-cns3xxx/Kconfig line 8
Quoted 10 lines · On Tuesday 11 February 2014 15:11:54 Rob Herring wrote:
arch/arm/mach-cns3xxx/Kconfig +1
-1@@ -1,9 +1,9 @@ config ARCH_CNS3XXX bool "Cavium Networks CNS3XXX family" if ARCH_MULTI_V6 select ARM_GIC - select CPU_V6K select MIGHT_HAVE_PCI select PCI_DOMAINS if PCI + select CPU_V6 help Support for Cavium Networks CNS3XXX platform.I thought we had concluded that CNS3xxx is V6K as well. Do you have newer information? Maybe Anton remembers.
I believe it is being MP, but I split this up so that changing the default doesn't change any platform and each platform change is a separate patch which can be applied or not.
Rob
PATCH v2 4/9 ARM: Select V6K instead of V6 by default for multi-platform
Quoted 16 lines · On Tuesday 11 February 2014 15:26:14 Rob Herring wrote:
Quoted 14 lines · Arnd Bergmann
arch/arm/mach-cns3xxx/Kconfig line 8
Quoted 10 lines · On Tuesday 11 February 2014 15:11:54 Rob Herring wrote:
arch/arm/mach-cns3xxx/Kconfig +1
-1@@ -1,9 +1,9 @@ config ARCH_CNS3XXX bool "Cavium Networks CNS3XXX family" if ARCH_MULTI_V6 select ARM_GIC - select CPU_V6K select MIGHT_HAVE_PCI select PCI_DOMAINS if PCI + select CPU_V6 help Support for Cavium Networks CNS3XXX platform.I thought we had concluded that CNS3xxx is V6K as well. Do you have newer information? Maybe Anton remembers.
Quoted 4 lines
I believe it is being MP, but I split this up so that changing the default doesn't change any platform and each platform change is a separate patch which can be applied or not.
Ok, got it.
Arnd
PATCH 4/9 ARM: Select V6K instead of V6 by default for multi-platform
In reply to Rob HerringQuoted 9 lines · Rob Herring
From: Rob Herring <[email protected]>
MULTI_V6should default to V6K as it is more optimal than V6. Any platform which is not V6K should selectCPU_V6which will enable the less optimal code paths.Signed-off-by Rob Herring <[email protected]>Cc Anton Vorontsov <[email protected]>Cc Shawn Guo <[email protected]>
...
Quoted 1 line
arch/arm/mach-imx/Kconfig | 1 -
PATCH v2 5/9 ARM: bcm2835: enable V6K instead of plain V6
In reply to Rob HerringFrom: Rob Herring <[email protected]>
The bcm2835 is an ARM1176 which has all the V6K extensions except for SMP, so V6K should be selected instead. Dropping the select will use the default for ARCH_MULTI_V6 which is V6K.
--- arch/arm/mach-bcm2835/Kconfig | 1 - 1 file changed, 1 deletion(-)
arch/arm/mach-bcm2835/Kconfig +0 -1
@@ -4,7 +4,6 @@ config ARCH_BCM2835 select ARM_AMBA select ARM_ERRATA_411920 select ARM_TIMER_SP804 - select CPU_V6 select PINCTRL select PINCTRL_BCM2835 help
Signature · 1 line
1.8.3.2
PATCH v2 6/9 ARM: cns3xxx: enable V6K instead of plain V6
In reply to Rob HerringFrom: Rob Herring <[email protected]>
The cns3xxx is an ARM11MPCore which has all the V6K extensions, so V6K should be selected instead. Dropping the select will use the default for ARCH_MULTI_V6 which is V6K.
--- arch/arm/mach-cns3xxx/Kconfig | 1 - 1 file changed, 1 deletion(-)
arch/arm/mach-cns3xxx/Kconfig +0 -1
@@ -3,7 +3,6 @@ config ARCH_CNS3XXX select ARM_GIC select MIGHT_HAVE_PCI select PCI_DOMAINS if PCI - select CPU_V6 help Support for Cavium Networks CNS3XXX platform.
Signature · 1 line
1.8.3.2
PATCH v2 7/9 ARM: vt8500: enable V6K instead of plain V6
In reply to Rob HerringFrom: Rob Herring <[email protected]>
The wm8750 is an ARM1176 which has all the V6K extensions except for SMP, so V6K should be selected instead. Dropping the select will use the default for ARCH_MULTI_V6 which is V6K.
--- arch/arm/mach-vt8500/Kconfig | 1 - 1 file changed, 1 deletion(-)
arch/arm/mach-vt8500/Kconfig +0 -1
@@ -19,7 +19,6 @@ config ARCH_WM8750 bool "WonderMedia WM8750" depends on ARCH_MULTI_V6 select ARCH_VT8500 - select CPU_V6 help Support for WonderMedia WM8750 System-on-Chip.
Signature · 1 line
1.8.3.2
PATCH v2 8/9 ARM: virt: make mach-virt just a kconfig option
In reply to Rob HerringFrom: Rob Herring <[email protected]>
The mach code for mach-virt is no longer needed, so we can remove all of mach-virt except the kconfig entry.
--- arch/arm/Kconfig | 8 ++++++-- arch/arm/Makefile | 1 - arch/arm/mach-virt/Kconfig | 6 ------ arch/arm/mach-virt/Makefile | 5 ----- arch/arm/mach-virt/virt.c | 41 ----------------------------------------- 5 files changed, 6 insertions(+), 55 deletions(-) delete mode 100644 arch/arm/mach-virt/Kconfig delete mode 100644 arch/arm/mach-virt/Makefile delete mode 100644 arch/arm/mach-virt/virt.c
arch/arm/Kconfig +6 -2
@@ -929,6 +929,12 @@ config ARCH_MULTI_CPU_AUTO endmenu +config ARCH_VIRT + bool "Dummy Virtual Machine" if ARCH_MULTI_V7 + select ARM_GIC + select HAVE_ARM_ARCH_TIMER + select ARM_PSCI + # # This is sorted alphabetically by mach-* pathname. However, plat-* # Kconfigs may be included either alphabetically (according to the
@@ -1052,8 +1058,6 @@ source "arch/arm/mach-versatile/Kconfig" source "arch/arm/mach-vexpress/Kconfig" source "arch/arm/plat-versatile/Kconfig" -source "arch/arm/mach-virt/Kconfig" - source "arch/arm/mach-vt8500/Kconfig" source "arch/arm/mach-w90x900/Kconfig"
arch/arm/Makefile +0 -1
@@ -199,7 +199,6 @@ machine-$(CONFIG_ARCH_U300) += u300 machine-$(CONFIG_ARCH_U8500) += ux500 machine-$(CONFIG_ARCH_VERSATILE) += versatile machine-$(CONFIG_ARCH_VEXPRESS) += vexpress -machine-$(CONFIG_ARCH_VIRT) += virt machine-$(CONFIG_ARCH_VT8500) += vt8500 machine-$(CONFIG_ARCH_W90X900) += w90x900 machine-$(CONFIG_ARCH_ZYNQ) += zynq
arch/arm/mach-virt/Kconfig deleted +0 -6
@@ -1,6 +0,0 @@ -config ARCH_VIRT - bool "Dummy Virtual Machine" if ARCH_MULTI_V7 - select ARM_GIC - select HAVE_ARM_ARCH_TIMER - select ARM_PSCI - select HAVE_SMP
arch/arm/mach-virt/Makefile deleted +0 -5
@@ -1,5 +0,0 @@ -# -# Makefile for the linux kernel. -# - -obj-y := virt.o
arch/arm/mach-virt/virt.c deleted +0 -41
41 lines not on this page · raw message
Signature · 1 line
1.8.3.2
PATCH v2 8/9 ARM: virt: make mach-virt just a kconfig option
Quoted 7 lines · Rob Herring
From: Rob Herring <[email protected]>
The mach code for mach-virt is no longer needed, so we can remove all of mach-virt except the kconfig entry.
Signed-off-by Rob Herring <[email protected]>Cc Russell King <[email protected]>
M.
Signature · 1 line
Jazz is not dead. It just smells funny...
PATCH v2 9/9 ARM: virt: select ARM_AMBA
In reply to Rob HerringFrom: Rob Herring <[email protected]>
Guests can use AMBA bus devices such as the PL011 uart, so enable the AMBA bus for mach-virt.
--- arch/arm/Kconfig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/arm/Kconfig +2 -1
@@ -931,9 +931,10 @@ endmenu config ARCH_VIRT bool "Dummy Virtual Machine" if ARCH_MULTI_V7 + select ARM_AMBA select ARM_GIC - select HAVE_ARM_ARCH_TIMER select ARM_PSCI + select HAVE_ARM_ARCH_TIMER # # This is sorted alphabetically by mach-* pathname. However, plat-*
Signature · 1 line
1.8.3.2
v2 cover ARM: multi-platform kconfig cleanup and mach-virt removal
In reply to Rob HerringQuoted 7 lines · Rob Herring
From: Rob Herring <[email protected]>
This series removes common kconfig options required by multi-platform builds out of individual platforms as they are redundant. Patches 2 and 3 make SMP and
CACHE_L2X0config options visible onMULTI_V7builds as most platforms enable these options and all platforms can run with them enabled.
Overall looks pretty good, let's wait for a few more Acks or a possible Nak and then put it into arm-soc. You can add my 'Acked-by' to all patches if you like.
Quoted 4 lines
The previous version [1] was mainly a discussion about v6 vs. v6K. Several platforms have this wrong and incorrectly select v6 when the more optimal v6K option could be used. After more research, my memory about i.MX31 was wrong and it does need to remain v6.
Just curious: do you have more information on this? Are all i.MX31 ARMv6 and all i.MX35 v6k as the current Kconfig claims, or is it more complicated?
Quoted 4 lines
Finally, patch 8 removes mach-virt as it is no longer needed. The core ARM code can handle all the necessary initialization and mach-virt is left as a kconfig option. Although not really related to this series, it would otherwise conflict with it.
Makes sense. It's still a cleanup, so you could send it as a separate patch to be applied on-top of the pull rather than the same pull request, although the difference is really marginal.
You are probably right in leaving out the non-multiplatform platforms, but maybe we can figure out whether they should be changed as well, especially as some of them are going to become multiplatform-enabled in the future:
* ARCH_S5P64X0 should be changed, it's next on the list
* DaVinci/TNETV107X looks rather broken, I wonder if we should just remove it entirely rather than fix it. I have a series to fix all 'randconfig' build bugs locally and there were a lot of them for TNETV107X, and I doubt fixing the build will actually give you a booting kernel.
* ARCH_MSM7X00A should just be changed, although probably nobody really cares.
* integrator and realview apparently allow both CPU_V6 and CPU_V6K to be manually selected. Is that actually the correct behavior in that both kinds of core tiles exist?
Arnd
v2 cover ARM: multi-platform kconfig cleanup and mach-virt removal
Quoted 9 lines · Arnd Bergmann
Quoted 4 lines · Rob Herring
The previous version [1] was mainly a discussion about v6 vs. v6K. Several platforms have this wrong and incorrectly select v6 when the more optimal v6K option could be used. After more research, my memory about i.MX31 was wrong and it does need to remain v6.
Just curious: do you have more information on this? Are all i.MX31 ARMv6 and all i.MX35 v6k as the current
Kconfigclaims, or is it more complicated?
Slightly tangential, but the one to watch out for is 1136. Prior to r1 (i.e. r0pX), it is v6 but r1pX+ are v6k (without SMP).
Quoted 3 lines
* integrator and realview apparently allow both
CPU_V6andCPU_V6Kto be manually selected. Is that actually the correct behavior in that both kinds of core tiles exist?
I have 1136 r0p1 on an integrator CP, so I suppose it could also take an 1136 r1pX without any trouble.
Will
v2 cover ARM: multi-platform kconfig cleanup and mach-virt removal
Quoted 7 lines · Will Deacon
Quoted 6 lines · Arnd Bergmann
Quoted 4 lines · Rob Herring
The previous version [1] was mainly a discussion about v6 vs. v6K. Several platforms have this wrong and incorrectly select v6 when the more optimal v6K option could be used. After more research, my memory about i.MX31 was wrong and it does need to remain v6.
Quoted 6 lines
Quoted 3 lines
Just curious: do you have more information on this? Are all i.MX31 ARMv6 and all i.MX35 v6k as the current
Kconfigclaims, or is it more complicated?Slightly tangential, but the one to watch out for is 1136. Prior to r1 (i.e. r0pX), it is v6 but r1pX+ are v6k (without SMP).
Right. I originally was thinking that the MX31 1.x was r0pX and MX31 2.x was r1pX and that there are no 1.x chips around. However, after checking the errata sheet, 1.x is r0p1 and 2.x is r0p4. It must have been one of the other 1136 chips we did that moved to r1pX.
Quoted 6 lines
Quoted 3 lines
* integrator and realview apparently allow both
CPU_V6andCPU_V6Kto be manually selected. Is that actually the correct behavior in that both kinds of core tiles exist?I have 1136 r0p1 on an integrator CP, so I suppose it could also take an 1136 r1pX without any trouble.
Presumably some of both exist which is why the config options are as they are?
Rob
v2 cover ARM: multi-platform kconfig cleanup and mach-virt removal
Quoted 12 lines · On Wednesday 12 February 2014 08:07:12 Rob Herring wrote:
Quoted 11 lines · Will Deacon
Quoted 9 lines · Arnd Bergmann
Quoted 4 lines · Rob Herring
The previous version [1] was mainly a discussion about v6 vs. v6K. Several platforms have this wrong and incorrectly select v6 when the more optimal v6K option could be used. After more research, my memory about i.MX31 was wrong and it does need to remain v6.
Just curious: do you have more information on this? Are all i.MX31 ARMv6 and all i.MX35 v6k as the current
Kconfigclaims, or is it more complicated?
Quoted 7 lines
Quoted 2 lines
Slightly tangential, but the one to watch out for is 1136. Prior to r1 (i.e. r0pX), it is v6 but r1pX+ are v6k (without SMP).
Right. I originally was thinking that the MX31 1.x was r0pX and MX31 2.x was r1pX and that there are no 1.x chips around. However, after checking the errata sheet, 1.x is r0p1 and 2.x is r0p4. It must have been one of the other 1136 chips we did that moved to r1pX.
Ok.
Quoted 8 lines
Quoted 6 lines
Quoted 3 lines
* integrator and realview apparently allow both
CPU_V6andCPU_V6Kto be manually selected. Is that actually the correct behavior in that both kinds of core tiles exist?I have 1136 r0p1 on an integrator CP, so I suppose it could also take an 1136 r1pX without any trouble.
Presumably some of both exist which is why the config options are as they are?
Possible, but I wouldn't trust that part of the kernel very far. Especially the MMU-less CPUs in there seem to be listed a bit randomly.
On the topic of V6, we don't support CPU_V6T2 at all, though I assume that there is an ARM1156 core tile for integrator and realview, and we support running the V6/V6K parts with MMU turned off. Would all revisions of ARM1156 work with CPU_V6K and !MMU?
Arnd
v2 cover ARM: multi-platform kconfig cleanup and mach-virt removal
Quoted 5 lines · Arnd Bergmann
On the topic of V6, we don't support
CPU_V6T2at all, though I assume that there is an ARM1156 core tile for integrator and realview, and we support running the V6/V6K parts with MMU turned off. Would all revisions of ARM1156 work withCPU_V6Kand !MMU?
CPU_V6 and !MMU should work. V6K might, but that requires close inspection (WFE, SEV shouldn't be used in UP context)...
Full disclosure: I happen to have a *brand new*, freshly unwrapped ARM1156 core tile for a Versatile EB. All it requires is a victim with time on their hand...
M.
Signature · 1 line
Jazz is not dead. It just smells funny...
v2 cover ARM: multi-platform kconfig cleanup and mach-virt removal
Quoted 9 lines · Marc Zyngier
Quoted 5 lines · Arnd Bergmann
On the topic of V6, we don't support
CPU_V6T2at all, though I assume that there is an ARM1156 core tile for integrator and realview, and we support running the V6/V6K parts with MMU turned off. Would all revisions of ARM1156 work withCPU_V6Kand !MMU?
CPU_V6and !MMU should work. V6K might, but that requires close inspection (WFE, SEV shouldn't be used in UP context)...
Well I can boot Debian on my 1136 r0p1 (no v6k) using a v6/v7 kernel, so the lack of MMU shouldn't change that. The main issue was booting the same kernel on an A15, which resulted in speculative interrupt acks on the GIC (fix sitting in rmk's tree [ARM: 7954/1: mm: remove remaining domain support from ARMv6]).
Will
v2 cover ARM: multi-platform kconfig cleanup and mach-virt removal
Quoted 8 lines · On Wednesday 12 February 2014 17:16:21 Will Deacon wrote:
Quoted 7 lines · Marc Zyngier
Quoted 5 lines · Arnd Bergmann
On the topic of V6, we don't support
CPU_V6T2at all, though I assume that there is an ARM1156 core tile for integrator and realview, and we support running the V6/V6K parts with MMU turned off. Would all revisions of ARM1156 work withCPU_V6Kand !MMU?
Quoted 5 lines
Quoted 2 lines
CPU_V6and !MMU should work. V6K might, but that requires close inspection (WFE, SEV shouldn't be used in UP context)...Well I can boot Debian on my 1136 r0p1 (no v6k) using a v6/v7 kernel, so the lack of MMU shouldn't change that.
I was more worried about ARM1156 not being a strict superset of V6K, i.e. stuff other than the MMU missing from it that the kernel would rely on.
Arnd
v2 cover ARM: multi-platform kconfig cleanup and mach-virt removal
Quoted 9 lines · Arnd Bergmann
Quoted 8 lines · On Wednesday 12 February 2014 17:16:21 Will Deacon wrote:
Quoted 7 lines · Marc Zyngier
Quoted 5 lines · Arnd Bergmann
On the topic of V6, we don't support
CPU_V6T2at all, though I assume that there is an ARM1156 core tile for integrator and realview, and we support running the V6/V6K parts with MMU turned off. Would all revisions of ARM1156 work withCPU_V6Kand !MMU?
Quoted 8 lines
Quoted 5 lines
Quoted 2 lines
CPU_V6and !MMU should work. V6K might, but that requires close inspection (WFE, SEV shouldn't be used in UP context)...Well I can boot Debian on my 1136 r0p1 (no v6k) using a v6/v7 kernel, so the lack of MMU shouldn't change that.
I was more worried about ARM1156 not being a strict superset of V6K, i.e. stuff other than the MMU missing from it that the kernel would rely on.
ARM1156 doesn't implement v6k, so you mean subset, right? My point was that 1136 works fine, so the only remaining part should be the lack of MMU.
I can't think of anything else missing, but I've never actually tried booting one!
Will
v2 cover ARM: multi-platform kconfig cleanup and mach-virt removal
Quoted 13 lines · On Wednesday 12 February 2014 18:15:27 Will Deacon wrote:
Quoted 12 lines · Arnd Bergmann
Quoted 11 lines · On Wednesday 12 February 2014 17:16:21 Will Deacon wrote:
Quoted 9 lines · Marc Zyngier
Quoted 5 lines · Arnd Bergmann
On the topic of V6, we don't support
CPU_V6T2at all, though I assume that there is an ARM1156 core tile for integrator and realview, and we support running the V6/V6K parts with MMU turned off. Would all revisions of ARM1156 work withCPU_V6Kand !MMU?
CPU_V6and !MMU should work. V6K might, but that requires close inspection (WFE, SEV shouldn't be used in UP context)...
Quoted 8 lines
Quoted 5 lines
Quoted 2 lines
Well I can boot Debian on my 1136 r0p1 (no v6k) using a v6/v7 kernel, so the lack of MMU shouldn't change that.
I was more worried about ARM1156 not being a strict superset of V6K, i.e. stuff other than the MMU missing from it that the kernel would rely on.
ARM1156 doesn't implement v6k, so you mean subset, right? My point was that 1136 works fine, so the only remaining part should be the lack of MMU.
I meant superset of the no-mmu subset of v6k. ARM1156 introduced Thumb2 support, so it's clearly not just a subset but also contains stuff that wasn't part of v6k.
Arnd
v2 cover ARM: multi-platform kconfig cleanup and mach-virt removal
In reply to Rob HerringQuoted 16 lines · Rob Herring
From: Rob Herring <[email protected]>
This series removes common kconfig options required by multi-platform builds out of individual platforms as they are redundant. Patches 2 and 3 make SMP and
CACHE_L2X0config options visible onMULTI_V7builds as most platforms enable these options and all platforms can run with them enabled.The previous version [1] was mainly a discussion about v6 vs. v6K. Several platforms have this wrong and incorrectly select v6 when the more optimal v6K option could be used. After more research, my memory about i.MX31 was wrong and it does need to remain v6. I've tested the v6K change on Rasp Pi. The default change to v6K for
MULTI_V6does not switch any platforms. I don't plan to submit the v6K changes for platforms without platform maintainers acks or testing.
Quoted 4 lines
Finally, patch 8 removes mach-virt as it is no longer needed. The core ARM code can handle all the necessary initialization and mach-virt is left as a kconfig option. Although not really related to this series, it would otherwise conflict with it.
mach-tegra changes,
mach-bcm2835 *except* patch 5/9, which I hope to test tonight,
v2 cover ARM: multi-platform kconfig cleanup and mach-virt removal
In reply to Rob HerringQuoted 16 lines · Rob Herring
From: Rob Herring <[email protected]>
This series removes common kconfig options required by multi-platform builds out of individual platforms as they are redundant. Patches 2 and 3 make SMP and
CACHE_L2X0config options visible onMULTI_V7builds as most platforms enable these options and all platforms can run with them enabled.The previous version [1] was mainly a discussion about v6 vs. v6K. Several platforms have this wrong and incorrectly select v6 when the more optimal v6K option could be used. After more research, my memory about i.MX31 was wrong and it does need to remain v6. I've tested the v6K change on Rasp Pi. The default change to v6K for
MULTI_V6does not switch any platforms. I don't plan to submit the v6K changes for platforms without platform maintainers acks or testing.
Quoted 4 lines
Finally, patch 8 removes mach-virt as it is no longer needed. The core ARM code can handle all the necessary initialization and mach-virt is left as a kconfig option. Although not really related to this series, it would otherwise conflict with it.
For mach-bcm2835, the series,
And patch 5/9 also now,