microchipsw: tactical-1000: expand FIP partition size

Expand the FIP partition size to future proof and allow custom firmware
to be used as BL31 instead of U-Boot.

Signed-off-by: Robert Marko <robert.marko@sartura.hr>

diff --git a/target/linux/microchipsw/image/lan969x.mk b/target/linux/microchipsw/image/lan969x.mk
index 6cf8d28ebf461f1fdc4b8079287f180cb77c8479..0fb8d7f47cefc6ee45f9ffa4c0ddf20e5f39e798 100644 (file)
--- a/target/linux/microchipsw/image/lan969x.mk
+++ b/target/linux/microchipsw/image/lan969x.mk
@@ -18,6 +18,20 @@ define Build/lan969x-gpt-emmc
        rm $@.tmp
 endef
 
+define Build/tactical-1000-gpt-emmc
+       cp $@ $@.tmp 2>/dev/null || true
+       ptgen -g -o $@.tmp -a 1 -l 1024 \
+                       -t 0x83 -N fip          -r      -p 128M@1M \
+                       -t 0x83 -N fip.bak      -r      -p 128M@129M \
+                       -t 0x83 -N Env          -r      -p 2M@257M \
+               $(if $(findstring flash,$1), \
+                       -t 0x2e -N kernel               -p $(CONFIG_TARGET_KERNEL_PARTSIZE)M@259M \
+                       -t 0x2e -N rootfs               -p $(CONFIG_TARGET_ROOTFS_PARTSIZE)M
+               )
+       cat $@.tmp >> $@
+       rm $@.tmp
+endef
+
 define Build/append-kernel-part
        dd if=$(IMAGE_KERNEL) bs=$(CONFIG_TARGET_KERNEL_PARTSIZE)M conv=sync >> $@
 endef
@@ -51,15 +65,16 @@ define Device/novarq_tactical-1000
        DEVICE_PACKAGES := kmod-i2c-mux-gpio \
                kmod-gpio-pwm kmod-hwmon-pwmfan kmod-hwmon-gpiofan \
                kmod-rtc-ds1307 kmod-hwmon-lm75
-       IMAGES += emmc-atf-gpt.gz emmc-gpt.img.gz
-       IMAGE/emmc-atf-gpt.gz := lan969x-gpt-emmc |\
+       IMAGES += emmc-gpt-table.gz emmc-atf-gpt.gz emmc-gpt.img.gz
+       IMAGE/emmc-gpt-table.gz := tactical-1000-gpt-emmc | gzip
+       IMAGE/emmc-atf-gpt.gz := tactical-1000-gpt-emmc |\
                pad-to 1M | lan969x-fip tactical-1000 |\
-               pad-to 9M | lan969x-fip tactical-1000 |\
+               pad-to 129M | lan969x-fip tactical-1000 |\
                gzip
-       IMAGE/emmc-gpt.img.gz := lan969x-gpt-emmc flash |\
+       IMAGE/emmc-gpt.img.gz := tactical-1000-gpt-emmc flash |\
                pad-to 1M | lan969x-fip tactical-1000 |\
-               pad-to 9M | lan969x-fip tactical-1000 |\
-               pad-to 19M | append-kernel-part |\
+               pad-to 129M | lan969x-fip tactical-1000 |\
+               pad-to 259M | append-kernel-part |\
                append-rootfs |\
                gzip
        SUPPORTED_DEVICES += novarq,tactical-1000-v3