diff options
author | Jan-Simon Möller <jsmoeller@linuxfoundation.org> | 2020-07-01 02:01:57 +0200 |
---|---|---|
committer | Jan-Simon Möller <jsmoeller@linuxfoundation.org> | 2020-07-02 19:05:17 +0200 |
commit | 3fb78c5ff1b63c5c4703efde2dc405d897fda74c (patch) | |
tree | 719707a201785170c31414e32b6f372f7317db72 /meta-agl-bsp | |
parent | aecad47046dc62af8c1a61bc0b9b1659eddf1d6f (diff) |
Cleanup of deprecated recipes
We deprecated meta-intel in favour of a combined qemux86-64 image.
Thus we can remove bbappends related to meta-intel.
We can also remove the joule bootdisk (board long EOL).
The intel kernel config fragments are moved to the generic recipes-kernel folder
for a later inspection as to enhance the kernel options available in the
qemux86-64 build.
Finally also remove the override for meta-synopsys (no dunfell branch).
Bug-AGL: SPEC-3468
Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
Change-Id: I8c999a4f6d3ad4b85c71f94dac13c3563c440a88
Diffstat (limited to 'meta-agl-bsp')
13 files changed, 140 insertions, 24 deletions
diff --git a/meta-agl-bsp/meta-aglprofilegraphical/recipes-graphics/mesa/mesa_%.bbappend b/meta-agl-bsp/meta-aglprofilegraphical/recipes-graphics/mesa/mesa_%.bbappend index 8ac343aa3..57800ab37 100644 --- a/meta-agl-bsp/meta-aglprofilegraphical/recipes-graphics/mesa/mesa_%.bbappend +++ b/meta-agl-bsp/meta-aglprofilegraphical/recipes-graphics/mesa/mesa_%.bbappend @@ -1,7 +1,3 @@ # The gallium-llvm is recommended as software 3D graphics renderer -GALLIUM_LLVM = "gallium-llvm" -PACKAGECONFIG_append_qemux86 = " gallium ${GALLIUM_LLVM}" -PACKAGECONFIG_append_qemux86-64 = " gallium ${GALLIUM_LLVM}" -PACKAGECONFIG_append_intel-corei7-64 = " gallium ${GALLIUM_LLVM}" - -DRIDRIVERS_append_intel-corei7-64 = ",i965" +PACKAGECONFIG_append_qemux86 = " gallium-llvm" +PACKAGECONFIG_append_qemux86-64 = " gallium-llvm" diff --git a/meta-agl-bsp/meta-aglprofilegraphical/recipes-graphics/wayland/libva_%.bbappend b/meta-agl-bsp/meta-aglprofilegraphical/recipes-graphics/wayland/libva_%.bbappend deleted file mode 100644 index eda8de38a..000000000 --- a/meta-agl-bsp/meta-aglprofilegraphical/recipes-graphics/wayland/libva_%.bbappend +++ /dev/null @@ -1,4 +0,0 @@ -# This patch correct a bug in libva1_1.7.0.bb 1.8 inmeta-intel (no clue when it will be fixed) -# libva.bb calls for an x11 runtime dependency even if wayland is selected -# -RDEPENDS_${PN}-egl_remove = "${@bb.utils.contains("DISTRO_FEATURES", "x11", "", "${PN}-x11", d)}" diff --git a/meta-agl-bsp/meta-aglprofilegraphical/recipes-graphics/wayland/weston-ini-conf.bbappend b/meta-agl-bsp/meta-aglprofilegraphical/recipes-graphics/wayland/weston-ini-conf.bbappend index 4a2dc80af..67629edba 100644 --- a/meta-agl-bsp/meta-aglprofilegraphical/recipes-graphics/wayland/weston-ini-conf.bbappend +++ b/meta-agl-bsp/meta-aglprofilegraphical/recipes-graphics/wayland/weston-ini-conf.bbappend @@ -4,4 +4,3 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" # and Virtual-1 outputs. This allows us to run virtual images on real hardware # and vice versa. SRC_URI_append_qemuall = " file://virtual.cfg" -SRC_URI_append_intel-corei7-64 = " file://virtual.cfg" diff --git a/meta-agl-bsp/meta-aglprofilegraphical/recipes-graphics/wayland/weston_%.bbappend b/meta-agl-bsp/meta-aglprofilegraphical/recipes-graphics/wayland/weston_%.bbappend index 9aaea5f69..d22ff5947 100644 --- a/meta-agl-bsp/meta-aglprofilegraphical/recipes-graphics/wayland/weston_%.bbappend +++ b/meta-agl-bsp/meta-aglprofilegraphical/recipes-graphics/wayland/weston_%.bbappend @@ -1,3 +1,2 @@ RDEPENDS_${PN}_append_qemux86 = " mesa-megadriver" RDEPENDS_${PN}_append_qemux86-64 = " mesa-megadriver" -RDEPENDS_${PN}_append_intel-corei7-64 = " mesa-megadriver" diff --git a/meta-agl-bsp/recipes-kernel/linux/linux/todo-old-intel-cfg/extra-graphic-devices.cfg b/meta-agl-bsp/recipes-kernel/linux/linux/todo-old-intel-cfg/extra-graphic-devices.cfg new file mode 100644 index 000000000..d2b64de67 --- /dev/null +++ b/meta-agl-bsp/recipes-kernel/linux/linux/todo-old-intel-cfg/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/todo-old-intel-cfg/fix_branch.scc b/meta-agl-bsp/recipes-kernel/linux/linux/todo-old-intel-cfg/fix_branch.scc new file mode 100644 index 000000000..d94108d9f --- /dev/null +++ b/meta-agl-bsp/recipes-kernel/linux/linux/todo-old-intel-cfg/fix_branch.scc @@ -0,0 +1,3 @@ + +branch bxt-rebase +mark patching start diff --git a/meta-agl-bsp/recipes-kernel/linux/linux/todo-old-intel-cfg/lava.cfg b/meta-agl-bsp/recipes-kernel/linux/linux/todo-old-intel-cfg/lava.cfg new file mode 100644 index 000000000..4dcf4036d --- /dev/null +++ b/meta-agl-bsp/recipes-kernel/linux/linux/todo-old-intel-cfg/lava.cfg @@ -0,0 +1,3 @@ +CONFIG_BLK_DEV_RAM=y +CONFIG_BLK_DEV_NBD=y +CONFIG_BLK_DEV_INITRD=y diff --git a/meta-agl-bsp/recipes-kernel/linux/linux/todo-old-intel-cfg/net-devices.cfg b/meta-agl-bsp/recipes-kernel/linux/linux/todo-old-intel-cfg/net-devices.cfg new file mode 100644 index 000000000..ab88cedc2 --- /dev/null +++ b/meta-agl-bsp/recipes-kernel/linux/linux/todo-old-intel-cfg/net-devices.cfg @@ -0,0 +1,2 @@ +CONFIG_IGB=y +CONFIG_R8169=y diff --git a/meta-agl-bsp/recipes-kernel/linux/linux/todo-old-intel-cfg/security-tpm.cfg b/meta-agl-bsp/recipes-kernel/linux/linux/todo-old-intel-cfg/security-tpm.cfg new file mode 100644 index 000000000..b66b1b9b1 --- /dev/null +++ b/meta-agl-bsp/recipes-kernel/linux/linux/todo-old-intel-cfg/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/todo-old-intel-cfg/startup.nsh b/meta-agl-bsp/recipes-kernel/linux/linux/todo-old-intel-cfg/startup.nsh new file mode 100644 index 000000000..33746243d --- /dev/null +++ b/meta-agl-bsp/recipes-kernel/linux/linux/todo-old-intel-cfg/startup.nsh @@ -0,0 +1 @@ +fs0:EFI\BOOT\BOOTx64.EFI
diff --git a/meta-agl-bsp/recipes-kernel/linux/linux/todo-old-intel-cfg/upsquare.cfg b/meta-agl-bsp/recipes-kernel/linux/linux/todo-old-intel-cfg/upsquare.cfg new file mode 100644 index 000000000..7be178bf6 --- /dev/null +++ b/meta-agl-bsp/recipes-kernel/linux/linux/todo-old-intel-cfg/upsquare.cfg @@ -0,0 +1,4 @@ +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/todo-old-intel-cfg/usb-devices.cfg b/meta-agl-bsp/recipes-kernel/linux/linux/todo-old-intel-cfg/usb-devices.cfg new file mode 100644 index 000000000..19c57796e --- /dev/null +++ b/meta-agl-bsp/recipes-kernel/linux/linux/todo-old-intel-cfg/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 diff --git a/meta-agl-bsp/wic/systemd-joule-bootdisk.wks b/meta-agl-bsp/wic/systemd-joule-bootdisk.wks deleted file mode 100644 index a318e2315..000000000 --- a/meta-agl-bsp/wic/systemd-joule-bootdisk.wks +++ /dev/null @@ -1,12 +0,0 @@ -# short-description: Custom EFI disk image with systemd-boot -# long-description: Creates a partitioned EFI disk image that the user -# can directly dd to boot media. The selected bootloader is systemd-boot -# and we do not have swap. We assume a Joule system and provide an -# appropriate kernel command line. - -part /boot --source bootimg-efi --sourceparams="loader=systemd-boot,initrd=microcode.cpio" --use-uuid --label msdos --active --align 1024 - -part / --source rootfs --fstype=ext4 --label platform --align 1024 --use-uuid - -# Modify the append line here as needed to suit the environment -bootloader --ptable gpt --timeout=5 --append="rootwait rootfstype=ext4 console=ttyS2,115200n8 console=tty0 video=efifb maxcpus=4 noxsave reboot=efi kmemleak=off" |