x86: lift generic x86-32 target

* build for pentium4 instead of i486
* enable PAE
* enable EFI support
* enable KVM guest and host support

Signed-off-by: Daniel Golle <daniel@makrotopia.org>

2 files changed, 136 insertions, 17 deletions

diff --git a/target/linux/x86/generic/config-default b/target/linux/x86/generic/config-default
index 2ef610f7ab..6d6f94a447 100644
--- a/target/linux/x86/generic/config-default
+++ b/target/linux/x86/generic/config-default
@@ -1,8 +1,8 @@
 # CONFIG_3C515 is not set
 CONFIG_ACPI=y
 CONFIG_ACPI_AC=y
-# CONFIG_ACPI_ALS is not set
 CONFIG_ACPI_BATTERY=y
+# CONFIG_ACPI_BGRT is not set
 CONFIG_ACPI_BUTTON=y
 # CONFIG_ACPI_CMPC is not set
 # CONFIG_ACPI_CONTAINER is not set
@@ -17,6 +17,7 @@ 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_NFIT is not set
 # CONFIG_ACPI_PCI_SLOT is not set
 CONFIG_ACPI_PROCESSOR=y
 # CONFIG_ACPI_PROCESSOR_AGGREGATOR is not set
@@ -39,18 +40,21 @@ CONFIG_AGP_INTEL=y
 # CONFIG_AGP_SIS is not set
 # CONFIG_AGP_SWORKS is not set
 # CONFIG_AGP_VIA is not set
-# CONFIG_APPLE_GMUX is not set
+CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y
 CONFIG_ARCH_MIGHT_HAVE_ACPI_PDC=y
+CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
+CONFIG_ARCH_RANDOM=y
+CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y
 # 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_CPU_IDLE_GOV_MENU=y
+CONFIG_CPU_RMAP=y
 CONFIG_DMA_SHARED_BUFFER=y
 CONFIG_DRM=y
 CONFIG_DRM_AMDGPU=y
@@ -89,8 +93,18 @@ CONFIG_DRM_TTM=y
 # CONFIG_DRM_UDL is not set
 # CONFIG_DRM_VGEM is not set
 # CONFIG_DRM_VIA is not set
+CONFIG_DRM_VIRTIO_GPU=y
 # CONFIG_DRM_VMWGFX is not set
-# CONFIG_EFI is not set
+CONFIG_EARLY_PRINTK_EFI=y
+CONFIG_EFI=y
+CONFIG_EFIVAR_FS=m
+CONFIG_EFI_ESRT=y
+# CONFIG_EFI_FAKE_MEMMAP is not set
+# CONFIG_EFI_PGT_DUMP is not set
+CONFIG_EFI_RUNTIME_MAP=y
+CONFIG_EFI_RUNTIME_WRAPPERS=y
+CONFIG_EFI_STUB=y
+CONFIG_EFI_VARS=y
 # CONFIG_EISA is not set
 # CONFIG_EL3 is not set
 CONFIG_FB=y
@@ -98,6 +112,7 @@ CONFIG_FB_CFB_COPYAREA=y
 CONFIG_FB_CFB_FILLRECT=y
 CONFIG_FB_CFB_IMAGEBLIT=y
 CONFIG_FB_CMDLINE=y
+CONFIG_FB_EFI=y
 # CONFIG_FB_I810 is not set
 CONFIG_FB_SYS_COPYAREA=y
 CONFIG_FB_SYS_FILLRECT=y
@@ -111,18 +126,41 @@ 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_GENERIC_PENDING_IRQ=y
+CONFIG_GENERIC_PINCONF=y
+CONFIG_GPIOLIB=y
+CONFIG_GPIOLIB_IRQCHIP=y
+# CONFIG_GPIO_104_IDIO_16 is not set
+CONFIG_GPIO_ACPI=y
+# CONFIG_GPIO_AMDPT is not set
+CONFIG_GPIO_DEVRES=y
+# CONFIG_GPIO_F7188X is not set
+# CONFIG_GPIO_INTEL_MID is not set
+# CONFIG_GPIO_IT87 is not set
+# CONFIG_GPIO_LYNXPOINT is not set
 CONFIG_HAVE_ACPI_APEI=y
 CONFIG_HAVE_ACPI_APEI_NMI=y
+CONFIG_HAVE_ARCH_HUGE_VMAP=y
 CONFIG_HAVE_CLK=y
 CONFIG_HAVE_CLK_PREPARE=y
+CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT=y
+CONFIG_HAVE_KVM_EVENTFD=y
+CONFIG_HAVE_KVM_IRQCHIP=y
+CONFIG_HAVE_KVM_IRQFD=y
+CONFIG_HAVE_KVM_IRQ_BYPASS=y
+CONFIG_HAVE_KVM_IRQ_ROUTING=y
+CONFIG_HAVE_KVM_MSI=y
 CONFIG_HDMI=y
 CONFIG_HID=y
 CONFIG_HID_BATTERY_STRENGTH=y
+# CONFIG_HIGHMEM64G is not set
 CONFIG_HPET=y
 CONFIG_HPET_MMAP=y
 # CONFIG_HP_ACCEL is not set
+CONFIG_HVC_DRIVER=y
 CONFIG_HWMON=y
+CONFIG_HW_RANDOM_VIRTIO=y
+CONFIG_HYPERVISOR_GUEST=y
 CONFIG_I2C=y
 CONFIG_I2C_ALGOBIT=y
 CONFIG_I2C_BOARDINFO=y
@@ -137,19 +175,37 @@ CONFIG_INTEL_IDLE=y
 # CONFIG_INTEL_MENLOW is not set
 # CONFIG_INTEL_PMC_IPC is not set
 CONFIG_INTERVAL_TREE=y
+CONFIG_IOMMU_HELPER=y
+CONFIG_IRQ_BYPASS_MANAGER=y
 CONFIG_ISA=y
 CONFIG_ISAPNP=y
 # CONFIG_ISCSI_IBFT_FIND is not set
 CONFIG_ISO9660_FS=y
 # CONFIG_JOLIET is not set
+CONFIG_KVM=y
+CONFIG_KVM_AMD=y
+CONFIG_KVM_APIC_ARCHITECTURE=y
+CONFIG_KVM_ASYNC_PF=y
+# CONFIG_KVM_DEBUG_FS is not set
+CONFIG_KVM_GENERIC_DIRTYLOG_READ_PROTECT=y
+CONFIG_KVM_GUEST=y
+CONFIG_KVM_INTEL=y
+CONFIG_KVM_MMIO=y
+CONFIG_KVM_VFIO=y
 # CONFIG_LANCE is not set
 # CONFIG_LCD_CLASS_DEVICE is not set
+# CONFIG_LGUEST is not set
+# CONFIG_LGUEST_GUEST is not set
+CONFIG_LOCK_SPIN_ON_OWNER=y
+# CONFIG_M486 is not set
 # CONFIG_MDA_CONSOLE is not set
+CONFIG_MEMORY_BALLOON=y
 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
@@ -161,36 +217,64 @@ CONFIG_MOUSE_PS2_LOGIPS2PP=y
 CONFIG_MOUSE_PS2_SYNAPTICS=y
 # CONFIG_MOUSE_PS2_TOUCHKIT is not set
 CONFIG_MOUSE_PS2_TRACKPOINT=y
+# CONFIG_MOUSE_PS2_VMMOUSE is not set
 # CONFIG_MOUSE_SERIAL is not set
 # CONFIG_MOUSE_VSXXXAA is not set
+CONFIG_MPENTIUM4=y
+CONFIG_MUTEX_SPIN_ON_OWNER=y
+CONFIG_NEED_DMA_MAP_STATE=y
+CONFIG_NET_FLOW_LIMIT=y
 CONFIG_NLS=y
 CONFIG_NO_HZ=y
-# CONFIG_PANASONIC_LAPTOP is not set
-CONFIG_PATA_AMD=y
-CONFIG_PATA_ATIIXP=y
-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_NR_CPUS=4
+CONFIG_PARAVIRT=y
+CONFIG_PARAVIRT_CLOCK=y
+# CONFIG_PARAVIRT_DEBUG is not set
+CONFIG_PARAVIRT_SPINLOCKS=y
+# CONFIG_PARAVIRT_TIME_ACCOUNTING is not set
 CONFIG_PCIEAER=y
 CONFIG_PCIEPORTBUS=y
 CONFIG_PCI_LABEL=y
 CONFIG_PCI_MMCONFIG=y
 # CONFIG_PCWATCHDOG is not set
+CONFIG_PGTABLE_LEVELS=3
+CONFIG_PHYS_ADDR_T_64BIT=y
+CONFIG_PINCTRL=y
+CONFIG_PINCTRL_BAYTRAIL=y
+CONFIG_PINCTRL_BROXTON=y
+CONFIG_PINCTRL_CHERRYVIEW=y
+CONFIG_PINCTRL_INTEL=y
+CONFIG_PINCTRL_SUNRISEPOINT=y
 # CONFIG_PMIC_OPREGION is not set
 CONFIG_PNP=y
 CONFIG_PNPACPI=y
 # CONFIG_PNPBIOS is not set
 CONFIG_PNP_DEBUG_MESSAGES=y
+CONFIG_PREEMPT_NOTIFIERS=y
 # CONFIG_PVPANIC is not set
+CONFIG_QUEUED_RWLOCKS=y
+CONFIG_QUEUED_SPINLOCKS=y
+# CONFIG_RANDOMIZE_BASE is not set
 CONFIG_RAS=y
+CONFIG_RCU_STALL_COMMON=y
+CONFIG_RELOCATABLE=y
+CONFIG_RFS_ACCEL=y
+CONFIG_RPS=y
+CONFIG_RWSEM_SPIN_ON_OWNER=y
 # CONFIG_SAMSUNG_Q10 is not set
 CONFIG_SATA_AHCI=y
+CONFIG_SCHED_INFO=y
+CONFIG_SCSI_VIRTIO=y
 CONFIG_SERIAL_8250_PNP=y
+CONFIG_SMP=y
 # CONFIG_SURFACE_PRO3_BUTTON is not set
+CONFIG_SWIOTLB=y
+CONFIG_TASKSTATS=y
+CONFIG_TASK_DELAY_ACCT=y
+# CONFIG_TASK_XACCT is not set
 # CONFIG_TOSHIBA_BT_RFKILL is not set
+CONFIG_TREE_RCU=y
+CONFIG_UCS2_STRING=y
 CONFIG_USB=y
 CONFIG_USB_COMMON=y
 CONFIG_USB_EHCI_HCD=y
@@ -200,13 +284,44 @@ CONFIG_USB_OHCI_HCD=y
 # CONFIG_USB_OHCI_HCD_PLATFORM is not set
 CONFIG_USB_STORAGE=y
 CONFIG_USB_UHCI_HCD=y
+CONFIG_USER_RETURN_NOTIFIER=y
 CONFIG_VGACON_SOFT_SCROLLBACK=y
 CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=64
+CONFIG_VHOST=y
+# CONFIG_VHOST_CROSS_ENDIAN_LEGACY is not set
+CONFIG_VHOST_NET=y
+CONFIG_VHOST_RING=y
+CONFIG_VIRTIO=y
+CONFIG_VIRTIO_BALLOON=y
+CONFIG_VIRTIO_BLK=y
+CONFIG_VIRTIO_CONSOLE=y
+CONFIG_VIRTIO_INPUT=y
+CONFIG_VIRTIO_MMIO=y
+# CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set
+CONFIG_VIRTIO_NET=y
+CONFIG_VIRTIO_PCI=y
+CONFIG_VIRTIO_PCI_LEGACY=y
+CONFIG_VIRTUALIZATION=y
 # CONFIG_WDT is not set
+CONFIG_X86_32_SMP=y
 # CONFIG_X86_ACPI_CPUFREQ is not set
 # CONFIG_X86_AMD_PLATFORM_DEVICE is not set
+# CONFIG_X86_BIGSMP is not set
+CONFIG_X86_CMOV=y
+CONFIG_X86_CMPXCHG64=y
+CONFIG_X86_DEBUGCTLMSR=y
 # CONFIG_X86_E_POWERSAVER is not set
-# CONFIG_X86_INTEL_LPSS is not set
+CONFIG_X86_INTEL_LPSS=y
+CONFIG_X86_INTEL_PSTATE=y
+CONFIG_X86_INTERNODE_CACHE_SHIFT=7
+CONFIG_X86_L1_CACHE_SHIFT=7
 # CONFIG_X86_LONGHAUL is not set
+CONFIG_X86_MINIMUM_CPU_FAMILY=5
+CONFIG_X86_NEED_RELOCS=y
+CONFIG_X86_PAE=y
 # CONFIG_X86_PCC_CPUFREQ is not set
+# CONFIG_X86_PMEM_LEGACY is not set
 CONFIG_X86_PM_TIMER=y
+CONFIG_X86_TSC=y
+CONFIG_X86_USE_PPRO_CHECKSUM=y
+CONFIG_XPS=y
diff --git a/target/linux/x86/generic/target.mk b/target/linux/x86/generic/target.mk
index 7191292e81..e135b6d6b6 100644
--- a/target/linux/x86/generic/target.mk
+++ b/target/linux/x86/generic/target.mk
@@ -1,7 +1,11 @@
 BOARDNAME:=Generic
+CPU_TYPE :=pentium4
+FEATURES += audio fpu pci pcie usb
+DEFAULT_PACKAGES += kmod-button-hotplug
 
 define Target/Description
-	Build firmware images for x86 based boards
-	(e.g : Soekris, ...)
+	Build firmware images for modern x86 based boards with CPUs
+	supporting at least the Intel Pentium 4 instruction set with
+	MMX, SSE and SSE2.
 endef