lt-qcom-bootloader: include empty/zero boot image in the rescue package

When we reset the board with the rescue package, we also need to erase
the boot partition to make sure that there is no left out boot image
from the past. So let's create a small zero file that we will write to
boot partition, 1MB will be enough to clear the boot image header and
invalidate the boot data.

Change-Id: I50dd7c120b1d74cda407fc6394ea2084480b5185
Signed-off-by: Nicolas Dechesne <nicolas.dechesne@linaro.org>

3 files changed, 15 insertions, 0 deletions

diff --git a/lt-qcom-bootloader/dragonboard410c/builders.sh b/lt-qcom-bootloader/dragonboard410c/builders.sh
index 74b705eb..2a9bc9fa 100644
--- a/lt-qcom-bootloader/dragonboard410c/builders.sh
+++ b/lt-qcom-bootloader/dragonboard410c/builders.sh
@@ -53,6 +53,9 @@ git clone --depth 1 https://git.linaro.org/landing-teams/working/qualcomm/partio
 (mkdir ptool/linux && cd ptool/linux && python2 ${WORKSPACE}/ptool/ptool.py -x ${WORKSPACE}/dragonboard410c/linux/partition.xml)
 (mkdir ptool/aosp && cd ptool/aosp && python2 ${WORKSPACE}/ptool/ptool.py -x ${WORKSPACE}/dragonboard410c/aosp/partition.xml)
 
+# Empty/zero boot image file to clear boot partition
+dd if=/dev/zero of=boot-erase.img bs=1024 count=1024
+
 # bootloader_emmc_linux
 cp -a LICENSE \
    dragonboard410c/linux/flashall \
@@ -63,6 +66,7 @@ cp -a LICENSE \
    ptool/linux/{rawprogram,patch}?.xml \
    ptool/linux/gpt_{main,backup,both}?.bin \
    ptool/linux/zeros_*.bin \
+   boot-erase.img \
    out/${BOOTLOADER_EMMC_LINUX}
 
 # bootloader_emmc_aosp
@@ -74,6 +78,7 @@ cp -a LICENSE \
    ptool/aosp/{rawprogram,patch}?.xml \
    ptool/aosp/gpt_{main,backup,both}?.bin \
    ptool/aosp/zeros_*.bin \
+   boot-erase.img \
    out/${BOOTLOADER_EMMC_AOSP}
 
 # bootloader_sd_linux
diff --git a/lt-qcom-bootloader/dragonboard820c/builders.sh b/lt-qcom-bootloader/dragonboard820c/builders.sh
index 721da531..5aaf4c3c 100644
--- a/lt-qcom-bootloader/dragonboard820c/builders.sh
+++ b/lt-qcom-bootloader/dragonboard820c/builders.sh
@@ -49,6 +49,9 @@ git clone --depth 1 https://git.linaro.org/landing-teams/working/qualcomm/partio
 (mkdir ptool/linux && cd ptool/linux && python2 ${WORKSPACE}/ptool/ptool.py -x ${WORKSPACE}/dragonboard820c/linux/partition.xml)
 (mkdir ptool/aosp && cd ptool/aosp && python2 ${WORKSPACE}/ptool/ptool.py -x ${WORKSPACE}/dragonboard820c/aosp/partition.xml)
 
+# Empty/zero boot image file to clear boot partition
+dd if=/dev/zero of=boot-erase.img bs=1024 count=1024
+
 # bootloader_ufs_linux
 cp -a LICENSE \
    dragonboard820c/linux/flashall \
@@ -59,6 +62,7 @@ cp -a LICENSE \
    ptool/linux/gpt_{main,backup,both}?.bin \
    ptool/linux/zeros_*.bin \
    dragonboard820c/ufs-provision_toshiba.xml \
+   boot-erase.img \
    out/${BOOTLOADER_UFS_LINUX}
 
 # bootloader_ufs_aosp
@@ -71,6 +75,7 @@ cp -a LICENSE \
    ptool/aosp/gpt_{main,backup,both}?.bin \
    ptool/aosp/zeros_*.bin \
    dragonboard820c/ufs-provision_toshiba.xml \
+   boot-erase.img \
    out/${BOOTLOADER_UFS_AOSP}
 
 # sdcard_rescue
diff --git a/lt-qcom-bootloader/dragonboard845c/builders.sh b/lt-qcom-bootloader/dragonboard845c/builders.sh
index 2c82ca30..342f9591 100644
--- a/lt-qcom-bootloader/dragonboard845c/builders.sh
+++ b/lt-qcom-bootloader/dragonboard845c/builders.sh
@@ -85,12 +85,16 @@ python2 sectools/sectools.py secimage -v \
         -g abl -i abl.elf -o out -sa
 popd
 
+# Empty/zero boot image file to clear boot partition
+dd if=/dev/zero of=boot-erase.img bs=1024 count=1024
+
 # bootloader_ufs_linux
 cp -a LICENSE \
    dragonboard845c/linux/flashall \
    bootloaders-linux/* \
    abl/out/sdm845/abl/abl.elf \
    ptool/linux/{rawprogram?.xml,patch?.xml,gpt_main?.bin,gpt_backup?.bin,gpt_both?.bin} \
+   boot-erase.img \
    out/${BOOTLOADER_UFS_LINUX}
 
 # bootloader_ufs_aosp
@@ -99,6 +103,7 @@ cp -a LICENSE \
    bootloaders-linux/* \
    abl/out/sdm845/abl/abl.elf \
    ptool/aosp/{rawprogram?.xml,patch?.xml,gpt_main?.bin,gpt_backup?.bin,gpt_both?.bin} \
+   boot-erase.img \
    out/${BOOTLOADER_UFS_AOSP}
 
 # Final preparation of archives for publishing