conf/machine, ti-bsp: add support for multiple BSP providers
PATCH v2 1/4 conf/machine, ti-bsp: add support for multiple BSP providers
From: Denys Dmytriyenko <[email protected]>
This adds a facility to define multiple supported BSPs with their own preferences for individual components, as well as lets machine configs specify conditional configurations for different BSPs.
---
v2 - rename TI_DEFAULT_BSP to TI_PREFERRED_BSP
meta-ti-bsp/conf/machine/beagleplay-k3r5.conf | 3 - meta-ti-bsp/conf/machine/beagleplay.conf | 5 +- meta-ti-bsp/conf/machine/include/am62pxx.inc | 2 +- meta-ti-bsp/conf/machine/include/am62xx.inc | 2 +- meta-ti-bsp/conf/machine/include/am65xx.inc | 2 +- meta-ti-bsp/conf/machine/include/am68.inc | 2 +- meta-ti-bsp/conf/machine/include/am69.inc | 2 +- meta-ti-bsp/conf/machine/include/beagle.inc | 4 +- meta-ti-bsp/conf/machine/include/j721e.inc | 2 +- meta-ti-bsp/conf/machine/include/j721s2.inc | 2 +- meta-ti-bsp/conf/machine/include/j722s.inc | 2 +- meta-ti-bsp/conf/machine/include/j784s4.inc | 2 +- meta-ti-bsp/conf/machine/include/k3.inc | 4 +- meta-ti-bsp/conf/machine/include/k3r5.inc | 4 +- meta-ti-bsp/conf/machine/include/omap-a15.inc | 6 +- meta-ti-bsp/conf/machine/include/omapl138.inc | 4 +- meta-ti-bsp/conf/machine/include/ti-bsp.inc | 109 ++++++++++++++++++ meta-ti-bsp/conf/machine/include/ti-soc.inc | 3 +- meta-ti-bsp/conf/machine/include/ti33x.inc | 7 +- meta-ti-bsp/conf/machine/include/ti43x.inc | 7 +- 20 files changed, 131 insertions(+), 43 deletions(-) create mode 100644 meta-ti-bsp/conf/machine/include/ti-bsp.inc
meta-ti-bsp/conf/machine/beagleplay-k3r5.conf +0 -3
@@ -4,9 +4,6 @@ require conf/machine/include/k3r5.inc -PREFERRED_PROVIDER_virtual/bootloader = "u-boot-bb.org" -PREFERRED_PROVIDER_u-boot = "u-boot-bb.org" - SYSFW_SOC = "am62x" SYSFW_CONFIG = "evm" SYSFW_SUFFIX = "gp"
meta-ti-bsp/conf/machine/beagleplay.conf +1 -4
@@ -11,7 +11,7 @@ MACHINE_FEATURES += "screen gpu" SERIAL_CONSOLES = "115200;ttyS2" require conf/machine/include/mesa-pvr.inc -PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver" +PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}" TFA_BOARD = "lite" TFA_K3_SYSTEM_SUSPEND = "1"
@@ -25,9 +25,6 @@ UBOOT_MACHINE = "am62x_evm_a53_defconfig" # under meta-ti-bsp/recipes-bsp/u-boot/ for more details. UBOOT_CONFIG_FRAGMENTS = "am625_beagleplay_a53.config" -PREFERRED_PROVIDER_virtual/bootloader = "u-boot-bb.org" -PREFERRED_PROVIDER_u-boot = "u-boot-bb.org" - KERNEL_DEVICETREE_PREFIX = " \ ti/k3-am625 \ ti/k3-am62x-sk \
meta-ti-bsp/conf/machine/include/am62pxx.inc +1 -1
@@ -4,7 +4,7 @@ SOC_FAMILY:append = ":am62pxx" MACHINE_FEATURES += "screen gpu" require conf/machine/include/mesa-pvr.inc -PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver" +PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}" # Default tiboot3.bin on AM62Px is for HS-FS IMAGE_BOOT_FILES += "tiboot3-am62px-hs-fs-evm.bin"
meta-ti-bsp/conf/machine/include/am62xx.inc +1 -1
@@ -4,7 +4,7 @@ SOC_FAMILY:append = ":am62xx" MACHINE_FEATURES += "screen gpu" require conf/machine/include/mesa-pvr.inc -PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver" +PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}" # Default tiboot3.bin on AM62x is for HS-FS IMAGE_BOOT_FILES += "tiboot3-am62x-hs-fs-evm.bin"
meta-ti-bsp/conf/machine/include/am65xx.inc +1 -1
@@ -4,7 +4,7 @@ SOC_FAMILY:append = ":am65xx" MACHINE_FEATURES += "screen touchscreen gpu" require conf/machine/include/mesa-pvr.inc -PREFERRED_PROVIDER_virtual/gpudriver ?= "" +PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_SGX_DRIVER_PROVIDER}" KERNEL_DEVICETREE_PREFIX = "ti/k3-am654"
meta-ti-bsp/conf/machine/include/am68.inc +1 -1
@@ -4,7 +4,7 @@ SOC_FAMILY:append = ":j721s2" MACHINE_FEATURES += "screen gpu" require conf/machine/include/mesa-pvr.inc -PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver" +PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}" # Default tiboot3.bin on AM68 is for SR1.0 HS-FS IMAGE_BOOT_FILES += "tiboot3-j721s2-hs-fs-evm.bin"
meta-ti-bsp/conf/machine/include/am69.inc +1 -1
@@ -4,7 +4,7 @@ SOC_FAMILY:append = ":j784s4" MACHINE_FEATURES += "screen gpu" require conf/machine/include/mesa-pvr.inc -PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver" +PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}" # Default tiboot3.bin on AM69 is for SR1.0 HS-FS IMAGE_BOOT_FILES += "tiboot3-j784s4-hs-fs-evm.bin"
meta-ti-bsp/conf/machine/include/beagle.inc +1 -3
@@ -1,3 +1 @@ - -PREFERRED_PROVIDER_virtual/kernel ?= "linux-bb.org" - +TI_PREFERRED_BSP ?= "bb_org"
meta-ti-bsp/conf/machine/include/j721e.inc +1 -1
@@ -4,7 +4,7 @@ SOC_FAMILY:append = ":j721e" MACHINE_FEATURES += "screen gpu" require conf/machine/include/mesa-pvr.inc -PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver" +PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}" IMAGE_BOOT_FILES += "sysfw.itb"
meta-ti-bsp/conf/machine/include/j721s2.inc +1 -1
@@ -4,7 +4,7 @@ SOC_FAMILY:append = ":j721s2" MACHINE_FEATURES += "screen gpu" require conf/machine/include/mesa-pvr.inc -PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver" +PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}" # Default tiboot3.bin on J721S2 is for GP IMAGE_BOOT_FILES += "tiboot3-j721s2-gp-evm.bin"
meta-ti-bsp/conf/machine/include/j722s.inc +1 -1
@@ -4,7 +4,7 @@ SOC_FAMILY:append = ":j722s" MACHINE_FEATURES += "screen gpu" require conf/machine/include/mesa-pvr.inc -PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver" +PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}" # Default tiboot3.bin on J722S is for HS-FS IMAGE_BOOT_FILES += "tiboot3-j722s-hs-fs-evm.bin"
meta-ti-bsp/conf/machine/include/j784s4.inc +1 -1
@@ -4,7 +4,7 @@ SOC_FAMILY:append = ":j784s4" MACHINE_FEATURES += "screen gpu" require conf/machine/include/mesa-pvr.inc -PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver" +PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}" # Default tiboot3.bin on J784S4 is for GP IMAGE_BOOT_FILES += "tiboot3-j784s4-gp-evm.bin"
meta-ti-bsp/conf/machine/include/k3.inc +1 -3
@@ -10,9 +10,7 @@ BBMULTICONFIG += "k3r5" # Increase this everytime you change something in the kernel MACHINE_KERNEL_PR = "r0" -PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging" -PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-ti-staging" -PREFERRED_PROVIDER_u-boot ?= "u-boot-ti-staging" +require conf/machine/include/ti-bsp.inc KERNEL_IMAGETYPE = "Image" KERNEL_IMAGETYPES = "Image fitImage"
meta-ti-bsp/conf/machine/include/k3r5.inc +2 -2
@@ -11,9 +11,9 @@ require conf/machine/include/arm/armv7a/tune-cortexa8.inc # https://git.ti.com/cgit/ti-u-boot/ti-u-boot/tree/doc/board/ti/j721e_evm.rst # https://git.ti.com/cgit/ti-u-boot/ti-u-boot/tree/doc/board/ti/am62x_sk.rst # https://git.ti.com/cgit/ti-u-boot/ti-u-boot/tree/doc/board/ti/k3.rst + +require conf/machine/include/ti-bsp.inc PREFERRED_PROVIDER_virtual/kernel = "linux-dummy" -PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-ti-staging" -PREFERRED_PROVIDER_u-boot ?= "u-boot-ti-staging" SPL_SUFFIX = "bin" SPL_BINARY = "tiboot3-${SYSFW_SOC}-${SYSFW_SUFFIX}-${SYSFW_CONFIG}.${SPL_SUFFIX}"
meta-ti-bsp/conf/machine/include/omap-a15.inc +2 -4
@@ -7,13 +7,11 @@ require conf/machine/include/arm/armv7a/tune-cortexa15.inc # Increase this everytime you change something in the kernel MACHINE_KERNEL_PR = "r7" -PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging" -PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-ti-staging" -PREFERRED_PROVIDER_u-boot ?= "u-boot-ti-staging" +require conf/machine/include/ti-bsp.inc # Graphics providers and variables require conf/machine/include/mesa-pvr.inc -PREFERRED_PROVIDER_virtual/gpudriver ?= "" +PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_SGX_DRIVER_PROVIDER}" PVR_DISPLAY_CONTROLLER_ALIAS ?= "omapdrm" KERNEL_IMAGETYPE = "zImage"
meta-ti-bsp/conf/machine/include/omapl138.inc +1 -3
@@ -5,9 +5,7 @@ require conf/machine/include/arm/armv5/tune-arm926ejs.inc KERNEL_IMAGETYPE = "zImage" -PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging" -PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging" -PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging" +require conf/machine/include/ti-bsp.inc EXTRA_IMAGEDEPENDS += "virtual/bootloader"
meta-ti-bsp/conf/machine/include/ti-bsp.inc new file +109 -0
109 lines not on this page · raw message
meta-ti-bsp/conf/machine/include/ti-soc.inc +1 -2
@@ -1,9 +1,8 @@ # This is a generic TI SOC family. It is a superset of all other SOCs # and platforms defined in meta-ti to allow BSP-level overrides. SOC_FAMILY = "ti-soc" +require conf/machine/include/soc-family.inc # TI platforms all use devicetrees with overlays MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-devicetree" KERNEL_DTB_OVERLAY_SUPPORT ?= "1" - -require conf/machine/include/soc-family.inc
meta-ti-bsp/conf/machine/include/ti33x.inc +2 -5
@@ -7,14 +7,11 @@ require conf/machine/include/arm/armv7a/tune-cortexa8.inc # Increase this everytime you change something in the kernel MACHINE_KERNEL_PR = "r22" -# Default providers, may need to override for specific machines -PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging" -PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-ti-staging" -PREFERRED_PROVIDER_u-boot ?= "u-boot-ti-staging" +require conf/machine/include/ti-bsp.inc # Graphics providers and variables require conf/machine/include/mesa-pvr.inc -PREFERRED_PROVIDER_virtual/gpudriver ?= "" +PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_SGX_DRIVER_PROVIDER}" PVR_DISPLAY_CONTROLLER_ALIAS ?= "tilcdc" KERNEL_IMAGETYPE = "zImage"
meta-ti-bsp/conf/machine/include/ti43x.inc +2 -5
@@ -7,14 +7,11 @@ require conf/machine/include/arm/armv7a/tune-cortexa9.inc # Increase this everytime you change something in the kernel MACHINE_KERNEL_PR = "r3" -# Default providers, may need to override for specific machines -PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging" -PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-ti-staging" -PREFERRED_PROVIDER_u-boot ?= "u-boot-ti-staging" +require conf/machine/include/ti-bsp.inc # Graphics providers and variables require conf/machine/include/mesa-pvr.inc -PREFERRED_PROVIDER_virtual/gpudriver ?= "" +PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_SGX_DRIVER_PROVIDER}" PVR_DISPLAY_CONTROLLER_ALIAS ?= "omapdrm" KERNEL_IMAGETYPE = "zImage"
Signature · 1 line
2.25.1
PATCH 2/4 conf/machine/j721e: some BSPs don't support all SR and HS variants
From: Denys Dmytriyenko <[email protected]>
Adjust IMAGE_BOOT_FILES list as some BSPs do not support all combinations of SR1.1, SR2.0, HS-FS and HS-SE variants.
--- meta-ti-bsp/conf/machine/include/j721e.inc | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-)
meta-ti-bsp/conf/machine/include/j721e.inc +10 -8
@@ -13,20 +13,22 @@ IMAGE_BOOT_FILES += "tiboot3-j721e-gp-evm.bin" IMAGE_BOOT_FILES += "sysfw-j721e-gp-evm.itb" # Since default on J721e is for GP, add a version for SR1.1 HS-FS -IMAGE_BOOT_FILES += "tiboot3-j721e_sr1_1-hs-fs-evm.bin" -IMAGE_BOOT_FILES += "sysfw-j721e_sr1_1-hs-fs-evm.itb" +IMAGE_SR1_1_HS_FS_FILES = "tiboot3-j721e_sr1_1-hs-fs-evm.bin sysfw-j721e_sr1_1-hs-fs-evm.itb" +IMAGE_SR1_1_HS_FS_FILES:bsp-mainline = "" +IMAGE_BOOT_FILES += "${IMAGE_SR1_1_HS_FS_FILES}" # Since default on J721e is for GP, add a version for SR1.1 HS-SE -IMAGE_BOOT_FILES += "tiboot3-j721e_sr1_1-hs-evm.bin" -IMAGE_BOOT_FILES += "sysfw-j721e_sr1_1-hs-evm.itb" +IMAGE_SR1_1_HS_SE_FILES = "tiboot3-j721e_sr1_1-hs-evm.bin sysfw-j721e_sr1_1-hs-evm.itb" +IMAGE_BOOT_FILES += "${IMAGE_SR1_1_HS_SE_FILES}" # Since default on J721e is for GP, add a version for SR2.0 HS-FS -IMAGE_BOOT_FILES += "tiboot3-j721e_sr2-hs-fs-evm.bin" -IMAGE_BOOT_FILES += "sysfw-j721e_sr2-hs-fs-evm.itb" +IMAGE_SR2_HS_FS_FILES = "tiboot3-j721e_sr2-hs-fs-evm.bin sysfw-j721e_sr2-hs-fs-evm.itb" +IMAGE_BOOT_FILES += "${IMAGE_SR2_HS_FS_FILES}" # Since default on J721e is for GP, add a version for SR2.0 HS-SE -IMAGE_BOOT_FILES += "tiboot3-j721e_sr2-hs-evm.bin" -IMAGE_BOOT_FILES += "sysfw-j721e_sr2-hs-evm.itb" +IMAGE_SR2_HS_SE_FILES = "tiboot3-j721e_sr2-hs-evm.bin sysfw-j721e_sr2-hs-evm.itb" +IMAGE_SR2_HS_SE_FILES:bsp-mainline = "" +IMAGE_BOOT_FILES += "${IMAGE_SR2_HS_SE_FILES}" TFA_BOARD = "generic"
Signature · 1 line
2.25.1
PATCH v2 4/4 conf/machine: use the default TI BSP for BeaglePlay
In reply to Denys DmytriyenkoFrom: Denys Dmytriyenko <[email protected]>
BeaglePlay gains official support from latest TI lts-6.6 baseline, so set it as the default. Other Beagle platforms will still use BB.org as default.
And these defaults can still be changed with TI_PREFERRED_BSP setting in a distro config or by end user in the local.conf
---
v2 - rename TI_DEFAULT_BSP to TI_PREFERRED_BSP
meta-ti-bsp/conf/machine/beagle-x15.conf | 3 ++- meta-ti-bsp/conf/machine/beaglebone-ai64-k3r5.conf | 3 ++- meta-ti-bsp/conf/machine/beaglebone-ai64.conf | 3 ++- meta-ti-bsp/conf/machine/beaglebone.conf | 3 ++- meta-ti-bsp/conf/machine/beagleplay-k3r5.conf | 1 - meta-ti-bsp/conf/machine/beagleplay.conf | 1 - meta-ti-bsp/conf/machine/include/beagle.inc | 1 - 7 files changed, 8 insertions(+), 7 deletions(-) delete mode 100644 meta-ti-bsp/conf/machine/include/beagle.inc
meta-ti-bsp/conf/machine/beagle-x15.conf +2 -1
@@ -2,7 +2,8 @@ #@NAME: BeagleBoard X15 #@DESCRIPTION: Machine configuration for the BeagleBoard X15 -require conf/machine/include/beagle.inc +TI_PREFERRED_BSP ?= "bb_org" + require conf/machine/include/am57xx.inc DT_VENDOR_PREFIX = "ti/omap/"
meta-ti-bsp/conf/machine/beaglebone-ai64-k3r5.conf +2 -1
@@ -2,7 +2,8 @@ #@NAME: BeagleBone AI-64 (R5F) #@DESCRIPTION: Machine configuration for the BeagleBone AI-64 (R5F core) -require conf/machine/include/beagle.inc +TI_PREFERRED_BSP ?= "bb_org" + require conf/machine/include/k3r5.inc SYSFW_SOC = "j721e"
meta-ti-bsp/conf/machine/beaglebone-ai64.conf +2 -1
@@ -2,7 +2,8 @@ #@NAME: BeagleBone AI-64 (A72) #@DESCRIPTION: Machine configuration for the BeagleBone AI-64 board (A72 core) -require conf/machine/include/beagle.inc +TI_PREFERRED_BSP ?= "bb_org" + require conf/machine/include/j721e.inc UBOOT_MACHINE = "j721e_evm_a72_config"
meta-ti-bsp/conf/machine/beaglebone.conf +2 -1
@@ -2,7 +2,8 @@ #@NAME: BeagleBone machine #@DESCRIPTION: Machine configuration for the http://beagleboard.org/bone board -require conf/machine/include/beagle.inc +TI_PREFERRED_BSP ?= "bb_org" + require conf/machine/include/ti33x.inc DT_VENDOR_PREFIX = "ti/omap/"
meta-ti-bsp/conf/machine/beagleplay-k3r5.conf +0 -1
@@ -2,7 +2,6 @@ #@NAME: BeaglePlay (R5F) #@DESCRIPTION: Machine configuration for the BeaglePlay (R5F core) -require conf/machine/include/beagle.inc require conf/machine/include/k3r5.inc SYSFW_SOC = "am62x"
meta-ti-bsp/conf/machine/beagleplay.conf +0 -1
@@ -2,7 +2,6 @@ #@NAME: BeaglePlay (A53) #@DESCRIPTION: Machine configuration for the BeaglePlay board (A53 core) -require conf/machine//include/beagle.inc require conf/machine/include/k3.inc SOC_FAMILY:append = ":am62xx"
meta-ti-bsp/conf/machine/include/beagle.inc deleted +0 -1
@@ -1 +0,0 @@ -TI_PREFERRED_BSP ?= "bb_org"
Signature · 1 line
2.25.1
PATCH 3/4 conf/machine/beagle*, linux-bb.org: update for multi-BSP support
In reply to Denys DmytriyenkoFrom: Denys Dmytriyenko <[email protected]>
Update all Beagle platform configurations to support multiple BSPs.
--- meta-ti-bsp/conf/machine/beagle-x15.conf | 18 ++-- .../conf/machine/beaglebone-ai64-k3r5.conf | 8 +- meta-ti-bsp/conf/machine/beaglebone-ai64.conf | 23 ++++- meta-ti-bsp/conf/machine/beaglebone.conf | 30 ++++--- meta-ti-bsp/conf/machine/beagleplay-k3r5.conf | 9 +- meta-ti-bsp/conf/machine/beagleplay.conf | 48 ++++++++++- .../recipes-kernel/linux/linux-bb.org_git.bb | 84 ------------------- 7 files changed, 100 insertions(+), 120 deletions(-)
meta-ti-bsp/conf/machine/beagle-x15.conf +11 -7
@@ -5,17 +5,21 @@ require conf/machine/include/beagle.inc require conf/machine/include/am57xx.inc +DT_VENDOR_PREFIX = "ti/omap/" +DT_VENDOR_PREFIX:bsp-ti-6_1 = "" +DT_VENDOR_PREFIX:bsp-bb_org = "" + KERNEL_DEVICETREE_PREFIX = " \ -ti/omap/am57xx-beagle-x15 \ -ti/omap/am57xx-idk-lcd \ +${DT_VENDOR_PREFIX}am57xx-beagle-x15 \ +${DT_VENDOR_PREFIX}am57xx-idk-lcd \ " KERNEL_DEVICETREE = " \ -ti/omap/am57xx-beagle-x15.dtb \ -ti/omap/am57xx-beagle-x15-revb1.dtb \ -ti/omap/am57xx-beagle-x15-revc.dtb \ -ti/omap/am57xx-idk-lcd-osd101t2045.dtbo \ -ti/omap/am57xx-idk-lcd-osd101t2587.dtbo \ +${DT_VENDOR_PREFIX}am57xx-beagle-x15.dtb \ +${DT_VENDOR_PREFIX}am57xx-beagle-x15-revb1.dtb \ +${DT_VENDOR_PREFIX}am57xx-beagle-x15-revc.dtb \ +${DT_VENDOR_PREFIX}am57xx-idk-lcd-osd101t2045.dtbo \ +${DT_VENDOR_PREFIX}am57xx-idk-lcd-osd101t2587.dtbo \ " MACHINE_GUI_CLASS = "bigscreen"
meta-ti-bsp/conf/machine/beaglebone-ai64-k3r5.conf +4 -4
@@ -2,6 +2,7 @@ #@NAME: BeagleBone AI-64 (R5F) #@DESCRIPTION: Machine configuration for the BeagleBone AI-64 (R5F core) +require conf/machine/include/beagle.inc require conf/machine/include/k3r5.inc SYSFW_SOC = "j721e"
@@ -15,8 +16,7 @@ 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_CONFIG_FRAGMENTS holds the list of u-boot config fragments which has to be build -# along with the base defconfig mentioned in UBOOT_MACHINE. Refer u-boot-mergeconfig.inc -# under meta-ti-bsp/recipes-bsp/u-boot/ for more details. -UBOOT_CONFIG_FRAGMENTS = "j721e_beagleboneai64_r5.config" +UBOOT_CONFIG_FRAGMENTS:bsp-bb_org = "j721e_beagleboneai64_r5.config" +UBOOT_CONFIG_FRAGMENTS:bsp-ti-6_1 = "j721e_beagleboneai64_r5.config"
meta-ti-bsp/conf/machine/beaglebone-ai64.conf +19 -4
@@ -6,11 +6,13 @@ require conf/machine/include/beagle.inc require conf/machine/include/j721e.inc UBOOT_MACHINE = "j721e_evm_a72_config" +UBOOT_MACHINE:bsp-ti-6_6 = "j721e_beagleboneai64_a72_defconfig" -# UBOOT_CONFIG_FRAGMENTS holds the list of u-boot config fragments which has to be build -# along with the base defconfig mentioned in UBOOT_MACHINE. Refer u-boot-mergeconfig.inc -# under meta-ti-bsp/recipes-bsp/u-boot/ for more details. -UBOOT_CONFIG_FRAGMENTS = "j721e_beagleboneai64_a72.config" +UBOOT_CONFIG_FRAGMENTS:bsp-ti-6_1 = "j721e_beagleboneai64_a72.config" +UBOOT_CONFIG_FRAGMENTS:bsp-bb_org = "j721e_beagleboneai64_a72.config" + +SPL_BINARY:bsp-ti-6_6 = "tispl.bin_unsigned" +SPL_BINARYNAME:bsp-ti-6_6 = "tispl.bin" KERNEL_DEVICETREE_PREFIX = " \ ti/k3-j721e \
@@ -24,4 +26,17 @@ ti/k3-j721e-evm-quad-port-eth-exp.dtbo \ ti/k3-j721e-sk.dtb \ " +KERNEL_DEVICETREE:append:bsp-bb_org = " \ +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"
meta-ti-bsp/conf/machine/beaglebone.conf +17 -13
@@ -5,23 +5,27 @@ require conf/machine/include/beagle.inc require conf/machine/include/ti33x.inc +DT_VENDOR_PREFIX = "ti/omap/" +DT_VENDOR_PREFIX:bsp-ti-6_1 = "" +DT_VENDOR_PREFIX:bsp-bb_org = "" + KERNEL_DEVICETREE_PREFIX = " \ -ti/omap/am335x-bone \ -ti/omap/am335x-pocketbeagle \ -ti/omap/am335x-sancloud-bbe \ +${DT_VENDOR_PREFIX}am335x-bone \ +${DT_VENDOR_PREFIX}am335x-pocketbeagle \ +${DT_VENDOR_PREFIX}am335x-sancloud-bbe \ " KERNEL_DEVICETREE = " \ -ti/omap/am335x-bone.dtb \ -ti/omap/am335x-boneblack.dtb \ -ti/omap/am335x-boneblack-wireless.dtb \ -ti/omap/am335x-boneblue.dtb \ -ti/omap/am335x-bonegreen.dtb \ -ti/omap/am335x-bonegreen-wireless.dtb \ -ti/omap/am335x-pocketbeagle.dtb \ -ti/omap/am335x-sancloud-bbe.dtb \ -ti/omap/am335x-sancloud-bbe-extended-wifi.dtb \ -ti/omap/am335x-sancloud-bbe-lite.dtb \ +${DT_VENDOR_PREFIX}am335x-bone.dtb \ +${DT_VENDOR_PREFIX}am335x-boneblack.dtb \ +${DT_VENDOR_PREFIX}am335x-boneblack-wireless.dtb \ +${DT_VENDOR_PREFIX}am335x-boneblue.dtb \ +${DT_VENDOR_PREFIX}am335x-bonegreen.dtb \ +${DT_VENDOR_PREFIX}am335x-bonegreen-wireless.dtb \ +${DT_VENDOR_PREFIX}am335x-pocketbeagle.dtb \ +${DT_VENDOR_PREFIX}am335x-sancloud-bbe.dtb \ +${DT_VENDOR_PREFIX}am335x-sancloud-bbe-extended-wifi.dtb \ +${DT_VENDOR_PREFIX}am335x-sancloud-bbe-lite.dtb \ " MACHINE_GUI_CLASS = "bigscreen"
meta-ti-bsp/conf/machine/beagleplay-k3r5.conf +5 -4
@@ -2,6 +2,7 @@ #@NAME: BeaglePlay (R5F) #@DESCRIPTION: Machine configuration for the BeaglePlay (R5F core) +require conf/machine/include/beagle.inc require conf/machine/include/k3r5.inc SYSFW_SOC = "am62x"
@@ -9,8 +10,8 @@ SYSFW_CONFIG = "evm" SYSFW_SUFFIX = "gp" UBOOT_MACHINE = "am62x_evm_r5_defconfig" +UBOOT_MACHINE:bsp-ti-6_6 = "am62x_beagleplay_r5_defconfig" -# UBOOT_CONFIG_FRAGMENTS holds the list of u-boot config fragments which has to be build -# along with the base defconfig mentioned in UBOOT_MACHINE. Refer u-boot-mergeconfig.inc -# under meta-ti-bsp/recipes-bsp/u-boot/ for more details. -UBOOT_CONFIG_FRAGMENTS = "am625_beagleplay_r5.config" +UBOOT_CONFIG_FRAGMENTS:bsp-bb_org = "am625_beagleplay_r5.config" +UBOOT_CONFIG_FRAGMENTS:bsp-ti-6_1 = "am625_beagleplay_r5.config" +UBOOT_CONFIG_FRAGMENTS:bsp-mainline = "beagleplay_r5.config"
meta-ti-bsp/conf/machine/beagleplay.conf +44 -4
59 lines not on this page · raw message
meta-ti-bsp/recipes-kernel/linux/linux-bb.org_git.bb +0 -84
96 lines not on this page · raw message
Signature · 1 line
2.25.1