aboutsummaryrefslogtreecommitdiff
path: root/lt-qcom-debian-images
diff options
context:
space:
mode:
authorNicolas Dechesne <nicolas.dechesne@linaro.org>2017-05-04 11:37:15 +0200
committerNicolas Dechesne <nicolas.dechesne@linaro.org>2017-05-04 20:49:21 +0000
commitbac369c7dc63477933f16936718915bcbdc022ff (patch)
treeb5283e70f7bdfabbdbed9dbd175dd8ac4f4d55c9 /lt-qcom-debian-images
parent08edaa4ee7ea1a12f15d98330e6214aa081c559d (diff)
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>
Diffstat (limited to 'lt-qcom-debian-images')
-rw-r--r--lt-qcom-debian-images/builders-arm64.sh15
-rw-r--r--lt-qcom-debian-images/installer-dragonboard-410c.sh4
2 files changed, 9 insertions, 10 deletions
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 ..