From 14bc74d7f9538c962df0d0cd67abfa9e4af26cfb Mon Sep 17 00:00:00 2001 From: Manorit Chawdhry Date: Mon, 17 Apr 2023 15:56:37 +0530 Subject: [PATCH] j721e-hs-evm: Merge j721e defconfigs uboot will now use a merged defconfig build so keep the defconfig same for hs here Signed-off-by: Manorit Chawdhry Signed-off-by: Ryan Eatmon --- 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(-) 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 56312c0c..94c434ea 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 00ec1998..0ed77c3d 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"