arm-bsp: u-boot error fixing and file clean-up
PATCH 1/1 arm-bsp: u-boot error fixing and file clean-up
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.
---
.../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.%.bbappendmeta-arm-bsp/recipes-bsp/u-boot/u-boot-2020.01/juno/u-boot_vexpress_uenv.patch renamed from meta-arm-bsp/recipes-bsp/u-boot/files/juno/u-boot_vexpress_uenv.patch +0 -0
meta-arm-bsp/recipes-bsp/u-boot/u-boot-2020.07/juno/u-boot_vexpress_uenv.patch new file +37 -0
@@ -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} ;"\
meta-arm-bsp/recipes-bsp/u-boot/u-boot-tc0.inc deleted +0 -3
@@ -1,3 +0,0 @@ -# TC0 specific Das U-Boot configuration and patch - -SRC_URI_append = ' file://0001-Add-support-for-Total-Compute.patch'
meta-arm-bsp/recipes-bsp/u-boot/u-boot_%.bbappend +25 -5
@@ -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"
meta-arm-bsp/recipes-bsp/u-boot/u-boot_2020.%.bbappend deleted +0 -13
@@ -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"
Signature · 1 line
2.17.1
Quoted 9 lines · Jon Mason
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 I442c843b1fafeb41ea283d2f11393522a48fc9d2Signed-off-by Damodar Santhapuri <[email protected]>Signed-off-by Jon Mason <[email protected]>
Thanks, looking forward to green builds!
Cheers,
Richard
Quoted 7 lines · Richard Purdie
Quoted 6 lines · Jon Mason
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.
Quoted 5 lines
Quoted 3 lines
Change-Id I442c843b1fafeb41ea283d2f11393522a48fc9d2Signed-off-by Damodar Santhapuri <[email protected]>Signed-off-by Jon Mason <[email protected]>Thanks, looking forward to green builds!
I'm not sure this gets us to green, but it gets us out of the red for sure ;-).
It's in master now. Now Ross can start fixing all the warnings.
Thanks,
Jon
Quoted 7 lines
Cheers,
Richard
Quoted 13 lines · Jon Mason
Quoted 12 lines · Richard Purdie
Quoted 10 lines · Jon Mason
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 I442c843b1fafeb41ea283d2f11393522a48fc9d2Signed-off-by Damodar Santhapuri <[email protected]>Signed-off-by Jon Mason <[email protected]>
Quoted 6 lines
Quoted 1 line
Thanks, looking forward to green builds!
I'm not sure this gets us to green, but it gets us out of the red for sure ;-).
It's in master now. Now Ross can start fixing all the warnings.
Ross' plan here seems to be to file them as bitbake bugs and force the bitbake maintainer to write patches! ;-)
The last test build didn't throw any warnings so we may be looking ok there too...
Cheers,
Richard