Home Home > GIT Browse > linux-next
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2019-07-05 15:14:59 +0200
committerTakashi Iwai <tiwai@suse.de>2019-07-05 15:14:59 +0200
commited6b56442c87ba45fa80ce1f6b07a84409872539 (patch)
tree3a7a8e16ec146910f5e969af7553ead3c89c3f2d
parent22fd19c08aef69310bd9fe136067010f8be904df (diff)
config: align CONFIG_PHYSICAL_START and CONFIG_PHYSICAL_ALIGN to default values
As suggested in bsc#1067593, our kconfig keeps the old default values while the upstream took different (actually swapped) values for x86 CONFIG_PHYSICAL_START and CONFIG_PHYSICAL_ALIGN. Let's follow the upstream default now.
-rw-r--r--config/x86_64/vanilla4
1 files changed, 2 insertions, 2 deletions
diff --git a/config/x86_64/vanilla b/config/x86_64/vanilla
index e2eb93a083..6c669cab90 100644
--- a/config/x86_64/vanilla
+++ b/config/x86_64/vanilla
@@ -450,11 +450,11 @@ CONFIG_ARCH_HAS_KEXEC_PURGATORY=y
# CONFIG_KEXEC_VERIFY_SIG is not set
CONFIG_CRASH_DUMP=y
# CONFIG_KEXEC_JUMP is not set
-CONFIG_PHYSICAL_START=0x200000
+CONFIG_PHYSICAL_START=0x1000000
CONFIG_RELOCATABLE=y
CONFIG_RANDOMIZE_BASE=y
CONFIG_X86_NEED_RELOCS=y
-CONFIG_PHYSICAL_ALIGN=0x1000000
+CONFIG_PHYSICAL_ALIGN=0x200000
CONFIG_DYNAMIC_MEMORY_LAYOUT=y
CONFIG_RANDOMIZE_MEMORY=y
CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING=0xa