Merge branch 'master' into next

[platform/kernel/u-boot.git] / scripts / get_default_envs.sh

diff --git a/scripts/get_default_envs.sh b/scripts/get_default_envs.sh
index 184cc19..fedf720 100755 (executable)
--- a/scripts/get_default_envs.sh
+++ b/scripts/get_default_envs.sh
@@ -1,9 +1,8 @@
 #! /bin/bash
+# SPDX-License-Identifier: GPL-2.0+
 #
 # Copyright (C) 2016, Lukasz Majewski <l.majewski@majess.pl>
 #
-# SPDX-License-Identifier:      GPL-2.0+
-#
 
 # This file extracts default envs from built u-boot
 # usage: get_default_envs.sh [build dir] > u-boot-env-default.txt
@@ -11,7 +10,7 @@ set -ue
 
 : "${OBJCOPY:=${CROSS_COMPILE:-}objcopy}"
 
-ENV_OBJ_FILE="built-in.o"
+ENV_OBJ_FILE="common.o"
 ENV_OBJ_FILE_COPY="copy_${ENV_OBJ_FILE}"
 
 echoerr() { echo "$@" 1>&2; }
@@ -24,7 +23,7 @@ else
 fi
 
 env_obj_file_path=$(find ${path} -path "*/env/*" -not -path "*/spl/*" \
-                        -name "${ENV_OBJ_FILE}")
+                        -not -path "*/tools/*" -name "${ENV_OBJ_FILE}")
 [ -z "${env_obj_file_path}" ] && \
     { echoerr "File '${ENV_OBJ_FILE}' not found!"; exit 1; }
 
@@ -33,10 +32,11 @@ cp ${env_obj_file_path} ${ENV_OBJ_FILE_COPY}
 # NOTE: objcopy saves its output to file passed in
 # (copy_${ENV_OBJ_FILE} in this case)
 
-${OBJCOPY} -O binary -j ".rodata.default_environment" ${ENV_OBJ_FILE_COPY}
+${OBJCOPY} --dump-section .rodata.default_environment=${ENV_OBJ_FILE_COPY} \
+       ${env_obj_file_path}
 
-# Replace default '\0' with '\n' and sort entries
-tr '\0' '\n' < ${ENV_OBJ_FILE_COPY} | sort -u
+# Replace default '\0' with '\n' , remove blank lines and sort entries
+tr '\0' '\n' < ${ENV_OBJ_FILE_COPY} | sed -e '/^\s*$/d' | sort --field-separator== -k1,1 --stable
 
 rm ${ENV_OBJ_FILE_COPY}