[2/6] arm-bsp/tc: Update to u-boot v2022.04

Message ID 20220614171514.32495-2-jon.mason@arm.com
State New
Headers show
Series [1/6] arm-bsp/juno: Update to u-boot v2022.04 | expand

Commit Message

Jon Mason June 14, 2022, 5:15 p.m. UTC
Signed-off-by: Jon Mason <jon.mason@arm.com>
---
 meta-arm-bsp/conf/machine/include/tc.inc                  | 2 +-
 .../0001-arm-total_compute-update-secure-dram-size.patch  | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

Patch

diff --git a/meta-arm-bsp/conf/machine/include/tc.inc b/meta-arm-bsp/conf/machine/include/tc.inc
index ed5ffa96..88eda556 100644
--- a/meta-arm-bsp/conf/machine/include/tc.inc
+++ b/meta-arm-bsp/conf/machine/include/tc.inc
@@ -6,7 +6,7 @@  MACHINEOVERRIDES =. "tc:"
 
 # Das U-boot
 UBOOT_MACHINE ?= "total_compute_defconfig"
-PREFERRED_VERSION_u-boot ?= "2022.01"
+PREFERRED_VERSION_u-boot ?= "2022.04"
 UBOOT_RD_LOADADDRESS = "0x88000000"
 UBOOT_RD_ENTRYPOINT = "0x88000000"
 UBOOT_LOADADDRESS = "0x80080000"
diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/tc/0001-arm-total_compute-update-secure-dram-size.patch b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/tc/0001-arm-total_compute-update-secure-dram-size.patch
index 657af223..85b14b03 100644
--- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/tc/0001-arm-total_compute-update-secure-dram-size.patch
+++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/tc/0001-arm-total_compute-update-secure-dram-size.patch
@@ -1,7 +1,7 @@ 
-From 5f10bd9b64c745084292a7094af2e4c3d14c1ac5 Mon Sep 17 00:00:00 2001
+From f7c24393604e45012447b16aaa95eb5e7224ba07 Mon Sep 17 00:00:00 2001
 From: Arunachalam Ganapathy <arunachalam.ganapathy@arm.com>
 Date: Tue, 12 Apr 2022 12:43:49 +0100
-Subject: [PATCH 1/3] arm: total_compute: update secure dram size
+Subject: [PATCH] arm: total_compute: update secure dram size
 
 Update secure DRAM size as it is increased by 64MB for additional
 secure partitions.
@@ -14,10 +14,10 @@  Upstream-Status: Pending [Not submitted to upstream yet]
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/include/configs/total_compute.h b/include/configs/total_compute.h
-index 933a145f99..66de8ae239 100644
+index 0324b1e1b217..62bdb4f6a3ae 100644
 --- a/include/configs/total_compute.h
 +++ b/include/configs/total_compute.h
-@@ -25,8 +25,8 @@
+@@ -23,8 +23,8 @@
  
  /* Physical Memory Map */
  #define PHYS_SDRAM_1		0x80000000