summaryrefslogtreecommitdiffstats
path: root/meta/recipes-bsp/u-boot
diff options
context:
space:
mode:
authorCharlie Davies <charles.davies@whitetree.xyz>2020-07-09 20:22:08 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-07-12 12:21:48 +0100
commitb9513b838698d212c9a3034778f3377e8f38de38 (patch)
treec3e3625e2acfb19131dec7beaa14842460f26a0d /meta/recipes-bsp/u-boot
parent9e856a0a1a76bc4ba5fa050be038dd702cc58185 (diff)
downloadpoky-b9513b838698d212c9a3034778f3377e8f38de38.tar.gz
u-boot: fix condition to allow use of *.cfg
U-boot recipe supports .cfg files in SRC_URI, but bug in conditional statement meant that the code was unreachable and the .cfg files were never applied. (From OE-Core rev: 766f827df4c3f76b1ef06acaba3c4f160c3791aa) Signed-off-by: Charlie Davies <charles.davies@whitetree.xyz> 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.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-bsp/u-boot/u-boot.inc b/meta/recipes-bsp/u-boot/u-boot.inc
index c91da02959..2666de647c 100644
--- a/meta/recipes-bsp/u-boot/u-boot.inc
+++ b/meta/recipes-bsp/u-boot/u-boot.inc
@@ -89,7 +89,7 @@ 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 if [ test -n "${@' '.join(find_cfgs(d))}" ]; then 92 if [ -n "${@' '.join(find_cfgs(d))}" ]; then
93 merge_config.sh -m -O ${B}/${config} ${B}/${config}/.config ${@" ".join(find_cfgs(d))} 93 merge_config.sh -m -O ${B}/${config} ${B}/${config}/.config ${@" ".join(find_cfgs(d))}
94 oe_runmake -C ${S} O=${B}/${config} oldconfig 94 oe_runmake -C ${S} O=${B}/${config} oldconfig
95 fi 95 fi