lt-qcom-*-dragonboard410c: add support for next QDN firmware release

* new LICENSE which allows (easier) redistribution
* removal of non PSCI TZ firmware
* removal of duplicate firmware files in proprietary-linux (WLAN)
* migration to mainline SBL which does not support SD card boot, so we are
  reusing SBL from previous release for SD boot.
* support for CDT partition
* no change for Android BSP, only Linux BSP

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

5 files changed, 32 insertions, 20 deletions

diff --git a/lt-qcom-bootloader-dragonboard410c.yaml b/lt-qcom-bootloader-dragonboard410c.yaml
index 69a418794b..1ec868d344 100644
--- a/lt-qcom-bootloader-dragonboard410c.yaml
+++ b/lt-qcom-bootloader-dragonboard410c.yaml
@@ -43,6 +43,9 @@
             name: QCOM_LINUX_FIRMWARE_MD5
             default: 'c93ddb1165f0e23123a02ac3c952f932'
         - string:
+            name: QCOM_LINUX_FIRMWARE_LICENSE_MD5
+            default: '4d087ee0965cb059f1b2f9429e166f64'
+        - string:
             name: QCOM_ANDROID_FIRMWARE
             default: 'http://builds.96boards.org/snapshots/dragonboard410c/binaries/20160826/bootloaders-android-v2.zip'
         - string:
diff --git a/lt-qcom-bootloader/dragonboard410c/builders.sh b/lt-qcom-bootloader/dragonboard410c/builders.sh
index f34370b875..2ebaff220b 100644
--- a/lt-qcom-bootloader/dragonboard410c/builders.sh
+++ b/lt-qcom-bootloader/dragonboard410c/builders.sh
@@ -15,7 +15,7 @@ md5sum -c MD5
 
 unzip -j -d bootloaders-android $(basename ${QCOM_ANDROID_FIRMWARE})
 unzip -j -d bootloaders-android-old $(basename ${QCOM_ANDROID_FIRMWARE_OLD})
-unzip -j -d bootloaders-linux $(basename ${QCOM_LINUX_FIRMWARE}) "*/bootloaders-linux/*"
+unzip -j -d bootloaders-linux $(basename ${QCOM_LINUX_FIRMWARE}) "*/bootloaders-linux/*" "*/cdt-linux/*"
 
 # Get the Android compiler
 git clone ${LK_GCC_GIT} --depth 1 -b ${LK_GCC_REL} android-gcc
@@ -44,14 +44,19 @@ mkdir -p out/dragonboard410c_sdcard_rescue \
       out/dragonboard410c_bootloader_emmc_android \
       out/dragonboard410c_bootloader_emmc_aosp
 
-# get license.txt file
+# get license.txt file (for Android BSP)
 wget https://git.linaro.org/landing-teams/working/qualcomm/lt-docs.git/blob_plain/HEAD:/license/license.txt
 
+# get LICENSE file (for Linux BSP)
+unzip -j $(basename ${QCOM_LINUX_FIRMWARE}) "*/LICENSE"
+echo "${QCOM_LINUX_FIRMWARE_LICENSE_MD5}  LICENSE" > MD5
+md5sum -c MD5
+
 # bootloader_emmc_linux
-cp -a license.txt \
+cp -a LICENSE \
    dragonboard410c/linux/flashall \
    lk_emmc_boot/build-msm8916/emmc_appsboot.mbn \
-   bootloaders-linux/{NON-HLOS.bin,rpm.mbn,sbl1.mbn,tz.mbn,tz-psci.mbn,hyp.mbn} \
+   bootloaders-linux/{NON-HLOS.bin,rpm.mbn,sbl1.mbn,tz.mbn,hyp.mbn,sbc_1.0_8016.bin} \
    out/dragonboard410c_bootloader_emmc_linux
 
 # no need to set the eMMC size here. Fastboot will patch the last partition and grow it until last sector
@@ -73,10 +78,10 @@ sudo sgdisk -bgpt.bin gpt.img
 ./mkgpt -d -i gpt.bin -o out/dragonboard410c_bootloader_emmc_android/gpt_both0.bin
 
 # bootloader_emmc_aosp
-cp -a license.txt \
+cp -a LICENSE \
    dragonboard410c/aosp/flashall \
    lk_emmc_boot/build-msm8916/emmc_appsboot.mbn \
-   bootloaders-linux/{NON-HLOS.bin,rpm.mbn,sbl1.mbn,tz.mbn,tz-psci.mbn,hyp.mbn} \
+   bootloaders-linux/{NON-HLOS.bin,rpm.mbn,sbl1.mbn,tz.mbn,hyp.mbn,sbc_1.0_8016.bin} \
    out/dragonboard410c_bootloader_emmc_aosp
 
 # no need to set the eMMC size here. Fastboot will patch the last partition and grow it until last sector
@@ -85,17 +90,19 @@ sudo sgdisk -bgpt.bin gpt.img
 ./mkgpt -d -i gpt.bin -o out/dragonboard410c_bootloader_emmc_aosp/gpt_both0.bin
 
 # bootloader_sd_linux
-cp -a license.txt \
+cp -a LICENSE \
    lk_sd_boot/build-msm8916/emmc_appsboot.mbn \
-   bootloaders-linux/{NON-HLOS.bin,rpm.mbn,sbl1.mbn,tz.mbn,tz-psci.mbn,hyp.mbn} \
+   bootloaders-linux/{NON-HLOS.bin,rpm.mbn,tz.mbn,hyp.mbn} \
    out/dragonboard410c_bootloader_sd_linux
 
+cp -a bootloaders-linux/sbl1.sd.mbn out/dragonboard410c_bootloader_sd_linux/sbl1.mbn
+
 # sdcard_rescue
-cp -a license.txt out/dragonboard410c_sdcard_rescue
+cp -a LICENSE out/dragonboard410c_sdcard_rescue
 sudo ./mksdcard -x -p dragonboard410c/linux/sdrescue.txt \
      -o out/dragonboard410c_sdcard_rescue/db410c_sd_rescue.img \
      -i lk_sdrescue/build-msm8916/ \
-     -i bootloaders-linux/
+     -i out/dragonboard410c_bootloader_sd_linux
 
 # Create MD5SUMS file
 for i in dragonboard410c_sdcard_rescue \
diff --git a/lt-qcom-debian-images-dragonboard410c.yaml b/lt-qcom-debian-images-dragonboard410c.yaml
index faf51dfc71..7d94275e60 100644
--- a/lt-qcom-debian-images-dragonboard410c.yaml
+++ b/lt-qcom-debian-images-dragonboard410c.yaml
@@ -55,6 +55,9 @@
             name: QCOM_FIRMWARE_MD5
             default: 'c93ddb1165f0e23123a02ac3c952f932'
         - string:
+            name: QCOM_LINUX_LICENSE_MD5
+            default: '4d087ee0965cb059f1b2f9429e166f64'
+        - string:
             name: BOOTIMG_PAGESIZE
             default: '2048'
     disabled: false
diff --git a/lt-qcom-debian-images/builders-arm64.sh b/lt-qcom-debian-images/builders-arm64.sh
index d9bdf43e06..38e6e0c2b3 100644
--- a/lt-qcom-debian-images/builders-arm64.sh
+++ b/lt-qcom-debian-images/builders-arm64.sh
@@ -116,20 +116,19 @@ Build description:
 EOF
 
 # Download license file and firmware
-rm -f license.txt
-wget https://git.linaro.org/landing-teams/working/qualcomm/lt-docs.git/blob_plain/HEAD:/license/license.txt
-
 if [ -n "${QCOM_FIRMWARE}" ]; then
     rm -rf qcom_firmware && mkdir qcom_firmware && cd qcom_firmware
     wget -q ${QCOM_FIRMWARE}
     echo "${QCOM_FIRMWARE_MD5}  $(basename ${QCOM_FIRMWARE})" > MD5
     md5sum -c MD5
     unzip $(basename ${QCOM_FIRMWARE})
+    # check LICENSE file (for Linux BSP)
+    echo "${QCOM_FIRMWARE_LICENSE_MD5}  LICENSE" > MD5
+    md5sum -c MD5
     cd -
-    rm -f qcom_firmware/linux-board-support-package-*/proprietary-linux/wlan/macaddr0
-    rm -f qcom_firmware/linux-board-support-package-*/proprietary-linux/firmware.tar
+
     sudo MTOOLS_SKIP_CHECK=1 mcopy -i qcom_firmware/linux-board-support-package-*/bootloaders-linux/NON-HLOS.bin \
-         ::image/modem.* ::image/mba.mbn qcom_firmware/linux-board-support-package-*/proprietary-linux
+         ::image/modem.* ::image/mba.mbn ::image/wcnss.* qcom_firmware/linux-board-support-package-*/proprietary-linux
 fi
 
 for rootfs in ${ROOTFS}; do
@@ -175,9 +174,9 @@ EOF
 
     if [ -n "${QCOM_FIRMWARE}" ]; then
         # add license file in the generated rootfs
-        sudo cp -f license.txt rootfs/etc/license.txt
+        sudo cp -f qcom_firmware/linux-board-support-package-*/LICENSE rootfs/etc/QCOM-LINUX-BOARD-SUPPORT-LICENSE
 
-        # add firmware (adreno, venus and WCN)
+        # add firmware (adreno, dsp, venus and WCN)
         sudo cp -a qcom_firmware/linux-board-support-package-*/proprietary-linux/* rootfs/lib/firmware
     fi
 
diff --git a/lt-qcom-debian-images/installer-dragonboard-410c.sh b/lt-qcom-debian-images/installer-dragonboard-410c.sh
index 1778cc2983..fe6868f096 100644
--- a/lt-qcom-debian-images/installer-dragonboard-410c.sh
+++ b/lt-qcom-debian-images/installer-dragonboard-410c.sh
@@ -55,7 +55,7 @@ cat << EOF >> os/debian/os.json
 "url": "http://builds.96boards.org/releases/dragonboard410c",
 "version": "${VERSION}",
 "release_date": "`date +%Y-%m-%d`",
-"description": "Linaro Linux with LXDE desktop based on Debian (${OS_FLAVOUR}) for DragonBoard 410c"
+"description": "Linaro Linux with LXQt desktop based on Debian (${OS_FLAVOUR}) for DragonBoard 410c"
 }
 EOF
 
@@ -80,5 +80,5 @@ sudo umount mnt
 sudo ./mksdcard -p dragonboard410c/linux/installer.txt -s $size_img -i out -o db410c_sd_install_debian.img
 
 # create archive for publishing
-zip -j ${WORKSPACE}/out/dragonboard410c_sdcard_install_debian-${BUILD_NUMBER}.zip db410c_sd_install_debian.img ${WORKSPACE}/license.txt
+zip -j ${WORKSPACE}/out/dragonboard410c_sdcard_install_debian-${BUILD_NUMBER}.zip db410c_sd_install_debian.img out/LICENSE
 cd ..