diff options
| author | Jo-Philipp Wich <jo@mein.io> | 2017-04-27 15:26:48 +0200 |
|---|---|---|
| committer | Jo-Philipp Wich <jo@mein.io> | 2017-04-27 15:26:48 +0200 |
| commit | af1d1ebdda59602cbb61c84a103a1149a054a1b4 (patch) | |
| tree | 9bbabf236606d1364ab4dad80b97114a6f06086b /target/linux | |
| parent | 3bfe7ee6326d5131e50678638251540c8acf2177 (diff) | |
| download | upstream-af1d1ebdda59602cbb61c84a103a1149a054a1b4.tar.gz upstream-af1d1ebdda59602cbb61c84a103a1149a054a1b4.tar.bz2 upstream-af1d1ebdda59602cbb61c84a103a1149a054a1b4.zip | |
x86: enable 4G high memory support for generic (32bit) subtarget
This is required to fully support a number of 32bit x86 systems equipped
with more than one GB ram, e.g. certain Atom CPU machines.
Ref: https://forum.lede-project.org/t/17-01-1-x86-doesnt-detect-all-of-the-ram/3295
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
Diffstat (limited to 'target/linux')
| -rw-r--r-- | target/linux/x86/config-4.4 | 8 | ||||
| -rw-r--r-- | target/linux/x86/legacy/config-default | 3 |
2 files changed, 8 insertions, 3 deletions
diff --git a/target/linux/x86/config-4.4 b/target/linux/x86/config-4.4 index 29d19daeb0..26bb124b8c 100644 --- a/target/linux/x86/config-4.4 +++ b/target/linux/x86/config-4.4 @@ -9,6 +9,7 @@ CONFIG_AMD_NB=y CONFIG_ARCH_CLOCKSOURCE_DATA=y CONFIG_ARCH_DEFCONFIG="arch/x86/configs/i386_defconfig" CONFIG_ARCH_DISCARD_MEMBLOCK=y +CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y CONFIG_ARCH_HAS_CPU_RELAX=y @@ -213,7 +214,9 @@ CONFIG_HAVE_SYSCALL_TRACEPOINTS=y CONFIG_HAVE_UID16=y CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y CONFIG_HAVE_USER_RETURN_NOTIFIER=y -# CONFIG_HIGHMEM4G is not set +CONFIG_HIGHMEM=y +CONFIG_HIGHMEM4G=y +# CONFIG_HIGHPTE is not set CONFIG_HPET_EMULATE_RTC=y CONFIG_HPET_TIMER=y # CONFIG_HP_WATCHDOG is not set @@ -305,7 +308,7 @@ CONFIG_NEED_SG_DMA_LENGTH=y # CONFIG_NET5501 is not set # CONFIG_NET_NS is not set CONFIG_NLS=y -CONFIG_NOHIGHMEM=y +# CONFIG_NOHIGHMEM is not set CONFIG_NO_BOOTMEM=y CONFIG_NR_CPUS=1 # CONFIG_NSC_GPIO is not set @@ -431,7 +434,6 @@ CONFIG_X86_MINIMUM_CPU_FAMILY=4 CONFIG_X86_MPPARSE=y CONFIG_X86_MSR=y # CONFIG_X86_P4_CLOCKMOD is not set -# CONFIG_X86_PAE is not set CONFIG_X86_PAT=y CONFIG_X86_PLATFORM_DEVICES=y # CONFIG_X86_POWERNOW_K6 is not set diff --git a/target/linux/x86/legacy/config-default b/target/linux/x86/legacy/config-default index 60b55c7ee7..968c14bdd7 100644 --- a/target/linux/x86/legacy/config-default +++ b/target/linux/x86/legacy/config-default @@ -119,6 +119,7 @@ CONFIG_HAVE_CLK_PREPARE=y CONFIG_HDMI=y CONFIG_HID=y CONFIG_HID_BATTERY_STRENGTH=y +# CONFIG_HIGHMEM4G is not set CONFIG_HPET=y CONFIG_HPET_MMAP=y # CONFIG_HP_ACCEL is not set @@ -164,6 +165,7 @@ CONFIG_MOUSE_PS2_TRACKPOINT=y # CONFIG_MOUSE_SERIAL is not set # CONFIG_MOUSE_VSXXXAA is not set CONFIG_NLS=y +CONFIG_NOHIGHMEM=y CONFIG_NO_HZ=y # CONFIG_PANASONIC_LAPTOP is not set CONFIG_PATA_AMD=y @@ -211,5 +213,6 @@ CONFIG_X86_ACPI_CPUFREQ=y # CONFIG_X86_E_POWERSAVER is not set # CONFIG_X86_INTEL_LPSS is not set # CONFIG_X86_LONGHAUL is not set +# CONFIG_X86_PAE is not set # CONFIG_X86_PCC_CPUFREQ is not set CONFIG_X86_PM_TIMER=y |