diff options
Diffstat (limited to 'src/cpu')
| -rw-r--r-- | src/cpu/qemu-x86/Kconfig | 1 | ||||
| -rw-r--r-- | src/cpu/x86/64bit/Makefile.mk | 6 | ||||
| -rw-r--r-- | src/cpu/x86/Kconfig | 6 |
3 files changed, 7 insertions, 6 deletions
diff --git a/src/cpu/qemu-x86/Kconfig b/src/cpu/qemu-x86/Kconfig index b5ff6f09a5..221a7bae45 100644 --- a/src/cpu/qemu-x86/Kconfig +++ b/src/cpu/qemu-x86/Kconfig @@ -7,6 +7,7 @@ config CPU_QEMU_X86 select UDELAY_TSC select TSC_MONOTONIC_TIMER select UNKNOWN_TSC_RATE + select NEED_SMALL_2MB_PAGE_TABLES # QEMU doesn't support 1GB pages if CPU_QEMU_X86 diff --git a/src/cpu/x86/64bit/Makefile.mk b/src/cpu/x86/64bit/Makefile.mk index b24e4d7de0..1fda087879 100644 --- a/src/cpu/x86/64bit/Makefile.mk +++ b/src/cpu/x86/64bit/Makefile.mk @@ -3,10 +3,10 @@ all_x86-y += mode_switch.S all_x86-y += mode_switch2.S -ifeq ($(CONFIG_USE_1G_PAGES_TLB),y) -PAGETABLE_SRC := pt1G.S -else +ifeq ($(CONFIG_NEED_SMALL_2MB_PAGE_TABLES),y) PAGETABLE_SRC := pt.S +else +PAGETABLE_SRC := pt1G.S endif all_x86-y += $(PAGETABLE_SRC) diff --git a/src/cpu/x86/Kconfig b/src/cpu/x86/Kconfig index ec1fa1305a..417989d764 100644 --- a/src/cpu/x86/Kconfig +++ b/src/cpu/x86/Kconfig @@ -152,12 +152,12 @@ config NO_SMM bool default n -config USE_1G_PAGES_TLB +config NEED_SMALL_2MB_PAGE_TABLES bool default n help - Select this option to enable access to up to 512 GiB of memory - by using 1 GiB large pages. + Select this option from boards/SoCs that do not support the Page1GB + CPUID feature (CPUID.80000001H:EDX.bit26). config SMM_ASEG bool |