summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorManorit Chawdhry <m-chawdhry@ti.com>2023-04-17 15:56:37 +0530
committerRyan Eatmon <reatmon@ti.com>2023-05-15 11:20:14 -0500
commit14bc74d7f9538c962df0d0cd67abfa9e4af26cfb (patch)
tree1d2d0b246f03f6a0fa2799997c9ccbe227813bbb
parenta03b6a0242f8d2e6f62d50db3404b620b5e3c702 (diff)
downloadmeta-ti-14bc74d7f9538c962df0d0cd67abfa9e4af26cfb.tar.gz
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 <m-chawdhry@ti.com> Signed-off-by: Ryan Eatmon <reatmon@ti.com>
-rw-r--r--meta-ti-bsp/conf/machine/j721e-hs-evm-k3r5.conf2
-rw-r--r--meta-ti-bsp/conf/machine/j721e-hs-evm.conf2
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}"
14UBOOT_IMAGE = "tiboot3-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}" 14UBOOT_IMAGE = "tiboot3-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}"
15UBOOT_SYMLINK = "tiboot3-${MAINMACHINE}.${UBOOT_SUFFIX}" 15UBOOT_SYMLINK = "tiboot3-${MAINMACHINE}.${UBOOT_SUFFIX}"
16 16
17UBOOT_MACHINE = "j721e_hs_evm_r5_defconfig" 17UBOOT_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 @@
4 4
5require conf/machine/j721e-evm.conf 5require conf/machine/j721e-evm.conf
6 6
7UBOOT_MACHINE = "j721e_hs_evm_a72_defconfig" 7UBOOT_MACHINE = "j721e_evm_a72_defconfig"
8 8
9SPL_BINARY = "tispl.bin_HS" 9SPL_BINARY = "tispl.bin_HS"
10UBOOT_BINARY = "u-boot.img_HS" 10UBOOT_BINARY = "u-boot.img_HS"