rockchip: fix broken squashfs sysupgrade
authorDavid Bauer <mail@david-bauer.net>
Thu, 23 Sep 2021 19:01:37 +0000 (21:01 +0200)
committerDavid Bauer <mail@david-bauer.net>
Fri, 24 Sep 2021 10:29:22 +0000 (12:29 +0200)
The rockchip platform supports squashfs SD card images. However, the
resulting image is not padded to completely fill the rootfs partition.

Because of that, the f2fs overlay might not be erased, resulting in
uci-defaults not bing executed or the configuration not being erased,
even though drop config was selected.

Modify the image generation process so the image is padded to cover the
entire root filesystem partition.

Signed-off-by: David Bauer <mail@david-bauer.net>
(cherry picked from commit b56f7407d999d29c200c8c5880655926ef9874b7)

target/linux/rockchip/image/Makefile

index f5fdff637f8f24c15720797fffae82f84f03c5c7..e4db1e5d58c62bbacb2382c95d9999f0e4fddb04 100644 (file)
@@ -34,7 +34,7 @@ define Build/pine64-img
        # http://opensource.rock-chips.com/wiki_Boot_option#Boot_flow
        #
        # U-Boot SPL expects the U-Boot ITB to be located at sector 0x4000 (8 MiB) on the MMC storage
-       $(SCRIPT_DIR)/gen_image_generic.sh \
+       PADDING=1 $(SCRIPT_DIR)/gen_image_generic.sh \
                $@ \
                $(CONFIG_TARGET_KERNEL_PARTSIZE) $@.boot \
                $(CONFIG_TARGET_ROOTFS_PARTSIZE) $(IMAGE_ROOTFS) \