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

make.sh: support assign U-Boot dtb with external one 

Usage: ./make.sh EXT_DTB=rk-kernel.dtb

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I83218f5bb2f8e05d895d57fd344f54a01b6ad789
This commit is contained in:
Joseph Chen 2020-02-16 14:33:53 +08:00
parent ea8a3d10b6
commit 622ccf343f
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
make.sh
View File

@ -59,8 +59,7 @@ TOOLCHAIN_OBJDUMP=
TOOLCHAIN_ADDR2LINE= TOOLCHAIN_ADDR2LINE=
# Declare global default output dir and cmd, update in prepare() # Declare global default output dir and cmd, update in prepare()
OUTDIR=$2 OPTION=
OUTOPT=
# Declare global plaform configure, updated in fixup_platform_configure() # Declare global plaform configure, updated in fixup_platform_configure()
PLATFORM_RSA= PLATFORM_RSA=
@ -75,10 +74,10 @@ help()
{ {
echo echo
echo "Usage:" echo "Usage:"
echo " ./make.sh [board|subcmd] [O=<dir>|ini]" echo " ./make.sh [board|subcmd|EXT_DTB=<file>]"
echo echo
echo " - board: board name of defconfig" echo " - board: board name of defconfig"
echo " - subcmd: |elf*|loader*|spl*|itb||trust*|uboot|map|sym|<addr>|" echo " - subcmd: |elf*|loader*|spl*|itb|trust*|uboot|map|sym|<addr>|EXT_DTB=*"
echo " - ini: assigned ini file to pack trust/loader" echo " - ini: assigned ini file to pack trust/loader"
echo echo
echo "Output:" echo "Output:"
@ -89,6 +88,7 @@ help()
echo "1. Build:" echo "1. Build:"
echo " ./make.sh evb-rk3399 --- build for evb-rk3399_defconfig" echo " ./make.sh evb-rk3399 --- build for evb-rk3399_defconfig"
echo " ./make.sh firefly-rk3288 --- build for firefly-rk3288_defconfig" echo " ./make.sh firefly-rk3288 --- build for firefly-rk3288_defconfig"
echo " ./make.sh EXT_DTB=rk-kernel.dtb --- build with exist .config and external dtb"
echo " ./make.sh --- build with exist .config" echo " ./make.sh --- build with exist .config"
echo " ./make.sh env --- build envtools" echo " ./make.sh env --- build envtools"
echo echo
@ -119,7 +119,7 @@ prepare()
case $BOARD in case $BOARD in
# Parse from exit .config # Parse from exit .config
''|elf*|loader*|spl*|itb|debug*|trust|uboot|map|sym|env) ''|elf*|loader*|spl*|itb|debug*|trust|uboot|map|sym|env|EXT_DTB=*)
if [ ! -f .config ]; then if [ ! -f .config ]; then
echo echo
echo "Build failed, Can't find .config" echo "Build failed, Can't find .config"
@ -138,7 +138,7 @@ prepare()
;; ;;
#Subcmd #Subcmd
''|elf*|loader*|spl*|itb|debug*|trust*|uboot|map|sym|env) ''|elf*|loader*|spl*|itb|debug*|trust*|uboot|map|sym|env|EXT_DTB=*)
;; ;;
*) *)
@ -156,7 +156,7 @@ prepare()
exit 1 exit 1
else else
echo "make for ${BOARD}_defconfig by -j${JOB}" echo "make for ${BOARD}_defconfig by -j${JOB}"
make ${BOARD}_defconfig ${OUTOPT} make ${BOARD}_defconfig ${OPTION}
fi fi
;; ;;
esac esac
@ -276,6 +276,10 @@ sub_commands()
exit 0 exit 0
;; ;;
EXT_DTB=*)
OPTION=${SUBCMD}
;;
*) *)
# Search function and code position of address # Search function and code position of address
RELOC_OFF=${FUNCADDR#*-} RELOC_OFF=${FUNCADDR#*-}
@ -680,7 +684,9 @@ pack_trust_image()
finish() finish()
{ {
echo echo
if [ "$BOARD" = '' ]; then if [ ! -z "$OPTION" ]; then
echo "Platform ${RKCHIP_LABEL} is build OK, with exist .config ($OPTION)"
elif [ "$BOARD" = '' ]; then
echo "Platform ${RKCHIP_LABEL} is build OK, with exist .config" echo "Platform ${RKCHIP_LABEL} is build OK, with exist .config"
else else
echo "Platform ${RKCHIP_LABEL} is build OK, with new .config(make ${BOARD}_defconfig)" echo "Platform ${RKCHIP_LABEL} is build OK, with new .config(make ${BOARD}_defconfig)"
@ -692,7 +698,7 @@ select_toolchain
select_chip_info select_chip_info
fixup_platform_configure fixup_platform_configure
sub_commands sub_commands
make CROSS_COMPILE=${TOOLCHAIN_GCC} all --jobs=${JOB} ${OUTOPT} make CROSS_COMPILE=${TOOLCHAIN_GCC} ${OPTION} all --jobs=${JOB}
pack_uboot_image pack_uboot_image
pack_loader_image pack_loader_image
pack_trust_image pack_trust_image