Commit 40b387a8 authored by H. Peter Anvin's avatar H. Peter Anvin

x86, boot: use LOAD_PHYSICAL_ADDR on 64 bits

Use LOAD_PHYSICAL_ADDR instead of CONFIG_PHYSICAL_START in the 64-bit
decompression code, for equivalence with the 32-bit code.

[ Impact: cleanup, increases code similarity ]
Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
parent 77d1a499
...@@ -87,7 +87,7 @@ ENTRY(startup_32) ...@@ -87,7 +87,7 @@ ENTRY(startup_32)
addl $(PMD_PAGE_SIZE -1), %ebx addl $(PMD_PAGE_SIZE -1), %ebx
andl $PMD_PAGE_MASK, %ebx andl $PMD_PAGE_MASK, %ebx
#else #else
movl $CONFIG_PHYSICAL_START, %ebx movl $LOAD_PHYSICAL_ADDR, %ebx
#endif #endif
/* Target address to relocate to for decompression */ /* Target address to relocate to for decompression */
...@@ -215,7 +215,7 @@ ENTRY(startup_64) ...@@ -215,7 +215,7 @@ ENTRY(startup_64)
* *
* If it is a relocatable kernel then decompress and run the kernel * If it is a relocatable kernel then decompress and run the kernel
* from load address aligned to 2MB addr, otherwise decompress and * from load address aligned to 2MB addr, otherwise decompress and
* run the kernel from CONFIG_PHYSICAL_START * run the kernel from LOAD_PHYSICAL_ADDR
* *
* We cannot rely on the calculation done in 32-bit mode, since we * We cannot rely on the calculation done in 32-bit mode, since we
* may have been invoked via the 64-bit entry point. * may have been invoked via the 64-bit entry point.
...@@ -228,7 +228,7 @@ ENTRY(startup_64) ...@@ -228,7 +228,7 @@ ENTRY(startup_64)
andq $PMD_PAGE_MASK, %rbp andq $PMD_PAGE_MASK, %rbp
movq %rbp, %rbx movq %rbp, %rbx
#else #else
movq $CONFIG_PHYSICAL_START, %rbp movq $LOAD_PHYSICAL_ADDR, %rbp
movq %rbp, %rbx movq %rbp, %rbx
#endif #endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment