Commit 562f36ed authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'kconfig-v4.16' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild 

Pull Kconfig updates from Masahiro Yamada:
 "A pretty big batch of Kconfig updates.

  I have to mention the lexer and parser of Kconfig are now built from
  real .l and .y sources. So, flex and bison are the requirement for
  building the kernel. Both of them (unlike gperf) have been stable for
  a long time. This change has been tested several weeks in linux-next,
  and I did not receive any problem report about this.

  Summary:

   - add checks for mistakes, like the choice default is not in choice,
     help is doubled

   - document data structure and complex code

   - fix various memory leaks

   - change Makefile to build lexer and parser instead of using
     pre-generated C files

   - drop 'boolean' keyword, which is equivalent to 'bool'

   - use default 'yy' prefix and remove unneeded Make variables

   - fix gettext() check for xconfig

   - announce that oldnoconfig will be finally removed

   - make 'Selected by:' and 'Implied by' readable in help and search
     result

   - hide silentoldconfig from 'make help' to stop confusing people

   - fix misc things and cleanups"

* tag 'kconfig-v4.16' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild: (37 commits)
  kconfig: Remove silentoldconfig from help and docs; fix kconfig/conf's help
  kconfig: make "Selected by:" and "Implied by:" readable
  kconfig: announce removal of oldnoconfig if used
  kconfig: fix make xconfig when gettext is missing
  kconfig: Clarify menu and 'if' dependency propagation
  kconfig: Document 'if' flattening logic
  kconfig: Clarify choice dependency propagation
  kconfig: Document SYMBOL_OPTIONAL logic
  kbuild: remove unnecessary LEX_PREFIX and YACC_PREFIX
  kconfig: use default 'yy' prefix for lexer and parser
  kconfig: make conf_unsaved a local variable of conf_read()
  kconfig: make xfgets() really static
  kconfig: make input_mode static
  kconfig: Warn if there is more than one help text
  kconfig: drop 'boolean' keyword
  kconfig: use bool instead of boolean for type definition attributes, again
  kconfig: Remove menu_end_entry()
  kconfig: Document important expression functions
  kconfig: Document automatic submenu creation code
  kconfig: Fix choice symbol expression leak
  ...
parents a659f159 cedd55d4

Documentation/admin-guide/README.rst

+0 −5
Original line number Diff line number Diff line
@@ -170,11 +170,6 @@ Configuring the kernel 
                        your existing ./.config file and asking about

                        new config symbols.



     "make silentoldconfig"

                        Like above, but avoids cluttering the screen

                        with questions already answered.

                        Additionally updates the dependencies.



     "make olddefconfig"

                        Like above, but sets new symbols to their default

                        values without prompting.

Documentation/process/changes.rst

+25 −0
Original line number Diff line number Diff line
@@ -32,6 +32,8 @@ you probably needn't concern yourself with isdn4k-utils. 
GNU C                  3.2              gcc --version

GNU make               3.81             make --version

binutils               2.20             ld -v

flex                   2.5.35           flex --version

bison                  2.0              bison --version

util-linux             2.10o            fdformat --version

module-init-tools      0.9.10           depmod -V

e2fsprogs              1.41.4           e2fsck -V
@@ -79,6 +81,19 @@ The build system has, as of 4.13, switched to using thin archives (`ar T`) 
rather than incremental linking (`ld -r`) for built-in.o intermediate steps.

This requires binutils 2.20 or newer.



Flex

----



Since Linux 4.16, the build system generates lexical analyzers

during build.  This requires flex 2.5.35 or later.





Bison

-----



Since Linux 4.16, the build system generates parsers

during build.  This requires bison 2.0 or later.



Perl

----
@@ -333,6 +348,16 @@ Binutils 


- <https://www.kernel.org/pub/linux/devel/binutils/>



Flex

----



- <https://github.com/westes/flex/releases>



Bison

-----



- <ftp://ftp.gnu.org/gnu/bison/>



OpenSSL

-------

Makefile

+3 −1
Original line number Diff line number Diff line
@@ -377,6 +377,8 @@ NM = $(CROSS_COMPILE)nm 
STRIP		= $(CROSS_COMPILE)strip

OBJCOPY		= $(CROSS_COMPILE)objcopy

OBJDUMP		= $(CROSS_COMPILE)objdump

LEX		= flex

YACC		= bison

AWK		= awk

GENKSYMS	= scripts/genksyms/genksyms

INSTALLKERNEL  := installkernel
@@ -428,7 +430,7 @@ GCC_PLUGINS_CFLAGS := 


export ARCH SRCARCH CONFIG_SHELL HOSTCC HOSTCFLAGS CROSS_COMPILE AS LD CC

export CPP AR NM STRIP OBJCOPY OBJDUMP HOSTLDFLAGS HOST_LOADLIBES

export MAKE AWK GENKSYMS INSTALLKERNEL PERL PYTHON UTS_MACHINE

export MAKE LEX YACC AWK GENKSYMS INSTALLKERNEL PERL PYTHON UTS_MACHINE

export HOSTCXX HOSTCXXFLAGS LDFLAGS_MODULE CHECK CHECKFLAGS



export KBUILD_CPPFLAGS NOSTDINC_FLAGS LINUXINCLUDE OBJCOPYFLAGS LDFLAGS

drivers/firmware/efi/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ config EFI_CAPSULE_LOADER 
	  Most users should say N.



config EFI_CAPSULE_QUIRK_QUARK_CSH

	boolean "Add support for Quark capsules with non-standard headers"

	bool "Add support for Quark capsules with non-standard headers"

	depends on X86 && !64BIT

	select EFI_CAPSULE_LOADER

	default y

drivers/staging/rtlwifi/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -7,6 +7,6 @@ config R8822BE 
	wireless network adapters.



config RTLWIFI_DEBUG_ST

	boolean

	bool

	depends on R8822BE

	default y

CRA Git | Maintained and supported by SUSTech CRA and CCSE