diff --git a/boards/x86/acrn/acrn.dts b/boards/x86/acrn/acrn.dts index b5c3c06cee7..a4979cc71f8 100644 --- a/boards/x86/acrn/acrn.dts +++ b/boards/x86/acrn/acrn.dts @@ -9,6 +9,7 @@ #include #define DT_DRAM_SIZE DT_SIZE_K(8192) +#define DT_DRAM_BASE 0 #include diff --git a/boards/x86/qemu_x86/qemu_x86.dts b/boards/x86/qemu_x86/qemu_x86.dts index 03cfdab115b..25d6849bc43 100644 --- a/boards/x86/qemu_x86/qemu_x86.dts +++ b/boards/x86/qemu_x86/qemu_x86.dts @@ -4,6 +4,9 @@ #include +#ifndef DT_DRAM_BASE +#define DT_DRAM_BASE 0 +#endif #ifndef DT_DRAM_SIZE #define DT_DRAM_SIZE DT_SIZE_K(4096) #endif diff --git a/boards/x86/qemu_x86/qemu_x86_tiny.dts b/boards/x86/qemu_x86/qemu_x86_tiny.dts index a32afaa5b86..f7b083a3b40 100644 --- a/boards/x86/qemu_x86/qemu_x86_tiny.dts +++ b/boards/x86/qemu_x86/qemu_x86_tiny.dts @@ -4,5 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define DT_DRAM_SIZE DT_SIZE_K(2048) +#define DT_DRAM_BASE 0x100000 +#define DT_DRAM_SIZE DT_SIZE_K(128) #include "qemu_x86.dts" diff --git a/boards/x86/qemu_x86/qemu_x86_tiny_defconfig b/boards/x86/qemu_x86/qemu_x86_tiny_defconfig index bd2d264b25f..178996b332a 100644 --- a/boards/x86/qemu_x86/qemu_x86_tiny_defconfig +++ b/boards/x86/qemu_x86/qemu_x86_tiny_defconfig @@ -22,4 +22,7 @@ CONFIG_X86_PAE=n CONFIG_X86_COMMON_PAGE_TABLE=y CONFIG_X86_KPTI=n CONFIG_KERNEL_VM_SIZE=0x400000 +CONFIG_KERNEL_VM_BASE=0x0 CONFIG_X86_MMU_PAGE_POOL_PAGES=0 +CONFIG_KERNEL_VM_OFFSET=0x100000 +CONFIG_X86_KERNEL_OFFSET=0 \ No newline at end of file diff --git a/dts/x86/ia32.dtsi b/dts/x86/ia32.dtsi index 1b1cd087c40..bda175c76c7 100644 --- a/dts/x86/ia32.dtsi +++ b/dts/x86/ia32.dtsi @@ -29,7 +29,7 @@ dram0: memory@0 { device_type = "memory"; - reg = <0x0 DT_DRAM_SIZE>; + reg = ; }; soc {