1
0
mirror of https://git.yoctoproject.org/meta-ti synced 2026-06-01 16:30:45 +00:00

beagle-bsp, linux-bb.org, u-boot-bb.org: add support for 6.6 BSP

Most Beagle platforms are switching to 6.6 based Linux kernel and U-boot
2024.10. Add corresponding recipes and extend beagle-bsp with required
settings.

BeagleY-AI for now remains on 6.1 BSP with U-boot 2023.04.

Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
This commit is contained in:
Denys Dmytriyenko
2024-12-13 18:32:02 -05:00
committed by Ryan Eatmon
parent 80c9829297
commit e7d80bc915
12 changed files with 180 additions and 31 deletions
+1 -1
View File
@@ -7,7 +7,7 @@ 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 = ""
DT_VENDOR_PREFIX:bsp-bb_org-6_1 = ""
KERNEL_DEVICETREE_PREFIX = " \
${DT_VENDOR_PREFIX}am57xx-beagle-x15 \
@@ -15,8 +15,10 @@ UBOOT_BINARY = "tiboot3.${UBOOT_SUFFIX}"
UBOOT_IMAGE = "tiboot3-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}"
UBOOT_SYMLINK = "tiboot3-${MAINMACHINE}.${UBOOT_SUFFIX}"
UBOOT_MACHINE = "j721e_evm_r5_defconfig"
UBOOT_MACHINE:bsp-ti-6_6 = "j721e_beagleboneai64_r5_defconfig"
UBOOT_MACHINE = "j721e_beagleboneai64_r5_defconfig"
UBOOT_CONFIG_FRAGMENTS:bsp-bb_org = "j721e_beagleboneai64_r5.config"
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"
+13 -6
View File
@@ -5,18 +5,25 @@
require conf/machine/include/j721e.inc
require conf/machine/include/beagle-bsp.inc
IMAGE_SR1_1_HS_FS_FILES:bsp-bb_org = ""
IMAGE_SR2_HS_SE_FILES:bsp-bb_org = ""
IMAGE_SR1_1_HS_FS_FILES = ""
IMAGE_SR1_1_HS_SE_FILES = ""
IMAGE_SR2_HS_FS_FILES = ""
IMAGE_SR2_HS_SE_FILES = ""
UBOOT_MACHINE = "j721e_evm_a72_config"
UBOOT_MACHINE:bsp-ti-6_6 = "j721e_beagleboneai64_a72_defconfig"
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_CONFIG_FRAGMENTS:bsp-bb_org = "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:bsp-ti-6_6 = "tispl.bin_unsigned"
SPL_BINARYNAME:bsp-ti-6_6 = "tispl.bin"
SPL_BINARY:bsp-bb_org-6_6 = "tispl.bin_unsigned"
SPL_BINARYNAME:bsp-bb_org-6_6 = "tispl.bin"
KERNEL_DEVICETREE_PREFIX = " \
ti/k3-j721e \
"
@@ -29,7 +36,7 @@ ti/k3-j721e-evm-quad-port-eth-exp.dtbo \
ti/k3-j721e-sk.dtb \
"
KERNEL_DEVICETREE:append:bsp-bb_org = " \
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 \
+1 -1
View File
@@ -7,7 +7,7 @@ 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 = ""
DT_VENDOR_PREFIX:bsp-bb_org-6_1 = ""
KERNEL_DEVICETREE_PREFIX = " \
${DT_VENDOR_PREFIX}am335x-bone \
@@ -3,6 +3,9 @@
#@DESCRIPTION: Machine configuration for the BeaglePlay (R5F core)
require conf/machine/beagleplay-ti-k3r5.conf
require conf/machine/include/beagle-bsp.inc
UBOOT_CONFIG_FRAGMENTS:bsp-bb_org = "am625_beagleplay_r5.config"
UBOOT_MACHINE:bsp-bb_org-6_6 = "am62x_beagleplay_r5_defconfig"
UBOOT_CONFIG_FRAGMENTS:bsp-bb_org-6_1 = "am625_beagleplay_r5.config"
+35 -2
View File
@@ -3,11 +3,17 @@
#@DESCRIPTION: Machine configuration for the BeaglePlay board (A53 core)
require conf/machine/beagleplay-ti.conf
require conf/machine/include/beagle-bsp.inc
UBOOT_CONFIG_FRAGMENTS:bsp-bb_org = "am625_beagleplay_a53.config"
UBOOT_MACHINE:bsp-bb_org-6_6 = "am62x_beagleplay_a53_defconfig"
KERNEL_DEVICETREE:append:bsp-bb_org = " \
UBOOT_CONFIG_FRAGMENTS:bsp-bb_org-6_1 = "am625_beagleplay_a53.config"
SPL_BINARY:bsp-bb_org-6_6 = "tispl.bin_unsigned"
SPL_BINARYNAME:bsp-bb_org-6_6 = "tispl.bin"
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 \
@@ -43,3 +49,30 @@ 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 \
ti/k3-am625-beagleplay.dtb \
ti/k3-am625-beagleplay-lincolntech-lcd185-panel.dtbo \
ti/k3-am625-minimal.dtb \
ti/k3-am625-sk.dtb \
ti/k3-am625-sk-ecap-capture.dtbo \
ti/k3-am625-sk-lincolntech-lcd185-panel.dtbo \
ti/k3-am625-sk-m2-cc3301.dtbo \
ti/k3-am625-sk-mcspi-loopback.dtbo \
ti/k3-am625-sk-microtips-mf101hie-panel.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-dmtimer-pwm.dtbo \
ti/k3-am62x-sk-eqep.dtbo \
ti/k3-am62x-sk-fastboot-disable-hdmi.dtbo \
ti/k3-am62x-sk-hdmi-audio.dtbo \
ti/k3-am62x-sk-lpm-wkup-sources.dtbo \
ti/k3-am62x-sk-mcan.dtbo \
ti/k3-am62x-sk-microtips-mf103hie-lcd2.dtbo \
ti/k3-am62x-sk-pwm.dtbo \
"
@@ -3,6 +3,8 @@
#@DESCRIPTION: Machine configuration for the BeagleY AI (R5F core)
require conf/machine/include/k3r5.inc
TI_PREFERRED_BSP ?= "bb_org-6_1"
require conf/machine/include/beagle-bsp.inc
SYSFW_SOC = "j722s"
@@ -11,4 +13,4 @@ SYSFW_SUFFIX = "hs-fs"
UBOOT_MACHINE = "j722s_evm_r5_defconfig"
UBOOT_CONFIG_FRAGMENTS:bsp-bb_org = "am67a_beagley_ai_r5.config"
UBOOT_CONFIG_FRAGMENTS:bsp-bb_org-6_1 = "am67a_beagley_ai_r5.config"
+4 -2
View File
@@ -3,11 +3,13 @@
#@DESCRIPTION: Machine configuration for the BeagleY AI board (A53 core)
require conf/machine/include/j722s.inc
TI_PREFERRED_BSP ?= "bb_org-6_1"
require conf/machine/include/beagle-bsp.inc
UBOOT_MACHINE = "j722s_evm_a53_config"
UBOOT_CONFIG_FRAGMENTS:bsp-bb_org = "am67a_beagley_ai_a53.config"
UBOOT_CONFIG_FRAGMENTS:bsp-bb_org-6_1 = "am67a_beagley_ai_a53.config"
KERNEL_DEVICETREE_PREFIX = " \
ti/k3-j722s \
@@ -15,7 +17,7 @@ KERNEL_DEVICETREE_PREFIX = " \
KERNEL_DEVICETREE = ""
KERNEL_DEVICETREE:append:bsp-bb_org = " \
KERNEL_DEVICETREE:append:bsp-bb_org-6_1 = " \
ti/k3-j722s-evm.dtb \
ti/k3-am67a-beagley-ai.dtb \
"
+33 -14
View File
@@ -1,24 +1,43 @@
# Use meta-ti-bsp "multi-BSP" facility to create a custom "bb_org" BSP profile
# with default preferences for Beagle platforms
# Default is bb_org, but can override with any of the existing options
TI_PREFERRED_BSP ?= "bb_org"
# Default is bb_org-6_6, but can override with any of the existing options
TI_PREFERRED_BSP ?= "bb_org-6_6"
# ==========
# bb_org
# 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 = "linux-bb.org"
BSP_KERNEL_VERSION:bsp-bb_org = "%"
BSP_BOOTLOADER_PROVIDER:bsp-bb_org = "u-boot-bb.org"
BSP_BOOTLOADER_VERSION:bsp-bb_org = "%"
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.%"
BSP_SGX_DRIVER_PROVIDER:bsp-bb_org = "ti-sgx-ddk-km"
BSP_SGX_DRIVER_VERSION:bsp-bb_org = "1.17%"
BSP_SGX_UMLIBS_VERSION:bsp-bb_org = "1.17%"
BSP_ROGUE_DRIVER_PROVIDER:bsp-bb_org = "ti-img-rogue-driver"
BSP_ROGUE_DRIVER_VERSION:bsp-bb_org = "23%"
BSP_ROGUE_UMLIBS_VERSION:bsp-bb_org = "23%"
BSP_MESA_PVR_VERSION:bsp-bb_org = "22%"
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%"
# ==========
# bb_org-6_6
# BeagleBoard.org kernel 6.6, Upstream u-boot 2024.07
# 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_6 = "linux-bb.org"
BSP_KERNEL_VERSION:bsp-bb_org-6_6 = "6.6.%"
BSP_BOOTLOADER_PROVIDER:bsp-bb_org-6_6 = "u-boot-bb.org"
BSP_BOOTLOADER_VERSION:bsp-bb_org-6_6 = "2024.%"
BSP_SGX_DRIVER_PROVIDER:bsp-bb_org-6_6 = "ti-sgx-ddk-km"
BSP_SGX_DRIVER_VERSION:bsp-bb_org-6_6 = "1.17%"
BSP_SGX_UMLIBS_VERSION:bsp-bb_org-6_6 = "1.17%"
BSP_ROGUE_DRIVER_PROVIDER:bsp-bb_org-6_6 = "ti-img-rogue-driver"
BSP_ROGUE_DRIVER_VERSION:bsp-bb_org-6_6 = "24%"
BSP_ROGUE_UMLIBS_VERSION:bsp-bb_org-6_6 = "24%"
BSP_MESA_PVR_VERSION:bsp-bb_org-6_6 = "23%"