Lubancat2/device_rockchip
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rv1126: fix pack fit image failed for thunder boot

Browse Source 
Signed-off-by: Zhichao Yu <zhichao.yu@rock-chips.com>
Change-Id: Iae48f43533f014cad31421ca1f2fe6e042496e42
This commit is contained in:
Zhichao Yu
2020-08-25 17:25:01 +08:00
committed by Weiwen Chen
parent 96d4186420
commit d8d6682bd7
4 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
common/mk-fitimage.sh
View File

@ -9,12 +9,6 @@ cd $TOP_DIR
source $TOP_DIR/device/rockchip/.BoardConfig.mk
ROCKDEV=$TOP_DIR/rockdev
if [ -z $RK_KERNEL_ZIMG ]; then
KERNEL_IMAGE=$TOP_DIR/$RK_KERNEL_IMG
else
KERNEL_IMAGE=$TOP_DIR/$RK_KERNEL_ZIMG
fi
fdt=0
kernel=0
ramdisk=0
@ -22,8 +16,17 @@ resource=0
OUTPUT_TARGET_IMAGE="$1"
src_its_file="$2"
ramdisk_file_path="$3"
kernel_image="$4"
target_its_file="$ROCKDEV/.tmp_its"
if [ -z $kernel_image ]; then
if [ -z $RK_KERNEL_ZIMG ]; then
kernel_image=$TOP_DIR/$RK_KERNEL_IMG
else
kernel_image=$TOP_DIR/$RK_KERNEL_ZIMG
fi
fi
if [ ! -f $src_its_file ]; then
echo "Not Fount $src_its_file ..."
exit -1
@ -48,7 +51,7 @@ do
############################# generate kernel image path
if [ $kernel -eq 1 ];then
echo "data = /incbin/(\"$KERNEL_IMAGE\");" >> $target_its_file
echo "data = /incbin/(\"$kernel_image\");" >> $target_its_file
kernel=0
continue
fi

2
common/mk-ramdisk.sh
View File

@ -79,7 +79,7 @@ fi
echo -n "pack $RAMDISK_IMG..."
if [ -f "$TOP_DIR/device/rockchip/$RK_TARGET_PRODUCT/$RK_RECOVERY_FIT_ITS" ];then
$COMMON_DIR/mk-fitimage.sh $TARGET_IMAGE $TOP_DIR/device/rockchip/$RK_TARGET_PRODUCT/$RK_RECOVERY_FIT_ITS $ROOTFS_IMAGE
$COMMON_DIR/mk-fitimage.sh $TARGET_IMAGE $TOP_DIR/device/rockchip/$RK_TARGET_PRODUCT/$RK_RECOVERY_FIT_ITS $ROOTFS_IMAGE $KERNEL_IMAGE
else
$TOP_DIR/kernel/scripts/mkbootimg --kernel $KERNEL_IMAGE --ramdisk $ROOTFS_IMAGE --second $KERNEL_DTB -o $TARGET_IMAGE
fi

2
rv1126_rv1109/BoardConfig-tb-v12.mk
View File

@ -15,7 +15,7 @@ export RK_KERNEL_DTS=rv1126-evb-ddr3-v12-tb-emmc
# boot image type
export RK_BOOT_IMG=zboot.img
# kernel image path
export RK_KERNEL_IMG=kernel/arch/arm/boot/Image.gz
export RK_KERNEL_IMG=kernel/arch/arm/boot/Image
# parameter for GPT table
export RK_PARAMETER=parameter-tb.txt
# Buildroot config

2
rv1126_rv1109/BoardConfig-tb-v13.mk
View File

@ -15,7 +15,7 @@ export RK_KERNEL_DTS=rv1126-evb-ddr3-v13-tb-emmc
# boot image type
export RK_BOOT_IMG=zboot.img
# kernel image path
export RK_KERNEL_IMG=kernel/arch/arm/boot/Image.gz
export RK_KERNEL_IMG=kernel/arch/arm/boot/Image
# parameter for GPT table
export RK_PARAMETER=parameter-tb.txt
# Buildroot config