diff mbox series

[meta-ti,master/kirkstone] j721e-hs-evm: Merge j721e defconfigs

Message ID 20230417-kirkstone-v1-1-5b63595fa69f@ti.com
State Superseded
Delegated to: Ryan Eatmon
Headers show
Series [meta-ti,master/kirkstone] j721e-hs-evm: Merge j721e defconfigs | expand

Commit Message

Manorit Chawdhry April 17, 2023, 10:22 a.m. UTC 
uboot will now use a merged defconfig build so keep the defconfig same
for hs here

Signed-off-by: Manorit Chawdhry <m-chawdhry@ti.com>

machine: k3r5:

Signed-off-by: Manorit Chawdhry <m-chawdhry@ti.com>
---
Lore link for the u-boot patch: https://lore.kernel.org/u-boot/20230324-j721e-upstream-hs-v6-0-5aa43a4817a9@ti.com/
The patch is merged internally for this

Cc: Udit Kumar <u-kumar1@ti.com>
---
 meta-ti-bsp/conf/machine/j721e-hs-evm-k3r5.conf | 2 +-
 meta-ti-bsp/conf/machine/j721e-hs-evm.conf      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


---
base-commit: c8ba8aaade90101f06164aec1b393d7c8b3aa201
change-id: 20230417-kirkstone-12a840df853f

Best regards,
-- 
Manorit Chawdhry <m-chawdhry@ti.com>
diff mbox series

Patch

diff --git a/meta-ti-bsp/conf/machine/j721e-hs-evm-k3r5.conf b/meta-ti-bsp/conf/machine/j721e-hs-evm-k3r5.conf
index 56312c0ce52d..94c434eaefbc 100644
--- a/meta-ti-bsp/conf/machine/j721e-hs-evm-k3r5.conf
+++ b/meta-ti-bsp/conf/machine/j721e-hs-evm-k3r5.conf
@@ -14,4 +14,4 @@  UBOOT_BINARY = "tiboot3.${UBOOT_SUFFIX}"
 UBOOT_IMAGE = "tiboot3-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}"
 UBOOT_SYMLINK = "tiboot3-${MAINMACHINE}.${UBOOT_SUFFIX}"
 
-UBOOT_MACHINE = "j721e_hs_evm_r5_defconfig"
+UBOOT_MACHINE = "j721e_evm_r5_defconfig"
diff --git a/meta-ti-bsp/conf/machine/j721e-hs-evm.conf b/meta-ti-bsp/conf/machine/j721e-hs-evm.conf
index 00ec19980c1e..0ed77c3da7b5 100644
--- a/meta-ti-bsp/conf/machine/j721e-hs-evm.conf
+++ b/meta-ti-bsp/conf/machine/j721e-hs-evm.conf
@@ -4,7 +4,7 @@ 
 
 require conf/machine/j721e-evm.conf
 
-UBOOT_MACHINE = "j721e_hs_evm_a72_defconfig"
+UBOOT_MACHINE = "j721e_evm_a72_defconfig"
 
 SPL_BINARY = "tispl.bin_HS"
 UBOOT_BINARY = "u-boot.img_HS"