From 49f2575f25fa2ba7d1f95faad7a5ecda8b55185f Mon Sep 17 00:00:00 2001 From: Peng Fan Date: Mon, 25 Feb 2019 14:19:15 +0800 Subject: [PATCH] MLK-20975 8qm: android: add a new target for non-trusty Since trusty not ready, we need a new target without tee, but we switch to spl uboot for dom0 to ease adding trusty in future. Signed-off-by: Peng Fan --- iMX8QM/scripts/android.mak | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/iMX8QM/scripts/android.mak b/iMX8QM/scripts/android.mak index 1b8480a..935bb0a 100644 --- a/iMX8QM/scripts/android.mak +++ b/iMX8QM/scripts/android.mak @@ -6,6 +6,14 @@ flash_b0_spl_container_m4_1_trusty: $(MKIMG) mx8qm-ahab-container.img scfw_tcm.b echo "append u-boot-atf-container.img at $$pad_cnt KB"; \ dd if=u-boot-atf-container.img of=flash.bin bs=1K seek=$$pad_cnt; \ +flash_b0_spl_container_m4_1: $(MKIMG) mx8qm-ahab-container.img scfw_tcm.bin u-boot-atf-container.img m4_1_image.bin u-boot-spl.bin + ./$(MKIMG) -soc QM -rev B0 -append mx8qm-ahab-container.img -c -flags 0x01200000 -scfw scfw_tcm.bin -p4 -m4 m4_1_image.bin 1 0x88800000 -ap u-boot-spl.bin a53 0x00100000 -out flash.bin + cp flash.bin boot-spl-container.img + @flashbin_size=`wc -c flash.bin | awk '{print $$1}'`; \ + pad_cnt=$$(((flashbin_size + 0x400 - 1) / 0x400)); \ + echo "append u-boot-atf-container.img at $$pad_cnt KB"; \ + dd if=u-boot-atf-container.img of=flash.bin bs=1K seek=$$pad_cnt; \ + flash_b0_spl_container_trusty: $(MKIMG) mx8qm-ahab-container.img scfw_tcm.bin u-boot-atf-container.img tee.bin u-boot-spl.bin ./$(MKIMG) -soc QM -rev B0 -dcd skip -append mx8qm-ahab-container.img -c -scfw scfw_tcm.bin -ap u-boot-spl.bin a53 0x00100000 -out flash.bin cp flash.bin boot-spl-container.img -- 2.26.2