From 1a77ae9d5ff627bd446db4dd3e174770dc135814 Mon Sep 17 00:00:00 2001 From: Nathan Dunne Date: Wed, 24 Mar 2021 15:24:43 +0000 Subject: [PATCH] arm-autonomy/u-boot: Modified kernel_addr for fvp-base with xen Modified the default booti command for fvp-base with xen to boot into xen at 0x84000000, rather than requiring the user to break into the u-boot prompt. Issue-Id: SCM-2195 Signed-off-by: Nathan Dunne Change-Id: I91f324ce77716474596a78f97e74f432969d9803 Signed-off-by: Jon Mason --- .../documentation/arm-autonomy-quickstart.md | 4 ++++ .../fvp-base/xen_u-boot_kernel_addr.patch | 16 ++++++++++++++++ .../recipes-bsp/u-boot/u-boot_2021.01.bbappend | 9 +++++++++ 3 files changed, 29 insertions(+) create mode 100644 meta-arm-autonomy/recipes-bsp/u-boot/u-boot-2021.01/fvp-base/xen_u-boot_kernel_addr.patch create mode 100644 meta-arm-autonomy/recipes-bsp/u-boot/u-boot_2021.01.bbappend diff --git a/meta-arm-autonomy/documentation/arm-autonomy-quickstart.md b/meta-arm-autonomy/documentation/arm-autonomy-quickstart.md index e46729d8..ab8e2195 100644 --- a/meta-arm-autonomy/documentation/arm-autonomy-quickstart.md +++ b/meta-arm-autonomy/documentation/arm-autonomy-quickstart.md @@ -119,6 +119,10 @@ To boot the system using an u-boot base board you will need to: In this example the addresses might need to be adapted depending on your board. +For arm-autonomy host on FVP-Base u-boot has been modified such that +`booti 0x84000000 - 0x83000000` is the default boot command. If FVP-Base is your +MACHINE target there should be no need to interfere with u-boot. + Guest project ------------- The guest projects are not target specific and will use a Yocto MACHINE defined diff --git a/meta-arm-autonomy/recipes-bsp/u-boot/u-boot-2021.01/fvp-base/xen_u-boot_kernel_addr.patch b/meta-arm-autonomy/recipes-bsp/u-boot/u-boot-2021.01/fvp-base/xen_u-boot_kernel_addr.patch new file mode 100644 index 00000000..ac27ddea --- /dev/null +++ b/meta-arm-autonomy/recipes-bsp/u-boot/u-boot-2021.01/fvp-base/xen_u-boot_kernel_addr.patch @@ -0,0 +1,16 @@ +Upstream Status: Inappropriate [meta-arm-autonomy specifc u-boot config] +Signed-off-by: Nathan Dunne + +diff --git a/include/configs/vexpress_aemv8a.h b/include/configs/vexpress_aemv8a.h +index e63c335f85..9ee050a4a6 100644 +--- a/include/configs/vexpress_aemv8a.h ++++ b/include/configs/vexpress_aemv8a.h +@@ -162,7 +162,7 @@ + #elif CONFIG_TARGET_VEXPRESS64_BASE_FVP + #define CONFIG_EXTRA_ENV_SETTINGS \ + "kernel_name=Image\0" \ +- "kernel_addr=0x80080000\0" \ ++ "kernel_addr=0x84000000\0" \ + "initrd_name=ramdisk.img\0" \ + "initrd_addr=0x88000000\0" \ + "fdtfile=devtree.dtb\0" \ diff --git a/meta-arm-autonomy/recipes-bsp/u-boot/u-boot_2021.01.bbappend b/meta-arm-autonomy/recipes-bsp/u-boot/u-boot_2021.01.bbappend new file mode 100644 index 00000000..daabc5f1 --- /dev/null +++ b/meta-arm-autonomy/recipes-bsp/u-boot/u-boot_2021.01.bbappend @@ -0,0 +1,9 @@ +# Machine specific u-boot + +FILESEXTRAPATHS_prepend := "${THISDIR}/${BP}:" + +# +# FVP BASE +# + +SRC_URI_append_fvp-base = "${@bb.utils.contains('DISTRO_FEATURES', 'arm-autonomy-host', ' file://xen_u-boot_kernel_addr.patch', '', d)}"