From e2abf967b9fedb0f818a854e9c340906618d90b1 Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Mon, 4 May 2020 20:10:53 -0400 Subject: meta-agl-bsp: extend qemux86-64 hardware support Copy extra hardware support kernel configuration fragments used with meta-intel for intel-corei7-64 machine over to also use them with qemux86-64, and add apparently now required LPSS configuration options to x86-upsquared.cfg to fix serial console support. Bug-AGL: SPEC-3353 Signed-off-by: Scott Murray Change-Id: Iabcd7701f6967c877b295c09c1d328d69c4d0deb (cherry picked from commit b8a8fef1cb9914b9e11a50da8296af9b3316adb3) Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/25778 Tested-by: Jenkins Job builder account ci-image-build: Jenkins Job builder account ci-image-boot-test: Jenkins Job builder account Reviewed-by: Jan-Simon Moeller --- meta-agl-bsp/recipes-kernel/linux/linux-agl.inc | 16 +++++ .../linux/linux/x86-extra-graphic-devices.cfg | 40 +++++++++++ .../recipes-kernel/linux/linux/x86-net-devices.cfg | 3 + .../linux/linux/x86-security-tpm.cfg | 3 + .../recipes-kernel/linux/linux/x86-upsquare.cfg | 8 +++ .../recipes-kernel/linux/linux/x86-usb-devices.cfg | 82 ++++++++++++++++++++++ 6 files changed, 152 insertions(+) create mode 100644 meta-agl-bsp/recipes-kernel/linux/linux/x86-extra-graphic-devices.cfg create mode 100644 meta-agl-bsp/recipes-kernel/linux/linux/x86-net-devices.cfg create mode 100644 meta-agl-bsp/recipes-kernel/linux/linux/x86-security-tpm.cfg create mode 100644 meta-agl-bsp/recipes-kernel/linux/linux/x86-upsquare.cfg create mode 100644 meta-agl-bsp/recipes-kernel/linux/linux/x86-usb-devices.cfg diff --git a/meta-agl-bsp/recipes-kernel/linux/linux-agl.inc b/meta-agl-bsp/recipes-kernel/linux/linux-agl.inc index 7e801e0a7..322f35b5a 100644 --- a/meta-agl-bsp/recipes-kernel/linux/linux-agl.inc +++ b/meta-agl-bsp/recipes-kernel/linux/linux-agl.inc @@ -79,6 +79,22 @@ OVERRIDES_prepend_qemux86-64 = "virtualmachine:" SRC_URI_append_virtualmachine = " file://vbox-vmware-sata.cfg" KERNEL_CONFIG_FRAGMENTS_append_virtualmachine = " ${WORKDIR}/vbox-vmware-sata.cfg" +# Extra configuration for using qemux86-64 image on physical hardware +SRC_URI_append_qemux86-64 = "\ + file://x86-extra-graphic-devices.cfg \ + file://x86-net-devices.cfg \ + file://x86-security-tpm.cfg \ + file://x86-usb-devices.cfg \ + file://x86-upsquare.cfg \ +" +KERNEL_CONFIG_FRAGMENTS_append_qemux86-64 = "\ + ${WORKDIR}/x86-extra-graphic-devices.cfg \ + ${WORKDIR}/x86-net-devices.cfg \ + ${WORKDIR}/x86-security-tpm.cfg \ + ${WORKDIR}/x86-usb-devices.cfg \ + ${WORKDIR}/x86-upsquare.cfg \ +" + # Enable support for smack KERNEL_CONFIG_FRAGMENTS_append_with-lsm-smack = "\ ${WORKDIR}/audit.cfg \ diff --git a/meta-agl-bsp/recipes-kernel/linux/linux/x86-extra-graphic-devices.cfg b/meta-agl-bsp/recipes-kernel/linux/linux/x86-extra-graphic-devices.cfg new file mode 100644 index 000000000..d2b64de67 --- /dev/null +++ b/meta-agl-bsp/recipes-kernel/linux/linux/x86-extra-graphic-devices.cfg @@ -0,0 +1,40 @@ +CONFIG_MWIFIEX_PCIE=m +CONFIG_MWIFIEX_USB=m +CONFIG_RSI_91X=m +CONFIG_RSI_DEBUGFS=y +CONFIG_RSI_SDIO=m +CONFIG_RSI_USB=m +CONFIG_DRM_RADEON=m +CONFIG_DRM_RADEON_USERPTR=y +CONFIG_DRM_NOUVEAU=m +CONFIG_NOUVEAU_DEBUG=5 +CONFIG_NOUVEAU_DEBUG_DEFAULT=3 +CONFIG_DRM_NOUVEAU_BACKLIGHT=y +CONFIG_DRM_VGEM=m +CONFIG_DRM_VMWGFX=m +CONFIG_DRM_VMWGFX_FBCON=y +CONFIG_DRM_GMA500=m +CONFIG_DRM_GMA600=y +CONFIG_DRM_GMA3600=y +CONFIG_DRM_UDL=m +CONFIG_FB_DEFERRED_IO=y +CONFIG_FB_BACKLIGHT=y +CONFIG_IRQ_BYPASS_MANAGER=m +CONFIG_ACPI_WMI=m +CONFIG_MXM_WMI=m +CONFIG_SCHED_INFO=y +CONFIG_HAVE_KVM_IRQCHIP=y +CONFIG_HAVE_KVM_IRQFD=y +CONFIG_HAVE_KVM_IRQ_ROUTING=y +CONFIG_HAVE_KVM_EVENTFD=y +CONFIG_KVM_MMIO=y +CONFIG_KVM_ASYNC_PF=y +CONFIG_HAVE_KVM_MSI=y +CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT=y +CONFIG_KVM_VFIO=y +CONFIG_KVM_GENERIC_DIRTYLOG_READ_PROTECT=y +CONFIG_KVM_COMPAT=y +CONFIG_HAVE_KVM_IRQ_BYPASS=y +CONFIG_KVM=m +CONFIG_KVM_INTEL=m +CONFIG_CRC7=m diff --git a/meta-agl-bsp/recipes-kernel/linux/linux/x86-net-devices.cfg b/meta-agl-bsp/recipes-kernel/linux/linux/x86-net-devices.cfg new file mode 100644 index 000000000..6c5b698a9 --- /dev/null +++ b/meta-agl-bsp/recipes-kernel/linux/linux/x86-net-devices.cfg @@ -0,0 +1,3 @@ +CONFIG_IGB=y +CONFIG_IGB_DCA=y +CONFIG_R8169=y diff --git a/meta-agl-bsp/recipes-kernel/linux/linux/x86-security-tpm.cfg b/meta-agl-bsp/recipes-kernel/linux/linux/x86-security-tpm.cfg new file mode 100644 index 000000000..b66b1b9b1 --- /dev/null +++ b/meta-agl-bsp/recipes-kernel/linux/linux/x86-security-tpm.cfg @@ -0,0 +1,3 @@ +CONFIG_TCG_TPM=y +CONFIG_TCG_TIS=y +CONFIG_TCG_CRB=y diff --git a/meta-agl-bsp/recipes-kernel/linux/linux/x86-upsquare.cfg b/meta-agl-bsp/recipes-kernel/linux/linux/x86-upsquare.cfg new file mode 100644 index 000000000..caac6168b --- /dev/null +++ b/meta-agl-bsp/recipes-kernel/linux/linux/x86-upsquare.cfg @@ -0,0 +1,8 @@ +CONFIG_X86_INTEL_LPSS=y +CONFIG_EXPERT=y +CONFIG_SERIAL_8250_DMA=y +CONFIG_SERIAL_8250_DW=y +CONFIG_MFD_CORE=y +CONFIG_MFD_INTEL_LPSS=y +CONFIG_MFD_INTEL_LPSS_ACPI=y +CONFIG_MFD_INTEL_LPSS_PCI=y diff --git a/meta-agl-bsp/recipes-kernel/linux/linux/x86-usb-devices.cfg b/meta-agl-bsp/recipes-kernel/linux/linux/x86-usb-devices.cfg new file mode 100644 index 000000000..19c57796e --- /dev/null +++ b/meta-agl-bsp/recipes-kernel/linux/linux/x86-usb-devices.cfg @@ -0,0 +1,82 @@ +CONFIG_BT_QCA=m +CONFIG_BT_HCIBTSDIO=m +CONFIG_BT_HCIUART=m +CONFIG_BT_HCIUART_BCSP=y +CONFIG_BT_HCIUART_ATH3K=y +CONFIG_BT_HCIUART_LL=y +CONFIG_BT_HCIUART_3WIRE=y +CONFIG_BT_HCIUART_BCM=y +CONFIG_BT_HCIUART_QCA=y +CONFIG_BT_HCIBCM203X=m +CONFIG_BT_HCIBPA10X=m +CONFIG_BT_HCIBFUSB=m +CONFIG_BT_HCIVHCI=m +CONFIG_BT_MRVL=m +CONFIG_BT_MRVL_SDIO=m +CONFIG_BT_ATH3K=m +CONFIG_WIRELESS_EXT=y +CONFIG_WEXT_SPY=y +CONFIG_WEXT_PRIV=y +CONFIG_CFG80211_WEXT_EXPORT=y +CONFIG_LIB80211=m +CONFIG_LIB80211_CRYPT_WEP=m +CONFIG_LIB80211_CRYPT_CCMP=m +CONFIG_LIB80211_CRYPT_TKIP=m +# CONFIG_LIB80211_DEBUG is not set +CONFIG_VHOST_NET=m +CONFIG_VHOST_RING=m +CONFIG_VHOST=m +CONFIG_MICROCHIP_PHY=m +CONFIG_USB_CATC=m +CONFIG_USB_KAWETH=m +CONFIG_USB_PEGASUS=m +CONFIG_USB_RTL8152=m +CONFIG_USB_LAN78XX=m +CONFIG_USB_NET_SR9800=m +CONFIG_USB_NET_RNDIS_HOST=m +CONFIG_USB_HSO=m +CONFIG_USB_IPHETH=m +CONFIG_USB_ZD1201=m +CONFIG_USB_NET_RNDIS_WLAN=m +CONFIG_RTL8180=m +CONFIG_RTL8187=m +CONFIG_RTL8187_LEDS=y +CONFIG_MWL8K=m +# CONFIG_B43_BUSES_BCMA_AND_SSB is not set +# CONFIG_B43_BUSES_BCMA is not set +# CONFIG_B43_BUSES_SSB is not set +CONFIG_BRCMFMAC_PROTO_MSGBUF=y +CONFIG_BRCMFMAC_PCIE=y +CONFIG_IPW2100=m +CONFIG_IPW2100_MONITOR=y +CONFIG_IPW2100_DEBUG=y +CONFIG_IPW2200=m +CONFIG_IPW2200_MONITOR=y +CONFIG_IPW2200_RADIOTAP=y +CONFIG_IPW2200_PROMISCUOUS=y +CONFIG_IPW2200_QOS=y +CONFIG_IPW2200_DEBUG=y +CONFIG_LIBIPW=m +CONFIG_LIBIPW_DEBUG=y +CONFIG_LIBERTAS=m +CONFIG_LIBERTAS_USB=m +CONFIG_LIBERTAS_SDIO=m +CONFIG_LIBERTAS_SPI=m +# CONFIG_LIBERTAS_DEBUG is not set +# CONFIG_LIBERTAS_MESH is not set +CONFIG_RTL8XXXU=m +CONFIG_RTL8XXXU_UNTESTED=y +CONFIG_WLAN_VENDOR_TI=y +CONFIG_WL1251=m +# CONFIG_WL1251_SPI is not set +# CONFIG_WL1251_SDIO is not set +CONFIG_WL12XX=m +CONFIG_WL18XX=m +CONFIG_WLCORE=m +CONFIG_WLCORE_SPI=m +CONFIG_WLCORE_SDIO=m +CONFIG_WILINK_PLATFORM_DATA=y +CONFIG_ZD1211RW=m +CONFIG_ZD1211RW_DEBUG=y +CONFIG_MWIFIEX=m +# CONFIG_MWIFIEX_SDIO is not set -- cgit 1.2.3-korg