ARM: tegra: unify Tegra's Kconfig a bit more
Subsystems (3)
PATCH v2 1/1 ARM: tegra: unify Tegra's Kconfig a bit more
From: Stephen Warren <[email protected]>
Move all common select clauses from ARCH_TEGRA_*_SOC to ARCH_TEGRA to eliminate duplication. The USB-related selects all should have been common too, but were missing from Tegra114 previously. Move these to ARCH_TEGRA too. The latter fixes a build break when only Tegra114 support was enabled, but not Tegra20 or Tegra30 support.
This is 20984c44b5a08620778ea14fa5807489170fd5ca in v3.12-rc1, with a merge conflict resolved.
---
v2: I actually applied the patch this time, resolving the merge conflict
while I was at it. I built and booted the result too.
arch/arm/mach-tegra/Kconfig | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-)
arch/arm/mach-tegra/Kconfig +6 -15
@@ -2,18 +2,24 @@ config ARCH_TEGRA bool "NVIDIA Tegra" if ARCH_MULTI_V7 select ARCH_HAS_CPUFREQ select ARCH_REQUIRE_GPIOLIB + select ARM_GIC select CLKDEV_LOOKUP 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 LOCAL_TIMERS select HAVE_CLK select HAVE_SMP select MIGHT_HAVE_CACHE_L2X0 + select PINCTRL 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.
@@ -27,15 +33,9 @@ config ARCH_TEGRA_2x_SOC select ARM_ERRATA_720789 select ARM_ERRATA_754327 if SMP select ARM_ERRATA_764369 if SMP - select ARM_GIC - select CPU_V7 - select PINCTRL select PINCTRL_TEGRA20 select PL310_ERRATA_727915 if CACHE_L2X0 select PL310_ERRATA_769419 if CACHE_L2X0 - select USB_ARCH_HAS_EHCI if USB_SUPPORT - select USB_ULPI if USB_PHY - select USB_ULPI_VIEWPORT if USB_PHY help Support for NVIDIA Tegra AP20 and T20 processors, based on the ARM CortexA9MP CPU and the ARM PL310 L2 cache controller
@@ -44,14 +44,8 @@ config ARCH_TEGRA_3x_SOC bool "Enable support for Tegra30 family" select ARM_ERRATA_754322 select ARM_ERRATA_764369 if SMP - select ARM_GIC - select CPU_V7 - select PINCTRL select PINCTRL_TEGRA30 select PL310_ERRATA_769419 if CACHE_L2X0 - select USB_ARCH_HAS_EHCI if USB_SUPPORT - select USB_ULPI if USB_PHY - select USB_ULPI_VIEWPORT if USB_PHY help Support for NVIDIA Tegra T30 processor family, based on the ARM CortexA9MP CPU and the ARM PL310 L2 cache controller
@@ -59,10 +53,7 @@ config ARCH_TEGRA_3x_SOC config ARCH_TEGRA_114_SOC bool "Enable support for Tegra114 family" select HAVE_ARM_ARCH_TIMER - select ARM_GIC select ARM_L1_CACHE_SHIFT_6 - select CPU_V7 - select PINCTRL select PINCTRL_TEGRA114 help Support for NVIDIA Tegra T114 processor family, based on the
Signature · 1 line
1.8.1.5
PATCH v2 1/1 ARM: tegra: unify Tegra's Kconfig a bit more
Quoted 11 lines · Stephen Warren
From: Stephen Warren <[email protected]>
Move all common select clauses from ARCH_TEGRA_*_SOC to
ARCH_TEGRAto eliminate duplication. The USB-related selects all should have been common too, but were missing from Tegra114 previously. Move these toARCH_TEGRAtoo. The latter fixes a build break when only Tegra114 support was enabled, but not Tegra20 or Tegra30 support.This is
20984c44b5a08620778ea14fa5807489170fd5cain v3.12-rc1, with a merge conflict resolved.
Quoted 6 lines
Signed-off-by Stephen Warren <[email protected]>Reported-by Paul Walmsley <[email protected]>[our auto-builders for 3.11.x are failing due to this]---
v2: I actually applied the patch this time, resolving the merge conflict
while I was at it. I built and booted the result too.
Thanks for testing it :)
Now queued up.
greg k-h