diff options
| author | Pawel Dembicki <paweldembicki@gmail.com> | 2020-08-19 12:13:26 +0200 |
|---|---|---|
| committer | Adrian Schmutzler <freifunk@adrianschmutzler.de> | 2020-10-26 00:40:12 +0100 |
| commit | 3605eff88190af9cc2905ba750252c1643a1bc7d (patch) | |
| tree | 478a38f0a5e5e459131fa6cd9e360731c1e8a878 /target/linux/layerscape/image/armv7.mk | |
| parent | 6180005debe3f2502e5c2e1839f05682338990b4 (diff) | |
| download | upstream-3605eff88190af9cc2905ba750252c1643a1bc7d.tar.gz upstream-3605eff88190af9cc2905ba750252c1643a1bc7d.tar.bz2 upstream-3605eff88190af9cc2905ba750252c1643a1bc7d.zip | |
layerscape: add dtb to sysupgrade
At this moment sysupgrade replaces only kernel and rootfs.
This patch add dtb part to sysupgrade images to avoid situation
when old dtb make system broken.
Is possible to sysupgrade older images for NOR devices:
1. Firmware partition in bootargs need to be updated to:
"49m@0xf00000(firmware)". Env should be saved after changes.
2. After step one, "sysupgrade -F" will work.
Run tested: LS1046A-RDB
Reviewed-by: Yangbo Lu <yangbo.lu@nxp.com>
Signed-off-by: Pawel Dembicki <paweldembicki@gmail.com>
[bump PKG_RELEASE for uboot-layerscape]
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Diffstat (limited to 'target/linux/layerscape/image/armv7.mk')
| -rw-r--r-- | target/linux/layerscape/image/armv7.mk | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/target/linux/layerscape/image/armv7.mk b/target/linux/layerscape/image/armv7.mk index 8a86997399..23bd3e8d82 100644 --- a/target/linux/layerscape/image/armv7.mk +++ b/target/linux/layerscape/image/armv7.mk @@ -16,12 +16,14 @@ define Device/Default DEVICE_DTS = $(lastword $(subst _, ,$(1))) SUPPORTED_DEVICES = $(subst _,$(comma),$(1)) IMAGE_SIZE := 64m - IMAGE/sysupgrade.bin := append-kernel | pad-to 16M | \ + IMAGE/sysupgrade.bin = ls-append-dtb $$(DEVICE_DTS) | pad-to 1M | \ + append-kernel | pad-to 17M | \ append-rootfs | pad-rootfs | \ check-size $(LS_SYSUPGRADE_IMAGE_SIZE) | append-metadata endef define Device/fsl_ls1021a-twr + $(Device/fix-sysupgrade) DEVICE_VENDOR := NXP DEVICE_MODEL := TWR-LS1021A DEVICE_VARIANT := Default @@ -54,7 +56,8 @@ define Device/fsl_ls1021a-twr-sdboot append-rootfs | check-size $(LS_SD_IMAGE_SIZE) IMAGE/sysupgrade.bin := \ ls-clean | \ - ls-append-sdhead $(1) | pad-to 16M | \ + ls-append-sdhead $(1) | pad-to 15M | \ + ls-append-dtb $$(DEVICE_DTS) | pad-to 16M | \ append-kernel | pad-to $(LS_SD_ROOTFSPART_OFFSET)M | \ append-rootfs | check-size $(LS_SD_IMAGE_SIZE) | append-metadata endef @@ -67,7 +70,7 @@ define Device/fsl_ls1021a-iot-sdboot DEVICE_DTS := ls1021a-iot FILESYSTEMS := ext4 SUPPORTED_DEVICES := - IMAGES := sdcard.img + IMAGES := sdcard.img sysupgrade.bin IMAGE/sdcard.img := \ ls-clean | \ ls-append-sdhead $(1) | pad-to 4K | \ @@ -76,5 +79,11 @@ define Device/fsl_ls1021a-iot-sdboot ls-append-dtb $$(DEVICE_DTS) | pad-to 16M | \ append-kernel | pad-to $(LS_SD_ROOTFSPART_OFFSET)M | \ append-rootfs | check-size $(LS_SD_IMAGE_SIZE) + IMAGE/sysupgrade.bin := \ + ls-clean | \ + ls-append-sdhead $(1) | pad-to 15M | \ + ls-append-dtb $$(DEVICE_DTS) | pad-to 16M | \ + append-kernel | pad-to $(LS_SD_ROOTFSPART_OFFSET)M | \ + append-rootfs | check-size $(LS_SD_IMAGE_SIZE) | append-metadata endef TARGET_DEVICES += fsl_ls1021a-iot-sdboot |