From 961c0eacea00b2c8e82eed695eb6ae60703f7763 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Fri, 5 May 2017 14:16:44 +0200 Subject: 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 --- target/linux/x86/config-4.9 | 34 ++++++++++++++++++++++++++-------- 1 file changed, 26 insertions(+), 8 deletions(-) (limited to 'target/linux/x86/config-4.9') diff --git a/target/linux/x86/config-4.9 b/target/linux/x86/config-4.9 index 09a9dfe0e6..075b4f04e2 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 -- cgit v1.2.3