diff options
author | Dongjin Kim <tobetter@gmail.com> | 2021-06-08 10:54:48 +0900 |
---|---|---|
committer | Dongjin Kim <tobetter@gmail.com> | 2021-12-11 18:23:58 +0900 |
commit | 85a778994c2afaab0dce63a99bee4006030103c9 (patch) | |
tree | fe2f46dababd67dcde006647e27bc67ae7b327a7 | |
parent | 031bc403d14af2030c6c874e0b006e06a7a6ef73 (diff) | |
download | u-boot-odroid-c1-85a778994c2afaab0dce63a99bee4006030103c9.tar.gz |
ODROID-COMMON: add new git submodule to download 'rkbin/*'
$ git submodule init
$ git submodule update
$ ./make.sh
Signed-off-by: Dongjin Kim <tobetter@gmail.com>
Signed-off-by: Luke go <sangch.go@gmail.com>
Change-Id: If9e02fbf73b2f81f461e78ccb738b81bf6c65f2e
-rw-r--r-- | .gitignore | 2 | ||||
-rw-r--r-- | .gitmodules | 4 | ||||
m--------- | rkbin | 0 | ||||
-rwxr-xr-x | scripts/fit.sh | 4 | ||||
-rwxr-xr-x | scripts/pack_resource.sh | 2 | ||||
-rwxr-xr-x | scripts/uboot.sh | 2 | ||||
-rwxr-xr-x | scripts/unpack_resource.sh | 4 |
7 files changed, 12 insertions, 6 deletions
diff --git a/.gitignore b/.gitignore index f72f3a2fd4..cedfe85522 100644 --- a/.gitignore +++ b/.gitignore @@ -87,3 +87,5 @@ GTAGS *.orig *~ \#*# + +rkbin diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000000..6079bdc6e9 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,4 @@ +[submodule "rkbin"] + path = rkbin + url = ../../../rk/rkbin + branch = odroidm1-v2017.09 diff --git a/rkbin b/rkbin new file mode 160000 +Subproject bcab36925d63303514de496dc46767760e8b451 diff --git a/scripts/fit.sh b/scripts/fit.sh index 158659ea3a..89348f6f82 100755 --- a/scripts/fit.sh +++ b/scripts/fit.sh @@ -27,7 +27,7 @@ KERNEL_ADDR_PLACEHOLDER="0xffffff01" RAMDISK_ADDR_PLACEHOLDER="0xffffff02" # tools MKIMAGE="./tools/mkimage" -RK_SIGN_TOOL="../rkbin/tools/rk_sign_tool" +RK_SIGN_TOOL="rkbin/tools/rk_sign_tool" FIT_UNPACK="./scripts/fit-unpack.sh" CHECK_SIGN="./tools/fit_check_sign" # key @@ -298,7 +298,7 @@ function fit_gen_uboot_itb() if [ "${ARG_SPL_NEW}" == "y" ]; then ${CHECK_SIGN} -f ${ITB_UBOOT} -k ${SPL_DTB} -s else - spl_file="../rkbin/"`sed -n "/FlashBoot=/s/FlashBoot=//p" ${ARG_INI_LOADER} |tr -d '\r'` + spl_file="rkbin/"`sed -n "/FlashBoot=/s/FlashBoot=//p" ${ARG_INI_LOADER} |tr -d '\r'` offs=`fdtdump -s ${spl_file} | head -1 | awk -F ":" '{ print $2 }' | sed "s/ found fdt at offset //g" | tr -d " "` if [ -z ${offs} ]; then echo "ERROR: invalid ${spl_file} , unable to find fdt blob" diff --git a/scripts/pack_resource.sh b/scripts/pack_resource.sh index a6e7baef7c..66de8357a5 100755 --- a/scripts/pack_resource.sh +++ b/scripts/pack_resource.sh @@ -11,7 +11,7 @@ RSCE_NEW=resource.img BOOT_OLD=$1 BOOT_NEW=boot.img -TOOL=../rkbin/tools/resource_tool +TOOL=rkbin/tools/resource_tool IMAGES=./tools/images/ TMP_DIR=.resource_tmp TMP_DIR2=.boot_tmp diff --git a/scripts/uboot.sh b/scripts/uboot.sh index eb9e6a887d..d5b7e193d9 100755 --- a/scripts/uboot.sh +++ b/scripts/uboot.sh @@ -50,6 +50,6 @@ if [ ${BIN_KB} -gt ${MAX_KB} ]; then exit 1 fi -../rkbin/tools/loaderimage --pack --uboot u-boot.bin uboot.img ${LOAD_ADDR} ${SIZE} +rkbin/tools/loaderimage --pack --uboot u-boot.bin uboot.img ${LOAD_ADDR} ${SIZE} echo "pack uboot okay! Input: u-boot.bin" echo diff --git a/scripts/unpack_resource.sh b/scripts/unpack_resource.sh index 14fe4b26cc..c97e6b08ff 100755 --- a/scripts/unpack_resource.sh +++ b/scripts/unpack_resource.sh @@ -8,7 +8,7 @@ IMAGE_FILE=$1 OUTPUT_DIR=$2 -PACK_TOOL=../rkbin/tools/resource_tool +PACK_TOOL=rkbin/tools/resource_tool usage() { @@ -23,7 +23,7 @@ prepare() usage exit 0 elif [ ! -f "$PACK_TOOL" ];then - echo "Can't find '../rkbin/' Responsity, please download it before pack image!" + echo "Can't find 'rkbin/' Responsity, please download it before pack image!" echo "How to obtain? 3 ways:" echo " 1. Login your Rockchip gerrit account: \"Projects\" -> \"List\" -> search \"rk/rkbin\" Responsity" echo " 2. Github Responsity: https://github.com/rockchip-linux/rkbin" |