diff --git a/make.sh b/make.sh index 201d54df1b..ee1815e79e 100755 --- a/make.sh +++ b/make.sh @@ -620,17 +620,18 @@ function pack_uboot_itb_image() TEE_OFFSET=0x8400000 fi TEE_ARG="-t ${TEE_OFFSET}" - - # MCU - MCU_ENABLED=`awk -F"," '/MCU=/ { printf $3 }' ${INI} | tr -d ' '` - if [ "${MCU_ENABLED}" == "enabled" -o "${MCU_ENABLED}" == "okay" ]; then - MCU=`awk -F"," '/MCU=/ { printf $1 }' ${INI} | tr -d ' ' | cut -c 5-` - cp ${RKBIN}/${MCU} mcu.bin - MCU_OFFSET=`awk -F"," '/MCU=/ { printf $2 }' ${INI} | tr -d ' '` - MCU_ARG="-m ${MCU_OFFSET}" - fi fi + # MCU + MCU_ENABLED=`awk -F"," '/MCU=/ { printf $3 }' ${INI} | tr -d ' '` + if [ "${MCU_ENABLED}" == "enabled" -o "${MCU_ENABLED}" == "okay" ]; then + MCU=`awk -F"," '/MCU=/ { printf $1 }' ${INI} | tr -d ' ' | cut -c 5-` + cp ${RKBIN}/${MCU} mcu.bin + MCU_OFFSET=`awk -F"," '/MCU=/ { printf $2 }' ${INI} | tr -d ' '` + MCU_ARG="-m ${MCU_OFFSET}" + fi + + # COMPRESSION COMPRESSION=`awk -F"," '/COMPRESSION=/ { printf $1 }' ${INI} | tr -d ' ' | cut -c 13-` if [ ! -z "${COMPRESSION}" -a "${COMPRESSION}" != "none" ]; then COMPRESSION_ARG="-c ${COMPRESSION}" diff --git a/scripts/fit.sh b/scripts/fit.sh index 8b2eac5054..c222f47f81 100755 --- a/scripts/fit.sh +++ b/scripts/fit.sh @@ -15,7 +15,7 @@ SIG_BIN="data2sign.bin" SIG_UBOOT="${FIT_DIR}/uboot.data2sign" SIG_BOOT="${FIT_DIR}/boot.data2sign" # offs -OFFS_NS_UBOOT="0xa00" +OFFS_NS_UBOOT="0xc00" OFFS_S_UBOOT="0xc00" OFFS_NS_BOOT="0x800" OFFS_S_BOOT="0xc00"