From 20ddfa9324b470764125f5ca555c315b5af13507 Mon Sep 17 00:00:00 2001 From: Barry Song Date: Thu, 20 Dec 2012 17:14:10 +0800 Subject: ARM: PRIMA2: enable AUTO_ZRELADDR for SIRF in Kconfig prima2 and marco have different memory base address. prima2 begins from 0 and marco begins from 0x40000000. This patch enables AUTO_ZRELADDR so that kernel can detect the physical address automatically. Signed-off-by: Barry Song CC: Mark Rutland --- arch/arm/Kconfig | 1 + 1 file changed, 1 insertion(+) (limited to 'arch/arm/Kconfig') diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index f95ba14ae3d0..13f89a262fa8 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -394,6 +394,7 @@ config ARCH_GEMINI config ARCH_SIRF bool "CSR SiRF" select ARCH_REQUIRE_GPIOLIB + select AUTO_ZRELADDR select COMMON_CLK select GENERIC_CLOCKEVENTS select GENERIC_IRQ_CHIP -- cgit v1.2.3 From 23c8c4b4e0ae21852e366206aa4981380b863799 Mon Sep 17 00:00:00 2001 From: Stephen Warren Date: Thu, 7 Feb 2013 14:43:23 -0700 Subject: ARM: tegra: enable ARCH_REQUIRE_GPIOLIB for Tegra114 CONFIG_ARCH_TEGRA_114_SOC doesn't currently enable gpiolib, which causes numerous build problems building a Tegra kernel with only Tegra114 enabled, and not Tegra20 or Tegra30. Enable ARCH_REQUIRE_GPIOLIB to solve this. However, all Tegra will use gpiolib, so select this option from ARCH_TEGRA rather than each individual ARCH_TEGRA_*_SOC, to prevent this problem for any future chips. Signed-off-by: Stephen Warren Signed-off-by: Olof Johansson --- arch/arm/Kconfig | 1 + arch/arm/mach-tegra/Kconfig | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'arch/arm/Kconfig') diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index eb9fc2f8acf1..25541a1971aa 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -640,6 +640,7 @@ config ARCH_LPC32XX config ARCH_TEGRA bool "NVIDIA Tegra" select ARCH_HAS_CPUFREQ + select ARCH_REQUIRE_GPIOLIB select CLKDEV_LOOKUP select CLKSRC_MMIO select CLKSRC_OF diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig index bde8197c8db8..86543241f5bb 100644 --- a/arch/arm/mach-tegra/Kconfig +++ b/arch/arm/mach-tegra/Kconfig @@ -5,7 +5,6 @@ comment "NVIDIA Tegra options" config ARCH_TEGRA_2x_SOC bool "Enable support for Tegra20 family" select ARCH_NEEDS_CPU_IDLE_COUPLED if SMP - select ARCH_REQUIRE_GPIOLIB select ARM_ERRATA_720789 select ARM_ERRATA_742230 if SMP select ARM_ERRATA_751472 @@ -27,7 +26,6 @@ config ARCH_TEGRA_2x_SOC config ARCH_TEGRA_3x_SOC bool "Enable support for Tegra30 family" - select ARCH_REQUIRE_GPIOLIB select ARM_ERRATA_743622 select ARM_ERRATA_751472 select ARM_ERRATA_754322 -- cgit v1.2.3