kconfig selection fixes
Subsystems (6)
cover kconfig selection fixes
From: Rob Herring <[email protected]>
Olof,
Here are a few kconfig select fixes. The first one can be squashed into my previous patch for HiSilicon removing SMP select if you want to.
I'm still looking into the cpufreq select issue with highbank. I'll follow-up with Viresh on that.
Rob
Rob Herring (3):
ARM: hisi: fix kconfig warning on HAVE_ARM_TWD
ARM: moxart: move DMA_OF selection to driver
ARM: fix HAVE_ARM_TWD selection for OMAP and shmobile
arch/arm/mach-hisi/Kconfig | 2 +- arch/arm/mach-moxart/Kconfig | 1 - arch/arm/mach-omap2/Kconfig | 2 +- arch/arm/mach-shmobile/Kconfig | 2 +- drivers/dma/Kconfig | 1 + 5 files changed, 4 insertions(+), 4 deletions(-)
Signature · 1 line
1.8.3.2
PATCH 1/3 ARM: hisi: fix kconfig warning on HAVE_ARM_TWD
From: Rob Herring <[email protected]>
Commit "ARM: hisi: don't select SMP" introduced a kconfig warning:
warning: (ARCH_HI3xxx) selects HAVE_ARM_TWD which has unmet direct dependencies (SMP)
Fix HAVE_ARM_TWD to depend on SMP.
--- arch/arm/mach-hisi/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/mach-hisi/Kconfig +1 -1
@@ -8,7 +8,7 @@ config ARCH_HI3xxx select CLKSRC_OF select GENERIC_CLOCKEVENTS select HAVE_ARM_SCU - select HAVE_ARM_TWD + select HAVE_ARM_TWD if SMP select HAVE_SMP select PINCTRL select PINCTRL_SINGLE
Signature · 1 line
1.8.3.2
PATCH 2/3 ARM: moxart: move DMA_OF selection to driver
In reply to Rob HerringFrom: Rob Herring <[email protected]>
Move the DMA_OF selection to the DMA driver to fix kconfig warning:
warning: (ARCH_MOXART) selects DMA_OF which has unmet direct dependencies (DMADEVICES && OF)
--- arch/arm/mach-moxart/Kconfig | 1 - drivers/dma/Kconfig | 1 + 2 files changed, 1 insertion(+), 1 deletion(-)
arch/arm/mach-moxart/Kconfig +0 -1
@@ -2,7 +2,6 @@ config ARCH_MOXART bool "MOXA ART SoC" if ARCH_MULTI_V4T select CPU_FA526 select ARM_DMA_MEM_BUFFERABLE - select DMA_OF select USE_OF select CLKSRC_OF select CLKSRC_MMIO
drivers/dma/Kconfig +1 -0
@@ -346,6 +346,7 @@ config MOXART_DMA tristate "MOXART DMA support" depends on ARCH_MOXART select DMA_ENGINE + select DMA_OF select DMA_VIRTUAL_CHANNELS help Enable support for the MOXA ART SoC DMA controller.
Signature · 1 line
1.8.3.2
PATCH 3/3 ARM: fix HAVE_ARM_TWD selection for OMAP and shmobile
In reply to Rob HerringFrom: Rob Herring <[email protected]>
The selection of HAVE_ARM_TWD for OMAP and shmobile depend on LOCAL_TIMER which no longer exists. They should depend on SMP instead.
--- arch/arm/mach-omap2/Kconfig | 2 +- arch/arm/mach-shmobile/Kconfig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
arch/arm/mach-omap2/Kconfig +1 -1
@@ -54,7 +54,7 @@ config SOC_OMAP5 select ARM_GIC select CPU_V7 select HAVE_ARM_SCU if SMP - select HAVE_ARM_TWD if LOCAL_TIMERS + select HAVE_ARM_TWD if SMP select HAVE_SMP select HAVE_ARM_ARCH_TIMER select ARM_ERRATA_798181 if SMP
arch/arm/mach-shmobile/Kconfig +1 -1
@@ -8,7 +8,7 @@ config ARCH_SHMOBILE_MULTI select CPU_V7 select GENERIC_CLOCKEVENTS select HAVE_ARM_SCU if SMP - select HAVE_ARM_TWD if LOCAL_TIMERS + select HAVE_ARM_TWD if SMP select HAVE_SMP select ARM_GIC select MIGHT_HAVE_CACHE_L2X0
Signature · 1 line
1.8.3.2
PATCH 3/3 ARM: fix HAVE_ARM_TWD selection for OMAP and shmobile
Hi,
could you split the shmobile portion out into a separate patch so that I can take it through my tree?
Thanks
Quoted 49 lines · Rob Herring
From: Rob Herring <[email protected]>
The selection of
HAVE_ARM_TWDfor OMAP and shmobile depend onLOCAL_TIMERwhich no longer exists. They should depend on SMP instead.Cc Tony Lindgren <[email protected]>Cc Simon Horman <[email protected]>Cc Magnus Damm <[email protected]>Signed-off-by Rob Herring <[email protected]>--- arch/arm/mach-omap2/Kconfig | 2 +- arch/arm/mach-shmobile/Kconfig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)arch/arm/mach-omap2/Kconfig +1
-1@@ -54,7 +54,7 @@ config SOC_OMAP5 select ARM_GIC select CPU_V7 select HAVE_ARM_SCU if SMP - select HAVE_ARM_TWD if LOCAL_TIMERS + select HAVE_ARM_TWD if SMP select HAVE_SMP select HAVE_ARM_ARCH_TIMER select ARM_ERRATA_798181 if SMParch/arm/mach-shmobile/Kconfig +1
-1@@ -8,7 +8,7 @@ config ARCH_SHMOBILE_MULTI select CPU_V7 select GENERIC_CLOCKEVENTS select HAVE_ARM_SCU if SMP - select HAVE_ARM_TWD if LOCAL_TIMERS + select HAVE_ARM_TWD if SMP select HAVE_SMP select ARM_GIC select MIGHT_HAVE_CACHE_L2X0Signature · 7 lines
1.8.3.2 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel at lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
cover kconfig selection fixes
In reply to Rob HerringQuoted 9 lines · Rob Herring
From: Rob Herring <[email protected]>
Olof,
Here are a few kconfig select fixes. The first one can be squashed into my previous patch for HiSilicon removing SMP select if you want to.
I'm still looking into the cpufreq select issue with highbank. I'll follow-up with Viresh on that.
Since I had already applied the first version of the hisi patch (and sent the pull request for it), I held this off until -rc1. I've applied it to fixes now, so it'll be in the next batch we send up.
Thanks!
-Olof