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/zconf.gperf | |
| 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/zconf.gperf')
| -rw-r--r-- | scripts/kconfig/zconf.gperf | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/scripts/kconfig/zconf.gperf b/scripts/kconfig/zconf.gperf index b6ac02d..ead02ed 100644 --- a/scripts/kconfig/zconf.gperf +++ b/scripts/kconfig/zconf.gperf @@ -22,6 +22,7 @@ comment, T_COMMENT, TF_COMMAND config, T_CONFIG, TF_COMMAND menuconfig, T_MENUCONFIG, TF_COMMAND help, T_HELP, TF_COMMAND +---help---, T_HELP, TF_COMMAND if, T_IF, TF_COMMAND|TF_PARAM endif, T_ENDIF, TF_COMMAND depends, T_DEPENDS, TF_COMMAND @@ -37,6 +38,7 @@ int, T_TYPE, TF_COMMAND, S_INT hex, T_TYPE, TF_COMMAND, S_HEX string, T_TYPE, TF_COMMAND, S_STRING select, T_SELECT, TF_COMMAND +imply, T_IMPLY, TF_COMMAND range, T_RANGE, TF_COMMAND visible, T_VISIBLE, TF_COMMAND option, T_OPTION, TF_COMMAND |