diff options
| author | Arnd Bergmann | 2016-09-02 18:12:09 +0200 |
|---|---|---|
| committer | Arnd Bergmann | 2016-09-02 18:12:09 +0200 |
| commit | c964cdc3694fb9b9975e1a5a098d208b1d49c885 (patch) | |
| tree | aa03a7ca74f10ab191223558203fec7fc871aeba /arch/arm/Kconfig | |
| parent | Linux 4.8-rc4 (diff) | |
| parent | ARM: realview: imply device tree boot (diff) | |
| download | kernel-qcow2-linux-c964cdc3694fb9b9975e1a5a098d208b1d49c885.tar.gz kernel-qcow2-linux-c964cdc3694fb9b9975e1a5a098d208b1d49c885.tar.xz kernel-qcow2-linux-c964cdc3694fb9b9975e1a5a098d208b1d49c885.zip | |
Merge tag 'realview-broomstick-sweep' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator into next/cleanup
Merge "delete the RealView boardfiles" from Linus Walleij:
This deletes the realview boardfiles, consolidates a bit
around the Kconfig options and leaves the mach-realview
directory nice and tidy, with all boards migrated over to
Device Tree.
* tag 'realview-broomstick-sweep' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator:
ARM: realview: imply device tree boot
ARM: realview: no need to select SMP_ON_UP explicitly
ARM: realview: delete the RealView board files
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index a9c4e48bb7ec..a6cdfefd7b9b 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -278,10 +278,9 @@ config PHYS_OFFSET ARCH_INTEGRATOR || \ ARCH_IOP13XX || \ ARCH_KS8695 || \ - (ARCH_REALVIEW && !REALVIEW_HIGH_PHYS_OFFSET) + ARCH_REALVIEW default 0x10000000 if ARCH_OMAP1 || ARCH_RPC default 0x20000000 if ARCH_S5PV210 - default 0x70000000 if REALVIEW_HIGH_PHYS_OFFSET default 0xc0000000 if ARCH_SA1100 help Please provide the physical address corresponding to the |