diff options
| author | Lukasz Majewski <lukma@denx.de> | 2018-02-14 11:39:48 +0100 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2018-03-21 09:42:25 +0100 |
| commit | 8a98158f8bd5ede3197c8c62fb4099ff7e48e7a7 (patch) | |
| tree | 6b5b7ff55604b783e5f7138cc95752dca931fe85 | |
| parent | d58b8057a7dd74bf163e103df302099546259f81 (diff) | |
script: Make the get_default_envs.sh script working with newest u-boot
This commit fixes several issues:
- Use ${OBJCOPY} if available, fallback to system default's objcopy if not
present.
- Extend the script to accept different build directory than current one.
It is extremely handy with OE usage, where source code is separated from
build.
Signed-off-by: Lukasz Majewski <lukma@denx.de>
Tested-by: Alex Kiernan <alex.kiernan@gmail.com>
[Backported to 2016.11]
Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
(cherry picked from commit 0778e7c50ba1904943a1d6b5194c29d1fee33334)
| -rwxr-xr-x | scripts/get_default_envs.sh | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/scripts/get_default_envs.sh b/scripts/get_default_envs.sh index 7955db60e5..55387b4cc5 100755 --- a/scripts/get_default_envs.sh +++ b/scripts/get_default_envs.sh @@ -6,16 +6,24 @@ # # This file extracts default envs from built u-boot -# usage: get_default_envs.sh > u-boot-env-default.txt +# usage: get_default_envs.sh [build dir] > u-boot-env-default.txt set -ue +: "${OBJCOPY:=${CROSS_COMPILE:-}objcopy}" + ENV_OBJ_FILE="env_common.o" ENV_OBJ_FILE_COPY="copy_${ENV_OBJ_FILE}" echoerr() { echo "$@" 1>&2; } -path=$(readlink -f $0) -env_obj_file_path=$(find ${path%/scripts*} -not -path "*/spl/*" \ +if [ "$#" -eq 1 ]; then + path=${1} +else + path=$(readlink -f $0) + path=${path%/scripts*} +fi + +env_obj_file_path=$(find ${path} -path "*/common/*" -not -path "*/spl/*" \ -name "${ENV_OBJ_FILE}") [ -z "${env_obj_file_path}" ] && \ { echoerr "File '${ENV_OBJ_FILE}' not found!"; exit 1; } @@ -23,8 +31,9 @@ env_obj_file_path=$(find ${path%/scripts*} -not -path "*/spl/*" \ cp ${env_obj_file_path} ${ENV_OBJ_FILE_COPY} # NOTE: objcopy saves its output to file passed in -# (copy_env_common.o in this case) -objcopy -O binary -j ".rodata.default_environment" ${ENV_OBJ_FILE_COPY} +# (copy_${ENV_OBJ_FILE} in this case) + +${OBJCOPY} -O binary -j ".rodata.default_environment" ${ENV_OBJ_FILE_COPY} # Replace default '\0' with '\n' and sort entries tr '\0' '\n' < ${ENV_OBJ_FILE_COPY} | sort -u |