dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-03 17:52:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

script: Make the get_default_envs.sh script working with newest u-boot

Browse Source 
This commit fixes several issues:

- After moving env related code to ./env directory the env_common.o file
is no longer present in the system (has been replaced with built-in.o).

- 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>
This commit is contained in:
Lukasz Majewski
2018-02-14 11:39:48 +01:00
committed by Tom Rini
parent 26862b4a40
commit 0778e7c50b
1 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
scripts/get_default_envs.sh
View File

@@ -6,16 +6,24 @@
# #
# This file extracts default envs from built u-boot # 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 set -ue
ENV_OBJ_FILE="env_common.o" : "${OBJCOPY:=${CROSS_COMPILE:-}objcopy}"
ENV_OBJ_FILE="built-in.o"
ENV_OBJ_FILE_COPY="copy_${ENV_OBJ_FILE}" ENV_OBJ_FILE_COPY="copy_${ENV_OBJ_FILE}"
echoerr() { echo "$@" 1>&2; } echoerr() { echo "$@" 1>&2; }
path=$(readlink -f $0) if [ "$#" -eq 1 ]; then
env_obj_file_path=$(find ${path%/scripts*} -not -path "*/spl/*" \ path=${1}
else
path=$(readlink -f $0)
path=${path%/scripts*}
fi
env_obj_file_path=$(find ${path} -path "*/env/*" -not -path "*/spl/*" \
-name "${ENV_OBJ_FILE}") -name "${ENV_OBJ_FILE}")
[ -z "${env_obj_file_path}" ] && \ [ -z "${env_obj_file_path}" ] && \
{ echoerr "File '${ENV_OBJ_FILE}' not found!"; exit 1; } { 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} cp ${env_obj_file_path} ${ENV_OBJ_FILE_COPY}
# NOTE: objcopy saves its output to file passed in # NOTE: objcopy saves its output to file passed in
# (copy_env_common.o in this case) # (copy_${ENV_OBJ_FILE} in this case)
objcopy -O binary -j ".rodata.default_environment" ${ENV_OBJ_FILE_COPY}
${OBJCOPY} -O binary -j ".rodata.default_environment" ${ENV_OBJ_FILE_COPY}
# Replace default '\0' with '\n' and sort entries # Replace default '\0' with '\n' and sort entries
tr '\0' '\n' < ${ENV_OBJ_FILE_COPY} | sort -u tr '\0' '\n' < ${ENV_OBJ_FILE_COPY} | sort -u