mirror of
https://git.yoctoproject.org/meta-arm
synced 2026-05-08 05:09:56 +00:00
arm-bsp/juno: Update to u-boot v2022.04
Signed-off-by: Jon Mason <jon.mason@arm.com>
This commit is contained in:
Jon Mason
@@ -18,7 +18,7 @@ IMAGE_FSTYPES += "tar.bz2 ext4"
|
||||
SERIAL_CONSOLES = "115200;ttyAMA0"
|
||||
|
||||
PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
|
||||
PREFERRED_VERSION_u-boot ?= "2020.07"
|
||||
PREFERRED_VERSION_u-boot ?= "2022.04"
|
||||
PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot"
|
||||
|
||||
EXTRA_IMAGEDEPENDS += "trusted-firmware-a virtual/bootloader firmware-image-juno"
|
||||
|
||||
@@ -1,80 +0,0 @@
|
||||
From 5372743bab931e0f31e37c3767077abd504eca2b Mon Sep 17 00:00:00 2001
|
||||
From: Damodar Santhapuri <damodar.santhapuri@arm.com>
|
||||
Date: Thu, 5 Nov 2020 22:40:48 +0530
|
||||
Subject: [PATCH] arm: juno: add custom bootcmd to autoboot from uEnv.txt file
|
||||
|
||||
enable autoboot support with custom bootcmd loads uEnv.txt
|
||||
from NOR to DRAM and import.
|
||||
|
||||
Signed-off-by: Damodar Santhapuri <damodar.santhapuri@arm.com>
|
||||
Upstream-Status: Pending
|
||||
---
|
||||
include/configs/vexpress_aemv8a.h | 40 ++++++++++++++++++++++++++-----
|
||||
1 file changed, 34 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/include/configs/vexpress_aemv8a.h b/include/configs/vexpress_aemv8a.h
|
||||
index 09cdd3dab5..9c9f8dfd16 100644
|
||||
--- a/include/configs/vexpress_aemv8a.h
|
||||
+++ b/include/configs/vexpress_aemv8a.h
|
||||
@@ -131,11 +131,39 @@
|
||||
"kernel_name=norkern\0" \
|
||||
"kernel_alt_name=Image\0" \
|
||||
"kernel_addr_r=0x80080000\0" \
|
||||
- "ramdisk_name=ramdisk.img\0" \
|
||||
- "ramdisk_addr_r=0x88000000\0" \
|
||||
+ "initrd_name=ramdisk.img\0" \
|
||||
+ "initrd_addr_r=0x88000000\0" \
|
||||
"fdtfile=board.dtb\0" \
|
||||
"fdt_alt_name=juno\0" \
|
||||
"fdt_addr_r=0x80000000\0" \
|
||||
+ "fdt_high=0xffffffffffffffff\0" \
|
||||
+ "initrd_high=0xffffffffffffffff\0" \
|
||||
+ "bootenvfile=uEnv.txt\0" \
|
||||
+ "bootcmd=run envboot\0" \
|
||||
+ "envboot=if run loadbootenv; then echo Loading env from ${bootenvfile}; run importbootenv; else run default_bootcmd; fi; if test -n $uenvcmd; then echo Running uenvcmd ...; run uenvcmd;fi;\0" \
|
||||
+ "importbootenv=echo Importing environment from memory, size ${filesize}; env import -t ${loadaddr} ${filesize}\0" \
|
||||
+ "loadaddr=0x84000000\0" \
|
||||
+ "filesize=0x4000\0" \
|
||||
+ "loadbootenv=mw.l ${loadaddr} 0 0x1000; afs load ${bootenvfile} ${loadaddr}\0" \
|
||||
+ "default_bootcmd=echo running default boot command; afs load ${kernel_name} ${kernel_addr_r} ; " \
|
||||
+ "if test $? -eq 1; then "\
|
||||
+ " echo Loading ${kernel_alt_name} instead of "\
|
||||
+ "${kernel_name}; "\
|
||||
+ " afs load ${kernel_alt_name} ${kernel_addr_r};"\
|
||||
+ "fi ; "\
|
||||
+ "afs load ${fdtfile} ${fdt_addr_r} ; " \
|
||||
+ "if test $? -eq 1; then "\
|
||||
+ " echo Loading ${fdt_alt_name} instead of "\
|
||||
+ "${fdtfile}; "\
|
||||
+ " afs load ${fdt_alt_name} ${fdt_addr_r}; "\
|
||||
+ "fi ; "\
|
||||
+ "fdt addr ${fdt_addr_r}; fdt resize; " \
|
||||
+ "if afs load ${initrd_name} ${initrd_addr_r} ; "\
|
||||
+ "then "\
|
||||
+ " setenv initrd_param ${initrd_addr_r}; "\
|
||||
+ " else setenv initrd_param -; "\
|
||||
+ "fi ; " \
|
||||
+ "booti ${kernel_addr_r} ${initrd_param} ${fdt_addr_r}\0"
|
||||
|
||||
/* Copy the kernel and FDT to DRAM memory and boot */
|
||||
#define CONFIG_BOOTCOMMAND "afs load ${kernel_name} ${kernel_addr_r} ;"\
|
||||
@@ -151,12 +179,12 @@
|
||||
" afs load ${fdt_alt_name} ${fdt_addr_r}; "\
|
||||
"fi ; "\
|
||||
"fdt addr ${fdt_addr_r}; fdt resize; " \
|
||||
- "if afs load ${ramdisk_name} ${ramdisk_addr_r} ; "\
|
||||
+ "if afs load ${initrd_name} ${initrd_addr_r} ; "\
|
||||
"then "\
|
||||
- " setenv ramdisk_param ${ramdisk_addr_r}; "\
|
||||
- " else setenv ramdisk_param -; "\
|
||||
+ " setenv initrd_param ${initrd_addr_r}; "\
|
||||
+ " else setenv initrd_param -; "\
|
||||
"fi ; " \
|
||||
- "booti ${kernel_addr_r} ${ramdisk_param} ${fdt_addr_r}"
|
||||
+ "booti ${kernel_addr_r} ${initrd_param} ${fdt_addr_r}"
|
||||
|
||||
|
||||
#elif CONFIG_TARGET_VEXPRESS64_BASE_FVP
|
||||
--
|
||||
2.17.1
|
||||
|
||||
+50
@@ -0,0 +1,50 @@
|
||||
From 13dde05efae99c5261ed213108087d0f7ac9581e Mon Sep 17 00:00:00 2001
|
||||
From: Damodar Santhapuri <damodar.santhapuri@arm.com>
|
||||
Date: Thu, 5 Nov 2020 22:40:48 +0530
|
||||
Subject: [PATCH] arm: juno: add custom bootcmd to autoboot from uEnv.txt file
|
||||
|
||||
enable autoboot support with custom bootcmd loads uEnv.txt
|
||||
from NOR to DRAM and import.
|
||||
|
||||
Signed-off-by: Damodar Santhapuri <damodar.santhapuri@arm.com>
|
||||
Upstream-Status: Pending
|
||||
---
|
||||
include/configs/vexpress_aemv8.h | 12 ++++++------
|
||||
1 file changed, 6 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/include/configs/vexpress_aemv8.h b/include/configs/vexpress_aemv8.h
|
||||
index f0c5ceb3849a..cd7f6c1b9ba0 100644
|
||||
--- a/include/configs/vexpress_aemv8.h
|
||||
+++ b/include/configs/vexpress_aemv8.h
|
||||
@@ -137,13 +137,13 @@
|
||||
" afs load ${fdt_alt_name} ${fdt_addr_r}; "\
|
||||
"fi ; "\
|
||||
"fdt addr ${fdt_addr_r}; fdt resize; " \
|
||||
- "if afs load ${ramdisk_name} ${ramdisk_addr_r} ; "\
|
||||
+ "if afs load ${initrd_name} ${initrd_addr_r} ; "\
|
||||
"then "\
|
||||
- " setenv ramdisk_param ${ramdisk_addr_r}; "\
|
||||
+ " setenv initrd_param ${initrd_addr_r}; "\
|
||||
"else "\
|
||||
- " setenv ramdisk_param -; "\
|
||||
+ " setenv initrd_param -; "\
|
||||
"fi ; " \
|
||||
- "booti ${kernel_addr_r} ${ramdisk_param} ${fdt_addr_r}\0"
|
||||
+ "booti ${kernel_addr_r} ${initrd_param} ${fdt_addr_r}"
|
||||
#define BOOTENV_DEV_NAME_AFS(devtypeu, devtypel, instance) "afs "
|
||||
|
||||
#define BOOT_TARGET_DEVICES(func) \
|
||||
@@ -164,8 +164,8 @@
|
||||
"kernel_name=norkern\0" \
|
||||
"kernel_alt_name=Image\0" \
|
||||
"kernel_addr_r=0x80080000\0" \
|
||||
- "ramdisk_name=ramdisk.img\0" \
|
||||
- "ramdisk_addr_r=0x88000000\0" \
|
||||
+ "initrd_name=ramdisk.img\0" \
|
||||
+ "initrd_addr_r=0x88000000\0" \
|
||||
"fdtfile=board.dtb\0" \
|
||||
"fdt_alt_name=juno\0" \
|
||||
"fdt_addr_r=0x80000000\0" \
|
||||
--
|
||||
2.30.2
|
||||
|
||||
@@ -72,6 +72,13 @@ SRC_URI:append:fvp-baser-aemv8r64 = " \
|
||||
file://0010-armv8-Enable-icache-when-switching-exception-levels-.patch \
|
||||
"
|
||||
|
||||
|
||||
#
|
||||
# Juno Machines
|
||||
#
|
||||
SRC_URI:append:juno = " file://0001-arm-juno-add-custom-bootcmd-to-autoboot-from-uEnv.tx.patch"
|
||||
|
||||
|
||||
#
|
||||
# TC0 and TC1 MACHINES
|
||||
#
|
||||
|
||||
@@ -1,26 +0,0 @@
|
||||
HOMEPAGE = "http://www.denx.de/wiki/U-Boot/WebHome"
|
||||
DESCRIPTION = "U-Boot, a boot loader for Embedded boards based on PowerPC, \
|
||||
ARM, MIPS and several other processors, which can be installed in a boot \
|
||||
ROM and used to initialize and test the hardware or to download and run \
|
||||
application code."
|
||||
SECTION = "bootloaders"
|
||||
DEPENDS += "flex-native bison-native"
|
||||
|
||||
LICENSE = "GPL-2.0-or-later"
|
||||
LIC_FILES_CHKSUM = "file://Licenses/README;md5=30503fd321432fc713238f582193b78e"
|
||||
PE = "1"
|
||||
|
||||
# We use the revision in order to avoid having to fetch it from the
|
||||
# repo during parse
|
||||
SRCREV = "2f5fbb5b39f7b67044dda5c35e4a4b31685a3109"
|
||||
|
||||
SRC_URI = "git://git.denx.de/u-boot.git;branch=master \
|
||||
"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
B = "${WORKDIR}/build"
|
||||
do_configure[cleandirs] = "${B}"
|
||||
|
||||
require recipes-bsp/u-boot/u-boot.inc
|
||||
|
||||
DEPENDS += "bc-native dtc-native"
|
||||
@@ -1,9 +0,0 @@
|
||||
# Machine specific u-boot
|
||||
|
||||
THIS_DIR := "${THISDIR}"
|
||||
FILESEXTRAPATHS:prepend = "${THIS_DIR}/${BP}:"
|
||||
|
||||
#
|
||||
# Juno KMACHINE
|
||||
#
|
||||
SRC_URI:append:juno = " file://u-boot_vexpress_uenv.patch"
|
||||
Reference in New Issue
Block a user