From 97e5fcc396d30e178082e64cf1162ebfe9da76e6 Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Fri, 13 Dec 2024 18:31:52 -0500 Subject: conf/machine: rename beagleplay machine to beagleplay-ti BeaglePlay is officially supported by TI "ti-6_6" BSP and is part of the TI-SDK releases. Switching BSP to BeagleBoard.org "bb_org" settings for the same machine is possible within the same layer. But having different machine configs for the same machine name in multiple layers can be confusing and prone to errors. Hence rename the config to indicate BeaglePlay with official TI support in order to re-use the canonical name in a separate layer. Signed-off-by: Denys Dmytriyenko --- meta-ti-bsp/conf/machine/beagleplay-k3r5.conf | 17 ----- meta-ti-bsp/conf/machine/beagleplay-ti-k3r5.conf | 17 +++++ meta-ti-bsp/conf/machine/beagleplay-ti.conf | 96 ++++++++++++++++++++++++ meta-ti-bsp/conf/machine/beagleplay.conf | 96 ------------------------ 4 files changed, 113 insertions(+), 113 deletions(-) delete mode 100644 meta-ti-bsp/conf/machine/beagleplay-k3r5.conf create mode 100644 meta-ti-bsp/conf/machine/beagleplay-ti-k3r5.conf create mode 100644 meta-ti-bsp/conf/machine/beagleplay-ti.conf delete mode 100644 meta-ti-bsp/conf/machine/beagleplay.conf diff --git a/meta-ti-bsp/conf/machine/beagleplay-k3r5.conf b/meta-ti-bsp/conf/machine/beagleplay-k3r5.conf deleted file mode 100644 index 3844ccfa..00000000 --- a/meta-ti-bsp/conf/machine/beagleplay-k3r5.conf +++ /dev/null @@ -1,17 +0,0 @@ -#@TYPE: Machine -#@NAME: BeaglePlay (R5F) -#@DESCRIPTION: Machine configuration for the BeaglePlay (R5F core) - -require conf/machine/include/k3r5.inc - -SYSFW_SOC = "am62x" -SYSFW_CONFIG = "evm" -SYSFW_SUFFIX = "gp" - -UBOOT_MACHINE = "am62x_evm_r5_defconfig" -UBOOT_MACHINE:bsp-ti-6_6 = "am62x_beagleplay_r5_defconfig" -UBOOT_MACHINE:bsp-ti-6_12 = "am62x_beagleplay_r5_defconfig" - -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-ti-k3r5.conf b/meta-ti-bsp/conf/machine/beagleplay-ti-k3r5.conf new file mode 100644 index 00000000..3844ccfa --- /dev/null +++ b/meta-ti-bsp/conf/machine/beagleplay-ti-k3r5.conf @@ -0,0 +1,17 @@ +#@TYPE: Machine +#@NAME: BeaglePlay (R5F) +#@DESCRIPTION: Machine configuration for the BeaglePlay (R5F core) + +require conf/machine/include/k3r5.inc + +SYSFW_SOC = "am62x" +SYSFW_CONFIG = "evm" +SYSFW_SUFFIX = "gp" + +UBOOT_MACHINE = "am62x_evm_r5_defconfig" +UBOOT_MACHINE:bsp-ti-6_6 = "am62x_beagleplay_r5_defconfig" +UBOOT_MACHINE:bsp-ti-6_12 = "am62x_beagleplay_r5_defconfig" + +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-ti.conf b/meta-ti-bsp/conf/machine/beagleplay-ti.conf new file mode 100644 index 00000000..3ae10171 --- /dev/null +++ b/meta-ti-bsp/conf/machine/beagleplay-ti.conf @@ -0,0 +1,96 @@ +#@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 gpu" + +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_evm_a53_defconfig" +UBOOT_MACHINE:bsp-ti-6_6 = "am62x_beagleplay_a53_defconfig" +UBOOT_MACHINE:bsp-ti-6_12 = "am62x_beagleplay_a53_defconfig" + +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 \ + 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-phyboard-lyra-1-4-ghz-opp.dtbo \ + ti/k3-am625-phyboard-lyra-rdk.dtb \ + ti/k3-am625-sk.dtb \ + ti/k3-am625-verdin-nonwifi-dahlia.dtb \ + ti/k3-am625-verdin-nonwifi-dev.dtb \ + ti/k3-am625-verdin-nonwifi-mallow.dtb \ + ti/k3-am625-verdin-nonwifi-yavia.dtb \ + ti/k3-am625-verdin-wifi-dahlia.dtb \ + ti/k3-am625-verdin-wifi-dev.dtb \ + ti/k3-am625-verdin-wifi-mallow.dtb \ + ti/k3-am625-verdin-wifi-yavia.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 \ +" + +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/conf/machine/beagleplay.conf b/meta-ti-bsp/conf/machine/beagleplay.conf deleted file mode 100644 index 3ae10171..00000000 --- a/meta-ti-bsp/conf/machine/beagleplay.conf +++ /dev/null @@ -1,96 +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 gpu" - -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_evm_a53_defconfig" -UBOOT_MACHINE:bsp-ti-6_6 = "am62x_beagleplay_a53_defconfig" -UBOOT_MACHINE:bsp-ti-6_12 = "am62x_beagleplay_a53_defconfig" - -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 \ - 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-phyboard-lyra-1-4-ghz-opp.dtbo \ - ti/k3-am625-phyboard-lyra-rdk.dtb \ - ti/k3-am625-sk.dtb \ - ti/k3-am625-verdin-nonwifi-dahlia.dtb \ - ti/k3-am625-verdin-nonwifi-dev.dtb \ - ti/k3-am625-verdin-nonwifi-mallow.dtb \ - ti/k3-am625-verdin-nonwifi-yavia.dtb \ - ti/k3-am625-verdin-wifi-dahlia.dtb \ - ti/k3-am625-verdin-wifi-dev.dtb \ - ti/k3-am625-verdin-wifi-mallow.dtb \ - ti/k3-am625-verdin-wifi-yavia.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 \ -" - -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" -- cgit v1.2.3-54-g00ecf