[U-Boot] [PATCH v3] script: Make the get_default_envs.sh script working with newest u-boot

[U-Boot] [PATCH v3] script: Make the get_default_envs.sh script working with newest u-boot

[Lukasz Majewski]

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>
---

Changes in v3:
- Extend the objcopy to use CROSS_COMPILE if defined

Changes in v2:
- Update comment information

 scripts/get_default_envs.sh | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/scripts/get_default_envs.sh b/scripts/get_default_envs.sh
index 7955db60e5..184cc19ab7 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
 
-ENV_OBJ_FILE="env_common.o"
+: "${OBJCOPY:=${CROSS_COMPILE:-}objcopy}"
+
+ENV_OBJ_FILE="built-in.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 "*/env/*" -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
-- 
2.11.0

[U-Boot] [U-Boot, v3] script: Make the get_default_envs.sh script working with newest u-boot

[Tom Rini]

On Wed, Feb 14, 2018 at 11:39:48AM +0100, Lukasz Majewski wrote:

> 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>

Applied to u-boot/master, thanks!

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20180220/2a55d38b/attachment.sig>