mirrors/meta-arm
1
0
Fork 0
mirror of https://git.yoctoproject.org/meta-arm synced 2026-05-07 04:58:57 +00:00
Code Issues Projects Releases Wiki Activity

arm-bsp/tc0: move to u-boot 2021.07

Browse Source 
Also add necessary patches.

Change-Id: I7ef31832e3bd0521c03a3945e8b70596d2ef0f73
Signed-off-by: Anders Dellien <anders.dellien@arm.com>
This commit is contained in:
Anders Dellien
2021-06-22 11:32:04 +01:00
committed by Jon Mason
parent 709b5de7e0
commit 6bf368c4db
4 changed files with 78 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
meta-arm-bsp/conf/machine/tc0.conf
View File

@@ -10,7 +10,7 @@ require conf/machine/include/arm/arch-armv8a.inc
# Das U-boot
UBOOT_MACHINE ?= "total_compute_defconfig"
PREFERRED_VERSION_u-boot ?= "2020.10"
PREFERRED_VERSION_u-boot ?= "2021.07"
UBOOT_RD_LOADADDRESS = "0x88000000"
UBOOT_RD_ENTRYPOINT = "0x88000000"
UBOOT_LOADADDRESS = "0x80080000"

33
meta-arm-bsp/recipes-bsp/u-boot/u-boot-2021.07/tc0/0001-board-armltd-Remove-bootargs-from-Total-Compute-conf.patch Normal file
View File

@@ -0,0 +1,33 @@
From 893c4a4089f796d1282b3ebde3d327db00e07157 Mon Sep 17 00:00:00 2001
From: Anders Dellien <anders.dellien@arm.com>
Date: Tue, 8 Jun 2021 09:35:56 +0100
Subject: [PATCH 1/2] board: armltd: Remove bootargs from Total Compute
configuration
This information will be maintained in the device tree instead.
Signed-off-by: Anders Dellien <anders.dellien@arm.com>
Change-Id: I279399d4a0ea1a3330de5b58e8c9af78e48ba04c
Upstream-Status: Pending [https://lists.denx.de/pipermail/u-boot/2021-June/452156.html]
---
configs/total_compute_defconfig | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/configs/total_compute_defconfig b/configs/total_compute_defconfig
index e36d701ff4..954023fae5 100644
--- a/configs/total_compute_defconfig
+++ b/configs/total_compute_defconfig
@@ -11,8 +11,7 @@ CONFIG_FIT=y
CONFIG_FIT_SIGNATURE=y
CONFIG_LEGACY_IMAGE_FORMAT=y
CONFIG_BOOTDELAY=5
-CONFIG_USE_BOOTARGS=y
-CONFIG_BOOTARGS="console=ttyAMA0 debug user_debug=31 earlycon=pl011,0x7ff80000 loglevel=9 androidboot.hardware=total_compute video=640x480-32@60 androidboot.boot_devices=1c050000.mmci ip=dhcp androidboot.selinux=permissive"
+# CONFIG_USE_BOOTARGS is not set
# CONFIG_USE_BOOTCOMMAND is not set
# CONFIG_DISPLAY_CPUINFO is not set
# CONFIG_DISPLAY_BOARDINFO is not set
--
2.17.1

32
meta-arm-bsp/recipes-bsp/u-boot/u-boot-2021.07/tc0/0002-cmd-part-Correct-error-handling.patch Normal file
View File

@@ -0,0 +1,32 @@
From 2fb7e756c005fe60b440943cfe0cbd39a82c79ac Mon Sep 17 00:00:00 2001
From: Anders Dellien <anders.dellien@arm.com>
Date: Tue, 15 Jun 2021 15:38:55 +0100
Subject: [PATCH 2/2] cmd: part: Correct error handling
As 'part_get_info_by_name' now returns more status codes than just
-1 to indicate failure, we need to update the return value check.
Signed-off-by: Anders Dellien <anders.dellien@arm.com>
Change-Id: Id972be70e9ed12fecaf97793b12d23ccc57007e7
Upstream-Status: Pending [https://lists.denx.de/pipermail/u-boot/2021-June/452573.html]
---
cmd/part.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/cmd/part.c b/cmd/part.c
index 3395c17b89..e0463b5a54 100644
--- a/cmd/part.c
+++ b/cmd/part.c
@@ -140,7 +140,7 @@ static int do_part_info(int argc, char *const argv[], enum cmd_part_info param)
return 1;
} else {
part = part_get_info_by_name(desc, argv[2], &info);
- if (part == -1)
+ if (part < 0)
return 1;
}
--
2.17.1

12
meta-arm-bsp/recipes-bsp/u-boot/u-boot_2021.07.bbappend Normal file
View File

@@ -0,0 +1,12 @@
# Machine specific u-boot
THIS_DIR := "${THISDIR}"
FILESEXTRAPATHS_prepend = "${THIS_DIR}/${BP}:"
#
# TC0 MACHINE
#
SRC_URI_append_tc0 = " \
file://0001-board-armltd-Remove-bootargs-from-Total-Compute-conf.patch \
file://0002-cmd-part-Correct-error-handling.patch \
"