diff options
author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2017-02-11 12:39:54 +0900 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2017-02-12 14:31:25 -0500 |
commit | bf7ab1e70fd7621fea5dea07b6975c576119b86e (patch) | |
tree | 8d857c342799d9d75d704fd87ea29e42ce0454b6 /scripts/kconfig/expr.h | |
parent | 554c73c0256c9e22af1b89e842a310b73b5eb657 (diff) | |
download | u-boot-imx-bf7ab1e70fd7621fea5dea07b6975c576119b86e.zip u-boot-imx-bf7ab1e70fd7621fea5dea07b6975c576119b86e.tar.gz u-boot-imx-bf7ab1e70fd7621fea5dea07b6975c576119b86e.tar.bz2 |
kconfig: re-sync with Linux 4.10
Re-sync all files under the scripts/kconfig directory with
Linux 4.10.
Some parts include U-Boot own modification. I made sure to not
revert the following commits:
5b8031ccb4ed ("Add more SPDX-License-Identifier tags")
192bc6948b02 ("Fix GCC format-security errors and convert sprintfs.")
da58dec86616 ("Various Makefiles: Add SPDX-License-Identifier tags")
20c20826efab ("Kconfig: Enable usage of escape char '\' in string values")
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Diffstat (limited to 'scripts/kconfig/expr.h')
-rw-r--r-- | scripts/kconfig/expr.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/scripts/kconfig/expr.h b/scripts/kconfig/expr.h index a2fc96a..a73f762 100644 --- a/scripts/kconfig/expr.h +++ b/scripts/kconfig/expr.h @@ -29,7 +29,9 @@ typedef enum tristate { } tristate; enum expr_type { - E_NONE, E_OR, E_AND, E_NOT, E_EQUAL, E_UNEQUAL, E_LIST, E_SYMBOL, E_RANGE + E_NONE, E_OR, E_AND, E_NOT, + E_EQUAL, E_UNEQUAL, E_LTH, E_LEQ, E_GTH, E_GEQ, + E_LIST, E_SYMBOL, E_RANGE }; union expr_data { @@ -83,6 +85,7 @@ struct symbol { struct property *prop; struct expr_value dir_dep; struct expr_value rev_dep; + struct expr_value implied; }; #define for_all_symbols(i, sym) for (i = 0; i < SYMBOL_HASHSIZE; i++) for (sym = symbol_hash[i]; sym; sym = sym->next) if (sym->type != S_OTHER) @@ -134,6 +137,7 @@ enum prop_type { P_DEFAULT, /* default y */ P_CHOICE, /* choice value */ P_SELECT, /* select BAR */ + P_IMPLY, /* imply BAR */ P_RANGE, /* range 7..100 (for a symbol) */ P_ENV, /* value from environment variable */ P_SYMBOL, /* where a symbol is defined */ |