diff options
author | Zev Weiss <zev@bewilderbeest.net> | 2022-01-19 09:48:12 +0300 |
---|---|---|
committer | Zev Weiss <zev@bewilderbeest.net> | 2022-01-25 00:35:39 +0300 |
commit | 897b7444e5ee1ce045b536aa822f20a95c5dd63d (patch) | |
tree | 8c09e8041e22ab357ce6d14abd40b6d26463541c /poky/meta/recipes-bsp/u-boot/u-boot-configure.inc | |
parent | 33061da68a61d2808bc4323fa66d1bb2711d3e0d (diff) | |
download | openbmc-897b7444e5ee1ce045b536aa822f20a95c5dd63d.tar.xz |
u-boot: Split do_configure logic into separate file
Some auxiliary u-boot recipes may need u-boot properly configured
(including *.cfg additions via bbappends) but aren't necessarily
building u-boot itself; to support such situations, here we split the
u-boot do_configure() out of u-boot.inc and into its own
u-boot-configure.inc.
(From OE-Core rev: e55e6fb4983a41f74c0e457bf54bd8dfa5608daa)
Signed-off-by: Zev Weiss <zev@bewilderbeest.net>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Change-Id: I4941535818effd3e660c227195bd5755d11ef8b4
Diffstat (limited to 'poky/meta/recipes-bsp/u-boot/u-boot-configure.inc')
-rw-r--r-- | poky/meta/recipes-bsp/u-boot/u-boot-configure.inc | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/poky/meta/recipes-bsp/u-boot/u-boot-configure.inc b/poky/meta/recipes-bsp/u-boot/u-boot-configure.inc new file mode 100644 index 0000000000..04e0894752 --- /dev/null +++ b/poky/meta/recipes-bsp/u-boot/u-boot-configure.inc @@ -0,0 +1,39 @@ +# This provides the logic for creating the desired u-boot config, +# accounting for any *.cfg files added to SRC_URI. It's separated +# from u-boot.inc for use by recipes that need u-boot properly +# configured but aren't doing a full build of u-boot itself (such as +# its companion tools). + +inherit uboot-config cml1 + +DEPENDS += "kern-tools-native" + +do_configure () { + if [ -n "${UBOOT_CONFIG}" ]; then + unset i j + for config in ${UBOOT_MACHINE}; do + i=$(expr $i + 1); + for type in ${UBOOT_CONFIG}; do + j=$(expr $j + 1); + if [ $j -eq $i ]; then + oe_runmake -C ${S} O=${B}/${config} ${config} + if [ -n "${@' '.join(find_cfgs(d))}" ]; then + merge_config.sh -m -O ${B}/${config} ${B}/${config}/.config ${@" ".join(find_cfgs(d))} + oe_runmake -C ${S} O=${B}/${config} oldconfig + fi + fi + done + unset j + done + unset i + DEVTOOL_DISABLE_MENUCONFIG=true + else + if [ -n "${UBOOT_MACHINE}" ]; then + oe_runmake -C ${S} O=${B} ${UBOOT_MACHINE} + else + oe_runmake -C ${S} O=${B} oldconfig + fi + merge_config.sh -m .config ${@" ".join(find_cfgs(d))} + cml1_do_configure + fi +} |