Skip to content

Commit c6e77bb

Browse files
arndbRussell King (Oracle)
authored andcommitted
ARM: 9143/1: add CONFIG_PHYS_OFFSET default values
For platforms that are not yet converted to ARCH_MULTIPLATFORM, we can disable CONFIG_ARM_PATCH_PHYS_VIRT, which in turn requires setting a correct address here. As we actualy know what all the values are supposed to be based on the old mach/memory.h header file contents (from git history), we can just add them here. This also solves a problem in Kconfig where 'make randconfig' fails to continue if no number is selected for a 'hex' option. Users can still override the number at configuration time, e.g. when the memory visible to the kernel starts at a nonstandard address on some machine, but it should no longer be required now. I originally posted this back in 2016, but the problem still persists. The patch has gotten much simpler though, as almost all platforms rely on ARM_PATCH_PHYS_VIRT now. Link: https://lore.kernel.org/linux-arm-kernel/[email protected]/ Acked-by: Nicolas Pitre <[email protected]> Reviewed-by: Linus Walleij <[email protected]> Signed-off-by: Arnd Bergmann <[email protected]> Signed-off-by: Russell King (Oracle) <[email protected]>
1 parent c2e6df3 commit c6e77bb

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

arch/arm/Kconfig

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -264,10 +264,12 @@ config PHYS_OFFSET
264264
hex "Physical address of main memory" if MMU
265265
depends on !ARM_PATCH_PHYS_VIRT
266266
default DRAM_BASE if !MMU
267-
default 0x00000000 if ARCH_FOOTBRIDGE
267+
default 0x00000000 if ARCH_FOOTBRIDGE || ARCH_IXP4XX
268268
default 0x10000000 if ARCH_OMAP1 || ARCH_RPC
269-
default 0x20000000 if ARCH_S5PV210
270-
default 0xc0000000 if ARCH_SA1100
269+
default 0x30000000 if ARCH_S3C24XX
270+
default 0xa0000000 if ARCH_IOP32X || ARCH_PXA
271+
default 0xc0000000 if ARCH_EP93XX || ARCH_SA1100
272+
default 0
271273
help
272274
Please provide the physical address corresponding to the
273275
location of main memory in your system.

0 commit comments

Comments
 (0)