qiurui
/
rv1126-uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

scritps: fit-base: add file existence check for its 

remove loader pack from uboot itb build process.

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I857d3560f49e4bbfcedf262ee195fbc4f9065d21
This commit is contained in:
Joseph Chen 2020-04-12 10:42:28 +08:00 committed by Jianhong Chen
parent 75e20461a6
commit 37f507ff86
1 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
scripts/fit-base.sh
View File

@ -113,6 +113,18 @@ function fit_process_args()
done done
} }
function its_file_existence_check()
{
cat $1 | while read line
do
image=`echo $line | sed -n "/incbin/p" | awk -F '"' '{ printf $2 }' | tr -d ' '`
if [ ! -f $image ]; then
echo "ERROR: No $image"
exit 1
fi
done
}
function fit_rebuild() function fit_rebuild()
{ {
if [ "$ARG_NO_REBUILD" != "y" ]; then if [ "$ARG_NO_REBUILD" != "y" ]; then
@ -129,12 +141,12 @@ function fit_rebuild()
function fit_uboot_make_itb() function fit_uboot_make_itb()
{ {
./make.sh itb ./make.sh itb
its_file_existence_check u-boot.its
# output uboot.itb # output uboot.itb
if [ "$ARG_NO_VBOOT" = "y" ]; then if [ "$ARG_NO_VBOOT" = "y" ]; then
SIGN_MSG="no-signed" SIGN_MSG="no-signed"
./tools/mkimage -f u-boot.its -E -p $FIT_NS_OFFS_UBOOT $FIT_ITB_UBOOT ./tools/mkimage -f u-boot.its -E -p $FIT_NS_OFFS_UBOOT $FIT_ITB_UBOOT
./make.sh spl-s
else else
SIGN_MSG="signed" SIGN_MSG="signed"
@ -216,15 +228,19 @@ function fit_uboot_make_itb()
function fit_boot_make_itb() function fit_boot_make_itb()
{ {
# output boot.itb
if [ "$ARG_NO_VBOOT" = "y" ]; then
SIGN_MSG="no-signed"
if grep -q '^CONFIG_ARM64=y' .config ; then if grep -q '^CONFIG_ARM64=y' .config ; then
FIT_ITS_BOOT="kernel_arm64.its" FIT_ITS_BOOT="kernel_arm64.its"
else else
FIT_ITS_BOOT="kernel_arm.its" FIT_ITS_BOOT="kernel_arm.its"
fi fi
cp arch/arm/mach-rockchip/$FIT_ITS_BOOT ./ cp arch/arm/mach-rockchip/$FIT_ITS_BOOT ./
its_file_existence_check $FIT_ITS_BOOT
# output boot.itb
if [ "$ARG_NO_VBOOT" = "y" ]; then
SIGN_MSG="no-signed"
./tools/mkimage -f $FIT_ITS_BOOT -E -p $FIT_NS_OFFS_BOOT $FIT_ITB_BOOT ./tools/mkimage -f $FIT_ITS_BOOT -E -p $FIT_NS_OFFS_BOOT $FIT_ITB_BOOT
else else
SIGN_MSG="signed" SIGN_MSG="signed"
@ -250,14 +266,7 @@ function fit_boot_make_itb()
fi fi
fi fi
if grep -q '^CONFIG_ARM64=y' .config ; then
FIT_ITS_BOOT="kernel_arm64.its"
else
FIT_ITS_BOOT="kernel_arm.its"
fi
# fixup entry and load address # fixup entry and load address
cp arch/arm/mach-rockchip/$FIT_ITS_BOOT ./
COMM_FILE=`sed -n "/_common.h/p" $CHIP_FILE | awk '{ print $1 }'` COMM_FILE=`sed -n "/_common.h/p" $CHIP_FILE | awk '{ print $1 }'`
FDT_ADDR_R=`awk /fdt_addr_r/ $COMM_FILE | awk -F '=' '{ print $2 }' | awk -F '\\' '{ print $1 }'` FDT_ADDR_R=`awk /fdt_addr_r/ $COMM_FILE | awk -F '=' '{ print $2 }' | awk -F '\\' '{ print $1 }'`
KERNEL_ADDR_R=`awk /kernel_addr_r/ $COMM_FILE | awk -F '=' '{ print $2 }' | awk -F '\\' '{ print $1 }'` KERNEL_ADDR_R=`awk /kernel_addr_r/ $COMM_FILE | awk -F '=' '{ print $2 }' | awk -F '\\' '{ print $1 }'`