diff mbox series

[meta-ti,master/scarthgap,v4] conf: machine: am62*-evm-k3r5.conf: apply fragment for enabling USB DFU

Message ID 20240709083302.2499244-1-s-vadapalli@ti.com
State Accepted
Delegated to: Ryan Eatmon
Headers show
Series [meta-ti,master/scarthgap,v4] conf: machine: am62*-evm-k3r5.conf: apply fragment for enabling USB DFU | expand

Commit Message

Siddharth Vadapalli July 9, 2024, 8:33 a.m. UTC 
The config fragment "am62x_r5_usbdfu.config" is applicable to AM62x,
AM62x-SIP, AM62x-LP-EVM, AM62Ax and AM62Px devices and enables USB DFU boot
support at the R5 stage of boot.

Signed-off-by: Siddharth Vadapalli <s-vadapalli@ti.com>
Acked-by: Chirag Shilwant <c-shilwant@ti.com>
---
Hello, 

This patch is based on commit
f474b877 CI/CD Auto-Merger: cicd.scarthgap.202407082217
of scarthgap-next branch of meta-ti tree.

v3:
https://lore.kernel.org/r/20240708123653.2200919-1-s-vadapalli@ti.com
Changes since v3:
- Based on feedback from Ryan Eatmon <reatmon@ti.com> at:
  https://lore.kernel.org/r/390e677c-5027-4d0b-bf7c-78664ea12d88@ti.com/
  UBOOT_CONFIG_FRAGMENTS:bsp-ti-6_1 = ""
  has been added to
  am62axx-evm-k3r5.conf, am62pxx-evm-k3r5.conf, am62xx-evm-k3r5.conf and
  am62xx-lp-evm-k3r5.conf
  while the order has been fixed in all files with the assignment
  UBOOT_CONFIG_FRAGMENTS = "am62x_r5_usbdfu.config"
  preceding the override for bsp-ti-6_1.
- Collected Acked-by tag from Chirag Shilwant <c-shilwant@ti.com>
  as indicated at:
  https://lore.kernel.org/r/0b4fb757-2360-4b0a-b04c-ac31287bbdb3@ti.com/
  since Ryan's feedback has been addressed in this patch.

v2:
https://lore.kernel.org/r/20240708060054.1985156-1-s-vadapalli@ti.com/
Changes since v2:
- Based on feedback from Chirag Shilwant <c-shilwant@ti.com> at:
  https://lore.kernel.org/r/32db66e5-730c-42ec-9145-72abdf35b6d1@ti.com/
  the subject-prefix has been updated to master/scarthgap and the config
  fragment for USB DFU is being applied to AM62x SIP as well.

v1:
https://lore.kernel.org/r/20240708052457.1974547-1-s-vadapalli@ti.com/
Changes since v1:
- As pointed out by Vignesh Raghavendra <vigneshr@ti.com> at:
  https://lore.kernel.org/r/829dc5b5-e87c-4679-9e2d-7417c744a9c9@ti.com/
  the A53 defconfigs already include the "am62x_a53_usbdfu.config" config
  fragment. Hence, they are not required in the am62*-evm.conf files and
  have been dropped in this patch.
- Commit message has been updated accordingly.

Regards,
Siddharth.

 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, 9 insertions(+), 1 deletion(-)
diff mbox series

Patch

diff --git a/meta-ti-bsp/conf/machine/am62axx-evm-k3r5.conf b/meta-ti-bsp/conf/machine/am62axx-evm-k3r5.conf
index 2af3317e..370ae2f9 100644
--- a/meta-ti-bsp/conf/machine/am62axx-evm-k3r5.conf
+++ b/meta-ti-bsp/conf/machine/am62axx-evm-k3r5.conf
@@ -9,3 +9,5 @@  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 36915381..2da09f5c 100644
--- a/meta-ti-bsp/conf/machine/am62pxx-evm-k3r5.conf
+++ b/meta-ti-bsp/conf/machine/am62pxx-evm-k3r5.conf
@@ -10,3 +10,5 @@  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 548369ca..483de2e4 100644
--- a/meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf
+++ b/meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf
@@ -10,3 +10,5 @@  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 52b69a72..1c3c5213 100644
--- a/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf
+++ b/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf
@@ -10,3 +10,5 @@  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 55bc530b..57ccbc15 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"