From 87f5d17fd0983bf5bb09ad664efd615bcf60a97b Mon Sep 17 00:00:00 2001 From: Randolph Sapp Date: Mon, 23 Feb 2026 17:57:42 -0600 Subject: meta-beagle: move all beagle board configurations Move all beagle board configurations to meta-beagle. There are 2 skews currently: 1. A base TI configuration setting all the default variables required to use the device with meta-ti-bsp provided packages. 2. An override that uses meta-beagle BSP components. This includes all the values defined in the TI skew as well as any meta-beagle specific configuration. Signed-off-by: Randolph Sapp Signed-off-by: Ryan Eatmon --- meta-beagle/conf/machine/beaglebadge-ti.conf | 21 ++++++++++++ meta-beagle/conf/machine/beagleplay-ti-k3r5.conf | 7 ++++ meta-beagle/conf/machine/beagleplay-ti.conf | 43 ++++++++++++++++++++++++ meta-ti-bsp/conf/machine/beaglebadge-ti.conf | 21 ------------ meta-ti-bsp/conf/machine/beagleplay-ti-k3r5.conf | 7 ---- meta-ti-bsp/conf/machine/beagleplay-ti.conf | 43 ------------------------ 6 files changed, 71 insertions(+), 71 deletions(-) create mode 100644 meta-beagle/conf/machine/beaglebadge-ti.conf create mode 100644 meta-beagle/conf/machine/beagleplay-ti-k3r5.conf create mode 100644 meta-beagle/conf/machine/beagleplay-ti.conf delete mode 100644 meta-ti-bsp/conf/machine/beaglebadge-ti.conf delete mode 100644 meta-ti-bsp/conf/machine/beagleplay-ti-k3r5.conf delete mode 100644 meta-ti-bsp/conf/machine/beagleplay-ti.conf diff --git a/meta-beagle/conf/machine/beaglebadge-ti.conf b/meta-beagle/conf/machine/beaglebadge-ti.conf new file mode 100644 index 00000000..d62730ed --- /dev/null +++ b/meta-beagle/conf/machine/beaglebadge-ti.conf @@ -0,0 +1,21 @@ +#@TYPE: Machine +#@NAME: AM62L Badge +#@DESCRIPTION: Machine configuration for the TI AM62L Badge + +require conf/machine/include/am62lxx.inc + +IMAGE_FSTYPES += "ubifs ubi" + +MKUBIFS_ARGS ?= "-F -m 4096 -e 258048 -c 8500" + +UBINIZE_ARGS ?= "-m 4096 -p 256KiB -s 1024 -O 1024" + +KERNEL_DEVICETREE_PREFIX = " \ + ti/k3-am62l3-badge \ +" + +KERNEL_DEVICETREE = "" + +UBOOT_MACHINE = "am62lx_badge_defconfig" + +TFA_BOARD = "am62l-badge" diff --git a/meta-beagle/conf/machine/beagleplay-ti-k3r5.conf b/meta-beagle/conf/machine/beagleplay-ti-k3r5.conf new file mode 100644 index 00000000..6996cc2b --- /dev/null +++ b/meta-beagle/conf/machine/beagleplay-ti-k3r5.conf @@ -0,0 +1,7 @@ +#@TYPE: Machine +#@NAME: BeaglePlay (R5F) +#@DESCRIPTION: Machine configuration for the BeaglePlay (R5F core) + +require conf/machine/include/k3r5.inc + +UBOOT_MACHINE = "am62x_beagleplay_r5_defconfig" diff --git a/meta-beagle/conf/machine/beagleplay-ti.conf b/meta-beagle/conf/machine/beagleplay-ti.conf new file mode 100644 index 00000000..ca88fdfb --- /dev/null +++ b/meta-beagle/conf/machine/beagleplay-ti.conf @@ -0,0 +1,43 @@ +#@TYPE: Machine +#@NAME: BeaglePlay (A53) +#@DESCRIPTION: Machine configuration for the BeaglePlay board (A53 core) + +require conf/machine/include/k3.inc +require conf/machine/include/mc_k3r5.inc + +SOC_FAMILY:append = ":am62xx" + +MACHINE_FEATURES += "screen" + +SERIAL_CONSOLES = "115200;ttyS2" + +require conf/machine/include/mesa-pvr.inc +PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}" + +TFA_BOARD = "lite" +TFA_K3_SYSTEM_SUSPEND = "1" + +OPTEEMACHINE = "k3-am62x" + +UBOOT_MACHINE = "am62x_beagleplay_a53_defconfig" + +SPL_BINARY = "tispl.bin_unsigned" + +KERNEL_DEVICETREE_PREFIX = " \ + ti/k3-am625-beagle \ + ti/k3-am625-sk \ + ti/k3-am62x-sk \ +" + +KERNEL_DEVICETREE = " \ + ti/k3-am625-beagleplay-csi2-ov5640.dtbo \ + ti/k3-am625-beagleplay-csi2-tevi-ov5640.dtbo \ + ti/k3-am625-beagleplay.dtb \ + ti/k3-am625-sk.dtb \ + 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-hdmi-audio.dtbo \ +" + +MACHINE_GUI_CLASS = "bigscreen" diff --git a/meta-ti-bsp/conf/machine/beaglebadge-ti.conf b/meta-ti-bsp/conf/machine/beaglebadge-ti.conf deleted file mode 100644 index d62730ed..00000000 --- a/meta-ti-bsp/conf/machine/beaglebadge-ti.conf +++ /dev/null @@ -1,21 +0,0 @@ -#@TYPE: Machine -#@NAME: AM62L Badge -#@DESCRIPTION: Machine configuration for the TI AM62L Badge - -require conf/machine/include/am62lxx.inc - -IMAGE_FSTYPES += "ubifs ubi" - -MKUBIFS_ARGS ?= "-F -m 4096 -e 258048 -c 8500" - -UBINIZE_ARGS ?= "-m 4096 -p 256KiB -s 1024 -O 1024" - -KERNEL_DEVICETREE_PREFIX = " \ - ti/k3-am62l3-badge \ -" - -KERNEL_DEVICETREE = "" - -UBOOT_MACHINE = "am62lx_badge_defconfig" - -TFA_BOARD = "am62l-badge" diff --git a/meta-ti-bsp/conf/machine/beagleplay-ti-k3r5.conf b/meta-ti-bsp/conf/machine/beagleplay-ti-k3r5.conf deleted file mode 100644 index 6996cc2b..00000000 --- a/meta-ti-bsp/conf/machine/beagleplay-ti-k3r5.conf +++ /dev/null @@ -1,7 +0,0 @@ -#@TYPE: Machine -#@NAME: BeaglePlay (R5F) -#@DESCRIPTION: Machine configuration for the BeaglePlay (R5F core) - -require conf/machine/include/k3r5.inc - -UBOOT_MACHINE = "am62x_beagleplay_r5_defconfig" diff --git a/meta-ti-bsp/conf/machine/beagleplay-ti.conf b/meta-ti-bsp/conf/machine/beagleplay-ti.conf deleted file mode 100644 index ca88fdfb..00000000 --- a/meta-ti-bsp/conf/machine/beagleplay-ti.conf +++ /dev/null @@ -1,43 +0,0 @@ -#@TYPE: Machine -#@NAME: BeaglePlay (A53) -#@DESCRIPTION: Machine configuration for the BeaglePlay board (A53 core) - -require conf/machine/include/k3.inc -require conf/machine/include/mc_k3r5.inc - -SOC_FAMILY:append = ":am62xx" - -MACHINE_FEATURES += "screen" - -SERIAL_CONSOLES = "115200;ttyS2" - -require conf/machine/include/mesa-pvr.inc -PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}" - -TFA_BOARD = "lite" -TFA_K3_SYSTEM_SUSPEND = "1" - -OPTEEMACHINE = "k3-am62x" - -UBOOT_MACHINE = "am62x_beagleplay_a53_defconfig" - -SPL_BINARY = "tispl.bin_unsigned" - -KERNEL_DEVICETREE_PREFIX = " \ - ti/k3-am625-beagle \ - ti/k3-am625-sk \ - ti/k3-am62x-sk \ -" - -KERNEL_DEVICETREE = " \ - ti/k3-am625-beagleplay-csi2-ov5640.dtbo \ - ti/k3-am625-beagleplay-csi2-tevi-ov5640.dtbo \ - ti/k3-am625-beagleplay.dtb \ - ti/k3-am625-sk.dtb \ - 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-hdmi-audio.dtbo \ -" - -MACHINE_GUI_CLASS = "bigscreen" -- cgit v1.2.3-54-g00ecf