From 43d10b0593a7e82fbb324f3baf758cacce0f1347 Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Fri, 13 Dec 2024 18:31:57 -0500 Subject: conf/machine: move remaining Beagle platforms to meta-beagle Include beagle-bsp.inc to define "bb_org" BSP settings and select that as a default. Signed-off-by: Denys Dmytriyenko --- meta-beagle/conf/machine/beagle-x15.conf | 29 ++++++++++++++ meta-beagle/conf/machine/beaglebone-ai64-k3r5.conf | 22 +++++++++++ meta-beagle/conf/machine/beaglebone-ai64.conf | 45 +++++++++++++++++++++ meta-beagle/conf/machine/beaglebone.conf | 34 ++++++++++++++++ meta-ti-bsp/conf/machine/beagle-x15.conf | 30 -------------- meta-ti-bsp/conf/machine/beaglebone-ai64-k3r5.conf | 23 ----------- meta-ti-bsp/conf/machine/beaglebone-ai64.conf | 46 ---------------------- meta-ti-bsp/conf/machine/beaglebone.conf | 35 ---------------- 8 files changed, 130 insertions(+), 134 deletions(-) create mode 100644 meta-beagle/conf/machine/beagle-x15.conf create mode 100644 meta-beagle/conf/machine/beaglebone-ai64-k3r5.conf create mode 100644 meta-beagle/conf/machine/beaglebone-ai64.conf create mode 100644 meta-beagle/conf/machine/beaglebone.conf delete mode 100644 meta-ti-bsp/conf/machine/beagle-x15.conf delete mode 100644 meta-ti-bsp/conf/machine/beaglebone-ai64-k3r5.conf delete mode 100644 meta-ti-bsp/conf/machine/beaglebone-ai64.conf delete mode 100644 meta-ti-bsp/conf/machine/beaglebone.conf diff --git a/meta-beagle/conf/machine/beagle-x15.conf b/meta-beagle/conf/machine/beagle-x15.conf new file mode 100644 index 00000000..e9ab5d40 --- /dev/null +++ b/meta-beagle/conf/machine/beagle-x15.conf @@ -0,0 +1,29 @@ +#@TYPE: Machine +#@NAME: BeagleBoard X15 +#@DESCRIPTION: Machine configuration for the BeagleBoard X15 + +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 = "" + +KERNEL_DEVICETREE_PREFIX = " \ +${DT_VENDOR_PREFIX}am57xx-beagle-x15 \ +${DT_VENDOR_PREFIX}am57xx-idk-lcd \ +" + +KERNEL_DEVICETREE = " \ +${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" + +SERIAL_CONSOLES = "115200;ttyS2" + +UBOOT_MACHINE = "am57xx_evm_config" diff --git a/meta-beagle/conf/machine/beaglebone-ai64-k3r5.conf b/meta-beagle/conf/machine/beaglebone-ai64-k3r5.conf new file mode 100644 index 00000000..95d3abc0 --- /dev/null +++ b/meta-beagle/conf/machine/beaglebone-ai64-k3r5.conf @@ -0,0 +1,22 @@ +#@TYPE: Machine +#@NAME: BeagleBone AI-64 (R5F) +#@DESCRIPTION: Machine configuration for the BeagleBone AI-64 (R5F core) + +require conf/machine/include/k3r5.inc +require conf/machine/include/beagle-bsp.inc + +SYSFW_SOC = "j721e" +SYSFW_CONFIG = "evm" +SYSFW_SUFFIX = "gp" + +SPL_BINARY = "spl/u-boot-spl.${UBOOT_SUFFIX}" +SPL_SYMLINK = "u-boot-r5spl.${UBOOT_SUFFIX}" +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_CONFIG_FRAGMENTS:bsp-bb_org = "j721e_beagleboneai64_r5.config" +UBOOT_CONFIG_FRAGMENTS:bsp-ti-6_1 = "j721e_beagleboneai64_r5.config" diff --git a/meta-beagle/conf/machine/beaglebone-ai64.conf b/meta-beagle/conf/machine/beaglebone-ai64.conf new file mode 100644 index 00000000..faffd0bb --- /dev/null +++ b/meta-beagle/conf/machine/beaglebone-ai64.conf @@ -0,0 +1,45 @@ +#@TYPE: Machine +#@NAME: BeagleBone AI-64 (A72) +#@DESCRIPTION: Machine configuration for the BeagleBone AI-64 board (A72 core) + +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 = "" + +UBOOT_MACHINE = "j721e_evm_a72_config" +UBOOT_MACHINE:bsp-ti-6_6 = "j721e_beagleboneai64_a72_defconfig" + +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 \ +" + +KERNEL_DEVICETREE = " \ +ti/k3-j721e-beagleboneai64.dtb \ +ti/k3-j721e-common-proc-board.dtb \ +ti/k3-j721e-evm-gesi-exp-board.dtbo \ +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-beagle/conf/machine/beaglebone.conf b/meta-beagle/conf/machine/beaglebone.conf new file mode 100644 index 00000000..6048383b --- /dev/null +++ b/meta-beagle/conf/machine/beaglebone.conf @@ -0,0 +1,34 @@ +#@TYPE: Machine +#@NAME: BeagleBone machine +#@DESCRIPTION: Machine configuration for the http://beagleboard.org/bone board + +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 = "" + +KERNEL_DEVICETREE_PREFIX = " \ +${DT_VENDOR_PREFIX}am335x-bone \ +${DT_VENDOR_PREFIX}am335x-pocketbeagle \ +${DT_VENDOR_PREFIX}am335x-sancloud-bbe \ +" + +KERNEL_DEVICETREE = " \ +${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" +MACHINE_FEATURES += "screen" + +SERIAL_CONSOLES = "115200;ttyS0" diff --git a/meta-ti-bsp/conf/machine/beagle-x15.conf b/meta-ti-bsp/conf/machine/beagle-x15.conf deleted file mode 100644 index 6f8c435b..00000000 --- a/meta-ti-bsp/conf/machine/beagle-x15.conf +++ /dev/null @@ -1,30 +0,0 @@ -#@TYPE: Machine -#@NAME: BeagleBoard X15 -#@DESCRIPTION: Machine configuration for the BeagleBoard X15 - -TI_PREFERRED_BSP ?= "bb_org" - -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 = " \ -${DT_VENDOR_PREFIX}am57xx-beagle-x15 \ -${DT_VENDOR_PREFIX}am57xx-idk-lcd \ -" - -KERNEL_DEVICETREE = " \ -${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" - -SERIAL_CONSOLES = "115200;ttyS2" - -UBOOT_MACHINE = "am57xx_evm_config" diff --git a/meta-ti-bsp/conf/machine/beaglebone-ai64-k3r5.conf b/meta-ti-bsp/conf/machine/beaglebone-ai64-k3r5.conf deleted file mode 100644 index d415a212..00000000 --- a/meta-ti-bsp/conf/machine/beaglebone-ai64-k3r5.conf +++ /dev/null @@ -1,23 +0,0 @@ -#@TYPE: Machine -#@NAME: BeagleBone AI-64 (R5F) -#@DESCRIPTION: Machine configuration for the BeagleBone AI-64 (R5F core) - -TI_PREFERRED_BSP ?= "bb_org" - -require conf/machine/include/k3r5.inc - -SYSFW_SOC = "j721e" -SYSFW_CONFIG = "evm" -SYSFW_SUFFIX = "gp" - -SPL_BINARY = "spl/u-boot-spl.${UBOOT_SUFFIX}" -SPL_SYMLINK = "u-boot-r5spl.${UBOOT_SUFFIX}" -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_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 deleted file mode 100644 index 56e1ed4e..00000000 --- a/meta-ti-bsp/conf/machine/beaglebone-ai64.conf +++ /dev/null @@ -1,46 +0,0 @@ -#@TYPE: Machine -#@NAME: BeagleBone AI-64 (A72) -#@DESCRIPTION: Machine configuration for the BeagleBone AI-64 board (A72 core) - -TI_PREFERRED_BSP ?= "bb_org" - -require conf/machine/include/j721e.inc - -IMAGE_SR1_1_HS_FS_FILES:bsp-bb_org = "" -IMAGE_SR2_HS_SE_FILES:bsp-bb_org = "" - -UBOOT_MACHINE = "j721e_evm_a72_config" -UBOOT_MACHINE:bsp-ti-6_6 = "j721e_beagleboneai64_a72_defconfig" - -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 \ -" - -KERNEL_DEVICETREE = " \ -ti/k3-j721e-beagleboneai64.dtb \ -ti/k3-j721e-common-proc-board.dtb \ -ti/k3-j721e-evm-gesi-exp-board.dtbo \ -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 deleted file mode 100644 index 0db4d304..00000000 --- a/meta-ti-bsp/conf/machine/beaglebone.conf +++ /dev/null @@ -1,35 +0,0 @@ -#@TYPE: Machine -#@NAME: BeagleBone machine -#@DESCRIPTION: Machine configuration for the http://beagleboard.org/bone board - -TI_PREFERRED_BSP ?= "bb_org" - -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 = " \ -${DT_VENDOR_PREFIX}am335x-bone \ -${DT_VENDOR_PREFIX}am335x-pocketbeagle \ -${DT_VENDOR_PREFIX}am335x-sancloud-bbe \ -" - -KERNEL_DEVICETREE = " \ -${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" -MACHINE_FEATURES += "screen" - -SERIAL_CONSOLES = "115200;ttyS0" -- cgit v1.2.3-54-g00ecf