From 16092e065bb03cfe29952d4ec792a0de3142879a Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Fri, 14 Jun 2024 17:57:20 -0400 Subject: conf/machine/beagle*, linux-bb.org: update for multi-BSP support Update all Beagle platform configurations to support multiple BSPs. Signed-off-by: Denys Dmytriyenko Signed-off-by: Ryan Eatmon --- meta-ti-bsp/conf/machine/beagle-x15.conf | 18 +++-- meta-ti-bsp/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(-) diff --git a/meta-ti-bsp/conf/machine/beagle-x15.conf b/meta-ti-bsp/conf/machine/beagle-x15.conf index 706f999a..15815119 100644 --- a/meta-ti-bsp/conf/machine/beagle-x15.conf +++ b/meta-ti-bsp/conf/machine/beagle-x15.conf @@ -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" diff --git a/meta-ti-bsp/conf/machine/beaglebone-ai64-k3r5.conf b/meta-ti-bsp/conf/machine/beaglebone-ai64-k3r5.conf index 2bf58bce..85669cca 100644 --- a/meta-ti-bsp/conf/machine/beaglebone-ai64-k3r5.conf +++ b/meta-ti-bsp/conf/machine/beaglebone-ai64-k3r5.conf @@ -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" diff --git a/meta-ti-bsp/conf/machine/beaglebone-ai64.conf b/meta-ti-bsp/conf/machine/beaglebone-ai64.conf index aaf94fa5..618e27d7 100644 --- a/meta-ti-bsp/conf/machine/beaglebone-ai64.conf +++ b/meta-ti-bsp/conf/machine/beaglebone-ai64.conf @@ -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" diff --git a/meta-ti-bsp/conf/machine/beaglebone.conf b/meta-ti-bsp/conf/machine/beaglebone.conf index 9d001599..9f5f41e0 100644 --- a/meta-ti-bsp/conf/machine/beaglebone.conf +++ b/meta-ti-bsp/conf/machine/beaglebone.conf @@ -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" diff --git a/meta-ti-bsp/conf/machine/beagleplay-k3r5.conf b/meta-ti-bsp/conf/machine/beagleplay-k3r5.conf index e38029ff..16503f09 100644 --- a/meta-ti-bsp/conf/machine/beagleplay-k3r5.conf +++ b/meta-ti-bsp/conf/machine/beagleplay-k3r5.conf @@ -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" diff --git a/meta-ti-bsp/conf/machine/beagleplay.conf b/meta-ti-bsp/conf/machine/beagleplay.conf index a09c0d13..6f042d03 100644 --- a/meta-ti-bsp/conf/machine/beagleplay.conf +++ b/meta-ti-bsp/conf/machine/beagleplay.conf @@ -19,11 +19,14 @@ TFA_K3_SYSTEM_SUSPEND = "1" OPTEEMACHINE = "k3-am62x" UBOOT_MACHINE = "am62x_evm_a53_defconfig" +UBOOT_MACHINE:bsp-ti-6_6 = "am62x_beagleplay_a53_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_a53.config" +UBOOT_CONFIG_FRAGMENTS:bsp-ti-6_1 = "am625_beagleplay_a53.config" +UBOOT_CONFIG_FRAGMENTS:bsp-bb_org = "am625_beagleplay_a53.config" +UBOOT_CONFIG_FRAGMENTS:bsp-mainline = "beagleplay_a53.config" + +SPL_BINARY:bsp-ti-6_6 = "tispl.bin_unsigned" +SPL_BINARYNAME:bsp-ti-6_6 = "tispl.bin" KERNEL_DEVICETREE_PREFIX = " \ ti/k3-am625 \ @@ -36,4 +39,41 @@ ti/k3-am625-sk.dtb \ ti/k3-am62x-sk-hdmi-audio.dtbo \ " +KERNEL_DEVICETREE:append:bsp-bb_org = " \ +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 \ +" + MACHINE_GUI_CLASS = "bigscreen" diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-bb.org_git.bb b/meta-ti-bsp/recipes-kernel/linux/linux-bb.org_git.bb index 534fc047..cee9c7cb 100644 --- a/meta-ti-bsp/recipes-kernel/linux/linux-bb.org_git.bb +++ b/meta-ti-bsp/recipes-kernel/linux/linux-bb.org_git.bb @@ -14,32 +14,6 @@ DEPENDS += "gmp-native libmpc-native" KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT} ${EXTRA_DTC_ARGS}" -KERNEL_DEVICETREE:beaglebone = " \ -am335x-bone.dtb \ -am335x-boneblack.dtb \ -am335x-boneblack-pps.dtb \ -am335x-boneblack-uboot.dtb \ -am335x-boneblack-uboot-univ.dtb \ -am335x-boneblack-wireless.dtb \ -am335x-boneblue.dtb \ -am335x-bonegreen.dtb \ -am335x-bonegreen-gateway.dtb \ -am335x-bonegreen-wireless.dtb \ -am335x-bonegreen-wireless-uboot-univ.dtb \ -am335x-pocketbeagle.dtb \ -am335x-sancloud-bbe.dtb \ -am335x-sancloud-bbe-extended-wifi.dtb \ -am335x-sancloud-bbe-lite.dtb \ -" - -KERNEL_DEVICETREE:beagle-x15 = " \ -am57xx-beagle-x15.dtb \ -am57xx-beagle-x15-revb1.dtb \ -am57xx-beagle-x15-revc.dtb \ -am57xx-idk-lcd-osd101t2045.dtbo \ -am57xx-idk-lcd-osd101t2587.dtbo \ -" - # Extra DT overlays/capes KERNEL_DEVICETREE:append:armv7a = " \ AM335X-PRU-UIO-00A0.dtbo \ @@ -76,64 +50,6 @@ PB-MIKROBUS-0.dtbo \ PB-MIKROBUS-1.dtbo \ " -KERNEL_DEVICETREE:beaglebone-ai64 = " \ -ti/k3-j721e-beagleboneai64.dtb \ -ti/k3-j721e-common-proc-board.dtb \ -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-gesi-exp-board.dtbo \ -ti/k3-j721e-evm-pcie0-ep.dtbo \ -ti/k3-j721e-evm-quad-port-eth-exp.dtbo \ -ti/k3-j721e-evm-virt-mac-client.dtbo \ -ti/k3-j721e-sk.dtb \ -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 \ -" - -KERNEL_DEVICETREE:beagleplay = " \ -ti/k3-am625-beagleplay.dtb \ -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.dtb \ -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-audio.dtbo \ -ti/k3-am62x-sk-hdmi-disable-fastboot.dtbo \ -ti/k3-am62x-sk-lpm-wkup-sources.dtbo \ -ti/k3-am62x-sk-mcan.dtbo \ -" - S = "${WORKDIR}/git" # 6.1.80 version for 32-bit -- cgit v1.2.3-54-g00ecf