From 342d2ec1586b34ec3f531a86f069b6d160fa49b0 Mon Sep 17 00:00:00 2001 From: Kamil Dziezyk Date: Fri, 20 Nov 2020 12:37:24 +0100 Subject: [PATCH] arm-autonomy/firmware-image-juno: update offset addresses for NOR flash images This patch brings following improvements: * Remove images-r[012].txt and uEnv.txt source files and move all customization to add-xen-support.patch. * Move juno*-xen.dtb and xen binaries under dedicated 'XEN' directory to be compatible with 8.3 format. * Increase XEN_DEVICETREE_DOM0_SIZE to 36 MiB. Change-Id: I3d3ff963f97c738dcf2d90ba825729232d63ad06 Issue-Id: SCM-1567 Signed-off-by: Kamil Dziezyk Signed-off-by: Ross Burton --- .../conf/machine/juno-extra-settings.inc | 1 + .../images/firmware-image-juno.bbappend | 29 +++- .../firmware-image-juno/add-xen-support.patch | 140 ++++++++++++++++++ .../images/firmware-image-juno/images-r0.txt | 78 ---------- .../images/firmware-image-juno/images-r1.txt | 78 ---------- .../images/firmware-image-juno/images-r2.txt | 78 ---------- .../images/firmware-image-juno/uEnv.txt | 15 -- 7 files changed, 166 insertions(+), 253 deletions(-) create mode 100644 meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-bsp/images/firmware-image-juno/add-xen-support.patch delete mode 100644 meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-bsp/images/firmware-image-juno/images-r0.txt delete mode 100644 meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-bsp/images/firmware-image-juno/images-r1.txt delete mode 100644 meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-bsp/images/firmware-image-juno/images-r2.txt delete mode 100644 meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-bsp/images/firmware-image-juno/uEnv.txt diff --git a/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/conf/machine/juno-extra-settings.inc b/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/conf/machine/juno-extra-settings.inc index 02600c59..110865de 100644 --- a/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/conf/machine/juno-extra-settings.inc +++ b/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/conf/machine/juno-extra-settings.inc @@ -2,3 +2,4 @@ # Juno board has 2 network interfaces, add both of them to the bridge XENGUEST_NETWORK_BRIDGE_MEMBERS ?= "eth0 eth1" +XEN_DEVICETREE_DOM0_SIZE ?= "0x02400000" diff --git a/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-bsp/images/firmware-image-juno.bbappend b/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-bsp/images/firmware-image-juno.bbappend index b0aae695..847e2527 100644 --- a/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-bsp/images/firmware-image-juno.bbappend +++ b/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-bsp/images/firmware-image-juno.bbappend @@ -4,6 +4,19 @@ OVERRIDES_append = "${@bb.utils.contains('DISTRO_FEATURES', 'xen', ':xen', '', d FILESEXTRAPATHS_prepend_xen := "${THISDIR}/${PN}:" +DEPENDS_append_xen = " dos2unix-native" + +SRC_URI_append_xen = " file://add-xen-support.patch;patchdir=../" + +do_install_append_xen() { + mv -v ${D}/${UNPACK_DIR}/SOFTWARE/uEnv.txt \ + ${D}/${UNPACK_DIR}/SOFTWARE/uenvfile + for dir in $(ls ${D}/${UNPACK_DIR}/SITE1/) + do + unix2dos ${D}/${UNPACK_DIR}/SITE1/${dir}/images.txt + done +} + DEPLOY_EXTRA_DEPS ??= "" DEPLOY_EXTRA_DEPS_xen = "xen:do_deploy xen-devicetree:do_deploy" @@ -14,8 +27,16 @@ do_deploy_prepend_xen() { # xen:do_deploy and xen-devicetree:do_deploy when # INITRAMFS_IMAGE_BUNDLE = "1", we need to handle the xen and # xen-devicetree binaries copying in the do_deploy task. - cp ${DEPLOY_DIR_IMAGE}/xen-${COMPATIBLE_MACHINE}.efi \ - ${D}/${UNPACK_DIR}/SOFTWARE/xen - cp ${DEPLOY_DIR_IMAGE}/*xen.dtb \ - ${D}/${UNPACK_DIR}/SOFTWARE/ + + mkdir -p ${D}/${UNPACK_DIR}/SOFTWARE/XEN + cp -v ${DEPLOY_DIR_IMAGE}/xen-${COMPATIBLE_MACHINE}.efi \ + ${D}/${UNPACK_DIR}/SOFTWARE/XEN/xen + + for dtb in $(basename -s .dtb ${KERNEL_DEVICETREE}) + do + cp -v ${DEPLOY_DIR_IMAGE}/${dtb}-xen.dtb \ + ${D}/${UNPACK_DIR}/SOFTWARE/XEN/${dtb}.dtb + done + + bbnote "Xen binaries added under SOFTWARE/XEN directory" } diff --git a/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-bsp/images/firmware-image-juno/add-xen-support.patch b/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-bsp/images/firmware-image-juno/add-xen-support.patch new file mode 100644 index 00000000..04098e11 --- /dev/null +++ b/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-bsp/images/firmware-image-juno/add-xen-support.patch @@ -0,0 +1,140 @@ +arm-bsp/firmware-image-juno: add xen support + +This patch adds xen and dtbs binaries entries to images-r[012].txt files. +These images-r[012].txt files contain NOR filesystem entries details, +like file offset, name, path etc. + +It also adds customization for uEnv.txt file, that allows to autoboot xen. + +Upstream-Status: Inappropriate [configuration] +Signed-off-by: Kamil Dziezyk + +diff -r -u a/images-r0.txt b/images-r0.txt +--- a/images-r0.txt 2020-11-13 17:26:27.945942230 +0100 ++++ b/images-r0.txt 2020-11-13 17:26:43.221881902 +0100 +@@ -1,7 +1,7 @@ + TITLE: Versatile Express Images Configuration File + + [IMAGES] +-TOTALIMAGES: 10 ;Number of Images (Max: 32) ++TOTALIMAGES: 11 ;Number of Images (Max: 32) + + NOR0UPDATE: AUTO ;Image Update:NONE/AUTO/FORCE + NOR0ADDRESS: 0x00000000 ;Image Flash Address +@@ -24,7 +24,7 @@ + + NOR3UPDATE: AUTO ;Image Update:NONE/AUTO/FORCE + NOR3ADDRESS: 0x02900000 ;Image Flash Address +-NOR3FILE: \SOFTWARE\juno.dtb ;Image File Name ++NOR3FILE: \SOFTWARE\XEN\juno.dtb ;Image File Name + NOR3NAME: board.dtb ;Specify target filename to preserve file extension + NOR3LOAD: 00000000 ;Image Load Address + NOR3ENTRY: 00000000 ;Image Entry Point +@@ -64,8 +64,13 @@ + NOR9UPDATE: AUTO ;Image Update:NONE/AUTO/FORCE + NOR9ADDRESS: 0x02A80000 ;Image Flash Address + NOR9NAME: uEnv.txt +-NOR9FILE: \SOFTWARE\uEnv.txt ;Image File Name ++NOR9FILE: \SOFTWARE\uenvfile ;Image File Name + NOR9LOAD: 00000000 ;Image Load Address + NOR9ENTRY: 00000000 ;Image Entry Point + +- ++NOR10UPDATE: AUTO ;Image Update:NONE/AUTO/FORCE ++NOR10ADDRESS: 0x03000000 ;Image Flash Address ++NOR10FILE: \SOFTWARE\XEN\xen ;Image File Name ++NOR10NAME: xen ++NOR10LOAD: 00000000 ;Image Load Address ++NOR10ENTRY: 00000000 ;Image Entry Point +diff -r -u a/images-r1.txt b/images-r1.txt +--- a/images-r1.txt 2020-11-13 17:26:27.945942230 +0100 ++++ b/images-r1.txt 2020-11-13 17:26:43.221881902 +0100 +@@ -1,7 +1,7 @@ + TITLE: Versatile Express Images Configuration File + + [IMAGES] +-TOTALIMAGES: 10 ;Number of Images (Max: 32) ++TOTALIMAGES: 11 ;Number of Images (Max: 32) + + NOR0UPDATE: AUTO ;Image Update:NONE/AUTO/FORCE + NOR0ADDRESS: 0x00000000 ;Image Flash Address +@@ -24,7 +24,7 @@ + + NOR3UPDATE: AUTO ;Image Update:NONE/AUTO/FORCE + NOR3ADDRESS: 0x02900000 ;Image Flash Address +-NOR3FILE: \SOFTWARE\juno-r1.dtb ;Image File Name ++NOR3FILE: \SOFTWARE\XEN\juno-r1.dtb ;Image File Name + NOR3NAME: board.dtb ;Specify target filename to preserve file extension + NOR3LOAD: 00000000 ;Image Load Address + NOR3ENTRY: 00000000 ;Image Entry Point +@@ -64,8 +64,13 @@ + NOR9UPDATE: AUTO ;Image Update:NONE/AUTO/FORCE + NOR9ADDRESS: 0x02A80000 ;Image Flash Address + NOR9NAME: uEnv.txt +-NOR9FILE: \SOFTWARE\uEnv.txt ;Image File Name ++NOR9FILE: \SOFTWARE\uenvfile ;Image File Name + NOR9LOAD: 00000000 ;Image Load Address + NOR9ENTRY: 00000000 ;Image Entry Point + +- ++NOR10UPDATE: AUTO ;Image Update:NONE/AUTO/FORCE ++NOR10ADDRESS: 0x03000000 ;Image Flash Address ++NOR10FILE: \SOFTWARE\XEN\xen ;Image File Name ++NOR10NAME: xen ++NOR10LOAD: 00000000 ;Image Load Address ++NOR10ENTRY: 00000000 ;Image Entry Point +diff -r -u a/images-r2.txt b/images-r2.txt +--- a/images-r2.txt 2020-11-13 17:26:27.949942214 +0100 ++++ b/images-r2.txt 2020-11-13 17:26:43.221881902 +0100 +@@ -1,7 +1,7 @@ + TITLE: Versatile Express Images Configuration File + + [IMAGES] +-TOTALIMAGES: 10 ;Number of Images (Max: 32) ++TOTALIMAGES: 11 ;Number of Images (Max: 32) + + NOR0UPDATE: AUTO ;Image Update:NONE/AUTO/FORCE + NOR0ADDRESS: 0x00000000 ;Image Flash Address +@@ -24,7 +24,7 @@ + + NOR3UPDATE: AUTO ;Image Update:NONE/AUTO/FORCE + NOR3ADDRESS: 0x02900000 ;Image Flash Address +-NOR3FILE: \SOFTWARE\juno-r2.dtb ;Image File Name ++NOR3FILE: \SOFTWARE\XEN\juno-r2.dtb ;Image File Name + NOR3NAME: board.dtb ;Specify target filename to preserve file extension + NOR3LOAD: 00000000 ;Image Load Address + NOR3ENTRY: 00000000 ;Image Entry Point +@@ -64,8 +64,13 @@ + NOR9UPDATE: AUTO ;Image Update:NONE/AUTO/FORCE + NOR9ADDRESS: 0x02A80000 ;Image Flash Address + NOR9NAME: uEnv.txt +-NOR9FILE: \SOFTWARE\uEnv.txt ;Image File Name ++NOR9FILE: \SOFTWARE\uenvfile ;Image File Name + NOR9LOAD: 00000000 ;Image Load Address + NOR9ENTRY: 00000000 ;Image Entry Point + +- ++NOR10UPDATE: AUTO ;Image Update:NONE/AUTO/FORCE ++NOR10ADDRESS: 0x03000000 ;Image Flash Address ++NOR10FILE: \SOFTWARE\XEN\xen ;Image File Name ++NOR10NAME: xen ++NOR10LOAD: 00000000 ;Image Load Address ++NOR10ENTRY: 00000000 ;Image Entry Point +diff -r -u a/uEnv.txt b/uEnv.txt +--- a/uEnv.txt 2020-11-13 17:26:27.949942214 +0100 ++++ b/uEnv.txt 2020-11-13 17:26:43.221881902 +0100 +@@ -1,3 +1,5 @@ ++xen_name=xen ++xen_addr=0x84000000 + uenvcmd=run mybootcmd + mybootcmd=echo Loading custom boot command; \ + echo Loading kernel; \ +@@ -7,5 +9,7 @@ + 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; \ +-booti ${kernel_addr_r} - ${fdt_addr_r}; ++echo Loading Xen; \ ++afs load ${xen_name} ${xen_addr}; \ ++if test $? -eq 0; then echo Booting Xen; bootefi ${xen_addr} ${fdt_addr_r}; fi; + diff --git a/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-bsp/images/firmware-image-juno/images-r0.txt b/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-bsp/images/firmware-image-juno/images-r0.txt deleted file mode 100644 index ec32ca29..00000000 --- a/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-bsp/images/firmware-image-juno/images-r0.txt +++ /dev/null @@ -1,78 +0,0 @@ -TITLE: Versatile Express Images Configuration File - -[IMAGES] -TOTALIMAGES: 11 ;Number of Images (Max: 32) - -NOR0UPDATE: AUTO ;Image Update:NONE/AUTO/FORCE -NOR0ADDRESS: 0x00000000 ;Image Flash Address -NOR0FILE: \SOFTWARE\fip.bin ;Image File Name -NOR0LOAD: 00000000 ;Image Load Address -NOR0ENTRY: 00000000 ;Image Entry Point - -NOR1UPDATE: AUTO ;Image Update:NONE/AUTO/FORCE -NOR1ADDRESS: 0x03EC0000 ;Image Flash Address -NOR1FILE: \SOFTWARE\bl1.bin ;Image File Name -NOR1LOAD: 00000000 ;Image Load Address -NOR1ENTRY: 00000000 ;Image Entry Point - -NOR2UPDATE: AUTO ;Image Update:NONE/AUTO/FORCE -NOR2ADDRESS: 0x00500000 ;Image Flash Address -NOR2FILE: \SOFTWARE\Image ;Image File Name -NOR2NAME: norkern ;Rename kernel to norkern -NOR2LOAD: 00000000 ;Image Load Address -NOR2ENTRY: 00000000 ;Image Entry Point - -NOR3UPDATE: AUTO ;Image Update:NONE/AUTO/FORCE -NOR3ADDRESS: 0x02700000 ;Image Flash Address -NOR3FILE: \SOFTWARE\juno-xen.dtb ;Image File Name -NOR3NAME: board.dtb ;Specify target filename to preserve file extension -NOR3LOAD: 00000000 ;Image Load Address -NOR3ENTRY: 00000000 ;Image Entry Point - -NOR4UPDATE: AUTO ;Image Update:NONE/AUTO/FORCE -NOR4ADDRESS: 0x01D00000 ;Image Flash Address -NOR4FILE: \SOFTWARE\xen ;Image File Name -NOR4NAME: xen -NOR4LOAD: 00000000 ;Image Load Address -NOR4ENTRY: 00000000 ;Image Entry Point - -NOR5UPDATE: AUTO ;Image Update:NONE/AUTO/FORCE -NOR5ADDRESS: 0x025C0000 ;Image Flash Address -NOR5FILE: \SOFTWARE\hdlcdclk.dat ;Image File Name -NOR5LOAD: 00000000 ;Image Load Address -NOR5ENTRY: 00000000 ;Image Entry Point - -NOR6UPDATE: AUTO ;Image Update:NONE/AUTO/FORCE -NOR6ADDRESS: 0x03E40000 ;Image Flash Address -NOR6FILE: \SOFTWARE\scp_bl1.bin ;Image File Name -NOR6LOAD: 00000000 ;Image Load Address -NOR6ENTRY: 00000000 ;Image Entry Point - -NOR7UPDATE: AUTO ;Image Update:NONE/AUTO/FORCE -NOR7ADDRESS: 0x0BF00000 ;Image Flash Address -NOR7FILE: \SOFTWARE\startup.nsh ;Image File Name -NOR7NAME: startup.nsh -NOR7LOAD: 00000000 ;Image Load Address -NOR7ENTRY: 00000000 ;Image Entry Point - -NOR8UPDATE: AUTO ;Image Update:NONE/AUTO/FORCE -NOR8ADDRESS: 0x0BFC0000 ;Image Flash Address -NOR8FILE: \SOFTWARE\blank.img ;Image File Name -NOR8NAME: BOOTENV -NOR8LOAD: 00000000 ;Image Load Address -NOR8ENTRY: 00000000 ;Image Entry Point - -NOR9UPDATE: AUTO ;Image Update:NONE/AUTO/FORCE -NOR9ADDRESS: 0x02600000 ;Image Flash Address -NOR9FILE: \SOFTWARE\selftest ;Image File Name -NOR9LOAD: 00000000 ;Image Load Address -NOR9ENTRY: 00000000 ;Image Entry Point - -NOR10UPDATE: AUTO ;Image Update:NONE/AUTO/FORCE -NOR10ADDRESS: 0x02780000 ;Image Flash Address -NOR10NAME: uEnv.txt -NOR10FILE: \SOFTWARE\uEnv.txt ;Image File Name -NOR10LOAD: 00000000 ;Image Load Address -NOR10ENTRY: 00000000 ;Image Entry Point - - diff --git a/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-bsp/images/firmware-image-juno/images-r1.txt b/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-bsp/images/firmware-image-juno/images-r1.txt deleted file mode 100644 index 1372bc30..00000000 --- a/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-bsp/images/firmware-image-juno/images-r1.txt +++ /dev/null @@ -1,78 +0,0 @@ -TITLE: Versatile Express Images Configuration File - -[IMAGES] -TOTALIMAGES: 11 ;Number of Images (Max: 32) - -NOR0UPDATE: AUTO ;Image Update:NONE/AUTO/FORCE -NOR0ADDRESS: 0x00000000 ;Image Flash Address -NOR0FILE: \SOFTWARE\fip.bin ;Image File Name -NOR0LOAD: 00000000 ;Image Load Address -NOR0ENTRY: 00000000 ;Image Entry Point - -NOR1UPDATE: AUTO ;Image Update:NONE/AUTO/FORCE -NOR1ADDRESS: 0x03EC0000 ;Image Flash Address -NOR1FILE: \SOFTWARE\bl1.bin ;Image File Name -NOR1LOAD: 00000000 ;Image Load Address -NOR1ENTRY: 00000000 ;Image Entry Point - -NOR2UPDATE: AUTO ;Image Update:NONE/AUTO/FORCE -NOR2ADDRESS: 0x00500000 ;Image Flash Address -NOR2FILE: \SOFTWARE\Image ;Image File Name -NOR2NAME: norkern ;Rename kernel to norkern -NOR2LOAD: 00000000 ;Image Load Address -NOR2ENTRY: 00000000 ;Image Entry Point - -NOR3UPDATE: AUTO ;Image Update:NONE/AUTO/FORCE -NOR3ADDRESS: 0x02700000 ;Image Flash Address -NOR3FILE: \SOFTWARE\juno-r1-xen.dtb ;Image File Name -NOR3NAME: board.dtb ;Specify target filename to preserve file extension -NOR3LOAD: 00000000 ;Image Load Address -NOR3ENTRY: 00000000 ;Image Entry Point - -NOR4UPDATE: AUTO ;Image Update:NONE/AUTO/FORCE -NOR4ADDRESS: 0x01D00000 ;Image Flash Address -NOR4FILE: \SOFTWARE\xen ;Image File Name -NOR4NAME: xen -NOR4LOAD: 00000000 ;Image Load Address -NOR4ENTRY: 00000000 ;Image Entry Point - -NOR5UPDATE: AUTO ;Image Update:NONE/AUTO/FORCE -NOR5ADDRESS: 0x025C0000 ;Image Flash Address -NOR5FILE: \SOFTWARE\hdlcdclk.dat ;Image File Name -NOR5LOAD: 00000000 ;Image Load Address -NOR5ENTRY: 00000000 ;Image Entry Point - -NOR6UPDATE: AUTO ;Image Update:NONE/AUTO/FORCE -NOR6ADDRESS: 0x03E40000 ;Image Flash Address -NOR6FILE: \SOFTWARE\scp_bl1.bin ;Image File Name -NOR6LOAD: 00000000 ;Image Load Address -NOR6ENTRY: 00000000 ;Image Entry Point - -NOR7UPDATE: AUTO ;Image Update:NONE/AUTO/FORCE -NOR7ADDRESS: 0x0BF00000 ;Image Flash Address -NOR7FILE: \SOFTWARE\startup.nsh ;Image File Name -NOR7NAME: startup.nsh -NOR7LOAD: 00000000 ;Image Load Address -NOR7ENTRY: 00000000 ;Image Entry Point - -NOR8UPDATE: AUTO ;Image Update:NONE/AUTO/FORCE -NOR8ADDRESS: 0x0BFC0000 ;Image Flash Address -NOR8FILE: \SOFTWARE\blank.img ;Image File Name -NOR8NAME: BOOTENV -NOR8LOAD: 00000000 ;Image Load Address -NOR8ENTRY: 00000000 ;Image Entry Point - -NOR9UPDATE: AUTO ;Image Update:NONE/AUTO/FORCE -NOR9ADDRESS: 0x02600000 ;Image Flash Address -NOR9FILE: \SOFTWARE\selftest ;Image File Name -NOR9LOAD: 00000000 ;Image Load Address -NOR9ENTRY: 00000000 ;Image Entry Point - -NOR10UPDATE: AUTO ;Image Update:NONE/AUTO/FORCE -NOR10ADDRESS: 0x02780000 ;Image Flash Address -NOR10NAME: uEnv.txt -NOR10FILE: \SOFTWARE\uEnv.txt ;Image File Name -NOR10LOAD: 00000000 ;Image Load Address -NOR10ENTRY: 00000000 ;Image Entry Point - - diff --git a/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-bsp/images/firmware-image-juno/images-r2.txt b/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-bsp/images/firmware-image-juno/images-r2.txt deleted file mode 100644 index def465e1..00000000 --- a/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-bsp/images/firmware-image-juno/images-r2.txt +++ /dev/null @@ -1,78 +0,0 @@ -TITLE: Versatile Express Images Configuration File - -[IMAGES] -TOTALIMAGES: 11 ;Number of Images (Max: 32) - -NOR0UPDATE: AUTO ;Image Update:NONE/AUTO/FORCE -NOR0ADDRESS: 0x00000000 ;Image Flash Address -NOR0FILE: \SOFTWARE\fip.bin ;Image File Name -NOR0LOAD: 00000000 ;Image Load Address -NOR0ENTRY: 00000000 ;Image Entry Point - -NOR1UPDATE: AUTO ;Image Update:NONE/AUTO/FORCE -NOR1ADDRESS: 0x03EC0000 ;Image Flash Address -NOR1FILE: \SOFTWARE\bl1.bin ;Image File Name -NOR1LOAD: 00000000 ;Image Load Address -NOR1ENTRY: 00000000 ;Image Entry Point - -NOR2UPDATE: AUTO ;Image Update:NONE/AUTO/FORCE -NOR2ADDRESS: 0x00500000 ;Image Flash Address -NOR2FILE: \SOFTWARE\Image ;Image File Name -NOR2NAME: norkern ;Rename kernel to norkern -NOR2LOAD: 00000000 ;Image Load Address -NOR2ENTRY: 00000000 ;Image Entry Point - -NOR3UPDATE: AUTO ;Image Update:NONE/AUTO/FORCE -NOR3ADDRESS: 0x02700000 ;Image Flash Address -NOR3FILE: \SOFTWARE\juno-r2-xen.dtb ;Image File Name -NOR3NAME: board.dtb ;Specify target filename to preserve file extension -NOR3LOAD: 00000000 ;Image Load Address -NOR3ENTRY: 00000000 ;Image Entry Point - -NOR4UPDATE: AUTO ;Image Update:NONE/AUTO/FORCE -NOR4ADDRESS: 0x01D00000 ;Image Flash Address -NOR4FILE: \SOFTWARE\xen ;Image File Name -NOR4NAME: xen -NOR4LOAD: 00000000 ;Image Load Address -NOR4ENTRY: 00000000 ;Image Entry Point - -NOR5UPDATE: AUTO ;Image Update:NONE/AUTO/FORCE -NOR5ADDRESS: 0x025C0000 ;Image Flash Address -NOR5FILE: \SOFTWARE\hdlcdclk.dat ;Image File Name -NOR5LOAD: 00000000 ;Image Load Address -NOR5ENTRY: 00000000 ;Image Entry Point - -NOR6UPDATE: AUTO ;Image Update:NONE/AUTO/FORCE -NOR6ADDRESS: 0x03E40000 ;Image Flash Address -NOR6FILE: \SOFTWARE\scp_bl1.bin ;Image File Name -NOR6LOAD: 00000000 ;Image Load Address -NOR6ENTRY: 00000000 ;Image Entry Point - -NOR7UPDATE: AUTO ;Image Update:NONE/AUTO/FORCE -NOR7ADDRESS: 0x0BF00000 ;Image Flash Address -NOR7FILE: \SOFTWARE\startup.nsh ;Image File Name -NOR7NAME: startup.nsh -NOR7LOAD: 00000000 ;Image Load Address -NOR7ENTRY: 00000000 ;Image Entry Point - -NOR8UPDATE: AUTO ;Image Update:NONE/AUTO/FORCE -NOR8ADDRESS: 0x0BFC0000 ;Image Flash Address -NOR8FILE: \SOFTWARE\blank.img ;Image File Name -NOR8NAME: BOOTENV -NOR8LOAD: 00000000 ;Image Load Address -NOR8ENTRY: 00000000 ;Image Entry Point - -NOR9UPDATE: AUTO ;Image Update:NONE/AUTO/FORCE -NOR9ADDRESS: 0x02600000 ;Image Flash Address -NOR9FILE: \SOFTWARE\selftest ;Image File Name -NOR9LOAD: 00000000 ;Image Load Address -NOR9ENTRY: 00000000 ;Image Entry Point - -NOR10UPDATE: AUTO ;Image Update:NONE/AUTO/FORCE -NOR10ADDRESS: 0x02780000 ;Image Flash Address -NOR10NAME: uEnv.txt -NOR10FILE: \SOFTWARE\uEnv.txt ;Image File Name -NOR10LOAD: 00000000 ;Image Load Address -NOR10ENTRY: 00000000 ;Image Entry Point - - diff --git a/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-bsp/images/firmware-image-juno/uEnv.txt b/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-bsp/images/firmware-image-juno/uEnv.txt deleted file mode 100644 index 4307b696..00000000 --- a/meta-arm-autonomy/dynamic-layers/meta-arm-bsp/recipes-bsp/images/firmware-image-juno/uEnv.txt +++ /dev/null @@ -1,15 +0,0 @@ -xen_name=xen -xen_addr=0x84000000 -uenvcmd=run mybootcmd -mybootcmd=echo Loading custom boot command; \ -echo Loading kernel; \ -afs load ${kernel_name} ${kernel_addr} ; \ -if test $? -eq 1; then echo Loading ${kernel_alt_name} instead of ${kernel_name}; afs load ${kernel_alt_name} ${kernel_addr}; fi; \ -echo Loading device tree; \ -afs load ${fdtfile} ${fdt_addr}; \ -if test $? -eq 1; then echo Loading ${fdt_alt_name} instead of ${fdtfile}; \ -afs load ${fdt_alt_name} ${fdt_addr}; fi; fdt addr ${fdt_addr}; fdt resize; \ -echo Loading Xen; \ -afs load ${xen_name} ${xen_addr}; \ -if test $? -eq 0; then echo Booting Xen; bootefi ${xen_addr} ${fdt_addr}; fi; -