add apalis-imx8 boot firmware update support and fixup for imx8qm-mek erase in mfgtool by mike-scott · Pull Request #454 · foundriesio/meta-lmp

mike-scott · 2021-11-03T20:03:49Z

No description provided.

mike-scott · 2021-11-03T20:04:22Z

Testing these changes

mike-scott · 2021-11-05T02:09:12Z

This needs an env size patch to avoid overflow error.

Tim-Anderson

LGTM

mike-scott · 2021-11-10T04:22:31Z

Updated with comments from @igoropaniuk

Diff from previous version:

diff --git a/meta-lmp-bsp/conf/machine/include/lmp-machine-custom.inc b/meta-lmp-bsp/conf/machine/include/lmp-machine-custom.inc
index b63cf4c4..1f9c03a0 100644
--- a/meta-lmp-bsp/conf/machine/include/lmp-machine-custom.inc
+++ b/meta-lmp-bsp/conf/machine/include/lmp-machine-custom.inc
@@ -261,7 +261,7 @@ SOTA_EXTRA_CLIENT_FEATURES_append_sota_apalis-imx6-sec = " fiovb"
 # iMX8QM
 SOTA_CLIENT_FEATURES_append_mx8qm = " ubootenv"
 IMAGE_BOOT_FILES_mx8qm = "imx-boot u-boot.itb hdmitxfw.bin ${KERNEL_IMAGETYPE} ${@make_dtb_boot_files(d)} boot.scr uEnv.txt"
-IMAGE_BOOT_FILES_sota_mx8qm = "imx-boot u-boot.itb boot.itb"
+IMAGE_BOOT_FILES_sota_mx8qm = "imx-boot u-boot.itb"
 LMP_BOOT_FIRMWARE_FILES_mx8qm = "imx-boot u-boot.itb"
 BOOTSCR_LOAD_ADDR_mx8qm = "0x83100000"
 KERNEL_IMAGETYPE_sota_mx8qm = "fitImage"
diff --git a/meta-lmp-bsp/recipes-bsp/u-boot/u-boot-base-scr/apalis-imx8/boot.cmd b/meta-lmp-bsp/recipes-bsp/u-boot/u-boot-base-scr/apalis-imx8/boot.cmd
index 40fb22c8..5a2abb23 100644
--- a/meta-lmp-bsp/recipes-bsp/u-boot/u-boot-base-scr/apalis-imx8/boot.cmd
+++ b/meta-lmp-bsp/recipes-bsp/u-boot/u-boot-base-scr/apalis-imx8/boot.cmd
@@ -1,14 +1,3 @@
-setenv fdt_file ${fdtfile}
-echo "Using freescale_${fdt_file}"
-
-# Default boot type and device
-setenv devtype mmc
-setenv devnum 0
-setenv boot_file Image
-setenv bootfile ${boot_file}
-setenv kernel_addr_r 0x80280000
-setenv mmcroot /dev/mmcblk0p2
-
 fatload ${devtype} ${devnum}:1 ${loadaddr} /uEnv.txt
 env import -t ${loadaddr} ${filesize}
 run bootcmd
diff --git a/meta-lmp-bsp/recipes-bsp/u-boot/u-boot-fio/apalis-imx8/lmp-base.cfg b/meta-lmp-bsp/recipes-bsp/u-boot/u-boot-fio/apalis-imx8/lmp-base.cfg
index 84ce9b16..2211f818 100644
--- a/meta-lmp-bsp/recipes-bsp/u-boot/u-boot-fio/apalis-imx8/lmp-base.cfg
+++ b/meta-lmp-bsp/recipes-bsp/u-boot/u-boot-fio/apalis-imx8/lmp-base.cfg
@@ -29,7 +29,5 @@ CONFIG_HUSH_PARSER=y
 CONFIG_ENV_IS_IN_FAT=y
 CONFIG_ENV_FAT_INTERFACE="mmc"
 CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
-CONFIG_USE_BOOTCOMMAND=y
-CONFIG_BOOTCOMMAND="fatload mmc 0:1 ${scriptaddr} /boot.scr; source ${scriptaddr}"
 CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR=y
 CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x400
diff --git a/meta-lmp-bsp/recipes-bsp/u-boot/u-boot-ostree-scr-fit/apalis-imx8/boot.cmd b/meta-lmp-bsp/recipes-bsp/u-boot/u-boot-ostree-scr-fit/apalis-imx8/boot.cmd
index 98f2e539..57e30bac 100644
--- a/meta-lmp-bsp/recipes-bsp/u-boot/u-boot-ostree-scr-fit/apalis-imx8/boot.cmd
+++ b/meta-lmp-bsp/recipes-bsp/u-boot/u-boot-ostree-scr-fit/apalis-imx8/boot.cmd
@@ -11,9 +11,6 @@ setenv rootpart 2
 setenv hdmi_image hdmitxfw.bin
 setenv m4_0_image core0_m4_image.bin
 setenv m4_1_image core1_m4_image.bin
-setenv ramdisk_addr_r 0x8a000000
-# enable relocation of ramdisk
-setenv initrd_high

 # Boot image files
 setenv fit_addr ${ramdisk_addr_r}
@@ -40,8 +37,8 @@ setenv bootloader2_s_image ${bootloader2_image}
 setenv update_image_boot0 'echo "${fio_msg} writing ${image_path} ..."; run set_blkcnt && mmc dev ${devnum} 1 && mmc write ${loadaddr} ${start_blk} ${blkcnt}'
 setenv update_image_boot1 'echo "${fio_msg} writing ${image_path} ..."; run set_blkcnt && mmc dev ${devnum} 2 && mmc write ${loadaddr} ${start_blk} ${blkcnt}'

-setenv backup_boot0 'echo "${fio_msg} backing up primary boot image set ..."; run set_blkcnt && mmc dev ${devnum} 1 && mmc read ${loadaddr} 0x0 0x3FFE && mmc dev ${devnu>
-setenv restore_boot0 'echo "${fio_msg} restore primary boot image set ..."; run set_blkcnt && mmc dev ${devnum} 2 && mmc read ${loadaddr} 0x0 0x3FFE && mmc dev ${devnum}>
+setenv backup_boot0 'echo "${fio_msg} backing up primary boot image set ..."; run set_blkcnt && mmc dev ${devnum} 1 && mmc read ${loadaddr} 0x0 0x3FFE && mmc dev ${devnum} 2 && mmc write ${loadaddr} 0x0 0x3FFE'
+setenv restore_boot0 'echo "${fio_msg} restore primary boot image set ..."; run set_blkcnt && mmc dev ${devnum} 2 && mmc read ${loadaddr} 0x0 0x3FFE && mmc dev ${devnum} 1 && mmc write ${loadaddr} 0x0 0x3FFE'

 setenv update_primary_image "run update_image_boot0"
 setenv update_primary_image2 "run update_image_boot0"

ricardosalveti

LGTM, will let @igoropaniuk do a final review.

igoropaniuk

LGTM, only one minor comment

igoropaniuk · 2021-11-11T19:59:36Z

@mike-scott we should also drop these two config options:

CONFIG_BOOTCOUNT_LIMIT=y
CONFIG_BOOTCOUNT_ENV=y

as it's handled now in boot.cmd instead (and to avoid collisions in logic)

did that already for imx8qm-mek https://github.com/foundriesio/meta-lmp/pull/459/files

mike-scott · 2021-11-15T23:16:31Z

@mike-scott we should also drop these two config options:
CONFIG_BOOTCOUNT_LIMIT=y
CONFIG_BOOTCOUNT_ENV=y
as it's handled now in boot.cmd instead (and to avoid collisions in logic)

did that already for imx8qm-mek https://github.com/foundriesio/meta-lmp/pull/459/files

Done.

mike-scott · 2021-11-15T23:17:49Z

Rebased on current master
Addressed comments
Added apalis-imx8 changes to align with Boot firmware updates alternative fixes #459

Pertninent diff from last version:

diff --git a/meta-lmp-bsp/recipes-bsp/u-boot/u-boot-fio/apalis-imx8/lmp.cfg b/meta-lmp-bsp/recipes-bsp/u-boot/u-boot-fio/apalis-imx8/lmp.cfg
index d898633d..91322d40 100644
--- a/meta-lmp-bsp/recipes-bsp/u-boot/u-boot-fio/apalis-imx8/lmp.cfg
+++ b/meta-lmp-bsp/recipes-bsp/u-boot/u-boot-fio/apalis-imx8/lmp.cfg
@@ -8,6 +8,7 @@ CONFIG_SPL_FIT_SIGNATURE=y
 CONFIG_SPL_FIT_SIGNATURE_STRICT=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_SPL_LOAD_FIT=y
+CONFIG_PSCI_BOARD_REBOOT=y
 # CONFIG_SPL_FIT_IMAGE_TINY is not set
 # CONFIG_SPL_SATA_SUPPORT is not set
 # CONFIG_SPL_LOAD_IMX_CONTAINER is not set
@@ -27,8 +28,6 @@ CONFIG_ENV_SIZE=0x4000
 CONFIG_CMD_IMPORTENV=y
 CONFIG_CMD_EDITENV=y
 CONFIG_CMD_SAVEENV=y
-CONFIG_BOOTCOUNT_LIMIT=y
-CONFIG_BOOTCOUNT_ENV=y
 # CONFIG_DISTRO_DEFAULTS is not set
 CONFIG_CMD_EXT4=y
 CONFIG_CMD_FAT=y
diff --git a/meta-lmp-bsp/recipes-bsp/u-boot/u-boot-ostree-scr-fit/apalis-imx8/boot.cmd b/meta-lmp-bsp/recipes-bsp/u-boot/u-boot-ostree-scr-fit/apalis-imx8/boot.cmd
index 57e30bac..951dd269 100644
--- a/meta-lmp-bsp/recipes-bsp/u-boot/u-boot-ostree-scr-fit/apalis-imx8/boot.cmd
+++ b/meta-lmp-bsp/recipes-bsp/u-boot/u-boot-ostree-scr-fit/apalis-imx8/boot.cmd
@@ -43,5 +43,7 @@ setenv restore_boot0 'echo "${fio_msg} restore primary boot image set ..."; run
 setenv update_primary_image "run update_image_boot0"
 setenv update_primary_image2 "run update_image_boot0"

+setenv do_reboot "reboot"
+
 @@INCLUDE_COMMON_IMX@@
 @@INCLUDE_COMMON_ALTERNATIVE@@

u-boot-fio config shows: CONFIG_ENV_SIZE=0x4000 Let's update 0x2000 value in fw_env.config to match that. Signed-off-by: Michael Scott <[email protected]>

The erase group for boot partitions on imx8qm is 0x400. This means using the current settings we are erasing the whole boot partition and clearing the Toradex Config Block. Let's account for the 0x400 erase block by erasing to block 0x3C00. Fixes: 58fba18 ("bsp: mfgtool-files: common: adjust boot0 erase cmds") Signed-off-by: Michael Scott <[email protected]>

Support secondary boot on the apalis-imx8 HW. (Similar to patch for imx8qm-mek) Signed-off-by: Michael Scott <[email protected]>

Support secondary boot for apalis-imx8 (Similar to patch for imx8qm-mek) Signed-off-by: Michael Scott <[email protected]>

Add support for boot firmware updates (Similar to patch for imx8qm-mek) Signed-off-by: Michael Scott <[email protected]>

Flash secondary boot images on apalis-imx8. (Similar to patch for iMX8QM-MEK) Signed-off-by: Michael Scott <[email protected]>

The boot script now lives in u-boot fit-image, and it's extracted by SPL. Let's use it. Signed-off-by: Michael Scott <[email protected]>

Some settings are in a different order and some settings may not be needed due to slight differences between the defconfigs. However, let's sync up the LmP settings for u-boot-fio so that future updates are easier to follow. Signed-off-by: Michael Scott <[email protected]>

…loadaddr This keeps the lmp-base boot script in better sync with the imx8qm-mek. Signed-off-by: Michael Scott <[email protected]>

This fixes an issue during boot software upgrade where the env is extended past the original 0x2000 limit. Signed-off-by: Michael Scott <[email protected]>

Relevant changes: - bfbf318ff1 [FIO toup] apalis-imx8: allow dropping CONFIG_CMD_USB requirement Signed-off-by: Michael Scott <[email protected]>

Boot script is now integrated into u-boot fit-image for all supported hardware. Signed-off-by: Michael Scott <[email protected]>

mike-scott · 2021-11-15T23:21:52Z

Dropped erase block change for imx8qm-mek

MrCry0

LGTM

Drop CONFIG_BOOTCOUNT_LIMIT, as this is now handled in boot.cmd instead. (Similar to imx8qm-mek change by Igor Opaniuk <[email protected]>) Signed-off-by: Michael Scott <[email protected]>

Enable CONFIG_PSCI_BOARD_REBOOT, which enables reboot cmd for triggering board reset (SC_PM_RESET_TYPE_BOARD). Default reset cmd is doing SC_PM_RESET_TYPE_COLD, which doesn't force BootROM to reload imx-boot firmware. (Similar to commit for imx8qm-mek by Igor Opaniuk <[email protected]>) Signed-off-by: Michael Scott <[email protected]>

Define custom do_reboot cmd in order to perform a cold reset to force BootROM to reload the imx-boot firmware. (Similar to commit for imx8qm-mek by Igor Opaniuk <[email protected]>) Signed-off-by: Michael Scott <[email protected]>

mike-scott · 2021-11-16T01:38:34Z

Fixed the disable of bootcount handling in u-boot:

-CONFIG_BOOTCOUNT_LIMIT=y
-CONFIG_BOOTCOUNT_ENV=y
+# CONFIG_BOOTCOUNT_LIMIT is not set

igoropaniuk

LGTM

mike-scott requested review from MrCry0, igoropaniuk and ricardosalveti November 3, 2021 20:03

mike-scott self-assigned this Nov 3, 2021

mike-scott changed the title ~~add apalis-imx8 boot firmware update support and fixup for imx8qm-mek erase in mfgtool~~ [WIP] add apalis-imx8 boot firmware update support and fixup for imx8qm-mek erase in mfgtool Nov 3, 2021

mike-scott force-pushed the master-apalis-imx8-boot-firmare-update-support branch from c0fb19a to cff180d Compare November 3, 2021 22:42

mike-scott requested a review from Tim-Anderson November 5, 2021 02:08

mike-scott marked this pull request as draft November 5, 2021 02:09

mike-scott changed the title ~~[WIP] add apalis-imx8 boot firmware update support and fixup for imx8qm-mek erase in mfgtool~~ add apalis-imx8 boot firmware update support and fixup for imx8qm-mek erase in mfgtool Nov 8, 2021

mike-scott marked this pull request as ready for review November 8, 2021 22:03

Tim-Anderson approved these changes Nov 8, 2021

View reviewed changes

mike-scott force-pushed the master-apalis-imx8-boot-firmare-update-support branch from 4d38d3b to 7cb5278 Compare November 8, 2021 22:37

igoropaniuk reviewed Nov 9, 2021

View reviewed changes

Comment thread meta-lmp-bsp/recipes-bsp/u-boot/u-boot-fio/apalis-imx8/lmp-base.cfg

igoropaniuk requested changes Nov 9, 2021

View reviewed changes

mike-scott force-pushed the master-apalis-imx8-boot-firmare-update-support branch from 2c259ce to c902f64 Compare November 10, 2021 04:06

ricardosalveti approved these changes Nov 10, 2021

View reviewed changes

igoropaniuk reviewed Nov 10, 2021

View reviewed changes

Comment thread meta-lmp-bsp/recipes-support/mfgtool-files/mfgtool-files/imx8qm-mek/full_image.uuu.in

MrCry0 reviewed Nov 10, 2021

View reviewed changes

mike-scott force-pushed the master-apalis-imx8-boot-firmare-update-support branch 3 times, most recently from cd42199 to 2da2cd5 Compare November 15, 2021 23:15

mike-scott added 3 commits November 15, 2021 15:20

bsp: u-boot-fio: imx8qm-mek: fix env size in fw_env.config

296c5a1

u-boot-fio config shows: CONFIG_ENV_SIZE=0x4000 Let's update 0x2000 value in fw_env.config to match that. Signed-off-by: Michael Scott <[email protected]>

bsp: u-boot-fio-mfgtool: apalis-imx8: add support of secondary boot

76ecbeb

Support secondary boot on the apalis-imx8 HW. (Similar to patch for imx8qm-mek) Signed-off-by: Michael Scott <[email protected]>

mike-scott added 9 commits November 15, 2021 15:20

bsp: u-boot-fio: apalis-imx8: add support for secondary boot

d81de14

Support secondary boot for apalis-imx8 (Similar to patch for imx8qm-mek) Signed-off-by: Michael Scott <[email protected]>

bsp: u-boot-ostree-scr-fit: apalis-imx8: boot firmware update support

600fd05

Add support for boot firmware updates (Similar to patch for imx8qm-mek) Signed-off-by: Michael Scott <[email protected]>

bsp: mfgtool-files: apalis-imx8: add support for secondary boot images

c56f9ec

Flash secondary boot images on apalis-imx8. (Similar to patch for iMX8QM-MEK) Signed-off-by: Michael Scott <[email protected]>

bsp: u-boot-fio: apalis-imx8: use boot.cmd in u-boot fit

974d3c2

The boot script now lives in u-boot fit-image, and it's extracted by SPL. Let's use it. Signed-off-by: Michael Scott <[email protected]>

bsp: u-boot-fio: apalis-imx8: lmp-base: use kernel_addr_r instead of …

7026b63

…loadaddr This keeps the lmp-base boot script in better sync with the imx8qm-mek. Signed-off-by: Michael Scott <[email protected]>

bsp: u-boot-fio: apalis-imx8: update env size to 0x4000

42e61c4

This fixes an issue during boot software upgrade where the env is extended past the original 0x2000 limit. Signed-off-by: Michael Scott <[email protected]>

base: u-boot-fio: 2020.04: bump to bfbf318ff1

e093afe

Relevant changes: - bfbf318ff1 [FIO toup] apalis-imx8: allow dropping CONFIG_CMD_USB requirement Signed-off-by: Michael Scott <[email protected]>

bsp: lmp-machine-custom: mx8qm: drop boot.itb from IMAGE_BOOT_FILES

f9cc32d

Boot script is now integrated into u-boot fit-image for all supported hardware. Signed-off-by: Michael Scott <[email protected]>

mike-scott force-pushed the master-apalis-imx8-boot-firmare-update-support branch from 2da2cd5 to e399962 Compare November 15, 2021 23:20

MrCry0 self-requested a review November 15, 2021 23:28

MrCry0 approved these changes Nov 15, 2021

View reviewed changes

mike-scott added 3 commits November 15, 2021 17:36

bsp: u-boot-fio: apalis-imx8: drop bootcount config

e356116

Drop CONFIG_BOOTCOUNT_LIMIT, as this is now handled in boot.cmd instead. (Similar to imx8qm-mek change by Igor Opaniuk <[email protected]>) Signed-off-by: Michael Scott <[email protected]>

mike-scott force-pushed the master-apalis-imx8-boot-firmare-update-support branch from e399962 to 2f02b59 Compare November 16, 2021 01:37

igoropaniuk self-requested a review November 16, 2021 19:38

igoropaniuk approved these changes Nov 16, 2021

View reviewed changes

mike-scott merged commit 8fc4475 into foundriesio:master Nov 16, 2021

mike-scott deleted the master-apalis-imx8-boot-firmare-update-support branch November 16, 2021 19:39

Conversation

mike-scott commented Nov 3, 2021

Uh oh!

mike-scott commented Nov 3, 2021

Uh oh!

mike-scott commented Nov 5, 2021

Uh oh!

Tim-Anderson left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

mike-scott commented Nov 10, 2021

Uh oh!

ricardosalveti left a comment

Choose a reason for hiding this comment

Uh oh!

igoropaniuk left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

igoropaniuk commented Nov 11, 2021

Uh oh!

mike-scott commented Nov 15, 2021

Uh oh!

mike-scott commented Nov 15, 2021

Uh oh!

mike-scott commented Nov 15, 2021

Uh oh!

MrCry0 left a comment

Choose a reason for hiding this comment

Uh oh!

mike-scott commented Nov 16, 2021

Uh oh!

igoropaniuk left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants