From: "Jon Mason" <jon.mason@arm.com>
To: meta-arm@lists.yoctoproject.org
Cc: nd@arm.com, Damodar Santhapuri <damodar.santhapuri@arm.com>
Subject: [PATCH] arm-bsp: u-boot error fixing and file clean-up
Date: Mon, 20 Jul 2020 14:17:35 -0400 [thread overview]
Message-ID: <20200720181735.21132-1-jon.mason@arm.com> (raw)
This commit fixes the errors while rebasing u-boot src to v2020.07.
Additional work necessary to preserve dunfell functionality.
Consolidate all of the files into a single inc file and single bbappend
file.
Change-Id: I442c843b1fafeb41ea283d2f11393522a48fc9d2
Signed-off-by: Damodar Santhapuri <damodar.santhapuri@arm.com>
Signed-off-by: Jon Mason <jon.mason@arm.com>
---
.../juno/u-boot_vexpress_uenv.patch | 0
.../juno/u-boot_vexpress_uenv.patch | 37 +++++++++++++++++++
.../recipes-bsp/u-boot/u-boot-tc0.inc | 3 --
.../recipes-bsp/u-boot/u-boot_%.bbappend | 30 ++++++++++++---
.../recipes-bsp/u-boot/u-boot_2020.%.bbappend | 13 -------
5 files changed, 62 insertions(+), 21 deletions(-)
rename meta-arm-bsp/recipes-bsp/u-boot/{files => u-boot-2020.01}/juno/u-boot_vexpress_uenv.patch (100%)
create mode 100644 meta-arm-bsp/recipes-bsp/u-boot/u-boot-2020.07/juno/u-boot_vexpress_uenv.patch
delete mode 100644 meta-arm-bsp/recipes-bsp/u-boot/u-boot-tc0.inc
delete mode 100644 meta-arm-bsp/recipes-bsp/u-boot/u-boot_2020.%.bbappend
diff --git a/meta-arm-bsp/recipes-bsp/u-boot/files/juno/u-boot_vexpress_uenv.patch b/meta-arm-bsp/recipes-bsp/u-boot/u-boot-2020.01/juno/u-boot_vexpress_uenv.patch
similarity index 100%
rename from meta-arm-bsp/recipes-bsp/u-boot/files/juno/u-boot_vexpress_uenv.patch
rename to meta-arm-bsp/recipes-bsp/u-boot/u-boot-2020.01/juno/u-boot_vexpress_uenv.patch
diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot-2020.07/juno/u-boot_vexpress_uenv.patch b/meta-arm-bsp/recipes-bsp/u-boot/u-boot-2020.07/juno/u-boot_vexpress_uenv.patch
new file mode 100644
index 0000000..c68c173
--- /dev/null
+++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot-2020.07/juno/u-boot_vexpress_uenv.patch
@@ -0,0 +1,37 @@
+diff --git a/include/configs/vexpress_aemv8a.h b/include/configs/vexpress_aemv8a.h
+index 09cdd3dab5..7d6d231bd9 100644
+--- a/include/configs/vexpress_aemv8a.h
++++ b/include/configs/vexpress_aemv8a.h
+@@ -136,6 +136,32 @@
+ "fdtfile=board.dtb\0" \
+ "fdt_alt_name=juno\0" \
+ "fdt_addr_r=0x80000000\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=0x82000000\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 ${ramdisk_name} ${ramdisk_addr_r} ; "\
++ "then "\
++ " setenv ramdisk_param ${ramdisk_addr_r}; "\
++ " else setenv ramdisk_param -; "\
++ "fi ; " \
++ "booti ${kernel_addr_r} ${ramdisk_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} ;"\
diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot-tc0.inc b/meta-arm-bsp/recipes-bsp/u-boot/u-boot-tc0.inc
deleted file mode 100644
index 6594b3f..0000000
--- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot-tc0.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-# TC0 specific Das U-Boot configuration and patch
-
-SRC_URI_append = ' file://0001-Add-support-for-Total-Compute.patch'
diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot_%.bbappend b/meta-arm-bsp/recipes-bsp/u-boot/u-boot_%.bbappend
index 0df13a4..966f040 100644
--- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot_%.bbappend
+++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot_%.bbappend
@@ -1,12 +1,32 @@
# Machine specific u-boot
-FILESEXTRAPATHS_prepend := "${THISDIR}/files/${MACHINE}:"
+THISDIR := "${THISDIR}"
+FILESEXTRAPATHS_prepend = "${THISDIR}/files/:${THISDIR}/${BP}:"
+FILESEXTRAPATHS_prepend_fvp-base := "${THISDIR}/files/fvp-common:"
+FILESEXTRAPATHS_prepend_foundation-armv8 := "${THISDIR}/files/fvp-common:"
+#
+# Cortex-A5 DesignStart KMACHINE
+#
SRC_URI_append_a5ds = " file://0001-armv7-add-mmio-timer.patch \
- file://0002-board-arm-add-designstart-cortex-a5-board.patch"
+ file://0002-board-arm-add-designstart-cortex-a5-board.patch"
-MACHINE_UBOOT_REQUIRE ?= ""
+#
+# FVP FOUNDATION KMACHINE
+#
+SRC_URI_append_foundation-armv8 = " file://u-boot_vexpress_fvp.patch"
-MACHINE_UBOOT_REQUIRE_tc0 = "u-boot-tc0.inc"
+#
+# FVP BASE KMACHINE
+#
+SRC_URI_append_fvp-base = " file://u-boot_vexpress_fvp.patch"
-require ${MACHINE_UBOOT_REQUIRE}
+#
+# Juno KMACHINE
+#
+SRC_URI_append_juno = " file://u-boot_vexpress_uenv.patch"
+
+#
+# Total Compute KMACHINE
+#
+SRC_URI_append_tc0 = " file://0001-Add-support-for-Total-Compute.patch"
diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot_2020.%.bbappend b/meta-arm-bsp/recipes-bsp/u-boot/u-boot_2020.%.bbappend
deleted file mode 100644
index a46e36f..0000000
--- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot_2020.%.bbappend
+++ /dev/null
@@ -1,13 +0,0 @@
-# u-boot_2020 patch for fvp machinesboard
-
-#
-# Patch u-boot to change kernel command line
-#
-
-FILESEXTRAPATHS_prepend_fvp-base := "${THISDIR}/files/fvp-common:"
-FILESEXTRAPATHS_prepend_foundation-armv8 := "${THISDIR}/files/fvp-common:"
-FILESEXTRAPATHS_prepend_juno := "${THISDIR}/files:"
-
-SRC_URI_append_fvp-base = " file://u-boot_vexpress_fvp.patch"
-SRC_URI_append_foundation-armv8 = " file://u-boot_vexpress_fvp.patch"
-SRC_URI_append_juno = " file://u-boot_vexpress_uenv.patch"
--
2.17.1
next reply other threads:[~2020-07-20 20:02 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-20 18:17 Jon Mason [this message]
2020-07-21 8:55 ` [meta-arm] [PATCH] arm-bsp: u-boot error fixing and file clean-up Richard Purdie
2020-07-21 13:48 ` Jon Mason
2020-07-21 14:12 ` Richard Purdie
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200720181735.21132-1-jon.mason@arm.com \
--to=jon.mason@arm.com \
--cc=damodar.santhapuri@arm.com \
--cc=meta-arm@lists.yoctoproject.org \
--cc=nd@arm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.