diff mbox series

[meta-ti,scarthgap] conf: machine: am62*: apply config fragments for enabling USB DFU

Message ID 20240708052457.1974547-1-s-vadapalli@ti.com
State Superseded
Delegated to: Ryan Eatmon
Headers show
Series [meta-ti,scarthgap] conf: machine: am62*: apply config fragments for enabling USB DFU | expand

Commit Message

Siddharth Vadapalli July 8, 2024, 5:24 a.m. UTC
The config fragments "am62x_r5_usbdfu.config" and "am62x_a53_usbdfu.config"
are applicable to AM62x, AM62x-LP-EVM, AM62Ax and AM62Px devices and enable
USB DFU boot support at the R5 and A53 stages of boot respectively.

Signed-off-by: Siddharth Vadapalli <s-vadapalli@ti.com>
---

Hello,

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

Regards,
Siddharth.

 meta-ti-bsp/conf/machine/am62axx-evm-k3r5.conf   | 1 +
 meta-ti-bsp/conf/machine/am62axx-evm.conf        | 1 +
 meta-ti-bsp/conf/machine/am62pxx-evm-k3r5.conf   | 1 +
 meta-ti-bsp/conf/machine/am62pxx-evm.conf        | 2 +-
 meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf    | 1 +
 meta-ti-bsp/conf/machine/am62xx-evm.conf         | 1 +
 meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf | 1 +
 meta-ti-bsp/conf/machine/am62xx-lp-evm.conf      | 1 +
 8 files changed, 8 insertions(+), 1 deletion(-)

Comments

Vignesh Raghavendra July 8, 2024, 5:40 a.m. UTC | #1
On 08/07/24 10:54, Siddharth Vadapalli wrote:
> The config fragments "am62x_r5_usbdfu.config" and "am62x_a53_usbdfu.config"

am62*x_evm_a53_defconfig already include am62x_a53_usbdfu.config:

ti-u-boot-2024.04-next ✓ git grep am62x_a53_usbdfu.config
configs/am62ax_evm_a53_defconfig:136:#include <configs/am62x_a53_usbdfu.config>
configs/am62px_evm_a53_defconfig:194:#include <configs/am62x_a53_usbdfu.config>
configs/am62x_beagleplay_a53_defconfig:123:#include <configs/am62x_a53_usbdfu.config>
configs/am62x_evm_a53_defconfig:147:#include <configs/am62x_a53_usbdfu.config>


so no need to build a separate tispl.bin / u-boot.img with fragement reapplied?

[...]
Siddharth Vadapalli July 8, 2024, 5:47 a.m. UTC | #2
On Mon, Jul 08, 2024 at 11:10:34AM +0530, Vignesh Raghavendra wrote:
> 
> 
> On 08/07/24 10:54, Siddharth Vadapalli wrote:
> > The config fragments "am62x_r5_usbdfu.config" and "am62x_a53_usbdfu.config"
> 
> am62*x_evm_a53_defconfig already include am62x_a53_usbdfu.config:
> 
> ti-u-boot-2024.04-next ✓ git grep am62x_a53_usbdfu.config
> configs/am62ax_evm_a53_defconfig:136:#include <configs/am62x_a53_usbdfu.config>
> configs/am62px_evm_a53_defconfig:194:#include <configs/am62x_a53_usbdfu.config>
> configs/am62x_beagleplay_a53_defconfig:123:#include <configs/am62x_a53_usbdfu.config>
> configs/am62x_evm_a53_defconfig:147:#include <configs/am62x_a53_usbdfu.config>
> 
> 
> so no need to build a separate tispl.bin / u-boot.img with fragement reapplied?

Yes! Thank you for pointing it out. Also, since am62x_lpsk_a53_defconfig
includes am62x_evm_a53_defconfig, the change to am62xx-lp-evm.conf can
be dropped. I will fix this in the v2 patch.

Regards,
Siddharth.
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..5ba8c27e 100644
--- a/meta-ti-bsp/conf/machine/am62axx-evm-k3r5.conf
+++ b/meta-ti-bsp/conf/machine/am62axx-evm-k3r5.conf
@@ -9,3 +9,4 @@  SYSFW_CONFIG = "evm"
 SYSFW_SUFFIX = "hs-fs"
 
 UBOOT_MACHINE = "am62ax_evm_r5_defconfig"
+UBOOT_CONFIG_FRAGMENTS = "am62x_r5_usbdfu.config"
diff --git a/meta-ti-bsp/conf/machine/am62axx-evm.conf b/meta-ti-bsp/conf/machine/am62axx-evm.conf
index 238718d0..4d1b58db 100644
--- a/meta-ti-bsp/conf/machine/am62axx-evm.conf
+++ b/meta-ti-bsp/conf/machine/am62axx-evm.conf
@@ -16,3 +16,4 @@  KERNEL_DEVICETREE = " \
 "
 
 UBOOT_MACHINE = "am62ax_evm_a53_defconfig"
+UBOOT_CONFIG_FRAGMENTS = "am62x_a53_usbdfu.config"
diff --git a/meta-ti-bsp/conf/machine/am62pxx-evm-k3r5.conf b/meta-ti-bsp/conf/machine/am62pxx-evm-k3r5.conf
index 36915381..9b68e626 100644
--- a/meta-ti-bsp/conf/machine/am62pxx-evm-k3r5.conf
+++ b/meta-ti-bsp/conf/machine/am62pxx-evm-k3r5.conf
@@ -10,3 +10,4 @@  SYSFW_CONFIG = "evm"
 SYSFW_SUFFIX = "hs-fs"
 
 UBOOT_MACHINE = "am62px_evm_r5_defconfig"
+UBOOT_CONFIG_FRAGMENTS = "am62x_r5_usbdfu.config"
diff --git a/meta-ti-bsp/conf/machine/am62pxx-evm.conf b/meta-ti-bsp/conf/machine/am62pxx-evm.conf
index 8d94c2b4..36b13e73 100644
--- a/meta-ti-bsp/conf/machine/am62pxx-evm.conf
+++ b/meta-ti-bsp/conf/machine/am62pxx-evm.conf
@@ -23,6 +23,6 @@  UBOOT_MACHINE = "am62px_evm_a53_defconfig"
 # under meta-ti-bsp/recipes-bsp/u-boot/ for more details.
 # For AM62P tisdk-display-cluster image, splash screen is handled by SBL.
 # Hence, disable the A53 based splash screen using the am62x_evm_prune_splashscreen.config fragment present in ti-u-boot tree
-UBOOT_CONFIG_FRAGMENTS = "${@oe.utils.conditional('DISPLAY_CLUSTER_ENABLE', '1', 'am62x_evm_prune_splashscreen.config', '', d)}"
+UBOOT_CONFIG_FRAGMENTS = "${@oe.utils.conditional('DISPLAY_CLUSTER_ENABLE', '1', 'am62x_evm_prune_splashscreen.config', 'am62x_a53_usbdfu.config', d)}"
 
 UBOOT_CONFIG_FRAGMENTS:bsp-ti-6_1 = "${@oe.utils.conditional('DISPLAY_CLUSTER_ENABLE', '1', 'am62px_evm_prune_splashscreen.config', '', d)}"
diff --git a/meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf b/meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf
index 548369ca..85c48334 100644
--- a/meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf
+++ b/meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf
@@ -10,3 +10,4 @@  SYSFW_CONFIG = "evm"
 SYSFW_SUFFIX = "hs-fs"
 
 UBOOT_MACHINE = "am62x_evm_r5_defconfig"
+UBOOT_CONFIG_FRAGMENTS = "am62x_r5_usbdfu.config"
diff --git a/meta-ti-bsp/conf/machine/am62xx-evm.conf b/meta-ti-bsp/conf/machine/am62xx-evm.conf
index fadbc6f4..5e1470b7 100644
--- a/meta-ti-bsp/conf/machine/am62xx-evm.conf
+++ b/meta-ti-bsp/conf/machine/am62xx-evm.conf
@@ -15,3 +15,4 @@  KERNEL_DEVICETREE = " \
 "
 
 UBOOT_MACHINE = "am62x_evm_a53_defconfig"
+UBOOT_CONFIG_FRAGMENTS = "am62x_a53_usbdfu.config"
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..24f96858 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,4 @@  SYSFW_CONFIG = "evm"
 SYSFW_SUFFIX = "hs-fs"
 
 UBOOT_MACHINE = "am62x_lpsk_r5_defconfig"
+UBOOT_CONFIG_FRAGMENTS = "am62x_r5_usbdfu.config"
diff --git a/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf b/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf
index 51e99728..0bad3aed 100644
--- a/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf
+++ b/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf
@@ -18,3 +18,4 @@  KERNEL_DEVICETREE = " \
 "
 
 UBOOT_MACHINE = "am62x_lpsk_a53_defconfig"
+UBOOT_CONFIG_FRAGMENTS = "am62x_a53_usbdfu.config"