diff options
| author | Daniel Golle <daniel@makrotopia.org> | 2017-05-05 14:16:44 +0200 |
|---|---|---|
| committer | Daniel Golle <daniel@makrotopia.org> | 2017-05-05 15:05:30 +0200 |
| commit | 961c0eacea00b2c8e82eed695eb6ae60703f7763 (patch) | |
| tree | 5c46268a1ef05321348cfe7623ca186bf2fc2d1e /target/linux/x86/legacy | |
| parent | ddbb036bbb8a1030dd8f6fae0004d390b5f2b8a5 (diff) | |
| download | upstream-961c0eacea00b2c8e82eed695eb6ae60703f7763.tar.gz upstream-961c0eacea00b2c8e82eed695eb6ae60703f7763.tar.bz2 upstream-961c0eacea00b2c8e82eed695eb6ae60703f7763.zip | |
x86: fix lifting kernel CPU requirements and always enable PAE
commit 89878f60f4 x86: lift kernel minimum CPU requirement to Pentium MMX
caused kconfig havoc. Fix this and make sure PAE is enabled even on legacy
CPUs as the minimum required CPU has been Pentium MMX for a while now and
hence PAE is supported even on the x86_legacy target.
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
Diffstat (limited to 'target/linux/x86/legacy')
| -rw-r--r-- | target/linux/x86/legacy/config-default | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/target/linux/x86/legacy/config-default b/target/linux/x86/legacy/config-default index 0061ce2a39..71049254b2 100644 --- a/target/linux/x86/legacy/config-default +++ b/target/linux/x86/legacy/config-default @@ -15,6 +15,7 @@ CONFIG_ACPI_CPU_FREQ_PSS=y CONFIG_ACPI_HOTPLUG_IOAPIC=y # CONFIG_ACPI_I2C_OPREGION is not set CONFIG_ACPI_LEGACY_TABLES_LOOKUP=y +# CONFIG_ACPI_NFIT is not set # CONFIG_ACPI_PCI_SLOT is not set CONFIG_ACPI_PROCESSOR=y # CONFIG_ACPI_PROCESSOR_AGGREGATOR is not set @@ -121,6 +122,7 @@ CONFIG_HDMI=y CONFIG_HID=y CONFIG_HID_BATTERY_STRENGTH=y # CONFIG_HIGHMEM4G is not set +# CONFIG_HIGHMEM64G is not set CONFIG_HPET=y CONFIG_HPET_MMAP=y # CONFIG_HP_ACCEL is not set @@ -149,7 +151,6 @@ CONFIG_ISO9660_FS=y # CONFIG_LCD_CLASS_DEVICE is not set CONFIG_LZO_COMPRESS=y CONFIG_LZO_DECOMPRESS=y -CONFIG_M486=y # CONFIG_MDA_CONSOLE is not set CONFIG_MFD_CORE=y CONFIG_MFD_INTEL_LPSS=y @@ -173,6 +174,7 @@ CONFIG_MOUSE_PS2_TRACKPOINT=y # CONFIG_MOUSE_VSXXXAA is not set CONFIG_NOHIGHMEM=y CONFIG_NO_HZ=y +# CONFIG_OLPC is not set CONFIG_PATA_AMD=y CONFIG_PATA_ATIIXP=y CONFIG_PATA_LEGACY=y @@ -220,7 +222,7 @@ 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_PAE=y # CONFIG_X86_PCC_CPUFREQ is not set CONFIG_X86_PM_TIMER=y # CONFIG_X86_POWERNOW_K8 is not set |