298977887/lede
1
0
Fork 0
mirror of https://github.com/coolsnowwolf/lede.git synced 2025-04-16 14:23:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

mediatek: fix, clean and unify SD card image generation

Browse Source 
Make sure sub-images on the SD card are size-checked, allow
generating SD card without squashfs and/or initramfs.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
This commit is contained in:
Daniel Golle 2023-05-26 10:26:49 +01:00
parent c10f7e39e6
commit a4956e53d0
3 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
target/linux/mediatek/image/filogic.mk
View File

@ -103,8 +103,9 @@ define Device/bananapi_bpi-r3
pad-to 52M | bl31-uboot bananapi_bpi-r3-emmc |\ pad-to 52M | bl31-uboot bananapi_bpi-r3-emmc |\
pad-to 56M | mt7986-gpt emmc |\ pad-to 56M | mt7986-gpt emmc |\
$(if $(CONFIG_TARGET_ROOTFS_SQUASHFS),\ $(if $(CONFIG_TARGET_ROOTFS_SQUASHFS),\
pad-to 64M | append-image squashfs-sysupgrade.itb | check-size | gzip \ pad-to 64M | append-image squashfs-sysupgrade.itb | check-size |\
) ) \
gzip
IMAGE_SIZE := $$(shell expr 64 + $$(CONFIG_TARGET_ROOTFS_PARTSIZE))m IMAGE_SIZE := $$(shell expr 64 + $$(CONFIG_TARGET_ROOTFS_PARTSIZE))m
KERNEL := kernel-bin | gzip KERNEL := kernel-bin | gzip
KERNEL_INITRAMFS := kernel-bin | lzma | \ KERNEL_INITRAMFS := kernel-bin | lzma | \

7
target/linux/mediatek/image/mt7622.mk
View File

@ -88,9 +88,10 @@ define Device/bananapi_bpi-r64
pad-to 40960k | bl31-uboot bananapi_bpi-r64-emmc |\ pad-to 40960k | bl31-uboot bananapi_bpi-r64-emmc |\
pad-to 43008k | bl2 snand-2ddr |\ pad-to 43008k | bl2 snand-2ddr |\
pad-to 43520k | bl31-uboot bananapi_bpi-r64-snand |\ pad-to 43520k | bl31-uboot bananapi_bpi-r64-snand |\
$(if $(CONFIG_TARGET_ROOTFS_SQUASHFS),\ $(if $(CONFIG_TARGET_ROOTFS_SQUASHFS), \
pad-to 46080k | append-image squashfs-sysupgrade.itb | check-size | gzip \ pad-to 46080k | append-image squashfs-sysupgrade.itb | check-size |\
) ) \
gzip
IMAGE_SIZE := $$(shell expr 45 + $$(CONFIG_TARGET_ROOTFS_PARTSIZE))m IMAGE_SIZE := $$(shell expr 45 + $$(CONFIG_TARGET_ROOTFS_PARTSIZE))m
KERNEL := kernel-bin | gzip KERNEL := kernel-bin | gzip
KERNEL_INITRAMFS := kernel-bin | lzma | fit lzma $$(DTS_DIR)/$$(DEVICE_DTS).dtb with-initrd | pad-to 128k KERNEL_INITRAMFS := kernel-bin | lzma | fit lzma $$(DTS_DIR)/$$(DEVICE_DTS).dtb with-initrd | pad-to 128k

10
target/linux/mediatek/image/mt7623.mk
View File

@ -96,6 +96,7 @@ define Device/bananapi_bpi-r2
KERNEL := kernel-bin | gzip KERNEL := kernel-bin | gzip
KERNEL_INITRAMFS_SUFFIX := -recovery.itb KERNEL_INITRAMFS_SUFFIX := -recovery.itb
KERNEL_INITRAMFS := kernel-bin | gzip | fit gzip $$(DTS_DIR)/$$(DEVICE_DTS).dtb with-initrd KERNEL_INITRAMFS := kernel-bin | gzip | fit gzip $$(DTS_DIR)/$$(DEVICE_DTS).dtb with-initrd
IMAGE_SIZE := $$(shell expr 48 + $$(CONFIG_TARGET_ROOTFS_PARTSIZE))m
IMAGE/sysupgrade.itb := append-kernel | fit gzip $$(DTS_DIR)/$$(DEVICE_DTS).dtb external-static-with-rootfs | append-metadata IMAGE/sysupgrade.itb := append-kernel | fit gzip $$(DTS_DIR)/$$(DEVICE_DTS).dtb external-static-with-rootfs | append-metadata
ARTIFACT/preloader.bin := mt7623-mbr emmc |\ ARTIFACT/preloader.bin := mt7623-mbr emmc |\
pad-to 2k | append-preloader $$(UBOOT_TARGET) pad-to 2k | append-preloader $$(UBOOT_TARGET)
@ -105,10 +106,10 @@ define Device/bananapi_bpi-r2
pad-to $$(UBOOT_OFFSET) | append-bootloader $$(UBOOT_TARGET) |\ pad-to $$(UBOOT_OFFSET) | append-bootloader $$(UBOOT_TARGET) |\
pad-to 4092k | mt7623-mbr emmc |\ pad-to 4092k | mt7623-mbr emmc |\
$(if $(CONFIG_TARGET_ROOTFS_INITRAMFS),\ $(if $(CONFIG_TARGET_ROOTFS_INITRAMFS),\
pad-to 4M | append-image-stage initramfs-recovery.itb |\ pad-to 4M | append-image-stage initramfs-recovery.itb | check-size 48m |\
) \ ) \
$(if $(CONFIG_TARGET_ROOTFS_SQUASHFS),\ $(if $(CONFIG_TARGET_ROOTFS_SQUASHFS),\
pad-to 48M | append-image squashfs-sysupgrade.itb |\ pad-to 48M | append-image squashfs-sysupgrade.itb | check-size |\
) \ ) \
gzip gzip
ARTIFACTS := u-boot.bin preloader.bin sdcard.img.gz ARTIFACTS := u-boot.bin preloader.bin sdcard.img.gz
@ -129,6 +130,7 @@ define Device/unielec_u7623-02
UBOOT_TARGET := mt7623a_unielec_u7623 UBOOT_TARGET := mt7623a_unielec_u7623
UBOOT_IMAGE := u-boot-mtk.bin UBOOT_IMAGE := u-boot-mtk.bin
UBOOT_PATH := $(STAGING_DIR_IMAGE)/$$(UBOOT_TARGET)-$$(UBOOT_IMAGE) UBOOT_PATH := $(STAGING_DIR_IMAGE)/$$(UBOOT_TARGET)-$$(UBOOT_IMAGE)
IMAGE_SIZE := $$(shell expr 48 + $$(CONFIG_TARGET_ROOTFS_PARTSIZE))m
IMAGES := sysupgrade.itb IMAGES := sysupgrade.itb
KERNEL := kernel-bin | gzip KERNEL := kernel-bin | gzip
KERNEL_INITRAMFS_SUFFIX := -recovery.itb KERNEL_INITRAMFS_SUFFIX := -recovery.itb
@ -140,10 +142,10 @@ define Device/unielec_u7623-02
ARTIFACT/emmc.img.gz := mt7623-mbr sdmmc |\ ARTIFACT/emmc.img.gz := mt7623-mbr sdmmc |\
pad-to $$(UBOOT_OFFSET) | append-bootloader $$(UBOOT_TARGET) |\ pad-to $$(UBOOT_OFFSET) | append-bootloader $$(UBOOT_TARGET) |\
$(if $(CONFIG_TARGET_ROOTFS_INITRAMFS),\ $(if $(CONFIG_TARGET_ROOTFS_INITRAMFS),\
pad-to 4M | append-image-stage initramfs-recovery.itb |\ pad-to 4M | append-image-stage initramfs-recovery.itb | check-size 48m |\
) \ ) \
$(if $(CONFIG_TARGET_ROOTFS_SQUASHFS),\ $(if $(CONFIG_TARGET_ROOTFS_SQUASHFS),\
pad-to 48M | append-image squashfs-sysupgrade.itb |\ pad-to 48M | append-image squashfs-sysupgrade.itb | check-size |\
) \ ) \
gzip | append-metadata gzip | append-metadata
ARTIFACT/scatter.txt := scatterfile emmc.img.gz ARTIFACT/scatter.txt := scatterfile emmc.img.gz