Beagle kernels can also make use of ti-devicetree-prefix, the only reason they do not is it is explicitly disabled in beagle-bsp.inc. Remove the lines clearing KERNEL_DEVICETREE_PREFIX so it can work on Beagle devices.
Remove all KERNEL_DEVICETREE lines already covered by a _PREFIX. Signed-off-by: Andrew Davis <[email protected]> --- meta-beagle/conf/machine/beagle-x15.conf | 31 ------- meta-beagle/conf/machine/beaglebadge-ti.conf | 2 - meta-beagle/conf/machine/beaglebone-ai64.conf | 74 --------------- meta-beagle/conf/machine/beaglebone.conf | 45 ---------- meta-beagle/conf/machine/beagleplay-ti.conf | 11 --- meta-beagle/conf/machine/beagleplay.conf | 57 ------------ meta-beagle/conf/machine/beagley-ai.conf | 90 ------------------- .../conf/machine/include/beagle-bsp.inc | 2 - meta-beagle/conf/machine/pocketbeagle2.conf | 37 +------- .../recipes-kernel/linux/linux-bb.org_6.12.bb | 37 ++------ .../recipes-kernel/linux/linux-bb.org_6.6.bb | 39 ++------ 11 files changed, 13 insertions(+), 412 deletions(-) diff --git a/meta-beagle/conf/machine/beagle-x15.conf b/meta-beagle/conf/machine/beagle-x15.conf index d0368924..ed7ffd3d 100644 --- a/meta-beagle/conf/machine/beagle-x15.conf +++ b/meta-beagle/conf/machine/beagle-x15.conf @@ -10,37 +10,6 @@ KERNEL_DEVICETREE_PREFIX = " \ ti/omap/am57xx-idk-lcd \ " -KERNEL_DEVICETREE:bsp-bb_org-6_6 = " \ -ti/omap/am571x-idk.dtb \ -ti/omap/am571x-idk-touchscreen.dtbo \ -ti/omap/am5729-beagleboneai.dtb \ -ti/omap/am572x-idk.dtb \ -ti/omap/am572x-idk-touchscreen.dtbo \ -ti/omap/am574x-idk.dtb \ -ti/omap/am57xx-beagle-x15.dtb \ -ti/omap/am57xx-beagle-x15-revb1.dtb \ -ti/omap/am57xx-beagle-x15-revc.dtb \ -ti/omap/am57xx-evm.dtbo \ -ti/omap/am57xx-idk-lcd-osd101t2045.dtbo \ -ti/omap/am57xx-idk-lcd-osd101t2587.dtbo \ -" - -KERNEL_DEVICETREE:bsp-bb_org-6_12 = " \ -ti/omap/am571x-idk.dtb \ -ti/omap/am571x-idk-touchscreen.dtbo \ -ti/omap/am5729-beagleboneai.dtb \ -ti/omap/am572x-idk.dtb \ -ti/omap/am572x-idk-touchscreen.dtbo \ -ti/omap/am574x-idk.dtb \ -ti/omap/am57xx-beagle-x15.dtb \ -ti/omap/am57xx-beagle-x15-revb1.dtb \ -ti/omap/am57xx-beagle-x15-revc.dtb \ -ti/omap/am57xx-evm.dtbo \ -ti/omap/am57xx-evm-ov10635.dtbo \ -ti/omap/am57xx-idk-lcd-osd101t2045.dtbo \ -ti/omap/am57xx-idk-lcd-osd101t2587.dtbo \ -" - MACHINE_GUI_CLASS = "bigscreen" SERIAL_CONSOLES = "115200;ttyS2" diff --git a/meta-beagle/conf/machine/beaglebadge-ti.conf b/meta-beagle/conf/machine/beaglebadge-ti.conf index 78525030..0f2c2dd1 100644 --- a/meta-beagle/conf/machine/beaglebadge-ti.conf +++ b/meta-beagle/conf/machine/beaglebadge-ti.conf @@ -14,8 +14,6 @@ KERNEL_DEVICETREE_PREFIX = " \ ti/k3-am62l3-badge \ " -KERNEL_DEVICETREE = "" - UBOOT_MACHINE = "am62lx_badge_defconfig" TFA_BOARD = "am62l3-badge" diff --git a/meta-beagle/conf/machine/beaglebone-ai64.conf b/meta-beagle/conf/machine/beaglebone-ai64.conf index 0504832c..c11a2cc7 100644 --- a/meta-beagle/conf/machine/beaglebone-ai64.conf +++ b/meta-beagle/conf/machine/beaglebone-ai64.conf @@ -13,80 +13,6 @@ KERNEL_DEVICETREE_PREFIX = " \ ti/k3-j721e \ " -KERNEL_DEVICETREE:bsp-bb_org-6_6 = " \ -ti/k3-j721e-beagleboneai64-BBORG_MOTOR.dtbo \ -ti/k3-j721e-beagleboneai64-dsi-rpi-7inch-panel.dtbo \ -ti/k3-j721e-beagleboneai64.dtb \ -ti/k3-j721e-beagleboneai64-microtips-mf070zima-lcd3.dtbo \ -ti/k3-j721e-beagleboneai64-pwm-epwm0-p8_13.dtbo \ -ti/k3-j721e-beagleboneai64-pwm-epwm0-p8_13-p8_19.dtbo \ -ti/k3-j721e-beagleboneai64-pwm-epwm0-p8_19.dtbo \ -ti/k3-j721e-beagleboneai64-pwm-epwm2-p9_14.dtbo \ -ti/k3-j721e-beagleboneai64-pwm-epwm2-p9_14-p9_16.dtbo \ -ti/k3-j721e-beagleboneai64-pwm-epwm2-p9_16.dtbo \ -ti/k3-j721e-beagleboneai64-pwm-epwm4-p9_25.dtbo \ -ti/k3-j721e-beagleboneai64-spi-mcspi1-cs0.dtbo \ -ti/k3-j721e-beagleboneai64-spi-mcspi1-cs0-no-miso.dtbo \ -ti/k3-j721e-beagleboneai64-spi-mcspi2-cs0.dtbo \ -ti/k3-j721e-beagleboneai64-spi-mcspi3-cs0-no-miso.dtbo \ -ti/k3-j721e-beagleboneai64-spi-mcspi6-cs0-cs1.dtbo \ -ti/k3-j721e-beagleboneai64-spi-mcspi6-cs0.dtbo \ -ti/k3-j721e-beagleboneai64-spi-mcspi6-cs1-no-miso.dtbo \ -ti/k3-j721e-beagleboneai64-spi-mcspi7-cs0.dtbo \ -ti/k3-j721e-common-proc-board.dtb \ -ti/k3-j721e-common-proc-board-infotainment.dtbo \ -ti/k3-j721e-evm-csi2-ov5640.dtbo \ -ti/k3-j721e-evm-ethfw.dtbo \ -ti/k3-j721e-evm-fusion.dtbo \ -ti/k3-j721e-evm-gesi-exp-board.dtbo \ -ti/k3-j721e-evm-ina2xx.dtbo \ -ti/k3-j721e-evm-pcie0-ep.dtbo \ -ti/k3-j721e-evm-pcie1-ep.dtbo \ -ti/k3-j721e-evm-quad-port-eth-exp.dtbo \ -ti/k3-j721e-sk-csi2-dual-imx219.dtbo \ -ti/k3-j721e-sk-csi2-ov5640.dtbo \ -ti/k3-j721e-sk.dtb \ -ti/k3-j721e-sk-fpdlink-fusion.dtbo \ -ti/k3-j721e-sk-rpi-hdr-ehrpwm.dtbo \ -" - -KERNEL_DEVICETREE:bsp-bb_org-6_12 = " \ -ti/k3-j721e-beagleboneai64-BBORG_MOTOR.dtbo \ -ti/k3-j721e-beagleboneai64-dsi-rpi-7inch-panel.dtbo \ -ti/k3-j721e-beagleboneai64.dtb \ -ti/k3-j721e-beagleboneai64-microtips-mf070zima-lcd3.dtbo \ -ti/k3-j721e-beagleboneai64-pwm-epwm0-p8_13.dtbo \ -ti/k3-j721e-beagleboneai64-pwm-epwm0-p8_13-p8_19.dtbo \ -ti/k3-j721e-beagleboneai64-pwm-epwm0-p8_19.dtbo \ -ti/k3-j721e-beagleboneai64-pwm-epwm2-p9_14.dtbo \ -ti/k3-j721e-beagleboneai64-pwm-epwm2-p9_14-p9_16.dtbo \ -ti/k3-j721e-beagleboneai64-pwm-epwm2-p9_16.dtbo \ -ti/k3-j721e-beagleboneai64-pwm-epwm4-p9_25.dtbo \ -ti/k3-j721e-beagleboneai64-spi-mcspi1-cs0.dtbo \ -ti/k3-j721e-beagleboneai64-spi-mcspi1-cs0-no-miso.dtbo \ -ti/k3-j721e-beagleboneai64-spi-mcspi2-cs0.dtbo \ -ti/k3-j721e-beagleboneai64-spi-mcspi3-cs0-no-miso.dtbo \ -ti/k3-j721e-beagleboneai64-spi-mcspi6-cs0-cs1.dtbo \ -ti/k3-j721e-beagleboneai64-spi-mcspi6-cs0.dtbo \ -ti/k3-j721e-beagleboneai64-spi-mcspi6-cs1-no-miso.dtbo \ -ti/k3-j721e-beagleboneai64-spi-mcspi7-cs0.dtbo \ -ti/k3-j721e-common-proc-board.dtb \ -ti/k3-j721e-common-proc-board-infotainment.dtbo \ -ti/k3-j721e-evm-csi2-ov5640.dtbo \ -ti/k3-j721e-evm-ethfw.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-pcie1-ep.dtbo \ -ti/k3-j721e-evm-pcie-ntb.dtbo \ -ti/k3-j721e-evm-quad-port-eth-exp.dtbo \ -ti/k3-j721e-evm-ub954.dtbo \ -ti/k3-j721e-sk-csi2-dual-imx219.dtbo \ -ti/k3-j721e-sk-csi2-ov5640.dtbo \ -ti/k3-j721e-sk.dtb \ -ti/k3-j721e-sk-fpdlink-fusion.dtbo \ -" - MACHINE_GUI_CLASS = "bigscreen" # TI has moved a driver out of its kernel tree and into an out of tree module. diff --git a/meta-beagle/conf/machine/beaglebone.conf b/meta-beagle/conf/machine/beaglebone.conf index 50d09e3e..e019a623 100644 --- a/meta-beagle/conf/machine/beaglebone.conf +++ b/meta-beagle/conf/machine/beaglebone.conf @@ -11,51 +11,6 @@ KERNEL_DEVICETREE_PREFIX = " \ ti/omap/am335x-sancloud-bbe \ " -KERNEL_DEVICETREE:bsp-bb_org-6_6 = " \ -ti/omap/am335x-boneblack.dtb \ -ti/omap/am335x-boneblack-revd.dtb \ -ti/omap/am335x-boneblack-uboot.dtb \ -ti/omap/am335x-boneblack-uboot-univ.dtb \ -ti/omap/am335x-boneblack-wireless.dtb \ -ti/omap/am335x-boneblue.dtb \ -ti/omap/am335x-bone.dtb \ -ti/omap/am335x-bonegreen.dtb \ -ti/omap/am335x-bonegreen-gateway.dtb \ -ti/omap/am335x-bonegreen-wireless.dtb \ -ti/omap/am335x-bonegreen-wireless-uboot-univ.dtb \ -ti/omap/am335x-evm.dtb \ -ti/omap/am335x-evmsk.dtb \ -ti/omap/am335x-icev2.dtb \ -ti/omap/am335x-osd3358-sm-red.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 \ -" - -KERNEL_DEVICETREE:bsp-bb_org-6_12 = " \ -ti/omap/am335x-boneblack.dtb \ -ti/omap/am335x-boneblack-revd.dtb \ -ti/omap/am335x-boneblack-uboot.dtb \ -ti/omap/am335x-boneblack-uboot-univ.dtb \ -ti/omap/am335x-boneblack-wireless.dtb \ -ti/omap/am335x-boneblue.dtb \ -ti/omap/am335x-bone.dtb \ -ti/omap/am335x-bonegreen.dtb \ -ti/omap/am335x-bonegreen-eco.dtb \ -ti/omap/am335x-bonegreen-gateway.dtb \ -ti/omap/am335x-bonegreen-wireless.dtb \ -ti/omap/am335x-bonegreen-wireless-uboot-univ.dtb \ -ti/omap/am335x-evm.dtb \ -ti/omap/am335x-evmsk.dtb \ -ti/omap/am335x-icev2.dtb \ -ti/omap/am335x-osd3358-sm-red.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 \ -" - MACHINE_GUI_CLASS = "bigscreen" MACHINE_FEATURES += "screen" diff --git a/meta-beagle/conf/machine/beagleplay-ti.conf b/meta-beagle/conf/machine/beagleplay-ti.conf index 4e69c819..905938cc 100644 --- a/meta-beagle/conf/machine/beagleplay-ti.conf +++ b/meta-beagle/conf/machine/beagleplay-ti.conf @@ -16,15 +16,4 @@ KERNEL_DEVICETREE_PREFIX = " \ 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-beagle/conf/machine/beagleplay.conf b/meta-beagle/conf/machine/beagleplay.conf index 218dcc63..84833ffb 100644 --- a/meta-beagle/conf/machine/beagleplay.conf +++ b/meta-beagle/conf/machine/beagleplay.conf @@ -5,60 +5,3 @@ require conf/machine/beagleplay-ti.conf require conf/machine/include/beagle-bsp.inc - -KERNEL_DEVICETREE:bsp-bb_org-6_6 = " \ -ti/k3-am625-beagleplay-csi2-ov5640.dtbo \ -ti/k3-am625-beagleplay-csi2-tevi-ov5640.dtbo \ -ti/k3-am625-beagleplay.dtb \ -ti/k3-am625-beagleplay-lincolntech-lcd185-panel.dtbo \ -ti/k3-am625-minimal.dtb \ -ti/k3-am625-sk.dtb \ -ti/k3-am625-sk-ecap-capture.dtbo \ -ti/k3-am625-sk-lincolntech-lcd185-panel.dtbo \ -ti/k3-am625-sk-m2-cc3301.dtbo \ -ti/k3-am625-sk-mcspi-loopback.dtbo \ -ti/k3-am625-sk-microtips-mf101hie-panel.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-dmtimer-pwm.dtbo \ -ti/k3-am62x-sk-eqep.dtbo \ -ti/k3-am62x-sk-fastboot-disable-hdmi.dtbo \ -ti/k3-am62x-sk-hdmi-audio.dtbo \ -ti/k3-am62x-sk-lpm-wkup-sources.dtbo \ -ti/k3-am62x-sk-mcan.dtbo \ -ti/k3-am62x-sk-microtips-mf103hie-lcd2.dtbo \ -ti/k3-am62x-sk-pwm.dtbo \ -" - -KERNEL_DEVICETREE:bsp-bb_org-6_12 = " \ -ti/k3-am625-beagleplay-bcfserial-no-firmware.dtbo \ -ti/k3-am625-beagleplay-csi2-ov5640.dtbo \ -ti/k3-am625-beagleplay-csi2-tevi-ov5640.dtbo \ -ti/k3-am625-beagleplay.dtb \ -ti/k3-am625-beagleplay-lincolntech-lcd185-panel.dtbo \ -ti/k3-am625-minimal.dtb \ -ti/k3-am625-sk.dtb \ -ti/k3-am625-sk-lincolntech-lcd185-panel.dtbo \ -ti/k3-am625-sk-m2-cc3351.dtbo \ -ti/k3-am625-sk-microtips-mf101hie-panel.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-dmtimer-pwm.dtbo \ -ti/k3-am62x-sk-ecap-capture.dtbo \ -ti/k3-am62x-sk-eqep.dtbo \ -ti/k3-am62x-sk-fastboot-disable-hdmi.dtbo \ -ti/k3-am62x-sk-hdmi-audio.dtbo \ -ti/k3-am62x-sk-lpm-io-ddr-wkup-sources.dtbo \ -ti/k3-am62x-sk-lpm-standby.dtbo \ -ti/k3-am62x-sk-lpm-wkup-sources.dtbo \ -ti/k3-am62x-sk-mcan.dtbo \ -ti/k3-am62x-sk-mcspi-loopback.dtbo \ -ti/k3-am62x-sk-microtips-mf103hie-lcd2.dtbo \ -ti/k3-am62x-sk-pwm.dtbo \ -" diff --git a/meta-beagle/conf/machine/beagley-ai.conf b/meta-beagle/conf/machine/beagley-ai.conf index d2c68201..f6215891 100644 --- a/meta-beagle/conf/machine/beagley-ai.conf +++ b/meta-beagle/conf/machine/beagley-ai.conf @@ -8,94 +8,4 @@ require conf/machine/include/beagle-bsp.inc UBOOT_MACHINE:bsp-bb_org-6_6 = "j722s_evm_a53_config" -KERNEL_DEVICETREE:bsp-bb_org-6_6 = " \ -ti/k3-am67a-beagley-ai.dtb \ -ti/k3-am67a-beagley-ai-i2c1-400000.dtbo \ -ti/k3-am67a-beagley-ai-i2c1-ads1115.dtbo \ -ti/k3-am67a-beagley-ai-i2c1-rtc-rv3028.dtbo \ -ti/k3-am67a-beagley-ai-i2c1-ssd1306.dtbo \ -ti/k3-am67a-beagley-ai-mikroe-eth.dtbo \ -ti/k3-am67a-beagley-ai-mikroe-microsd.dtbo \ -ti/k3-am67a-beagley-ai-pps-gpio18.dtbo \ -ti/k3-am67a-beagley-ai-pwm-ecap0-gpio12.dtbo \ -ti/k3-am67a-beagley-ai-pwm-ecap1-gpio16.dtbo \ -ti/k3-am67a-beagley-ai-pwm-ecap1-gpio21.dtbo \ -ti/k3-am67a-beagley-ai-pwm-ecap2-gpio17.dtbo \ -ti/k3-am67a-beagley-ai-pwm-ecap2-gpio18.dtbo \ -ti/k3-am67a-beagley-ai-pwm-epwm0-gpio12.dtbo \ -ti/k3-am67a-beagley-ai-pwm-epwm0-gpio14.dtbo \ -ti/k3-am67a-beagley-ai-pwm-epwm0-gpio15.dtbo \ -ti/k3-am67a-beagley-ai-pwm-epwm0-gpio15-gpio12.dtbo \ -ti/k3-am67a-beagley-ai-pwm-epwm0-gpio15-gpio14.dtbo \ -ti/k3-am67a-beagley-ai-pwm-epwm0-gpio5.dtbo \ -ti/k3-am67a-beagley-ai-pwm-epwm0-gpio5-gpio12.dtbo \ -ti/k3-am67a-beagley-ai-pwm-epwm0-gpio5-gpio14.dtbo \ -ti/k3-am67a-beagley-ai-pwm-epwm1-gpio13.dtbo \ -ti/k3-am67a-beagley-ai-pwm-epwm1-gpio20.dtbo \ -ti/k3-am67a-beagley-ai-pwm-epwm1-gpio21.dtbo \ -ti/k3-am67a-beagley-ai-pwm-epwm1-gpio21-gpio13.dtbo \ -ti/k3-am67a-beagley-ai-pwm-epwm1-gpio21-gpio20.dtbo \ -ti/k3-am67a-beagley-ai-pwm-epwm1-gpio6.dtbo \ -ti/k3-am67a-beagley-ai-pwm-epwm1-gpio6-gpio13.dtbo \ -ti/k3-am67a-beagley-ai-pwm-epwm1-gpio6-gpio20.dtbo \ -ti/k3-am67a-beagley-ai-spi0-1cs.dtbo \ -ti/k3-am67a-beagley-ai-spi0-2cs.dtbo \ -ti/k3-am67a-beagley-ai-spidev0.dtbo \ -ti/k3-am67a-beagley-ai-uart-ttyama0.dtbo \ -ti/k3-j722s-evm-csi2-ov5640.dtbo \ -ti/k3-j722s-evm-csi2-quad-rpi-cam-imx219.dtbo \ -ti/k3-j722s-evm-csi2-quad-tevi-ov5640.dtbo \ -ti/k3-j722s-evm-dsi-rpi-7inch-panel.dtbo \ -ti/k3-j722s-evm.dtb \ -ti/k3-j722s-evm-fpdlink-fusion.dtbo \ -ti/k3-j722s-evm-microtips-mf101hie-panel.dtbo \ -ti/k3-j722s-evm-pwm.dtbo \ -ti/k3-j722s-evm-v3link-fusion.dtbo \ -" - -KERNEL_DEVICETREE:bsp-bb_org-6_12 = " \ -ti/k3-am67a-beagley-ai.dtb \ -ti/k3-am67a-beagley-ai-i2c1-400000.dtbo \ -ti/k3-am67a-beagley-ai-i2c1-ads1115.dtbo \ -ti/k3-am67a-beagley-ai-i2c1-rtc-rv3028.dtbo \ -ti/k3-am67a-beagley-ai-i2c1-ssd1306.dtbo \ -ti/k3-am67a-beagley-ai-mikroe-eth.dtbo \ -ti/k3-am67a-beagley-ai-mikroe-microsd.dtbo \ -ti/k3-am67a-beagley-ai-pps-gpio18.dtbo \ -ti/k3-am67a-beagley-ai-pwm-ecap0-gpio12.dtbo \ -ti/k3-am67a-beagley-ai-pwm-ecap1-gpio16.dtbo \ -ti/k3-am67a-beagley-ai-pwm-ecap1-gpio21.dtbo \ -ti/k3-am67a-beagley-ai-pwm-ecap2-gpio17.dtbo \ -ti/k3-am67a-beagley-ai-pwm-ecap2-gpio18.dtbo \ -ti/k3-am67a-beagley-ai-pwm-epwm0-gpio12.dtbo \ -ti/k3-am67a-beagley-ai-pwm-epwm0-gpio14.dtbo \ -ti/k3-am67a-beagley-ai-pwm-epwm0-gpio15.dtbo \ -ti/k3-am67a-beagley-ai-pwm-epwm0-gpio15-gpio12.dtbo \ -ti/k3-am67a-beagley-ai-pwm-epwm0-gpio15-gpio14.dtbo \ -ti/k3-am67a-beagley-ai-pwm-epwm0-gpio5.dtbo \ -ti/k3-am67a-beagley-ai-pwm-epwm0-gpio5-gpio12.dtbo \ -ti/k3-am67a-beagley-ai-pwm-epwm0-gpio5-gpio14.dtbo \ -ti/k3-am67a-beagley-ai-pwm-epwm1-gpio13.dtbo \ -ti/k3-am67a-beagley-ai-pwm-epwm1-gpio20.dtbo \ -ti/k3-am67a-beagley-ai-pwm-epwm1-gpio21.dtbo \ -ti/k3-am67a-beagley-ai-pwm-epwm1-gpio21-gpio13.dtbo \ -ti/k3-am67a-beagley-ai-pwm-epwm1-gpio21-gpio20.dtbo \ -ti/k3-am67a-beagley-ai-pwm-epwm1-gpio6.dtbo \ -ti/k3-am67a-beagley-ai-pwm-epwm1-gpio6-gpio13.dtbo \ -ti/k3-am67a-beagley-ai-pwm-epwm1-gpio6-gpio20.dtbo \ -ti/k3-am67a-beagley-ai-spi0-1cs.dtbo \ -ti/k3-am67a-beagley-ai-spi0-2cs.dtbo \ -ti/k3-am67a-beagley-ai-spidev0.dtbo \ -ti/k3-am67a-beagley-ai-uart-ttyama0.dtbo \ -ti/k3-j722s-evm-csi2-quad-rpi-cam-imx219.dtbo \ -ti/k3-j722s-evm-csi2-quad-tevi-ov5640.dtbo \ -ti/k3-j722s-evm-dsi-rpi-7inch-panel.dtbo \ -ti/k3-j722s-evm.dtb \ -ti/k3-j722s-evm-fpdlink-fusion.dtbo \ -ti/k3-j722s-evm-fpdlink-iv-fusion.dtbo \ -ti/k3-j722s-evm-microtips-mf101hie-panel.dtbo \ -ti/k3-j722s-evm-pwm.dtbo \ -ti/k3-j722s-evm-v3link-fusion.dtbo \ -" - MACHINE_GUI_CLASS = "bigscreen" diff --git a/meta-beagle/conf/machine/include/beagle-bsp.inc b/meta-beagle/conf/machine/include/beagle-bsp.inc index 09c66668..2efc32aa 100644 --- a/meta-beagle/conf/machine/include/beagle-bsp.inc +++ b/meta-beagle/conf/machine/include/beagle-bsp.inc @@ -14,7 +14,6 @@ BSP_KERNEL_PROVIDER:bsp-bb_org-6_12 = "linux-bb.org" BSP_KERNEL_VERSION:bsp-bb_org-6_12 = "6.12.%" BSP_BOOTLOADER_PROVIDER:bsp-bb_org-6_12 = "u-boot-bb.org" BSP_BOOTLOADER_VERSION:bsp-bb_org-6_12 = "2025.%" -KERNEL_DEVICETREE_PREFIX:bsp-bb_org-6_12 = "" TI_CORE_INITRAMFS_KERNEL_MODULES:bsp-bb_org-6_12 = "" BSP_SGX_DRIVER_PROVIDER:bsp-bb_org-6_12 = "ti-sgx-ddk-km" @@ -36,7 +35,6 @@ BSP_KERNEL_PROVIDER:bsp-bb_org-6_6 = "linux-bb.org" BSP_KERNEL_VERSION:bsp-bb_org-6_6 = "6.6.%" BSP_BOOTLOADER_PROVIDER:bsp-bb_org-6_6 = "u-boot-bb.org" BSP_BOOTLOADER_VERSION:bsp-bb_org-6_6 = "2024.%" -KERNEL_DEVICETREE_PREFIX:bsp-bb_org-6_6 = "" TI_CORE_INITRAMFS_KERNEL_MODULES:bsp-bb_org-6_6 = "" BSP_SGX_DRIVER_PROVIDER:bsp-bb_org-6_6 = "ti-sgx-ddk-km" diff --git a/meta-beagle/conf/machine/pocketbeagle2.conf b/meta-beagle/conf/machine/pocketbeagle2.conf index bf10d565..33df38bb 100644 --- a/meta-beagle/conf/machine/pocketbeagle2.conf +++ b/meta-beagle/conf/machine/pocketbeagle2.conf @@ -19,40 +19,7 @@ UBOOT_MACHINE = "am62_pocketbeagle2_a53_defconfig" KERNEL_DEVICETREE_PREFIX = " \ ti/k3-am6232 \ + ti/k3-am625 \ ti/k3-am62-pocket \ -" - -KERNEL_DEVICETREE = " \ -ti/k3-am6232-pocketbeagle2.dtb \ -ti/k3-am6232-pocketbeagle2-techlab-cape.dtbo \ -ti/k3-am625-minimal.dtb \ -ti/k3-am625-sk.dtb \ -ti/k3-am625-sk-lincolntech-lcd185-panel.dtbo \ -ti/k3-am625-sk-m2-cc3351.dtbo \ -ti/k3-am625-sk-microtips-mf101hie-panel.dtbo \ -ti/k3-am625-sk-rpi-hdr-ehrpwm.dtbo \ -ti/k3-am62-pocketbeagle2-ardupilot-cape.dtbo \ -ti/k3-am62-pocketbeagle2.dtb \ -ti/k3-am62-pocketbeagle2-led-all.dtbo \ -ti/k3-am62-pocketbeagle2-leds-off.dtbo \ -ti/k3-am62-pocketbeagle2-mspm0swd.dtbo \ -ti/k3-am62-pocketbeagle2-pru0-out.dtbo \ -ti/k3-am62-pocketbeagle2-spi2-eth-wiz-click.dtbo \ -ti/k3-am62-pocketbeagle2-techlab-cape.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-dmtimer-pwm.dtbo \ -ti/k3-am62x-sk-ecap-capture.dtbo \ -ti/k3-am62x-sk-eqep.dtbo \ -ti/k3-am62x-sk-fastboot-disable-hdmi.dtbo \ -ti/k3-am62x-sk-hdmi-audio.dtbo \ -ti/k3-am62x-sk-lpm-io-ddr-wkup-sources.dtbo \ -ti/k3-am62x-sk-lpm-standby.dtbo \ -ti/k3-am62x-sk-lpm-wkup-sources.dtbo \ -ti/k3-am62x-sk-mcan.dtbo \ -ti/k3-am62x-sk-mcspi-loopback.dtbo \ -ti/k3-am62x-sk-microtips-mf103hie-lcd2.dtbo \ -ti/k3-am62x-sk-pwm.dtbo \ + ti/k3-am62x-sk \ " diff --git a/meta-beagle/recipes-kernel/linux/linux-bb.org_6.12.bb b/meta-beagle/recipes-kernel/linux/linux-bb.org_6.12.bb index b61eddce..756ddc65 100644 --- a/meta-beagle/recipes-kernel/linux/linux-bb.org_6.12.bb +++ b/meta-beagle/recipes-kernel/linux/linux-bb.org_6.12.bb @@ -18,38 +18,11 @@ DEPENDS += "gmp-native libmpc-native" KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}" # Extra DT overlays/capes -KERNEL_DEVICETREE:append:armv7a = " \ - ti/omap/BB-ADC-00A0.dtbo \ - ti/omap/BB-BBBW-WL1835-00A0.dtbo \ - ti/omap/BB-BBGG-WL1835-00A0.dtbo \ - ti/omap/BB-BBGW-WL1835-00A0.dtbo \ - ti/omap/BB-BONE-4D5R-01-00A1.dtbo \ - ti/omap/BB-BONE-eMMC1-01-00A0.dtbo \ - ti/omap/BB-BONE-LCD4-01-00A1.dtbo \ - ti/omap/BB-BONE-NH7C-01-A0.dtbo \ - ti/omap/BB-CAPE-DISP-CT4-00A0.dtbo \ - ti/omap/BB-HDMI-TDA998x-00A0.dtbo \ - ti/omap/BB-I2C1-MCP7940X-00A0.dtbo \ - ti/omap/BB-I2C1-RTC-DS3231.dtbo \ - ti/omap/BB-I2C1-RTC-PCF8563.dtbo \ - ti/omap/BB-I2C2-BME680.dtbo \ - ti/omap/BB-I2C2-MPU6050.dtbo \ - ti/omap/BB-LCD-ADAFRUIT-24-SPI1-00A0.dtbo \ - ti/omap/BB-NHDMI-TDA998x-00A0.dtbo \ - ti/omap/BBORG_COMMS-00A2.dtbo \ - ti/omap/BBORG_FAN-A000.dtbo \ - ti/omap/BBORG_RELAY-00A2.dtbo \ - ti/omap/BB-SPIDEV0-00A0.dtbo \ - ti/omap/BB-SPIDEV1-00A0.dtbo \ - ti/omap/BB-UART1-00A0.dtbo \ - ti/omap/BB-UART2-00A0.dtbo \ - ti/omap/BB-UART4-00A0.dtbo \ - ti/omap/BB-W1-P9.12-00A0.dtbo \ - ti/omap/BONE-ADC.dtbo \ - ti/omap/M-BB-BBG-00A0.dtbo \ - ti/omap/M-BB-BBGG-00A0.dtbo \ - ti/omap/PB-MIKROBUS-0.dtbo \ - ti/omap/PB-MIKROBUS-1.dtbo \ +KERNEL_DEVICETREE_PREFIX:append:armv7a = " \ + ti/omap/BB \ + ti/omap/BONE \ + ti/omap/M-BB \ + ti/omap/PB \ " S = "${UNPACKDIR}/${BB_GIT_DEFAULT_DESTSUFFIX}" diff --git a/meta-beagle/recipes-kernel/linux/linux-bb.org_6.6.bb b/meta-beagle/recipes-kernel/linux/linux-bb.org_6.6.bb index 37626a1d..74d1abd1 100644 --- a/meta-beagle/recipes-kernel/linux/linux-bb.org_6.6.bb +++ b/meta-beagle/recipes-kernel/linux/linux-bb.org_6.6.bb @@ -18,39 +18,12 @@ DEPENDS += "gmp-native libmpc-native" KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}" # Extra DT overlays/capes -KERNEL_DEVICETREE:append:armv7a = " \ - ti/omap/AM335X-PRU-UIO-00A0.dtbo \ - ti/omap/BB-ADC-00A0.dtbo \ - ti/omap/BB-BBBW-WL1835-00A0.dtbo \ - ti/omap/BB-BBGG-WL1835-00A0.dtbo \ - ti/omap/BB-BBGW-WL1835-00A0.dtbo \ - ti/omap/BB-BONE-4D5R-01-00A1.dtbo \ - ti/omap/BB-BONE-eMMC1-01-00A0.dtbo \ - ti/omap/BB-BONE-LCD4-01-00A1.dtbo \ - ti/omap/BB-BONE-NH7C-01-A0.dtbo \ - ti/omap/BB-CAPE-DISP-CT4-00A0.dtbo \ - ti/omap/BB-HDMI-TDA998x-00A0.dtbo \ - ti/omap/BB-I2C1-MCP7940X-00A0.dtbo \ - ti/omap/BB-I2C1-RTC-DS3231.dtbo \ - ti/omap/BB-I2C1-RTC-PCF8563.dtbo \ - ti/omap/BB-I2C2-BME680.dtbo \ - ti/omap/BB-I2C2-MPU6050.dtbo \ - ti/omap/BB-LCD-ADAFRUIT-24-SPI1-00A0.dtbo \ - ti/omap/BB-NHDMI-TDA998x-00A0.dtbo \ - ti/omap/BBORG_COMMS-00A2.dtbo \ - ti/omap/BBORG_FAN-A000.dtbo \ - ti/omap/BBORG_RELAY-00A2.dtbo \ - ti/omap/BB-SPIDEV0-00A0.dtbo \ - ti/omap/BB-SPIDEV1-00A0.dtbo \ - ti/omap/BB-UART1-00A0.dtbo \ - ti/omap/BB-UART2-00A0.dtbo \ - ti/omap/BB-UART4-00A0.dtbo \ - ti/omap/BB-W1-P9.12-00A0.dtbo \ - ti/omap/BONE-ADC.dtbo \ - ti/omap/M-BB-BBG-00A0.dtbo \ - ti/omap/M-BB-BBGG-00A0.dtbo \ - ti/omap/PB-MIKROBUS-0.dtbo \ - ti/omap/PB-MIKROBUS-1.dtbo \ +KERNEL_DEVICETREE_PREFIX:append:armv7a = " \ + ti/omap/AM335X \ + ti/omap/BB \ + ti/omap/BONE \ + ti/omap/M-BB \ + ti/omap/PB \ " S = "${UNPACKDIR}/${BB_GIT_DEFAULT_DESTSUFFIX}" -- 2.39.2
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#20077): https://lists.yoctoproject.org/g/meta-ti/message/20077 Mute This Topic: https://lists.yoctoproject.org/mt/119963639/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
