michaelh/zephyr
1
0
Fork 0
Code Releases Activity

x86: use CONFIG_SRAM_OFFSET instead of CONFIG_X86_KERNEL_OFFSET

Browse source 
This changes x86 to use CONFIG_SRAM_OFFSET instead of
arch-specific CONFIG_X86_KERNEL_OFFSET. This allows the common
MMU macro Z_BOOT_VIRT_TO_PHYS() and Z_BOOT_PHYS_TO_VIRT() to
function properly if we ever need to map the kernel into
virtual address space that does not have the same starting
physical address.

Signed-off-by: Daniel Leung <daniel.leung@intel.com>
This commit is contained in:
Daniel Leung 2021-02-20 11:11:24 -08:00 • committed by Anas Nashif
commit d340afd456
3 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
include/arch/x86/memory.ld
View file

@ -28,8 +28,8 @@
#define PHYS_RAM_ADDR DT_REG_ADDR(DT_CHOSEN(zephyr_sram))
#define PHYS_RAM_SIZE DT_REG_SIZE(DT_CHOSEN(zephyr_sram))
#define KERNEL_BASE_ADDR (PHYS_RAM_ADDR + CONFIG_X86_KERNEL_OFFSET)
#define KERNEL_RAM_SIZE (PHYS_RAM_SIZE - CONFIG_X86_KERNEL_OFFSET)
#define KERNEL_BASE_ADDR (PHYS_RAM_ADDR + CONFIG_SRAM_OFFSET)
#define KERNEL_RAM_SIZE (PHYS_RAM_SIZE - CONFIG_SRAM_OFFSET)
#ifdef CONFIG_XIP
/* "ROM" is flash, we leave rodata and text there and just copy in data.