diff options
| author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-12-02 17:09:42 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-12-06 06:16:13 -0500 |
| commit | 974c07249b06d948154be3275bf4f6e55b585300 (patch) | |
| tree | 0587b205f84ac10c625b6619503a495e2f200a3f /arch | |
| parent | 45e713efe2fa574b6662e7fb63fae9497c5e03d4 (diff) | |
ARM: 7186/1: fix Kconfig issue with PHYS_OFFSET and !MMU
Commit 1b9f95f8ade9 (ARM: prepare for removal of a bunch of <mach/memory.h>
files) introduced CONFIG_PHYS_OFFSET but the Kconfig hex prompt did not
provide a default value.
This has the undesired side effect of breaking a reportedly used
trick for updating defconfigs on the fly for routine buildtesting
across all arch and all platforms, i.e.
cp /path/to/somedefconfig .config ; yes "" | make oldconfig
because the config system will endlessly loop until a valid address is
provided.
However we can't just pick a random default value since it is likely to
be wrong for the majority of the boards as the right answer for this
option is quite varied. So the fact that the config system insists on
having a proper value be entered is actually a good thing.
It turns out that only at91x40_defconfig has this problem because it has
CONFIG_MMU=n. However, in the !MMU case, there is already a CONFIG_DRAM_BASE
value that can be used here. So let's use that as a default in that case
and suppress the redundant CONFIG_PHYS_OFFSET prompt.
Eventually the DRAM_BASE config option could simply be replaced by
PHYS_OFFSET directly, but that's a larger change better suited for later.
Reported-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: Nicolas Pitre <nico@linaro.org>
Acked-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/Kconfig | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index e084b7e981e8..776d76b8cb69 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
| @@ -220,8 +220,9 @@ config NEED_MACH_MEMORY_H | |||
| 220 | be avoided when possible. | 220 | be avoided when possible. |
| 221 | 221 | ||
| 222 | config PHYS_OFFSET | 222 | config PHYS_OFFSET |
| 223 | hex "Physical address of main memory" | 223 | hex "Physical address of main memory" if MMU |
| 224 | depends on !ARM_PATCH_PHYS_VIRT && !NEED_MACH_MEMORY_H | 224 | depends on !ARM_PATCH_PHYS_VIRT && !NEED_MACH_MEMORY_H |
| 225 | default DRAM_BASE if !MMU | ||
| 225 | help | 226 | help |
| 226 | Please provide the physical address corresponding to the | 227 | Please provide the physical address corresponding to the |
| 227 | location of main memory in your system. | 228 | location of main memory in your system. |