summaryrefslogtreecommitdiffstats
path: root/meta/recipes-bsp/u-boot/u-boot.inc
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-bsp/u-boot/u-boot.inc')
-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 f905dfed4e..bed759c7c5 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