s7: update acpu image tools to support s7d [1/1]
PD#SWPL-143501
Problem:
update acpu image tools to support s7d
Solution:
Update build tools support
Verify:
local
Change-Id: I615f2def52efcd1f21ead7ef14e9e4f40b05ce42
Signed-off-by: wenbo.wang <wenbo.wang@amlogic.com>
diff --git a/s7d/build.sh b/s7d/build.sh
index d510d02..63f53d8 100755
--- a/s7d/build.sh
+++ b/s7d/build.sh
@@ -85,19 +85,19 @@
echo "================================================================="
echo "image packing with acpu-imagetool for bl2 bl2e bl2x"
- dd if=/dev/zero of=${payload}/bl2.bin.sto bs=183200 count=1
+ dd if=/dev/zero of=${payload}/bl2.bin.sto bs=202592 count=1
dd if=${output}/bl2.bin.sto of=${payload}/bl2.bin.sto conv=notrunc
- dd if=/dev/zero of=${payload}/bl2.bin.usb bs=183200 count=1
+ dd if=/dev/zero of=${payload}/bl2.bin.usb bs=202592 count=1
dd if=${output}/bl2.bin.usb of=${payload}/bl2.bin.usb conv=notrunc
- dd if=/dev/zero of=${payload}/bl2e.bin.sto bs=65536 count=1
+ dd if=/dev/zero of=${payload}/bl2e.bin.sto bs=98304 count=1
dd if=${output}/bl2e.bin.sto of=${payload}/bl2e.bin.sto conv=notrunc
- dd if=/dev/zero of=${payload}/bl2e.bin.usb bs=65536 count=1
+ dd if=/dev/zero of=${payload}/bl2e.bin.usb bs=98304 count=1
dd if=${output}/bl2e.bin.usb of=${payload}/bl2e.bin.usb conv=notrunc
- dd if=/dev/zero of=${payload}/bl2x.bin bs=65536 count=1
+ dd if=/dev/zero of=${payload}/bl2x.bin bs=98304 count=1
dd if=${output}/bl2x.bin of=${payload}/bl2x.bin conv=notrunc
@@ -122,7 +122,6 @@
fi
chip_acs_size=`stat -c %s ${INPUT_PARAMS}/chip_acs.bin`
dev_acs_size=`stat -c %s ${INPUT_PARAMS}/device_acs.bin`
-
if [ $chip_acs_size -gt 2048 ]; then
echo "chip acs size exceed limit 2048, $chip_acs_size"
exit -1
@@ -131,11 +130,11 @@
dd if=${INPUT_PARAMS}/chip_acs.bin of=${payload}/chip_acs.bin conv=notrunc
fi
- if [ $dev_acs_size -gt 8192 ]; then
- echo "dev acs size exceed limit 8192, $dev_acs_size"
+ if [ $dev_acs_size -gt 7168 ]; then
+ echo "dev acs size exceed limit 7168, $dev_acs_size"
exit -1
else
- dd if=/dev/zero of=${payload}/device_acs.bin bs=8192 count=1
+ dd if=/dev/zero of=${payload}/device_acs.bin bs=7168 count=1
dd if=${INPUT_PARAMS}/device_acs.bin of=${payload}/device_acs.bin conv=notrunc
fi
@@ -145,7 +144,7 @@
--infile-bl2x-payload=${payload}/bl2x.bin \
--infile-dvinit-params=${payload}/device_acs.bin \
--infile-csinit-params=${payload}/chip_acs.bin \
- --scs-family=s5 \
+ --scs-family=s7d \
--outfile-bb1st=${output}/bb1st.sto.bin \
--outfile-blob-bl2e=${output}/blob-bl2e.sto.bin \
--outfile-blob-bl2x=${output}/blob-bl2x.bin
@@ -156,7 +155,7 @@
--infile-bl2x-payload=${payload}/bl2x.bin \
--infile-dvinit-params=${payload}/device_acs.bin \
--infile-csinit-params=${payload}/chip_acs.bin \
- --scs-family=s5 \
+ --scs-family=s7d \
--outfile-bb1st=${output}/bb1st.usb.bin \
--outfile-blob-bl2e=${output}/blob-bl2e.usb.bin \
--outfile-blob-bl2x=${output}/blob-bl2x.bin
@@ -258,10 +257,10 @@
dd if=/dev/zero of=${payload}/bl33.bin bs=1572864 count=1
dd if=${output}/bl33.bin of=${payload}/bl33.bin conv=notrunc
-
./${FIP_FOLDER}${CUR_SOC}/binary-tool/acpu-imagetool create-device-fip \
--infile-bl30-payload=${payload}/bl30.bin \
--infile-bl40-payload=${payload}/bl40.bin \
+ --header-layout=full \
--infile-bl31-payload=${payload}/bl31.bin \
--infile-bl32-payload=${payload}/bl32.bin \
--infile-bl33-payload=${payload}/bl33.bin \
@@ -504,7 +503,7 @@
rm -f ${file_info_cfg}
mv -f ${file_info_cfg}.sha256 ${file_info_cfg}
- dd if=${file_info_cfg} of=${bootloader} bs=512 seek=404 conv=notrunc status=none
+ dd if=${file_info_cfg} of=${bootloader} bs=512 seek=440 conv=notrunc status=none
if [ ${storage_type_suffix} == ".sto" ]; then
echo "Image SDCARD"