Skip to contentSkip to conversation

meta-beagle: Make use of ti-devicetree-prefix

RFC PATCH New Andrew Davis 1 participant 1 message Jun 24

lore
Share & tools
lore
#0 lore raw

RFC PATCH 1/1 meta-beagle: Make use of ti-devicetree-prefix

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.

---
 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(-)
meta-beagle/conf/machine/beagle-x15.conf +0 -31
index d0368924..ed7ffd3d 100644
@@ -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"
meta-beagle/conf/machine/beaglebadge-ti.conf +0 -2
index 78525030..0f2c2dd1 100644
@@ -14,8 +14,6 @@ KERNEL_DEVICETREE_PREFIX = " \
     ti/k3-am62l3-badge \
 "
 
-KERNEL_DEVICETREE = ""
-
 UBOOT_MACHINE = "am62lx_badge_defconfig"
 
 TFA_BOARD = "am62l3-badge"
meta-beagle/conf/machine/beaglebone-ai64.conf +0 -74

80 lines not on this page · raw message

meta-beagle/conf/machine/beaglebone.conf +0 -45

51 lines not on this page · raw message

meta-beagle/conf/machine/beagleplay-ti.conf +0 -11
index 4e69c819..905938cc 100644
@@ -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"
meta-beagle/conf/machine/beagleplay.conf +0 -57

60 lines not on this page · raw message

meta-beagle/conf/machine/beagley-ai.conf +0 -90

94 lines not on this page · raw message

meta-beagle/conf/machine/include/beagle-bsp.inc +0 -2
index 09c66668..2efc32aa 100644
@@ -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"
meta-beagle/conf/machine/pocketbeagle2.conf +2 -35
index bf10d565..33df38bb 100644
@@ -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 \
 "
meta-beagle/recipes-kernel/linux/linux-bb.org_6.12.bb +5 -32
index b61eddce..756ddc65 100644
@@ -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}"
meta-beagle/recipes-kernel/linux/linux-bb.org_6.6.bb +6 -33
index 37626a1d..74d1abd1 100644
@@ -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}"
Signature · 1 line
2.39.2