diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/classes-recipe/cml1.bbclass | 5 | ||||
-rw-r--r-- | meta/classes-recipe/uboot-config.bbclass | 6 | ||||
-rw-r--r-- | meta/recipes-bsp/u-boot/u-boot-configure.inc | 1 |
3 files changed, 11 insertions, 1 deletions
diff --git a/meta/classes-recipe/cml1.bbclass b/meta/classes-recipe/cml1.bbclass index a09a042c3f..d87d8204e4 100644 --- a/meta/classes-recipe/cml1.bbclass +++ b/meta/classes-recipe/cml1.bbclass | |||
@@ -32,10 +32,15 @@ CROSS_CURSES_INC = '-DCURSES_LOC="<curses.h>"' | |||
32 | TERMINFO = "${STAGING_DATADIR_NATIVE}/terminfo" | 32 | TERMINFO = "${STAGING_DATADIR_NATIVE}/terminfo" |
33 | 33 | ||
34 | KCONFIG_CONFIG_COMMAND ??= "menuconfig" | 34 | KCONFIG_CONFIG_COMMAND ??= "menuconfig" |
35 | KCONFIG_CONFIG_ENABLE_MENUCONFIG ??= "true" | ||
35 | KCONFIG_CONFIG_ROOTDIR ??= "${B}" | 36 | KCONFIG_CONFIG_ROOTDIR ??= "${B}" |
36 | python do_menuconfig() { | 37 | python do_menuconfig() { |
37 | import shutil | 38 | import shutil |
38 | 39 | ||
40 | if not bb.utils.to_boolean(d.getVar("KCONFIG_CONFIG_ENABLE_MENUCONFIG")): | ||
41 | bb.fatal("do_menuconfig is disabled, please check KCONFIG_CONFIG_ENABLE_MENUCONFIG variable.") | ||
42 | return | ||
43 | |||
39 | config = os.path.join(d.getVar('KCONFIG_CONFIG_ROOTDIR'), ".config") | 44 | config = os.path.join(d.getVar('KCONFIG_CONFIG_ROOTDIR'), ".config") |
40 | configorig = os.path.join(d.getVar('KCONFIG_CONFIG_ROOTDIR'), ".config.orig") | 45 | configorig = os.path.join(d.getVar('KCONFIG_CONFIG_ROOTDIR'), ".config.orig") |
41 | 46 | ||
diff --git a/meta/classes-recipe/uboot-config.bbclass b/meta/classes-recipe/uboot-config.bbclass index fb7a4bc498..9be1d64d3e 100644 --- a/meta/classes-recipe/uboot-config.bbclass +++ b/meta/classes-recipe/uboot-config.bbclass | |||
@@ -140,4 +140,10 @@ python () { | |||
140 | 140 | ||
141 | if not found: | 141 | if not found: |
142 | raise bb.parse.SkipRecipe("The selected UBOOT_CONFIG key %s has no match in %s." % (ubootconfig, ubootconfigflags.keys())) | 142 | raise bb.parse.SkipRecipe("The selected UBOOT_CONFIG key %s has no match in %s." % (ubootconfig, ubootconfigflags.keys())) |
143 | |||
144 | if len(ubootconfig) == 1: | ||
145 | d.setVar('KCONFIG_CONFIG_ROOTDIR', os.path.join(d.getVar("B"), d.getVar("UBOOT_MACHINE").strip())) | ||
146 | else: | ||
147 | # Disable menuconfig for multiple configs | ||
148 | d.setVar('KCONFIG_CONFIG_ENABLE_MENUCONFIG', "false") | ||
143 | } | 149 | } |
diff --git a/meta/recipes-bsp/u-boot/u-boot-configure.inc b/meta/recipes-bsp/u-boot/u-boot-configure.inc index 04e0894752..235623d25a 100644 --- a/meta/recipes-bsp/u-boot/u-boot-configure.inc +++ b/meta/recipes-bsp/u-boot/u-boot-configure.inc | |||
@@ -26,7 +26,6 @@ do_configure () { | |||
26 | unset j | 26 | unset j |
27 | done | 27 | done |
28 | unset i | 28 | unset i |
29 | DEVTOOL_DISABLE_MENUCONFIG=true | ||
30 | else | 29 | else |
31 | if [ -n "${UBOOT_MACHINE}" ]; then | 30 | if [ -n "${UBOOT_MACHINE}" ]; then |
32 | oe_runmake -C ${S} O=${B} ${UBOOT_MACHINE} | 31 | oe_runmake -C ${S} O=${B} ${UBOOT_MACHINE} |