From 1644eaefd21f79e6e7a455224970dce0b17b5f7b Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Fri, 13 Dec 2024 18:31:56 -0500 Subject: conf/machine: split beagleplay config between meta-ti-bsp and meta-beagle Extract "bb_org" BSP specific settings from beagleplay-ti in meta-ti-bsp and move them to own beagleplay machine config in meta-beagle. The differences between 2 configs are minimal, hence beagleplay in meta-beagle inherits beagleplay-ti from meta-ti-bsp as a base and only adjusts what's needed. Signed-off-by: Denys Dmytriyenko --- meta-beagle/conf/machine/beagleplay-k3r5.conf | 8 ++++ meta-beagle/conf/machine/beagleplay.conf | 45 +++++++++++++++++++++ meta-ti-bsp/conf/machine/beagleplay-ti-k3r5.conf | 1 - meta-ti-bsp/conf/machine/beagleplay-ti.conf | 51 +----------------------- 4 files changed, 55 insertions(+), 50 deletions(-) create mode 100644 meta-beagle/conf/machine/beagleplay-k3r5.conf create mode 100644 meta-beagle/conf/machine/beagleplay.conf diff --git a/meta-beagle/conf/machine/beagleplay-k3r5.conf b/meta-beagle/conf/machine/beagleplay-k3r5.conf new file mode 100644 index 00000000..1423aa10 --- /dev/null +++ b/meta-beagle/conf/machine/beagleplay-k3r5.conf @@ -0,0 +1,8 @@ +#@TYPE: Machine +#@NAME: BeaglePlay (R5F) +#@DESCRIPTION: Machine configuration for the BeaglePlay (R5F core) + +require conf/machine/beagleplay-ti-k3r5.conf +require conf/machine/include/beagle-bsp.inc + +UBOOT_CONFIG_FRAGMENTS:bsp-bb_org = "am625_beagleplay_r5.config" diff --git a/meta-beagle/conf/machine/beagleplay.conf b/meta-beagle/conf/machine/beagleplay.conf new file mode 100644 index 00000000..1977b4c1 --- /dev/null +++ b/meta-beagle/conf/machine/beagleplay.conf @@ -0,0 +1,45 @@ +#@TYPE: Machine +#@NAME: BeaglePlay (A53) +#@DESCRIPTION: Machine configuration for the BeaglePlay board (A53 core) + +require conf/machine/beagleplay-ti.conf +require conf/machine/include/beagle-bsp.inc + +UBOOT_CONFIG_FRAGMENTS:bsp-bb_org = "am625_beagleplay_a53.config" + +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 \ +" diff --git a/meta-ti-bsp/conf/machine/beagleplay-ti-k3r5.conf b/meta-ti-bsp/conf/machine/beagleplay-ti-k3r5.conf index 3844ccfa..c27e0abc 100644 --- a/meta-ti-bsp/conf/machine/beagleplay-ti-k3r5.conf +++ b/meta-ti-bsp/conf/machine/beagleplay-ti-k3r5.conf @@ -12,6 +12,5 @@ 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 index 3ae10171..68d6dced 100644 --- a/meta-ti-bsp/conf/machine/beagleplay-ti.conf +++ b/meta-ti-bsp/conf/machine/beagleplay-ti.conf @@ -24,14 +24,14 @@ 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-am625-beagle \ + ti/k3-am625-sk \ ti/k3-am62x-sk \ " @@ -39,58 +39,11 @@ 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