s7d/s6: build failed when using prebuilt blob [1/1]
PD#SWPL-188272
Problem:
build faile when using prebuilt blob
Solution:
done
Verify:
s7d/s6
Change-Id: I7dc44db9e7cd17ae07e7c2ad8897a7cb41c2a6cb
Signed-off-by: wenbo.wang <wenbo.wang@amlogic.com>
diff --git a/s6/bin/add-dvinit-params.sh b/s6/bin/add-dvinit-params.sh
index 39fe19f..bacba1e 100755
--- a/s6/bin/add-dvinit-params.sh
+++ b/s6/bin/add-dvinit-params.sh
@@ -17,9 +17,10 @@
#
BASEDIR_TEMPLATE=$1
-BASEDIR_PAYLOAD=$2
-BASEDIR_OUTPUT_BLOB=$3
-SOC_FAMILY=$4
+BASEDIR_INPUT_BL2E=$2
+BASEDIR_PAYLOAD=$3
+BASEDIR_OUTPUT_BLOB=$4
+SOC_FAMILY=$5
#
# Arguments
@@ -46,6 +47,9 @@
### Input: template ###
BB1ST_ARGS="${BB1ST_ARGS} --infile-template-bb1st=${BASEDIR_TEMPLATE}"
+### Input: payload ###
+BB1ST_ARGS="${BB1ST_ARGS} --infile-blob-bl2e=${BASEDIR_INPUT_BL2E}"
+
### Input: payloads ###
BB1ST_ARGS="${BB1ST_ARGS} --infile-dvinit-params=${BASEDIR_PAYLOAD}"
diff --git a/s6/binary-tool/acpu-imagetool b/s6/binary-tool/acpu-imagetool
index 78f9632..81a6242 100755
--- a/s6/binary-tool/acpu-imagetool
+++ b/s6/binary-tool/acpu-imagetool
Binary files differ
diff --git a/s6/build.sh b/s6/build.sh
index 14a4519..8b73a30 100755
--- a/s6/build.sh
+++ b/s6/build.sh
@@ -729,8 +729,8 @@
dd if=${BUILD_PATH}/device_acs.bin of=${BUILD_PATH}/dvinit-params.bin conv=notrunc &> /dev/null
fi
- ./${FIP_FOLDER}${CUR_SOC}/bin/add-dvinit-params.sh ${BUILD_PATH}/bb1st.sto${CHIPSET_VARIANT_SUFFIX}.bin.signed ${BUILD_PATH}/dvinit-params.bin ${BUILD_PATH}/bb1st.sto${CHIPSET_VARIANT_SUFFIX}.bin.signed ${CUR_SOC}
- ./${FIP_FOLDER}${CUR_SOC}/bin/add-dvinit-params.sh ${BUILD_PATH}/bb1st.usb${CHIPSET_VARIANT_SUFFIX}.bin.signed ${BUILD_PATH}/dvinit-params.bin ${BUILD_PATH}/bb1st.usb${CHIPSET_VARIANT_SUFFIX}.bin.signed ${CUR_SOC}
+ ./${FIP_FOLDER}${CUR_SOC}/bin/add-dvinit-params.sh ${BUILD_PATH}/bb1st.sto${CHIPSET_VARIANT_SUFFIX}.bin.signed ${BUILD_PATH}/blob-bl2e.sto${CHIPSET_VARIANT_SUFFIX}.bin.signed ${BUILD_PATH}/dvinit-params.bin ${BUILD_PATH}/bb1st.sto${CHIPSET_VARIANT_SUFFIX}.bin.signed ${CUR_SOC}
+ ./${FIP_FOLDER}${CUR_SOC}/bin/add-dvinit-params.sh ${BUILD_PATH}/bb1st.usb${CHIPSET_VARIANT_SUFFIX}.bin.signed ${BUILD_PATH}/blob-bl2e.usb${CHIPSET_VARIANT_SUFFIX}.bin.signed ${BUILD_PATH}/dvinit-params.bin ${BUILD_PATH}/bb1st.usb${CHIPSET_VARIANT_SUFFIX}.bin.signed ${CUR_SOC}
# fix size for BL30 128KB
if [ -f ${BUILD_PATH}/bl30.bin ]; then
diff --git a/s7d/bin/add-dvinit-params.sh b/s7d/bin/add-dvinit-params.sh
index 39fe19f..bacba1e 100755
--- a/s7d/bin/add-dvinit-params.sh
+++ b/s7d/bin/add-dvinit-params.sh
@@ -17,9 +17,10 @@
#
BASEDIR_TEMPLATE=$1
-BASEDIR_PAYLOAD=$2
-BASEDIR_OUTPUT_BLOB=$3
-SOC_FAMILY=$4
+BASEDIR_INPUT_BL2E=$2
+BASEDIR_PAYLOAD=$3
+BASEDIR_OUTPUT_BLOB=$4
+SOC_FAMILY=$5
#
# Arguments
@@ -46,6 +47,9 @@
### Input: template ###
BB1ST_ARGS="${BB1ST_ARGS} --infile-template-bb1st=${BASEDIR_TEMPLATE}"
+### Input: payload ###
+BB1ST_ARGS="${BB1ST_ARGS} --infile-blob-bl2e=${BASEDIR_INPUT_BL2E}"
+
### Input: payloads ###
BB1ST_ARGS="${BB1ST_ARGS} --infile-dvinit-params=${BASEDIR_PAYLOAD}"
diff --git a/s7d/bin/device-vendor-scs-signing.sh b/s7d/bin/device-vendor-scs-signing.sh
index 182f5b1..6e2353d 100755
--- a/s7d/bin/device-vendor-scs-signing.sh
+++ b/s7d/bin/device-vendor-scs-signing.sh
@@ -51,6 +51,7 @@
}
function mk_uboot() {
+
output_images=$1
input_payloads=$2
postfix=$3
@@ -406,6 +407,7 @@
export DEVICE_VARIANT_SUFFIX=${chipset_variant_suffix}
export DEVICE_STORAGE_SUFFIX=.sto
+
make -C ${BASEDIR_TOP} dv-boot-blobs
export DEVICE_STORAGE_SUFFIX=.usb
make -C ${BASEDIR_TOP} dv-boot-blobs
diff --git a/s7d/binary-tool/acpu-imagetool b/s7d/binary-tool/acpu-imagetool
index 4ccb310..81a6242 100755
--- a/s7d/binary-tool/acpu-imagetool
+++ b/s7d/binary-tool/acpu-imagetool
Binary files differ
diff --git a/s7d/build.sh b/s7d/build.sh
index 301e134..6226136 100755
--- a/s7d/build.sh
+++ b/s7d/build.sh
@@ -542,7 +542,7 @@
seek_sector=$[seek/sector+seek_sector]
#nPayloadOffset=$[sector*(seek_sector+1)]
nPayloadOffset=$[sector*(seek_sector)]
- echo ${file} ${seek_sector} ${size_sector} $[sector*(seek_sector)]
+ echo ${file} ${seek_sector} ${size_sector} $[sector*(seek_sector)]
dd if=${file} of=${bootloader} bs=${sector} seek=${seek_sector} conv=notrunc status=none
echo ${arrPayload[$index]} > ${file_info_cfg_temp}.x
@@ -645,6 +645,7 @@
done
}
+
declare CHIPACS_SIZE="8192"
declare DDRFW_SIZE="212992"
function process_blx() {
@@ -709,7 +710,6 @@
# Remove sig scheme because some parts of the script doesn't use BLX_BIN_NAME
rename_blx_remove_sig_scheme
-
if [ ! -f ${BUILD_PATH}/device_acs.bin ]; then
echo "dev acs params not exist !"
exit -1
@@ -725,8 +725,8 @@
dd if=${BUILD_PATH}/device_acs.bin of=${BUILD_PATH}/dvinit-params.bin conv=notrunc &> /dev/null
fi
- ./${FIP_FOLDER}${CUR_SOC}/bin/add-dvinit-params.sh ${BUILD_PATH}/bb1st.sto${CHIPSET_VARIANT_SUFFIX}.bin.signed ${BUILD_PATH}/dvinit-params.bin ${BUILD_PATH}/bb1st.sto${CHIPSET_VARIANT_SUFFIX}.bin.signed ${CUR_SOC}
- ./${FIP_FOLDER}${CUR_SOC}/bin/add-dvinit-params.sh ${BUILD_PATH}/bb1st.usb${CHIPSET_VARIANT_SUFFIX}.bin.signed ${BUILD_PATH}/dvinit-params.bin ${BUILD_PATH}/bb1st.usb${CHIPSET_VARIANT_SUFFIX}.bin.signed ${CUR_SOC}
+ ./${FIP_FOLDER}${CUR_SOC}/bin/add-dvinit-params.sh ${BUILD_PATH}/bb1st.sto${CHIPSET_VARIANT_SUFFIX}.bin.signed ${BUILD_PATH}/blob-bl2e.sto${CHIPSET_VARIANT_SUFFIX}.bin.signed ${BUILD_PATH}/dvinit-params.bin ${BUILD_PATH}/bb1st.sto${CHIPSET_VARIANT_SUFFIX}.bin.signed ${CUR_SOC}
+ ./${FIP_FOLDER}${CUR_SOC}/bin/add-dvinit-params.sh ${BUILD_PATH}/bb1st.usb${CHIPSET_VARIANT_SUFFIX}.bin.signed ${BUILD_PATH}/blob-bl2e.usb${CHIPSET_VARIANT_SUFFIX}.bin.signed ${BUILD_PATH}/dvinit-params.bin ${BUILD_PATH}/bb1st.usb${CHIPSET_VARIANT_SUFFIX}.bin.signed ${CUR_SOC}
# fix size for BL30 128KB
if [ -f ${BUILD_PATH}/bl30.bin ]; then