mirror of
https://git.yoctoproject.org/meta-ti
synced 2026-05-06 19:39:17 +00:00
meta-ti: Remove bsp-ti-6_1 and bsp-bb_org-6_1 support
Remove support for the v6.1 TI and Beagle BSPs. This was originally split into meta-ti-bsp and meta-beagle changes, but there are some hidden interdependencies that made that more painful than needed. Remove v6.1 support from both BSP layers here. This includes packages specific to those BSPs: - TI and BB.org v6.1 Linux kernel - TI and BB.org 2023.04 U-Boot - Rogue GPU driver 23.3 and Mesa 22.3.5 Signed-off-by: Andrew Davis <afd@ti.com> Signed-off-by: Ryan Eatmon <reatmon@ti.com> Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
This commit is contained in:
committed by
Ryan Eatmon
parent
2faac12f96
commit
041f99a2da
@@ -6,8 +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 = " \
|
||||
${DT_VENDOR_PREFIX}am57xx-beagle-x15 \
|
||||
|
||||
@@ -16,9 +16,3 @@ UBOOT_IMAGE = "tiboot3-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}"
|
||||
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"
|
||||
|
||||
@@ -12,12 +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"
|
||||
|
||||
SPL_BINARY = "tispl.bin_unsigned"
|
||||
|
||||
KERNEL_DEVICETREE_PREFIX = " \
|
||||
@@ -32,23 +26,9 @@ ti/k3-j721e-evm-quad-port-eth-exp.dtbo \
|
||||
ti/k3-j721e-sk.dtb \
|
||||
"
|
||||
|
||||
KERNEL_DEVICETREE:append:bsp-bb_org-6_1 = " \
|
||||
ti/k3-j721e-beagleboneai64-dsi-rpi-7inch-panel.dtbo \
|
||||
ti/k3-j721e-common-proc-board-infotainment.dtbo \
|
||||
ti/k3-j721e-evm-csi2-ov5640.dtbo \
|
||||
ti/k3-j721e-evm-fusion.dtbo \
|
||||
ti/k3-j721e-evm-pcie0-ep.dtbo \
|
||||
ti/k3-j721e-evm-virt-mac-client.dtbo \
|
||||
ti/k3-j721e-sk-csi2-ov5640.dtbo \
|
||||
ti/k3-j721e-sk-csi2-rpi-imx219.dtbo \
|
||||
ti/k3-j721e-sk-fusion.dtbo \
|
||||
ti/k3-j721e-sk-rpi-hdr-ehrpwm.dtbo \
|
||||
"
|
||||
|
||||
MACHINE_GUI_CLASS = "bigscreen"
|
||||
|
||||
# TI has moved a driver out of its kernel tree and into an out of tree module.
|
||||
# We need to not include that for older kernels since the module is still in
|
||||
# the kernel.
|
||||
TI_VXE_VXD_DRIVER:bsp-bb_org-6_6 = ""
|
||||
TI_VXE_VXD_DRIVER:bsp-bb_org-6_1 = ""
|
||||
|
||||
@@ -6,8 +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 = " \
|
||||
${DT_VENDOR_PREFIX}am335x-bone \
|
||||
|
||||
@@ -5,7 +5,3 @@
|
||||
require conf/machine/beagleplay-ti-k3r5.conf
|
||||
|
||||
require conf/machine/include/beagle-bsp.inc
|
||||
|
||||
UBOOT_MACHINE:bsp-bb_org-6_1 = "am62x_evm_r5_defconfig"
|
||||
|
||||
UBOOT_CONFIG_FRAGMENTS:bsp-bb_org-6_1 = "am625_beagleplay_r5.config"
|
||||
|
||||
@@ -6,47 +6,6 @@ require conf/machine/beagleplay-ti.conf
|
||||
|
||||
require conf/machine/include/beagle-bsp.inc
|
||||
|
||||
UBOOT_MACHINE:bsp-bb_org-6_1 = "am62x_evm_a53_defconfig"
|
||||
|
||||
UBOOT_CONFIG_FRAGMENTS:bsp-bb_org-6_1 = "am625_beagleplay_a53.config"
|
||||
|
||||
KERNEL_DEVICETREE:append:bsp-bb_org-6_1 = " \
|
||||
ti/k3-am625-beagleplay-csi2-ov5640.dtbo \
|
||||
ti/k3-am625-beagleplay-csi2-tevi-ov5640.dtbo \
|
||||
ti/k3-am625-beagleplay-lincolntech-lcd185-panel.dtbo \
|
||||
ti/k3-am625-beaglemod.dtb \
|
||||
ti/k3-am625-beaglemod-audio.dtbo \
|
||||
ti/k3-am625-beaglemod-can0.dtbo \
|
||||
ti/k3-am625-beaglemod-can1.dtbo \
|
||||
ti/k3-am625-beaglemod-csi0-ov5640.dtbo \
|
||||
ti/k3-am625-beaglemod-eeprom.dtbo \
|
||||
ti/k3-am625-beaglemod-eth.dtbo \
|
||||
ti/k3-am625-beaglemod-hdmi.dtbo \
|
||||
ti/k3-am625-beaglemod-io-expand.dtbo \
|
||||
ti/k3-am625-beaglemod-lt-lcd185.dtbo \
|
||||
ti/k3-am625-beaglemod-ospi-flash.dtbo \
|
||||
ti/k3-am625-beaglemod-rs485-1.dtbo \
|
||||
ti/k3-am625-beaglemod-rs485-2.dtbo \
|
||||
ti/k3-am625-beaglemod-rtc.dtbo \
|
||||
ti/k3-am625-beaglemod-wl1835.dtbo \
|
||||
ti/k3-am625-sk-dmtimer-pwm.dtbo \
|
||||
ti/k3-am625-sk-ecap-capture.dtbo \
|
||||
ti/k3-am625-sk-lincolntech-lcd185-panel.dtbo \
|
||||
ti/k3-am625-sk-mcspi-loopback.dtbo \
|
||||
ti/k3-am625-sk-microtips-mf101hie-panel.dtbo \
|
||||
ti/k3-am625-sk-microtips-mf103hie-lcd2.dtbo \
|
||||
ti/k3-am625-sk-pwm.dtbo \
|
||||
ti/k3-am625-sk-rpi-hdr-ehrpwm.dtbo \
|
||||
ti/k3-am62x-sk-csi2-imx219.dtbo \
|
||||
ti/k3-am62x-sk-csi2-ov5640.dtbo \
|
||||
ti/k3-am62x-sk-csi2-tevi-ov5640.dtbo \
|
||||
ti/k3-am62x-sk-csi2-v3link-fusion.dtbo \
|
||||
ti/k3-am62x-sk-eqep.dtbo \
|
||||
ti/k3-am62x-sk-hdmi-disable-fastboot.dtbo \
|
||||
ti/k3-am62x-sk-lpm-wkup-sources.dtbo \
|
||||
ti/k3-am62x-sk-mcan.dtbo \
|
||||
"
|
||||
|
||||
KERNEL_DEVICETREE:append:bsp-bb_org-6_6 = " \
|
||||
ti/k3-am625-beagleplay-csi2-ov5640.dtbo \
|
||||
ti/k3-am625-beagleplay-csi2-tevi-ov5640.dtbo \
|
||||
|
||||
@@ -11,5 +11,3 @@ SYSFW_SUFFIX = "hs-fs"
|
||||
|
||||
UBOOT_MACHINE = "j722s_evm_r5_defconfig"
|
||||
UBOOT_MACHINE:bsp-bb_org-6_12 = "am67a_beagley_ai_r5_defconfig"
|
||||
|
||||
UBOOT_CONFIG_FRAGMENTS:bsp-bb_org-6_1 = "am67a_beagley_ai_r5.config"
|
||||
|
||||
@@ -8,19 +8,12 @@ require conf/machine/include/beagle-bsp.inc
|
||||
UBOOT_MACHINE = "j722s_evm_a53_config"
|
||||
UBOOT_MACHINE:bsp-bb_org-6_12 = "am67a_beagley_ai_a53_defconfig"
|
||||
|
||||
UBOOT_CONFIG_FRAGMENTS:bsp-bb_org-6_1 = "am67a_beagley_ai_a53.config"
|
||||
|
||||
KERNEL_DEVICETREE_PREFIX = " \
|
||||
ti/k3-j722s \
|
||||
"
|
||||
|
||||
KERNEL_DEVICETREE = ""
|
||||
|
||||
KERNEL_DEVICETREE:append:bsp-bb_org-6_1 = " \
|
||||
ti/k3-j722s-evm.dtb \
|
||||
ti/k3-am67a-beagley-ai.dtb \
|
||||
"
|
||||
|
||||
KERNEL_DEVICETREE:append:bsp-bb_org-6_12 = " \
|
||||
ti/k3-j722s-evm.dtb \
|
||||
ti/k3-am67a-beagley-ai.dtb \
|
||||
|
||||
@@ -49,26 +49,3 @@ BSP_MESA_PVR_VERSION:bsp-bb_org-6_6 = "24%"
|
||||
|
||||
# GC320 support requires out-of-tree drivers not yet available in bb.org 6.6
|
||||
MACHINE_FEATURES:remove:bsp-bb_org-6_6 = "gc320"
|
||||
|
||||
# ==========
|
||||
# bb_org-6_1
|
||||
# BeagleBoard.org kernel 6.1, u-boot 2023.04
|
||||
# based on TI staging trees with extra Beagle-specific features
|
||||
# but may not be up-to-date with TI version
|
||||
# ==========
|
||||
BSP_KERNEL_PROVIDER:bsp-bb_org-6_1 = "linux-bb.org"
|
||||
BSP_KERNEL_VERSION:bsp-bb_org-6_1 = "6.1.%"
|
||||
BSP_BOOTLOADER_PROVIDER:bsp-bb_org-6_1 = "u-boot-bb.org"
|
||||
BSP_BOOTLOADER_VERSION:bsp-bb_org-6_1 = "2023.%"
|
||||
KERNEL_DEVICETREE_PREFIX:bsp-bb_org-6_1 = ""
|
||||
|
||||
BSP_SGX_DRIVER_PROVIDER:bsp-bb_org-6_1 = "ti-sgx-ddk-km"
|
||||
BSP_SGX_DRIVER_VERSION:bsp-bb_org-6_1 = "1.17%"
|
||||
BSP_SGX_UMLIBS_VERSION:bsp-bb_org-6_1 = "1.17%"
|
||||
BSP_ROGUE_DRIVER_PROVIDER:bsp-bb_org-6_1 = "ti-img-rogue-driver"
|
||||
BSP_ROGUE_DRIVER_VERSION:bsp-bb_org-6_1 = "23%"
|
||||
BSP_ROGUE_UMLIBS_VERSION:bsp-bb_org-6_1 = "23%"
|
||||
BSP_MESA_PVR_VERSION:bsp-bb_org-6_1 = "22%"
|
||||
|
||||
# GC320 support requires out-of-tree drivers not yet available in bb.org 6.1
|
||||
MACHINE_FEATURES:remove:bsp-bb_org-6_1 = "gc320"
|
||||
|
||||
@@ -1,24 +0,0 @@
|
||||
require recipes-bsp/u-boot/u-boot-ti.inc
|
||||
|
||||
SUMMARY = "BeagleBoard.org U-Boot"
|
||||
|
||||
COMPATIBLE_MACHINE = "beagle.*"
|
||||
|
||||
PV = "2023.04"
|
||||
|
||||
SRC_URI += "file://0001-scripts-dtc-pylibfdt-libfdt.i_shipped-Use-SWIG_Appen.patch"
|
||||
|
||||
UBOOT_GIT_URI = "git://github.com/beagleboard/u-boot.git"
|
||||
UBOOT_GIT_PROTOCOL = "https"
|
||||
BRANCH = "v2023.04-ti-09.01.00.008"
|
||||
SRCREV = "b0d717b732ee28e446baf94522b3491e590f7fbb"
|
||||
|
||||
BRANCH:beagleplay = "v2023.04-ti-09.01.00.008-BeaglePlay"
|
||||
BRANCH:beagleplay-k3r5 = "v2023.04-ti-09.01.00.008-BeaglePlay"
|
||||
SRCREV:beagleplay = "43791d945f4e5c25bcc19b9c778e8f9d194dc16e"
|
||||
SRCREV:beagleplay-k3r5 = "43791d945f4e5c25bcc19b9c778e8f9d194dc16e"
|
||||
|
||||
BRANCH:beagley-ai = "v2023.04-ti-09.02.00.009-BeagleY-AI-Production"
|
||||
BRANCH:beagley-ai-k3r5 = "v2023.04-ti-09.02.00.009-BeagleY-AI-Production"
|
||||
SRCREV:beagley-ai = "93735daa6fe024304934d5a5e93ab05a06abf1a8"
|
||||
SRCREV:beagley-ai-k3r5 = "93735daa6fe024304934d5a5e93ab05a06abf1a8"
|
||||
@@ -1 +0,0 @@
|
||||
use-kernel-config=bb.org_defconfig
|
||||
@@ -1,70 +0,0 @@
|
||||
# Look in the generic major.minor directory for files
|
||||
FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-6.1:"
|
||||
|
||||
SECTION = "kernel"
|
||||
SUMMARY = "BeagleBoard.org Linux kernel"
|
||||
LICENSE = "GPL-2.0-only"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
|
||||
|
||||
COMPATIBLE_MACHINE = "beagle.*"
|
||||
|
||||
inherit kernel
|
||||
|
||||
require recipes-kernel/linux/setup-defconfig.inc
|
||||
require recipes-kernel/linux/ti-kernel.inc
|
||||
|
||||
DEPENDS += "gmp-native libmpc-native"
|
||||
|
||||
KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT} ${EXTRA_DTC_ARGS}"
|
||||
|
||||
# Extra DT overlays/capes
|
||||
KERNEL_DEVICETREE:append:armv7a = " \
|
||||
AM335X-PRU-UIO-00A0.dtbo \
|
||||
BB-ADC-00A0.dtbo \
|
||||
BB-BBBW-WL1835-00A0.dtbo \
|
||||
BB-BBGG-WL1835-00A0.dtbo \
|
||||
BB-BBGW-WL1835-00A0.dtbo \
|
||||
BB-BONE-4D5R-01-00A1.dtbo \
|
||||
BB-BONE-eMMC1-01-00A0.dtbo \
|
||||
BB-BONE-LCD4-01-00A1.dtbo \
|
||||
BB-BONE-NH7C-01-A0.dtbo \
|
||||
BB-CAPE-DISP-CT4-00A0.dtbo \
|
||||
BB-HDMI-TDA998x-00A0.dtbo \
|
||||
BB-I2C1-MCP7940X-00A0.dtbo \
|
||||
BB-I2C1-RTC-DS3231.dtbo \
|
||||
BB-I2C1-RTC-PCF8563.dtbo \
|
||||
BB-I2C2-BME680.dtbo \
|
||||
BB-I2C2-MPU6050.dtbo \
|
||||
BB-LCD-ADAFRUIT-24-SPI1-00A0.dtbo \
|
||||
BB-NHDMI-TDA998x-00A0.dtbo \
|
||||
BBORG_COMMS-00A2.dtbo \
|
||||
BBORG_FAN-A000.dtbo \
|
||||
BBORG_RELAY-00A2.dtbo \
|
||||
BB-SPIDEV0-00A0.dtbo \
|
||||
BB-SPIDEV1-00A0.dtbo \
|
||||
BB-UART1-00A0.dtbo \
|
||||
BB-UART2-00A0.dtbo \
|
||||
BB-UART4-00A0.dtbo \
|
||||
BB-W1-P9.12-00A0.dtbo \
|
||||
BONE-ADC.dtbo \
|
||||
M-BB-BBG-00A0.dtbo \
|
||||
M-BB-BBGG-00A0.dtbo \
|
||||
PB-MIKROBUS-0.dtbo \
|
||||
PB-MIKROBUS-1.dtbo \
|
||||
"
|
||||
|
||||
S = "${UNPACKDIR}/${BB_GIT_DEFAULT_DESTSUFFIX}"
|
||||
|
||||
# 6.1.83 version for 32-bit
|
||||
SRCREV:armv7a = "be9b910b08dfd674e47a2643f35080b005ac3792"
|
||||
PV:armv7a = "6.1.83+git"
|
||||
BRANCH:armv7a = "v6.1.83-ti-r35"
|
||||
|
||||
# 6.1.83 version for 64-bit
|
||||
SRCREV:aarch64 = "135558243d5a98ed39812b797d2ba6295ef3b86a"
|
||||
PV:aarch64 = "6.1.83+git"
|
||||
BRANCH:aarch64 = "v6.1.83-ti-arm64-r64"
|
||||
|
||||
KERNEL_GIT_URI = "git://github.com/beagleboard/linux.git"
|
||||
|
||||
INSANE_SKIP:kernel-modules += "debug-deps"
|
||||
Reference in New Issue
Block a user