[source] x86: fix lifting kernel CPU requirements and always enable PAE

LEDE Commits lede-commits at lists.infradead.org
Fri May 5 06:06:49 PDT 2017 

dangole pushed a commit to source.git, branch master:
https://git.lede-project.org/961c0eacea00b2c8e82eed695eb6ae60703f7763

commit 961c0eacea00b2c8e82eed695eb6ae60703f7763
Author: Daniel Golle <daniel at makrotopia.org>
AuthorDate: Fri May 5 14:16:44 2017 +0200

    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 at makrotopia.org>
---
 target/linux/x86/config-4.9                        |  34 ++++--
 .../x86/{legacy/config-default => epia/config-4.4} | 123 +++++++++------------
 target/linux/x86/legacy/config-default             |   6 +-
 3 files changed, 85 insertions(+), 78 deletions(-)

diff --git a/target/linux/x86/config-4.9 b/target/linux/x86/config-4.9
index 09a9dfe..075b4f0 100644
--- a/target/linux/x86/config-4.9
+++ b/target/linux/x86/config-4.9
@@ -9,7 +9,9 @@ CONFIG_AMD_NB=y
 CONFIG_ARCH_CLOCKSOURCE_DATA=y
 CONFIG_ARCH_DEFCONFIG="arch/x86/configs/i386_defconfig"
 CONFIG_ARCH_DISCARD_MEMBLOCK=y
+CONFIG_ARCH_DMA_ADDR_T_64BIT=y
 CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
+CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y
 CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
 CONFIG_ARCH_HAS_CPU_RELAX=y
 CONFIG_ARCH_HAS_ELF_RANDOMIZE=y
@@ -22,7 +24,8 @@ CONFIG_ARCH_HIBERNATION_POSSIBLE=y
 CONFIG_ARCH_MAY_HAVE_PC_FDC=y
 CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
 CONFIG_ARCH_MIGHT_HAVE_PC_SERIO=y
-# CONFIG_ARCH_RANDOM is not set
+CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
+CONFIG_ARCH_RANDOM=y
 CONFIG_ARCH_SELECT_MEMORY_MODEL=y
 CONFIG_ARCH_SPARSEMEM_ENABLE=y
 CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y
@@ -49,6 +52,7 @@ CONFIG_BLK_DEV_LOOP=y
 CONFIG_BLK_DEV_SD=y
 CONFIG_BLK_MQ_PCI=y
 CONFIG_BOUNCE=y
+CONFIG_BTT=y
 CONFIG_CLKBLD_I8253=y
 CONFIG_CLKEVT_I8253=y
 CONFIG_CLKSRC_I8253=y
@@ -163,6 +167,7 @@ CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y
 CONFIG_HAVE_AOUT=y
 CONFIG_HAVE_ARCH_AUDITSYSCALL=y
 # CONFIG_HAVE_ARCH_BITREVERSE is not set
+CONFIG_HAVE_ARCH_HUGE_VMAP=y
 CONFIG_HAVE_ARCH_JUMP_LABEL=y
 CONFIG_HAVE_ARCH_KGDB=y
 CONFIG_HAVE_ARCH_KMEMCHECK=y
@@ -212,7 +217,8 @@ CONFIG_HAVE_UID16=y
 CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
 CONFIG_HAVE_USER_RETURN_NOTIFIER=y
 CONFIG_HIGHMEM=y
-CONFIG_HIGHMEM4G=y
+# CONFIG_HIGHMEM4G is not set
+CONFIG_HIGHMEM64G=y
 # CONFIG_HIGHPTE is not set
 CONFIG_HPET_EMULATE_RTC=y
 CONFIG_HPET_TIMER=y
@@ -239,6 +245,7 @@ CONFIG_INSTRUCTION_DECODER=y
 # CONFIG_INTEL_PCH_THERMAL is not set
 # CONFIG_INTEL_POWERCLAMP is not set
 # CONFIG_INTEL_SOC_DTS_THERMAL is not set
+CONFIG_IOMMU_HELPER=y
 # CONFIG_IOMMU_STRESS is not set
 # CONFIG_IOSF_MBI is not set
 CONFIG_IO_DELAY_0X80=y
@@ -264,9 +271,10 @@ CONFIG_KEXEC=y
 CONFIG_KEXEC_CORE=y
 CONFIG_KEYBOARD_ATKBD=y
 # CONFIG_LEDS_CLEVO_MAIL is not set
-CONFIG_M586MMX=y
+CONFIG_LIBNVDIMM=y
+# CONFIG_M486 is not set
 # CONFIG_M586 is not set
-# CONFIG_M586MMX is not set
+CONFIG_M586MMX=y
 # CONFIG_M586TSC is not set
 # CONFIG_M686 is not set
 # CONFIG_MACHZ_WDT is not set
@@ -298,6 +306,10 @@ CONFIG_MTRR=y
 # CONFIG_MWINCHIP3D is not set
 # CONFIG_MWINCHIPC6 is not set
 CONFIG_NAMESPACES=y
+CONFIG_ND_BLK=y
+CONFIG_ND_BTT=y
+CONFIG_ND_CLAIM=y
+CONFIG_NEED_DMA_MAP_STATE=y
 CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
 CONFIG_NEED_PER_CPU_KM=y
 CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
@@ -313,7 +325,6 @@ CONFIG_NVRAM=y
 # CONFIG_OF is not set
 CONFIG_OLD_SIGACTION=y
 CONFIG_OLD_SIGSUSPEND3=y
-# CONFIG_OLPC is not set
 CONFIG_OPROFILE_NMI_TIMER=y
 # CONFIG_OPTIMIZE_INLINING is not set
 CONFIG_OUTPUT_FORMAT="elf32-i386"
@@ -322,6 +333,7 @@ CONFIG_PAGE_OFFSET=0xC0000000
 # CONFIG_PC87413_WDT is not set
 CONFIG_PCI=y
 CONFIG_PCI_BIOS=y
+CONFIG_PCI_BUS_ADDR_T_64BIT=y
 CONFIG_PCI_DIRECT=y
 CONFIG_PCI_DOMAINS=y
 CONFIG_PCI_GOANY=y
@@ -336,9 +348,10 @@ CONFIG_PERF_EVENTS=y
 CONFIG_PERF_EVENTS_INTEL_CSTATE=y
 CONFIG_PERF_EVENTS_INTEL_RAPL=y
 CONFIG_PERF_EVENTS_INTEL_UNCORE=y
-CONFIG_PGTABLE_LEVELS=2
+CONFIG_PGTABLE_LEVELS=3
 CONFIG_PHYSICAL_ALIGN=0x100000
 CONFIG_PHYSICAL_START=0x1000000
+CONFIG_PHYS_ADDR_T_64BIT=y
 CONFIG_PMC_ATOM=y
 CONFIG_POWER_SUPPLY=y
 # CONFIG_PROCESSOR_SELECT is not set
@@ -376,6 +389,7 @@ CONFIG_SPARSEMEM_STATIC=y
 CONFIG_SPARSE_IRQ=y
 CONFIG_SRCU=y
 CONFIG_STRICT_DEVMEM=y
+CONFIG_SWIOTLB=y
 CONFIG_SYSCTL_EXCEPTION_TRACE=y
 # CONFIG_TELCLOCK is not set
 CONFIG_THERMAL=y
@@ -406,6 +420,7 @@ CONFIG_X86_32_LAZY_GS=y
 CONFIG_X86_ALIGNMENT_16=y
 # CONFIG_X86_ANCIENT_MCE is not set
 # CONFIG_X86_CHECK_BIOS_CORRUPTION is not set
+CONFIG_X86_CMPXCHG64=y
 # CONFIG_X86_CPUFREQ_NFORCE2 is not set
 # CONFIG_X86_CPUID is not set
 # CONFIG_X86_DEBUG_FPU is not set
@@ -419,7 +434,6 @@ CONFIG_X86_GENERIC=y
 # CONFIG_X86_INTEL_PSTATE is not set
 CONFIG_X86_INTEL_USERCOPY=y
 CONFIG_X86_INTERNODE_CACHE_SHIFT=6
-CONFIG_X86_INVD_BUG=y
 CONFIG_X86_IO_APIC=y
 CONFIG_X86_L1_CACHE_SHIFT=6
 # CONFIG_X86_LEGACY_VM86 is not set
@@ -430,12 +444,15 @@ CONFIG_X86_MCE_AMD=y
 # CONFIG_X86_MCE_INJECT is not set
 CONFIG_X86_MCE_INTEL=y
 CONFIG_X86_MCE_THRESHOLD=y
-CONFIG_X86_MINIMUM_CPU_FAMILY=4
+CONFIG_X86_MINIMUM_CPU_FAMILY=5
 CONFIG_X86_MPPARSE=y
 CONFIG_X86_MSR=y
 # CONFIG_X86_P4_CLOCKMOD is not set
+CONFIG_X86_PAE=y
 CONFIG_X86_PAT=y
 CONFIG_X86_PLATFORM_DEVICES=y
+CONFIG_X86_PMEM_LEGACY=y
+CONFIG_X86_PMEM_LEGACY_DEVICE=y
 # CONFIG_X86_POWERNOW_K6 is not set
 # CONFIG_X86_POWERNOW_K7 is not set
 CONFIG_X86_PPRO_FENCE=y
@@ -451,6 +468,7 @@ CONFIG_X86_RESERVE_LOW=64
 # CONFIG_X86_SPEEDSTEP_SMI is not set
 CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y
 CONFIG_X86_THERMAL_VECTOR=y
+CONFIG_X86_TSC=y
 CONFIG_X86_UP_APIC=y
 CONFIG_X86_UP_IOAPIC=y
 CONFIG_X86_VERBOSE_BOOTUP=y
diff --git a/target/linux/x86/legacy/config-default b/target/linux/x86/epia/config-4.4
similarity index 69%
copy from target/linux/x86/legacy/config-default
copy to target/linux/x86/epia/config-4.4
index 0061ce2..a9bcd2a 100644
--- a/target/linux/x86/legacy/config-default
+++ b/target/linux/x86/epia/config-4.4
@@ -5,25 +5,20 @@ CONFIG_ACPI_BATTERY=y
 CONFIG_ACPI_BUTTON=y
 # CONFIG_ACPI_CMPC is not set
 # CONFIG_ACPI_CONTAINER is not set
-CONFIG_ACPI_CPU_FREQ_PSS=y
 # CONFIG_ACPI_CUSTOM_DSDT is not set
 # CONFIG_ACPI_DEBUG is not set
-# CONFIG_ACPI_DEBUGGER is not set
 # CONFIG_ACPI_DOCK is not set
 # CONFIG_ACPI_EC_DEBUGFS is not set
 # CONFIG_ACPI_FAN is not set
-CONFIG_ACPI_HOTPLUG_IOAPIC=y
 # CONFIG_ACPI_I2C_OPREGION is not set
+# CONFIG_ACPI_INITRD_TABLE_OVERRIDE is not set
 CONFIG_ACPI_LEGACY_TABLES_LOOKUP=y
 # CONFIG_ACPI_PCI_SLOT is not set
 CONFIG_ACPI_PROCESSOR=y
 # CONFIG_ACPI_PROCESSOR_AGGREGATOR is not set
-CONFIG_ACPI_PROCESSOR_CSTATE=y
-CONFIG_ACPI_PROCESSOR_IDLE=y
 # CONFIG_ACPI_PROCFS_POWER is not set
-CONFIG_ACPI_REV_OVERRIDE_POSSIBLE=y
+# CONFIG_ACPI_REDUCED_HARDWARE_ONLY is not set
 # CONFIG_ACPI_SBS is not set
-CONFIG_ACPI_SYSTEM_POWER_STATES_SUPPORT=y
 CONFIG_ACPI_THERMAL=y
 CONFIG_ACPI_VIDEO=y
 # CONFIG_ACPI_WMI is not set
@@ -33,64 +28,61 @@ CONFIG_AGP=y
 # CONFIG_AGP_AMD64 is not set
 # CONFIG_AGP_ATI is not set
 # CONFIG_AGP_EFFICEON is not set
-CONFIG_AGP_INTEL=y
+# CONFIG_AGP_INTEL is not set
 # CONFIG_AGP_NVIDIA is not set
 # CONFIG_AGP_SIS is not set
 # CONFIG_AGP_SWORKS is not set
-# CONFIG_AGP_VIA is not set
-CONFIG_ARCH_HAS_ACPI_TABLE_UPGRADE=y
+CONFIG_AGP_VIA=y
+# CONFIG_APPLE_GMUX is not set
 CONFIG_ARCH_MIGHT_HAVE_ACPI_PDC=y
+# CONFIG_ASUS_LAPTOP is not set
+# CONFIG_BACKLIGHT_ADP8860 is not set
+# CONFIG_BACKLIGHT_ADP8870 is not set
 # CONFIG_BACKLIGHT_APPLE is not set
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
 CONFIG_BACKLIGHT_GENERIC=y
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
+# CONFIG_BACKLIGHT_SAHARA is not set
 CONFIG_BLK_DEV_SR=y
 # CONFIG_BLK_DEV_SR_VENDOR is not set
-CONFIG_CLKDEV_LOOKUP=y
-CONFIG_COMMON_CLK=y
-# CONFIG_COMMON_CLK_CS2000_CP is not set
-# CONFIG_COMMON_CLK_NXP is not set
-# CONFIG_COMMON_CLK_PIC32 is not set
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 CONFIG_CPU_IDLE_GOV_MENU=y
+# CONFIG_DELL_SMO8800 is not set
 CONFIG_DMA_SHARED_BUFFER=y
-# CONFIG_DPTF_POWER is not set
+CONFIG_DMI=y
+# CONFIG_DMIID is not set
+CONFIG_DMI_SCAN_MACHINE_NON_EFI_FALLBACK=y
+# CONFIG_DMI_SYSFS is not set
 CONFIG_DRM=y
-CONFIG_DRM_AMDGPU=y
-# CONFIG_DRM_AMDGPU_CIK is not set
-# CONFIG_DRM_AMDGPU_GART_DEBUGFS is not set
-# CONFIG_DRM_AMDGPU_SI is not set
-# CONFIG_DRM_AMDGPU_USERPTR is not set
-# CONFIG_DRM_AMD_ACP is not set
 # CONFIG_DRM_AST is not set
 CONFIG_DRM_BOCHS=y
-CONFIG_DRM_BRIDGE=y
 # CONFIG_DRM_CIRRUS_QEMU is not set
-CONFIG_DRM_FBDEV_EMULATION=y
 # CONFIG_DRM_GMA500 is not set
 # CONFIG_DRM_I2C_CH7006 is not set
 # CONFIG_DRM_I2C_NXP_TDA998X is not set
 # CONFIG_DRM_I2C_SIL164 is not set
-CONFIG_DRM_I915=y
-# CONFIG_DRM_I915_DEBUG is not set
-# CONFIG_DRM_I915_GVT is not set
+# CONFIG_DRM_I810 is not set
+# CONFIG_DRM_I915 is not set
+# CONFIG_DRM_I915_FBDEV is not set
+# CONFIG_DRM_I915_KMS is not set
 # CONFIG_DRM_I915_PRELIMINARY_HW_SUPPORT is not set
-CONFIG_DRM_I915_USERPTR=y
-# CONFIG_DRM_I915_WERROR is not set
 CONFIG_DRM_KMS_FB_HELPER=y
 CONFIG_DRM_KMS_HELPER=y
 # CONFIG_DRM_LOAD_EDID_FIRMWARE is not set
+# CONFIG_DRM_MGA is not set
 # CONFIG_DRM_MGAG200 is not set
-CONFIG_DRM_MIPI_DSI=y
 # CONFIG_DRM_NOUVEAU is not set
-CONFIG_DRM_PANEL=y
+# CONFIG_DRM_PTN3460 is not set
 # CONFIG_DRM_QXL is not set
-CONFIG_DRM_RADEON=y
-# CONFIG_DRM_RADEON_USERPTR is not set
-CONFIG_DRM_TTM=y
+# CONFIG_DRM_R128 is not set
+# CONFIG_DRM_RADEON is not set
+# CONFIG_DRM_SAVAGE is not set
+# CONFIG_DRM_SIS is not set
+# CONFIG_DRM_TDFX is not set
+# CONFIG_DRM_TTM is not set
 # CONFIG_DRM_UDL is not set
-# CONFIG_DRM_VGEM is not set
+CONFIG_DRM_VIA=y
 # CONFIG_DRM_VMWGFX is not set
-# CONFIG_EBC_C384_WDT is not set
 # CONFIG_EFI is not set
 # CONFIG_EISA is not set
 # CONFIG_EL3 is not set
@@ -99,13 +91,14 @@ CONFIG_FB_CFB_COPYAREA=y
 CONFIG_FB_CFB_FILLRECT=y
 CONFIG_FB_CFB_IMAGEBLIT=y
 CONFIG_FB_CMDLINE=y
-CONFIG_FB_DEFERRED_IO=y
 # CONFIG_FB_I810 is not set
 CONFIG_FB_SYS_COPYAREA=y
 CONFIG_FB_SYS_FILLRECT=y
-CONFIG_FB_SYS_FOPS=y
 CONFIG_FB_SYS_IMAGEBLIT=y
 # CONFIG_FB_VESA is not set
+CONFIG_FB_VIA=y
+# CONFIG_FB_VIA_DIRECT_PROCFS is not set
+CONFIG_FB_VIA_X_COMPATIBILITY=y
 # CONFIG_FONTS is not set
 CONFIG_FONT_8x16=y
 CONFIG_FONT_8x8=y
@@ -113,18 +106,23 @@ CONFIG_FONT_SUPPORT=y
 CONFIG_FRAMEBUFFER_CONSOLE=y
 CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
 # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
+# CONFIG_FUJITSU_LAPTOP is not set
+# CONFIG_GEOS is not set
+CONFIG_GPIO_GENERIC_PLATFORM=y
+# CONFIG_GPIO_F7188X is not set
+CONFIG_GPIO_VX855=y
+# CONFIG_GPIO_LYNXPOINT is not set
+# CONFIG_GPIO_INTEL_MID is not set
 CONFIG_HAVE_ACPI_APEI=y
 CONFIG_HAVE_ACPI_APEI_NMI=y
-CONFIG_HAVE_CLK=y
-CONFIG_HAVE_CLK_PREPARE=y
 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
-CONFIG_HWMON=y
 CONFIG_I2C=y
 CONFIG_I2C_ALGOBIT=y
 CONFIG_I2C_BOARDINFO=y
@@ -133,35 +131,26 @@ CONFIG_INPUT_MOUSEDEV=y
 CONFIG_INPUT_MOUSEDEV_PSAUX=y
 CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+# CONFIG_INT340X_THERMAL is not set
 CONFIG_INTEL_GTT=y
 CONFIG_INTEL_IDLE=y
 # CONFIG_INTEL_IPS is not set
 # CONFIG_INTEL_MENLOW is not set
-# CONFIG_INTEL_PMC_IPC is not set
 CONFIG_INTERVAL_TREE=y
 CONFIG_ISA=y
 CONFIG_ISAPNP=y
-CONFIG_ISA_BUS_API=y
 # CONFIG_ISCSI_IBFT_FIND is not set
 CONFIG_ISO9660_FS=y
 # CONFIG_JOLIET is not set
 # CONFIG_LANCE is not set
 # CONFIG_LCD_CLASS_DEVICE is not set
-CONFIG_LZO_COMPRESS=y
-CONFIG_LZO_DECOMPRESS=y
-CONFIG_M486=y
+# CONFIG_LEDS_CLEVO_MAIL is not set
 # CONFIG_MDA_CONSOLE is not set
-CONFIG_MFD_CORE=y
-CONFIG_MFD_INTEL_LPSS=y
-CONFIG_MFD_INTEL_LPSS_ACPI=y
-# CONFIG_MFD_INTEL_QUARK_I2C_GPIO is not set
 # CONFIG_MIXCOMWD is not set
-CONFIG_MMU_NOTIFIER=y
 # CONFIG_MOUSE_BCM5974 is not set
 # CONFIG_MOUSE_CYAPA is not set
 CONFIG_MOUSE_PS2=y
 CONFIG_MOUSE_PS2_ALPS=y
-# CONFIG_MOUSE_PS2_BYD is not set
 # CONFIG_MOUSE_PS2_CYPRESS is not set
 # CONFIG_MOUSE_PS2_ELANTECH is not set
 CONFIG_MOUSE_PS2_LIFEBOOK=y
@@ -171,36 +160,35 @@ CONFIG_MOUSE_PS2_SYNAPTICS=y
 CONFIG_MOUSE_PS2_TRACKPOINT=y
 # CONFIG_MOUSE_SERIAL is not set
 # CONFIG_MOUSE_VSXXXAA is not set
+# CONFIG_M486 is not set
+CONFIG_MVIAC3_2=y
+CONFIG_NLS=y
 CONFIG_NOHIGHMEM=y
 CONFIG_NO_HZ=y
-CONFIG_PATA_AMD=y
-CONFIG_PATA_ATIIXP=y
+# CONFIG_PANASONIC_LAPTOP is not set
 CONFIG_PATA_LEGACY=y
-CONFIG_PATA_MPIIX=y
-CONFIG_PATA_OLDPIIX=y
-CONFIG_PATA_PLATFORM=y
-CONFIG_PATA_SC1200=y
 CONFIG_PATA_VIA=y
 CONFIG_PCIEAER=y
 CONFIG_PCIEPORTBUS=y
+CONFIG_PCI_IOAPIC=y
+CONFIG_PCI_LABEL=y
 CONFIG_PCI_MMCONFIG=y
 # CONFIG_PCWATCHDOG is not set
-# CONFIG_PMIC_OPREGION is not set
 CONFIG_PNP=y
 CONFIG_PNPACPI=y
 # CONFIG_PNPBIOS is not set
 CONFIG_PNP_DEBUG_MESSAGES=y
 # CONFIG_PVPANIC is not set
 CONFIG_RAS=y
-CONFIG_RATIONAL=y
-CONFIG_REGMAP=y
-CONFIG_REGMAP_I2C=y
-CONFIG_RTC_I2C_AND_SPI=y
 # CONFIG_SAMSUNG_Q10 is not set
 CONFIG_SATA_AHCI=y
+# CONFIG_SCx200_ACB is not set
+# CONFIG_SERIAL_8250_FINTEK is not set
 CONFIG_SERIAL_8250_PNP=y
-# CONFIG_SURFACE_PRO3_BUTTON is not set
+# CONFIG_THINKPAD_ACPI is not set
+# CONFIG_TOPSTAR_LAPTOP is not set
 # CONFIG_TOSHIBA_BT_RFKILL is not set
+# CONFIG_TOSHIBA_HAPS is not set
 CONFIG_USB=y
 CONFIG_USB_COMMON=y
 CONFIG_USB_EHCI_HCD=y
@@ -214,13 +202,12 @@ CONFIG_VGACON_SOFT_SCROLLBACK=y
 CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=64
 # CONFIG_WDT is not set
 CONFIG_X86_ACPI_CPUFREQ=y
-# CONFIG_X86_ACPI_CPUFREQ_CPB is not set
-# CONFIG_X86_AMD_FREQ_SENSITIVITY is not set
-# CONFIG_X86_AMD_PLATFORM_DEVICE is not set
+CONFIG_X86_ACPI_CPUFREQ_CPB=y
+CONFIG_X86_ANCIENT_MCE=y
+CONFIG_X86_CMOV=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
 # CONFIG_X86_POWERNOW_K8 is not set
diff --git a/target/linux/x86/legacy/config-default b/target/linux/x86/legacy/config-default
index 0061ce2..7104925 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

More information about the lede-commits mailing list