summaryrefslogtreecommitdiffstats
path: root/arch/arm/Kconfig
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2020-09-13 11:16:07 -0700
committerOlof Johansson <olof@lixom.net>2020-09-13 11:16:09 -0700
commitc9c7ddd0d7ad29fc229c51aff297718222c88ab5 (patch)
tree2ca51064d824b4fbe0c4e56f9d032461b65a1673 /arch/arm/Kconfig
parent465c335bb5fd25f1f433481b7423a982e23a4c58 (diff)
parent5d007a09f3c8b9b1421bf267d16d79fd9a11930b (diff)
downloadlinux-c9c7ddd0d7ad29fc229c51aff297718222c88ab5.tar.bz2
Merge tag 'versatile-soc-v5.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator into arm/soc
Versatile SoC updates for the v5.10 kernel cycle: - Drop a static qualifier in integrator_soc_init() - Remove Integrator and Versatile from PHYS_OFFSET * tag 'versatile-soc-v5.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator: ARM: versatile: Remove Integrator and Realview from PHYS_OFFSET soc: integrator: Drop pointless static qualifier in integrator_soc_init() Link: https://lore.kernel.org/r/CACRpkdYYDSg8FAjJAqew5yEu7H1Y3E1rPN9TL25K31T=QWATuA@mail.gmail.com Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/Kconfig')
-rw-r--r--arch/arm/Kconfig4
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 82c197a248dd..2a021052b5f2 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -265,9 +265,7 @@ config PHYS_OFFSET
depends on !ARM_PATCH_PHYS_VIRT
default DRAM_BASE if !MMU
default 0x00000000 if ARCH_EBSA110 || \
- ARCH_FOOTBRIDGE || \
- ARCH_INTEGRATOR || \
- ARCH_REALVIEW
+ ARCH_FOOTBRIDGE
default 0x10000000 if ARCH_OMAP1 || ARCH_RPC
default 0x20000000 if ARCH_S5PV210
default 0xc0000000 if ARCH_SA1100