Use uboot_custom_postprocess for different targets

This commit is contained in:
zador-blood-stained 2017-08-19 19:50:56 +03:00
parent cc204b83b0
commit 8f266c7301
2 changed files with 18 additions and 12 deletions

View file

@ -1,7 +1,7 @@
BOOTSCRIPT="boot-rockchip.cmd:boot.cmd"
BOOTENV_FILE='rockchip-default.txt'
UBOOT_TARGET_MAP=";;$SRC/packages/blobs/rockchip/rk3288_boot.bin u-boot-dtb.bin spl/u-boot-spl-dtb.bin"
UBOOT_TARGET_MAP=";;$SRC/packages/blobs/rockchip/rk3288_boot.bin u-boot-rockchip-with-spl.bin"
UBOOT_USE_GCC='> 6.0'
@ -20,6 +20,7 @@ case $BRANCH in
KERNELBRANCH='branch:miqi/release-4.4'
KERNELDIR='linux-rockchip'
;;
next)
KERNELSOURCE=$MAINLINE_KERNEL_SOURCE
KERNELBRANCH=$MAINLINE_KERNEL_BRANCH
@ -38,19 +39,21 @@ CPUMIN="600000"
CPUMAX="1900000"
GOVERNOR="conservative"
write_uboot_platform()
{
dd if=/dev/zero of=$2 bs=1k count=1023 seek=1 status=noxfer > /dev/null 2>&1
mkimage -n rk3288 -T rksd -d $1/u-boot-spl-dtb.bin $1/out > /dev/null 2>&1
cat $1/u-boot-dtb.bin >> $1/out
dd if=$1/out of=$2 seek=64 conv=notrunc > /dev/null 2>&1
dd if=$1/u-boot-rockchip-with-spl.bin of=$2 seek=64 conv=notrunc > /dev/null 2>&1
}
uboot_custom_postprocess()
{
tools/mkimage -n rk3288 -T rksd -d spl/u-boot-spl-dtb.bin u-boot-rockchip-with-spl.bin
cat u-boot-dtb.bin >> u-boot-rockchip-with-spl.bin
}
family_tweaks()
{
if [[ $BOARD == tinkerboard ]]; then
echo "fdt_file=rk3288-miniarm.dtb" >> $SDCARD/boot/armbianEnv.txt
echo "fdt_file=rk3288-miniarm.dtb" >> $SDCARD/boot/armbianEnv.txt
fi
}

View file

@ -5,7 +5,7 @@ BOOTSCRIPT='boot-s5p6818.cmd:boot.cmd'
BOOTENV_FILE='s5p6818-default.txt'
UBOOT_TARGET_MAP=";;$SRC/packages/blobs/nanopim3/bl1-drone.bin u-boot.bin"
UBOOT_TARGET_MAP=";;boot.img"
UBOOT_USE_GCC='> 6.0'
UBOOT_COMPILER='aarch64-linux-gnu-'
@ -27,7 +27,12 @@ GOVERNOR=interactive
write_uboot_platform()
{
cp $1/bl1-drone.bin $1/boot.img
dd if=$1/boot.img of=$2 seek=1 status=noxfer > /dev/null 2>&1
}
uboot_custom_postprocess()
{
cp $SRC/packages/blobs/nanopim3/bl1-drone.bin boot.img
i=0
merge=""
while [ $i -lt 512 ]; do
@ -43,10 +48,8 @@ write_uboot_platform()
merge=$merge"${vallo#??}${vallo%??}${valhi#??}${valhi%??}"
i=$((i+4))
done
echo $merge | xxd -r -p | dd of=$1/boot.img seek=63 status=none
cat $1/u-boot.bin >> $1/boot.img
dd if=$1/boot.img of=$2 seek=1 status=noxfer > /dev/null 2>&1
rm $1/boot.img
echo $merge | xxd -r -p | dd of=boot.img seek=63 status=none
cat u-boot.bin >> boot.img
}
family_tweaks()