From fb23cc6a0f53fbbfe31a457b5f7a381281cfa2ea Mon Sep 17 00:00:00 2001 From: Ryan Eatmon Date: Fri, 12 Jul 2024 07:14:49 -0500 Subject: Revert "conf: machine: am62*-evm-k3r5.conf: apply fragment for enabling USB DFU" This reverts commit fa94effc26a8678a5400291a3ca0ef1000eea7b1. There are boot issues with SD card booting with this change. Signed-off-by: Ryan Eatmon --- meta-ti-bsp/conf/machine/am62axx-evm-k3r5.conf | 2 -- meta-ti-bsp/conf/machine/am62pxx-evm-k3r5.conf | 2 -- meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf | 2 -- meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf | 2 -- meta-ti-bsp/conf/machine/am62xxsip-evm-k3r5.conf | 2 +- 5 files changed, 1 insertion(+), 9 deletions(-) diff --git a/meta-ti-bsp/conf/machine/am62axx-evm-k3r5.conf b/meta-ti-bsp/conf/machine/am62axx-evm-k3r5.conf index 370ae2f9..2af3317e 100644 --- a/meta-ti-bsp/conf/machine/am62axx-evm-k3r5.conf +++ b/meta-ti-bsp/conf/machine/am62axx-evm-k3r5.conf @@ -9,5 +9,3 @@ SYSFW_CONFIG = "evm" SYSFW_SUFFIX = "hs-fs" UBOOT_MACHINE = "am62ax_evm_r5_defconfig" -UBOOT_CONFIG_FRAGMENTS = "am62x_r5_usbdfu.config" -UBOOT_CONFIG_FRAGMENTS:bsp-ti-6_1 = "" diff --git a/meta-ti-bsp/conf/machine/am62pxx-evm-k3r5.conf b/meta-ti-bsp/conf/machine/am62pxx-evm-k3r5.conf index 2da09f5c..36915381 100644 --- a/meta-ti-bsp/conf/machine/am62pxx-evm-k3r5.conf +++ b/meta-ti-bsp/conf/machine/am62pxx-evm-k3r5.conf @@ -10,5 +10,3 @@ SYSFW_CONFIG = "evm" SYSFW_SUFFIX = "hs-fs" UBOOT_MACHINE = "am62px_evm_r5_defconfig" -UBOOT_CONFIG_FRAGMENTS = "am62x_r5_usbdfu.config" -UBOOT_CONFIG_FRAGMENTS:bsp-ti-6_1 = "" diff --git a/meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf b/meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf index 483de2e4..548369ca 100644 --- a/meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf +++ b/meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf @@ -10,5 +10,3 @@ SYSFW_CONFIG = "evm" SYSFW_SUFFIX = "hs-fs" UBOOT_MACHINE = "am62x_evm_r5_defconfig" -UBOOT_CONFIG_FRAGMENTS = "am62x_r5_usbdfu.config" -UBOOT_CONFIG_FRAGMENTS:bsp-ti-6_1 = "" diff --git a/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf b/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf index 1c3c5213..52b69a72 100644 --- a/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf +++ b/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf @@ -10,5 +10,3 @@ SYSFW_CONFIG = "evm" SYSFW_SUFFIX = "hs-fs" UBOOT_MACHINE = "am62x_lpsk_r5_defconfig" -UBOOT_CONFIG_FRAGMENTS = "am62x_r5_usbdfu.config" -UBOOT_CONFIG_FRAGMENTS:bsp-ti-6_1 = "" diff --git a/meta-ti-bsp/conf/machine/am62xxsip-evm-k3r5.conf b/meta-ti-bsp/conf/machine/am62xxsip-evm-k3r5.conf index 57ccbc15..55bc530b 100644 --- a/meta-ti-bsp/conf/machine/am62xxsip-evm-k3r5.conf +++ b/meta-ti-bsp/conf/machine/am62xxsip-evm-k3r5.conf @@ -11,5 +11,5 @@ SYSFW_SUFFIX = "hs-fs" UBOOT_MACHINE = "am62xsip_evm_r5_defconfig" UBOOT_MACHINE:bsp-ti-6_1 = "am62x_evm_r5_defconfig" -UBOOT_CONFIG_FRAGMENTS = "am62x_r5_usbdfu.config" + UBOOT_CONFIG_FRAGMENTS:bsp-ti-6_1 = "am62xsip_sk_r5.config" -- cgit v1.2.3-54-g00ecf