u-boot-ti-staging: Update to the latest ti-u-boot-2021.01

Update to the latest commit of ti-u-boot-2021.01.

As part of this U-Boot update the non-HS AM64x-evm defconfig was removed.
This is okay as building this defconfig without defining TI_SECURE_DEV_PKG
will still result in usable binaries for the non-HS devices. Use the
HS defconfig for both the HS and non-HS machines.

Signed-off-by: Andrew Davis <afd@ti.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>

4 files changed, 8 insertions, 4 deletions

diff --git a/conf/machine/am64xx-evm.conf b/conf/machine/am64xx-evm.conf
index c6ba2a87..2cb7f55a 100644
--- a/conf/machine/am64xx-evm.conf
+++ b/conf/machine/am64xx-evm.conf
@@ -5,3 +5,7 @@
 require conf/machine/include/am64xx.inc
 
 UBOOT_MACHINE = "am64x_evm_a53_defconfig"
+
+SPL_BINARY = "tispl.bin_HS"
+UBOOT_BINARY = "u-boot.img_HS"
+UBOOT_SYMLINK = "u-boot.img"
diff --git a/conf/machine/am64xx-hs-evm-k3r5.conf b/conf/machine/am64xx-hs-evm-k3r5.conf
index 647c8beb..95e68751 100644
--- a/conf/machine/am64xx-hs-evm-k3r5.conf
+++ b/conf/machine/am64xx-hs-evm-k3r5.conf
@@ -9,4 +9,4 @@ SYSFW_CONFIG = "evm"
 SYSFW_SUFFIX = "hs"
 SYSFW_SYMLINK = ""
 
-UBOOT_MACHINE = "am64x_hs_evm_r5_defconfig"
+UBOOT_MACHINE = "am64x_evm_r5_defconfig"
diff --git a/conf/machine/am64xx-hs-evm.conf b/conf/machine/am64xx-hs-evm.conf
index 3ab9a49e..614eba4b 100644
--- a/conf/machine/am64xx-hs-evm.conf
+++ b/conf/machine/am64xx-hs-evm.conf
@@ -4,7 +4,7 @@
 
 require conf/machine/include/am64xx.inc
 
-UBOOT_MACHINE = "am64x_hs_evm_a53_defconfig"
+UBOOT_MACHINE = "am64x_evm_a53_defconfig"
 
 UBOOT_ENTRYPOINT =       "0x80080000"
 UBOOT_LOADADDRESS =      "0x80080000"
diff --git a/recipes-bsp/u-boot/u-boot-ti-staging_2021.01.bb b/recipes-bsp/u-boot/u-boot-ti-staging_2021.01.bb
index 5560d1a1..bac87cf4 100644
--- a/recipes-bsp/u-boot/u-boot-ti-staging_2021.01.bb
+++ b/recipes-bsp/u-boot/u-boot-ti-staging_2021.01.bb
@@ -2,8 +2,8 @@ require u-boot-ti.inc
 
 LIC_FILES_CHKSUM = "file://Licenses/README;md5=5a7450c57ffe5ae63fd732446b988025"
 
-PR = "r32"
+PR = "r33"
 
 BRANCH = "ti-u-boot-2021.01"
 
-SRCREV = "a3f87b40a1b6744261d1ac351fe2566dbf64bc66"
+SRCREV = "1c29865c3106a1e6c8e2036601ff61a8bf70590b"