summaryrefslogtreecommitdiffstats
path: root/meta/recipes-bsp/u-boot
diff options
context:
space:
mode:
authorJens Rehsack <rehsack@gmail.com>2020-06-11 16:30:14 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-06-15 14:53:45 +0100
commit4a79418af009370419d846e115e3f4304638f978 (patch)
treee80cbb8c970044c3f5018a0316766019f9ff59c9 /meta/recipes-bsp/u-boot
parentfa496842dcae2950dc6af2da5d9b88167d77331d (diff)
downloadpoky-4a79418af009370419d846e115e3f4304638f978.tar.gz
u-boot: avoid blind merging all *.cfg
This fixes u-boot-qoriq breakage of: commit 4fde8c8f479f5acd24fb6e0d0b9b4dc94d6f560b Author: Ming Liu <ming.liu@toradex.com> Date: Wed Jun 3 13:56:01 2020 +0200 u-boot: support merging .cfg files for UBOOT_CONFIG U-boot recipe supports .cfg files in SRC_URI, but they would be merged to .config during do_configure only when UBOOT_MACHINE is set, we should also support merging .cfg files for UBOOT_CONFIG. The intension of 4fde8c8 looks more than append delta-config snippets to u-boot config and should probably be rewritten to express that much better than implicitely assume all "*.cfg" are for merging into .config. (From OE-Core rev: b4644f231a1463123d4100fcaf1448b3d174ef1a) Signed-off-by: Jens Rehsack <sno@netbsd.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-bsp/u-boot')
-rw-r--r--meta/recipes-bsp/u-boot/u-boot.inc8
1 files changed, 5 insertions, 3 deletions
diff --git a/meta/recipes-bsp/u-boot/u-boot.inc b/meta/recipes-bsp/u-boot/u-boot.inc
index f6a68da0f6..c91da02959 100644
--- a/meta/recipes-bsp/u-boot/u-boot.inc
+++ b/meta/recipes-bsp/u-boot/u-boot.inc
@@ -89,8 +89,10 @@ do_configure () {
89 j=$(expr $j + 1); 89 j=$(expr $j + 1);
90 if [ $j -eq $i ]; then 90 if [ $j -eq $i ]; then
91 oe_runmake -C ${S} O=${B}/${config} ${config} 91 oe_runmake -C ${S} O=${B}/${config} ${config}
92 merge_config.sh -m -O ${B}/${config} ${B}/${config}/.config ${@" ".join(find_cfgs(d))} 92 if [ test -n "${@' '.join(find_cfgs(d))}" ]; then
93 oe_runmake -C ${S} O=${B}/${config} oldconfig 93 merge_config.sh -m -O ${B}/${config} ${B}/${config}/.config ${@" ".join(find_cfgs(d))}
94 oe_runmake -C ${S} O=${B}/${config} oldconfig
95 fi
94 fi 96 fi
95 done 97 done
96 unset j 98 unset j
@@ -123,7 +125,7 @@ do_compile () {
123 echo ${UBOOT_LOCALVERSION} > ${S}/.scmversion 125 echo ${UBOOT_LOCALVERSION} > ${S}/.scmversion
124 fi 126 fi
125 127
126 if [ -n "${UBOOT_CONFIG}" ] 128 if [ -n "${UBOOT_CONFIG}" -o -n "${UBOOT_DELTA_CONFIG}" ]
127 then 129 then
128 unset i j k 130 unset i j k
129 for config in ${UBOOT_MACHINE}; do 131 for config in ${UBOOT_MACHINE}; do