michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Revert "qemu_x86_tiny: don't use first megabyte at all"

Browse source 
This reverts commit d2b7261076.

Signed-off-by: Anas Nashif <anas.nashif@intel.com>
This commit is contained in:
Anas Nashif 2021-01-22 07:37:34 -05:00
commit 2480b39b59
5 changed files with 2 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

1
boards/x86/acrn/acrn.dts
View file

@ -9,7 +9,6 @@
#include <mem.h> #include <mem.h>
#define DT_DRAM_SIZE DT_SIZE_K(8192) #define DT_DRAM_SIZE DT_SIZE_K(8192)
#define DT_DRAM_BASE 0
#include <ia32.dtsi> #include <ia32.dtsi>

3
boards/x86/qemu_x86/qemu_x86.dts
View file

@ -4,9 +4,6 @@
#include <mem.h> #include <mem.h>
#ifndef DT_DRAM_BASE
#define DT_DRAM_BASE 0
#endif
#ifndef DT_DRAM_SIZE #ifndef DT_DRAM_SIZE
#define DT_DRAM_SIZE DT_SIZE_K(4096) #define DT_DRAM_SIZE DT_SIZE_K(4096)
#endif #endif

3
boards/x86/qemu_x86/qemu_x86_tiny.dts
View file

@ -4,6 +4,5 @@
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
#define DT_DRAM_BASE 0x100000 #define DT_DRAM_SIZE DT_SIZE_K(2048)
#define DT_DRAM_SIZE DT_SIZE_K(128)
#include "qemu_x86.dts" #include "qemu_x86.dts"

3
boards/x86/qemu_x86/qemu_x86_tiny_defconfig
View file

@ -22,7 +22,4 @@ CONFIG_X86_PAE=n
CONFIG_X86_COMMON_PAGE_TABLE=y CONFIG_X86_COMMON_PAGE_TABLE=y
CONFIG_X86_KPTI=n CONFIG_X86_KPTI=n
CONFIG_KERNEL_VM_SIZE=0x400000 CONFIG_KERNEL_VM_SIZE=0x400000
CONFIG_KERNEL_VM_BASE=0x0
CONFIG_X86_MMU_PAGE_POOL_PAGES=0 CONFIG_X86_MMU_PAGE_POOL_PAGES=0
CONFIG_KERNEL_VM_OFFSET=0x100000
CONFIG_X86_KERNEL_OFFSET=0

2
dts/x86/ia32.dtsi
View file

@ -29,7 +29,7 @@
dram0: memory@0 { dram0: memory@0 {
device_type = "memory"; device_type = "memory";
reg = <DT_DRAM_BASE DT_DRAM_SIZE>; reg = <0x0 DT_DRAM_SIZE>;
}; };
soc { soc {