summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Hochstein <tom.hochstein@nxp.com>2019-11-20 19:25:51 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-02-11 23:05:13 (GMT)
commit65d341daaf1edf7241b0ea518ef9beb4328f16e9 (patch)
tree6a8ae22f60633bc090a2540e9489768844d38f0c
parent6f559af29a5c470ab8fe8b23c0adb8a8cc6b1abd (diff)
downloadpoky-65d341daaf1edf7241b0ea518ef9beb4328f16e9.tar.gz
u-boot.inc: Fix devtool build u-boot for u-boot without menuconfig
For u-boot recipes without menuconfig support, running devtool results in a do_configure error: cp: cannot stat '/home/r60874/upstream/fsl-xwayland/tmp/work/imx8mmevk-fsl-linux/u-boot-imx/2018.03-r0/u-boot-imx-2018.03//.config': No such file or directory The problem arises because u-boot.inc supports recipes with and without menuconfig. Fix the problem by properly setting DEVTOOL_DISABLE_MENUCONFIG so that devtool can control logic that applies only for menuconfig support. (From OE-Core rev: 00e0bc966cc21e8560587c73e72858b9d2e8c891) Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit a6c430b0077eb56b4adbe391a0a05a52133cc8f0) Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-bsp/u-boot/u-boot.inc2
1 files changed, 2 insertions, 0 deletions
diff --git a/meta/recipes-bsp/u-boot/u-boot.inc b/meta/recipes-bsp/u-boot/u-boot.inc
index 9a754fd..d241347 100644
--- a/meta/recipes-bsp/u-boot/u-boot.inc
+++ b/meta/recipes-bsp/u-boot/u-boot.inc
@@ -87,6 +87,8 @@ do_configure () {
87 fi 87 fi
88 merge_config.sh -m .config ${@" ".join(find_cfgs(d))} 88 merge_config.sh -m .config ${@" ".join(find_cfgs(d))}
89 cml1_do_configure 89 cml1_do_configure
90 else
91 DEVTOOL_DISABLE_MENUCONFIG=true
90 fi 92 fi
91} 93}
92 94