diff options
| author | Jo-Philipp Wich <jo@mein.io> | 2020-04-12 00:09:41 +0200 |
|---|---|---|
| committer | Jo-Philipp Wich <jo@mein.io> | 2020-04-12 00:10:16 +0200 |
| commit | fbc01f2a4c072dafb3a6ef73e6f3f2ef1433575f (patch) | |
| tree | d23a071653aa68caffa243365f33bc6014f9c923 /scripts/config | |
| parent | 93294b516e5437980a3562496a5bedec1b3a424f (diff) | |
| download | upstream-fbc01f2a4c072dafb3a6ef73e6f3f2ef1433575f.tar.gz upstream-fbc01f2a4c072dafb3a6ef73e6f3f2ef1433575f.tar.bz2 upstream-fbc01f2a4c072dafb3a6ef73e6f3f2ef1433575f.zip | |
Revert "build: config: allow bool to select a module pkg"
This reverts commit 8514b6b42c17d7cf887fc826596534698e89e3f8.
Reverting this commit in preparation for reverting
dcf3e63a35 ("build: scripts/config - update to kconfig-v5.6") which
introduces various unaddressed build breakages.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
Diffstat (limited to 'scripts/config')
| -rw-r--r-- | scripts/config/README | 4 | ||||
| -rw-r--r-- | scripts/config/symbol.c | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/scripts/config/README b/scripts/config/README index d193050ba4..81243e8016 100644 --- a/scripts/config/README +++ b/scripts/config/README @@ -22,9 +22,7 @@ OpenWrt Buildroot: that may cause one. - use pre-built *.lex.c *.tab.[ch] files by default, to avoid depending on flex & bison. Rebuild/remove these files only if running make with - BUILD_SHIPPED_FILES defined. - - allow a bool symbol to select a tristate symbol that depends on m (i.e. - a package that should only be built as a module). + BUILD_SHIPPED_FILES defined For a full list of changes, see the repository at: https://github.com/cotequeiroz/linux/commits/openwrt/scripts/kconfig diff --git a/scripts/config/symbol.c b/scripts/config/symbol.c index 051472238d..5c6f540314 100644 --- a/scripts/config/symbol.c +++ b/scripts/config/symbol.c @@ -205,7 +205,7 @@ static void sym_calc_visibility(struct symbol *sym) tri = yes; if (sym->dir_dep.expr) tri = expr_calc_value(sym->dir_dep.expr); - if (tri == mod) + if (tri == mod && sym_get_type(sym) == S_BOOLEAN) tri = yes; if (sym->dir_dep.tri != tri) { sym->dir_dep.tri = tri; |