arm-bsp/n1sdp-board-firmware: include RAM firmware for secondary device
PATCH 1/1 arm-bsp/n1sdp-board-firmware: include RAM firmware for secondary device
From: Khasim Mohammed <[email protected]>
While testing multi-chip mode it was observed that n1sdp running as secondary device needs scp and mcp RAM firmware as well.
This issue wasn't captured earlier as QSPI flash had RAM firmware installed and it doesn't get erased automatically therefore the device was able to load it on every reboot.
--- .../recipes-bsp/images/sdcard-image-n1sdp_0.1.bb | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-)
meta-arm-bsp/recipes-bsp/images/sdcard-image-n1sdp_0.1.bb +5 -9
@@ -18,9 +18,7 @@ FIRMWARE_DIR = "n1sdp-board-firmware_source" PRIMARY_DIR = "${WORKDIR}/n1sdp-board-firmware_primary" SECONDARY_DIR = "${WORKDIR}/n1sdp-board-firmware_secondary" -SOC_BINARIES_PRIMARY = "mcp_fw.bin scp_fw.bin ${SOC_BINARIES_SECONDARY}" -SOC_BINARIES_SECONDARY = "mcp_rom.bin scp_rom.bin" - +SOC_BINARIES = "mcp_fw.bin scp_fw.bin mcp_rom.bin scp_rom.bin" prepare_package() { cd ${WORKDIR}
@@ -33,7 +31,7 @@ prepare_package() { cp -v ${RECIPE_SYSROOT}/firmware/uefi.bin ${PRIMARY_DIR}/SOFTWARE/ # Copy SOC binaries - for f in ${SOC_BINARIES_PRIMARY}; do + for f in ${SOC_BINARIES}; do cp -v ${RECIPE_SYSROOT}/firmware/${f} ${PRIMARY_DIR}/SOFTWARE/ done
@@ -49,7 +47,7 @@ prepare_package() { mkdir -p ${SECONDARY_DIR}/SOFTWARE/ # Copy SOC binaries - for f in ${SOC_BINARIES_SECONDARY}; do + for f in ${SOC_BINARIES}; do cp -v ${RECIPE_SYSROOT}/firmware/${f} ${SECONDARY_DIR}/SOFTWARE/ done
@@ -59,10 +57,8 @@ prepare_package() { ${SECONDARY_DIR}/MB/HBI0316A/io_v123f.txt sed -i -e 's|.*SOCCON: 0x1170.*PLATFORM_CTRL.*|SOCCON: 0x1170 0x00000101 ;SoC SCC PLATFORM_CTRL|' \ ${SECONDARY_DIR}/MB/HBI0316A/io_v123f.txt - sed -i -e '/^TOTALIMAGES:/ s|5|2|' ${SECONDARY_DIR}/MB/HBI0316A/images.txt - sed -i -e 's|^IMAGE[^23]|;&|' ${SECONDARY_DIR}/MB/HBI0316A/images.txt - sed -i -e 's|^IMAGE2|IMAGE0|' ${SECONDARY_DIR}/MB/HBI0316A/images.txt - sed -i -e 's|^IMAGE3|IMAGE1|' ${SECONDARY_DIR}/MB/HBI0316A/images.txt + sed -i -e '/^TOTALIMAGES:/ s|5|4|' ${SECONDARY_DIR}/MB/HBI0316A/images.txt + sed -i -e 's|^IMAGE4|;&|' ${SECONDARY_DIR}/MB/HBI0316A/images.txt } do_deploy() {
Signature · 1 line
2.17.1
When applying the patch below and trying to build n1sdp, I see the following error:
Log data follows:
| DEBUG: Executing python function sstate_task_prefunc | DEBUG: Python function sstate_task_prefunc finished | DEBUG: Executing shell function do_deploy | cp: cannot stat '/home/jdm/yocto/poky/build/tmp/work/n1sdp-poky-linux/sdcard-image-n1sdp/0.1-r0/recipe-sysroot/n1sdp-board-firmware_source/*': No such file or directory | WARNING: exit code 1 from a shell command. | ERROR: Execution of '/home/jdm/yocto/poky/build/tmp/work/n1sdp-poky-linux/sdcard-image-n1sdp/0.1-r0/temp/run.do_deploy.10290' failed with exit code 1: | cp: cannot stat '/home/jdm/yocto/poky/build/tmp/work/n1sdp-poky-linux/sdcard-image-n1sdp/0.1-r0/recipe-sysroot/n1sdp-board-firmware_source/*': No such file or directory | WARNING: exit code 1 from a shell command. |
Thanks,
Jon
Quoted 68 lines · Khasim Mohammed
From: Khasim Mohammed <[email protected]>
While testing multi-chip mode it was observed that n1sdp running as secondary device needs scp and mcp RAM firmware as well.
This issue wasn't captured earlier as QSPI flash had RAM firmware installed and it doesn't get erased automatically therefore the device was able to load it on every reboot.
Change-Id Ied9d24429c7025206e35f50c8e5b6f090a590015Signed-off-by Khasim Syed Mohammed <[email protected]>--- .../recipes-bsp/images/sdcard-image-n1sdp_0.1.bb | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-)meta-arm-bsp/recipes-bsp/images/sdcard-image-n1sdp_0.1.bb +5
-9@@ -18,9 +18,7 @@ FIRMWARE_DIR = "n1sdp-board-firmware_source" PRIMARY_DIR = "${WORKDIR}/n1sdp-board-firmware_primary" SECONDARY_DIR = "${WORKDIR}/n1sdp-board-firmware_secondary" -SOC_BINARIES_PRIMARY = "mcp_fw.bin scp_fw.bin ${SOC_BINARIES_SECONDARY}" -SOC_BINARIES_SECONDARY = "mcp_rom.bin scp_rom.bin" - +SOC_BINARIES = "mcp_fw.bin scp_fw.bin mcp_rom.bin scp_rom.bin" prepare_package() { cd ${WORKDIR}@@ -33,7 +31,7 @@ prepare_package() { cp -v ${RECIPE_SYSROOT}/firmware/uefi.bin ${PRIMARY_DIR}/SOFTWARE/ # Copy SOC binaries - for f in ${SOC_BINARIES_PRIMARY}; do + for f in ${SOC_BINARIES}; do cp -v ${RECIPE_SYSROOT}/firmware/${f} ${PRIMARY_DIR}/SOFTWARE/ done@@ -49,7 +47,7 @@ prepare_package() { mkdir -p ${SECONDARY_DIR}/SOFTWARE/ # Copy SOC binaries - for f in ${SOC_BINARIES_SECONDARY}; do + for f in ${SOC_BINARIES}; do cp -v ${RECIPE_SYSROOT}/firmware/${f} ${SECONDARY_DIR}/SOFTWARE/ done@@ -59,10 +57,8 @@ prepare_package() { ${SECONDARY_DIR}/MB/HBI0316A/io_v123f.txt sed -i -e 's|.*SOCCON: 0x1170.*PLATFORM_CTRL.*|SOCCON: 0x1170 0x00000101 ;SoC SCC PLATFORM_CTRL|' \ ${SECONDARY_DIR}/MB/HBI0316A/io_v123f.txt - sed -i -e '/^TOTALIMAGES:/ s|5|2|' ${SECONDARY_DIR}/MB/HBI0316A/images.txt - sed -i -e 's|^IMAGE[^23]|;&|' ${SECONDARY_DIR}/MB/HBI0316A/images.txt - sed -i -e 's|^IMAGE2|IMAGE0|' ${SECONDARY_DIR}/MB/HBI0316A/images.txt - sed -i -e 's|^IMAGE3|IMAGE1|' ${SECONDARY_DIR}/MB/HBI0316A/images.txt + sed -i -e '/^TOTALIMAGES:/ s|5|4|' ${SECONDARY_DIR}/MB/HBI0316A/images.txt + sed -i -e 's|^IMAGE4|;&|' ${SECONDARY_DIR}/MB/HBI0316A/images.txt } do_deploy() {Signature · 1 line
2.17.1