Skip to contentSkip to conversation

conf: Remove leftover UIO Device Tree overlay files

PATCH New Andrew Davis 1 participant 3 messages Jul 18, 2023

lore
Share & tools
lore
#0 lore raw

PATCH 1/3 conf: Remove leftover UIO Device Tree overlay files

We do not use UIO anymore, remove these files.

---
 meta-ti-bsp/conf/machine/am57xx-evm.conf   | 2 --
 meta-ti-bsp/conf/machine/include/ti33x.inc | 2 --
 2 files changed, 4 deletions(-)
meta-ti-bsp/conf/machine/am57xx-evm.conf +0 -2
index 9b12f383..26b7f78c 100644
@@ -30,8 +30,6 @@ KERNEL_DEVICETREE = " \
     am574x-idk.dtb \
 "
 
-KERNEL_DEVICETREE += "${@oe.utils.conditional('ENABLE_TI_UIO_DEVICES', '1', 'am574x-idk-pru-excl-uio.dtb am572x-idk-pru-excl-uio.dtb am571x-idk-pru-excl-uio.dtb', '', d)}"
-
 UBOOT_MACHINE = "am57xx_evm_config"
 
 # UBI information.  Note that this is board and kernel specific.  Changes
meta-ti-bsp/conf/machine/include/ti33x.inc +0 -2
index bce88309..ec53e612 100644
@@ -35,8 +35,6 @@ KERNEL_DEVICETREE = " \
     am335x-sancloud-bbe.dtb \
 "
 
-KERNEL_DEVICETREE += "${@oe.utils.conditional('ENABLE_TI_UIO_DEVICES', '1', 'am335x-icev2-pru-excl-uio.dtb', '', d)}"
-
 UBOOT_ARCH = "arm"
 UBOOT_MACHINE = "am335x_evm_config"
 
Signature · 1 line
2.39.2
#1 lore raw

PATCH 2/3 conf: Remove old and no longer used MACHINE_FEATURES

The following MACHINE_FEATURES are not matched against anywhere, remove:
* kernel26
* ethernet
* mmc

---
 meta-ti-bsp/conf/machine/include/k3.inc       | 2 +-
 meta-ti-bsp/conf/machine/include/omap-a15.inc | 2 +-
 meta-ti-bsp/conf/machine/include/omapl138.inc | 2 +-
 meta-ti-bsp/conf/machine/include/ti33x.inc    | 2 +-
 meta-ti-bsp/conf/machine/include/ti43x.inc    | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)
meta-ti-bsp/conf/machine/include/k3.inc +1 -1
index 366db16d..8f6f4014 100644
@@ -47,7 +47,7 @@ TFA_PLATFORM = "k3"
 UBI_VOLNAME = "rootfs"
 
 # List common SoC features, may need to add touchscreen for specific machines
-MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 alsa ethernet pci"
+MACHINE_FEATURES = "apm usbgadget usbhost vfat ext2 alsa pci"
 
 IMAGE_FSTYPES += "tar.xz wic.xz wic.bmap"
 
meta-ti-bsp/conf/machine/include/omap-a15.inc +1 -1
index 700b1a11..c9d16f3c 100644
@@ -45,7 +45,7 @@ EXTRA_IMAGEDEPENDS += "virtual/bootloader"
 UBI_VOLNAME = "rootfs"
 
 # List common SoC features, may need to add touchscreen for specific machines
-MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa ethernet gpu mmip dsp gc320"
+MACHINE_FEATURES = "apm usbgadget usbhost vfat ext2 screen alsa gpu mmip dsp gc320"
 
 IMAGE_FSTYPES += "tar.xz wic.xz wic.bmap"
 WKS_FILE ?= "sdimage-2part.wks"
meta-ti-bsp/conf/machine/include/omapl138.inc +1 -1
index 2e4a47a5..72cfd659 100644
@@ -11,4 +11,4 @@ PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging"
 
 EXTRA_IMAGEDEPENDS += "virtual/bootloader"
 
-MACHINE_FEATURES = "kernel26 serial ethernet usbhost usbgadget mmc alsa"
+MACHINE_FEATURES = "serial usbhost usbgadget alsa"
meta-ti-bsp/conf/machine/include/ti33x.inc +1 -1
index ec53e612..f7f126f4 100644
@@ -60,7 +60,7 @@ UBI_VOLNAME = "rootfs"
 EXTRA_IMAGEDEPENDS += "virtual/bootloader"
 
 # List common SoC features, may need to add touchscreen for specific machines
-MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 alsa ethernet gpu"
+MACHINE_FEATURES = "apm usbgadget usbhost vfat ext2 alsa gpu"
 
 IMAGE_FSTYPES += "tar.xz wic.xz wic.bmap"
 WKS_FILE ?= "sdimage-2part.wks"
meta-ti-bsp/conf/machine/include/ti43x.inc +1 -1
index c1009dc6..a6af56e3 100644
@@ -58,7 +58,7 @@ UBI_VOLNAME = "rootfs"
 EXTRA_IMAGEDEPENDS += "u-boot"
 
 # List common SoC features, may need to add touchscreen for specific machines
-MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen alsa ethernet gpu"
+MACHINE_FEATURES = "apm usbgadget usbhost vfat ext2 screen alsa gpu"
 
 IMAGE_FSTYPES += "tar.xz wic.xz wic.bmap"
 WKS_FILE ?= "sdimage-2part.wks"
Signature · 1 line
2.39.2
#2 lore raw

PATCH 3/3 conf: machine: am65xx: Remove SYSFW_SUFFIX from non-k3r5 configs

In reply to Andrew Davis

This definition is only needed in the "-k3r5" multiconfig files.

---
 meta-ti-bsp/conf/machine/am65xx-evm.conf    | 2 --
 meta-ti-bsp/conf/machine/am65xx-hs-evm.conf | 2 --
 2 files changed, 4 deletions(-)
meta-ti-bsp/conf/machine/am65xx-evm.conf +0 -2
index 63f2ecc5..8b6ef546 100644
@@ -2,8 +2,6 @@
 #@NAME: AM65xx EVM
 #@DESCRIPTION: Machine configuration for the TI AM65xx EVM
 
-SYSFW_SUFFIX = "gp"
-
 require conf/machine/include/am65xx.inc
 
 UBOOT_MACHINE = "am65x_evm_a53_defconfig"
meta-ti-bsp/conf/machine/am65xx-hs-evm.conf +0 -2
index 3c6a1574..0addec90 100644
@@ -2,8 +2,6 @@
 #@NAME: AM65xx HS EVM
 #@DESCRIPTION: Machine configuration for the TI AM65xx HS EVM
 
-SYSFW_SUFFIX = "hs"
-
 require conf/machine/include/am65xx.inc
 
 UBOOT_MACHINE = "am65x_hs_evm_a53_defconfig"
Signature · 1 line
2.39.2