From 1a55e1d03882d8cb0e57144cb05396f5ae0609ad Mon Sep 17 00:00:00 2001 From: Justin Hibbits Date: Tue, 23 Jan 2018 02:52:12 +0000 Subject: [PATCH] Fix 64-bit booke kernel builds after the ldscript changes Commits r326203 and r326978 broke 64-bit booke kernels by introducing a 1MB zero-pad between the ELF header and the start of the kernel. This didn't cause a build failure, but caused kernels to need to be loaded into memory 1MB lower, which could easily break scripts expecting previous behavior. This change matches the similar change made to AIM in r327358. --- sys/powerpc/include/vmparam.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/powerpc/include/vmparam.h b/sys/powerpc/include/vmparam.h index e079024e0196..d7cf4c39f65c 100644 --- a/sys/powerpc/include/vmparam.h +++ b/sys/powerpc/include/vmparam.h @@ -134,9 +134,9 @@ #ifdef __powerpc64__ #ifndef LOCORE -#define KERNBASE 0xc000000000000000UL /* start of kernel virtual */ +#define KERNBASE 0xc000000000000100UL /* start of kernel virtual */ #else -#define KERNBASE 0xc000000000000000 /* start of kernel virtual */ +#define KERNBASE 0xc000000000000100 /* start of kernel virtual */ #endif #else #define KERNBASE 0xc0000000 /* start of kernel virtual */