ti-bsp: Remove ti-6_1 and all related recipes
PATCH 1/1 ti-bsp: Remove ti-6_1 and all related recipes
With the upcoming LTS move to 6.12 we no longer need to continue supporting the ti-6_1 BSP. Also remove the related recipes and their related file:
linux-ti-staging_6.1.bb
linux-ti-staging-rt_6.1.bb
u-boot-ti-staging_2023.04.bb
ti-img-rogue-driver_23.3.6512818.bb
ti-img-rogue-umlibs_23.3.6512818.bb
mesa-pvr_22.3.5.bb
Signed-off-by Ryan Eatmon <[email protected]>
--- meta-beagle/conf/machine/beagle-x15.conf | 1 - .../conf/machine/beaglebone-ai64-k3r5.conf | 3 - meta-beagle/conf/machine/beaglebone-ai64.conf | 3 - meta-beagle/conf/machine/beaglebone.conf | 1 - meta-ti-bsp/conf/machine/am62pxx-evm.conf | 2 - .../conf/machine/am62xxsip-evm-k3r5.conf | 4 - meta-ti-bsp/conf/machine/am62xxsip-evm.conf | 2 - .../conf/machine/beagleplay-ti-k3r5.conf | 3 - meta-ti-bsp/conf/machine/beagleplay-ti.conf | 3 - meta-ti-bsp/conf/machine/include/ti-bsp.inc | 22 +-- .../ti-img-rogue-driver_23.3.6512818.bb | 39 ----- .../u-boot/u-boot-ti-staging_2023.04.bb | 9 -- ...lude-of-Host-h-moved-to-TargetParser.patch | 64 -------- ...allium-Fix-build-with-llvm-18-and-19.patch | 52 ------- .../recipes-graphics/mesa/mesa-pvr_22.3.5.bb | 62 -------- .../ti-img-rogue-umlibs_23.3.6512818.bb | 147 ------------------ .../linux/linux-ti-staging-6.1/defconfig | 2 - .../linux/linux-ti-staging-6.1/k3/defconfig | 2 - .../linux-ti-staging-6.1/omapl138/defconfig | 1 - .../linux-ti-staging-6.1/ti33x/defconfig | 2 - .../linux-ti-staging-6.1/ti43x/defconfig | 2 - .../linux/linux-ti-staging-rt-6.1/defconfig | 2 - .../linux-ti-staging-rt-6.1/k3/defconfig | 2 - .../omapl138/defconfig | 2 - .../linux-ti-staging-rt-6.1/ti33x/defconfig | 2 - .../linux-ti-staging-rt-6.1/ti43x/defconfig | 2 - .../linux/linux-ti-staging-rt_6.1.bb | 15 -- .../linux/linux-ti-staging_6.1.bb | 33 ---- 28 files changed, 1 insertion(+), 483 deletions(-) delete mode 100644 meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_23.3.6512818.bb delete mode 100644 meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2023.04.bb delete mode 100644 meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-22.3.5/0001-fix-gallivm-fix-LLVM-include-of-Host-h-moved-to-TargetParser.patch delete mode 100644 meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-22.3.5/0001-gallium-Fix-build-with-llvm-18-and-19.patch delete mode 100644 meta-ti-bsp/recipes-graphics/mesa/mesa-pvr_22.3.5.bb delete mode 100644 meta-ti-bsp/recipes-graphics/powervr-umlibs/ti-img-rogue-umlibs_23.3.6512818.bb delete mode 100644 meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.1/defconfig delete mode 100644 meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.1/k3/defconfig delete mode 100644 meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.1/omapl138/defconfig delete mode 100644 meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.1/ti33x/defconfig delete mode 100644 meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.1/ti43x/defconfig delete mode 100644 meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.1/defconfig delete mode 100644 meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.1/k3/defconfig delete mode 100644 meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.1/omapl138/defconfig delete mode 100644 meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.1/ti33x/defconfig delete mode 100644 meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.1/ti43x/defconfig delete mode 100644 meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_6.1.bb delete mode 100644 meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.1.bb
meta-beagle/conf/machine/beagle-x15.conf +0 -1
@@ -6,7 +6,6 @@ require conf/machine/include/am57xx.inc require conf/machine/include/beagle-bsp.inc DT_VENDOR_PREFIX = "ti/omap/" -DT_VENDOR_PREFIX:bsp-ti-6_1 = "" DT_VENDOR_PREFIX:bsp-bb_org-6_1 = "" KERNEL_DEVICETREE_PREFIX = " \
meta-beagle/conf/machine/beaglebone-ai64-k3r5.conf +0 -3
@@ -17,8 +17,5 @@ UBOOT_SYMLINK = "tiboot3-${MAINMACHINE}.${UBOOT_SUFFIX}" UBOOT_MACHINE = "j721e_beagleboneai64_r5_defconfig" -UBOOT_MACHINE:bsp-ti-6_1 = "j721e_evm_r5_defconfig" -UBOOT_CONFIG_FRAGMENTS:bsp-ti-6_1 = "j721e_beagleboneai64_r5.config" - UBOOT_MACHINE:bsp-bb_org-6_1 = "j721e_evm_r5_defconfig" UBOOT_CONFIG_FRAGMENTS:bsp-bb_org-6_1 = "j721e_beagleboneai64_r5.config"
meta-beagle/conf/machine/beaglebone-ai64.conf +0 -3
@@ -12,9 +12,6 @@ IMAGE_SR2_HS_SE_FILES = "" UBOOT_MACHINE = "j721e_beagleboneai64_a72_defconfig" -UBOOT_MACHINE:bsp-ti-6_1 = "j721e_evm_a72_config" -UBOOT_CONFIG_FRAGMENTS:bsp-ti-6_1 = "j721e_beagleboneai64_a72.config" - UBOOT_MACHINE:bsp-bb_org-6_1 = "j721e_evm_a72_config" UBOOT_CONFIG_FRAGMENTS:bsp-bb_org-6_1 = "j721e_beagleboneai64_a72.config"
meta-beagle/conf/machine/beaglebone.conf +0 -1
@@ -6,7 +6,6 @@ require conf/machine/include/ti33x.inc require conf/machine/include/beagle-bsp.inc DT_VENDOR_PREFIX = "ti/omap/" -DT_VENDOR_PREFIX:bsp-ti-6_1 = "" DT_VENDOR_PREFIX:bsp-bb_org-6_1 = "" KERNEL_DEVICETREE_PREFIX = " \
meta-ti-bsp/conf/machine/am62pxx-evm.conf +0 -2
@@ -29,5 +29,3 @@ UBOOT_MACHINE = "am62px_evm_a53_defconfig" # For AM62P tisdk-display-cluster image, splash screen is handled by SBL. # Hence, disable the A53 based splash screen using the am62x_evm_prune_splashscreen.config fragment present in ti-u-boot tree UBOOT_CONFIG_FRAGMENTS = "${@oe.utils.conditional('DISPLAY_CLUSTER_ENABLE', '1', 'am62x_evm_prune_splashscreen.config', '', d)}" - -UBOOT_CONFIG_FRAGMENTS:bsp-ti-6_1 = "${@oe.utils.conditional('DISPLAY_CLUSTER_ENABLE', '1', 'am62px_evm_prune_splashscreen.config', '', d)}"
meta-ti-bsp/conf/machine/am62xxsip-evm-k3r5.conf +0 -4
@@ -9,7 +9,3 @@ SYSFW_CONFIG = "evm" SYSFW_SUFFIX = "hs-fs" UBOOT_MACHINE = "am62xsip_evm_r5_defconfig" - -UBOOT_MACHINE:bsp-ti-6_1 = "am62x_evm_r5_defconfig" - -UBOOT_CONFIG_FRAGMENTS:bsp-ti-6_1 = "am62xsip_sk_r5.config"
meta-ti-bsp/conf/machine/am62xxsip-evm.conf +0 -2
@@ -14,5 +14,3 @@ KERNEL_DEVICETREE = " \ " UBOOT_MACHINE = "am62xsip_evm_a53_defconfig" - -UBOOT_MACHINE:bsp-ti-6_1 = "am62x_evm_a53_defconfig"
meta-ti-bsp/conf/machine/beagleplay-ti-k3r5.conf +0 -3
@@ -9,6 +9,3 @@ SYSFW_CONFIG = "evm" SYSFW_SUFFIX = "gp" UBOOT_MACHINE = "am62x_beagleplay_r5_defconfig" -UBOOT_MACHINE:bsp-ti-6_1 = "am62x_evm_r5_defconfig" - -UBOOT_CONFIG_FRAGMENTS:bsp-ti-6_1 = "am625_beagleplay_r5.config"
meta-ti-bsp/conf/machine/beagleplay-ti.conf +0 -3
@@ -20,9 +20,6 @@ TFA_K3_SYSTEM_SUSPEND = "1" OPTEEMACHINE = "k3-am62x" UBOOT_MACHINE = "am62x_beagleplay_a53_defconfig" -UBOOT_MACHINE:bsp-ti-6_1 = "am62x_evm_a53_defconfig" - -UBOOT_CONFIG_FRAGMENTS:bsp-ti-6_1 = "am625_beagleplay_a53.config" SPL_BINARY = "tispl.bin_unsigned"
meta-ti-bsp/conf/machine/include/ti-bsp.inc +1 -21
@@ -3,7 +3,7 @@ # preferences for kernel, bootloader and graphics components, as # well as a dedicated machine override. -# Supported options are: mainline, next, ti-6_12, ti-6_6, ti-6_1 +# Supported options are: mainline, next, ti-6_12, ti-6_6 TI_PREFERRED_BSP ??= "ti-6_12" # Use bsp-* namespace for overrides
@@ -77,26 +77,6 @@ BSP_MESA_PVR_VERSION:bsp-ti-6_6 = "23%" # GC320 support requires out-of-tree drivers not yet available in 6.6 MACHINE_FEATURES:remove:bsp-ti-6_6 = "gc320" -# ========== -# ti-6_1 -# TI staging kernel 6.1, u-boot 2023.04 -# ========== -BSP_KERNEL_PROVIDER:bsp-ti-6_1 = "linux-ti-staging" -BSP_KERNEL_VERSION:bsp-ti-6_1 = "6.1.%" -BSP_BOOTLOADER_PROVIDER:bsp-ti-6_1 = "u-boot-ti-staging" -BSP_BOOTLOADER_VERSION:bsp-ti-6_1 = "2023.04%" - -BSP_SGX_DRIVER_PROVIDER:bsp-ti-6_1 = "ti-sgx-ddk-km" -BSP_SGX_DRIVER_VERSION:bsp-ti-6_1 = "1.17%" -BSP_SGX_UMLIBS_VERSION:bsp-ti-6_1 = "1.17%" -BSP_ROGUE_DRIVER_PROVIDER:bsp-ti-6_1 = "ti-img-rogue-driver" -BSP_ROGUE_DRIVER_VERSION:bsp-ti-6_1 = "23%" -BSP_ROGUE_UMLIBS_VERSION:bsp-ti-6_1 = "23%" -BSP_MESA_PVR_VERSION:bsp-ti-6_1 = "22%" - -# GC320 support requires out-of-tree drivers not yet available in 6.1 -MACHINE_FEATURES:remove:bsp-ti-6_1 = "gc320" - # ========== # sane fallback defaults # if specific values are not defined or bsp is set incorrectly
meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_23.3.6512818.bb deleted +0 -39
@@ -1,39 +0,0 @@ -DESCRIPTION = "Kernel drivers for the PowerVR Rogue GPU found in the TI SoCs" -HOMEPAGE = "http://git.ti.com/graphics/ti-img-rogue-driver" -LICENSE = "MIT | GPL-2.0-only" -LIC_FILES_CHKSUM = "file://README;beginline=14;endline=19;md5=0403c7dea01a2b8232261e805325fac2" - -inherit module - -PROVIDES = "virtual/gpudriver" - -PACKAGE_ARCH = "${MACHINE_ARCH}" - -COMPATIBLE_MACHINE = "j721e|j721s2|j784s4|am62xx|am62pxx|j722s" - -DEPENDS = "virtual/kernel" - -BRANCH = "linuxws/kirkstone/k6.1/${PV}" - -SRC_URI = "git://git.ti.com/git/graphics/ti-img-rogue-driver.git;protocol=https;branch=${BRANCH}" - -S = "${WORKDIR}/git" - -SRCREV = "c838bc06a163abad46dcc193c8fb9a4fb9e2e356" - -TARGET_PRODUCT:j721e = "j721e_linux" -TARGET_PRODUCT:j721s2 = "j721s2_linux" -TARGET_PRODUCT:j784s4 = "j784s4_linux" -TARGET_PRODUCT:am62xx = "am62_linux" -TARGET_PRODUCT:am62pxx = "am62p_linux" -TARGET_PRODUCT:j722s = "j722s_linux" -PVR_BUILD = "release" -PVR_WS = "lws-generic" - -EXTRA_OEMAKE += 'KERNELDIR="${STAGING_KERNEL_DIR}" BUILD=${PVR_BUILD} PVR_BUILD_DIR=${TARGET_PRODUCT} WINDOW_SYSTEM=${PVR_WS}' - -do_install() { - make -C ${STAGING_KERNEL_DIR} M=${B}/binary_${TARGET_PRODUCT}_${PVR_WS}_${PVR_BUILD}/target_aarch64/kbuild INSTALL_MOD_PATH=${D}${root_prefix} PREFIX=${STAGING_DIR_HOST} modules_install -} - -RRECOMMENDS:${PN} += "ti-img-rogue-umlibs"
meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2023.04.bb deleted +0 -9
@@ -1,9 +0,0 @@ -require u-boot-ti.inc - -include ${@ 'recipes-bsp/u-boot/ti-extras.inc' if d.getVar('TI_EXTRAS') else ''} - -PR = "r0" - -BRANCH = "ti-u-boot-2023.04" - -SRCREV = "0893e693e08f9fc864a6191051dccc818accf933"
meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-22.3.5/0001-fix-gallivm-fix-LLVM-include-of-Host-h-moved-to-TargetParser.patch deleted +0 -64
64 lines not on this page · raw message
meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-22.3.5/0001-gallium-Fix-build-with-llvm-18-and-19.patch deleted +0 -52
52 lines not on this page · raw message
meta-ti-bsp/recipes-graphics/mesa/mesa-pvr_22.3.5.bb deleted +0 -62
62 lines not on this page · raw message
meta-ti-bsp/recipes-graphics/powervr-umlibs/ti-img-rogue-umlibs_23.3.6512818.bb deleted +0 -147
147 lines not on this page · raw message
meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.1/defconfig deleted +0 -2
@@ -1,2 +0,0 @@ -use-kernel-config=multi_v7_defconfig -config-fragment=kernel/configs/ti_multi_v7_prune.config
meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.1/k3/defconfig deleted +0 -2
@@ -1,2 +0,0 @@ -use-kernel-config=defconfig -config-fragment=kernel/configs/ti_arm64_prune.config
meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.1/omapl138/defconfig deleted +0 -1
@@ -1 +0,0 @@ -use-kernel-config=davinci_all_defconfig
meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.1/ti33x/defconfig deleted +0 -2
@@ -1,2 +0,0 @@ -use-kernel-config=multi_v7_defconfig -config-fragment=kernel/configs/ti_multi_v7_prune.config kernel/configs/no_smp.config
meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.1/ti43x/defconfig deleted +0 -2
@@ -1,2 +0,0 @@ -use-kernel-config=multi_v7_defconfig -config-fragment=kernel/configs/ti_multi_v7_prune.config kernel/configs/no_smp.config
meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.1/defconfig deleted +0 -2
@@ -1,2 +0,0 @@ -use-kernel-config=multi_v7_defconfig -config-fragment=kernel/configs/ti_multi_v7_prune.config kernel/configs/ti_rt.config
meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.1/k3/defconfig deleted +0 -2
@@ -1,2 +0,0 @@ -use-kernel-config=defconfig -config-fragment=kernel/configs/ti_arm64_prune.config kernel/configs/ti_rt.config
meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.1/omapl138/defconfig deleted +0 -2
@@ -1,2 +0,0 @@ -use-kernel-config=davinci_all_defconfig -config-fragment=kernel/configs/ti_rt.config
meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.1/ti33x/defconfig deleted +0 -2
@@ -1,2 +0,0 @@ -use-kernel-config=multi_v7_defconfig -config-fragment=kernel/configs/ti_multi_v7_prune.config kernel/configs/ti_rt.config kernel/configs/no_smp.config
meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.1/ti43x/defconfig deleted +0 -2
@@ -1,2 +0,0 @@ -use-kernel-config=multi_v7_defconfig -config-fragment=kernel/configs/ti_multi_v7_prune.config kernel/configs/ti_rt.config kernel/configs/no_smp.config
meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_6.1.bb deleted +0 -15
@@ -1,15 +0,0 @@ -require linux-ti-staging_6.1.bb - -KERNEL_LOCALVERSION:append = "-rt" - -# Look in the generic major.minor directory for files -# This will have priority over generic non-rt path -FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-6.1:" - -BRANCH = "ti-rt-linux-6.1.y" - -SRCREV = "194ebd939bee3ffff36de9cf8dff28a77c671f5b" - -include ${@ 'recipes-kernel/linux/ti-extras-rt.inc' if d.getVar('TI_EXTRAS') else ''} - -PV = "6.1.112+git"
meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.1.bb deleted +0 -33
@@ -1,33 +0,0 @@ -SECTION = "kernel" -SUMMARY = "Linux kernel for TI devices" -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" - -inherit ti-secdev -inherit kernel - -require recipes-kernel/linux/setup-defconfig.inc -require recipes-kernel/linux/ti-kernel.inc -include ${@ 'recipes-kernel/linux/ti-kernel-devicetree-prefix.inc' if d.getVar('KERNEL_DEVICETREE_PREFIX') else ''} -include ${@ 'recipes-kernel/linux/ti-extras.inc' if d.getVar('TI_EXTRAS') else ''} - -DEPENDS += "gmp-native libmpc-native" - -# Look in the generic major.minor directory for files -FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-6.1:" - -KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT} \ - ${EXTRA_DTC_ARGS}" - -S = "${WORKDIR}/git" - -BRANCH ?= "ti-linux-6.1.y" - -SRCREV ?= "4ef41ca7ad952c7b13b7e40808ab1025796f9a6c" -PV = "6.1.112+git" - -# Special configuration for remoteproc/rpmsg IPC modules -module_conf_rpmsg_client_sample = "blacklist rpmsg_client_sample" -module_conf_ti_k3_r5_remoteproc = "softdep ti_k3_r5_remoteproc pre: virtio_rpmsg_bus" -module_conf_ti_k3_dsp_remoteproc = "softdep ti_k3_dsp_remoteproc pre: virtio_rpmsg_bus" -KERNEL_MODULE_PROBECONF += "rpmsg_client_sample ti_k3_r5_remoteproc ti_k3_dsp_remoteproc"
Signature · 1 line
2.17.1