diff --git a/make.sh b/make.sh index e02fba0a54..935d141ce2 100755 --- a/make.sh +++ b/make.sh @@ -310,7 +310,7 @@ function sub_commands() fit) if [ "${arg}" == "ns" ]; then - ./scripts/fit-mkimg.sh --uboot-itb --boot-itb --no-vboot ${ARG_FIT} + ./scripts/fit-mkimg.sh --uboot-itb --boot-itb --no-vboot ${ARG_LIST_FIT} fi exit 0 ;; diff --git a/scripts/fit-mkimg.sh b/scripts/fit-mkimg.sh index bf4e894365..66db8347eb 100755 --- a/scripts/fit-mkimg.sh +++ b/scripts/fit-mkimg.sh @@ -38,6 +38,7 @@ SPL_DTB="spl/u-boot-spl.dtb" UBOOT_DTB="u-boot.dtb" # its ITS_UBOOT="u-boot.its" +ITS_BOOT="boot.its" function help() { @@ -295,8 +296,11 @@ function fit_gen_boot_itb() ${FIT_UNPACK} -f ${ARG_EXT_BOOT} -o ${FIT_DIR}/unpack ITS_BOOT="${FIT_DIR}/unpack/image.its" else - ITS_BOOT="kernel_arm.its" - cp arch/arm/mach-rockchip/${ITS_BOOT} ./ + compression=`awk -F"," '/COMPRESSION=/ { printf $1 }' ${ARG_INI_TRUST} | tr -d ' ' | cut -c 13-` + if [ -z "${compression}" ]; then + compression="none" + fi + ./arch/arm/mach-rockchip/make_fit_boot.sh -c ${compression} > ${ITS_BOOT} check_its ${ITS_BOOT} fi @@ -457,15 +461,6 @@ function fit_vboot_uboot() fit_msg_uboot } -function fit_vboot_boot() -{ - fit_rebuild - fit_boot_make_itb - fit_boot_make_img - echo - fit_verbose_boot -} - function fit_vboot() { fit_rebuild