214 files changed, 8219 insertions, 13596 deletions
diff --git a/scripts/.gitignore b/scripts/.gitignore
index 0442c06eefcb..12d302d70128 100644
--- a/scripts/.gitignore
+++ b/scripts/.gitignore
@@ -1,6 +1,7 @@
 #
 # Generated files
 #
+bin2c
 conmakehash
 kallsyms
 pnmtologo
diff --git a/scripts/Kbuild.include b/scripts/Kbuild.include
index 065324a8046f..bb015551c2d9 100644
--- a/scripts/Kbuild.include
+++ b/scripts/Kbuild.include
@@ -8,8 +8,7 @@ squote  := '
 empty   :=
 space   := $(empty) $(empty)
 space_escape := _-_SPACE_-_
-right_paren := )
+pound := \#
-left_paren := (
 ###
 # Name of target with a '.' as filename prefix. foo/bar.o => foo/.bar.o
@@ -56,9 +55,8 @@ kecho := $($(quiet)kecho)
 #   to specify a valid file as first prerequisite (often the kbuild file)
 define filechk
        $(Q)set -e;                             \
-        $(kecho) '  CHK     $@';                \
        mkdir -p $(dir $@);                     \
-        $(filechk_$(1)) < $< > $@.tmp;          \
+        $(filechk_$(1)) > $@.tmp;               \
        if [ -r $@ ] && cmp -s $@ $@.tmp; then  \
                rm -f $@.tmp;                   \
        else                                    \
@@ -82,71 +80,6 @@ cc-cross-prefix =  \
                        echo $(c);                                    \
                fi)))
-# Tools for caching Makefile variables that are "expensive" to compute.
-#
-# Here we want to help deal with variables that take a long time to compute
-# by making it easy to store these variables in a cache.
-#
-# The canonical example here is testing for compiler flags.  On a simple system
-# each call to the compiler takes 10 ms, but on a system with a compiler that's
-# called through various wrappers it can take upwards of 100 ms.  If we have
-# 100 calls to the compiler this can take 1 second (on a simple system) or 10
-# seconds (on a complicated system).
-#
-# The "cache" will be in Makefile syntax and can be directly included.
-# Any time we try to reference a variable that's not in the cache we'll
-# calculate it and store it in the cache for next time.
-# Include values from last time
-make-cache := $(if $(KBUILD_EXTMOD),$(KBUILD_EXTMOD)/,$(if $(obj),$(obj)/)).cache.mk
-$(make-cache): ;
-include $(make-cache)
-cached-data := $(filter __cached_%, $(.VARIABLES))
-# If cache exceeds 1000 lines, shrink it down to 500.
-ifneq ($(word 1000,$(cached-data)),)
-$(shell tail -n 500 $(make-cache) > $(make-cache).tmp; \
-        mv $(make-cache).tmp $(make-cache))
-endif
-create-cache-dir := $(if $(KBUILD_SRC),$(if $(cache-data),,1))
-# Usage: $(call __sanitize-opt,Hello=Hola$(comma)Goodbye Adios)
-#
-# Convert all '$', ')', '(', '\', '=', ' ', ',', ':' to '_'
-__sanitize-opt = $(subst $$,_,$(subst $(right_paren),_,$(subst $(left_paren),_,$(subst \,_,$(subst =,_,$(subst $(space),_,$(subst $(comma),_,$(subst :,_,$(1)))))))))
-# Usage:   $(call shell-cached,shell_command)
-# Example: $(call shell-cached,md5sum /usr/bin/gcc)
-#
-# If we've already seen a call to this exact shell command (even in a
-# previous invocation of make!) we'll return the value.  If not, we'll
-# compute it and store the result for future runs.
-#
-# This is a bit of voodoo, but basic explanation is that if the variable
-# was undefined then we'll evaluate the shell command and store the result
-# into the variable.  We'll then store that value in the cache and finally
-# output the value.
-#
-# NOTE: The $$(2) here isn't actually a parameter to __run-and-store.  We
-# happen to know that the caller will have their shell command in $(2) so the
-# result of "call"ing this will produce a reference to that $(2).  The reason
-# for this strangeness is to avoid an extra level of eval (and escaping) of
-# $(2).
-define __run-and-store
-ifeq ($(origin $(1)),undefined)
-  $$(eval $(1) := $$(shell $$(2)))
-ifeq ($(create-cache-dir),1)
-  $$(shell mkdir -p $(dir $(make-cache)))
-  $$(eval create-cache-dir :=)
-endif
-  $$(shell echo '$(1) := $$($(1))' >> $(make-cache))
-endif
-endef
-__shell-cached = $(eval $(call __run-and-store,$(1)))$($(1))
-shell-cached = $(call __shell-cached,__cached_$(call __sanitize-opt,$(1)),$(1))
 # output directory for tests below
 TMPOUT := $(if $(KBUILD_EXTMOD),$(firstword $(KBUILD_EXTMOD))/)
@@ -154,41 +87,37 @@ TMPOUT := $(if $(KBUILD_EXTMOD),$(firstword $(KBUILD_EXTMOD))/)
 # Usage: option = $(call try-run, $(CC)...-o "$$TMP",option-ok,otherwise)
 # Exit code chooses option. "$$TMP" serves as a temporary file and is
 # automatically cleaned up.
-__try-run = set -e;                     \
+try-run = $(shell set -e;               \
        TMP="$(TMPOUT).$$$$.tmp";       \
        TMPO="$(TMPOUT).$$$$.o";        \
        if ($(1)) >/dev/null 2>&1;      \
        then echo "$(2)";               \
        else echo "$(3)";               \
        fi;                             \
-        rm -f "$$TMP" "$$TMPO"
+        rm -f "$$TMP" "$$TMPO")
-try-run = $(shell $(__try-run))
-# try-run-cached
-# This works like try-run, but the result is cached.
-try-run-cached = $(call shell-cached,$(__try-run))
 # as-option
 # Usage: cflags-y += $(call as-option,-Wa$(comma)-isa=foo,)
-as-option = $(call try-run-cached,\
+as-option = $(call try-run,\
        $(CC) $(KBUILD_CFLAGS) $(1) -c -x assembler /dev/null -o "$$TMP",$(1),$(2))
 # as-instr
 # Usage: cflags-y += $(call as-instr,instr,option1,option2)
-as-instr = $(call try-run-cached,\
+as-instr = $(call try-run,\
        printf "%b\n" "$(1)" | $(CC) $(KBUILD_AFLAGS) -c -x assembler -o "$$TMP" -,$(2),$(3))
 # __cc-option
 # Usage: MY_CFLAGS += $(call __cc-option,$(CC),$(MY_CFLAGS),-march=winchip-c6,-march=i586)
-__cc-option = $(call try-run-cached,\
+__cc-option = $(call try-run,\
        $(1) -Werror $(2) $(3) -c -x c /dev/null -o "$$TMP",$(3),$(4))
 # Do not attempt to build with gcc plugins during cc-option tests.
 # (And this uses delayed resolution so the flags will be up to date.)
-CC_OPTION_CFLAGS = $(filter-out $(GCC_PLUGINS_CFLAGS),$(KBUILD_CFLAGS))
+# In addition, do not include the asm macros which are built later.
+CC_OPTION_FILTERED = $(GCC_PLUGINS_CFLAGS) $(ASM_MACRO_FLAGS)
+CC_OPTION_CFLAGS = $(filter-out $(CC_OPTION_FILTERED),$(KBUILD_CFLAGS))
 # cc-option
 # Usage: cflags-y += $(call cc-option,-march=winchip-c6,-march=i586)
@@ -199,56 +128,42 @@ cc-option = $(call __cc-option, $(CC),\
 # hostcc-option
 # Usage: cflags-y += $(call hostcc-option,-march=winchip-c6,-march=i586)
 hostcc-option = $(call __cc-option, $(HOSTCC),\
-        $(HOSTCFLAGS) $(HOST_EXTRACFLAGS),$(1),$(2))
+        $(KBUILD_HOSTCFLAGS) $(HOST_EXTRACFLAGS),$(1),$(2))
 # cc-option-yn
 # Usage: flag := $(call cc-option-yn,-march=winchip-c6)
-cc-option-yn = $(call try-run-cached,\
+cc-option-yn = $(call try-run,\
        $(CC) -Werror $(KBUILD_CPPFLAGS) $(CC_OPTION_CFLAGS) $(1) -c -x c /dev/null -o "$$TMP",y,n)
 # cc-disable-warning
 # Usage: cflags-y += $(call cc-disable-warning,unused-but-set-variable)
-cc-disable-warning = $(call try-run-cached,\
+cc-disable-warning = $(call try-run,\
        $(CC) -Werror $(KBUILD_CPPFLAGS) $(CC_OPTION_CFLAGS) -W$(strip $(1)) -c -x c /dev/null -o "$$TMP",-Wno-$(strip $(1)))
-# cc-name
-# Expands to either gcc or clang
-cc-name = $(call shell-cached,$(CC) -v 2>&1 | grep -q "clang version" && echo clang || echo gcc)
 # cc-version
-cc-version = $(call shell-cached,$(CONFIG_SHELL) $(srctree)/scripts/gcc-version.sh $(CC))
+cc-version = $(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-version.sh $(CC))
-# cc-fullversion
-cc-fullversion = $(call shell-cached,$(CONFIG_SHELL) \
-        $(srctree)/scripts/gcc-version.sh -p $(CC))
 # cc-ifversion
 # Usage:  EXTRA_CFLAGS += $(call cc-ifversion, -lt, 0402, -O1)
 cc-ifversion = $(shell [ $(cc-version) $(1) $(2) ] && echo $(3) || echo $(4))
-# cc-if-fullversion
-# Usage:  EXTRA_CFLAGS += $(call cc-if-fullversion, -lt, 040502, -O1)
-cc-if-fullversion = $(shell [ $(cc-fullversion) $(1) $(2) ] && echo $(3) || echo $(4))
 # cc-ldoption
 # Usage: ldflags += $(call cc-ldoption, -Wl$(comma)--hash-style=both)
-cc-ldoption = $(call try-run-cached,\
+cc-ldoption = $(call try-run,\
        $(CC) $(1) $(KBUILD_CPPFLAGS) $(CC_OPTION_CFLAGS) -nostdlib -x c /dev/null -o "$$TMP",$(1),$(2))
 # ld-option
-# Usage: LDFLAGS += $(call ld-option, -X)
+# Usage: KBUILD_LDFLAGS += $(call ld-option, -X, -Y)
-ld-option = $(call try-run-cached,\
+ld-option = $(call try-run, $(LD) $(KBUILD_LDFLAGS) $(1) -v,$(1),$(2),$(3))
-        $(CC) $(KBUILD_CPPFLAGS) $(CC_OPTION_CFLAGS) -x c /dev/null -c -o "$$TMPO"; \
-        $(LD) $(LDFLAGS) $(1) "$$TMPO" -o "$$TMP",$(1),$(2))
 # ar-option
 # Usage: KBUILD_ARFLAGS := $(call ar-option,D)
 # Important: no spaces around options
-ar-option = $(call try-run-cached, $(AR) rc$(1) "$$TMP",$(1),$(2))
+ar-option = $(call try-run, $(AR) rc$(1) "$$TMP",$(1),$(2))
 # ld-version
 # Note this is mainly for HJ Lu's 3 number binutil versions
-ld-version = $(call shell-cached,$(LD) --version | $(srctree)/scripts/ld-version.sh)
+ld-version = $(shell $(LD) --version | $(srctree)/scripts/ld-version.sh)
 # ld-ifversion
 # Usage:  $(call ld-ifversion, -ge, 22252, y)
@@ -272,7 +187,7 @@ modbuiltin := -f $(srctree)/scripts/Makefile.modbuiltin obj
 # Shorthand for $(Q)$(MAKE) -f scripts/Makefile.dtbinst obj=
 # Usage:
 # $(Q)$(MAKE) $(dtbinst)=dir
-dtbinst := -f $(if $(KBUILD_SRC),$(srctree)/)scripts/Makefile.dtbinst obj
+dtbinst := -f $(srctree)/scripts/Makefile.dtbinst obj
 ###
 # Shorthand for $(Q)$(MAKE) -f scripts/Makefile.clean obj=
@@ -289,7 +204,7 @@ hdr-inst := -f $(srctree)/scripts/Makefile.headersinst obj
 # Prefix -I with $(srctree) if it is not an absolute path.
 # skip if -I has no parameter
 addtree = $(if $(patsubst -I%,%,$(1)), \
-$(if $(filter-out -I/% -I./% -I../%,$(1)),$(patsubst -I%,-I$(srctree)/%,$(1)),$(1)))
+$(if $(filter-out -I/% -I./% -I../%,$(1)),$(patsubst -I%,-I$(srctree)/%,$(1)),$(1)),$(1))
 # Find all -I options and call addtree
 flags = $(foreach o,$($(1)),$(if $(filter -I%,$(o)),$(call addtree,$(o)),$(o)))
@@ -324,11 +239,11 @@ endif
 # Replace >$< with >$$< to preserve $ when reloading the .cmd file
 # (needed for make)
-# Replace >#< with >\#< to avoid starting a comment in the .cmd file
+# Replace >#< with >$(pound)< to avoid starting a comment in the .cmd file
 # (needed for make)
 # Replace >'< with >'\''< to be able to enclose the whole string in '...'
 # (needed for the shell)
-make-cmd = $(call escsq,$(subst \#,\\\#,$(subst $$,$$$$,$(cmd_$(1)))))
+make-cmd = $(call escsq,$(subst $(pound),$$(pound),$(subst $$,$$$$,$(cmd_$(1)))))
 # Find any prerequisites that is newer than target or that does not exist.
 # PHONY targets skipped in both cases.
@@ -368,7 +283,7 @@ ksym_dep_filter =                                                            \
            $(CPP) $(call flags_nodeps,a_flags) -D__KSYM_DEPS__ $< ;;        \
          boot*|build*|cpp_its_S|*cpp_lds_S|dtc|host*|vdso*) : ;;            \
          *) echo "Don't know how to preprocess $(1)" >&2; false ;;          \
-        esac | tr ";" "\n" | sed -rn 's/^.*=== __KSYM_(.*) ===.*$$/KSYM_\1/p'
+        esac | tr ";" "\n" | sed -n 's/^.*=== __KSYM_\(.*\) ===.*$$/_\1/p'
 cmd_and_fixdep =                                                             \
        $(echo-cmd) $(cmd_$(1));                                             \
@@ -475,3 +390,6 @@ endif
 endef
 #
 ###############################################################################
+# delete partially updated (i.e. corrupted) files on error
+.DELETE_ON_ERROR:
diff --git a/scripts/Kconfig.include b/scripts/Kconfig.include
new file mode 100644
index 000000000000..dad5583451af
--- /dev/null
+++ b/scripts/Kconfig.include
@@ -0,0 +1,30 @@
+# Kconfig helper macros
+# Convenient variables
+comma       := ,
+quote       := "
+squote      := '
+empty       :=
+space       := $(empty) $(empty)
+dollar      := $
+right_paren := )
+left_paren  := (
+# $(if-success,<command>,<then>,<else>)
+# Return <then> if <command> exits with 0, <else> otherwise.
+if-success = $(shell,{ $(1); } >/dev/null 2>&1 && echo "$(2)" || echo "$(3)")
+# $(success,<command>)
+# Return y if <command> exits with 0, n otherwise
+success = $(if-success,$(1),y,n)
+# $(cc-option,<flag>)
+# Return y if the compiler supports <flag>, n otherwise
+cc-option = $(success,$(CC) -Werror $(1) -E -x c /dev/null -o /dev/null)
+# $(ld-option,<flag>)
+# Return y if the linker supports <flag>, n otherwise
+ld-option = $(success,$(LD) -v $(1))
+# gcc version including patch level
+gcc-version := $(shell,$(srctree)/scripts/gcc-version.sh -p $(CC) | sed 's/^0*//')
diff --git a/scripts/Makefile b/scripts/Makefile
index 25ab143cbe14..ece52ff20171 100644
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -10,6 +10,7 @@
 HOST_EXTRACFLAGS += -I$(srctree)/tools/include
+hostprogs-$(CONFIG_BUILD_BIN2C)  += bin2c
 hostprogs-$(CONFIG_KALLSYMS)     += kallsyms
 hostprogs-$(CONFIG_LOGO)         += pnmtologo
 hostprogs-$(CONFIG_VT)           += conmakehash
@@ -22,8 +23,8 @@ hostprogs-$(CONFIG_SYSTEM_EXTRA_CERTIFICATE) += insert-sys-cert
 HOSTCFLAGS_sortextable.o = -I$(srctree)/tools/include
 HOSTCFLAGS_asn1_compiler.o = -I$(srctree)/include
-HOSTLOADLIBES_sign-file = -lcrypto
+HOSTLDLIBS_sign-file = -lcrypto
-HOSTLOADLIBES_extract-cert = -lcrypto
+HOSTLDLIBS_extract-cert = -lcrypto
 always          := $(hostprogs-y) $(hostprogs-m)
@@ -38,8 +39,7 @@ build_unifdef: $(obj)/unifdef
 subdir-$(CONFIG_MODVERSIONS) += genksyms
 subdir-y                     += mod
 subdir-$(CONFIG_SECURITY_SELINUX) += selinux
-subdir-$(CONFIG_DTC)         += dtc
 subdir-$(CONFIG_GDB_SCRIPTS) += gdb
 # Let clean descend into subdirs
-subdir- += basic kconfig package gcc-plugins
+subdir- += basic dtc kconfig package gcc-plugins
diff --git a/scripts/Makefile.build b/scripts/Makefile.build
index 4f2b25d43ec9..a8e7ba9f73e8 100644
--- a/scripts/Makefile.build
+++ b/scripts/Makefile.build
@@ -36,30 +36,13 @@ subdir-ccflags-y :=
 include scripts/Kbuild.include
-# For backward compatibility check that these variables do not change
-save-cflags := $(CFLAGS)
 # The filename Kbuild has precedence over Makefile
 kbuild-dir := $(if $(filter /%,$(src)),$(src),$(srctree)/$(src))
 kbuild-file := $(if $(wildcard $(kbuild-dir)/Kbuild),$(kbuild-dir)/Kbuild,$(kbuild-dir)/Makefile)
 include $(kbuild-file)
-# If the save-* variables changed error out
-ifeq ($(KBUILD_NOPEDANTIC),)
-        ifneq ("$(save-cflags)","$(CFLAGS)")
-                $(error CFLAGS was changed in "$(kbuild-file)". Fix it to use ccflags-y)
-        endif
-endif
 include scripts/Makefile.lib
-ifdef host-progs
-ifneq ($(hostprogs-y),$(host-progs))
-$(warning kbuild: $(obj)/Makefile - Usage of host-progs is deprecated. Please replace with hostprogs-y!)
-hostprogs-y += $(host-progs)
-endif
-endif
 # Do not include host rules unless needed
 ifneq ($(hostprogs-y)$(hostprogs-m)$(hostlibs-y)$(hostlibs-m)$(hostcxxlibs-y)$(hostcxxlibs-m),)
 include scripts/Makefile.host
@@ -73,11 +56,11 @@ endif
 ifneq ($(strip $(lib-y) $(lib-m) $(lib-)),)
 lib-target := $(obj)/lib.a
-obj-y += $(obj)/lib-ksyms.o
+real-obj-y += $(obj)/lib-ksyms.o
 endif
-ifneq ($(strip $(obj-y) $(need-builtin)),)
+ifneq ($(strip $(real-obj-y) $(need-builtin)),)
-builtin-target := $(obj)/built-in.o
+builtin-target := $(obj)/built-in.a
 endif
 modorder-target := $(obj)/modules.order
@@ -90,21 +73,19 @@ __build: $(if $(KBUILD_BUILTIN),$(builtin-target) $(lib-target) $(extra-y)) \
        @:
 # Linus' kernel sanity checking tool
-ifneq ($(KBUILD_CHECKSRC),0)
+ifeq ($(KBUILD_CHECKSRC),1)
-  ifeq ($(KBUILD_CHECKSRC),2)
+  quiet_cmd_checksrc       = CHECK   $<
-    quiet_cmd_force_checksrc = CHECK   $<
+        cmd_checksrc       = $(CHECK) $(CHECKFLAGS) $(c_flags) $< ;
-          cmd_force_checksrc = $(CHECK) $(CHECKFLAGS) $(c_flags) $< ;
+else ifeq ($(KBUILD_CHECKSRC),2)
-  else
+  quiet_cmd_force_checksrc = CHECK   $<
-      quiet_cmd_checksrc     = CHECK   $<
+        cmd_force_checksrc = $(CHECK) $(CHECKFLAGS) $(c_flags) $< ;
-            cmd_checksrc     = $(CHECK) $(CHECKFLAGS) $(c_flags) $< ;
-  endif
 endif
 ifneq ($(KBUILD_ENABLE_EXTRA_GCC_CHECKS),)
  cmd_checkdoc = $(srctree)/scripts/kernel-doc -none $< ;
 endif
-# Do section mismatch analysis for each module/built-in.o
+# Do section mismatch analysis for each module/built-in.a
 ifdef CONFIG_DEBUG_SECTION_MISMATCH
  cmd_secanalysis = ; scripts/mod/modpost $@
 endif
@@ -119,29 +100,17 @@ modkern_cflags =                                          \
                $(KBUILD_CFLAGS_KERNEL) $(CFLAGS_KERNEL))
 quiet_modtag := $(empty)   $(empty)
-$(real-objs-m)        : part-of-module := y
+$(real-obj-m)        : part-of-module := y
-$(real-objs-m:.o=.i)  : part-of-module := y
+$(real-obj-m:.o=.i)  : part-of-module := y
-$(real-objs-m:.o=.s)  : part-of-module := y
+$(real-obj-m:.o=.s)  : part-of-module := y
-$(real-objs-m:.o=.lst): part-of-module := y
+$(real-obj-m:.o=.lst): part-of-module := y
-$(real-objs-m)        : quiet_modtag := [M]
+$(real-obj-m)        : quiet_modtag := [M]
-$(real-objs-m:.o=.i)  : quiet_modtag := [M]
+$(real-obj-m:.o=.i)  : quiet_modtag := [M]
-$(real-objs-m:.o=.s)  : quiet_modtag := [M]
+$(real-obj-m:.o=.s)  : quiet_modtag := [M]
-$(real-objs-m:.o=.lst): quiet_modtag := [M]
+$(real-obj-m:.o=.lst): quiet_modtag := [M]
-$(obj-m)              : quiet_modtag := [M]
+$(obj-m)             : quiet_modtag := [M]
-# Default for not multi-part modules
-modname = $(basetarget)
-$(multi-objs-m)         : modname = $(modname-multi)
-$(multi-objs-m:.o=.i)   : modname = $(modname-multi)
-$(multi-objs-m:.o=.s)   : modname = $(modname-multi)
-$(multi-objs-m:.o=.lst) : modname = $(modname-multi)
-$(multi-objs-y)         : modname = $(modname-multi)
-$(multi-objs-y:.o=.i)   : modname = $(modname-multi)
-$(multi-objs-y:.o=.s)   : modname = $(modname-multi)
-$(multi-objs-y:.o=.lst) : modname = $(modname-multi)
 quiet_cmd_cc_s_c = CC $(quiet_modtag)  $@
 cmd_cc_s_c       = $(CC) $(c_flags) $(DISABLE_LTO) -fverbose-asm -S -o $@ $<
@@ -159,7 +128,6 @@ $(obj)/%.i: $(src)/%.c FORCE
 cmd_gensymtypes_c =                                                         \
    $(CPP) -D__GENKSYMS__ $(c_flags) $< |                                   \
    $(GENKSYMS) $(if $(1), -T $(2))                                         \
-     $(patsubst y,-s _,$(CONFIG_HAVE_UNDERSCORE_SYMBOL_PREFIX))             \
     $(patsubst y,-R,$(CONFIG_MODULE_REL_CRCS))                             \
     $(if $(KBUILD_PRESERVE),-p)                                            \
     -r $(firstword $(wildcard $(2:.symtypes=.symref) /dev/null))
@@ -210,7 +178,7 @@ cmd_modversions_c =								\
                $(call cmd_gensymtypes_c,$(KBUILD_SYMTYPES),$(@:.o=.symtypes))  \
                    > $(@D)/.tmp_$(@F:.o=.ver);                                 \
                                                                                \
-                $(LD) $(LDFLAGS) -r -o $@ $(@D)/.tmp_$(@F)                      \
+                $(LD) $(KBUILD_LDFLAGS) -r -o $@ $(@D)/.tmp_$(@F)               \
                        -T $(@D)/.tmp_$(@F:.o=.ver);                            \
                rm -f $(@D)/.tmp_$(@F) $(@D)/.tmp_$(@F:.o=.ver);                \
        else                                                                    \
@@ -219,6 +187,8 @@ cmd_modversions_c =								\
 endif
 ifdef CONFIG_FTRACE_MCOUNT_RECORD
+ifndef CC_USING_RECORD_MCOUNT
+# compiler will not generate __mcount_loc use recordmcount or recordmcount.pl
 ifdef BUILD_C_RECORDMCOUNT
 ifeq ("$(origin RECORDMCOUNT_WARN)", "command line")
  RECORDMCOUNT_FLAGS = -w
@@ -237,8 +207,8 @@ else
 sub_cmd_record_mcount = set -e ; perl $(srctree)/scripts/recordmcount.pl "$(ARCH)" \
        "$(if $(CONFIG_CPU_BIG_ENDIAN),big,little)" \
        "$(if $(CONFIG_64BIT),64,32)" \
-        "$(OBJDUMP)" "$(OBJCOPY)" "$(CC) $(KBUILD_CFLAGS)" \
+        "$(OBJDUMP)" "$(OBJCOPY)" "$(CC) $(KBUILD_CPPFLAGS) $(KBUILD_CFLAGS)" \
-        "$(LD)" "$(NM)" "$(RM)" "$(MV)" \
+        "$(LD) $(KBUILD_LDFLAGS)" "$(NM)" "$(RM)" "$(MV)" \
        "$(if $(part-of-module),1,0)" "$(@)";
 recordmcount_source := $(srctree)/scripts/recordmcount.pl
 endif # BUILD_C_RECORDMCOUNT
@@ -247,6 +217,7 @@ cmd_record_mcount =						\
             "$(CC_FLAGS_FTRACE)" ]; then                       \
                $(sub_cmd_record_mcount)                        \
        fi;
+endif # CC_USING_RECORD_MCOUNT
 endif # CONFIG_FTRACE_MCOUNT_RECORD
 ifdef CONFIG_STACK_VALIDATION
@@ -263,8 +234,6 @@ objtool_args += --no-fp
 endif
 ifdef CONFIG_GCOV_KERNEL
 objtool_args += --no-unreachable
-else
-objtool_args += $(call cc-ifversion, -lt, 0405, --no-unreachable)
 endif
 ifdef CONFIG_RETPOLINE
 ifneq ($(RETPOLINE_CFLAGS),)
@@ -314,7 +283,7 @@ endef
 # List module undefined symbols (or empty line if not enabled)
 ifdef CONFIG_TRIM_UNUSED_KSYMS
-cmd_undef_syms = $(NM) $@ | sed -n 's/^ \+U //p' | xargs echo
+cmd_undef_syms = $(NM) $@ | sed -n 's/^  *U //p' | xargs echo
 else
 cmd_undef_syms = echo
 endif
@@ -345,8 +314,8 @@ $(obj)/%.lst: $(src)/%.c FORCE
 modkern_aflags := $(KBUILD_AFLAGS_KERNEL) $(AFLAGS_KERNEL)
-$(real-objs-m)      : modkern_aflags := $(KBUILD_AFLAGS_MODULE) $(AFLAGS_MODULE)
+$(real-obj-m)      : modkern_aflags := $(KBUILD_AFLAGS_MODULE) $(AFLAGS_MODULE)
-$(real-objs-m:.o=.s): modkern_aflags := $(KBUILD_AFLAGS_MODULE) $(AFLAGS_MODULE)
+$(real-obj-m:.o=.s): modkern_aflags := $(KBUILD_AFLAGS_MODULE) $(AFLAGS_MODULE)
 # .S file exports must have their C prototypes defined in asm/asm-prototypes.h
 # or a file that it includes, in order to get versioned symbols. We build a
@@ -367,7 +336,6 @@ cmd_gensymtypes_S =                                                         \
     sed 's/.*___EXPORT_SYMBOL[[:space:]]*\([a-zA-Z0-9_]*\)[[:space:]]*,.*/EXPORT_SYMBOL(\1);/' ) | \
    $(CPP) -D__GENKSYMS__ $(c_flags) -xc - |                                \
    $(GENKSYMS) $(if $(1), -T $(2))                                         \
-     $(patsubst y,-s _,$(CONFIG_HAVE_UNDERSCORE_SYMBOL_PREFIX))             \
     $(patsubst y,-R,$(CONFIG_MODULE_REL_CRCS))                             \
     $(if $(KBUILD_PRESERVE),-p)                                            \
     -r $(firstword $(wildcard $(2:.symtypes=.symref) /dev/null))
@@ -412,7 +380,7 @@ cmd_modversions_S =								\
                $(call cmd_gensymtypes_S,$(KBUILD_SYMTYPES),$(@:.o=.symtypes))  \
                    > $(@D)/.tmp_$(@F:.o=.ver);                                 \
                                                                                \
-                $(LD) $(LDFLAGS) -r -o $@ $(@D)/.tmp_$(@F)                      \
+                $(LD) $(KBUILD_LDFLAGS) -r -o $@ $(@D)/.tmp_$(@F)               \
                        -T $(@D)/.tmp_$(@F:.o=.ver);                            \
                rm -f $(@D)/.tmp_$(@F) $(@D)/.tmp_$(@F:.o=.ver);                \
        else                                                                    \
@@ -424,7 +392,7 @@ endif
 $(obj)/%.o: $(src)/%.S $(objtool_dep) FORCE
        $(call if_changed_rule,as_o_S)
-targets += $(real-objs-y) $(real-objs-m) $(lib-y)
+targets += $(filter-out $(subdir-obj-y), $(real-obj-y)) $(real-obj-m) $(lib-y)
 targets += $(extra-y) $(MAKECMDGOALS) $(always)
 # Linker scripts preprocessor (.lds.S -> .lds)
@@ -442,9 +410,7 @@ quiet_cmd_asn1_compiler = ASN.1   $@
      cmd_asn1_compiler = $(objtree)/scripts/asn1_compiler $< \
                                $(subst .h,.c,$@) $(subst .c,.h,$@)
-.PRECIOUS: $(objtree)/$(obj)/%-asn1.c $(objtree)/$(obj)/%-asn1.h
+$(obj)/%.asn1.c $(obj)/%.asn1.h: $(src)/%.asn1 $(objtree)/scripts/asn1_compiler
-$(obj)/%-asn1.c $(obj)/%-asn1.h: $(src)/%.asn1 $(objtree)/scripts/asn1_compiler
        $(call cmd,asn1_compiler)
 # Build the compiled-in targets
@@ -458,24 +424,16 @@ $(sort $(subdir-obj-y)): $(subdir-ym) ;
 #
 ifdef builtin-target
-ifdef CONFIG_THIN_ARCHIVES
+# built-in.a archives are made with no symbol table or index which
-  cmd_make_builtin = rm -f $@; $(AR) rcSTP$(KBUILD_ARFLAGS)
+# makes them small and fast, but unable to be used by the linker.
-  cmd_make_empty_builtin = rm -f $@; $(AR) rcSTP$(KBUILD_ARFLAGS)
+# scripts/link-vmlinux.sh builds an aggregate built-in.a with a symbol
-  quiet_cmd_link_o_target = AR      $@
+# table and index.
-else
+quiet_cmd_ar_builtin = AR      $@
-  cmd_make_builtin = $(LD) $(ld_flags) -r -o
+      cmd_ar_builtin = rm -f $@; \
-  cmd_make_empty_builtin = rm -f $@; $(AR) rcs$(KBUILD_ARFLAGS)
+                     $(AR) rcSTP$(KBUILD_ARFLAGS) $@ $(filter $(real-obj-y), $^)
-  quiet_cmd_link_o_target = LD      $@
-endif
-# If the list of objects to link is empty, just create an empty built-in.o
-cmd_link_o_target = $(if $(strip $(obj-y)),\
-                      $(cmd_make_builtin) $@ $(filter $(obj-y), $^) \
-                      $(cmd_secanalysis),\
-                      $(cmd_make_empty_builtin) $@)
-$(builtin-target): $(obj-y) FORCE
+$(builtin-target): $(real-obj-y) FORCE
-        $(call if_changed,link_o_target)
+        $(call if_changed,ar_builtin)
 targets += $(builtin-target)
 endif # builtin-target
@@ -499,11 +457,8 @@ $(modorder-target): $(subdir-ym) FORCE
 ifdef lib-target
 quiet_cmd_link_l_target = AR      $@
-ifdef CONFIG_THIN_ARCHIVES
+# lib target archives do get a symbol table and index
-  cmd_link_l_target = rm -f $@; $(AR) rcsTP$(KBUILD_ARFLAGS) $@ $(lib-y)
+cmd_link_l_target = rm -f $@; $(AR) rcsTP$(KBUILD_ARFLAGS) $@ $(lib-y)
-else
-  cmd_link_l_target = rm -f $@; $(AR) rcs$(KBUILD_ARFLAGS) $@ $(lib-y)
-endif
 $(lib-target): $(lib-y) FORCE
        $(call if_changed,link_l_target)
@@ -512,15 +467,10 @@ targets += $(lib-target)
 dummy-object = $(obj)/.lib_exports.o
 ksyms-lds = $(dot-target).lds
-ifdef CONFIG_HAVE_UNDERSCORE_SYMBOL_PREFIX
-ref_prefix = EXTERN(_
-else
-ref_prefix = EXTERN(
-endif
 quiet_cmd_export_list = EXPORTS $@
 cmd_export_list = $(OBJDUMP) -h $< | \
-        sed -ne '/___ksymtab/s/.*+\([^ ]*\).*/$(ref_prefix)\1)/p' >$(ksyms-lds);\
+        sed -ne '/___ksymtab/s/.*+\([^ ]*\).*/EXTERN(\1)/p' >$(ksyms-lds);\
        rm -f $(dummy-object);\
        echo | $(CC) $(a_flags) -c -o $(dummy-object) -x assembler -;\
        $(LD) $(ld_flags) -r -o $@ -T $(ksyms-lds) $(dummy-object);\
@@ -533,48 +483,33 @@ targets += $(obj)/lib-ksyms.o
 endif
-#
-# Rule to link composite objects
-#
-#  Composite objects are specified in kbuild makefile as follows:
-#    <composite-object>-objs := <list of .o files>
-#  or
-#    <composite-object>-y    := <list of .o files>
-#  or
-#    <composite-object>-m    := <list of .o files>
-#  The -m syntax only works if <composite object> is a module
-link_multi_deps =                     \
-$(filter $(addprefix $(obj)/,         \
-$($(subst $(obj)/,,$(@:.o=-objs)))    \
-$($(subst $(obj)/,,$(@:.o=-y)))       \
-$($(subst $(obj)/,,$(@:.o=-m)))), $^)
-cmd_link_multi-link = $(LD) $(ld_flags) -r -o $@ $(link_multi_deps) $(cmd_secanalysis)
-ifdef CONFIG_THIN_ARCHIVES
-  quiet_cmd_link_multi-y = AR      $@
-  cmd_link_multi-y = rm -f $@; $(AR) rcSTP$(KBUILD_ARFLAGS) $@ $(link_multi_deps)
-else
-  quiet_cmd_link_multi-y = LD      $@
-  cmd_link_multi-y = $(cmd_link_multi-link)
-endif
 quiet_cmd_link_multi-m = LD [M]  $@
-cmd_link_multi-m = $(cmd_link_multi-link)
+cmd_link_multi-m = $(LD) $(ld_flags) -r -o $@ $(filter %.o,$^) $(cmd_secanalysis)
-$(multi-used-y): FORCE
-        $(call if_changed,link_multi-y)
-$(call multi_depend, $(multi-used-y), .o, -objs -y)
 $(multi-used-m): FORCE
        $(call if_changed,link_multi-m)
-        @{ echo $(@:.o=.ko); echo $(link_multi_deps); \
+        @{ echo $(@:.o=.ko); echo $(filter %.o,$^); \
           $(cmd_undef_syms); } > $(MODVERDIR)/$(@F:.o=.mod)
 $(call multi_depend, $(multi-used-m), .o, -objs -y -m)
-targets += $(multi-used-y) $(multi-used-m)
+targets += $(multi-used-m)
 targets := $(filter-out $(PHONY), $(targets))
+# Add intermediate targets:
+# When building objects with specific suffix patterns, add intermediate
+# targets that the final targets are derived from.
+intermediate_targets = $(foreach sfx, $(2), \
+                                $(patsubst %$(strip $(1)),%$(sfx), \
+                                        $(filter %$(strip $(1)), $(targets))))
+# %.asn1.o <- %.asn1.[ch] <- %.asn1
+# %.dtb.o <- %.dtb.S <- %.dtb <- %.dts
+# %.lex.o <- %.lex.c <- %.l
+# %.tab.o <- %.tab.[ch] <- %.y
+targets += $(call intermediate_targets, .asn1.o, .asn1.c .asn1.h) \
+           $(call intermediate_targets, .dtb.o, .dtb.S .dtb) \
+           $(call intermediate_targets, .lex.o, .lex.c) \
+           $(call intermediate_targets, .tab.o, .tab.c .tab.h)
 # Descending
 # ---------------------------------------------------------------------------
@@ -611,7 +546,8 @@ $(shell mkdir -p $(obj-dirs))
 endif
 endif
-# Declare the contents of the .PHONY variable as phony.  We keep that
+# Some files contained in $(targets) are intermediate artifacts.
-# information in a variable se we can use it in if_changed and friends.
+# We never want them to be removed automatically.
+.SECONDARY: $(targets)
 .PHONY: $(PHONY)
diff --git a/scripts/Makefile.clean b/scripts/Makefile.clean
index 808d09f27ad4..0b80e3207b20 100644
--- a/scripts/Makefile.clean
+++ b/scripts/Makefile.clean
@@ -38,7 +38,6 @@ subdir-ymn	:= $(addprefix $(obj)/,$(subdir-ymn))
 __clean-files   := $(extra-y) $(extra-m) $(extra-)       \
                   $(always) $(targets) $(clean-files)   \
-                   $(host-progs)                         \
                   $(hostprogs-y) $(hostprogs-m) $(hostprogs-) \
                   $(hostlibs-y) $(hostlibs-m) $(hostlibs-) \
                   $(hostcxxlibs-y) $(hostcxxlibs-m)
@@ -88,7 +87,4 @@ PHONY += $(subdir-ymn)
 $(subdir-ymn):
        $(Q)$(MAKE) $(clean)=$@
-# Declare the contents of the .PHONY variable as phony.  We keep that
-# information in a variable se we can use it in if_changed and friends.
 .PHONY: $(PHONY)
diff --git a/scripts/Makefile.extrawarn b/scripts/Makefile.extrawarn
index 8d5357053f86..768306add591 100644
--- a/scripts/Makefile.extrawarn
+++ b/scripts/Makefile.extrawarn
@@ -29,6 +29,7 @@ warning-1 += $(call cc-option, -Wmissing-include-dirs)
 warning-1 += $(call cc-option, -Wunused-but-set-variable)
 warning-1 += $(call cc-option, -Wunused-const-variable)
 warning-1 += $(call cc-option, -Wpacked-not-aligned)
+warning-1 += $(call cc-option, -Wstringop-truncation)
 warning-1 += $(call cc-disable-warning, missing-field-initializers)
 warning-1 += $(call cc-disable-warning, sign-compare)
@@ -52,7 +53,6 @@ warning-3 += -Wpointer-arith
 warning-3 += -Wredundant-decls
 warning-3 += -Wswitch-default
 warning-3 += $(call cc-option, -Wpacked-bitfield-compat)
-warning-3 += $(call cc-option, -Wvla)
 warning := $(warning-$(findstring 1, $(KBUILD_ENABLE_EXTRA_GCC_CHECKS)))
 warning += $(warning-$(findstring 2, $(KBUILD_ENABLE_EXTRA_GCC_CHECKS)))
@@ -65,7 +65,7 @@ endif
 KBUILD_CFLAGS += $(warning)
 else
-ifeq ($(cc-name),clang)
+ifdef CONFIG_CC_IS_CLANG
 KBUILD_CFLAGS += $(call cc-disable-warning, initializer-overrides)
 KBUILD_CFLAGS += $(call cc-disable-warning, unused-value)
 KBUILD_CFLAGS += $(call cc-disable-warning, format)
diff --git a/scripts/Makefile.gcc-plugins b/scripts/Makefile.gcc-plugins
index b2a95af7df18..46c5c6809806 100644
--- a/scripts/Makefile.gcc-plugins
+++ b/scripts/Makefile.gcc-plugins
@@ -1,84 +1,58 @@
 # SPDX-License-Identifier: GPL-2.0
-ifdef CONFIG_GCC_PLUGINS
-  __PLUGINCC := $(call cc-ifversion, -ge, 0408, $(HOSTCXX), $(HOSTCC))
-  PLUGINCC := $(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-plugin.sh "$(__PLUGINCC)" "$(HOSTCXX)" "$(CC)")
-  SANCOV_PLUGIN := -fplugin=$(objtree)/scripts/gcc-plugins/sancov_plugin.so
-  gcc-plugin-$(CONFIG_GCC_PLUGIN_CYC_COMPLEXITY)        += cyc_complexity_plugin.so
-  gcc-plugin-$(CONFIG_GCC_PLUGIN_LATENT_ENTROPY)        += latent_entropy_plugin.so
-  gcc-plugin-cflags-$(CONFIG_GCC_PLUGIN_LATENT_ENTROPY) += -DLATENT_ENTROPY_PLUGIN
-  ifdef CONFIG_GCC_PLUGIN_LATENT_ENTROPY
-    DISABLE_LATENT_ENTROPY_PLUGIN                       += -fplugin-arg-latent_entropy_plugin-disable
-  endif
-  ifdef CONFIG_GCC_PLUGIN_SANCOV
-    ifeq ($(CFLAGS_KCOV),)
-      # It is needed because of the gcc-plugin.sh and gcc version checks.
-      gcc-plugin-$(CONFIG_GCC_PLUGIN_SANCOV)           += sancov_plugin.so
-      ifneq ($(PLUGINCC),)
-        CFLAGS_KCOV := $(SANCOV_PLUGIN)
-      else
-        $(warning warning: cannot use CONFIG_KCOV: -fsanitize-coverage=trace-pc is not supported by compiler)
-      endif
-    endif
-  endif
-  gcc-plugin-$(CONFIG_GCC_PLUGIN_STRUCTLEAK)    += structleak_plugin.so
-  gcc-plugin-cflags-$(CONFIG_GCC_PLUGIN_STRUCTLEAK_VERBOSE)     += -fplugin-arg-structleak_plugin-verbose
-  gcc-plugin-cflags-$(CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL)   += -fplugin-arg-structleak_plugin-byref-all
-  gcc-plugin-cflags-$(CONFIG_GCC_PLUGIN_STRUCTLEAK)     += -DSTRUCTLEAK_PLUGIN
-  gcc-plugin-$(CONFIG_GCC_PLUGIN_RANDSTRUCT)    += randomize_layout_plugin.so
+gcc-plugin-$(CONFIG_GCC_PLUGIN_CYC_COMPLEXITY)  += cyc_complexity_plugin.so
-  gcc-plugin-cflags-$(CONFIG_GCC_PLUGIN_RANDSTRUCT)     += -DRANDSTRUCT_PLUGIN
-  gcc-plugin-cflags-$(CONFIG_GCC_PLUGIN_RANDSTRUCT_PERFORMANCE) += -fplugin-arg-randomize_layout_plugin-performance-mode
-  GCC_PLUGINS_CFLAGS := $(strip $(addprefix -fplugin=$(objtree)/scripts/gcc-plugins/, $(gcc-plugin-y)) $(gcc-plugin-cflags-y))
+gcc-plugin-$(CONFIG_GCC_PLUGIN_LATENT_ENTROPY)  += latent_entropy_plugin.so
+gcc-plugin-cflags-$(CONFIG_GCC_PLUGIN_LATENT_ENTROPY)           \
-  export PLUGINCC GCC_PLUGINS_CFLAGS GCC_PLUGIN GCC_PLUGIN_SUBDIR
+                += -DLATENT_ENTROPY_PLUGIN
-  export SANCOV_PLUGIN DISABLE_LATENT_ENTROPY_PLUGIN
+ifdef CONFIG_GCC_PLUGIN_LATENT_ENTROPY
+    DISABLE_LATENT_ENTROPY_PLUGIN += -fplugin-arg-latent_entropy_plugin-disable
+endif
+export DISABLE_LATENT_ENTROPY_PLUGIN
+gcc-plugin-$(CONFIG_GCC_PLUGIN_SANCOV)          += sancov_plugin.so
+gcc-plugin-$(CONFIG_GCC_PLUGIN_STRUCTLEAK)      += structleak_plugin.so
+gcc-plugin-cflags-$(CONFIG_GCC_PLUGIN_STRUCTLEAK_VERBOSE)       \
+                += -fplugin-arg-structleak_plugin-verbose
+gcc-plugin-cflags-$(CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL)     \
+                += -fplugin-arg-structleak_plugin-byref-all
+gcc-plugin-cflags-$(CONFIG_GCC_PLUGIN_STRUCTLEAK)               \
+                += -DSTRUCTLEAK_PLUGIN
+gcc-plugin-$(CONFIG_GCC_PLUGIN_RANDSTRUCT)      += randomize_layout_plugin.so
+gcc-plugin-cflags-$(CONFIG_GCC_PLUGIN_RANDSTRUCT)               \
+                += -DRANDSTRUCT_PLUGIN
+gcc-plugin-cflags-$(CONFIG_GCC_PLUGIN_RANDSTRUCT_PERFORMANCE)   \
+                += -fplugin-arg-randomize_layout_plugin-performance-mode
+gcc-plugin-$(CONFIG_GCC_PLUGIN_STACKLEAK)       += stackleak_plugin.so
+gcc-plugin-cflags-$(CONFIG_GCC_PLUGIN_STACKLEAK)                \
+                += -DSTACKLEAK_PLUGIN
+gcc-plugin-cflags-$(CONFIG_GCC_PLUGIN_STACKLEAK)                \
+                += -fplugin-arg-stackleak_plugin-track-min-size=$(CONFIG_STACKLEAK_TRACK_MIN_SIZE)
+ifdef CONFIG_GCC_PLUGIN_STACKLEAK
+    DISABLE_STACKLEAK_PLUGIN += -fplugin-arg-stackleak_plugin-disable
+endif
+export DISABLE_STACKLEAK_PLUGIN
-  ifneq ($(PLUGINCC),)
+# All the plugin CFLAGS are collected here in case a build target needs to
-    # SANCOV_PLUGIN can be only in CFLAGS_KCOV because avoid duplication.
+# filter them out of the KBUILD_CFLAGS.
-    GCC_PLUGINS_CFLAGS := $(filter-out $(SANCOV_PLUGIN), $(GCC_PLUGINS_CFLAGS))
+GCC_PLUGINS_CFLAGS := $(strip $(addprefix -fplugin=$(objtree)/scripts/gcc-plugins/, $(gcc-plugin-y)) $(gcc-plugin-cflags-y))
-  endif
+# The sancov_plugin.so is included via CFLAGS_KCOV, so it is removed here.
+GCC_PLUGINS_CFLAGS := $(filter-out %/sancov_plugin.so, $(GCC_PLUGINS_CFLAGS))
+export GCC_PLUGINS_CFLAGS
-  KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
+# Add the flags to the build!
-  GCC_PLUGIN := $(gcc-plugin-y)
+KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
-  GCC_PLUGIN_SUBDIR := $(gcc-plugin-subdir-y)
-endif
-# If plugins aren't supported, abort the build before hard-to-read compiler
+# All enabled GCC plugins are collected here for building below.
-# errors start getting spewed by the main build.
+GCC_PLUGIN := $(gcc-plugin-y)
-PHONY += gcc-plugins-check
+export GCC_PLUGIN
-gcc-plugins-check: FORCE
-ifdef CONFIG_GCC_PLUGINS
-  ifeq ($(PLUGINCC),)
-    ifneq ($(GCC_PLUGINS_CFLAGS),)
-      # Various gccs between 4.5 and 5.1 have bugs on powerpc due to missing
-      # header files. gcc <= 4.6 doesn't work at all, gccs from 4.8 to 5.1 have
-      # issues with 64-bit targets.
-      ifeq ($(ARCH),powerpc)
-        ifeq ($(call cc-ifversion, -le, 0501, y), y)
-          @echo "Cannot use CONFIG_GCC_PLUGINS: plugin support on gcc <= 5.1 is buggy on powerpc, please upgrade to gcc 5.2 or newer" >&2 && exit 1
-        endif
-      endif
-      ifeq ($(call cc-ifversion, -ge, 0405, y), y)
-        $(Q)$(srctree)/scripts/gcc-plugin.sh --show-error "$(__PLUGINCC)" "$(HOSTCXX)" "$(CC)" || true
-        @echo "Cannot use CONFIG_GCC_PLUGINS: your gcc installation does not support plugins, perhaps the necessary headers are missing?" >&2 && exit 1
-      else
-        @echo "Cannot use CONFIG_GCC_PLUGINS: your gcc version does not support plugins, you should upgrade it to at least gcc 4.5" >&2 && exit 1
-      endif
-    endif
-  endif
-endif
-        @:
 # Actually do the build, if requested.
 PHONY += gcc-plugins
-gcc-plugins: scripts_basic gcc-plugins-check
+gcc-plugins: scripts_basic
 ifdef CONFIG_GCC_PLUGINS
        $(Q)$(MAKE) $(build)=scripts/gcc-plugins
 endif
diff --git a/scripts/Makefile.host b/scripts/Makefile.host
index e6dc6ae2d7c4..0393f75db4d4 100644
--- a/scripts/Makefile.host
+++ b/scripts/Makefile.host
@@ -62,9 +62,9 @@ host-cxxshobjs	:= $(addprefix $(obj)/,$(host-cxxshobjs))
 #####
 # Handle options to gcc. Support building with separate output directory
-_hostc_flags   = $(HOSTCFLAGS)   $(HOST_EXTRACFLAGS)   \
+_hostc_flags   = $(KBUILD_HOSTCFLAGS)   $(HOST_EXTRACFLAGS)   \
                 $(HOSTCFLAGS_$(basetarget).o)
-_hostcxx_flags = $(HOSTCXXFLAGS) $(HOST_EXTRACXXFLAGS) \
+_hostcxx_flags = $(KBUILD_HOSTCXXFLAGS) $(HOST_EXTRACXXFLAGS) \
                 $(HOSTCXXFLAGS_$(basetarget).o)
 ifeq ($(KBUILD_SRC),)
@@ -84,17 +84,17 @@ hostcxx_flags  = -Wp,-MD,$(depfile) $(__hostcxx_flags)
 # Create executable from a single .c file
 # host-csingle -> Executable
 quiet_cmd_host-csingle  = HOSTCC  $@
-      cmd_host-csingle  = $(HOSTCC) $(hostc_flags) -o $@ $< \
+      cmd_host-csingle  = $(HOSTCC) $(hostc_flags) $(KBUILD_HOSTLDFLAGS) -o $@ $< \
-                $(HOST_LOADLIBES) $(HOSTLOADLIBES_$(@F))
+                $(KBUILD_HOSTLDLIBS) $(HOSTLDLIBS_$(@F))
 $(host-csingle): $(obj)/%: $(src)/%.c FORCE
        $(call if_changed_dep,host-csingle)
 # Link an executable based on list of .o files, all plain c
 # host-cmulti -> executable
 quiet_cmd_host-cmulti   = HOSTLD  $@
-      cmd_host-cmulti   = $(HOSTCC) $(HOSTLDFLAGS) -o $@ \
+      cmd_host-cmulti   = $(HOSTCC) $(KBUILD_HOSTLDFLAGS) -o $@ \
                          $(addprefix $(obj)/,$($(@F)-objs)) \
-                          $(HOST_LOADLIBES) $(HOSTLOADLIBES_$(@F))
+                          $(KBUILD_HOSTLDLIBS) $(HOSTLDLIBS_$(@F))
 $(host-cmulti): FORCE
        $(call if_changed,host-cmulti)
 $(call multi_depend, $(host-cmulti), , -objs)
@@ -109,10 +109,10 @@ $(host-cobjs): $(obj)/%.o: $(src)/%.c FORCE
 # Link an executable based on list of .o files, a mixture of .c and .cc
 # host-cxxmulti -> executable
 quiet_cmd_host-cxxmulti = HOSTLD  $@
-      cmd_host-cxxmulti = $(HOSTCXX) $(HOSTLDFLAGS) -o $@ \
+      cmd_host-cxxmulti = $(HOSTCXX) $(KBUILD_HOSTLDFLAGS) -o $@ \
                          $(foreach o,objs cxxobjs,\
                          $(addprefix $(obj)/,$($(@F)-$(o)))) \
-                          $(HOST_LOADLIBES) $(HOSTLOADLIBES_$(@F))
+                          $(KBUILD_HOSTLDLIBS) $(HOSTLDLIBS_$(@F))
 $(host-cxxmulti): FORCE
        $(call if_changed,host-cxxmulti)
 $(call multi_depend, $(host-cxxmulti), , -objs -cxxobjs)
@@ -143,9 +143,9 @@ $(host-cxxshobjs): $(obj)/%.o: $(src)/%.c FORCE
 # Link a shared library, based on position independent .o files
 # *.o -> .so shared library (host-cshlib)
 quiet_cmd_host-cshlib   = HOSTLLD -shared $@
-      cmd_host-cshlib   = $(HOSTCC) $(HOSTLDFLAGS) -shared -o $@ \
+      cmd_host-cshlib   = $(HOSTCC) $(KBUILD_HOSTLDFLAGS) -shared -o $@ \
                          $(addprefix $(obj)/,$($(@F:.so=-objs))) \
-                          $(HOST_LOADLIBES) $(HOSTLOADLIBES_$(@F))
+                          $(KBUILD_HOSTLDLIBS) $(HOSTLDLIBS_$(@F))
 $(host-cshlib): FORCE
        $(call if_changed,host-cshlib)
 $(call multi_depend, $(host-cshlib), .so, -objs)
@@ -153,9 +153,9 @@ $(call multi_depend, $(host-cshlib), .so, -objs)
 # Link a shared library, based on position independent .o files
 # *.o -> .so shared library (host-cxxshlib)
 quiet_cmd_host-cxxshlib = HOSTLLD -shared $@
-      cmd_host-cxxshlib = $(HOSTCXX) $(HOSTLDFLAGS) -shared -o $@ \
+      cmd_host-cxxshlib = $(HOSTCXX) $(KBUILD_HOSTLDFLAGS) -shared -o $@ \
                          $(addprefix $(obj)/,$($(@F:.so=-objs))) \
-                          $(HOST_LOADLIBES) $(HOSTLOADLIBES_$(@F))
+                          $(KBUILD_HOSTLDLIBS) $(HOSTLDLIBS_$(@F))
 $(host-cxxshlib): FORCE
        $(call if_changed,host-cxxshlib)
 $(call multi_depend, $(host-cxxshlib), .so, -objs)
diff --git a/scripts/Makefile.kcov b/scripts/Makefile.kcov
index 5cc72037e423..3d61c4bfcbee 100644
--- a/scripts/Makefile.kcov
+++ b/scripts/Makefile.kcov
@@ -1,7 +1,9 @@
 ifdef CONFIG_KCOV
-CFLAGS_KCOV     := $(call cc-option,-fsanitize-coverage=trace-pc,)
-ifeq ($(CONFIG_KCOV_ENABLE_COMPARISONS),y)
+kcov-flags-$(CONFIG_CC_HAS_SANCOV_TRACE_PC)     += -fsanitize-coverage=trace-pc
-CFLAGS_KCOV += $(call cc-option,-fsanitize-coverage=trace-cmp,)
+kcov-flags-$(CONFIG_KCOV_ENABLE_COMPARISONS)    += -fsanitize-coverage=trace-cmp
-endif
+kcov-flags-$(CONFIG_GCC_PLUGIN_SANCOV)          += -fplugin=$(objtree)/scripts/gcc-plugins/sancov_plugin.so
+export CFLAGS_KCOV := $(kcov-flags-y)
 endif
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
index a6f538b31ad6..8fe4468f9bda 100644
--- a/scripts/Makefile.lib
+++ b/scripts/Makefile.lib
@@ -27,7 +27,7 @@ modorder	:= $(patsubst %/,%/modules.order, $(filter %/, $(obj-y)) $(obj-m:.o=.ko
 # Handle objects in subdirs
 # ---------------------------------------------------------------------------
-# o if we encounter foo/ in $(obj-y), replace it by foo/built-in.o
+# o if we encounter foo/ in $(obj-y), replace it by foo/built-in.a
 #   and add the directory to the list of dirs to descend into: $(subdir-y)
 # o if we encounter foo/ in $(obj-m), remove it from $(obj-m)
 #   and add the directory to the list of dirs to descend into: $(subdir-m)
@@ -35,7 +35,7 @@ __subdir-y	:= $(patsubst %/,%,$(filter %/, $(obj-y)))
 subdir-y        += $(__subdir-y)
 __subdir-m      := $(patsubst %/,%,$(filter %/, $(obj-m)))
 subdir-m        += $(__subdir-m)
-obj-y           := $(patsubst %/, %/built-in.o, $(obj-y))
+obj-y           := $(patsubst %/, %/built-in.a, $(obj-y))
 obj-m           := $(filter-out %/, $(obj-m))
 # Subdirectories we need to descend into
@@ -47,18 +47,14 @@ multi-used-m := $(sort $(foreach m,$(obj-m), $(if $(strip $($(m:.o=-objs)) $($(m
 multi-used   := $(multi-used-y) $(multi-used-m)
 single-used-m := $(sort $(filter-out $(multi-used-m),$(obj-m)))
-# Build list of the parts of our composite objects, our composite
-# objects depend on those (obviously)
-multi-objs-y := $(foreach m, $(multi-used-y), $($(m:.o=-objs)) $($(m:.o=-y)))
-multi-objs-m := $(foreach m, $(multi-used-m), $($(m:.o=-objs)) $($(m:.o=-y)))
 # $(subdir-obj-y) is the list of objects in $(obj-y) which uses dir/ to
 # tell kbuild to descend
-subdir-obj-y := $(filter %/built-in.o, $(obj-y))
+subdir-obj-y := $(filter %/built-in.a, $(obj-y))
-# Replace multi-part objects by their individual parts, look at local dir only
+# Replace multi-part objects by their individual parts,
-real-objs-y := $(foreach m, $(filter-out $(subdir-obj-y), $(obj-y)), $(if $(strip $($(m:.o=-objs)) $($(m:.o=-y))),$($(m:.o=-objs)) $($(m:.o=-y)),$(m)))
+# including built-in.a from subdirectories
-real-objs-m := $(foreach m, $(obj-m), $(if $(strip $($(m:.o=-objs)) $($(m:.o=-y)) $($(m:.o=-m))),$($(m:.o=-objs)) $($(m:.o=-y)) $($(m:.o=-m)),$(m)))
+real-obj-y := $(foreach m, $(obj-y), $(if $(strip $($(m:.o=-objs)) $($(m:.o=-y))),$($(m:.o=-objs)) $($(m:.o=-y)),$(m)))
+real-obj-m := $(foreach m, $(obj-m), $(if $(strip $($(m:.o=-objs)) $($(m:.o=-y)) $($(m:.o=-m))),$($(m:.o=-objs)) $($(m:.o=-y)) $($(m:.o=-m)),$(m)))
 # DTB
 # If CONFIG_OF_ALL_DTBS is enabled, all DT blobs are built
@@ -71,29 +67,29 @@ extra-y		:= $(addprefix $(obj)/,$(extra-y))
 always          := $(addprefix $(obj)/,$(always))
 targets         := $(addprefix $(obj)/,$(targets))
 modorder        := $(addprefix $(obj)/,$(modorder))
-obj-y           := $(addprefix $(obj)/,$(obj-y))
 obj-m           := $(addprefix $(obj)/,$(obj-m))
 lib-y           := $(addprefix $(obj)/,$(lib-y))
 subdir-obj-y    := $(addprefix $(obj)/,$(subdir-obj-y))
-real-objs-y     := $(addprefix $(obj)/,$(real-objs-y))
+real-obj-y      := $(addprefix $(obj)/,$(real-obj-y))
-real-objs-m     := $(addprefix $(obj)/,$(real-objs-m))
+real-obj-m      := $(addprefix $(obj)/,$(real-obj-m))
 single-used-m   := $(addprefix $(obj)/,$(single-used-m))
-multi-used-y    := $(addprefix $(obj)/,$(multi-used-y))
 multi-used-m    := $(addprefix $(obj)/,$(multi-used-m))
-multi-objs-y    := $(addprefix $(obj)/,$(multi-objs-y))
-multi-objs-m    := $(addprefix $(obj)/,$(multi-objs-m))
 subdir-ym       := $(addprefix $(obj)/,$(subdir-ym))
+# Finds the multi-part object the current object will be linked into.
+# If the object belongs to two or more multi-part objects, all of them are
+# concatenated with a colon separator.
+modname-multi = $(subst $(space),:,$(sort $(foreach m,$(multi-used),\
+                $(if $(filter $*.o, $($(m:.o=-objs)) $($(m:.o=-y)) $($(m:.o=-m))),$(m:.o=)))))
+modname = $(if $(modname-multi),$(modname-multi),$(basetarget))
 # These flags are needed for modversions and compiling, so we define them here
 # $(modname_flags) defines KBUILD_MODNAME as the name of the module it will
 # end up in (or would, if it gets compiled in)
-# Note: Files that end up in two or more modules are compiled without the
-#       KBUILD_MODNAME definition. The reason is that any made-up name would
-#       differ in different configs.
 name-fix = $(squote)$(quote)$(subst $(comma),_,$(subst -,_,$1))$(quote)$(squote)
 basename_flags = -DKBUILD_BASENAME=$(call name-fix,$(basetarget))
-modname_flags  = $(if $(filter 1,$(words $(modname))),\
+modname_flags  = -DKBUILD_MODNAME=$(call name-fix,$(modname))
-                 -DKBUILD_MODNAME=$(call name-fix,$(modname)))
 orig_c_flags   = $(KBUILD_CPPFLAGS) $(KBUILD_CFLAGS) \
                 $(ccflags-y) $(CFLAGS_$(basetarget).o)
@@ -156,6 +152,7 @@ __cpp_flags     = $(call flags,_cpp_flags)
 endif
 c_flags        = -Wp,-MD,$(depfile) $(NOSTDINC_FLAGS) $(LINUXINCLUDE)     \
+                 -include $(srctree)/include/linux/compiler_types.h       \
                 $(__c_flags) $(modkern_cflags)                           \
                 $(basename_flags) $(modname_flags)
@@ -165,7 +162,7 @@ a_flags        = -Wp,-MD,$(depfile) $(NOSTDINC_FLAGS) $(LINUXINCLUDE)     \
 cpp_flags      = -Wp,-MD,$(depfile) $(NOSTDINC_FLAGS) $(LINUXINCLUDE)     \
                 $(__cpp_flags)
-ld_flags       = $(LDFLAGS) $(ldflags-y)
+ld_flags       = $(KBUILD_LDFLAGS) $(ldflags-y) $(LDFLAGS_$(@F))
 DTC_INCLUDE    := $(srctree)/scripts/dtc/include-prefixes
@@ -173,10 +170,6 @@ dtc_cpp_flags  = -Wp,-MD,$(depfile).pre.tmp -nostdinc                    \
                 $(addprefix -I,$(DTC_INCLUDE))                          \
                 -undef -D__DTS__
-# Finds the multi-part object the current object will be linked into
-modname-multi = $(sort $(foreach m,$(multi-used),\
-                $(if $(filter $(subst $(obj)/,,$*.o), $($(m:.o=-objs)) $($(m:.o=-y))),$(m:.o=))))
 # Useful for describing the dependency of composite objects
 # Usage:
 #   $(call multi_depend, multi_used_targets, suffix_to_remove, suffix_to_add)
@@ -191,14 +184,7 @@ endef
 quiet_cmd_flex = LEX     $@
      cmd_flex = $(LEX) -o$@ -L $<
-ifdef REGENERATE_PARSERS
+$(obj)/%.lex.c: $(src)/%.l FORCE
-.PRECIOUS: $(src)/%.lex.c_shipped
-$(src)/%.lex.c_shipped: $(src)/%.l
-        $(call cmd,flex)
-endif
-.PRECIOUS: $(obj)/%.lex.c
-$(filter %.lex.c,$(targets)): $(obj)/%.lex.c: $(src)/%.l FORCE
        $(call if_changed,flex)
 # YACC
@@ -206,27 +192,13 @@ $(filter %.lex.c,$(targets)): $(obj)/%.lex.c: $(src)/%.l FORCE
 quiet_cmd_bison = YACC    $@
      cmd_bison = $(YACC) -o$@ -t -l $<
-ifdef REGENERATE_PARSERS
+$(obj)/%.tab.c: $(src)/%.y FORCE
-.PRECIOUS: $(src)/%.tab.c_shipped
-$(src)/%.tab.c_shipped: $(src)/%.y
-        $(call cmd,bison)
-endif
-.PRECIOUS: $(obj)/%.tab.c
-$(filter %.tab.c,$(targets)): $(obj)/%.tab.c: $(src)/%.y FORCE
        $(call if_changed,bison)
 quiet_cmd_bison_h = YACC    $@
-      cmd_bison_h = bison -o/dev/null --defines=$@ -t -l -p $(YACC_PREFIX) $<
+      cmd_bison_h = $(YACC) -o/dev/null --defines=$@ -t -l $<
-ifdef REGENERATE_PARSERS
-.PRECIOUS: $(src)/%.tab.h_shipped
-$(src)/%.tab.h_shipped: $(src)/%.y
-        $(call cmd,bison_h)
-endif
-.PRECIOUS: $(obj)/%.tab.h
+$(obj)/%.tab.h: $(src)/%.y FORCE
-$(filter %.tab.h,$(targets)): $(obj)/%.tab.h: $(src)/%.y FORCE
        $(call if_changed,bison_h)
 # Shipped files
@@ -253,8 +225,7 @@ $(obj)/%: $(src)/%_shipped
 # ---------------------------------------------------------------------------
 quiet_cmd_ld = LD      $@
-cmd_ld = $(LD) $(LDFLAGS) $(ldflags-y) $(LDFLAGS_$(@F)) \
+cmd_ld = $(LD) $(ld_flags) $(filter-out FORCE,$^) -o $@
-               $(filter-out FORCE,$^) -o $@
 # Objcopy
 # ---------------------------------------------------------------------------
@@ -276,10 +247,12 @@ DTC ?= $(objtree)/scripts/dtc/dtc
 # Disable noisy checks by default
 ifeq ($(findstring 1,$(KBUILD_ENABLE_EXTRA_GCC_CHECKS)),)
 DTC_FLAGS += -Wno-unit_address_vs_reg \
-        -Wno-simple_bus_reg \
        -Wno-unit_address_format \
-        -Wno-pci_bridge \
+        -Wno-avoid_unnecessary_addr_size \
-        -Wno-pci_device_bus_num \
+        -Wno-alias_paths \
+        -Wno-graph_child_address \
+        -Wno-graph_port \
+        -Wno-unique_unit_address \
        -Wno-pci_device_reg
 endif
@@ -305,18 +278,18 @@ cmd_dt_S_dtb=						\
        echo '.balign STRUCT_ALIGNMENT';                \
 ) > $@
-$(obj)/%.dtb.S: $(obj)/%.dtb
+$(obj)/%.dtb.S: $(obj)/%.dtb FORCE
-        $(call cmd,dt_S_dtb)
+        $(call if_changed,dt_S_dtb)
 quiet_cmd_dtc = DTC     $@
 cmd_dtc = mkdir -p $(dir ${dtc-tmp}) ; \
-        $(CPP) $(dtc_cpp_flags) -x assembler-with-cpp -o $(dtc-tmp) $< ; \
+        $(HOSTCC) -E $(dtc_cpp_flags) -x assembler-with-cpp -o $(dtc-tmp) $< ; \
        $(DTC) -O dtb -o $@ -b 0 \
                $(addprefix -i,$(dir $<) $(DTC_INCLUDE)) $(DTC_FLAGS) \
                -d $(depfile).dtc.tmp $(dtc-tmp) ; \
        cat $(depfile).pre.tmp $(depfile).dtc.tmp > $(depfile)
-$(obj)/%.dtb: $(src)/%.dts FORCE
+$(obj)/%.dtb: $(src)/%.dts $(DTC) FORCE
        $(call if_changed_dep,dtc)
 dtc-tmp = $(subst $(comma),_,$(dot-target).dts.tmp)
@@ -329,7 +302,7 @@ dtc-tmp = $(subst $(comma),_,$(dot-target).dts.tmp)
 size_append = printf $(shell                                            \
 dec_size=0;                                                             \
 for F in $1; do                                                         \
-        fsize=$$(stat -c "%s" $$F);                                     \
+        fsize=$$($(CONFIG_SHELL) $(srctree)/scripts/file-size.sh $$F);  \
        dec_size=$$(expr $$dec_size + $$fsize);                         \
 done;                                                                   \
 printf "%08x\n" $$dec_size |                                            \
@@ -442,7 +415,7 @@ define filechk_offsets
         echo " * This file was generated by Kbuild"; \
         echo " */"; \
         echo ""; \
-         sed -ne $(sed-offsets); \
+         sed -ne $(sed-offsets) < $<; \
         echo ""; \
         echo "#endif" )
 endef
diff --git a/scripts/Makefile.modbuiltin b/scripts/Makefile.modbuiltin
index a763b4775d06..a072a4267746 100644
--- a/scripts/Makefile.modbuiltin
+++ b/scripts/Makefile.modbuiltin
@@ -8,10 +8,10 @@ src := $(obj)
 PHONY := __modbuiltin
 __modbuiltin:
-include include/config/auto.conf
+include include/config/auto.conf
 # tristate.conf sets tristate variables to uppercase 'Y' or 'M'
 # That way, we get the list of built-in modules in obj-Y
-include include/config/tristate.conf
+include include/config/tristate.conf
 include scripts/Kbuild.include
@@ -54,8 +54,4 @@ PHONY += $(subdir-ym)
 $(subdir-ym):
        $(Q)$(MAKE) $(modbuiltin)=$@
-# Declare the contents of the .PHONY variable as phony.  We keep that
-# information in a variable se we can use it in if_changed and friends.
 .PHONY: $(PHONY)
diff --git a/scripts/Makefile.modinst b/scripts/Makefile.modinst
index 51ca0244fc8a..ff5ca9817a85 100644
--- a/scripts/Makefile.modinst
+++ b/scripts/Makefile.modinst
@@ -35,8 +35,4 @@ modinst_dir = $(if $(KBUILD_EXTMOD),$(ext-mod-dir),kernel/$(@D))
 $(modules):
        $(call cmd,modules_install,$(MODLIB)/$(modinst_dir))
-# Declare the contents of the .PHONY variable as phony.  We keep that
-# information in a variable so we can use it in if_changed and friends.
 .PHONY: $(PHONY)
diff --git a/scripts/Makefile.modpost b/scripts/Makefile.modpost
index df4174405feb..7d4af0d0accb 100644
--- a/scripts/Makefile.modpost
+++ b/scripts/Makefile.modpost
@@ -120,7 +120,7 @@ ARCH_POSTLINK := $(wildcard $(srctree)/arch/$(SRCARCH)/Makefile.postlink)
 # Step 6), final link of the modules with optional arch pass after final link
 quiet_cmd_ld_ko_o = LD [M]  $@
      cmd_ld_ko_o =                                                     \
-        $(LD) -r $(LDFLAGS)                                             \
+        $(LD) -r $(KBUILD_LDFLAGS)                                      \
                 $(KBUILD_LDFLAGS_MODULE) $(LDFLAGS_MODULE)             \
                 -o $@ $(filter-out FORCE,$^) ;                         \
        $(if $(ARCH_POSTLINK), $(MAKE) -f $(ARCH_POSTLINK) $@, true)
@@ -149,8 +149,4 @@ ifneq ($(cmd_files),)
  include $(cmd_files)
 endif
-# Declare the contents of the .PHONY variable as phony.  We keep that
-# information in a variable se we can use it in if_changed and friends.
 .PHONY: $(PHONY)
diff --git a/scripts/Makefile.modsign b/scripts/Makefile.modsign
index 171483bc0538..da56aa78d245 100644
--- a/scripts/Makefile.modsign
+++ b/scripts/Makefile.modsign
@@ -27,7 +27,4 @@ modinst_dir = $(if $(KBUILD_EXTMOD),$(ext-mod-dir),kernel/$(@D))
 $(modules):
        $(call cmd,sign_ko,$(MODLIB)/$(modinst_dir))
-# Declare the contents of the .PHONY variable as phony.  We keep that
-# information in a variable se we can use it in if_changed and friends.
 .PHONY: $(PHONY)
diff --git a/scripts/Makefile.ubsan b/scripts/Makefile.ubsan
index b593b36ccff8..38b2b4818e8e 100644
--- a/scripts/Makefile.ubsan
+++ b/scripts/Makefile.ubsan
@@ -14,10 +14,6 @@ ifdef CONFIG_UBSAN_ALIGNMENT
      CFLAGS_UBSAN += $(call cc-option, -fsanitize=alignment)
 endif
-ifdef CONFIG_UBSAN_NULL
-      CFLAGS_UBSAN += $(call cc-option, -fsanitize=null)
-endif
      # -fsanitize=* options makes GCC less smart than usual and
      # increase number of 'maybe-uninitialized false-positives
      CFLAGS_UBSAN += $(call cc-option, -Wno-maybe-uninitialized)
diff --git a/scripts/adjust_autoksyms.sh b/scripts/adjust_autoksyms.sh
index d67830e6e360..6e6d63957da3 100755
--- a/scripts/adjust_autoksyms.sh
+++ b/scripts/adjust_autoksyms.sh
@@ -48,9 +48,6 @@ case "${KCONFIG_CONFIG}" in
        . "./${KCONFIG_CONFIG}"
 esac
-# In case it doesn't exist yet...
-if [ -e "$cur_ksyms_file" ]; then touch "$cur_ksyms_file"; fi
 # Generate a new ksym list file with symbols needed by the current
 # set of modules.
 cat > "$new_ksyms_file" << EOT
@@ -60,11 +57,10 @@ cat > "$new_ksyms_file" << EOT
 EOT
 [ "$(ls -A "$MODVERDIR")" ] &&
-sed -ns -e '3{s/ /\n/g;/^$/!p;}' "$MODVERDIR"/*.mod | sort -u |
+for mod in "$MODVERDIR"/*.mod; do
+        sed -n -e '3{s/ /\n/g;/^$/!p;}' "$mod"
+done | sort -u |
 while read sym; do
-        if [ -n "$CONFIG_HAVE_UNDERSCORE_SYMBOL_PREFIX" ]; then
-                sym="${sym#_}"
-        fi
        echo "#define __KSYM_${sym} 1"
 done >> "$new_ksyms_file"
@@ -81,7 +77,7 @@ sort "$cur_ksyms_file" "$new_ksyms_file" | uniq -u |
 sed -n 's/^#define __KSYM_\(.*\) 1/\1/p' | tr "A-Z_" "a-z/" |
 while read sympath; do
        if [ -z "$sympath" ]; then continue; fi
-        depfile="include/config/ksym/${sympath}.h"
+        depfile="include/ksym/${sympath}.h"
        mkdir -p "$(dirname "$depfile")"
        touch "$depfile"
        # Filesystems with coarse time precision may create timestamps
diff --git a/scripts/asn1_compiler.c b/scripts/asn1_compiler.c
index c1b7ef3e24c1..1b28787028d3 100644
--- a/scripts/asn1_compiler.c
+++ b/scripts/asn1_compiler.c
@@ -413,7 +413,7 @@ static void tokenise(char *buffer, char *end)
                        /* Handle string tokens */
                        if (isalpha(*p)) {
-                                const char **dir, *start = p;
+                                const char **dir;
                                /* Can be a directive, type name or element
                                 * name.  Find the end of the name.
@@ -1319,7 +1319,7 @@ static void render(FILE *out, FILE *hdr)
        fprintf(out, " * ASN.1 parser for %s\n", grammar_name);
        fprintf(out, " */\n");
        fprintf(out, "#include <linux/asn1_ber_bytecode.h>\n");
-        fprintf(out, "#include \"%s-asn1.h\"\n", grammar_name);
+        fprintf(out, "#include \"%s.asn1.h\"\n", grammar_name);
        fprintf(out, "\n");
        if (ferror(out)) {
                perror(outputname);
diff --git a/scripts/basic/.gitignore b/scripts/basic/.gitignore
index 9528ec9e5adc..a776371a3502 100644
--- a/scripts/basic/.gitignore
+++ b/scripts/basic/.gitignore
@@ -1,2 +1 @@
 fixdep
-bin2c
diff --git a/scripts/basic/Makefile b/scripts/basic/Makefile
index 0372b33febe5..af49b446f17d 100644
--- a/scripts/basic/Makefile
+++ b/scripts/basic/Makefile
@@ -9,7 +9,6 @@
 # fixdep:        Used to generate dependency information during build process
 hostprogs-y     := fixdep
-hostprogs-$(CONFIG_BUILD_BIN2C)     += bin2c
 always          := $(hostprogs-y)
 # fixdep is needed to compile other host programs
diff --git a/scripts/basic/fixdep.c b/scripts/basic/fixdep.c
index 449b68c4c90c..850966f3d602 100644
--- a/scripts/basic/fixdep.c
+++ b/scripts/basic/fixdep.c
@@ -113,18 +113,20 @@ static void usage(void)
 /*
 * Print out a dependency path from a symbol name
 */
-static void print_config(const char *m, int slen)
+static void print_dep(const char *m, int slen, const char *dir)
 {
-        int c, i;
+        int c, prev_c = '/', i;
-        printf("    $(wildcard include/config/");
+        printf("    $(wildcard %s/", dir);
        for (i = 0; i < slen; i++) {
                c = m[i];
                if (c == '_')
                        c = '/';
                else
                        c = tolower(c);
-                putchar(c);
+                if (c != '/' || prev_c != '/')
+                        putchar(c);
+                prev_c = c;
        }
        printf(".h) \\\n");
 }
@@ -140,7 +142,7 @@ static void do_extra_deps(void)
                        fprintf(stderr, "fixdep: bad data on stdin\n");
                        exit(1);
                }
-                print_config(buf, len - 1);
+                print_dep(buf, len - 1, "include/ksym");
        }
 }
@@ -208,7 +210,7 @@ static void use_config(const char *m, int slen)
            return;
        define_config(m, slen, hash);
-        print_config(m, slen);
+        print_dep(m, slen, "include/config");
 }
 /* test if s ends in sub */
diff --git a/scripts/basic/bin2c.c b/scripts/bin2c.c
index c3d7eef3ad06..c3d7eef3ad06 100644
--- a/scripts/basic/bin2c.c
+++ b/scripts/bin2c.c
diff --git a/scripts/bloat-o-meter b/scripts/bloat-o-meter
index d84a5674e95e..a923f05edb36 100755
--- a/scripts/bloat-o-meter
+++ b/scripts/bloat-o-meter
@@ -30,8 +30,8 @@ def getsizes(file, format):
            if type in format:
                # strip generated symbols
                if name.startswith("__mod_"): continue
-                if name.startswith("SyS_"): continue
+                if name.startswith("__se_sys"): continue
-                if name.startswith("compat_SyS_"): continue
+                if name.startswith("__se_compat_sys"): continue
                if name == "linux_banner": continue
                # statics and some other optimizations adds random .NUMBER
                name = re_NUMBER.sub('', name)
diff --git a/scripts/bpf_helpers_doc.py b/scripts/bpf_helpers_doc.py
new file mode 100755
index 000000000000..5010a4d5bfba
--- /dev/null
+++ b/scripts/bpf_helpers_doc.py
@@ -0,0 +1,421 @@
+#!/usr/bin/python3
+# SPDX-License-Identifier: GPL-2.0-only
+#
+# Copyright (C) 2018 Netronome Systems, Inc.
+# In case user attempts to run with Python 2.
+from __future__ import print_function
+import argparse
+import re
+import sys, os
+class NoHelperFound(BaseException):
+    pass
+class ParsingError(BaseException):
+    def __init__(self, line='<line not provided>', reader=None):
+        if reader:
+            BaseException.__init__(self,
+                                   'Error at file offset %d, parsing line: %s' %
+                                   (reader.tell(), line))
+        else:
+            BaseException.__init__(self, 'Error parsing line: %s' % line)
+class Helper(object):
+    """
+    An object representing the description of an eBPF helper function.
+    @proto: function prototype of the helper function
+    @desc: textual description of the helper function
+    @ret: description of the return value of the helper function
+    """
+    def __init__(self, proto='', desc='', ret=''):
+        self.proto = proto
+        self.desc = desc
+        self.ret = ret
+    def proto_break_down(self):
+        """
+        Break down helper function protocol into smaller chunks: return type,
+        name, distincts arguments.
+        """
+        arg_re = re.compile('((const )?(struct )?(\w+|...))( (\**)(\w+))?$')
+        res = {}
+        proto_re = re.compile('(.+) (\**)(\w+)\(((([^,]+)(, )?){1,5})\)$')
+        capture = proto_re.match(self.proto)
+        res['ret_type'] = capture.group(1)
+        res['ret_star'] = capture.group(2)
+        res['name']     = capture.group(3)
+        res['args'] = []
+        args    = capture.group(4).split(', ')
+        for a in args:
+            capture = arg_re.match(a)
+            res['args'].append({
+                'type' : capture.group(1),
+                'star' : capture.group(6),
+                'name' : capture.group(7)
+            })
+        return res
+class HeaderParser(object):
+    """
+    An object used to parse a file in order to extract the documentation of a
+    list of eBPF helper functions. All the helpers that can be retrieved are
+    stored as Helper object, in the self.helpers() array.
+    @filename: name of file to parse, usually include/uapi/linux/bpf.h in the
+               kernel tree
+    """
+    def __init__(self, filename):
+        self.reader = open(filename, 'r')
+        self.line = ''
+        self.helpers = []
+    def parse_helper(self):
+        proto    = self.parse_proto()
+        desc     = self.parse_desc()
+        ret      = self.parse_ret()
+        return Helper(proto=proto, desc=desc, ret=ret)
+    def parse_proto(self):
+        # Argument can be of shape:
+        #   - "void"
+        #   - "type  name"
+        #   - "type *name"
+        #   - Same as above, with "const" and/or "struct" in front of type
+        #   - "..." (undefined number of arguments, for bpf_trace_printk())
+        # There is at least one term ("void"), and at most five arguments.
+        p = re.compile(' \* ?((.+) \**\w+\((((const )?(struct )?(\w+|\.\.\.)( \**\w+)?)(, )?){1,5}\))$')
+        capture = p.match(self.line)
+        if not capture:
+            raise NoHelperFound
+        self.line = self.reader.readline()
+        return capture.group(1)
+    def parse_desc(self):
+        p = re.compile(' \* ?(?:\t| {5,8})Description$')
+        capture = p.match(self.line)
+        if not capture:
+            # Helper can have empty description and we might be parsing another
+            # attribute: return but do not consume.
+            return ''
+        # Description can be several lines, some of them possibly empty, and it
+        # stops when another subsection title is met.
+        desc = ''
+        while True:
+            self.line = self.reader.readline()
+            if self.line == ' *\n':
+                desc += '\n'
+            else:
+                p = re.compile(' \* ?(?:\t| {5,8})(?:\t| {8})(.*)')
+                capture = p.match(self.line)
+                if capture:
+                    desc += capture.group(1) + '\n'
+                else:
+                    break
+        return desc
+    def parse_ret(self):
+        p = re.compile(' \* ?(?:\t| {5,8})Return$')
+        capture = p.match(self.line)
+        if not capture:
+            # Helper can have empty retval and we might be parsing another
+            # attribute: return but do not consume.
+            return ''
+        # Return value description can be several lines, some of them possibly
+        # empty, and it stops when another subsection title is met.
+        ret = ''
+        while True:
+            self.line = self.reader.readline()
+            if self.line == ' *\n':
+                ret += '\n'
+            else:
+                p = re.compile(' \* ?(?:\t| {5,8})(?:\t| {8})(.*)')
+                capture = p.match(self.line)
+                if capture:
+                    ret += capture.group(1) + '\n'
+                else:
+                    break
+        return ret
+    def run(self):
+        # Advance to start of helper function descriptions.
+        offset = self.reader.read().find('* Start of BPF helper function descriptions:')
+        if offset == -1:
+            raise Exception('Could not find start of eBPF helper descriptions list')
+        self.reader.seek(offset)
+        self.reader.readline()
+        self.reader.readline()
+        self.line = self.reader.readline()
+        while True:
+            try:
+                helper = self.parse_helper()
+                self.helpers.append(helper)
+            except NoHelperFound:
+                break
+        self.reader.close()
+        print('Parsed description of %d helper function(s)' % len(self.helpers),
+              file=sys.stderr)
+###############################################################################
+class Printer(object):
+    """
+    A generic class for printers. Printers should be created with an array of
+    Helper objects, and implement a way to print them in the desired fashion.
+    @helpers: array of Helper objects to print to standard output
+    """
+    def __init__(self, helpers):
+        self.helpers = helpers
+    def print_header(self):
+        pass
+    def print_footer(self):
+        pass
+    def print_one(self, helper):
+        pass
+    def print_all(self):
+        self.print_header()
+        for helper in self.helpers:
+            self.print_one(helper)
+        self.print_footer()
+class PrinterRST(Printer):
+    """
+    A printer for dumping collected information about helpers as a ReStructured
+    Text page compatible with the rst2man program, which can be used to
+    generate a manual page for the helpers.
+    @helpers: array of Helper objects to print to standard output
+    """
+    def print_header(self):
+        header = '''\
+.. Copyright (C) All BPF authors and contributors from 2014 to present.
+.. See git log include/uapi/linux/bpf.h in kernel tree for details.
+.. 
+.. %%%LICENSE_START(VERBATIM)
+.. Permission is granted to make and distribute verbatim copies of this
+.. manual provided the copyright notice and this permission notice are
+.. preserved on all copies.
+.. 
+.. Permission is granted to copy and distribute modified versions of this
+.. manual under the conditions for verbatim copying, provided that the
+.. entire resulting derived work is distributed under the terms of a
+.. permission notice identical to this one.
+.. 
+.. Since the Linux kernel and libraries are constantly changing, this
+.. manual page may be incorrect or out-of-date.  The author(s) assume no
+.. responsibility for errors or omissions, or for damages resulting from
+.. the use of the information contained herein.  The author(s) may not
+.. have taken the same level of care in the production of this manual,
+.. which is licensed free of charge, as they might when working
+.. professionally.
+.. 
+.. Formatted or processed versions of this manual, if unaccompanied by
+.. the source, must acknowledge the copyright and authors of this work.
+.. %%%LICENSE_END
+.. 
+.. Please do not edit this file. It was generated from the documentation
+.. located in file include/uapi/linux/bpf.h of the Linux kernel sources
+.. (helpers description), and from scripts/bpf_helpers_doc.py in the same
+.. repository (header and footer).
+===========
+BPF-HELPERS
+===========
+-------------------------------------------------------------------------------
+list of eBPF helper functions
+-------------------------------------------------------------------------------
+:Manual section: 7
+DESCRIPTION
+===========
+The extended Berkeley Packet Filter (eBPF) subsystem consists in programs
+written in a pseudo-assembly language, then attached to one of the several
+kernel hooks and run in reaction of specific events. This framework differs
+from the older, "classic" BPF (or "cBPF") in several aspects, one of them being
+the ability to call special functions (or "helpers") from within a program.
+These functions are restricted to a white-list of helpers defined in the
+kernel.
+These helpers are used by eBPF programs to interact with the system, or with
+the context in which they work. For instance, they can be used to print
+debugging messages, to get the time since the system was booted, to interact
+with eBPF maps, or to manipulate network packets. Since there are several eBPF
+program types, and that they do not run in the same context, each program type
+can only call a subset of those helpers.
+Due to eBPF conventions, a helper can not have more than five arguments.
+Internally, eBPF programs call directly into the compiled helper functions
+without requiring any foreign-function interface. As a result, calling helpers
+introduces no overhead, thus offering excellent performance.
+This document is an attempt to list and document the helpers available to eBPF
+developers. They are sorted by chronological order (the oldest helpers in the
+kernel at the top).
+HELPERS
+=======
+'''
+        print(header)
+    def print_footer(self):
+        footer = '''
+EXAMPLES
+========
+Example usage for most of the eBPF helpers listed in this manual page are
+available within the Linux kernel sources, at the following locations:
+* *samples/bpf/*
+* *tools/testing/selftests/bpf/*
+LICENSE
+=======
+eBPF programs can have an associated license, passed along with the bytecode
+instructions to the kernel when the programs are loaded. The format for that
+string is identical to the one in use for kernel modules (Dual licenses, such
+as "Dual BSD/GPL", may be used). Some helper functions are only accessible to
+programs that are compatible with the GNU Privacy License (GPL).
+In order to use such helpers, the eBPF program must be loaded with the correct
+license string passed (via **attr**) to the **bpf**\ () system call, and this
+generally translates into the C source code of the program containing a line
+similar to the following:
+::
+        char ____license[] __attribute__((section("license"), used)) = "GPL";
+IMPLEMENTATION
+==============
+This manual page is an effort to document the existing eBPF helper functions.
+But as of this writing, the BPF sub-system is under heavy development. New eBPF
+program or map types are added, along with new helper functions. Some helpers
+are occasionally made available for additional program types. So in spite of
+the efforts of the community, this page might not be up-to-date. If you want to
+check by yourself what helper functions exist in your kernel, or what types of
+programs they can support, here are some files among the kernel tree that you
+may be interested in:
+* *include/uapi/linux/bpf.h* is the main BPF header. It contains the full list
+  of all helper functions, as well as many other BPF definitions including most
+  of the flags, structs or constants used by the helpers.
+* *net/core/filter.c* contains the definition of most network-related helper
+  functions, and the list of program types from which they can be used.
+* *kernel/trace/bpf_trace.c* is the equivalent for most tracing program-related
+  helpers.
+* *kernel/bpf/verifier.c* contains the functions used to check that valid types
+  of eBPF maps are used with a given helper function.
+* *kernel/bpf/* directory contains other files in which additional helpers are
+  defined (for cgroups, sockmaps, etc.).
+Compatibility between helper functions and program types can generally be found
+in the files where helper functions are defined. Look for the **struct
+bpf_func_proto** objects and for functions returning them: these functions
+contain a list of helpers that a given program type can call. Note that the
+**default:** label of the **switch ... case** used to filter helpers can call
+other functions, themselves allowing access to additional helpers. The
+requirement for GPL license is also in those **struct bpf_func_proto**.
+Compatibility between helper functions and map types can be found in the
+**check_map_func_compatibility**\ () function in file *kernel/bpf/verifier.c*.
+Helper functions that invalidate the checks on **data** and **data_end**
+pointers for network processing are listed in function
+**bpf_helper_changes_pkt_data**\ () in file *net/core/filter.c*.
+SEE ALSO
+========
+**bpf**\ (2),
+**cgroups**\ (7),
+**ip**\ (8),
+**perf_event_open**\ (2),
+**sendmsg**\ (2),
+**socket**\ (7),
+**tc-bpf**\ (8)'''
+        print(footer)
+    def print_proto(self, helper):
+        """
+        Format function protocol with bold and italics markers. This makes RST
+        file less readable, but gives nice results in the manual page.
+        """
+        proto = helper.proto_break_down()
+        print('**%s %s%s(' % (proto['ret_type'],
+                              proto['ret_star'].replace('*', '\\*'),
+                              proto['name']),
+              end='')
+        comma = ''
+        for a in proto['args']:
+            one_arg = '{}{}'.format(comma, a['type'])
+            if a['name']:
+                if a['star']:
+                    one_arg += ' {}**\ '.format(a['star'].replace('*', '\\*'))
+                else:
+                    one_arg += '** '
+                one_arg += '*{}*\\ **'.format(a['name'])
+            comma = ', '
+            print(one_arg, end='')
+        print(')**')
+    def print_one(self, helper):
+        self.print_proto(helper)
+        if (helper.desc):
+            print('\tDescription')
+            # Do not strip all newline characters: formatted code at the end of
+            # a section must be followed by a blank line.
+            for line in re.sub('\n$', '', helper.desc, count=1).split('\n'):
+                print('{}{}'.format('\t\t' if line else '', line))
+        if (helper.ret):
+            print('\tReturn')
+            for line in helper.ret.rstrip().split('\n'):
+                print('{}{}'.format('\t\t' if line else '', line))
+        print('')
+###############################################################################
+# If script is launched from scripts/ from kernel tree and can access
+# ../include/uapi/linux/bpf.h, use it as a default name for the file to parse,
+# otherwise the --filename argument will be required from the command line.
+script = os.path.abspath(sys.argv[0])
+linuxRoot = os.path.dirname(os.path.dirname(script))
+bpfh = os.path.join(linuxRoot, 'include/uapi/linux/bpf.h')
+argParser = argparse.ArgumentParser(description="""
+Parse eBPF header file and generate documentation for eBPF helper functions.
+The RST-formatted output produced can be turned into a manual page with the
+rst2man utility.
+""")
+if (os.path.isfile(bpfh)):
+    argParser.add_argument('--filename', help='path to include/uapi/linux/bpf.h',
+                           default=bpfh)
+else:
+    argParser.add_argument('--filename', help='path to include/uapi/linux/bpf.h')
+args = argParser.parse_args()
+# Parse file.
+headerParser = HeaderParser(args.filename)
+headerParser.run()
+# Print formatted output to standard output.
+printer = PrinterRST(headerParser.helpers)
+printer.print_all()
diff --git a/scripts/cc-can-link.sh b/scripts/cc-can-link.sh
new file mode 100755
index 000000000000..6efcead31989
--- /dev/null
+++ b/scripts/cc-can-link.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
+cat << "END" | $@ -x c - -o /dev/null >/dev/null 2>&1
+#include <stdio.h>
+int main(void)
+{
+        printf("");
+        return 0;
+}
+END
diff --git a/scripts/check_00index.sh b/scripts/check_00index.sh
deleted file mode 100755
index aa47f5926c80..000000000000
--- a/scripts/check_00index.sh
+++ /dev/null
@@ -1,67 +0,0 @@
-#!/bin/bash
-# SPDX-License-Identifier: GPL-2.0
-cd Documentation/
-# Check entries that should be removed
-obsolete=""
-for i in $(tail -n +12 00-INDEX |grep -E '^[a-zA-Z0-9]+'); do
-        if [ ! -e $i ]; then
-                obsolete="$obsolete $i"
-        fi
-done
-# Check directory entries that should be added
-search=""
-dir=""
-for i in $(find . -maxdepth 1 -type d); do
-        if [ "$i" != "." ]; then
-                new=$(echo $i|perl -ne 's,./(.*),$1/,; print $_')
-                search="$search $new"
-        fi
-done
-for i in $search; do
-        if [ "$(grep -P "^$i" 00-INDEX)" == "" ]; then
-                dir="$dir $i"
-        fi
-done
-# Check file entries that should be added
-search=""
-file=""
-for i in $(find . -maxdepth 1 -type f); do
-        if [ "$i" != "./.gitignore" ]; then
-                new=$(echo $i|perl -ne 's,./(.*),$1,; print $_')
-                search="$search $new"
-        fi
-done
-for i in $search; do
-        if [ "$(grep -P "^$i\$" 00-INDEX)" == "" ]; then
-                file="$file $i"
-        fi
-done
-# Output its findings
-echo -e "Documentation/00-INDEX check results:\n"
-if [ "$obsolete" != "" ]; then
-        echo -e "- Should remove those entries:\n\t$obsolete\n"
-else
-        echo -e "- No obsolete entries\n"
-fi
-if [ "$dir" != "" ]; then
-        echo -e "- Should document those directories:\n\t$dir\n"
-else
-        echo -e "- No new directories to add\n"
-fi
-if [ "$file" != "" ]; then
-        echo -e "- Should document those files:\n\t$file"
-else
-        echo "- No new files to add"
-fi
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 3d4040322ae1..c883ec55654f 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -1,9 +1,11 @@
 #!/usr/bin/env perl
+# SPDX-License-Identifier: GPL-2.0
+#
 # (c) 2001, Dave Jones. (the file handling bit)
 # (c) 2005, Joel Schopp <jschopp@austin.ibm.com> (the ugly bit)
 # (c) 2007,2008, Andy Whitcroft <apw@uk.ibm.com> (new conditions, test suite)
 # (c) 2008-2010 Andy Whitcroft <apw@canonical.com>
-# Licensed under the terms of the GNU GPL License version 2
+# (c) 2010-2018 Joe Perches <joe@perches.com>
 use strict;
 use warnings;
@@ -11,6 +13,7 @@ use POSIX;
 use File::Basename;
 use Cwd 'abs_path';
 use Term::ANSIColor qw(:constants);
+use Encode qw(decode encode);
 my $P = $0;
 my $D = dirname(abs_path($P));
@@ -238,11 +241,11 @@ $check_orig = $check;
 my $exit = 0;
+my $perl_version_ok = 1;
 if ($^V && $^V lt $minimum_perl_version) {
+        $perl_version_ok = 0;
        printf "$P: requires at least perl version %vd\n", $minimum_perl_version;
-        if (!$ignore_perl_version) {
+        exit(1) if (!$ignore_perl_version);
-                exit(1);
-        }
 }
 #if no filenames are given, push '-' to read patch from stdin
@@ -344,9 +347,10 @@ our $Sparse	= qr{
                        __force|
                        __iomem|
                        __must_check|
-                        __init_refok|
                        __kprobes|
                        __ref|
+                        __refconst|
+                        __refdata|
                        __rcu|
                        __private
                }x;
@@ -376,6 +380,7 @@ our $Attribute	= qr{
                        __noclone|
                        __deprecated|
                        __read_mostly|
+                        __ro_after_init|
                        __kprobes|
                        $InitAttribute|
                        ____cacheline_aligned|
@@ -791,7 +796,8 @@ our $FuncArg = qr{$Typecast{0,1}($LvalOrFunc|$Constant|$String)};
 our $declaration_macros = qr{(?x:
        (?:$Storage\s+)?(?:[A-Z_][A-Z0-9]*_){0,2}(?:DEFINE|DECLARE)(?:_[A-Z0-9]+){1,6}\s*\(|
        (?:$Storage\s+)?[HLP]?LIST_HEAD\s*\(|
-        (?:$Storage\s+)?${Type}\s+uninitialized_var\s*\(
+        (?:$Storage\s+)?${Type}\s+uninitialized_var\s*\(|
+        (?:SKCIPHER_REQUEST|SHASH_DESC|AHASH_REQUEST)_ON_STACK\s*\(
 )};
 sub deparenthesize {
@@ -844,6 +850,17 @@ sub is_maintained_obsolete {
        return $status =~ /obsolete/i;
 }
+sub is_SPDX_License_valid {
+        my ($license) = @_;
+        return 1 if (!$tree || which("python") eq "" || !(-e "$root/scripts/spdxcheck.py") || !(-e "$root/.git"));
+        my $root_path = abs_path($root);
+        my $status = `cd "$root_path"; echo "$license" | python scripts/spdxcheck.py -`;
+        return 0 if ($status ne "");
+        return 1;
+}
 my $camelcase_seeded = 0;
 sub seed_camelcase_includes {
        return if ($camelcase_seeded);
@@ -1023,11 +1040,11 @@ if (!$quiet) {
        hash_show_words(\%use_type, "Used");
        hash_show_words(\%ignore_type, "Ignored");
-        if ($^V lt 5.10.0) {
+        if (!$perl_version_ok) {
                print << "EOM"
 NOTE: perl $^V is not modern enough to detect all possible issues.
-      An upgrade to at least perl v5.10.0 is suggested.
+      An upgrade to at least perl $minimum_perl_version is suggested.
 EOM
        }
        if ($exit) {
@@ -1075,7 +1092,7 @@ sub parse_email {
        } elsif ($formatted_email =~ /(\S+\@\S+)(.*)$/) {
                $address = $1;
                $comment = $2 if defined $2;
-                $formatted_email =~ s/$address.*$//;
+                $formatted_email =~ s/\Q$address\E.*$//;
                $name = $formatted_email;
                $name = trim($name);
                $name =~ s/^\"|\"$//g;
@@ -1217,7 +1234,7 @@ sub sanitise_line {
        for ($off = 1; $off < length($line); $off++) {
                $c = substr($line, $off, 1);
-                # Comments we are wacking completly including the begin
+                # Comments we are whacking completely including the begin
                # and end, all to $;.
                if ($sanitise_quote eq '' && substr($line, $off, 2) eq '/*') {
                        $sanitise_quote = '*/';
@@ -1297,6 +1314,7 @@ sub sanitise_line {
 sub get_quoted_string {
        my ($line, $rawline) = @_;
+        return "" if (!defined($line) || !defined($rawline));
        return "" if ($line !~ m/($String)/g);
        return substr($rawline, $-[0], $+[0] - $-[0]);
 }
@@ -1644,6 +1662,28 @@ sub raw_line {
        return $line;
 }
+sub get_stat_real {
+        my ($linenr, $lc) = @_;
+        my $stat_real = raw_line($linenr, 0);
+        for (my $count = $linenr + 1; $count <= $lc; $count++) {
+                $stat_real = $stat_real . "\n" . raw_line($count, 0);
+        }
+        return $stat_real;
+}
+sub get_stat_here {
+        my ($linenr, $cnt, $here) = @_;
+        my $herectx = $here . "\n";
+        for (my $n = 0; $n < $cnt; $n++) {
+                $herectx .= raw_line($linenr, $n) . "\n";
+        }
+        return $herectx;
+}
 sub cat_vet {
        my ($vet) = @_;
        my ($res, $coded);
@@ -2209,10 +2249,14 @@ sub process {
        our $clean = 1;
        my $signoff = 0;
+        my $author = '';
+        my $authorsignoff = 0;
        my $is_patch = 0;
+        my $is_binding_patch = -1;
        my $in_header_lines = $file ? 0 : 1;
        my $in_commit_log = 0;          #Scanning lines before patch
        my $has_commit_log = 0;         #Encountered lines before patch
+        my $commit_log_lines = 0;       #Number of commit log lines
        my $commit_log_possible_stack_dump = 0;
        my $commit_log_long_line = 0;
        my $commit_log_has_diff = 0;
@@ -2257,6 +2301,8 @@ sub process {
        my $camelcase_file_seeded = 0;
+        my $checklicenseline = 1;
        sanitise_line_reset();
        my $line;
        foreach my $rawline (@rawlines) {
@@ -2349,6 +2395,14 @@ sub process {
                my $rawline = $rawlines[$linenr - 1];
+# check if it's a mode change, rename or start of a patch
+                if (!$in_commit_log &&
+                    ($line =~ /^ mode change [0-7]+ => [0-7]+ \S+\s*$/ ||
+                    ($line =~ /^rename (?:from|to) \S+\s*$/ ||
+                     $line =~ /^diff --git a\/[\w\/\.\_\-]+ b\/\S+\s*$/))) {
+                        $is_patch = 1;
+                }
 #extract the line range in the file after the patch is applied
                if (!$in_commit_log &&
                    $line =~ /^\@\@ -\d+(?:,\d+)? \+(\d+)(,(\d+))? \@\@(.*)/) {
@@ -2448,6 +2502,20 @@ sub process {
                        } else {
                                $check = $check_orig;
                        }
+                        $checklicenseline = 1;
+                        if ($realfile !~ /^MAINTAINERS/) {
+                                my $last_binding_patch = $is_binding_patch;
+                                $is_binding_patch = () = $realfile =~ m@^(?:Documentation/devicetree/|include/dt-bindings/)@;
+                                if (($last_binding_patch != -1) &&
+                                    ($last_binding_patch ^ $is_binding_patch)) {
+                                        WARN("DT_SPLIT_BINDING_PATCH",
+                                             "DT binding docs and includes should be a separate patch. See: Documentation/devicetree/bindings/submitting-patches.txt\n");
+                                }
+                        }
                        next;
                }
@@ -2459,6 +2527,18 @@ sub process {
                $cnt_lines++ if ($realcnt != 0);
+# Verify the existence of a commit log if appropriate
+# 2 is used because a $signature is counted in $commit_log_lines
+                if ($in_commit_log) {
+                        if ($line !~ /^\s*$/) {
+                                $commit_log_lines++;    #could be a $signature
+                        }
+                } elsif ($has_commit_log && $commit_log_lines < 2) {
+                        WARN("COMMIT_MESSAGE",
+                             "Missing commit description - Add an appropriate one\n");
+                        $commit_log_lines = 2;  #warn only once
+                }
 # Check if the commit log has what seems like a diff which can confuse patch
                if ($in_commit_log && !$commit_log_has_diff &&
                    (($line =~ m@^\s+diff\b.*a/[\w/]+@ &&
@@ -2480,10 +2560,24 @@ sub process {
                        }
                }
+# Check the patch for a From:
+                if (decode("MIME-Header", $line) =~ /^From:\s*(.*)/) {
+                        $author = $1;
+                        $author = encode("utf8", $author) if ($line =~ /=\?utf-8\?/i);
+                        $author =~ s/"//g;
+                }
 # Check the patch for a signoff:
                if ($line =~ /^\s*signed-off-by:/i) {
                        $signoff++;
                        $in_commit_log = 0;
+                        if ($author ne '') {
+                                my $l = $line;
+                                $l =~ s/"//g;
+                                if ($l =~ /^\s*signed-off-by:\s*\Q$author\E/i) {
+                                    $authorsignoff = 1;
+                                }
+                        }
                }
 # Check if MAINTAINERS is being updated.  If so, there's probably no need to
@@ -2569,12 +2663,6 @@ sub process {
                             "A patch subject line should describe the change not the tool that found it\n" . $herecurr);
                }
-# Check for old stable address
-                if ($line =~ /^\s*cc:\s*.*<?\bstable\@kernel\.org\b>?.*$/i) {
-                        ERROR("STABLE_ADDRESS",
-                              "The 'stable' address should be 'stable\@vger.kernel.org'\n" . $herecurr);
-                }
 # Check for unwanted Gerrit info
                if ($in_commit_log && $line =~ /^\s*change-id:/i) {
                        ERROR("GERRIT_CHANGE_ID",
@@ -2797,7 +2885,10 @@ sub process {
 # Only applies when adding the entry originally, after that we do not have
 # sufficient context to determine whether it is indeed long enough.
                if ($realfile =~ /Kconfig/ &&
-                    $line =~ /^\+\s*config\s+/) {
+                    # 'choice' is usually the last thing on the line (though
+                    # Kconfig supports named choices), so use a word boundary
+                    # (\b) rather than a whitespace character (\s)
+                    $line =~ /^\+\s*(?:config|menuconfig|choice)\b/) {
                        my $length = 0;
                        my $cnt = $realcnt;
                        my $ln = $linenr + 1;
@@ -2812,9 +2903,13 @@ sub process {
                                next if ($f =~ /^-/);
                                last if (!$file && $f =~ /^\@\@/);
-                                if ($lines[$ln - 1] =~ /^\+\s*(?:bool|tristate)\s*\"/) {
+                                if ($lines[$ln - 1] =~ /^\+\s*(?:bool|tristate|prompt)\s*["']/) {
                                        $is_start = 1;
-                                } elsif ($lines[$ln - 1] =~ /^\+\s*(?:---)?help(?:---)?$/) {
+                                } elsif ($lines[$ln - 1] =~ /^\+\s*(?:help|---help---)\s*$/) {
+                                        if ($lines[$ln - 1] =~ "---help---") {
+                                                WARN("CONFIG_DESCRIPTION",
+                                                     "prefer 'help' over '---help---' for new help texts\n" . $herecurr);
+                                        }
                                        $length = -1;
                                }
@@ -2822,7 +2917,13 @@ sub process {
                                $f =~ s/#.*//;
                                $f =~ s/^\s+//;
                                next if ($f =~ /^$/);
-                                if ($f =~ /^\s*config\s/) {
+                                # This only checks context lines in the patch
+                                # and so hopefully shouldn't trigger false
+                                # positives, even though some of these are
+                                # common words in help texts
+                                if ($f =~ /^\s*(?:config|menuconfig|choice|endchoice|
+                                                  if|endif|menu|endmenu|source)\b/x) {
                                        $is_end = 1;
                                        last;
                                }
@@ -2898,6 +2999,36 @@ sub process {
                        }
                }
+# check for using SPDX license tag at beginning of files
+                if ($realline == $checklicenseline) {
+                        if ($rawline =~ /^[ \+]\s*\#\!\s*\//) {
+                                $checklicenseline = 2;
+                        } elsif ($rawline =~ /^\+/) {
+                                my $comment = "";
+                                if ($realfile =~ /\.(h|s|S)$/) {
+                                        $comment = '/*';
+                                } elsif ($realfile =~ /\.(c|dts|dtsi)$/) {
+                                        $comment = '//';
+                                } elsif (($checklicenseline == 2) || $realfile =~ /\.(sh|pl|py|awk|tc)$/) {
+                                        $comment = '#';
+                                } elsif ($realfile =~ /\.rst$/) {
+                                        $comment = '..';
+                                }
+                                if ($comment !~ /^$/ &&
+                                    $rawline !~ /^\+\Q$comment\E SPDX-License-Identifier: /) {
+                                         WARN("SPDX_LICENSE_TAG",
+                                              "Missing or malformed SPDX-License-Identifier tag in line $checklicenseline\n" . $herecurr);
+                                } elsif ($rawline =~ /(SPDX-License-Identifier: .*)/) {
+                                         my $spdx_license = $1;
+                                         if (!is_SPDX_License_valid($spdx_license)) {
+                                                  WARN("SPDX_LICENSE_TAG",
+                                                       "'$spdx_license' is not supported in LICENSES/...\n" . $herecurr);
+                                         }
+                                }
+                        }
+                }
 # check we are in a valid source file if not then ignore this hunk
                next if ($realfile !~ /\.(h|c|s|S|sh|dtsi|dts)$/);
@@ -2969,20 +3100,6 @@ sub process {
                             "adding a line without newline at end of file\n" . $herecurr);
                }
-# Blackfin: use hi/lo macros
-                if ($realfile =~ m@arch/blackfin/.*\.S$@) {
-                        if ($line =~ /\.[lL][[:space:]]*=.*&[[:space:]]*0x[fF][fF][fF][fF]/) {
-                                my $herevet = "$here\n" . cat_vet($line) . "\n";
-                                ERROR("LO_MACRO",
-                                      "use the LO() macro, not (... & 0xFFFF)\n" . $herevet);
-                        }
-                        if ($line =~ /\.[hH][[:space:]]*=.*>>[[:space:]]*16/) {
-                                my $herevet = "$here\n" . cat_vet($line) . "\n";
-                                ERROR("HI_MACRO",
-                                      "use the HI() macro, not (... >> 16)\n" . $herevet);
-                        }
-                }
 # check we are in a valid source file C or perl if not then ignore this hunk
                next if ($realfile !~ /\.(h|c|pl|dtsi|dts)$/);
@@ -3012,6 +3129,12 @@ sub process {
                        }
                }
+# check for assignments on the start of a line
+                if ($sline =~ /^\+\s+($Assignment)[^=]/) {
+                        CHK("ASSIGNMENT_CONTINUATIONS",
+                            "Assignment operator '$1' should be on the previous line\n" . $hereprev);
+                }
 # check for && or || at the start of a line
                if ($rawline =~ /^\+\s*(&&|\|\|)/) {
                        CHK("LOGICAL_CONTINUATIONS",
@@ -3019,7 +3142,7 @@ sub process {
                }
 # check indentation starts on a tab stop
-                if ($^V && $^V ge 5.10.0 &&
+                if ($perl_version_ok &&
                    $sline =~ /^\+\t+( +)(?:$c90_Keywords\b|\{\s*$|\}\s*(?:else\b|while\b|\s*$)|$Declare\s*$Ident\s*[;=])/) {
                        my $indent = length($1);
                        if ($indent % 8) {
@@ -3032,7 +3155,7 @@ sub process {
                }
 # check multi-line statement indentation matches previous line
-                if ($^V && $^V ge 5.10.0 &&
+                if ($perl_version_ok &&
                    $prevline =~ /^\+([ \t]*)((?:$c90_Keywords(?:\s+if)\s*)|(?:$Declare\s*)?(?:$Ident|\(\s*\*\s*$Ident\s*\))\s*|(?:\*\s*)*$Lval\s*=\s*$Ident\s*)\(.*(\&\&|\|\||,)\s*$/) {
                        $prevline =~ /^\+(\t*)(.*)$/;
                        my $oldindent = $1;
@@ -3189,7 +3312,7 @@ sub process {
                        # known declaration macros
                      $sline =~ /^\+\s+$declaration_macros/ ||
                        # start of struct or union or enum
-                      $sline =~ /^\+\s+(?:union|struct|enum|typedef)\b/ ||
+                      $sline =~ /^\+\s+(?:static\s+)?(?:const\s+)?(?:union|struct|enum|typedef)\b/ ||
                        # start or end of block or continuation of declaration
                      $sline =~ /^\+\s+(?:$|[\{\}\.\#\"\?\:\(\[])/ ||
                        # bitfield continuation
@@ -3269,18 +3392,6 @@ sub process {
                             "CVS style keyword markers, these will _not_ be updated\n". $herecurr);
                }
-# Blackfin: don't use __builtin_bfin_[cs]sync
-                if ($line =~ /__builtin_bfin_csync/) {
-                        my $herevet = "$here\n" . cat_vet($line) . "\n";
-                        ERROR("CSYNC",
-                              "use the CSYNC() macro in asm/blackfin.h\n" . $herevet);
-                }
-                if ($line =~ /__builtin_bfin_ssync/) {
-                        my $herevet = "$here\n" . cat_vet($line) . "\n";
-                        ERROR("SSYNC",
-                              "use the SSYNC() macro in asm/blackfin.h\n" . $herevet);
-                }
 # check for old HOTPLUG __dev<foo> section markings
                if ($line =~ /\b(__dev(init|exit)(data|const|))\b/) {
                        WARN("HOTPLUG_SECTION",
@@ -3733,6 +3844,26 @@ sub process {
                             "type '$tmp' should be specified in [[un]signed] [short|int|long|long long] order\n" . $herecurr);
                }
+# check for unnecessary <signed> int declarations of short/long/long long
+                while ($sline =~ m{\b($TypeMisordered(\s*\*)*|$C90_int_types)\b}g) {
+                        my $type = trim($1);
+                        next if ($type !~ /\bint\b/);
+                        next if ($type !~ /\b(?:short|long\s+long|long)\b/);
+                        my $new_type = $type;
+                        $new_type =~ s/\b\s*int\s*\b/ /;
+                        $new_type =~ s/\b\s*(?:un)?signed\b\s*/ /;
+                        $new_type =~ s/^const\s+//;
+                        $new_type = "unsigned $new_type" if ($type =~ /\bunsigned\b/);
+                        $new_type = "const $new_type" if ($type =~ /^const\b/);
+                        $new_type =~ s/\s+/ /g;
+                        $new_type = trim($new_type);
+                        if (WARN("UNNECESSARY_INT",
+                                 "Prefer '$new_type' over '$type' as the int is unnecessary\n" . $herecurr) &&
+                            $fix) {
+                                $fixed[$fixlinenr] =~ s/\b\Q$type\E\b/$new_type/;
+                        }
+                }
 # check for static const char * arrays.
                if ($line =~ /\bstatic\s+const\s+char\s*\*\s*(\w+)\s*\[\s*\]\s*=\s*/) {
                        WARN("STATIC_CONST_CHAR_ARRAY",
@@ -3919,7 +4050,7 @@ sub process {
 # function brace can't be on same line, except for #defines of do while,
 # or if closed on same line
-                if ($^V && $^V ge 5.10.0 &&
+                if ($perl_version_ok &&
                    $sline =~ /$Type\s*$Ident\s*$balanced_parens\s*\{/ &&
                    $sline !~ /\#\s*define\b.*do\s*\{/ &&
                    $sline !~ /}/) {
@@ -4045,7 +4176,7 @@ sub process {
                        my ($where, $prefix) = ($-[1], $1);
                        if ($prefix !~ /$Type\s+$/ &&
                            ($where != 0 || $prefix !~ /^.\s+$/) &&
-                            $prefix !~ /[{,]\s+$/) {
+                            $prefix !~ /[{,:]\s+$/) {
                                if (ERROR("BRACKET_SPACE",
                                          "space prohibited before open square bracket '['\n" . $herecurr) &&
                                    $fix) {
@@ -4435,11 +4566,11 @@ sub process {
 #need space before brace following if, while, etc
                if (($line =~ /\(.*\)\{/ && $line !~ /\($Type\)\{/) ||
-                    $line =~ /do\{/) {
+                    $line =~ /\b(?:else|do)\{/) {
                        if (ERROR("SPACING",
                                  "space required before the open brace '{'\n" . $herecurr) &&
                            $fix) {
-                                $fixed[$fixlinenr] =~ s/^(\+.*(?:do|\)))\{/$1 {/;
+                                $fixed[$fixlinenr] =~ s/^(\+.*(?:do|else|\)))\{/$1 {/;
                        }
                }
@@ -4530,7 +4661,7 @@ sub process {
 # check for unnecessary parentheses around comparisons in if uses
 # when !drivers/staging or command-line uses --strict
                if (($realfile !~ m@^(?:drivers/staging/)@ || $check_orig) &&
-                    $^V && $^V ge 5.10.0 && defined($stat) &&
+                    $perl_version_ok && defined($stat) &&
                    $stat =~ /(^.\s*if\s*($balanced_parens))/) {
                        my $if_stat = $1;
                        my $test = substr($2, 1, -1);
@@ -4567,7 +4698,7 @@ sub process {
 # return is not a function
                if (defined($stat) && $stat =~ /^.\s*return(\s*)\(/s) {
                        my $spacing = $1;
-                        if ($^V && $^V ge 5.10.0 &&
+                        if ($perl_version_ok &&
                            $stat =~ /^.\s*return\s*($balanced_parens)\s*;\s*$/) {
                                my $value = $1;
                                $value = deparenthesize($value);
@@ -4594,7 +4725,7 @@ sub process {
               }
 # if statements using unnecessary parentheses - ie: if ((foo == bar))
-                if ($^V && $^V ge 5.10.0 &&
+                if ($perl_version_ok &&
                    $line =~ /\bif\s*((?:\(\s*){2,})/) {
                        my $openparens = $1;
                        my $count = $openparens =~ tr@\(@\(@;
@@ -4611,7 +4742,7 @@ sub process {
 #       avoid cases like "foo + BAR < baz"
 #       only fix matches surrounded by parentheses to avoid incorrect
 #       conversions like "FOO < baz() + 5" being "misfixed" to "baz() > FOO + 5"
-                if ($^V && $^V ge 5.10.0 &&
+                if ($perl_version_ok &&
                    $line =~ /^\+(.*)\b($Constant|[A-Z_][A-Z0-9_]*)\s*($Compare)\s*($LvalOrFunc)/) {
                        my $lead = $1;
                        my $const = $2;
@@ -4803,17 +4934,6 @@ sub process {
                while ($line =~ m{($Constant|$Lval)}g) {
                        my $var = $1;
-#gcc binary extension
-                        if ($var =~ /^$Binary$/) {
-                                if (WARN("GCC_BINARY_CONSTANT",
-                                         "Avoid gcc v4.3+ binary constant extension: <$var>\n" . $herecurr) &&
-                                    $fix) {
-                                        my $hexval = sprintf("0x%x", oct($var));
-                                        $fixed[$fixlinenr] =~
-                                            s/\b$var\b/$hexval/;
-                                }
-                        }
 #CamelCase
                        if ($var !~ /^$Constant$/ &&
                            $var =~ /[A-Z][a-z]|[a-z][A-Z]/ &&
@@ -4901,6 +5021,7 @@ sub process {
                        if (defined $define_args && $define_args ne "") {
                                $define_args = substr($define_args, 1, length($define_args) - 2);
                                $define_args =~ s/\s*//g;
+                                $define_args =~ s/\\\+?//g;
                                @def_args = split(",", $define_args);
                        }
@@ -4941,12 +5062,8 @@ sub process {
                        #print "REST<$rest> dstat<$dstat> ctx<$ctx>\n";
                        $ctx =~ s/\n*$//;
-                        my $herectx = $here . "\n";
                        my $stmt_cnt = statement_rawlines($ctx);
+                        my $herectx = get_stat_here($linenr, $stmt_cnt, $here);
-                        for (my $n = 0; $n < $stmt_cnt; $n++) {
-                                $herectx .= raw_line($linenr, $n) . "\n";
-                        }
                        if ($dstat ne '' &&
                            $dstat !~ /^(?:$Ident|-?$Constant),$/ &&                    # 10, // foo(),
@@ -5001,7 +5118,7 @@ sub process {
                                $tmp_stmt =~ s/\b(typeof|__typeof__|__builtin\w+|typecheck\s*\(\s*$Type\s*,|\#+)\s*\(*\s*$arg\s*\)*\b//g;
                                $tmp_stmt =~ s/\#+\s*$arg\b//g;
                                $tmp_stmt =~ s/\b$arg\s*\#\#//g;
-                                my $use_cnt = $tmp_stmt =~ s/\b$arg\b//g;
+                                my $use_cnt = () = $tmp_stmt =~ /\b$arg\b/g;
                                if ($use_cnt > 1) {
                                        CHK("MACRO_ARG_REUSE",
                                            "Macro argument reuse '$arg' - possible side-effects?\n" . "$herectx");
@@ -5018,12 +5135,9 @@ sub process {
 # check for macros with flow control, but without ## concatenation
 # ## concatenation is commonly a macro that defines a function so ignore those
                        if ($has_flow_statement && !$has_arg_concat) {
-                                my $herectx = $here . "\n";
                                my $cnt = statement_rawlines($ctx);
+                                my $herectx = get_stat_here($linenr, $cnt, $here);
-                                for (my $n = 0; $n < $cnt; $n++) {
-                                        $herectx .= raw_line($linenr, $n) . "\n";
-                                }
                                WARN("MACRO_WITH_FLOW_CONTROL",
                                     "Macros with flow control statements should be avoided\n" . "$herectx");
                        }
@@ -5043,7 +5157,7 @@ sub process {
 # do {} while (0) macro tests:
 # single-statement macros do not need to be enclosed in do while (0) loop,
 # macro should not end with a semicolon
-                if ($^V && $^V ge 5.10.0 &&
+                if ($perl_version_ok &&
                    $realfile !~ m@/vmlinux.lds.h$@ &&
                    $line =~ /^.\s*\#\s*define\s+$Ident(\()?/) {
                        my $ln = $linenr;
@@ -5063,11 +5177,7 @@ sub process {
                                $ctx =~ s/\n*$//;
                                my $cnt = statement_rawlines($ctx);
-                                my $herectx = $here . "\n";
+                                my $herectx = get_stat_here($linenr, $cnt, $here);
-                                for (my $n = 0; $n < $cnt; $n++) {
-                                        $herectx .= raw_line($linenr, $n) . "\n";
-                                }
                                if (($stmts =~ tr/;/;/) == 1 &&
                                    $stmts !~ /^\s*(if|while|for|switch)\b/) {
@@ -5081,27 +5191,13 @@ sub process {
                        } elsif ($dstat =~ /^\+\s*#\s*define\s+$Ident.*;\s*$/) {
                                $ctx =~ s/\n*$//;
                                my $cnt = statement_rawlines($ctx);
-                                my $herectx = $here . "\n";
+                                my $herectx = get_stat_here($linenr, $cnt, $here);
-                                for (my $n = 0; $n < $cnt; $n++) {
-                                        $herectx .= raw_line($linenr, $n) . "\n";
-                                }
                                WARN("TRAILING_SEMICOLON",
                                     "macros should not use a trailing semicolon\n" . "$herectx");
                        }
                }
-# make sure symbols are always wrapped with VMLINUX_SYMBOL() ...
-# all assignments may have only one of the following with an assignment:
-#       .
-#       ALIGN(...)
-#       VMLINUX_SYMBOL(...)
-                if ($realfile eq 'vmlinux.lds.h' && $line =~ /(?:(?:^|\s)$Ident\s*=|=\s*$Ident(?:\s|$))/) {
-                        WARN("MISSING_VMLINUX_SYMBOL",
-                             "vmlinux.lds.h needs VMLINUX_SYMBOL() around C-visible symbols\n" . $herecurr);
-                }
 # check for redundant bracing round if etc
                if ($line =~ /(^.*)\bif\b/ && $1 !~ /else\s*$/) {
                        my ($level, $endln, @chunks) =
@@ -5208,12 +5304,8 @@ sub process {
                                }
                        }
                        if ($level == 0 && $block =~ /^\s*\{/ && !$allowed) {
-                                my $herectx = $here . "\n";
                                my $cnt = statement_rawlines($block);
+                                my $herectx = get_stat_here($linenr, $cnt, $here);
-                                for (my $n = 0; $n < $cnt; $n++) {
-                                        $herectx .= raw_line($linenr, $n) . "\n";
-                                }
                                WARN("BRACES",
                                     "braces {} are not necessary for single statement blocks\n" . $herectx);
@@ -5311,15 +5403,28 @@ sub process {
                }
 # concatenated string without spaces between elements
-                if ($line =~ /$String[A-Z_]/ || $line =~ /[A-Za-z0-9_]$String/) {
+                if ($line =~ /$String[A-Za-z0-9_]/ || $line =~ /[A-Za-z0-9_]$String/) {
-                        CHK("CONCATENATED_STRING",
+                        if (CHK("CONCATENATED_STRING",
-                            "Concatenated strings should use spaces between elements\n" . $herecurr);
+                                "Concatenated strings should use spaces between elements\n" . $herecurr) &&
+                            $fix) {
+                                while ($line =~ /($String)/g) {
+                                        my $extracted_string = substr($rawline, $-[0], $+[0] - $-[0]);
+                                        $fixed[$fixlinenr] =~ s/\Q$extracted_string\E([A-Za-z0-9_])/$extracted_string $1/;
+                                        $fixed[$fixlinenr] =~ s/([A-Za-z0-9_])\Q$extracted_string\E/$1 $extracted_string/;
+                                }
+                        }
                }
 # uncoalesced string fragments
                if ($line =~ /$String\s*"/) {
-                        WARN("STRING_FRAGMENTS",
+                        if (WARN("STRING_FRAGMENTS",
-                             "Consecutive strings are generally better as a single string\n" . $herecurr);
+                                 "Consecutive strings are generally better as a single string\n" . $herecurr) &&
+                            $fix) {
+                                while ($line =~ /($String)(?=\s*")/g) {
+                                        my $extracted_string = substr($rawline, $-[0], $+[0] - $-[0]);
+                                        $fixed[$fixlinenr] =~ s/\Q$extracted_string\E\s*"/substr($extracted_string, 0, -1)/e;
+                                }
+                        }
                }
 # check for non-standard and hex prefixed decimal printf formats
@@ -5355,9 +5460,14 @@ sub process {
 # warn about #if 0
                if ($line =~ /^.\s*\#\s*if\s+0\b/) {
-                        CHK("REDUNDANT_CODE",
+                        WARN("IF_0",
-                            "if this code is redundant consider removing it\n" .
+                             "Consider removing the code enclosed by this #if 0 and its #endif\n" . $herecurr);
-                                $herecurr);
+                }
+# warn about #if 1
+                if ($line =~ /^.\s*\#\s*if\s+1\b/) {
+                        WARN("IF_1",
+                             "Consider removing the #if 1 and its #endif\n" . $herecurr);
                }
 # check for needless "if (<foo>) fn(<foo>)" uses
@@ -5428,7 +5538,7 @@ sub process {
                }
 # check for mask then right shift without a parentheses
-                if ($^V && $^V ge 5.10.0 &&
+                if ($perl_version_ok &&
                    $line =~ /$LvalOrFunc\s*\&\s*($LvalOrFunc)\s*>>/ &&
                    $4 !~ /^\&/) { # $LvalOrFunc may be &foo, ignore if so
                        WARN("MASK_THEN_SHIFT",
@@ -5436,7 +5546,7 @@ sub process {
                }
 # check for pointer comparisons to NULL
-                if ($^V && $^V ge 5.10.0) {
+                if ($perl_version_ok) {
                        while ($line =~ /\b$LvalOrFunc\s*(==|\!=)\s*NULL\b/g) {
                                my $val = $1;
                                my $equal = "!";
@@ -5708,7 +5818,7 @@ sub process {
                }
 # Check for __attribute__ weak, or __weak declarations (may have link issues)
-                if ($^V && $^V ge 5.10.0 &&
+                if ($perl_version_ok &&
                    $line =~ /(?:$Declare|$DeclareMisordered)\s*$Ident\s*$balanced_parens\s*(?:$Attribute)?\s*;/ &&
                    ($line =~ /\b__attribute__\s*\(\s*\(.*\bweak\b/ ||
                     $line =~ /\b__weak\b/)) {
@@ -5789,41 +5899,55 @@ sub process {
                        }
                }
-                # check for vsprintf extension %p<foo> misuses
+# check for vsprintf extension %p<foo> misuses
-                if ($^V && $^V ge 5.10.0 &&
+                if ($perl_version_ok &&
                    defined $stat &&
                    $stat =~ /^\+(?![^\{]*\{\s*).*\b(\w+)\s*\(.*$String\s*,/s &&
                    $1 !~ /^_*volatile_*$/) {
-                        my $bad_extension = "";
+                        my $stat_real;
                        my $lc = $stat =~ tr@\n@@;
                        $lc = $lc + $linenr;
                        for (my $count = $linenr; $count <= $lc; $count++) {
+                                my $specifier;
+                                my $extension;
+                                my $bad_specifier = "";
                                my $fmt = get_quoted_string($lines[$count - 1], raw_line($count, 0));
                                $fmt =~ s/%%//g;
-                                if ($fmt =~ /(\%[\*\d\.]*p(?![\WSsBKRraEhMmIiUDdgVCbGNOx]).)/) {
-                                        $bad_extension = $1;
+                                while ($fmt =~ /(\%[\*\d\.]*p(\w))/g) {
-                                        last;
+                                        $specifier = $1;
-                                }
+                                        $extension = $2;
-                        }
+                                        if ($extension !~ /[SsBKRraEhMmIiUDdgVCbGNOx]/) {
-                        if ($bad_extension ne "") {
+                                                $bad_specifier = $specifier;
-                                my $stat_real = raw_line($linenr, 0);
+                                                last;
-                                my $ext_type = "Invalid";
+                                        }
-                                my $use = "";
+                                        if ($extension eq "x" && !defined($stat_real)) {
-                                for (my $count = $linenr + 1; $count <= $lc; $count++) {
+                                                if (!defined($stat_real)) {
-                                        $stat_real = $stat_real . "\n" . raw_line($count, 0);
+                                                        $stat_real = get_stat_real($linenr, $lc);
+                                                }
+                                                WARN("VSPRINTF_SPECIFIER_PX",
+                                                     "Using vsprintf specifier '\%px' potentially exposes the kernel memory layout, if you don't really need the address please consider using '\%p'.\n" . "$here\n$stat_real\n");
+                                        }
                                }
-                                if ($bad_extension =~ /p[Ff]/) {
+                                if ($bad_specifier ne "") {
-                                        $ext_type = "Deprecated";
+                                        my $stat_real = get_stat_real($linenr, $lc);
-                                        $use = " - use %pS instead";
+                                        my $ext_type = "Invalid";
-                                        $use =~ s/pS/ps/ if ($bad_extension =~ /pf/);
+                                        my $use = "";
+                                        if ($bad_specifier =~ /p[Ff]/) {
+                                                $ext_type = "Deprecated";
+                                                $use = " - use %pS instead";
+                                                $use =~ s/pS/ps/ if ($bad_specifier =~ /pf/);
+                                        }
+                                        WARN("VSPRINTF_POINTER_EXTENSION",
+                                             "$ext_type vsprintf pointer extension '$bad_specifier'$use\n" . "$here\n$stat_real\n");
                                }
-                                WARN("VSPRINTF_POINTER_EXTENSION",
-                                     "$ext_type vsprintf pointer extension '$bad_extension'$use\n" . "$here\n$stat_real\n");
                        }
                }
 # Check for misused memsets
-                if ($^V && $^V ge 5.10.0 &&
+                if ($perl_version_ok &&
                    defined $stat &&
                    $stat =~ /^\+(?:.*?)\bmemset\s*\(\s*$FuncArg\s*,\s*$FuncArg\s*\,\s*$FuncArg\s*\)/) {
@@ -5841,7 +5965,7 @@ sub process {
                }
 # Check for memcpy(foo, bar, ETH_ALEN) that could be ether_addr_copy(foo, bar)
-#               if ($^V && $^V ge 5.10.0 &&
+#               if ($perl_version_ok &&
 #                   defined $stat &&
 #                   $stat =~ /^\+(?:.*?)\bmemcpy\s*\(\s*$FuncArg\s*,\s*$FuncArg\s*\,\s*ETH_ALEN\s*\)/) {
 #                       if (WARN("PREFER_ETHER_ADDR_COPY",
@@ -5852,7 +5976,7 @@ sub process {
 #               }
 # Check for memcmp(foo, bar, ETH_ALEN) that could be ether_addr_equal*(foo, bar)
-#               if ($^V && $^V ge 5.10.0 &&
+#               if ($perl_version_ok &&
 #                   defined $stat &&
 #                   $stat =~ /^\+(?:.*?)\bmemcmp\s*\(\s*$FuncArg\s*,\s*$FuncArg\s*\,\s*ETH_ALEN\s*\)/) {
 #                       WARN("PREFER_ETHER_ADDR_EQUAL",
@@ -5861,7 +5985,7 @@ sub process {
 # check for memset(foo, 0x0, ETH_ALEN) that could be eth_zero_addr
 # check for memset(foo, 0xFF, ETH_ALEN) that could be eth_broadcast_addr
-#               if ($^V && $^V ge 5.10.0 &&
+#               if ($perl_version_ok &&
 #                   defined $stat &&
 #                   $stat =~ /^\+(?:.*?)\bmemset\s*\(\s*$FuncArg\s*,\s*$FuncArg\s*\,\s*ETH_ALEN\s*\)/) {
 #
@@ -5883,7 +6007,7 @@ sub process {
 #               }
 # typecasts on min/max could be min_t/max_t
-                if ($^V && $^V ge 5.10.0 &&
+                if ($perl_version_ok &&
                    defined $stat &&
                    $stat =~ /^\+(?:.*?)\b(min|max)\s*\(\s*$FuncArg\s*,\s*$FuncArg\s*\)/) {
                        if (defined $2 || defined $7) {
@@ -5907,7 +6031,7 @@ sub process {
                }
 # check usleep_range arguments
-                if ($^V && $^V ge 5.10.0 &&
+                if ($perl_version_ok &&
                    defined $stat &&
                    $stat =~ /^\+(?:.*?)\busleep_range\s*\(\s*($FuncArg)\s*,\s*($FuncArg)\s*\)/) {
                        my $min = $1;
@@ -5923,7 +6047,7 @@ sub process {
                }
 # check for naked sscanf
-                if ($^V && $^V ge 5.10.0 &&
+                if ($perl_version_ok &&
                    defined $stat &&
                    $line =~ /\bsscanf\b/ &&
                    ($stat !~ /$Ident\s*=\s*sscanf\s*$balanced_parens/ &&
@@ -5931,24 +6055,18 @@ sub process {
                     $stat !~ /(?:$Compare)\s*\bsscanf\s*$balanced_parens/)) {
                        my $lc = $stat =~ tr@\n@@;
                        $lc = $lc + $linenr;
-                        my $stat_real = raw_line($linenr, 0);
+                        my $stat_real = get_stat_real($linenr, $lc);
-                        for (my $count = $linenr + 1; $count <= $lc; $count++) {
-                                $stat_real = $stat_real . "\n" . raw_line($count, 0);
-                        }
                        WARN("NAKED_SSCANF",
                             "unchecked sscanf return value\n" . "$here\n$stat_real\n");
                }
 # check for simple sscanf that should be kstrto<foo>
-                if ($^V && $^V ge 5.10.0 &&
+                if ($perl_version_ok &&
                    defined $stat &&
                    $line =~ /\bsscanf\b/) {
                        my $lc = $stat =~ tr@\n@@;
                        $lc = $lc + $linenr;
-                        my $stat_real = raw_line($linenr, 0);
+                        my $stat_real = get_stat_real($linenr, $lc);
-                        for (my $count = $linenr + 1; $count <= $lc; $count++) {
-                                $stat_real = $stat_real . "\n" . raw_line($count, 0);
-                        }
                        if ($stat_real =~ /\bsscanf\b\s*\(\s*$FuncArg\s*,\s*("[^"]+")/) {
                                my $format = $6;
                                my $count = $format =~ tr@%@%@;
@@ -6015,7 +6133,7 @@ sub process {
                }
 # check for function definitions
-                if ($^V && $^V ge 5.10.0 &&
+                if ($perl_version_ok &&
                    defined $stat &&
                    $stat =~ /^.\s*(?:$Storage\s+)?$Type\s*($Ident)\s*$balanced_parens\s*{/s) {
                        $context_function = $1;
@@ -6055,14 +6173,14 @@ sub process {
 # alloc style
 # p = alloc(sizeof(struct foo), ...) should be p = alloc(sizeof(*p), ...)
-                if ($^V && $^V ge 5.10.0 &&
+                if ($perl_version_ok &&
                    $line =~ /\b($Lval)\s*\=\s*(?:$balanced_parens)?\s*([kv][mz]alloc(?:_node)?)\s*\(\s*(sizeof\s*\(\s*struct\s+$Lval\s*\))/) {
                        CHK("ALLOC_SIZEOF_STRUCT",
                            "Prefer $3(sizeof(*$1)...) over $3($4...)\n" . $herecurr);
                }
 # check for k[mz]alloc with multiplies that could be kmalloc_array/kcalloc
-                if ($^V && $^V ge 5.10.0 &&
+                if ($perl_version_ok &&
                    defined $stat &&
                    $stat =~ /^\+\s*($Lval)\s*\=\s*(?:$balanced_parens)?\s*(k[mz]alloc)\s*\(\s*($FuncArg)\s*\*\s*($FuncArg)\s*,/) {
                        my $oldfunc = $3;
@@ -6078,12 +6196,9 @@ sub process {
                        }
                        if ($r1 !~ /^sizeof\b/ && $r2 =~ /^sizeof\s*\S/ &&
                            !($r1 =~ /^$Constant$/ || $r1 =~ /^[A-Z_][A-Z0-9_]*$/)) {
-                                my $ctx = '';
-                                my $herectx = $here . "\n";
                                my $cnt = statement_rawlines($stat);
-                                for (my $n = 0; $n < $cnt; $n++) {
+                                my $herectx = get_stat_here($linenr, $cnt, $here);
-                                        $herectx .= raw_line($linenr, $n) . "\n";
-                                }
                                if (WARN("ALLOC_WITH_MULTIPLY",
                                         "Prefer $newfunc over $oldfunc with multiply\n" . $herectx) &&
                                    $cnt == 1 &&
@@ -6094,8 +6209,9 @@ sub process {
                }
 # check for krealloc arg reuse
-                if ($^V && $^V ge 5.10.0 &&
+                if ($perl_version_ok &&
-                    $line =~ /\b($Lval)\s*\=\s*(?:$balanced_parens)?\s*krealloc\s*\(\s*\1\s*,/) {
+                    $line =~ /\b($Lval)\s*\=\s*(?:$balanced_parens)?\s*krealloc\s*\(\s*($Lval)\s*,/ &&
+                    $1 eq $3) {
                        WARN("KREALLOC_ARG_REUSE",
                             "Reusing the krealloc arg is almost always a bug\n" . $herecurr);
                }
@@ -6163,15 +6279,12 @@ sub process {
                }
 # check for switch/default statements without a break;
-                if ($^V && $^V ge 5.10.0 &&
+                if ($perl_version_ok &&
                    defined $stat &&
                    $stat =~ /^\+[$;\s]*(?:case[$;\s]+\w+[$;\s]*:[$;\s]*|)*[$;\s]*\bdefault[$;\s]*:[$;\s]*;/g) {
-                        my $ctx = '';
-                        my $herectx = $here . "\n";
                        my $cnt = statement_rawlines($stat);
-                        for (my $n = 0; $n < $cnt; $n++) {
+                        my $herectx = get_stat_here($linenr, $cnt, $here);
-                                $herectx .= raw_line($linenr, $n) . "\n";
-                        }
                        WARN("DEFAULT_NO_BREAK",
                             "switch default: should use break\n" . $herectx);
                }
@@ -6224,6 +6337,19 @@ sub process {
                        }
                }
+# check for bool bitfields
+                if ($sline =~ /^.\s+bool\s*$Ident\s*:\s*\d+\s*;/) {
+                        WARN("BOOL_BITFIELD",
+                             "Avoid using bool as bitfield.  Prefer bool bitfields as unsigned int or u<8|16|32>\n" . $herecurr);
+                }
+# check for bool use in .h files
+                if ($realfile =~ /\.h$/ &&
+                    $sline =~ /^.\s+bool\s*$Ident\s*(?::\s*d+\s*)?;/) {
+                        CHK("BOOL_MEMBER",
+                            "Avoid using bool structure members because of possible alignment issues - see: https://lkml.org/lkml/2017/11/21/384\n" . $herecurr);
+                }
 # check for semaphores initialized locked
                if ($line =~ /^.\s*sema_init.+,\W?0\W?\)/) {
                        WARN("CONSIDER_COMPLETION",
@@ -6270,7 +6396,7 @@ sub process {
                }
 # likely/unlikely comparisons similar to "(likely(foo) > 0)"
-                if ($^V && $^V ge 5.10.0 &&
+                if ($perl_version_ok &&
                    $line =~ /\b((?:un)?likely)\s*\(\s*$FuncArg\s*\)\s*$Compare/) {
                        WARN("LIKELY_MISUSE",
                             "Using $1 should generally have parentheses around the comparison\n" . $herecurr);
@@ -6313,7 +6439,7 @@ sub process {
 # check for DEVICE_ATTR uses that could be DEVICE_ATTR_<FOO>
 # and whether or not function naming is typical and if
 # DEVICE_ATTR permissions uses are unusual too
-                if ($^V && $^V ge 5.10.0 &&
+                if ($perl_version_ok &&
                    defined $stat &&
                    $stat =~ /\bDEVICE_ATTR\s*\(\s*(\w+)\s*,\s*\(?\s*(\s*(?:${multi_mode_perms_string_search}|0[0-7]{3,3})\s*)\s*\)?\s*,\s*(\w+)\s*,\s*(\w+)\s*\)/) {
                        my $var = $1;
@@ -6373,7 +6499,7 @@ sub process {
 #   specific definition of not visible in sysfs.
 # o Ignore proc_create*(...) uses with a decimal 0 permission as that means
 #   use the default permissions
-                if ($^V && $^V ge 5.10.0 &&
+                if ($perl_version_ok &&
                    defined $stat &&
                    $line =~ /$mode_perms_search/) {
                        foreach my $entry (@mode_permission_funcs) {
@@ -6382,10 +6508,7 @@ sub process {
                                my $lc = $stat =~ tr@\n@@;
                                $lc = $lc + $linenr;
-                                my $stat_real = raw_line($linenr, 0);
+                                my $stat_real = get_stat_real($linenr, $lc);
-                                for (my $count = $linenr + 1; $count <= $lc; $count++) {
-                                        $stat_real = $stat_real . "\n" . raw_line($count, 0);
-                                }
                                my $skip_args = "";
                                if ($arg_pos > 1) {
@@ -6411,7 +6534,7 @@ sub process {
                }
 # check for uses of S_<PERMS> that could be octal for readability
-                if ($line =~ /\b($multi_mode_perms_string_search)\b/) {
+                while ($line =~ m{\b($multi_mode_perms_string_search)\b}g) {
                        my $oval = $1;
                        my $octal = perms_to_octal($oval);
                        if (WARN("SYMBOLIC_PERMS",
@@ -6462,9 +6585,14 @@ sub process {
                ERROR("NOT_UNIFIED_DIFF",
                      "Does not appear to be a unified-diff format patch\n");
        }
-        if ($is_patch && $has_commit_log && $chk_signoff && $signoff == 0) {
+        if ($is_patch && $has_commit_log && $chk_signoff) {
-                ERROR("MISSING_SIGN_OFF",
+                if ($signoff == 0) {
-                      "Missing Signed-off-by: line(s)\n");
+                        ERROR("MISSING_SIGN_OFF",
+                              "Missing Signed-off-by: line(s)\n");
+                } elsif (!$authorsignoff) {
+                        WARN("NO_AUTHOR_SIGN_OFF",
+                             "Missing Signed-off-by: line by nominal patch author '$author'\n");
+                }
        }
        print report_dump();
diff --git a/scripts/checkstack.pl b/scripts/checkstack.pl
index cb993801e4b2..8081b6cf67d2 100755
--- a/scripts/checkstack.pl
+++ b/scripts/checkstack.pl
@@ -15,6 +15,7 @@
 #       M68k port by Geert Uytterhoeven and Andreas Schwab
 #       AArch64, PARISC ports by Kyle McMartin
 #       sparc port by Martin Habets <errandir_news@mph.eclipse.co.uk>
+#       ppc64le port by Breno Leitao <leitao@debian.org>
 #
 #       Usage:
 #       objdump -d vmlinux | scripts/checkstack.pl [arch]
@@ -64,10 +65,6 @@ my (@stack, $re, $dre, $x, $xs, $funcre);
                #    2b6c:       4e56 fb70       linkw %fp,#-1168
                #  1df770:       defc ffe4       addaw #-28,%sp
                $re = qr/.*(?:linkw %fp,|addaw )#-([0-9]{1,4})(?:,%sp)?$/o;
-        } elsif ($arch eq 'metag') {
-                #400026fc:       40 00 00 82     ADD       A0StP,A0StP,#0x8
-                $re = qr/.*ADD.*A0StP,A0StP,\#(0x$x{1,8})/o;
-                $funcre = qr/^$x* <[^\$](.*)>:$/;
        } elsif ($arch eq 'mips64') {
                #8800402c:       67bdfff0        daddiu  sp,sp,-16
                $re = qr/.*daddiu.*sp,sp,-(([0-9]{2}|[3-9])[0-9]{2})/o;
@@ -82,13 +79,9 @@ my (@stack, $re, $dre, $x, $xs, $funcre);
                $re = qr/.*l\.addi.*r1,r1,-(([0-9]{2}|[3-9])[0-9]{2})/o;
        } elsif ($arch eq 'parisc' || $arch eq 'parisc64') {
                $re = qr/.*ldo ($x{1,8})\(sp\),sp/o;
-        } elsif ($arch eq 'ppc') {
+        } elsif ($arch eq 'powerpc' || $arch =~ /^ppc(64)?(le)?$/ ) {
-                #c00029f4:       94 21 ff 30     stwu    r1,-208(r1)
+                # powerpc    : 94 21 ff 30     stwu    r1,-208(r1)
-                $re = qr/.*stwu.*r1,-($x{1,8})\(r1\)/o;
+                # ppc64(le)  : 81 ff 21 f8     stdu    r1,-128(r1)
-        } elsif ($arch eq 'ppc64') {
-                #XXX
-                $re = qr/.*stdu.*r1,-($x{1,8})\(r1\)/o;
-        } elsif ($arch eq 'powerpc') {
                $re = qr/.*st[dw]u.*r1,-($x{1,8})\(r1\)/o;
        } elsif ($arch =~ /^s390x?$/) {
                #   11160:       a7 fb ff 60             aghi   %r15,-160
@@ -102,9 +95,6 @@ my (@stack, $re, $dre, $x, $xs, $funcre);
                #     pair for larger users. -- PFM.
                #a00048e0:       d4fc40f0        addi.l  r15,-240,r15
                $re = qr/.*addi\.l.*r15,-(([0-9]{2}|[3-9])[0-9]{2}),r15/o;
-        } elsif ($arch =~ /^blackfin$/) {
-                #   0:   00 e8 38 01     LINK 0x4e0;
-                $re = qr/.*[[:space:]]LINK[[:space:]]*(0x$x{1,8})/o;
        } elsif ($arch eq 'sparc' || $arch eq 'sparc64') {
                # f0019d10:       9d e3 bf 90     save  %sp, -112, %sp
                $re = qr/.*save.*%sp, -(([0-9]{2}|[3-9])[0-9]{2}), %sp/o;
diff --git a/scripts/clang-version.sh b/scripts/clang-version.sh
new file mode 100755
index 000000000000..e65fbc3079d4
--- /dev/null
+++ b/scripts/clang-version.sh
@@ -0,0 +1,23 @@
+#!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
+#
+# clang-version [-p] clang-command
+#
+# Prints the compiler version of `clang-command' in a canonical 4-digit form
+# such as `0500' for clang-5.0 etc.
+#
+# With the -p option, prints the patchlevel as well, for example `050001' for
+# clang-5.0.1 etc.
+#
+compiler="$*"
+if ! ( $compiler --version | grep -q clang) ; then
+        echo 0
+        exit 1
+fi
+MAJOR=$(echo __clang_major__ | $compiler -E -x c - | tail -n 1)
+MINOR=$(echo __clang_minor__ | $compiler -E -x c - | tail -n 1)
+PATCHLEVEL=$(echo __clang_patchlevel__ | $compiler -E -x c - | tail -n 1)
+printf "%d%02d%02d\\n" $MAJOR $MINOR $PATCHLEVEL
diff --git a/scripts/coccicheck b/scripts/coccicheck
index 9fedca611b7f..e04d328210ac 100755
--- a/scripts/coccicheck
+++ b/scripts/coccicheck
@@ -128,9 +128,10 @@ run_cmd_parmap() {
        fi
        echo $@ >>$DEBUG_FILE
        $@ 2>>$DEBUG_FILE
-        if [[ $? -ne 0 ]]; then
+        err=$?
+        if [[ $err -ne 0 ]]; then
                echo "coccicheck failed"
-                exit $?
+                exit $err
        fi
 }
diff --git a/scripts/coccinelle/api/alloc/zalloc-simple.cocci b/scripts/coccinelle/api/alloc/zalloc-simple.cocci
index 92b20913055f..d819275b7fde 100644
--- a/scripts/coccinelle/api/alloc/zalloc-simple.cocci
+++ b/scripts/coccinelle/api/alloc/zalloc-simple.cocci
@@ -35,8 +35,7 @@ statement S;
 * x = (T)\(kmalloc(E1, ...)\|vmalloc(E1)\|dma_alloc_coherent(...,E1,...)\|
  kmalloc_node(E1, ...)\|kmem_cache_alloc(...)\|kmem_alloc(E1, ...)\|
-  devm_kmalloc(...,E1,...)\|kvmalloc(E1, ...)\|pci_alloc_consistent(...,E1,...)\|
+  devm_kmalloc(...,E1,...)\|kvmalloc(E1, ...)\|kvmalloc_node(E1,...)\);
-  kvmalloc_node(E1,...)\);
  if ((x==NULL) || ...) S
 * memset((T2)x,0,E1);
@@ -124,15 +123,6 @@ statement S;
 - x = (T)kvmalloc(E1,E2);
 + x = (T)kvzalloc(E1,E2);
 |
- x = pci_alloc_consistent(E2,E1,E3);
-+ x = pci_zalloc_consistent(E2,E1,E3);
-|
- x = (T *)pci_alloc_consistent(E2,E1,E3);
-+ x = pci_zalloc_consistent(E2,E1,E3);
-|
- x = (T)pci_alloc_consistent(E2,E1,E3);
-+ x = (T)pci_zalloc_consistent(E2,E1,E3);
-|
 - x = kvmalloc_node(E1,E2,E3);
 + x = kvzalloc_node(E1,E2,E3);
 |
@@ -389,35 +379,6 @@ msg="WARNING: kvzalloc should be used for %s, instead of kvmalloc/memset" % (x)
 coccilib.report.print_report(p[0], msg)
 //-----------------------------------------------------------------
-@r8 depends on org || report@
-type T, T2;
-expression x;
-expression E1,E2,E3;
-statement S;
-position p;
-@@
- x = (T)pci_alloc_consistent@p(E2,E1,E3);
- if ((x==NULL) || ...) S
- memset((T2)x,0,E1);
-@script:python depends on org@
-p << r8.p;
-x << r8.x;
-@@
-msg="%s" % (x)
-msg_safe=msg.replace("[","@(").replace("]",")")
-coccilib.org.print_todo(p[0], msg_safe)
-@script:python depends on report@
-p << r8.p;
-x << r8.x;
-@@
-msg="WARNING: pci_zalloc_consistent should be used for %s, instead of pci_alloc_consistent/memset" % (x)
-coccilib.report.print_report(p[0], msg)
-//-----------------------------------------------------------------
 @r9 depends on org || report@
 type T, T2;
 expression x;
diff --git a/scripts/coccinelle/api/atomic_as_refcounter.cocci b/scripts/coccinelle/api/atomic_as_refcounter.cocci
new file mode 100644
index 000000000000..988120e0fd67
--- /dev/null
+++ b/scripts/coccinelle/api/atomic_as_refcounter.cocci
@@ -0,0 +1,129 @@
+// Check if refcount_t type and API should be used
+// instead of atomic_t type when dealing with refcounters
+//
+// Copyright (c) 2016-2017, Elena Reshetova, Intel Corporation
+//
+// Confidence: Moderate
+// URL: http://coccinelle.lip6.fr/
+// Options: --include-headers --very-quiet
+virtual report
+@r1 exists@
+identifier a, x;
+position p1, p2;
+identifier fname =~ ".*free.*";
+identifier fname2 =~ ".*destroy.*";
+identifier fname3 =~ ".*del.*";
+identifier fname4 =~ ".*queue_work.*";
+identifier fname5 =~ ".*schedule_work.*";
+identifier fname6 =~ ".*call_rcu.*";
+@@
+(
+ atomic_dec_and_test@p1(&(a)->x)
+|
+ atomic_dec_and_lock@p1(&(a)->x, ...)
+|
+ atomic_long_dec_and_lock@p1(&(a)->x, ...)
+|
+ atomic_long_dec_and_test@p1(&(a)->x)
+|
+ atomic64_dec_and_test@p1(&(a)->x)
+|
+ local_dec_and_test@p1(&(a)->x)
+)
+...
+(
+ fname@p2(a, ...);
+|
+ fname2@p2(...);
+|
+ fname3@p2(...);
+|
+ fname4@p2(...);
+|
+ fname5@p2(...);
+|
+ fname6@p2(...);
+)
+@script:python depends on report@
+p1 << r1.p1;
+p2 << r1.p2;
+@@
+msg = "atomic_dec_and_test variation before object free at line %s."
+coccilib.report.print_report(p1[0], msg % (p2[0].line))
+@r4 exists@
+identifier a, x, y;
+position p1, p2;
+identifier fname =~ ".*free.*";
+@@
+(
+ atomic_dec_and_test@p1(&(a)->x)
+|
+ atomic_dec_and_lock@p1(&(a)->x, ...)
+|
+ atomic_long_dec_and_lock@p1(&(a)->x, ...)
+|
+ atomic_long_dec_and_test@p1(&(a)->x)
+|
+ atomic64_dec_and_test@p1(&(a)->x)
+|
+ local_dec_and_test@p1(&(a)->x)
+)
+...
+y=a
+...
+fname@p2(y, ...);
+@script:python depends on report@
+p1 << r4.p1;
+p2 << r4.p2;
+@@
+msg = "atomic_dec_and_test variation before object free at line %s."
+coccilib.report.print_report(p1[0], msg % (p2[0].line))
+@r2 exists@
+identifier a, x;
+position p1;
+@@
+(
+atomic_add_unless(&(a)->x,-1,1)@p1
+|
+atomic_long_add_unless(&(a)->x,-1,1)@p1
+|
+atomic64_add_unless(&(a)->x,-1,1)@p1
+)
+@script:python depends on report@
+p1 << r2.p1;
+@@
+msg = "atomic_add_unless"
+coccilib.report.print_report(p1[0], msg)
+@r3 exists@
+identifier x;
+position p1;
+@@
+(
+x = atomic_add_return@p1(-1, ...);
+|
+x = atomic_long_add_return@p1(-1, ...);
+|
+x = atomic64_add_return@p1(-1, ...);
+)
+@script:python depends on report@
+p1 << r3.p1;
+@@
+msg = "x = atomic_add_return(-1, ...)"
+coccilib.report.print_report(p1[0], msg)
diff --git a/scripts/coccinelle/api/drm-get-put.cocci b/scripts/coccinelle/api/drm-get-put.cocci
index 91fceb8f1fa2..3a09c97ad87d 100644
--- a/scripts/coccinelle/api/drm-get-put.cocci
+++ b/scripts/coccinelle/api/drm-get-put.cocci
@@ -16,12 +16,6 @@ expression object;
 @@
 (
- drm_mode_object_reference(object)
-+ drm_mode_object_get(object)
-|
- drm_mode_object_unreference(object)
-+ drm_mode_object_put(object)
-|
 - drm_connector_reference(object)
 + drm_connector_get(object)
 |
@@ -46,12 +40,6 @@ expression object;
 - drm_gem_object_unreference_unlocked(object)
 + drm_gem_object_put_unlocked(object)
 |
- drm_property_reference_blob(object)
-+ drm_property_blob_get(object)
-|
- drm_property_unreference_blob(object)
-+ drm_property_blob_put(object)
-|
 - drm_dev_unref(object)
 + drm_dev_put(object)
 )
@@ -62,10 +50,6 @@ position p;
 @@
 (
-drm_mode_object_unreference@p(object)
-|
-drm_mode_object_reference@p(object)
-|
 drm_connector_unreference@p(object)
 |
 drm_connector_reference@p(object)
@@ -82,10 +66,6 @@ __drm_gem_object_unreference(object)
 |
 drm_gem_object_unreference_unlocked(object)
 |
-drm_property_unreference_blob@p(object)
-|
-drm_property_reference_blob@p(object)
-|
 drm_dev_unref@p(object)
 )
diff --git a/scripts/coccinelle/locks/mini_lock.cocci b/scripts/coccinelle/locks/mini_lock.cocci
index 47f649b0ea87..19c6ee5b986b 100644
--- a/scripts/coccinelle/locks/mini_lock.cocci
+++ b/scripts/coccinelle/locks/mini_lock.cocci
@@ -67,12 +67,14 @@ identifier lock,unlock;
 @@
 *lock(E1@p,...);
-<+... when != E1
+... when != E1
+    when any
 if (...) {
  ... when != E1
 *  return@r ...;
 }
-...+>
+... when != E1
+    when any
 *unlock@up(E1,...);
 @script:python depends on org@
diff --git a/scripts/coccinelle/null/deref_null.cocci b/scripts/coccinelle/null/deref_null.cocci
index b16ccb7663a7..cbc6184e69ef 100644
--- a/scripts/coccinelle/null/deref_null.cocci
+++ b/scripts/coccinelle/null/deref_null.cocci
@@ -14,18 +14,10 @@ virtual context
 virtual org
 virtual report
-@ifm@
-expression *E;
-statement S1,S2;
-position p1;
-@@
-if@p1 ((E == NULL && ...) || ...) S1 else S2
 // The following two rules are separate, because both can match a single
 // expression in different ways
 @pr1 expression@
-expression *ifm.E;
+expression E;
 identifier f;
 position p1;
 @@
@@ -33,7 +25,7 @@ position p1;
 (E != NULL && ...) ? <+...E->f@p1...+> : ...
 @pr2 expression@
-expression *ifm.E;
+expression E;
 identifier f;
 position p2;
 @@
@@ -46,6 +38,14 @@ position p2;
 sizeof(<+...E->f@p2...+>)
 )
+@ifm@
+expression *E;
+statement S1,S2;
+position p1;
+@@
+if@p1 ((E == NULL && ...) || ...) S1 else S2
 // For org and report modes
 @r depends on !context && (org || report) exists@
@@ -212,16 +212,8 @@ else S3
 // The following three rules are duplicates of ifm, pr1 and pr2 respectively.
 // It is need because the previous rule as already made a "change".
-@ifm1 depends on context && !org && !report@
-expression *E;
-statement S1,S2;
-position p1;
-@@
-if@p1 ((E == NULL && ...) || ...) S1 else S2
 @pr11 depends on context && !org && !report expression@
-expression *ifm1.E;
+expression E;
 identifier f;
 position p1;
 @@
@@ -229,7 +221,7 @@ position p1;
 (E != NULL && ...) ? <+...E->f@p1...+> : ...
 @pr12 depends on context && !org && !report expression@
-expression *ifm1.E;
+expression E;
 identifier f;
 position p2;
 @@
@@ -242,6 +234,14 @@ position p2;
 sizeof(<+...E->f@p2...+>)
 )
+@ifm1 depends on context && !org && !report@
+expression *E;
+statement S1,S2;
+position p1;
+@@
+if@p1 ((E == NULL && ...) || ...) S1 else S2
 @depends on context && !org && !report exists@
 expression subE <= ifm1.E;
 expression *ifm1.E;
diff --git a/scripts/coccinelle/tests/doubletest.cocci b/scripts/coccinelle/tests/doubletest.cocci
index 78d74c22ca12..7af2ce7eb9bf 100644
--- a/scripts/coccinelle/tests/doubletest.cocci
+++ b/scripts/coccinelle/tests/doubletest.cocci
@@ -1,6 +1,7 @@
 /// Find &&/|| operations that include the same argument more than once
-//# A common source of false positives is when the argument performs a side
+//# A common source of false positives is when the expression, or
-//# effect.
+//# another expresssion in the same && or || operation, performs a
+//# side effect.
 ///
 // Confidence: Moderate
 // Copyright: (C) 2010 Nicolas Palix, DIKU.  GPLv2.
@@ -20,20 +21,37 @@ position p;
 @@
 (
-* E@p
+ E@p || ... || E
-  || ... || E
 |
-* E@p
+ E@p && ... && E
-  && ... && E
 )
-@script:python depends on org@
+@bad@
+expression r.E,e1,e2,fn;
+position r.p;
+assignment operator op;
+@@
+(
+E@p
+&
+ <+... \(fn(...)\|e1 op e2\|e1++\|e1--\|++e1\|--e1\) ...+>
+)
+@depends on context && !bad@
+expression r.E;
+position r.p;
+@@
+*E@p
+@script:python depends on org && !bad@
 p << r.p;
 @@
 cocci.print_main("duplicated argument to && or ||",p)
-@script:python depends on report@
+@script:python depends on report && !bad@
 p << r.p;
 @@
diff --git a/scripts/depmod.sh b/scripts/depmod.sh
index 9831cca31240..e083bcae343f 100755
--- a/scripts/depmod.sh
+++ b/scripts/depmod.sh
@@ -3,34 +3,22 @@
 #
 # A depmod wrapper used by the toplevel Makefile
-if test $# -ne 3; then
+if test $# -ne 2; then
-        echo "Usage: $0 /sbin/depmod <kernelrelease> <symbolprefix>" >&2
+        echo "Usage: $0 /sbin/depmod <kernelrelease>" >&2
        exit 1
 fi
 DEPMOD=$1
 KERNELRELEASE=$2
-SYMBOL_PREFIX=$3
-if ! test -r System.map -a -x "$DEPMOD"; then
+if ! test -r System.map ; then
+        echo "Warning: modules_install: missing 'System.map' file. Skipping depmod." >&2
        exit 0
 fi
-# older versions of depmod don't support -P <symbol-prefix>
+if [ -z $(command -v $DEPMOD) ]; then
-# support was added in module-init-tools 3.13
+        echo "Warning: 'make modules_install' requires $DEPMOD. Please install it." >&2
-if test -n "$SYMBOL_PREFIX"; then
+        echo "This is probably in the kmod package." >&2
-        release=$("$DEPMOD" --version)
+        exit 0
-        package=$(echo "$release" | cut -d' ' -f 1)
-        if test "$package" = "module-init-tools"; then
-                version=$(echo "$release" | cut -d' ' -f 2)
-                later=$(printf '%s\n' "$version" "3.13" | sort -V | tail -n 1)
-                if test "$later" != "$version"; then
-                        # module-init-tools < 3.13, drop the symbol prefix
-                        SYMBOL_PREFIX=""
-                fi
-        fi
-        if test -n "$SYMBOL_PREFIX"; then
-                SYMBOL_PREFIX="-P $SYMBOL_PREFIX"
-        fi
 fi
 # older versions of depmod require the version string to start with three
@@ -55,7 +43,7 @@ set -- -ae -F System.map
 if test -n "$INSTALL_MOD_PATH"; then
        set -- "$@" -b "$INSTALL_MOD_PATH"
 fi
-"$DEPMOD" "$@" "$KERNELRELEASE" $SYMBOL_PREFIX
+"$DEPMOD" "$@" "$KERNELRELEASE"
 ret=$?
 if $depmod_hack_needed; then
diff --git a/scripts/documentation-file-ref-check b/scripts/documentation-file-ref-check
index bc1659900e89..ad9db6821824 100755
--- a/scripts/documentation-file-ref-check
+++ b/scripts/documentation-file-ref-check
@@ -1,15 +1,164 @@
-#!/bin/sh
+#!/usr/bin/env perl
+# SPDX-License-Identifier: GPL-2.0
+#
 # Treewide grep for references to files under Documentation, and report
 # non-existing files in stderr.
-for f in $(git ls-files); do
+use warnings;
-        for ref in $(grep -ho "Documentation/[A-Za-z0-9_.,~/*+-]*" "$f"); do
+use strict;
-                # presume trailing . and , are not part of the name
+use Getopt::Long qw(:config no_auto_abbrev);
-                ref=${ref%%[.,]}
+my $scriptname = $0;
-                # use ls to handle wildcards
+$scriptname =~ s,.*/([^/]+/),$1,;
-                if ! ls $ref >/dev/null 2>&1; then
-                        echo "$f: $ref" >&2
+# Parse arguments
-                fi
+my $help = 0;
-        done
+my $fix = 0;
-done
+GetOptions(
+        'fix' => \$fix,
+        'h|help|usage' => \$help,
+);
+if ($help != 0) {
+    print "$scriptname [--help] [--fix]\n";
+    exit -1;
+}
+# Step 1: find broken references
+print "Finding broken references. This may take a while...  " if ($fix);
+my %broken_ref;
+open IN, "git grep 'Documentation/'|"
+     or die "Failed to run git grep";
+while (<IN>) {
+        next if (!m/^([^:]+):(.*)/);
+        my $f = $1;
+        my $ln = $2;
+        # Makefiles and scripts contain nasty expressions to parse docs
+        next if ($f =~ m/Makefile/ || $f =~ m/\.sh$/);
+        # Skip this script
+        next if ($f eq $scriptname);
+        if ($ln =~ m,\b(\S*)(Documentation/[A-Za-z0-9\_\.\,\~/\*\[\]\?+-]*)(.*),) {
+                my $prefix = $1;
+                my $ref = $2;
+                my $base = $2;
+                my $extra = $3;
+                # some file references are like:
+                # /usr/src/linux/Documentation/DMA-{API,mapping}.txt
+                # For now, ignore them
+                next if ($extra =~ m/^{/);
+                # Remove footnotes at the end like:
+                # Documentation/devicetree/dt-object-internal.txt[1]
+                $ref =~ s/(txt|rst)\[\d+]$/$1/;
+                # Remove ending ']' without any '['
+                $ref =~ s/\].*// if (!($ref =~ m/\[/));
+                # Remove puntuation marks at the end
+                $ref =~ s/[\,\.]+$//;
+                my $fulref = "$prefix$ref";
+                $fulref =~ s/^(\<file|ref)://;
+                $fulref =~ s/^[\'\`]+//;
+                $fulref =~ s,^\$\(.*\)/,,;
+                $base =~ s,.*/,,;
+                # Remove URL false-positives
+                next if ($fulref =~ m/^http/);
+                # Remove sched-pelt false-positive
+                next if ($fulref =~ m,^Documentation/scheduler/sched-pelt$,);
+                # Discard some build examples from Documentation/target/tcm_mod_builder.txt
+                next if ($fulref =~ m,mnt/sdb/lio-core-2.6.git/Documentation/target,);
+                # Check if exists, evaluating wildcards
+                next if (grep -e, glob("$ref $fulref"));
+                # Accept relative Documentation patches for tools/
+                if ($f =~ m/tools/) {
+                        my $path = $f;
+                        $path =~ s,(.*)/.*,$1,;
+                        next if (grep -e, glob("$path/$ref $path/$fulref"));
+                }
+                if ($fix) {
+                        if (!($ref =~ m/(scripts|Kconfig|Kbuild)/)) {
+                                $broken_ref{$ref}++;
+                        }
+                } else {
+                        print STDERR "$f: $fulref\n";
+                }
+        }
+}
+exit 0 if (!$fix);
+# Step 2: Seek for file name alternatives
+print "Auto-fixing broken references. Please double-check the results\n";
+foreach my $ref (keys %broken_ref) {
+        my $new =$ref;
+        # get just the basename
+        $new =~ s,.*/,,;
+        my $f="";
+        # usual reason for breakage: DT file moved around
+        if ($ref =~ /devicetree/) {
+                my $search = $new;
+                $search =~ s,^.*/,,;
+                $f = qx(find Documentation/devicetree/ -iname "*$search*") if ($search);
+                if (!$f) {
+                        # Manufacturer name may have changed
+                        $search =~ s/^.*,//;
+                        $f = qx(find Documentation/devicetree/ -iname "*$search*") if ($search);
+                }
+        }
+        # usual reason for breakage: file renamed to .rst
+        if (!$f) {
+                $new =~ s/\.txt$/.rst/;
+                $f=qx(find . -iname $new) if ($new);
+        }
+        # usual reason for breakage: use dash or underline
+        if (!$f) {
+                $new =~ s/[-_]/[-_]/g;
+                $f=qx(find . -iname $new) if ($new);
+        }
+        # Wild guess: seek for the same name on another place
+        if (!$f) {
+                $f = qx(find . -iname $new) if ($new);
+        }
+        my @find = split /\s+/, $f;
+        if (!$f) {
+                print STDERR "ERROR: Didn't find a replacement for $ref\n";
+        } elsif (scalar(@find) > 1) {
+                print STDERR "WARNING: Won't auto-replace, as found multiple files close to $ref:\n";
+                foreach my $j (@find) {
+                        $j =~ s,^./,,;
+                        print STDERR "    $j\n";
+                }
+        } else {
+                $f = $find[0];
+                $f =~ s,^./,,;
+                print "INFO: Replacing $ref to $f\n";
+                foreach my $j (qx(git grep -l $ref)) {
+                        qx(sed "s\@$ref\@$f\@g" -i $j);
+                }
+        }
+}
diff --git a/scripts/dtc/.gitignore b/scripts/dtc/.gitignore
index cdabdc95a6e7..2e6e60d64ede 100644
--- a/scripts/dtc/.gitignore
+++ b/scripts/dtc/.gitignore
@@ -1,4 +1 @@
 dtc
-dtc-lexer.lex.c
-dtc-parser.tab.c
-dtc-parser.tab.h
diff --git a/scripts/dtc/Makefile b/scripts/dtc/Makefile
index 0dc922bb7aea..056d5da6c477 100644
--- a/scripts/dtc/Makefile
+++ b/scripts/dtc/Makefile
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0
 # scripts/dtc makefile
-hostprogs-y     := dtc
+hostprogs-$(CONFIG_DTC) := dtc
 always          := $(hostprogs-y)
 dtc-objs        := dtc.o flattree.o fstree.o data.o livetree.o treesource.o \
@@ -9,24 +9,18 @@ dtc-objs	:= dtc.o flattree.o fstree.o data.o livetree.o treesource.o \
 dtc-objs        += dtc-lexer.lex.o dtc-parser.tab.o
 # Source files need to get at the userspace version of libfdt_env.h to compile
+HOST_EXTRACFLAGS := -I$(src)/libfdt
-HOSTCFLAGS_DTC := -I$(src) -I$(src)/libfdt
+ifeq ($(wildcard /usr/include/yaml.h),)
+HOST_EXTRACFLAGS += -DNO_YAML
+else
+dtc-objs        += yamltree.o
+HOSTLDLIBS_dtc  := -lyaml
+endif
-HOSTCFLAGS_checks.o := $(HOSTCFLAGS_DTC)
+# Generated files need one more search path to include headers in source tree
-HOSTCFLAGS_data.o := $(HOSTCFLAGS_DTC)
+HOSTCFLAGS_dtc-lexer.lex.o := -I$(src)
-HOSTCFLAGS_dtc.o := $(HOSTCFLAGS_DTC)
+HOSTCFLAGS_dtc-parser.tab.o := -I$(src)
-HOSTCFLAGS_flattree.o := $(HOSTCFLAGS_DTC)
-HOSTCFLAGS_fstree.o := $(HOSTCFLAGS_DTC)
-HOSTCFLAGS_livetree.o := $(HOSTCFLAGS_DTC)
-HOSTCFLAGS_srcpos.o := $(HOSTCFLAGS_DTC)
-HOSTCFLAGS_treesource.o := $(HOSTCFLAGS_DTC)
-HOSTCFLAGS_util.o := $(HOSTCFLAGS_DTC)
-HOSTCFLAGS_dtc-lexer.lex.o := $(HOSTCFLAGS_DTC)
-HOSTCFLAGS_dtc-parser.tab.o := $(HOSTCFLAGS_DTC)
 # dependencies on generated files need to be listed explicitly
 $(obj)/dtc-lexer.lex.o: $(obj)/dtc-parser.tab.h
-# generated files need to be cleaned explicitly
-clean-files     := dtc-lexer.lex.c dtc-parser.tab.c dtc-parser.tab.h
diff --git a/scripts/dtc/Makefile.dtc b/scripts/dtc/Makefile.dtc
index bece49b35535..d4375630a7f7 100644
--- a/scripts/dtc/Makefile.dtc
+++ b/scripts/dtc/Makefile.dtc
@@ -14,5 +14,9 @@ DTC_SRCS = \
        treesource.c \
        util.c
+ifneq ($(NO_YAML),1)
+DTC_SRCS += yamltree.c
+endif
 DTC_GEN_SRCS = dtc-lexer.lex.c dtc-parser.tab.c
 DTC_OBJS = $(DTC_SRCS:%.c=%.o) $(DTC_GEN_SRCS:%.c=%.o)
diff --git a/scripts/dtc/checks.c b/scripts/dtc/checks.c
index e66138449886..9c9b0c328af6 100644
--- a/scripts/dtc/checks.c
+++ b/scripts/dtc/checks.c
@@ -53,26 +53,28 @@ struct check {
        struct check **prereq;
 };
-#define CHECK_ENTRY(_nm, _fn, _d, _w, _e, ...)         \
+#define CHECK_ENTRY(nm_, fn_, d_, w_, e_, ...)         \
-        static struct check *_nm##_prereqs[] = { __VA_ARGS__ }; \
+        static struct check *nm_##_prereqs[] = { __VA_ARGS__ }; \
-        static struct check _nm = { \
+        static struct check nm_ = { \
-                .name = #_nm, \
+                .name = #nm_, \
-                .fn = (_fn), \
+                .fn = (fn_), \
-                .data = (_d), \
+                .data = (d_), \
-                .warn = (_w), \
+                .warn = (w_), \
-                .error = (_e), \
+                .error = (e_), \
                .status = UNCHECKED, \
-                .num_prereqs = ARRAY_SIZE(_nm##_prereqs), \
+                .num_prereqs = ARRAY_SIZE(nm_##_prereqs), \
-                .prereq = _nm##_prereqs, \
+                .prereq = nm_##_prereqs, \
        };
-#define WARNING(_nm, _fn, _d, ...) \
+#define WARNING(nm_, fn_, d_, ...) \
-        CHECK_ENTRY(_nm, _fn, _d, true, false, __VA_ARGS__)
+        CHECK_ENTRY(nm_, fn_, d_, true, false, __VA_ARGS__)
-#define ERROR(_nm, _fn, _d, ...) \
+#define ERROR(nm_, fn_, d_, ...) \
-        CHECK_ENTRY(_nm, _fn, _d, false, true, __VA_ARGS__)
+        CHECK_ENTRY(nm_, fn_, d_, false, true, __VA_ARGS__)
-#define CHECK(_nm, _fn, _d, ...) \
+#define CHECK(nm_, fn_, d_, ...) \
-        CHECK_ENTRY(_nm, _fn, _d, false, false, __VA_ARGS__)
+        CHECK_ENTRY(nm_, fn_, d_, false, false, __VA_ARGS__)
-static inline void  PRINTF(3, 4) check_msg(struct check *c, struct dt_info *dti,
+static inline void  PRINTF(5, 6) check_msg(struct check *c, struct dt_info *dti,
+                                           struct node *node,
+                                           struct property *prop,
                                           const char *fmt, ...)
 {
        va_list ap;
@@ -83,19 +85,33 @@ static inline void  PRINTF(3, 4) check_msg(struct check *c, struct dt_info *dti,
                fprintf(stderr, "%s: %s (%s): ",
                        strcmp(dti->outname, "-") ? dti->outname : "<stdout>",
                        (c->error) ? "ERROR" : "Warning", c->name);
+                if (node) {
+                        fprintf(stderr, "%s", node->fullpath);
+                        if (prop)
+                                fprintf(stderr, ":%s", prop->name);
+                        fputs(": ", stderr);
+                }
                vfprintf(stderr, fmt, ap);
                fprintf(stderr, "\n");
        }
        va_end(ap);
 }
-#define FAIL(c, dti, ...)                                               \
+#define FAIL(c, dti, node, ...)                                         \
        do {                                                            \
                TRACE((c), "\t\tFAILED at %s:%d", __FILE__, __LINE__);  \
                (c)->status = FAILED;                                   \
-                check_msg((c), dti, __VA_ARGS__);                       \
+                check_msg((c), dti, node, NULL, __VA_ARGS__);           \
        } while (0)
+#define FAIL_PROP(c, dti, node, prop, ...)                              \
+        do {                                                            \
+                TRACE((c), "\t\tFAILED at %s:%d", __FILE__, __LINE__);  \
+                (c)->status = FAILED;                                   \
+                check_msg((c), dti, node, prop, __VA_ARGS__);           \
+        } while (0)
 static void check_nodes_props(struct check *c, struct dt_info *dti, struct node *node)
 {
        struct node *child;
@@ -126,7 +142,7 @@ static bool run_check(struct check *c, struct dt_info *dti)
                error = error || run_check(prq, dti);
                if (prq->status != PASSED) {
                        c->status = PREREQ;
-                        check_msg(c, dti, "Failed prerequisite '%s'",
+                        check_msg(c, dti, NULL, NULL, "Failed prerequisite '%s'",
                                  c->prereq[i]->name);
                }
        }
@@ -156,7 +172,7 @@ out:
 static inline void check_always_fail(struct check *c, struct dt_info *dti,
                                     struct node *node)
 {
-        FAIL(c, dti, "always_fail check");
+        FAIL(c, dti, node, "always_fail check");
 }
 CHECK(always_fail, check_always_fail, NULL);
@@ -171,14 +187,42 @@ static void check_is_string(struct check *c, struct dt_info *dti,
                return; /* Not present, assumed ok */
        if (!data_is_one_string(prop->val))
-                FAIL(c, dti, "\"%s\" property in %s is not a string",
+                FAIL_PROP(c, dti, node, prop, "property is not a string");
-                     propname, node->fullpath);
 }
 #define WARNING_IF_NOT_STRING(nm, propname) \
        WARNING(nm, check_is_string, (propname))
 #define ERROR_IF_NOT_STRING(nm, propname) \
        ERROR(nm, check_is_string, (propname))
+static void check_is_string_list(struct check *c, struct dt_info *dti,
+                                 struct node *node)
+{
+        int rem, l;
+        struct property *prop;
+        char *propname = c->data;
+        char *str;
+        prop = get_property(node, propname);
+        if (!prop)
+                return; /* Not present, assumed ok */
+        str = prop->val.val;
+        rem = prop->val.len;
+        while (rem > 0) {
+                l = strnlen(str, rem);
+                if (l == rem) {
+                        FAIL_PROP(c, dti, node, prop, "property is not a string list");
+                        break;
+                }
+                rem -= l + 1;
+                str += l + 1;
+        }
+}
+#define WARNING_IF_NOT_STRING_LIST(nm, propname) \
+        WARNING(nm, check_is_string_list, (propname))
+#define ERROR_IF_NOT_STRING_LIST(nm, propname) \
+        ERROR(nm, check_is_string_list, (propname))
 static void check_is_cell(struct check *c, struct dt_info *dti,
                          struct node *node)
 {
@@ -190,8 +234,7 @@ static void check_is_cell(struct check *c, struct dt_info *dti,
                return; /* Not present, assumed ok */
        if (prop->val.len != sizeof(cell_t))
-                FAIL(c, dti, "\"%s\" property in %s is not a single cell",
+                FAIL_PROP(c, dti, node, prop, "property is not a single cell");
-                     propname, node->fullpath);
 }
 #define WARNING_IF_NOT_CELL(nm, propname) \
        WARNING(nm, check_is_cell, (propname))
@@ -212,8 +255,7 @@ static void check_duplicate_node_names(struct check *c, struct dt_info *dti,
                     child2;
                     child2 = child2->next_sibling)
                        if (streq(child->name, child2->name))
-                                FAIL(c, dti, "Duplicate node name %s",
+                                FAIL(c, dti, child2, "Duplicate node name");
-                                     child->fullpath);
 }
 ERROR(duplicate_node_names, check_duplicate_node_names, NULL);
@@ -227,8 +269,7 @@ static void check_duplicate_property_names(struct check *c, struct dt_info *dti,
                        if (prop2->deleted)
                                continue;
                        if (streq(prop->name, prop2->name))
-                                FAIL(c, dti, "Duplicate property name %s in %s",
+                                FAIL_PROP(c, dti, node, prop, "Duplicate property name");
-                                     prop->name, node->fullpath);
                }
        }
 }
@@ -246,8 +287,8 @@ static void check_node_name_chars(struct check *c, struct dt_info *dti,
        int n = strspn(node->name, c->data);
        if (n < strlen(node->name))
-                FAIL(c, dti, "Bad character '%c' in node %s",
+                FAIL(c, dti, node, "Bad character '%c' in node name",
-                     node->name[n], node->fullpath);
+                     node->name[n]);
 }
 ERROR(node_name_chars, check_node_name_chars, PROPNODECHARS "@");
@@ -257,8 +298,8 @@ static void check_node_name_chars_strict(struct check *c, struct dt_info *dti,
        int n = strspn(node->name, c->data);
        if (n < node->basenamelen)
-                FAIL(c, dti, "Character '%c' not recommended in node %s",
+                FAIL(c, dti, node, "Character '%c' not recommended in node name",
-                     node->name[n], node->fullpath);
+                     node->name[n]);
 }
 CHECK(node_name_chars_strict, check_node_name_chars_strict, PROPNODECHARSSTRICT);
@@ -266,8 +307,7 @@ static void check_node_name_format(struct check *c, struct dt_info *dti,
                                   struct node *node)
 {
        if (strchr(get_unitname(node), '@'))
-                FAIL(c, dti, "Node %s has multiple '@' characters in name",
+                FAIL(c, dti, node, "multiple '@' characters in node name");
-                     node->fullpath);
 }
 ERROR(node_name_format, check_node_name_format, NULL, &node_name_chars);
@@ -277,6 +317,11 @@ static void check_unit_address_vs_reg(struct check *c, struct dt_info *dti,
        const char *unitname = get_unitname(node);
        struct property *prop = get_property(node, "reg");
+        if (get_subnode(node, "__overlay__")) {
+                /* HACK: Overlay fragments are a special case */
+                return;
+        }
        if (!prop) {
                prop = get_property(node, "ranges");
                if (prop && !prop->val.len)
@@ -285,12 +330,10 @@ static void check_unit_address_vs_reg(struct check *c, struct dt_info *dti,
        if (prop) {
                if (!unitname[0])
-                        FAIL(c, dti, "Node %s has a reg or ranges property, but no unit name",
+                        FAIL(c, dti, node, "node has a reg or ranges property, but no unit name");
-                            node->fullpath);
        } else {
                if (unitname[0])
-                        FAIL(c, dti, "Node %s has a unit name, but no reg property",
+                        FAIL(c, dti, node, "node has a unit name, but no reg property");
-                            node->fullpath);
        }
 }
 WARNING(unit_address_vs_reg, check_unit_address_vs_reg, NULL);
@@ -304,8 +347,8 @@ static void check_property_name_chars(struct check *c, struct dt_info *dti,
                int n = strspn(prop->name, c->data);
                if (n < strlen(prop->name))
-                        FAIL(c, dti, "Bad character '%c' in property name \"%s\", node %s",
+                        FAIL_PROP(c, dti, node, prop, "Bad character '%c' in property name",
-                             prop->name[n], prop->name, node->fullpath);
+                                  prop->name[n]);
        }
 }
 ERROR(property_name_chars, check_property_name_chars, PROPNODECHARS);
@@ -336,8 +379,8 @@ static void check_property_name_chars_strict(struct check *c,
                        n = strspn(name, c->data);
                }
                if (n < strlen(name))
-                        FAIL(c, dti, "Character '%c' not recommended in property name \"%s\", node %s",
+                        FAIL_PROP(c, dti, node, prop, "Character '%c' not recommended in property name",
-                             name[n], prop->name, node->fullpath);
+                                  name[n]);
        }
 }
 CHECK(property_name_chars_strict, check_property_name_chars_strict, PROPNODECHARSSTRICT);
@@ -370,7 +413,7 @@ static void check_duplicate_label(struct check *c, struct dt_info *dti,
                return;
        if ((othernode != node) || (otherprop != prop) || (othermark != mark))
-                FAIL(c, dti, "Duplicate label '%s' on " DESCLABEL_FMT
+                FAIL(c, dti, node, "Duplicate label '%s' on " DESCLABEL_FMT
                     " and " DESCLABEL_FMT,
                     label, DESCLABEL_ARGS(node, prop, mark),
                     DESCLABEL_ARGS(othernode, otherprop, othermark));
@@ -410,8 +453,8 @@ static cell_t check_phandle_prop(struct check *c, struct dt_info *dti,
                return 0;
        if (prop->val.len != sizeof(cell_t)) {
-                FAIL(c, dti, "%s has bad length (%d) %s property",
+                FAIL_PROP(c, dti, node, prop, "bad length (%d) %s property",
-                     node->fullpath, prop->val.len, prop->name);
+                          prop->val.len, prop->name);
                return 0;
        }
@@ -422,8 +465,8 @@ static cell_t check_phandle_prop(struct check *c, struct dt_info *dti,
                        /* "Set this node's phandle equal to some
                         * other node's phandle".  That's nonsensical
                         * by construction. */ {
-                        FAIL(c, dti, "%s in %s is a reference to another node",
+                        FAIL(c, dti, node, "%s is a reference to another node",
-                             prop->name, node->fullpath);
+                             prop->name);
                }
                /* But setting this node's phandle equal to its own
                 * phandle is allowed - that means allocate a unique
@@ -436,8 +479,8 @@ static cell_t check_phandle_prop(struct check *c, struct dt_info *dti,
        phandle = propval_cell(prop);
        if ((phandle == 0) || (phandle == -1)) {
-                FAIL(c, dti, "%s has bad value (0x%x) in %s property",
+                FAIL_PROP(c, dti, node, prop, "bad value (0x%x) in %s property",
-                     node->fullpath, phandle, prop->name);
+                     phandle, prop->name);
                return 0;
        }
@@ -463,16 +506,16 @@ static void check_explicit_phandles(struct check *c, struct dt_info *dti,
                return;
        if (linux_phandle && phandle && (phandle != linux_phandle))
-                FAIL(c, dti, "%s has mismatching 'phandle' and 'linux,phandle'"
+                FAIL(c, dti, node, "mismatching 'phandle' and 'linux,phandle'"
-                     " properties", node->fullpath);
+                     " properties");
        if (linux_phandle && !phandle)
                phandle = linux_phandle;
        other = get_node_by_phandle(root, phandle);
        if (other && (other != node)) {
-                FAIL(c, dti, "%s has duplicated phandle 0x%x (seen before at %s)",
+                FAIL(c, dti, node, "duplicated phandle 0x%x (seen before at %s)",
-                     node->fullpath, phandle, other->fullpath);
+                     phandle, other->fullpath);
                return;
        }
@@ -496,8 +539,8 @@ static void check_name_properties(struct check *c, struct dt_info *dti,
        if ((prop->val.len != node->basenamelen+1)
            || (memcmp(prop->val.val, node->name, node->basenamelen) != 0)) {
-                FAIL(c, dti, "\"name\" property in %s is incorrect (\"%s\" instead"
+                FAIL(c, dti, node, "\"name\" property is incorrect (\"%s\" instead"
-                     " of base node name)", node->fullpath, prop->val.val);
+                     " of base node name)", prop->val.val);
        } else {
                /* The name property is correct, and therefore redundant.
                 * Delete it */
@@ -531,7 +574,7 @@ static void fixup_phandle_references(struct check *c, struct dt_info *dti,
                        refnode = get_node_by_ref(dt, m->ref);
                        if (! refnode) {
                                if (!(dti->dtsflags & DTSF_PLUGIN))
-                                        FAIL(c, dti, "Reference to non-existent node or "
+                                        FAIL(c, dti, node, "Reference to non-existent node or "
                                                        "label \"%s\"\n", m->ref);
                                else /* mark the entry as unresolved */
                                        *((fdt32_t *)(prop->val.val + m->offset)) =
@@ -541,6 +584,8 @@ static void fixup_phandle_references(struct check *c, struct dt_info *dti,
                        phandle = get_node_phandle(dt, refnode);
                        *((fdt32_t *)(prop->val.val + m->offset)) = cpu_to_fdt32(phandle);
+                        reference_node(refnode);
                }
        }
 }
@@ -563,7 +608,7 @@ static void fixup_path_references(struct check *c, struct dt_info *dti,
                        refnode = get_node_by_ref(dt, m->ref);
                        if (!refnode) {
-                                FAIL(c, dti, "Reference to non-existent node or label \"%s\"\n",
+                                FAIL(c, dti, node, "Reference to non-existent node or label \"%s\"\n",
                                     m->ref);
                                continue;
                        }
@@ -571,11 +616,21 @@ static void fixup_path_references(struct check *c, struct dt_info *dti,
                        path = refnode->fullpath;
                        prop->val = data_insert_at_marker(prop->val, m, path,
                                                          strlen(path) + 1);
+                        reference_node(refnode);
                }
        }
 }
 ERROR(path_references, fixup_path_references, NULL, &duplicate_node_names);
+static void fixup_omit_unused_nodes(struct check *c, struct dt_info *dti,
+                                    struct node *node)
+{
+        if (node->omit_if_unused && !node->is_referenced)
+                delete_node(node);
+}
+ERROR(omit_unused_nodes, fixup_omit_unused_nodes, NULL, &phandle_references, &path_references);
 /*
 * Semantic checks
 */
@@ -586,6 +641,45 @@ WARNING_IF_NOT_CELL(interrupt_cells_is_cell, "#interrupt-cells");
 WARNING_IF_NOT_STRING(device_type_is_string, "device_type");
 WARNING_IF_NOT_STRING(model_is_string, "model");
 WARNING_IF_NOT_STRING(status_is_string, "status");
+WARNING_IF_NOT_STRING(label_is_string, "label");
+WARNING_IF_NOT_STRING_LIST(compatible_is_string_list, "compatible");
+static void check_names_is_string_list(struct check *c, struct dt_info *dti,
+                                       struct node *node)
+{
+        struct property *prop;
+        for_each_property(node, prop) {
+                const char *s = strrchr(prop->name, '-');
+                if (!s || !streq(s, "-names"))
+                        continue;
+                c->data = prop->name;
+                check_is_string_list(c, dti, node);
+        }
+}
+WARNING(names_is_string_list, check_names_is_string_list, NULL);
+static void check_alias_paths(struct check *c, struct dt_info *dti,
+                                    struct node *node)
+{
+        struct property *prop;
+        if (!streq(node->name, "aliases"))
+                return;
+        for_each_property(node, prop) {
+                if (!prop->val.val || !get_node_by_path(dti->dt, prop->val.val)) {
+                        FAIL_PROP(c, dti, node, prop, "aliases property is not a valid node (%s)",
+                                  prop->val.val);
+                        continue;
+                }
+                if (strspn(prop->name, LOWERCASE DIGITS "-") != strlen(prop->name))
+                        FAIL(c, dti, node, "aliases property name must include only lowercase and '-'");
+        }
+}
+WARNING(alias_paths, check_alias_paths, NULL);
 static void fixup_addr_size_cells(struct check *c, struct dt_info *dti,
                                  struct node *node)
@@ -622,21 +716,21 @@ static void check_reg_format(struct check *c, struct dt_info *dti,
                return; /* No "reg", that's fine */
        if (!node->parent) {
-                FAIL(c, dti, "Root node has a \"reg\" property");
+                FAIL(c, dti, node, "Root node has a \"reg\" property");
                return;
        }
        if (prop->val.len == 0)
-                FAIL(c, dti, "\"reg\" property in %s is empty", node->fullpath);
+                FAIL_PROP(c, dti, node, prop, "property is empty");
        addr_cells = node_addr_cells(node->parent);
        size_cells = node_size_cells(node->parent);
        entrylen = (addr_cells + size_cells) * sizeof(cell_t);
        if (!entrylen || (prop->val.len % entrylen) != 0)
-                FAIL(c, dti, "\"reg\" property in %s has invalid length (%d bytes) "
+                FAIL_PROP(c, dti, node, prop, "property has invalid length (%d bytes) "
-                     "(#address-cells == %d, #size-cells == %d)",
+                          "(#address-cells == %d, #size-cells == %d)",
-                     node->fullpath, prop->val.len, addr_cells, size_cells);
+                          prop->val.len, addr_cells, size_cells);
 }
 WARNING(reg_format, check_reg_format, NULL, &addr_size_cells);
@@ -651,7 +745,7 @@ static void check_ranges_format(struct check *c, struct dt_info *dti,
                return;
        if (!node->parent) {
-                FAIL(c, dti, "Root node has a \"ranges\" property");
+                FAIL_PROP(c, dti, node, prop, "Root node has a \"ranges\" property");
                return;
        }
@@ -663,20 +757,20 @@ static void check_ranges_format(struct check *c, struct dt_info *dti,
        if (prop->val.len == 0) {
                if (p_addr_cells != c_addr_cells)
-                        FAIL(c, dti, "%s has empty \"ranges\" property but its "
+                        FAIL_PROP(c, dti, node, prop, "empty \"ranges\" property but its "
-                             "#address-cells (%d) differs from %s (%d)",
+                                  "#address-cells (%d) differs from %s (%d)",
-                             node->fullpath, c_addr_cells, node->parent->fullpath,
+                                  c_addr_cells, node->parent->fullpath,
-                             p_addr_cells);
+                                  p_addr_cells);
                if (p_size_cells != c_size_cells)
-                        FAIL(c, dti, "%s has empty \"ranges\" property but its "
+                        FAIL_PROP(c, dti, node, prop, "empty \"ranges\" property but its "
-                             "#size-cells (%d) differs from %s (%d)",
+                                  "#size-cells (%d) differs from %s (%d)",
-                             node->fullpath, c_size_cells, node->parent->fullpath,
+                                  c_size_cells, node->parent->fullpath,
-                             p_size_cells);
+                                  p_size_cells);
        } else if ((prop->val.len % entrylen) != 0) {
-                FAIL(c, dti, "\"ranges\" property in %s has invalid length (%d bytes) "
+                FAIL_PROP(c, dti, node, prop, "\"ranges\" property has invalid length (%d bytes) "
-                     "(parent #address-cells == %d, child #address-cells == %d, "
+                          "(parent #address-cells == %d, child #address-cells == %d, "
-                     "#size-cells == %d)", node->fullpath, prop->val.len,
+                          "#size-cells == %d)", prop->val.len,
-                     p_addr_cells, c_addr_cells, c_size_cells);
+                          p_addr_cells, c_addr_cells, c_size_cells);
        }
 }
 WARNING(ranges_format, check_ranges_format, NULL, &addr_size_cells);
@@ -696,41 +790,32 @@ static void check_pci_bridge(struct check *c, struct dt_info *dti, struct node *
        node->bus = &pci_bus;
-        if (!strneq(node->name, "pci", node->basenamelen) &&
+        if (!strprefixeq(node->name, node->basenamelen, "pci") &&
-            !strneq(node->name, "pcie", node->basenamelen))
+            !strprefixeq(node->name, node->basenamelen, "pcie"))
-                FAIL(c, dti, "Node %s node name is not \"pci\" or \"pcie\"",
+                FAIL(c, dti, node, "node name is not \"pci\" or \"pcie\"");
-                             node->fullpath);
        prop = get_property(node, "ranges");
        if (!prop)
-                FAIL(c, dti, "Node %s missing ranges for PCI bridge (or not a bridge)",
+                FAIL(c, dti, node, "missing ranges for PCI bridge (or not a bridge)");
-                             node->fullpath);
        if (node_addr_cells(node) != 3)
-                FAIL(c, dti, "Node %s incorrect #address-cells for PCI bridge",
+                FAIL(c, dti, node, "incorrect #address-cells for PCI bridge");
-                             node->fullpath);
        if (node_size_cells(node) != 2)
-                FAIL(c, dti, "Node %s incorrect #size-cells for PCI bridge",
+                FAIL(c, dti, node, "incorrect #size-cells for PCI bridge");
-                             node->fullpath);
        prop = get_property(node, "bus-range");
-        if (!prop) {
+        if (!prop)
-                FAIL(c, dti, "Node %s missing bus-range for PCI bridge",
-                             node->fullpath);
                return;
-        }
        if (prop->val.len != (sizeof(cell_t) * 2)) {
-                FAIL(c, dti, "Node %s bus-range must be 2 cells",
+                FAIL_PROP(c, dti, node, prop, "value must be 2 cells");
-                             node->fullpath);
                return;
        }
        cells = (cell_t *)prop->val.val;
        if (fdt32_to_cpu(cells[0]) > fdt32_to_cpu(cells[1]))
-                FAIL(c, dti, "Node %s bus-range 1st cell must be less than or equal to 2nd cell",
+                FAIL_PROP(c, dti, node, prop, "1st cell must be less than or equal to 2nd cell");
-                             node->fullpath);
        if (fdt32_to_cpu(cells[1]) > 0xff)
-                FAIL(c, dti, "Node %s bus-range maximum bus number must be less than 256",
+                FAIL_PROP(c, dti, node, prop, "maximum bus number must be less than 256");
-                             node->fullpath);
 }
 WARNING(pci_bridge, check_pci_bridge, NULL,
        &device_type_is_string, &addr_size_cells);
@@ -760,8 +845,8 @@ static void check_pci_device_bus_num(struct check *c, struct dt_info *dti, struc
                max_bus = fdt32_to_cpu(cells[0]);
        }
        if ((bus_num < min_bus) || (bus_num > max_bus))
-                FAIL(c, dti, "Node %s PCI bus number %d out of range, expected (%d - %d)",
+                FAIL_PROP(c, dti, node, prop, "PCI bus number %d out of range, expected (%d - %d)",
-                     node->fullpath, bus_num, min_bus, max_bus);
+                          bus_num, min_bus, max_bus);
 }
 WARNING(pci_device_bus_num, check_pci_device_bus_num, NULL, &reg_format, &pci_bridge);
@@ -778,25 +863,22 @@ static void check_pci_device_reg(struct check *c, struct dt_info *dti, struct no
        prop = get_property(node, "reg");
        if (!prop) {
-                FAIL(c, dti, "Node %s missing PCI reg property", node->fullpath);
+                FAIL(c, dti, node, "missing PCI reg property");
                return;
        }
        cells = (cell_t *)prop->val.val;
        if (cells[1] || cells[2])
-                FAIL(c, dti, "Node %s PCI reg config space address cells 2 and 3 must be 0",
+                FAIL_PROP(c, dti, node, prop, "PCI reg config space address cells 2 and 3 must be 0");
-                             node->fullpath);
        reg = fdt32_to_cpu(cells[0]);
        dev = (reg & 0xf800) >> 11;
        func = (reg & 0x700) >> 8;
        if (reg & 0xff000000)
-                FAIL(c, dti, "Node %s PCI reg address is not configuration space",
+                FAIL_PROP(c, dti, node, prop, "PCI reg address is not configuration space");
-                             node->fullpath);
        if (reg & 0x000000ff)
-                FAIL(c, dti, "Node %s PCI reg config space address register number must be 0",
+                FAIL_PROP(c, dti, node, prop, "PCI reg config space address register number must be 0");
-                             node->fullpath);
        if (func == 0) {
                snprintf(unit_addr, sizeof(unit_addr), "%x", dev);
@@ -808,8 +890,8 @@ static void check_pci_device_reg(struct check *c, struct dt_info *dti, struct no
        if (streq(unitname, unit_addr))
                return;
-        FAIL(c, dti, "Node %s PCI unit address format error, expected \"%s\"",
+        FAIL(c, dti, node, "PCI unit address format error, expected \"%s\"",
-             node->fullpath, unit_addr);
+             unit_addr);
 }
 WARNING(pci_device_reg, check_pci_device_reg, NULL, &reg_format, &pci_bridge);
@@ -828,7 +910,7 @@ static bool node_is_compatible(struct node *node, const char *compat)
        for (str = prop->val.val, end = str + prop->val.len; str < end;
             str += strnlen(str, end - str) + 1) {
-                if (strneq(str, compat, end - str))
+                if (strprefixeq(str, end - str, compat))
                        return true;
        }
        return false;
@@ -865,7 +947,7 @@ static void check_simple_bus_reg(struct check *c, struct dt_info *dti, struct no
        if (!cells) {
                if (node->parent->parent && !(node->bus == &simple_bus))
-                        FAIL(c, dti, "Node %s missing or empty reg/ranges property", node->fullpath);
+                        FAIL(c, dti, node, "missing or empty reg/ranges property");
                return;
        }
@@ -875,11 +957,148 @@ static void check_simple_bus_reg(struct check *c, struct dt_info *dti, struct no
        snprintf(unit_addr, sizeof(unit_addr), "%"PRIx64, reg);
        if (!streq(unitname, unit_addr))
-                FAIL(c, dti, "Node %s simple-bus unit address format error, expected \"%s\"",
+                FAIL(c, dti, node, "simple-bus unit address format error, expected \"%s\"",
-                     node->fullpath, unit_addr);
+                     unit_addr);
 }
 WARNING(simple_bus_reg, check_simple_bus_reg, NULL, &reg_format, &simple_bus_bridge);
+static const struct bus_type i2c_bus = {
+        .name = "i2c-bus",
+};
+static void check_i2c_bus_bridge(struct check *c, struct dt_info *dti, struct node *node)
+{
+        if (strprefixeq(node->name, node->basenamelen, "i2c-bus") ||
+            strprefixeq(node->name, node->basenamelen, "i2c-arb")) {
+                node->bus = &i2c_bus;
+        } else if (strprefixeq(node->name, node->basenamelen, "i2c")) {
+                struct node *child;
+                for_each_child(node, child) {
+                        if (strprefixeq(child->name, node->basenamelen, "i2c-bus"))
+                                return;
+                }
+                node->bus = &i2c_bus;
+        } else
+                return;
+        if (!node->children)
+                return;
+        if (node_addr_cells(node) != 1)
+                FAIL(c, dti, node, "incorrect #address-cells for I2C bus");
+        if (node_size_cells(node) != 0)
+                FAIL(c, dti, node, "incorrect #size-cells for I2C bus");
+}
+WARNING(i2c_bus_bridge, check_i2c_bus_bridge, NULL, &addr_size_cells);
+static void check_i2c_bus_reg(struct check *c, struct dt_info *dti, struct node *node)
+{
+        struct property *prop;
+        const char *unitname = get_unitname(node);
+        char unit_addr[17];
+        uint32_t reg = 0;
+        int len;
+        cell_t *cells = NULL;
+        if (!node->parent || (node->parent->bus != &i2c_bus))
+                return;
+        prop = get_property(node, "reg");
+        if (prop)
+                cells = (cell_t *)prop->val.val;
+        if (!cells) {
+                FAIL(c, dti, node, "missing or empty reg property");
+                return;
+        }
+        reg = fdt32_to_cpu(*cells);
+        snprintf(unit_addr, sizeof(unit_addr), "%x", reg);
+        if (!streq(unitname, unit_addr))
+                FAIL(c, dti, node, "I2C bus unit address format error, expected \"%s\"",
+                     unit_addr);
+        for (len = prop->val.len; len > 0; len -= 4) {
+                reg = fdt32_to_cpu(*(cells++));
+                if (reg > 0x3ff)
+                        FAIL_PROP(c, dti, node, prop, "I2C address must be less than 10-bits, got \"0x%x\"",
+                                  reg);
+        }
+}
+WARNING(i2c_bus_reg, check_i2c_bus_reg, NULL, &reg_format, &i2c_bus_bridge);
+static const struct bus_type spi_bus = {
+        .name = "spi-bus",
+};
+static void check_spi_bus_bridge(struct check *c, struct dt_info *dti, struct node *node)
+{
+        if (strprefixeq(node->name, node->basenamelen, "spi")) {
+                node->bus = &spi_bus;
+        } else {
+                /* Try to detect SPI buses which don't have proper node name */
+                struct node *child;
+                if (node_addr_cells(node) != 1 || node_size_cells(node) != 0)
+                        return;
+                for_each_child(node, child) {
+                        struct property *prop;
+                        for_each_property(child, prop) {
+                                if (strprefixeq(prop->name, 4, "spi-")) {
+                                        node->bus = &spi_bus;
+                                        break;
+                                }
+                        }
+                        if (node->bus == &spi_bus)
+                                break;
+                }
+                if (node->bus == &spi_bus && get_property(node, "reg"))
+                        FAIL(c, dti, node, "node name for SPI buses should be 'spi'");
+        }
+        if (node->bus != &spi_bus || !node->children)
+                return;
+        if (node_addr_cells(node) != 1)
+                FAIL(c, dti, node, "incorrect #address-cells for SPI bus");
+        if (node_size_cells(node) != 0)
+                FAIL(c, dti, node, "incorrect #size-cells for SPI bus");
+}
+WARNING(spi_bus_bridge, check_spi_bus_bridge, NULL, &addr_size_cells);
+static void check_spi_bus_reg(struct check *c, struct dt_info *dti, struct node *node)
+{
+        struct property *prop;
+        const char *unitname = get_unitname(node);
+        char unit_addr[9];
+        uint32_t reg = 0;
+        cell_t *cells = NULL;
+        if (!node->parent || (node->parent->bus != &spi_bus))
+                return;
+        prop = get_property(node, "reg");
+        if (prop)
+                cells = (cell_t *)prop->val.val;
+        if (!cells) {
+                FAIL(c, dti, node, "missing or empty reg property");
+                return;
+        }
+        reg = fdt32_to_cpu(*cells);
+        snprintf(unit_addr, sizeof(unit_addr), "%x", reg);
+        if (!streq(unitname, unit_addr))
+                FAIL(c, dti, node, "SPI bus unit address format error, expected \"%s\"",
+                     unit_addr);
+}
+WARNING(spi_bus_reg, check_spi_bus_reg, NULL, &reg_format, &spi_bus_bridge);
 static void check_unit_address_format(struct check *c, struct dt_info *dti,
                                      struct node *node)
 {
@@ -892,14 +1111,12 @@ static void check_unit_address_format(struct check *c, struct dt_info *dti,
                return;
        if (!strncmp(unitname, "0x", 2)) {
-                FAIL(c, dti, "Node %s unit name should not have leading \"0x\"",
+                FAIL(c, dti, node, "unit name should not have leading \"0x\"");
-                    node->fullpath);
                /* skip over 0x for next test */
                unitname += 2;
        }
        if (unitname[0] == '0' && isxdigit(unitname[1]))
-                FAIL(c, dti, "Node %s unit name should not have leading 0s",
+                FAIL(c, dti, node, "unit name should not have leading 0s");
-                    node->fullpath);
 }
 WARNING(unit_address_format, check_unit_address_format, NULL,
        &node_name_format, &pci_bridge, &simple_bus_bridge);
@@ -922,16 +1139,68 @@ static void check_avoid_default_addr_size(struct check *c, struct dt_info *dti,
                return;
        if (node->parent->addr_cells == -1)
-                FAIL(c, dti, "Relying on default #address-cells value for %s",
+                FAIL(c, dti, node, "Relying on default #address-cells value");
-                     node->fullpath);
        if (node->parent->size_cells == -1)
-                FAIL(c, dti, "Relying on default #size-cells value for %s",
+                FAIL(c, dti, node, "Relying on default #size-cells value");
-                     node->fullpath);
 }
 WARNING(avoid_default_addr_size, check_avoid_default_addr_size, NULL,
        &addr_size_cells);
+static void check_avoid_unnecessary_addr_size(struct check *c, struct dt_info *dti,
+                                              struct node *node)
+{
+        struct property *prop;
+        struct node *child;
+        bool has_reg = false;
+        if (!node->parent || node->addr_cells < 0 || node->size_cells < 0)
+                return;
+        if (get_property(node, "ranges") || !node->children)
+                return;
+        for_each_child(node, child) {
+                prop = get_property(child, "reg");
+                if (prop)
+                        has_reg = true;
+        }
+        if (!has_reg)
+                FAIL(c, dti, node, "unnecessary #address-cells/#size-cells without \"ranges\" or child \"reg\" property");
+}
+WARNING(avoid_unnecessary_addr_size, check_avoid_unnecessary_addr_size, NULL, &avoid_default_addr_size);
+static void check_unique_unit_address(struct check *c, struct dt_info *dti,
+                                              struct node *node)
+{
+        struct node *childa;
+        if (node->addr_cells < 0 || node->size_cells < 0)
+                return;
+        if (!node->children)
+                return;
+        for_each_child(node, childa) {
+                struct node *childb;
+                const char *addr_a = get_unitname(childa);
+                if (!strlen(addr_a))
+                        continue;
+                for_each_child(node, childb) {
+                        const char *addr_b = get_unitname(childb);
+                        if (childa == childb)
+                                break;
+                        if (streq(addr_a, addr_b))
+                                FAIL(c, dti, childb, "duplicate unit-address (also used in node %s)", childa->fullpath);
+                }
+        }
+}
+WARNING(unique_unit_address, check_unique_unit_address, NULL, &avoid_default_addr_size);
 static void check_obsolete_chosen_interrupt_controller(struct check *c,
                                                       struct dt_info *dti,
                                                       struct node *node)
@@ -950,12 +1219,61 @@ static void check_obsolete_chosen_interrupt_controller(struct check *c,
        prop = get_property(chosen, "interrupt-controller");
        if (prop)
-                FAIL(c, dti, "/chosen has obsolete \"interrupt-controller\" "
+                FAIL_PROP(c, dti, node, prop,
-                     "property");
+                          "/chosen has obsolete \"interrupt-controller\" property");
 }
 WARNING(obsolete_chosen_interrupt_controller,
        check_obsolete_chosen_interrupt_controller, NULL);
+static void check_chosen_node_is_root(struct check *c, struct dt_info *dti,
+                                      struct node *node)
+{
+        if (!streq(node->name, "chosen"))
+                return;
+        if (node->parent != dti->dt)
+                FAIL(c, dti, node, "chosen node must be at root node");
+}
+WARNING(chosen_node_is_root, check_chosen_node_is_root, NULL);
+static void check_chosen_node_bootargs(struct check *c, struct dt_info *dti,
+                                       struct node *node)
+{
+        struct property *prop;
+        if (!streq(node->name, "chosen"))
+                return;
+        prop = get_property(node, "bootargs");
+        if (!prop)
+                return;
+        c->data = prop->name;
+        check_is_string(c, dti, node);
+}
+WARNING(chosen_node_bootargs, check_chosen_node_bootargs, NULL);
+static void check_chosen_node_stdout_path(struct check *c, struct dt_info *dti,
+                                          struct node *node)
+{
+        struct property *prop;
+        if (!streq(node->name, "chosen"))
+                return;
+        prop = get_property(node, "stdout-path");
+        if (!prop) {
+                prop = get_property(node, "linux,stdout-path");
+                if (!prop)
+                        return;
+                FAIL_PROP(c, dti, node, prop, "Use 'stdout-path' instead");
+        }
+        c->data = prop->name;
+        check_is_string(c, dti, node);
+}
+WARNING(chosen_node_stdout_path, check_chosen_node_stdout_path, NULL);
 struct provider {
        const char *prop_name;
        const char *cell_name;
@@ -972,8 +1290,9 @@ static void check_property_phandle_args(struct check *c,
        int cell, cellsize = 0;
        if (prop->val.len % sizeof(cell_t)) {
-                FAIL(c, dti, "property '%s' size (%d) is invalid, expected multiple of %zu in node %s",
+                FAIL_PROP(c, dti, node, prop,
-                     prop->name, prop->val.len, sizeof(cell_t), node->fullpath);
+                          "property size (%d) is invalid, expected multiple of %zu",
+                          prop->val.len, sizeof(cell_t));
                return;
        }
@@ -1004,14 +1323,16 @@ static void check_property_phandle_args(struct check *c,
                                        break;
                        }
                        if (!m)
-                                FAIL(c, dti, "Property '%s', cell %d is not a phandle reference in %s",
+                                FAIL_PROP(c, dti, node, prop,
-                                     prop->name, cell, node->fullpath);
+                                          "cell %d is not a phandle reference",
+                                          cell);
                }
                provider_node = get_node_by_phandle(root, phandle);
                if (!provider_node) {
-                        FAIL(c, dti, "Could not get phandle node for %s:%s(cell %d)",
+                        FAIL_PROP(c, dti, node, prop,
-                             node->fullpath, prop->name, cell);
+                                  "Could not get phandle node for (cell %d)",
+                                  cell);
                        break;
                }
@@ -1021,16 +1342,17 @@ static void check_property_phandle_args(struct check *c,
                } else if (provider->optional) {
                        cellsize = 0;
                } else {
-                        FAIL(c, dti, "Missing property '%s' in node %s or bad phandle (referred from %s:%s[%d])",
+                        FAIL(c, dti, node, "Missing property '%s' in node %s or bad phandle (referred from %s[%d])",
                             provider->cell_name,
                             provider_node->fullpath,
-                             node->fullpath, prop->name, cell);
+                             prop->name, cell);
                        break;
                }
                if (prop->val.len < ((cell + cellsize + 1) * sizeof(cell_t))) {
-                        FAIL(c, dti, "%s property size (%d) too small for cell size %d in %s",
+                        FAIL_PROP(c, dti, node, prop,
-                             prop->name, prop->val.len, cellsize, node->fullpath);
+                                  "property size (%d) too small for cell size %d",
+                                  prop->val.len, cellsize);
                }
        }
 }
@@ -1066,7 +1388,7 @@ WARNING_PROPERTY_PHANDLE_CELLS(phys, "phys", "#phy-cells");
 WARNING_PROPERTY_PHANDLE_CELLS(power_domains, "power-domains", "#power-domain-cells");
 WARNING_PROPERTY_PHANDLE_CELLS(pwms, "pwms", "#pwm-cells");
 WARNING_PROPERTY_PHANDLE_CELLS(resets, "resets", "#reset-cells");
-WARNING_PROPERTY_PHANDLE_CELLS(sound_dais, "sound-dais", "#sound-dai-cells");
+WARNING_PROPERTY_PHANDLE_CELLS(sound_dai, "sound-dai", "#sound-dai-cells");
 WARNING_PROPERTY_PHANDLE_CELLS(thermal_sensors, "thermal-sensors", "#thermal-sensor-cells");
 static bool prop_is_gpio(struct property *prop)
@@ -1132,8 +1454,8 @@ static void check_deprecated_gpio_property(struct check *c,
                if (!streq(str, "gpio"))
                        continue;
-                FAIL(c, dti, "'[*-]gpio' is deprecated, use '[*-]gpios' instead for %s:%s",
+                FAIL_PROP(c, dti, node, prop,
-                     node->fullpath, prop->name);
+                          "'[*-]gpio' is deprecated, use '[*-]gpios' instead");
        }
 }
@@ -1167,9 +1489,8 @@ static void check_interrupts_property(struct check *c,
                return;
        if (irq_prop->val.len % sizeof(cell_t))
-                FAIL(c, dti, "property '%s' size (%d) is invalid, expected multiple of %zu in node %s",
+                FAIL_PROP(c, dti, node, irq_prop, "size (%d) is invalid, expected multiple of %zu",
-                     irq_prop->name, irq_prop->val.len, sizeof(cell_t),
+                     irq_prop->val.len, sizeof(cell_t));
-                     node->fullpath);
        while (parent && !prop) {
                if (parent != node && node_is_interrupt_provider(parent)) {
@@ -1187,14 +1508,12 @@ static void check_interrupts_property(struct check *c,
                        irq_node = get_node_by_phandle(root, phandle);
                        if (!irq_node) {
-                                FAIL(c, dti, "Bad interrupt-parent phandle for %s",
+                                FAIL_PROP(c, dti, parent, prop, "Bad phandle");
-                                     node->fullpath);
                                return;
                        }
                        if (!node_is_interrupt_provider(irq_node))
-                                FAIL(c, dti,
+                                FAIL(c, dti, irq_node,
-                                     "Missing interrupt-controller or interrupt-map property in %s",
+                                     "Missing interrupt-controller or interrupt-map property");
-                                     irq_node->fullpath);
                        break;
                }
@@ -1203,27 +1522,171 @@ static void check_interrupts_property(struct check *c,
        }
        if (!irq_node) {
-                FAIL(c, dti, "Missing interrupt-parent for %s", node->fullpath);
+                FAIL(c, dti, node, "Missing interrupt-parent");
                return;
        }
        prop = get_property(irq_node, "#interrupt-cells");
        if (!prop) {
-                FAIL(c, dti, "Missing #interrupt-cells in interrupt-parent %s",
+                FAIL(c, dti, irq_node, "Missing #interrupt-cells in interrupt-parent");
-                     irq_node->fullpath);
                return;
        }
        irq_cells = propval_cell(prop);
        if (irq_prop->val.len % (irq_cells * sizeof(cell_t))) {
-                FAIL(c, dti,
+                FAIL_PROP(c, dti, node, prop,
-                     "interrupts size is (%d), expected multiple of %d in %s",
+                          "size is (%d), expected multiple of %d",
-                     irq_prop->val.len, (int)(irq_cells * sizeof(cell_t)),
+                          irq_prop->val.len, (int)(irq_cells * sizeof(cell_t)));
-                     node->fullpath);
        }
 }
 WARNING(interrupts_property, check_interrupts_property, &phandle_references);
+static const struct bus_type graph_port_bus = {
+        .name = "graph-port",
+};
+static const struct bus_type graph_ports_bus = {
+        .name = "graph-ports",
+};
+static void check_graph_nodes(struct check *c, struct dt_info *dti,
+                              struct node *node)
+{
+        struct node *child;
+        for_each_child(node, child) {
+                if (!(strprefixeq(child->name, child->basenamelen, "endpoint") ||
+                      get_property(child, "remote-endpoint")))
+                        continue;
+                node->bus = &graph_port_bus;
+                /* The parent of 'port' nodes can be either 'ports' or a device */
+                if (!node->parent->bus &&
+                    (streq(node->parent->name, "ports") || get_property(node, "reg")))
+                        node->parent->bus = &graph_ports_bus;
+                break;
+        }
+}
+WARNING(graph_nodes, check_graph_nodes, NULL);
+static void check_graph_child_address(struct check *c, struct dt_info *dti,
+                                      struct node *node)
+{
+        int cnt = 0;
+        struct node *child;
+        if (node->bus != &graph_ports_bus && node->bus != &graph_port_bus)
+                return;
+        for_each_child(node, child) {
+                struct property *prop = get_property(child, "reg");
+                /* No error if we have any non-zero unit address */
+                if (prop && propval_cell(prop) != 0)
+                        return;
+                cnt++;
+        }
+        if (cnt == 1 && node->addr_cells != -1)
+                FAIL(c, dti, node, "graph node has single child node '%s', #address-cells/#size-cells are not necessary",
+                     node->children->name);
+}
+WARNING(graph_child_address, check_graph_child_address, NULL, &graph_nodes);
+static void check_graph_reg(struct check *c, struct dt_info *dti,
+                            struct node *node)
+{
+        char unit_addr[9];
+        const char *unitname = get_unitname(node);
+        struct property *prop;
+        prop = get_property(node, "reg");
+        if (!prop || !unitname)
+                return;
+        if (!(prop->val.val && prop->val.len == sizeof(cell_t))) {
+                FAIL(c, dti, node, "graph node malformed 'reg' property");
+                return;
+        }
+        snprintf(unit_addr, sizeof(unit_addr), "%x", propval_cell(prop));
+        if (!streq(unitname, unit_addr))
+                FAIL(c, dti, node, "graph node unit address error, expected \"%s\"",
+                     unit_addr);
+        if (node->parent->addr_cells != 1)
+                FAIL_PROP(c, dti, node, get_property(node, "#address-cells"),
+                          "graph node '#address-cells' is %d, must be 1",
+                          node->parent->addr_cells);
+        if (node->parent->size_cells != 0)
+                FAIL_PROP(c, dti, node, get_property(node, "#size-cells"),
+                          "graph node '#size-cells' is %d, must be 0",
+                          node->parent->size_cells);
+}
+static void check_graph_port(struct check *c, struct dt_info *dti,
+                             struct node *node)
+{
+        if (node->bus != &graph_port_bus)
+                return;
+        if (!strprefixeq(node->name, node->basenamelen, "port"))
+                FAIL(c, dti, node, "graph port node name should be 'port'");
+        check_graph_reg(c, dti, node);
+}
+WARNING(graph_port, check_graph_port, NULL, &graph_nodes);
+static struct node *get_remote_endpoint(struct check *c, struct dt_info *dti,
+                                        struct node *endpoint)
+{
+        int phandle;
+        struct node *node;
+        struct property *prop;
+        prop = get_property(endpoint, "remote-endpoint");
+        if (!prop)
+                return NULL;
+        phandle = propval_cell(prop);
+        /* Give up if this is an overlay with external references */
+        if (phandle == 0 || phandle == -1)
+                return NULL;
+        node = get_node_by_phandle(dti->dt, phandle);
+        if (!node)
+                FAIL_PROP(c, dti, endpoint, prop, "graph phandle is not valid");
+        return node;
+}
+static void check_graph_endpoint(struct check *c, struct dt_info *dti,
+                                 struct node *node)
+{
+        struct node *remote_node;
+        if (!node->parent || node->parent->bus != &graph_port_bus)
+                return;
+        if (!strprefixeq(node->name, node->basenamelen, "endpoint"))
+                FAIL(c, dti, node, "graph endpont node name should be 'endpoint'");
+        check_graph_reg(c, dti, node);
+        remote_node = get_remote_endpoint(c, dti, node);
+        if (!remote_node)
+                return;
+        if (get_remote_endpoint(c, dti, remote_node) != node)
+                FAIL(c, dti, node, "graph connection to node '%s' is not bidirectional",
+                     remote_node->fullpath);
+}
+WARNING(graph_endpoint, check_graph_endpoint, NULL, &graph_nodes);
 static struct check *check_table[] = {
        &duplicate_node_names, &duplicate_property_names,
        &node_name_chars, &node_name_format, &property_name_chars,
@@ -1233,9 +1696,13 @@ static struct check *check_table[] = {
        &explicit_phandles,
        &phandle_references, &path_references,
+        &omit_unused_nodes,
        &address_cells_is_cell, &size_cells_is_cell, &interrupt_cells_is_cell,
        &device_type_is_string, &model_is_string, &status_is_string,
+        &label_is_string,
+        &compatible_is_string_list, &names_is_string_list,
        &property_name_chars_strict,
        &node_name_chars_strict,
@@ -1252,8 +1719,17 @@ static struct check *check_table[] = {
        &simple_bus_bridge,
        &simple_bus_reg,
+        &i2c_bus_bridge,
+        &i2c_bus_reg,
+        &spi_bus_bridge,
+        &spi_bus_reg,
        &avoid_default_addr_size,
+        &avoid_unnecessary_addr_size,
+        &unique_unit_address,
        &obsolete_chosen_interrupt_controller,
+        &chosen_node_is_root, &chosen_node_bootargs, &chosen_node_stdout_path,
        &clocks_property,
        &cooling_device_property,
@@ -1269,13 +1745,17 @@ static struct check *check_table[] = {
        &power_domains_property,
        &pwms_property,
        &resets_property,
-        &sound_dais_property,
+        &sound_dai_property,
        &thermal_sensors_property,
        &deprecated_gpio_property,
        &gpios_property,
        &interrupts_property,
+        &alias_paths,
+        &graph_nodes, &graph_child_address, &graph_port, &graph_endpoint,
        &always_fail,
 };
diff --git a/scripts/dtc/data.c b/scripts/dtc/data.c
index aa37a16c8891..4a204145cc7b 100644
--- a/scripts/dtc/data.c
+++ b/scripts/dtc/data.c
@@ -74,7 +74,8 @@ struct data data_copy_escape_string(const char *s, int len)
        struct data d;
        char *q;
-        d = data_grow_for(empty_data, len + 1);
+        d = data_add_marker(empty_data, TYPE_STRING, NULL);
+        d = data_grow_for(d, len + 1);
        q = d.val;
        while (i < len) {
@@ -94,6 +95,7 @@ struct data data_copy_file(FILE *f, size_t maxlen)
 {
        struct data d = empty_data;
+        d = data_add_marker(d, TYPE_NONE, NULL);
        while (!feof(f) && (d.len < maxlen)) {
                size_t chunksize, ret;
diff --git a/scripts/dtc/dtc-lexer.l b/scripts/dtc/dtc-lexer.l
index fd825ebba69c..615b7ec6588f 100644
--- a/scripts/dtc/dtc-lexer.l
+++ b/scripts/dtc/dtc-lexer.l
@@ -153,6 +153,13 @@ static void PRINTF(1, 2) lexical_error(const char *fmt, ...);
                        return DT_DEL_NODE;
                }
+<*>"/omit-if-no-ref/"   {
+                        DPRINT("Keyword: /omit-if-no-ref/\n");
+                        DPRINT("<PROPNODENAME>\n");
+                        BEGIN(PROPNODENAME);
+                        return DT_OMIT_NO_REF;
+                }
 <*>{LABEL}:     {
                        DPRINT("Label: %s\n", yytext);
                        yylval.labelref = xstrdup(yytext);
diff --git a/scripts/dtc/dtc-lexer.lex.c_shipped b/scripts/dtc/dtc-lexer.lex.c_shipped
deleted file mode 100644
index 011bb9632ff2..000000000000
--- a/scripts/dtc/dtc-lexer.lex.c_shipped
+++ /dev/null
@@ -1,2259 +0,0 @@
-#line 2 "dtc-lexer.lex.c"
-#line 4 "dtc-lexer.lex.c"
-#define  YY_INT_ALIGNED short int
-/* A lexical scanner generated by flex */
-#define FLEX_SCANNER
-#define YY_FLEX_MAJOR_VERSION 2
-#define YY_FLEX_MINOR_VERSION 6
-#define YY_FLEX_SUBMINOR_VERSION 1
-#if YY_FLEX_SUBMINOR_VERSION > 0
-#define FLEX_BETA
-#endif
-/* First, we deal with  platform-specific or compiler-specific issues. */
-/* begin standard C headers. */
-#include <stdio.h>
-#include <string.h>
-#include <errno.h>
-#include <stdlib.h>
-/* end standard C headers. */
-/* flex integer type definitions */
-#ifndef FLEXINT_H
-#define FLEXINT_H
-/* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */
-#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
-/* C99 says to define __STDC_LIMIT_MACROS before including stdint.h,
- * if you want the limit (max/min) macros for int types. 
- */
-#ifndef __STDC_LIMIT_MACROS
-#define __STDC_LIMIT_MACROS 1
-#endif
-#include <inttypes.h>
-typedef int8_t flex_int8_t;
-typedef uint8_t flex_uint8_t;
-typedef int16_t flex_int16_t;
-typedef uint16_t flex_uint16_t;
-typedef int32_t flex_int32_t;
-typedef uint32_t flex_uint32_t;
-#else
-typedef signed char flex_int8_t;
-typedef short int flex_int16_t;
-typedef int flex_int32_t;
-typedef unsigned char flex_uint8_t; 
-typedef unsigned short int flex_uint16_t;
-typedef unsigned int flex_uint32_t;
-/* Limits of integral types. */
-#ifndef INT8_MIN
-#define INT8_MIN               (-128)
-#endif
-#ifndef INT16_MIN
-#define INT16_MIN              (-32767-1)
-#endif
-#ifndef INT32_MIN
-#define INT32_MIN              (-2147483647-1)
-#endif
-#ifndef INT8_MAX
-#define INT8_MAX               (127)
-#endif
-#ifndef INT16_MAX
-#define INT16_MAX              (32767)
-#endif
-#ifndef INT32_MAX
-#define INT32_MAX              (2147483647)
-#endif
-#ifndef UINT8_MAX
-#define UINT8_MAX              (255U)
-#endif
-#ifndef UINT16_MAX
-#define UINT16_MAX             (65535U)
-#endif
-#ifndef UINT32_MAX
-#define UINT32_MAX             (4294967295U)
-#endif
-#endif /* ! C99 */
-#endif /* ! FLEXINT_H */
-/* TODO: this is always defined, so inline it */
-#define yyconst const
-#if defined(__GNUC__) && __GNUC__ >= 3
-#define yynoreturn __attribute__((__noreturn__))
-#else
-#define yynoreturn
-#endif
-/* Returned upon end-of-file. */
-#define YY_NULL 0
-/* Promotes a possibly negative, possibly signed char to an unsigned
- * integer for use as an array index.  If the signed char is negative,
- * we want to instead treat it as an 8-bit unsigned char, hence the
- * double cast.
- */
-#define YY_SC_TO_UI(c) ((unsigned int) (unsigned char) c)
-/* Enter a start condition.  This macro really ought to take a parameter,
- * but we do it the disgusting crufty way forced on us by the ()-less
- * definition of BEGIN.
- */
-#define BEGIN (yy_start) = 1 + 2 *
-/* Translate the current start state into a value that can be later handed
- * to BEGIN to return to the state.  The YYSTATE alias is for lex
- * compatibility.
- */
-#define YY_START (((yy_start) - 1) / 2)
-#define YYSTATE YY_START
-/* Action number for EOF rule of a given start state. */
-#define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1)
-/* Special action meaning "start processing a new file". */
-#define YY_NEW_FILE yyrestart(yyin  )
-#define YY_END_OF_BUFFER_CHAR 0
-/* Size of default input buffer. */
-#ifndef YY_BUF_SIZE
-#ifdef __ia64__
-/* On IA-64, the buffer size is 16k, not 8k.
- * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case.
- * Ditto for the __ia64__ case accordingly.
- */
-#define YY_BUF_SIZE 32768
-#else
-#define YY_BUF_SIZE 16384
-#endif /* __ia64__ */
-#endif
-/* The state buf must be large enough to hold one state per character in the main buffer.
- */
-#define YY_STATE_BUF_SIZE   ((YY_BUF_SIZE + 2) * sizeof(yy_state_type))
-#ifndef YY_TYPEDEF_YY_BUFFER_STATE
-#define YY_TYPEDEF_YY_BUFFER_STATE
-typedef struct yy_buffer_state *YY_BUFFER_STATE;
-#endif
-#ifndef YY_TYPEDEF_YY_SIZE_T
-#define YY_TYPEDEF_YY_SIZE_T
-typedef size_t yy_size_t;
-#endif
-extern int yyleng;
-extern FILE *yyin, *yyout;
-#define EOB_ACT_CONTINUE_SCAN 0
-#define EOB_ACT_END_OF_FILE 1
-#define EOB_ACT_LAST_MATCH 2
-    #define YY_LESS_LINENO(n)
-    #define YY_LINENO_REWIND_TO(ptr)
-    
-/* Return all but the first "n" matched characters back to the input stream. */
-#define yyless(n) \
-        do \
-                { \
-                /* Undo effects of setting up yytext. */ \
-        int yyless_macro_arg = (n); \
-        YY_LESS_LINENO(yyless_macro_arg);\
-                *yy_cp = (yy_hold_char); \
-                YY_RESTORE_YY_MORE_OFFSET \
-                (yy_c_buf_p) = yy_cp = yy_bp + yyless_macro_arg - YY_MORE_ADJ; \
-                YY_DO_BEFORE_ACTION; /* set up yytext again */ \
-                } \
-        while ( 0 )
-#define unput(c) yyunput( c, (yytext_ptr)  )
-#ifndef YY_STRUCT_YY_BUFFER_STATE
-#define YY_STRUCT_YY_BUFFER_STATE
-struct yy_buffer_state
-        {
-        FILE *yy_input_file;
-        char *yy_ch_buf;                /* input buffer */
-        char *yy_buf_pos;               /* current position in input buffer */
-        /* Size of input buffer in bytes, not including room for EOB
-         * characters.
-         */
-        int yy_buf_size;
-        /* Number of characters read into yy_ch_buf, not including EOB
-         * characters.
-         */
-        int yy_n_chars;
-        /* Whether we "own" the buffer - i.e., we know we created it,
-         * and can realloc() it to grow it, and should free() it to
-         * delete it.
-         */
-        int yy_is_our_buffer;
-        /* Whether this is an "interactive" input source; if so, and
-         * if we're using stdio for input, then we want to use getc()
-         * instead of fread(), to make sure we stop fetching input after
-         * each newline.
-         */
-        int yy_is_interactive;
-        /* Whether we're considered to be at the beginning of a line.
-         * If so, '^' rules will be active on the next match, otherwise
-         * not.
-         */
-        int yy_at_bol;
-    int yy_bs_lineno; /**< The line count. */
-    int yy_bs_column; /**< The column count. */
-        /* Whether to try to fill the input buffer when we reach the
-         * end of it.
-         */
-        int yy_fill_buffer;
-        int yy_buffer_status;
-#define YY_BUFFER_NEW 0
-#define YY_BUFFER_NORMAL 1
-        /* When an EOF's been seen but there's still some text to process
-         * then we mark the buffer as YY_EOF_PENDING, to indicate that we
-         * shouldn't try reading from the input source any more.  We might
-         * still have a bunch of tokens to match, though, because of
-         * possible backing-up.
-         *
-         * When we actually see the EOF, we change the status to "new"
-         * (via yyrestart()), so that the user can continue scanning by
-         * just pointing yyin at a new input file.
-         */
-#define YY_BUFFER_EOF_PENDING 2
-        };
-#endif /* !YY_STRUCT_YY_BUFFER_STATE */
-/* Stack of input buffers. */
-static size_t yy_buffer_stack_top = 0; /**< index of top of stack. */
-static size_t yy_buffer_stack_max = 0; /**< capacity of stack. */
-static YY_BUFFER_STATE * yy_buffer_stack = NULL; /**< Stack as an array. */
-/* We provide macros for accessing buffer states in case in the
- * future we want to put the buffer states in a more general
- * "scanner state".
- *
- * Returns the top of the stack, or NULL.
- */
-#define YY_CURRENT_BUFFER ( (yy_buffer_stack) \
-                          ? (yy_buffer_stack)[(yy_buffer_stack_top)] \
-                          : NULL)
-/* Same as previous macro, but useful when we know that the buffer stack is not
- * NULL or when we need an lvalue. For internal use only.
- */
-#define YY_CURRENT_BUFFER_LVALUE (yy_buffer_stack)[(yy_buffer_stack_top)]
-/* yy_hold_char holds the character lost when yytext is formed. */
-static char yy_hold_char;
-static int yy_n_chars;          /* number of characters read into yy_ch_buf */
-int yyleng;
-/* Points to current character in buffer. */
-static char *yy_c_buf_p = NULL;
-static int yy_init = 0;         /* whether we need to initialize */
-static int yy_start = 0;        /* start state number */
-/* Flag which is used to allow yywrap()'s to do buffer switches
- * instead of setting up a fresh yyin.  A bit of a hack ...
- */
-static int yy_did_buffer_switch_on_eof;
-void yyrestart (FILE *input_file  );
-void yy_switch_to_buffer (YY_BUFFER_STATE new_buffer  );
-YY_BUFFER_STATE yy_create_buffer (FILE *file,int size  );
-void yy_delete_buffer (YY_BUFFER_STATE b  );
-void yy_flush_buffer (YY_BUFFER_STATE b  );
-void yypush_buffer_state (YY_BUFFER_STATE new_buffer  );
-void yypop_buffer_state (void );
-static void yyensure_buffer_stack (void );
-static void yy_load_buffer_state (void );
-static void yy_init_buffer (YY_BUFFER_STATE b,FILE *file  );
-#define YY_FLUSH_BUFFER yy_flush_buffer(YY_CURRENT_BUFFER )
-YY_BUFFER_STATE yy_scan_buffer (char *base,yy_size_t size  );
-YY_BUFFER_STATE yy_scan_string (yyconst char *yy_str  );
-YY_BUFFER_STATE yy_scan_bytes (yyconst char *bytes,int len  );
-void *yyalloc (yy_size_t  );
-void *yyrealloc (void *,yy_size_t  );
-void yyfree (void *  );
-#define yy_new_buffer yy_create_buffer
-#define yy_set_interactive(is_interactive) \
-        { \
-        if ( ! YY_CURRENT_BUFFER ){ \
-        yyensure_buffer_stack (); \
-                YY_CURRENT_BUFFER_LVALUE =    \
-            yy_create_buffer(yyin,YY_BUF_SIZE ); \
-        } \
-        YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \
-        }
-#define yy_set_bol(at_bol) \
-        { \
-        if ( ! YY_CURRENT_BUFFER ){\
-        yyensure_buffer_stack (); \
-                YY_CURRENT_BUFFER_LVALUE =    \
-            yy_create_buffer(yyin,YY_BUF_SIZE ); \
-        } \
-        YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \
-        }
-#define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol)
-/* Begin user sect3 */
-#define yywrap() (/*CONSTCOND*/1)
-#define YY_SKIP_YYWRAP
-typedef unsigned char YY_CHAR;
-FILE *yyin = NULL, *yyout = NULL;
-typedef int yy_state_type;
-extern int yylineno;
-int yylineno = 1;
-extern char *yytext;
-#ifdef yytext_ptr
-#undef yytext_ptr
-#endif
-#define yytext_ptr yytext
-static yy_state_type yy_get_previous_state (void );
-static yy_state_type yy_try_NUL_trans (yy_state_type current_state  );
-static int yy_get_next_buffer (void );
-static void yynoreturn yy_fatal_error (yyconst char* msg  );
-/* Done after the current pattern has been matched and before the
- * corresponding action - sets up yytext.
- */
-#define YY_DO_BEFORE_ACTION \
-        (yytext_ptr) = yy_bp; \
-        yyleng = (int) (yy_cp - yy_bp); \
-        (yy_hold_char) = *yy_cp; \
-        *yy_cp = '\0'; \
-        (yy_c_buf_p) = yy_cp;
-#define YY_NUM_RULES 31
-#define YY_END_OF_BUFFER 32
-/* This struct is not used in this scanner,
-   but its presence is necessary. */
-struct yy_trans_info
-        {
-        flex_int32_t yy_verify;
-        flex_int32_t yy_nxt;
-        };
-static yyconst flex_int16_t yy_accept[166] =
-    {   0,
-        0,    0,    0,    0,    0,    0,    0,    0,   32,   30,
-       19,   19,   30,   30,   30,   30,   30,   30,   30,   30,
-       30,   30,   30,   30,   30,   30,   16,   17,   17,   30,
-       17,   11,   11,   19,   27,    0,    3,    0,   28,   13,
-        0,    0,   12,    0,    0,    0,    0,    0,    0,    0,
-        0,   22,   24,   26,   25,   23,    0,   10,   29,    0,
-        0,    0,   15,   15,   17,   17,   17,   11,   11,   11,
-        0,   13,    0,   12,    0,    0,    0,   21,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,   17,   11,   11,
-       11,    0,   14,   20,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,   17,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,   17,    7,    0,    0,    0,
-        0,    0,    0,    0,    2,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    4,   18,    0,    0,    5,    2,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    1,    0,    0,    0,    0,    6,    9,    0,
-        0,    0,    0,    8,    0
-    } ;
-static yyconst YY_CHAR yy_ec[256] =
-    {   0,
-        1,    1,    1,    1,    1,    1,    1,    1,    2,    3,
-        4,    4,    4,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    2,    5,    6,    7,    1,    1,    8,    9,    1,
-        1,   10,   11,   11,   12,   11,   13,   14,   15,   16,
-       16,   16,   16,   16,   16,   16,   16,   17,    1,   18,
-       19,   20,   11,   11,   21,   21,   21,   21,   21,   21,
-       22,   22,   22,   22,   22,   23,   22,   22,   22,   22,
-       22,   22,   22,   22,   24,   22,   22,   25,   22,   22,
-        1,   26,   27,    1,   22,    1,   21,   28,   29,   30,
-       31,   21,   32,   22,   33,   22,   22,   34,   35,   36,
-       37,   38,   22,   39,   40,   41,   42,   43,   22,   25,
-       44,   22,   45,   46,   47,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1
-    } ;
-static yyconst YY_CHAR yy_meta[48] =
-    {   0,
-        1,    1,    1,    1,    1,    1,    2,    3,    1,    2,
-        2,    2,    4,    5,    5,    5,    6,    1,    1,    1,
-        7,    8,    8,    8,    8,    1,    1,    7,    7,    7,
-        7,    8,    8,    8,    8,    8,    8,    8,    8,    8,
-        8,    8,    8,    8,    3,    1,    4
-    } ;
-static yyconst flex_uint16_t yy_base[180] =
-    {   0,
-        0,  393,   35,  392,   66,  391,   38,  107,  397,  401,
-       55,  113,  377,  112,  111,  111,  114,   42,  376,  106,
-      377,  347,  126,  120,    0,  147,  401,    0,  124,    0,
-      137,  158,  170,  163,  401,  153,  401,  389,  401,    0,
-      378,  120,  401,  131,  380,  386,  355,  139,  351,  355,
-      351,  401,  401,  401,  401,  401,  367,  401,  401,  185,
-      350,  346,  401,  364,    0,  185,  347,  189,  356,  355,
-        0,    0,  330,  180,  366,  141,  372,  361,  332,  338,
-      331,  341,  334,  326,  205,  331,  337,  329,  401,  341,
-      167,  316,  401,  349,  348,  320,  328,  346,  180,  318,
-      324,  209,  324,  320,  322,  342,  338,  309,  306,  315,
-      305,  315,  312,  192,  342,  341,  401,  293,  306,  282,
-      268,  252,  255,  203,  285,  282,  272,  268,  252,  233,
-      232,  239,  208,  107,  401,  401,  238,  211,  401,  211,
-      212,  208,  228,  203,  215,  207,  233,  222,  212,  211,
-      203,  227,  401,  237,  225,  204,  185,  401,  401,  149,
-      128,   88,   42,  401,  401,  253,  259,  267,  271,  275,
-      281,  288,  292,  300,  308,  312,  318,  326,  334
-    } ;
-static yyconst flex_int16_t yy_def[180] =
-    {   0,
-      165,    1,    1,    3,  165,    5,    1,    1,  165,  165,
-      165,  165,  165,  166,  167,  168,  165,  165,  165,  165,
-      169,  165,  165,  165,  170,  169,  165,  171,  172,  171,
-      171,  165,  165,  165,  165,  166,  165,  166,  165,  173,
-      165,  168,  165,  168,  174,  175,  165,  165,  165,  165,
-      165,  165,  165,  165,  165,  165,  169,  165,  165,  165,
-      165,  165,  165,  169,  171,  172,  171,  165,  165,  165,
-      176,  173,  177,  168,  174,  174,  175,  165,  165,  165,
-      165,  165,  165,  165,  165,  165,  165,  171,  165,  165,
-      176,  177,  165,  165,  165,  165,  165,  165,  165,  165,
-      165,  165,  165,  165,  171,  165,  165,  165,  165,  165,
-      165,  165,  165,  178,  165,  171,  165,  165,  165,  165,
-      165,  165,  165,  178,  165,  178,  165,  165,  165,  165,
-      165,  165,  165,  165,  165,  165,  165,  165,  165,  165,
-      165,  165,  165,  165,  165,  165,  165,  179,  165,  165,
-      165,  179,  165,  179,  165,  165,  165,  165,  165,  165,
-      165,  165,  165,  165,    0,  165,  165,  165,  165,  165,
-      165,  165,  165,  165,  165,  165,  165,  165,  165
-    } ;
-static yyconst flex_uint16_t yy_nxt[449] =
-    {   0,
-       10,   11,   12,   11,   13,   14,   10,   15,   16,   10,
-       10,   10,   17,   10,   10,   10,   10,   18,   19,   20,
-       21,   21,   21,   21,   21,   10,   10,   21,   21,   21,
-       21,   21,   21,   21,   21,   21,   21,   21,   21,   21,
-       21,   21,   21,   21,   10,   22,   10,   24,   25,   25,
-       25,   32,   33,   33,  164,   26,   34,   34,   34,   52,
-       53,   27,   26,   26,   26,   26,   10,   11,   12,   11,
-       13,   14,   28,   15,   16,   28,   28,   28,   24,   28,
-       28,   28,   10,   18,   19,   20,   29,   29,   29,   29,
-       29,   30,   10,   29,   29,   29,   29,   29,   29,   29,
-       29,   29,   29,   29,   29,   29,   29,   29,   29,   29,
-       10,   22,   10,   23,   34,   34,   34,   37,   39,   43,
-       32,   33,   33,   45,   55,   56,   46,   60,   43,   45,
-       65,  163,   46,   65,   65,   65,   44,   38,   60,   74,
-       58,   47,  141,   48,  142,   44,   49,   47,   50,   48,
-       76,   51,   62,   94,   50,   41,   44,   51,   37,   61,
-       64,   64,   64,   58,   34,   34,   34,   64,  162,   80,
-       67,   68,   68,   68,   64,   64,   64,   64,   38,   81,
-       69,   70,   71,   68,   68,   68,   60,  161,   43,   69,
-       70,   65,   69,   70,   65,   65,   65,  125,   85,   85,
-       85,   58,   68,   68,   68,   44,  102,  110,  125,  133,
-      102,   69,   70,  111,  114,  160,  159,  126,   85,   85,
-       85,  140,  140,  140,  140,  140,  140,  153,  126,  147,
-      147,  147,  153,  148,  147,  147,  147,  158,  148,  165,
-      157,  156,  155,  151,  150,  149,  146,  154,  145,  144,
-      143,  139,  154,   36,   36,   36,   36,   36,   36,   36,
-       36,   40,  138,  137,  136,   40,   40,   42,   42,   42,
-       42,   42,   42,   42,   42,   57,   57,   57,   57,   63,
-      135,   63,   65,  134,  165,   65,  133,   65,   65,   66,
-      132,  131,   66,   66,   66,   66,   72,  130,   72,   72,
-       75,   75,   75,   75,   75,   75,   75,   75,   77,   77,
-       77,   77,   77,   77,   77,   77,   91,  129,   91,   92,
-      128,   92,   92,  127,   92,   92,  124,  124,  124,  124,
-      124,  124,  124,  124,  152,  152,  152,  152,  152,  152,
-      152,  152,   60,   60,  123,  122,  121,  120,  119,  118,
-      117,   45,  116,  111,  115,  113,  112,  109,  108,  107,
-       46,  106,   93,   89,  105,  104,  103,  101,  100,   99,
-       98,   97,   96,   95,   78,   76,   93,   90,   89,   88,
-       58,   87,   86,   58,   84,   83,   82,   79,   78,   76,
-       73,  165,   59,   58,   54,   35,  165,   31,   23,   23,
-        9,  165,  165,  165,  165,  165,  165,  165,  165,  165,
-      165,  165,  165,  165,  165,  165,  165,  165,  165,  165,
-      165,  165,  165,  165,  165,  165,  165,  165,  165,  165,
-      165,  165,  165,  165,  165,  165,  165,  165,  165,  165,
-      165,  165,  165,  165,  165,  165,  165,  165
-    } ;
-static yyconst flex_int16_t yy_chk[449] =
-    {   0,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    3,    3,    3,
-        3,    7,    7,    7,  163,    3,   11,   11,   11,   18,
-       18,    3,    3,    3,    3,    3,    5,    5,    5,    5,
-        5,    5,    5,    5,    5,    5,    5,    5,    5,    5,
-        5,    5,    5,    5,    5,    5,    5,    5,    5,    5,
-        5,    5,    5,    5,    5,    5,    5,    5,    5,    5,
-        5,    5,    5,    5,    5,    5,    5,    5,    5,    5,
-        5,    5,    5,    8,   12,   12,   12,   14,   15,   16,
-        8,    8,    8,   17,   20,   20,   17,   23,   42,   24,
-       29,  162,   24,   29,   29,   29,   16,   14,   31,   44,
-       29,   17,  134,   17,  134,   42,   17,   24,   17,   24,
-       76,   17,   24,   76,   24,   15,   44,   24,   36,   23,
-       26,   26,   26,   26,   34,   34,   34,   26,  161,   48,
-       31,   32,   32,   32,   26,   26,   26,   26,   36,   48,
-       32,   32,   32,   33,   33,   33,   60,  160,   74,   91,
-       91,   66,   33,   33,   66,   66,   66,  114,   60,   60,
-       60,   66,   68,   68,   68,   74,   85,   99,  124,  133,
-      102,   68,   68,   99,  102,  157,  156,  114,   85,   85,
-       85,  133,  133,  133,  140,  140,  140,  148,  124,  143,
-      143,  143,  152,  143,  147,  147,  147,  155,  147,  154,
-      151,  150,  149,  146,  145,  144,  142,  148,  141,  138,
-      137,  132,  152,  166,  166,  166,  166,  166,  166,  166,
-      166,  167,  131,  130,  129,  167,  167,  168,  168,  168,
-      168,  168,  168,  168,  168,  169,  169,  169,  169,  170,
-      128,  170,  171,  127,  126,  171,  125,  171,  171,  172,
-      123,  122,  172,  172,  172,  172,  173,  121,  173,  173,
-      174,  174,  174,  174,  174,  174,  174,  174,  175,  175,
-      175,  175,  175,  175,  175,  175,  176,  120,  176,  177,
-      119,  177,  177,  118,  177,  177,  178,  178,  178,  178,
-      178,  178,  178,  178,  179,  179,  179,  179,  179,  179,
-      179,  179,  116,  115,  113,  112,  111,  110,  109,  108,
-      107,  106,  105,  104,  103,  101,  100,   98,   97,   96,
-       95,   94,   92,   90,   88,   87,   86,   84,   83,   82,
-       81,   80,   79,   78,   77,   75,   73,   70,   69,   67,
-       64,   62,   61,   57,   51,   50,   49,   47,   46,   45,
-       41,   38,   22,   21,   19,   13,    9,    6,    4,    2,
-      165,  165,  165,  165,  165,  165,  165,  165,  165,  165,
-      165,  165,  165,  165,  165,  165,  165,  165,  165,  165,
-      165,  165,  165,  165,  165,  165,  165,  165,  165,  165,
-      165,  165,  165,  165,  165,  165,  165,  165,  165,  165,
-      165,  165,  165,  165,  165,  165,  165,  165
-    } ;
-static yy_state_type yy_last_accepting_state;
-static char *yy_last_accepting_cpos;
-extern int yy_flex_debug;
-int yy_flex_debug = 0;
-/* The intent behind this definition is that it'll catch
- * any uses of REJECT which flex missed.
- */
-#define REJECT reject_used_but_not_detected
-#define yymore() yymore_used_but_not_detected
-#define YY_MORE_ADJ 0
-#define YY_RESTORE_YY_MORE_OFFSET
-char *yytext;
-#line 1 "dtc-lexer.l"
-/*
- * (C) Copyright David Gibson <dwg@au1.ibm.com>, IBM Corporation.  2005.
- *
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
- *                                                                   USA
- */
-#define YY_NO_INPUT 1
-#line 37 "dtc-lexer.l"
-#include "dtc.h"
-#include "srcpos.h"
-#include "dtc-parser.tab.h"
-YYLTYPE yylloc;
-extern bool treesource_error;
-/* CAUTION: this will stop working if we ever use yyless() or yyunput() */
-#define YY_USER_ACTION \
-        { \
-                srcpos_update(&yylloc, yytext, yyleng); \
-        }
-/*#define LEXDEBUG      1*/
-#ifdef LEXDEBUG
-#define DPRINT(fmt, ...)        fprintf(stderr, fmt, ##__VA_ARGS__)
-#else
-#define DPRINT(fmt, ...)        do { } while (0)
-#endif
-static int dts_version = 1;
-#define BEGIN_DEFAULT()         DPRINT("<V1>\n"); \
-                                BEGIN(V1); \
-static void push_input_file(const char *filename);
-static bool pop_input_file(void);
-static void PRINTF(1, 2) lexical_error(const char *fmt, ...);
-#line 661 "dtc-lexer.lex.c"
-#define INITIAL 0
-#define BYTESTRING 1
-#define PROPNODENAME 2
-#define V1 3
-#ifndef YY_NO_UNISTD_H
-/* Special case for "unistd.h", since it is non-ANSI. We include it way
- * down here because we want the user's section 1 to have been scanned first.
- * The user has a chance to override it with an option.
- */
-#include <unistd.h>
-#endif
-#ifndef YY_EXTRA_TYPE
-#define YY_EXTRA_TYPE void *
-#endif
-static int yy_init_globals (void );
-/* Accessor methods to globals.
-   These are made visible to non-reentrant scanners for convenience. */
-int yylex_destroy (void );
-int yyget_debug (void );
-void yyset_debug (int debug_flag  );
-YY_EXTRA_TYPE yyget_extra (void );
-void yyset_extra (YY_EXTRA_TYPE user_defined  );
-FILE *yyget_in (void );
-void yyset_in  (FILE * _in_str  );
-FILE *yyget_out (void );
-void yyset_out  (FILE * _out_str  );
-                        int yyget_leng (void );
-char *yyget_text (void );
-int yyget_lineno (void );
-void yyset_lineno (int _line_number  );
-/* Macros after this point can all be overridden by user definitions in
- * section 1.
- */
-#ifndef YY_SKIP_YYWRAP
-#ifdef __cplusplus
-extern "C" int yywrap (void );
-#else
-extern int yywrap (void );
-#endif
-#endif
-#ifndef YY_NO_UNPUT
-    
-#endif
-#ifndef yytext_ptr
-static void yy_flex_strncpy (char *,yyconst char *,int );
-#endif
-#ifdef YY_NEED_STRLEN
-static int yy_flex_strlen (yyconst char * );
-#endif
-#ifndef YY_NO_INPUT
-#ifdef __cplusplus
-static int yyinput (void );
-#else
-static int input (void );
-#endif
-#endif
-/* Amount of stuff to slurp up with each read. */
-#ifndef YY_READ_BUF_SIZE
-#ifdef __ia64__
-/* On IA-64, the buffer size is 16k, not 8k */
-#define YY_READ_BUF_SIZE 16384
-#else
-#define YY_READ_BUF_SIZE 8192
-#endif /* __ia64__ */
-#endif
-/* Copy whatever the last rule matched to the standard output. */
-#ifndef ECHO
-/* This used to be an fputs(), but since the string might contain NUL's,
- * we now use fwrite().
- */
-#define ECHO do { if (fwrite( yytext, (size_t) yyleng, 1, yyout )) {} } while (0)
-#endif
-/* Gets input and stuffs it into "buf".  number of characters read, or YY_NULL,
- * is returned in "result".
- */
-#ifndef YY_INPUT
-#define YY_INPUT(buf,result,max_size) \
-        if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
-                { \
-                int c = '*'; \
-                size_t n; \
-                for ( n = 0; n < max_size && \
-                             (c = getc( yyin )) != EOF && c != '\n'; ++n ) \
-                        buf[n] = (char) c; \
-                if ( c == '\n' ) \
-                        buf[n++] = (char) c; \
-                if ( c == EOF && ferror( yyin ) ) \
-                        YY_FATAL_ERROR( "input in flex scanner failed" ); \
-                result = n; \
-                } \
-        else \
-                { \
-                errno=0; \
-                while ( (result = (int) fread(buf, 1, max_size, yyin))==0 && ferror(yyin)) \
-                        { \
-                        if( errno != EINTR) \
-                                { \
-                                YY_FATAL_ERROR( "input in flex scanner failed" ); \
-                                break; \
-                                } \
-                        errno=0; \
-                        clearerr(yyin); \
-                        } \
-                }\
-\
-#endif
-/* No semi-colon after return; correct usage is to write "yyterminate();" -
- * we don't want an extra ';' after the "return" because that will cause
- * some compilers to complain about unreachable statements.
- */
-#ifndef yyterminate
-#define yyterminate() return YY_NULL
-#endif
-/* Number of entries by which start-condition stack grows. */
-#ifndef YY_START_STACK_INCR
-#define YY_START_STACK_INCR 25
-#endif
-/* Report a fatal error. */
-#ifndef YY_FATAL_ERROR
-#define YY_FATAL_ERROR(msg) yy_fatal_error( msg )
-#endif
-/* end tables serialization structures and prototypes */
-/* Default declaration of generated scanner - a define so the user can
- * easily add parameters.
- */
-#ifndef YY_DECL
-#define YY_DECL_IS_OURS 1
-extern int yylex (void);
-#define YY_DECL int yylex (void)
-#endif /* !YY_DECL */
-/* Code executed at the beginning of each rule, after yytext and yyleng
- * have been set up.
- */
-#ifndef YY_USER_ACTION
-#define YY_USER_ACTION
-#endif
-/* Code executed at the end of each rule. */
-#ifndef YY_BREAK
-#define YY_BREAK /*LINTED*/break;
-#endif
-#define YY_RULE_SETUP \
-        if ( yyleng > 0 ) \
-                YY_CURRENT_BUFFER_LVALUE->yy_at_bol = \
-                                (yytext[yyleng - 1] == '\n'); \
-        YY_USER_ACTION
-/** The main scanner function which does all the work.
- */
-YY_DECL
-{
-        yy_state_type yy_current_state;
-        char *yy_cp, *yy_bp;
-        int yy_act;
-    
-        if ( !(yy_init) )
-                {
-                (yy_init) = 1;
-#ifdef YY_USER_INIT
-                YY_USER_INIT;
-#endif
-                if ( ! (yy_start) )
-                        (yy_start) = 1; /* first start state */
-                if ( ! yyin )
-                        yyin = stdin;
-                if ( ! yyout )
-                        yyout = stdout;
-                if ( ! YY_CURRENT_BUFFER ) {
-                        yyensure_buffer_stack ();
-                        YY_CURRENT_BUFFER_LVALUE =
-                                yy_create_buffer(yyin,YY_BUF_SIZE );
-                }
-                yy_load_buffer_state( );
-                }
-        {
-#line 69 "dtc-lexer.l"
-#line 885 "dtc-lexer.lex.c"
-        while ( /*CONSTCOND*/1 )                /* loops until end-of-file is reached */
-                {
-                yy_cp = (yy_c_buf_p);
-                /* Support of yytext. */
-                *yy_cp = (yy_hold_char);
-                /* yy_bp points to the position in yy_ch_buf of the start of
-                 * the current run.
-                 */
-                yy_bp = yy_cp;
-                yy_current_state = (yy_start);
-                yy_current_state += YY_AT_BOL();
-yy_match:
-                do
-                        {
-                        YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)] ;
-                        if ( yy_accept[yy_current_state] )
-                                {
-                                (yy_last_accepting_state) = yy_current_state;
-                                (yy_last_accepting_cpos) = yy_cp;
-                                }
-                        while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
-                                {
-                                yy_current_state = (int) yy_def[yy_current_state];
-                                if ( yy_current_state >= 166 )
-                                        yy_c = yy_meta[(unsigned int) yy_c];
-                                }
-                        yy_current_state = yy_nxt[yy_base[yy_current_state] + (flex_int16_t) yy_c];
-                        ++yy_cp;
-                        }
-                while ( yy_current_state != 165 );
-                yy_cp = (yy_last_accepting_cpos);
-                yy_current_state = (yy_last_accepting_state);
-yy_find_action:
-                yy_act = yy_accept[yy_current_state];
-                YY_DO_BEFORE_ACTION;
-do_action:      /* This label is used only to access EOF actions. */
-                switch ( yy_act )
-        { /* beginning of action switch */
-                        case 0: /* must back up */
-                        /* undo the effects of YY_DO_BEFORE_ACTION */
-                        *yy_cp = (yy_hold_char);
-                        yy_cp = (yy_last_accepting_cpos);
-                        yy_current_state = (yy_last_accepting_state);
-                        goto yy_find_action;
-case 1:
-/* rule 1 can match eol */
-YY_RULE_SETUP
-#line 70 "dtc-lexer.l"
-{
-                        char *name = strchr(yytext, '\"') + 1;
-                        yytext[yyleng-1] = '\0';
-                        push_input_file(name);
-                }
-        YY_BREAK
-case 2:
-/* rule 2 can match eol */
-YY_RULE_SETUP
-#line 76 "dtc-lexer.l"
-{
-                        char *line, *fnstart, *fnend;
-                        struct data fn;
-                        /* skip text before line # */
-                        line = yytext;
-                        while (!isdigit((unsigned char)*line))
-                                line++;
-                        /* regexp ensures that first and list "
-                         * in the whole yytext are those at
-                         * beginning and end of the filename string */
-                        fnstart = memchr(yytext, '"', yyleng);
-                        for (fnend = yytext + yyleng - 1;
-                             *fnend != '"'; fnend--)
-                                ;
-                        assert(fnstart && fnend && (fnend > fnstart));
-                        fn = data_copy_escape_string(fnstart + 1,
-                                                     fnend - fnstart - 1);
-                        /* Don't allow nuls in filenames */
-                        if (memchr(fn.val, '\0', fn.len - 1))
-                                lexical_error("nul in line number directive");
-                        /* -1 since #line is the number of the next line */
-                        srcpos_set_line(xstrdup(fn.val), atoi(line) - 1);
-                        data_free(fn);
-                }
-        YY_BREAK
-case YY_STATE_EOF(INITIAL):
-case YY_STATE_EOF(BYTESTRING):
-case YY_STATE_EOF(PROPNODENAME):
-case YY_STATE_EOF(V1):
-#line 105 "dtc-lexer.l"
-{
-                        if (!pop_input_file()) {
-                                yyterminate();
-                        }
-                }
-        YY_BREAK
-case 3:
-/* rule 3 can match eol */
-YY_RULE_SETUP
-#line 111 "dtc-lexer.l"
-{
-                        DPRINT("String: %s\n", yytext);
-                        yylval.data = data_copy_escape_string(yytext+1,
-                                        yyleng-2);
-                        return DT_STRING;
-                }
-        YY_BREAK
-case 4:
-YY_RULE_SETUP
-#line 118 "dtc-lexer.l"
-{
-                        DPRINT("Keyword: /dts-v1/\n");
-                        dts_version = 1;
-                        BEGIN_DEFAULT();
-                        return DT_V1;
-                }
-        YY_BREAK
-case 5:
-YY_RULE_SETUP
-#line 125 "dtc-lexer.l"
-{
-                        DPRINT("Keyword: /plugin/\n");
-                        return DT_PLUGIN;
-                }
-        YY_BREAK
-case 6:
-YY_RULE_SETUP
-#line 130 "dtc-lexer.l"
-{
-                        DPRINT("Keyword: /memreserve/\n");
-                        BEGIN_DEFAULT();
-                        return DT_MEMRESERVE;
-                }
-        YY_BREAK
-case 7:
-YY_RULE_SETUP
-#line 136 "dtc-lexer.l"
-{
-                        DPRINT("Keyword: /bits/\n");
-                        BEGIN_DEFAULT();
-                        return DT_BITS;
-                }
-        YY_BREAK
-case 8:
-YY_RULE_SETUP
-#line 142 "dtc-lexer.l"
-{
-                        DPRINT("Keyword: /delete-property/\n");
-                        DPRINT("<PROPNODENAME>\n");
-                        BEGIN(PROPNODENAME);
-                        return DT_DEL_PROP;
-                }
-        YY_BREAK
-case 9:
-YY_RULE_SETUP
-#line 149 "dtc-lexer.l"
-{
-                        DPRINT("Keyword: /delete-node/\n");
-                        DPRINT("<PROPNODENAME>\n");
-                        BEGIN(PROPNODENAME);
-                        return DT_DEL_NODE;
-                }
-        YY_BREAK
-case 10:
-YY_RULE_SETUP
-#line 156 "dtc-lexer.l"
-{
-                        DPRINT("Label: %s\n", yytext);
-                        yylval.labelref = xstrdup(yytext);
-                        yylval.labelref[yyleng-1] = '\0';
-                        return DT_LABEL;
-                }
-        YY_BREAK
-case 11:
-YY_RULE_SETUP
-#line 163 "dtc-lexer.l"
-{
-                        char *e;
-                        DPRINT("Integer Literal: '%s'\n", yytext);
-                        errno = 0;
-                        yylval.integer = strtoull(yytext, &e, 0);
-                        if (*e && e[strspn(e, "UL")]) {
-                                lexical_error("Bad integer literal '%s'",
-                                              yytext);
-                        }
-                        if (errno == ERANGE)
-                                lexical_error("Integer literal '%s' out of range",
-                                              yytext);
-                        else
-                                /* ERANGE is the only strtoull error triggerable
-                                 *  by strings matching the pattern */
-                                assert(errno == 0);
-                        return DT_LITERAL;
-                }
-        YY_BREAK
-case 12:
-/* rule 12 can match eol */
-YY_RULE_SETUP
-#line 185 "dtc-lexer.l"
-{
-                        struct data d;
-                        DPRINT("Character literal: %s\n", yytext);
-                        d = data_copy_escape_string(yytext+1, yyleng-2);
-                        if (d.len == 1) {
-                                lexical_error("Empty character literal");
-                                yylval.integer = 0;
-                        } else {
-                                yylval.integer = (unsigned char)d.val[0];
-                                if (d.len > 2)
-                                        lexical_error("Character literal has %d"
-                                                      " characters instead of 1",
-                                                      d.len - 1);
-                        }
-                        data_free(d);
-                        return DT_CHAR_LITERAL;
-                }
-        YY_BREAK
-case 13:
-YY_RULE_SETUP
-#line 206 "dtc-lexer.l"
-{       /* label reference */
-                        DPRINT("Ref: %s\n", yytext+1);
-                        yylval.labelref = xstrdup(yytext+1);
-                        return DT_REF;
-                }
-        YY_BREAK
-case 14:
-YY_RULE_SETUP
-#line 212 "dtc-lexer.l"
-{       /* new-style path reference */
-                        yytext[yyleng-1] = '\0';
-                        DPRINT("Ref: %s\n", yytext+2);
-                        yylval.labelref = xstrdup(yytext+2);
-                        return DT_REF;
-                }
-        YY_BREAK
-case 15:
-YY_RULE_SETUP
-#line 219 "dtc-lexer.l"
-{
-                        yylval.byte = strtol(yytext, NULL, 16);
-                        DPRINT("Byte: %02x\n", (int)yylval.byte);
-                        return DT_BYTE;
-                }
-        YY_BREAK
-case 16:
-YY_RULE_SETUP
-#line 225 "dtc-lexer.l"
-{
-                        DPRINT("/BYTESTRING\n");
-                        BEGIN_DEFAULT();
-                        return ']';
-                }
-        YY_BREAK
-case 17:
-YY_RULE_SETUP
-#line 231 "dtc-lexer.l"
-{
-                        DPRINT("PropNodeName: %s\n", yytext);
-                        yylval.propnodename = xstrdup((yytext[0] == '\\') ?
-                                                        yytext + 1 : yytext);
-                        BEGIN_DEFAULT();
-                        return DT_PROPNODENAME;
-                }
-        YY_BREAK
-case 18:
-YY_RULE_SETUP
-#line 239 "dtc-lexer.l"
-{
-                        DPRINT("Binary Include\n");
-                        return DT_INCBIN;
-                }
-        YY_BREAK
-case 19:
-/* rule 19 can match eol */
-YY_RULE_SETUP
-#line 244 "dtc-lexer.l"
-/* eat whitespace */
-        YY_BREAK
-case 20:
-/* rule 20 can match eol */
-YY_RULE_SETUP
-#line 245 "dtc-lexer.l"
-/* eat C-style comments */
-        YY_BREAK
-case 21:
-/* rule 21 can match eol */
-YY_RULE_SETUP
-#line 246 "dtc-lexer.l"
-/* eat C++-style comments */
-        YY_BREAK
-case 22:
-YY_RULE_SETUP
-#line 248 "dtc-lexer.l"
-{ return DT_LSHIFT; };
-        YY_BREAK
-case 23:
-YY_RULE_SETUP
-#line 249 "dtc-lexer.l"
-{ return DT_RSHIFT; };
-        YY_BREAK
-case 24:
-YY_RULE_SETUP
-#line 250 "dtc-lexer.l"
-{ return DT_LE; };
-        YY_BREAK
-case 25:
-YY_RULE_SETUP
-#line 251 "dtc-lexer.l"
-{ return DT_GE; };
-        YY_BREAK
-case 26:
-YY_RULE_SETUP
-#line 252 "dtc-lexer.l"
-{ return DT_EQ; };
-        YY_BREAK
-case 27:
-YY_RULE_SETUP
-#line 253 "dtc-lexer.l"
-{ return DT_NE; };
-        YY_BREAK
-case 28:
-YY_RULE_SETUP
-#line 254 "dtc-lexer.l"
-{ return DT_AND; };
-        YY_BREAK
-case 29:
-YY_RULE_SETUP
-#line 255 "dtc-lexer.l"
-{ return DT_OR; };
-        YY_BREAK
-case 30:
-YY_RULE_SETUP
-#line 257 "dtc-lexer.l"
-{
-                        DPRINT("Char: %c (\\x%02x)\n", yytext[0],
-                                (unsigned)yytext[0]);
-                        if (yytext[0] == '[') {
-                                DPRINT("<BYTESTRING>\n");
-                                BEGIN(BYTESTRING);
-                        }
-                        if ((yytext[0] == '{')
-                            || (yytext[0] == ';')) {
-                                DPRINT("<PROPNODENAME>\n");
-                                BEGIN(PROPNODENAME);
-                        }
-                        return yytext[0];
-                }
-        YY_BREAK
-case 31:
-YY_RULE_SETUP
-#line 272 "dtc-lexer.l"
-ECHO;
-        YY_BREAK
-#line 1257 "dtc-lexer.lex.c"
-        case YY_END_OF_BUFFER:
-                {
-                /* Amount of text matched not including the EOB char. */
-                int yy_amount_of_matched_text = (int) (yy_cp - (yytext_ptr)) - 1;
-                /* Undo the effects of YY_DO_BEFORE_ACTION. */
-                *yy_cp = (yy_hold_char);
-                YY_RESTORE_YY_MORE_OFFSET
-                if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_NEW )
-                        {
-                        /* We're scanning a new file or input source.  It's
-                         * possible that this happened because the user
-                         * just pointed yyin at a new source and called
-                         * yylex().  If so, then we have to assure
-                         * consistency between YY_CURRENT_BUFFER and our
-                         * globals.  Here is the right place to do so, because
-                         * this is the first action (other than possibly a
-                         * back-up) that will match for the new input source.
-                         */
-                        (yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
-                        YY_CURRENT_BUFFER_LVALUE->yy_input_file = yyin;
-                        YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = YY_BUFFER_NORMAL;
-                        }
-                /* Note that here we test for yy_c_buf_p "<=" to the position
-                 * of the first EOB in the buffer, since yy_c_buf_p will
-                 * already have been incremented past the NUL character
-                 * (since all states make transitions on EOB to the
-                 * end-of-buffer state).  Contrast this with the test
-                 * in input().
-                 */
-                if ( (yy_c_buf_p) <= &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] )
-                        { /* This was really a NUL. */
-                        yy_state_type yy_next_state;
-                        (yy_c_buf_p) = (yytext_ptr) + yy_amount_of_matched_text;
-                        yy_current_state = yy_get_previous_state(  );
-                        /* Okay, we're now positioned to make the NUL
-                         * transition.  We couldn't have
-                         * yy_get_previous_state() go ahead and do it
-                         * for us because it doesn't know how to deal
-                         * with the possibility of jamming (and we don't
-                         * want to build jamming into it because then it
-                         * will run more slowly).
-                         */
-                        yy_next_state = yy_try_NUL_trans( yy_current_state );
-                        yy_bp = (yytext_ptr) + YY_MORE_ADJ;
-                        if ( yy_next_state )
-                                {
-                                /* Consume the NUL. */
-                                yy_cp = ++(yy_c_buf_p);
-                                yy_current_state = yy_next_state;
-                                goto yy_match;
-                                }
-                        else
-                                {
-                                yy_cp = (yy_last_accepting_cpos);
-                                yy_current_state = (yy_last_accepting_state);
-                                goto yy_find_action;
-                                }
-                        }
-                else switch ( yy_get_next_buffer(  ) )
-                        {
-                        case EOB_ACT_END_OF_FILE:
-                                {
-                                (yy_did_buffer_switch_on_eof) = 0;
-                                if ( yywrap( ) )
-                                        {
-                                        /* Note: because we've taken care in
-                                         * yy_get_next_buffer() to have set up
-                                         * yytext, we can now set up
-                                         * yy_c_buf_p so that if some total
-                                         * hoser (like flex itself) wants to
-                                         * call the scanner after we return the
-                                         * YY_NULL, it'll still work - another
-                                         * YY_NULL will get returned.
-                                         */
-                                        (yy_c_buf_p) = (yytext_ptr) + YY_MORE_ADJ;
-                                        yy_act = YY_STATE_EOF(YY_START);
-                                        goto do_action;
-                                        }
-                                else
-                                        {
-                                        if ( ! (yy_did_buffer_switch_on_eof) )
-                                                YY_NEW_FILE;
-                                        }
-                                break;
-                                }
-                        case EOB_ACT_CONTINUE_SCAN:
-                                (yy_c_buf_p) =
-                                        (yytext_ptr) + yy_amount_of_matched_text;
-                                yy_current_state = yy_get_previous_state(  );
-                                yy_cp = (yy_c_buf_p);
-                                yy_bp = (yytext_ptr) + YY_MORE_ADJ;
-                                goto yy_match;
-                        case EOB_ACT_LAST_MATCH:
-                                (yy_c_buf_p) =
-                                &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)];
-                                yy_current_state = yy_get_previous_state(  );
-                                yy_cp = (yy_c_buf_p);
-                                yy_bp = (yytext_ptr) + YY_MORE_ADJ;
-                                goto yy_find_action;
-                        }
-                break;
-                }
-        default:
-                YY_FATAL_ERROR(
-                        "fatal flex scanner internal error--no action found" );
-        } /* end of action switch */
-                } /* end of scanning one token */
-        } /* end of user's declarations */
-} /* end of yylex */
-/* yy_get_next_buffer - try to read in a new buffer
- *
- * Returns a code representing an action:
- *      EOB_ACT_LAST_MATCH -
- *      EOB_ACT_CONTINUE_SCAN - continue scanning from current position
- *      EOB_ACT_END_OF_FILE - end of file
- */
-static int yy_get_next_buffer (void)
-{
-        char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
-        char *source = (yytext_ptr);
-        int number_to_move, i;
-        int ret_val;
-        if ( (yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] )
-                YY_FATAL_ERROR(
-                "fatal flex scanner internal error--end of buffer missed" );
-        if ( YY_CURRENT_BUFFER_LVALUE->yy_fill_buffer == 0 )
-                { /* Don't try to fill the buffer, so this is an EOF. */
-                if ( (yy_c_buf_p) - (yytext_ptr) - YY_MORE_ADJ == 1 )
-                        {
-                        /* We matched a single character, the EOB, so
-                         * treat this as a final EOF.
-                         */
-                        return EOB_ACT_END_OF_FILE;
-                        }
-                else
-                        {
-                        /* We matched some text prior to the EOB, first
-                         * process it.
-                         */
-                        return EOB_ACT_LAST_MATCH;
-                        }
-                }
-        /* Try to read more data. */
-        /* First move last chars to start of buffer. */
-        number_to_move = (int) ((yy_c_buf_p) - (yytext_ptr) - 1);
-        for ( i = 0; i < number_to_move; ++i )
-                *(dest++) = *(source++);
-        if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_EOF_PENDING )
-                /* don't do the read, it's not guaranteed to return an EOF,
-                 * just force an EOF
-                 */
-                YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars) = 0;
-        else
-                {
-                        int num_to_read =
-                        YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
-                while ( num_to_read <= 0 )
-                        { /* Not enough room in the buffer - grow it. */
-                        /* just a shorter name for the current buffer */
-                        YY_BUFFER_STATE b = YY_CURRENT_BUFFER_LVALUE;
-                        int yy_c_buf_p_offset =
-                                (int) ((yy_c_buf_p) - b->yy_ch_buf);
-                        if ( b->yy_is_our_buffer )
-                                {
-                                int new_size = b->yy_buf_size * 2;
-                                if ( new_size <= 0 )
-                                        b->yy_buf_size += b->yy_buf_size / 8;
-                                else
-                                        b->yy_buf_size *= 2;
-                                b->yy_ch_buf = (char *)
-                                        /* Include room in for 2 EOB chars. */
-                                        yyrealloc((void *) b->yy_ch_buf,b->yy_buf_size + 2  );
-                                }
-                        else
-                                /* Can't grow it, we don't own it. */
-                                b->yy_ch_buf = NULL;
-                        if ( ! b->yy_ch_buf )
-                                YY_FATAL_ERROR(
-                                "fatal error - scanner input buffer overflow" );
-                        (yy_c_buf_p) = &b->yy_ch_buf[yy_c_buf_p_offset];
-                        num_to_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size -
-                                                number_to_move - 1;
-                        }
-                if ( num_to_read > YY_READ_BUF_SIZE )
-                        num_to_read = YY_READ_BUF_SIZE;
-                /* Read in more data. */
-                YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]),
-                        (yy_n_chars), num_to_read );
-                YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
-                }
-        if ( (yy_n_chars) == 0 )
-                {
-                if ( number_to_move == YY_MORE_ADJ )
-                        {
-                        ret_val = EOB_ACT_END_OF_FILE;
-                        yyrestart(yyin  );
-                        }
-                else
-                        {
-                        ret_val = EOB_ACT_LAST_MATCH;
-                        YY_CURRENT_BUFFER_LVALUE->yy_buffer_status =
-                                YY_BUFFER_EOF_PENDING;
-                        }
-                }
-        else
-                ret_val = EOB_ACT_CONTINUE_SCAN;
-        if (((yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) {
-                /* Extend the array by 50%, plus the number we really need. */
-                int new_size = (yy_n_chars) + number_to_move + ((yy_n_chars) >> 1);
-                YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) yyrealloc((void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,new_size  );
-                if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
-                        YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" );
-        }
-        (yy_n_chars) += number_to_move;
-        YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] = YY_END_OF_BUFFER_CHAR;
-        YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] = YY_END_OF_BUFFER_CHAR;
-        (yytext_ptr) = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[0];
-        return ret_val;
-}
-/* yy_get_previous_state - get the state just before the EOB char was reached */
-    static yy_state_type yy_get_previous_state (void)
-{
-        yy_state_type yy_current_state;
-        char *yy_cp;
-    
-        yy_current_state = (yy_start);
-        yy_current_state += YY_AT_BOL();
-        for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp )
-                {
-                YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
-                if ( yy_accept[yy_current_state] )
-                        {
-                        (yy_last_accepting_state) = yy_current_state;
-                        (yy_last_accepting_cpos) = yy_cp;
-                        }
-                while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
-                        {
-                        yy_current_state = (int) yy_def[yy_current_state];
-                        if ( yy_current_state >= 166 )
-                                yy_c = yy_meta[(unsigned int) yy_c];
-                        }
-                yy_current_state = yy_nxt[yy_base[yy_current_state] + (flex_int16_t) yy_c];
-                }
-        return yy_current_state;
-}
-/* yy_try_NUL_trans - try to make a transition on the NUL character
- *
- * synopsis
- *      next_state = yy_try_NUL_trans( current_state );
- */
-    static yy_state_type yy_try_NUL_trans  (yy_state_type yy_current_state )
-{
-        int yy_is_jam;
-        char *yy_cp = (yy_c_buf_p);
-        YY_CHAR yy_c = 1;
-        if ( yy_accept[yy_current_state] )
-                {
-                (yy_last_accepting_state) = yy_current_state;
-                (yy_last_accepting_cpos) = yy_cp;
-                }
-        while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
-                {
-                yy_current_state = (int) yy_def[yy_current_state];
-                if ( yy_current_state >= 166 )
-                        yy_c = yy_meta[(unsigned int) yy_c];
-                }
-        yy_current_state = yy_nxt[yy_base[yy_current_state] + (flex_int16_t) yy_c];
-        yy_is_jam = (yy_current_state == 165);
-                return yy_is_jam ? 0 : yy_current_state;
-}
-#ifndef YY_NO_UNPUT
-#endif
-#ifndef YY_NO_INPUT
-#ifdef __cplusplus
-    static int yyinput (void)
-#else
-    static int input  (void)
-#endif
-{
-        int c;
-    
-        *(yy_c_buf_p) = (yy_hold_char);
-        if ( *(yy_c_buf_p) == YY_END_OF_BUFFER_CHAR )
-                {
-                /* yy_c_buf_p now points to the character we want to return.
-                 * If this occurs *before* the EOB characters, then it's a
-                 * valid NUL; if not, then we've hit the end of the buffer.
-                 */
-                if ( (yy_c_buf_p) < &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] )
-                        /* This was really a NUL. */
-                        *(yy_c_buf_p) = '\0';
-                else
-                        { /* need more input */
-                        int offset = (yy_c_buf_p) - (yytext_ptr);
-                        ++(yy_c_buf_p);
-                        switch ( yy_get_next_buffer(  ) )
-                                {
-                                case EOB_ACT_LAST_MATCH:
-                                        /* This happens because yy_g_n_b()
-                                         * sees that we've accumulated a
-                                         * token and flags that we need to
-                                         * try matching the token before
-                                         * proceeding.  But for input(),
-                                         * there's no matching to consider.
-                                         * So convert the EOB_ACT_LAST_MATCH
-                                         * to EOB_ACT_END_OF_FILE.
-                                         */
-                                        /* Reset buffer status. */
-                                        yyrestart(yyin );
-                                        /*FALLTHROUGH*/
-                                case EOB_ACT_END_OF_FILE:
-                                        {
-                                        if ( yywrap( ) )
-                                                return 0;
-                                        if ( ! (yy_did_buffer_switch_on_eof) )
-                                                YY_NEW_FILE;
-#ifdef __cplusplus
-                                        return yyinput();
-#else
-                                        return input();
-#endif
-                                        }
-                                case EOB_ACT_CONTINUE_SCAN:
-                                        (yy_c_buf_p) = (yytext_ptr) + offset;
-                                        break;
-                                }
-                        }
-                }
-        c = *(unsigned char *) (yy_c_buf_p);    /* cast for 8-bit char's */
-        *(yy_c_buf_p) = '\0';   /* preserve yytext */
-        (yy_hold_char) = *++(yy_c_buf_p);
-        YY_CURRENT_BUFFER_LVALUE->yy_at_bol = (c == '\n');
-        return c;
-}
-#endif  /* ifndef YY_NO_INPUT */
-/** Immediately switch to a different input stream.
- * @param input_file A readable stream.
- * 
- * @note This function does not reset the start condition to @c INITIAL .
- */
-    void yyrestart  (FILE * input_file )
-{
-    
-        if ( ! YY_CURRENT_BUFFER ){
-        yyensure_buffer_stack ();
-                YY_CURRENT_BUFFER_LVALUE =
-            yy_create_buffer(yyin,YY_BUF_SIZE );
-        }
-        yy_init_buffer(YY_CURRENT_BUFFER,input_file );
-        yy_load_buffer_state( );
-}
-/** Switch to a different input buffer.
- * @param new_buffer The new input buffer.
- * 
- */
-    void yy_switch_to_buffer  (YY_BUFFER_STATE  new_buffer )
-{
-    
-        /* TODO. We should be able to replace this entire function body
-         * with
-         *              yypop_buffer_state();
-         *              yypush_buffer_state(new_buffer);
-     */
-        yyensure_buffer_stack ();
-        if ( YY_CURRENT_BUFFER == new_buffer )
-                return;
-        if ( YY_CURRENT_BUFFER )
-                {
-                /* Flush out information for old buffer. */
-                *(yy_c_buf_p) = (yy_hold_char);
-                YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p);
-                YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
-                }
-        YY_CURRENT_BUFFER_LVALUE = new_buffer;
-        yy_load_buffer_state( );
-        /* We don't actually know whether we did this switch during
-         * EOF (yywrap()) processing, but the only time this flag
-         * is looked at is after yywrap() is called, so it's safe
-         * to go ahead and always set it.
-         */
-        (yy_did_buffer_switch_on_eof) = 1;
-}
-static void yy_load_buffer_state  (void)
-{
-        (yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
-        (yytext_ptr) = (yy_c_buf_p) = YY_CURRENT_BUFFER_LVALUE->yy_buf_pos;
-        yyin = YY_CURRENT_BUFFER_LVALUE->yy_input_file;
-        (yy_hold_char) = *(yy_c_buf_p);
-}
-/** Allocate and initialize an input buffer state.
- * @param file A readable stream.
- * @param size The character buffer size in bytes. When in doubt, use @c YY_BUF_SIZE.
- * 
- * @return the allocated buffer state.
- */
-    YY_BUFFER_STATE yy_create_buffer  (FILE * file, int  size )
-{
-        YY_BUFFER_STATE b;
-    
-        b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state )  );
-        if ( ! b )
-                YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
-        b->yy_buf_size = (yy_size_t)size;
-        /* yy_ch_buf has to be 2 characters longer than the size given because
-         * we need to put in 2 end-of-buffer characters.
-         */
-        b->yy_ch_buf = (char *) yyalloc(b->yy_buf_size + 2  );
-        if ( ! b->yy_ch_buf )
-                YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
-        b->yy_is_our_buffer = 1;
-        yy_init_buffer(b,file );
-        return b;
-}
-/** Destroy the buffer.
- * @param b a buffer created with yy_create_buffer()
- * 
- */
-    void yy_delete_buffer (YY_BUFFER_STATE  b )
-{
-    
-        if ( ! b )
-                return;
-        if ( b == YY_CURRENT_BUFFER ) /* Not sure if we should pop here. */
-                YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0;
-        if ( b->yy_is_our_buffer )
-                yyfree((void *) b->yy_ch_buf  );
-        yyfree((void *) b  );
-}
-/* Initializes or reinitializes a buffer.
- * This function is sometimes called more than once on the same buffer,
- * such as during a yyrestart() or at EOF.
- */
-    static void yy_init_buffer  (YY_BUFFER_STATE  b, FILE * file )
-{
-        int oerrno = errno;
-    
-        yy_flush_buffer(b );
-        b->yy_input_file = file;
-        b->yy_fill_buffer = 1;
-    /* If b is the current buffer, then yy_init_buffer was _probably_
-     * called from yyrestart() or through yy_get_next_buffer.
-     * In that case, we don't want to reset the lineno or column.
-     */
-    if (b != YY_CURRENT_BUFFER){
-        b->yy_bs_lineno = 1;
-        b->yy_bs_column = 0;
-    }
-        b->yy_is_interactive = 0;
-    
-        errno = oerrno;
-}
-/** Discard all buffered characters. On the next scan, YY_INPUT will be called.
- * @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER.
- * 
- */
-    void yy_flush_buffer (YY_BUFFER_STATE  b )
-{
-        if ( ! b )
-                return;
-        b->yy_n_chars = 0;
-        /* We always need two end-of-buffer characters.  The first causes
-         * a transition to the end-of-buffer state.  The second causes
-         * a jam in that state.
-         */
-        b->yy_ch_buf[0] = YY_END_OF_BUFFER_CHAR;
-        b->yy_ch_buf[1] = YY_END_OF_BUFFER_CHAR;
-        b->yy_buf_pos = &b->yy_ch_buf[0];
-        b->yy_at_bol = 1;
-        b->yy_buffer_status = YY_BUFFER_NEW;
-        if ( b == YY_CURRENT_BUFFER )
-                yy_load_buffer_state( );
-}
-/** Pushes the new state onto the stack. The new state becomes
- *  the current state. This function will allocate the stack
- *  if necessary.
- *  @param new_buffer The new state.
- *  
- */
-void yypush_buffer_state (YY_BUFFER_STATE new_buffer )
-{
-        if (new_buffer == NULL)
-                return;
-        yyensure_buffer_stack();
-        /* This block is copied from yy_switch_to_buffer. */
-        if ( YY_CURRENT_BUFFER )
-                {
-                /* Flush out information for old buffer. */
-                *(yy_c_buf_p) = (yy_hold_char);
-                YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p);
-                YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
-                }
-        /* Only push if top exists. Otherwise, replace top. */
-        if (YY_CURRENT_BUFFER)
-                (yy_buffer_stack_top)++;
-        YY_CURRENT_BUFFER_LVALUE = new_buffer;
-        /* copied from yy_switch_to_buffer. */
-        yy_load_buffer_state( );
-        (yy_did_buffer_switch_on_eof) = 1;
-}
-/** Removes and deletes the top of the stack, if present.
- *  The next element becomes the new top.
- *  
- */
-void yypop_buffer_state (void)
-{
-        if (!YY_CURRENT_BUFFER)
-                return;
-        yy_delete_buffer(YY_CURRENT_BUFFER );
-        YY_CURRENT_BUFFER_LVALUE = NULL;
-        if ((yy_buffer_stack_top) > 0)
-                --(yy_buffer_stack_top);
-        if (YY_CURRENT_BUFFER) {
-                yy_load_buffer_state( );
-                (yy_did_buffer_switch_on_eof) = 1;
-        }
-}
-/* Allocates the stack if it does not exist.
- *  Guarantees space for at least one push.
- */
-static void yyensure_buffer_stack (void)
-{
-        int num_to_alloc;
-    
-        if (!(yy_buffer_stack)) {
-                /* First allocation is just for 2 elements, since we don't know if this
-                 * scanner will even need a stack. We use 2 instead of 1 to avoid an
-                 * immediate realloc on the next call.
-         */
-      num_to_alloc = 1; /* After all that talk, this was set to 1 anyways... */
-                (yy_buffer_stack) = (struct yy_buffer_state**)yyalloc
-                                                                (num_to_alloc * sizeof(struct yy_buffer_state*)
-                                                                );
-                if ( ! (yy_buffer_stack) )
-                        YY_FATAL_ERROR( "out of dynamic memory in yyensure_buffer_stack()" );
-                memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*));
-                (yy_buffer_stack_max) = num_to_alloc;
-                (yy_buffer_stack_top) = 0;
-                return;
-        }
-        if ((yy_buffer_stack_top) >= ((yy_buffer_stack_max)) - 1){
-                /* Increase the buffer to prepare for a possible push. */
-                yy_size_t grow_size = 8 /* arbitrary grow size */;
-                num_to_alloc = (yy_buffer_stack_max) + grow_size;
-                (yy_buffer_stack) = (struct yy_buffer_state**)yyrealloc
-                                                                ((yy_buffer_stack),
-                                                                num_to_alloc * sizeof(struct yy_buffer_state*)
-                                                                );
-                if ( ! (yy_buffer_stack) )
-                        YY_FATAL_ERROR( "out of dynamic memory in yyensure_buffer_stack()" );
-                /* zero only the new slots.*/
-                memset((yy_buffer_stack) + (yy_buffer_stack_max), 0, grow_size * sizeof(struct yy_buffer_state*));
-                (yy_buffer_stack_max) = num_to_alloc;
-        }
-}
-/** Setup the input buffer state to scan directly from a user-specified character buffer.
- * @param base the character buffer
- * @param size the size in bytes of the character buffer
- * 
- * @return the newly allocated buffer state object.
- */
-YY_BUFFER_STATE yy_scan_buffer  (char * base, yy_size_t  size )
-{
-        YY_BUFFER_STATE b;
-    
-        if ( size < 2 ||
-             base[size-2] != YY_END_OF_BUFFER_CHAR ||
-             base[size-1] != YY_END_OF_BUFFER_CHAR )
-                /* They forgot to leave room for the EOB's. */
-                return NULL;
-        b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state )  );
-        if ( ! b )
-                YY_FATAL_ERROR( "out of dynamic memory in yy_scan_buffer()" );
-        b->yy_buf_size = size - 2;      /* "- 2" to take care of EOB's */
-        b->yy_buf_pos = b->yy_ch_buf = base;
-        b->yy_is_our_buffer = 0;
-        b->yy_input_file = NULL;
-        b->yy_n_chars = b->yy_buf_size;
-        b->yy_is_interactive = 0;
-        b->yy_at_bol = 1;
-        b->yy_fill_buffer = 0;
-        b->yy_buffer_status = YY_BUFFER_NEW;
-        yy_switch_to_buffer(b  );
-        return b;
-}
-/** Setup the input buffer state to scan a string. The next call to yylex() will
- * scan from a @e copy of @a str.
- * @param yystr a NUL-terminated string to scan
- * 
- * @return the newly allocated buffer state object.
- * @note If you want to scan bytes that may contain NUL values, then use
- *       yy_scan_bytes() instead.
- */
-YY_BUFFER_STATE yy_scan_string (yyconst char * yystr )
-{
-    
-        return yy_scan_bytes(yystr,(int) strlen(yystr) );
-}
-/** Setup the input buffer state to scan the given bytes. The next call to yylex() will
- * scan from a @e copy of @a bytes.
- * @param yybytes the byte buffer to scan
- * @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes.
- * 
- * @return the newly allocated buffer state object.
- */
-YY_BUFFER_STATE yy_scan_bytes  (yyconst char * yybytes, int  _yybytes_len )
-{
-        YY_BUFFER_STATE b;
-        char *buf;
-        yy_size_t n;
-        int i;
-    
-        /* Get memory for full buffer, including space for trailing EOB's. */
-        n = (yy_size_t) (_yybytes_len + 2);
-        buf = (char *) yyalloc(n  );
-        if ( ! buf )
-                YY_FATAL_ERROR( "out of dynamic memory in yy_scan_bytes()" );
-        for ( i = 0; i < _yybytes_len; ++i )
-                buf[i] = yybytes[i];
-        buf[_yybytes_len] = buf[_yybytes_len+1] = YY_END_OF_BUFFER_CHAR;
-        b = yy_scan_buffer(buf,n );
-        if ( ! b )
-                YY_FATAL_ERROR( "bad buffer in yy_scan_bytes()" );
-        /* It's okay to grow etc. this buffer, and we should throw it
-         * away when we're done.
-         */
-        b->yy_is_our_buffer = 1;
-        return b;
-}
-#ifndef YY_EXIT_FAILURE
-#define YY_EXIT_FAILURE 2
-#endif
-static void yynoreturn yy_fatal_error (yyconst char* msg )
-{
-                        (void) fprintf( stderr, "%s\n", msg );
-        exit( YY_EXIT_FAILURE );
-}
-/* Redefine yyless() so it works in section 3 code. */
-#undef yyless
-#define yyless(n) \
-        do \
-                { \
-                /* Undo effects of setting up yytext. */ \
-        int yyless_macro_arg = (n); \
-        YY_LESS_LINENO(yyless_macro_arg);\
-                yytext[yyleng] = (yy_hold_char); \
-                (yy_c_buf_p) = yytext + yyless_macro_arg; \
-                (yy_hold_char) = *(yy_c_buf_p); \
-                *(yy_c_buf_p) = '\0'; \
-                yyleng = yyless_macro_arg; \
-                } \
-        while ( 0 )
-/* Accessor  methods (get/set functions) to struct members. */
-/** Get the current line number.
- * 
- */
-int yyget_lineno  (void)
-{
-    
-    return yylineno;
-}
-/** Get the input stream.
- * 
- */
-FILE *yyget_in  (void)
-{
-        return yyin;
-}
-/** Get the output stream.
- * 
- */
-FILE *yyget_out  (void)
-{
-        return yyout;
-}
-/** Get the length of the current token.
- * 
- */
-int yyget_leng  (void)
-{
-        return yyleng;
-}
-/** Get the current token.
- * 
- */
-char *yyget_text  (void)
-{
-        return yytext;
-}
-/** Set the current line number.
- * @param _line_number line number
- * 
- */
-void yyset_lineno (int  _line_number )
-{
-    
-    yylineno = _line_number;
-}
-/** Set the input stream. This does not discard the current
- * input buffer.
- * @param _in_str A readable stream.
- * 
- * @see yy_switch_to_buffer
- */
-void yyset_in (FILE *  _in_str )
-{
-        yyin = _in_str ;
-}
-void yyset_out (FILE *  _out_str )
-{
-        yyout = _out_str ;
-}
-int yyget_debug  (void)
-{
-        return yy_flex_debug;
-}
-void yyset_debug (int  _bdebug )
-{
-        yy_flex_debug = _bdebug ;
-}
-static int yy_init_globals (void)
-{
-        /* Initialization is the same as for the non-reentrant scanner.
-     * This function is called from yylex_destroy(), so don't allocate here.
-     */
-    (yy_buffer_stack) = NULL;
-    (yy_buffer_stack_top) = 0;
-    (yy_buffer_stack_max) = 0;
-    (yy_c_buf_p) = NULL;
-    (yy_init) = 0;
-    (yy_start) = 0;
-/* Defined in main.c */
-#ifdef YY_STDINIT
-    yyin = stdin;
-    yyout = stdout;
-#else
-    yyin = NULL;
-    yyout = NULL;
-#endif
-    /* For future reference: Set errno on error, since we are called by
-     * yylex_init()
-     */
-    return 0;
-}
-/* yylex_destroy is for both reentrant and non-reentrant scanners. */
-int yylex_destroy  (void)
-{
-    
-    /* Pop the buffer stack, destroying each element. */
-        while(YY_CURRENT_BUFFER){
-                yy_delete_buffer(YY_CURRENT_BUFFER  );
-                YY_CURRENT_BUFFER_LVALUE = NULL;
-                yypop_buffer_state();
-        }
-        /* Destroy the stack itself. */
-        yyfree((yy_buffer_stack) );
-        (yy_buffer_stack) = NULL;
-    /* Reset the globals. This is important in a non-reentrant scanner so the next time
-     * yylex() is called, initialization will occur. */
-    yy_init_globals( );
-    return 0;
-}
-/*
- * Internal utility routines.
- */
-#ifndef yytext_ptr
-static void yy_flex_strncpy (char* s1, yyconst char * s2, int n )
-{
-                
-        int i;
-        for ( i = 0; i < n; ++i )
-                s1[i] = s2[i];
-}
-#endif
-#ifdef YY_NEED_STRLEN
-static int yy_flex_strlen (yyconst char * s )
-{
-        int n;
-        for ( n = 0; s[n]; ++n )
-                ;
-        return n;
-}
-#endif
-void *yyalloc (yy_size_t  size )
-{
-                        return malloc(size);
-}
-void *yyrealloc  (void * ptr, yy_size_t  size )
-{
-                
-        /* The cast to (char *) in the following accommodates both
-         * implementations that use char* generic pointers, and those
-         * that use void* generic pointers.  It works with the latter
-         * because both ANSI C and C++ allow castless assignment from
-         * any pointer type to void*, and deal with argument conversions
-         * as though doing an assignment.
-         */
-        return realloc(ptr, size);
-}
-void yyfree (void * ptr )
-{
-                        free( (char *) ptr );   /* see yyrealloc() for (char *) cast */
-}
-#define YYTABLES_NAME "yytables"
-#line 272 "dtc-lexer.l"
-static void push_input_file(const char *filename)
-{
-        assert(filename);
-        srcfile_push(filename);
-        yyin = current_srcfile->f;
-        yypush_buffer_state(yy_create_buffer(yyin,YY_BUF_SIZE));
-}
-static bool pop_input_file(void)
-{
-        if (srcfile_pop() == 0)
-                return false;
-        yypop_buffer_state();
-        yyin = current_srcfile->f;
-        return true;
-}
-static void lexical_error(const char *fmt, ...)
-{
-        va_list ap;
-        va_start(ap, fmt);
-        srcpos_verror(&yylloc, "Lexical error", fmt, ap);
-        va_end(ap);
-        treesource_error = true;
-}
diff --git a/scripts/dtc/dtc-parser.tab.c_shipped b/scripts/dtc/dtc-parser.tab.c_shipped
deleted file mode 100644
index aea514fa6928..000000000000
--- a/scripts/dtc/dtc-parser.tab.c_shipped
+++ /dev/null
@@ -1,2321 +0,0 @@
-/* A Bison parser, made by GNU Bison 3.0.4.  */
-/* Bison implementation for Yacc-like parsers in C
-   Copyright (C) 1984, 1989-1990, 2000-2015 Free Software Foundation, Inc.
-   This program is free software: you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
-/* As a special exception, you may create a larger work that contains
-   part or all of the Bison parser skeleton and distribute that work
-   under terms of your choice, so long as that work isn't itself a
-   parser generator using the skeleton or a modified version thereof
-   as a parser skeleton.  Alternatively, if you modify or redistribute
-   the parser skeleton itself, you may (at your option) remove this
-   special exception, which will cause the skeleton and the resulting
-   Bison output files to be licensed under the GNU General Public
-   License without this special exception.
-   This special exception was added by the Free Software Foundation in
-   version 2.2 of Bison.  */
-/* C LALR(1) parser skeleton written by Richard Stallman, by
-   simplifying the original so-called "semantic" parser.  */
-/* All symbols defined below should begin with yy or YY, to avoid
-   infringing on user name space.  This should be done even for local
-   variables, as they might otherwise be expanded by user macros.
-   There are some unavoidable exceptions within include files to
-   define necessary library symbols; they are noted "INFRINGES ON
-   USER NAME SPACE" below.  */
-/* Identify Bison output.  */
-#define YYBISON 1
-/* Bison version.  */
-#define YYBISON_VERSION "3.0.4"
-/* Skeleton name.  */
-#define YYSKELETON_NAME "yacc.c"
-/* Pure parsers.  */
-#define YYPURE 0
-/* Push parsers.  */
-#define YYPUSH 0
-/* Pull parsers.  */
-#define YYPULL 1
-/* Copy the first part of user declarations.  */
-#line 20 "dtc-parser.y" /* yacc.c:339  */
-#include <stdio.h>
-#include <inttypes.h>
-#include "dtc.h"
-#include "srcpos.h"
-extern int yylex(void);
-extern void yyerror(char const *s);
-#define ERROR(loc, ...) \
-        do { \
-                srcpos_error((loc), "Error", __VA_ARGS__); \
-                treesource_error = true; \
-        } while (0)
-extern struct dt_info *parser_output;
-extern bool treesource_error;
-#line 85 "dtc-parser.tab.c" /* yacc.c:339  */
-# ifndef YY_NULLPTR
-#  if defined __cplusplus && 201103L <= __cplusplus
-#   define YY_NULLPTR nullptr
-#  else
-#   define YY_NULLPTR 0
-#  endif
-# endif
-/* Enabling verbose error messages.  */
-#ifdef YYERROR_VERBOSE
-# undef YYERROR_VERBOSE
-# define YYERROR_VERBOSE 1
-#else
-# define YYERROR_VERBOSE 0
-#endif
-/* In a future release of Bison, this section will be replaced
-   by #include "dtc-parser.tab.h".  */
-#ifndef YY_YY_DTC_PARSER_TAB_H_INCLUDED
-# define YY_YY_DTC_PARSER_TAB_H_INCLUDED
-/* Debug traces.  */
-#ifndef YYDEBUG
-# define YYDEBUG 0
-#endif
-#if YYDEBUG
-extern int yydebug;
-#endif
-/* Token type.  */
-#ifndef YYTOKENTYPE
-# define YYTOKENTYPE
-  enum yytokentype
-  {
-    DT_V1 = 258,
-    DT_PLUGIN = 259,
-    DT_MEMRESERVE = 260,
-    DT_LSHIFT = 261,
-    DT_RSHIFT = 262,
-    DT_LE = 263,
-    DT_GE = 264,
-    DT_EQ = 265,
-    DT_NE = 266,
-    DT_AND = 267,
-    DT_OR = 268,
-    DT_BITS = 269,
-    DT_DEL_PROP = 270,
-    DT_DEL_NODE = 271,
-    DT_PROPNODENAME = 272,
-    DT_LITERAL = 273,
-    DT_CHAR_LITERAL = 274,
-    DT_BYTE = 275,
-    DT_STRING = 276,
-    DT_LABEL = 277,
-    DT_REF = 278,
-    DT_INCBIN = 279
-  };
-#endif
-/* Value type.  */
-#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
-union YYSTYPE
-{
-#line 39 "dtc-parser.y" /* yacc.c:355  */
-        char *propnodename;
-        char *labelref;
-        uint8_t byte;
-        struct data data;
-        struct {
-                struct data     data;
-                int             bits;
-        } array;
-        struct property *prop;
-        struct property *proplist;
-        struct node *node;
-        struct node *nodelist;
-        struct reserve_info *re;
-        uint64_t integer;
-        unsigned int flags;
-#line 170 "dtc-parser.tab.c" /* yacc.c:355  */
-};
-typedef union YYSTYPE YYSTYPE;
-# define YYSTYPE_IS_TRIVIAL 1
-# define YYSTYPE_IS_DECLARED 1
-#endif
-/* Location type.  */
-#if ! defined YYLTYPE && ! defined YYLTYPE_IS_DECLARED
-typedef struct YYLTYPE YYLTYPE;
-struct YYLTYPE
-{
-  int first_line;
-  int first_column;
-  int last_line;
-  int last_column;
-};
-# define YYLTYPE_IS_DECLARED 1
-# define YYLTYPE_IS_TRIVIAL 1
-#endif
-extern YYSTYPE yylval;
-extern YYLTYPE yylloc;
-int yyparse (void);
-#endif /* !YY_YY_DTC_PARSER_TAB_H_INCLUDED  */
-/* Copy the second part of user declarations.  */
-#line 201 "dtc-parser.tab.c" /* yacc.c:358  */
-#ifdef short
-# undef short
-#endif
-#ifdef YYTYPE_UINT8
-typedef YYTYPE_UINT8 yytype_uint8;
-#else
-typedef unsigned char yytype_uint8;
-#endif
-#ifdef YYTYPE_INT8
-typedef YYTYPE_INT8 yytype_int8;
-#else
-typedef signed char yytype_int8;
-#endif
-#ifdef YYTYPE_UINT16
-typedef YYTYPE_UINT16 yytype_uint16;
-#else
-typedef unsigned short int yytype_uint16;
-#endif
-#ifdef YYTYPE_INT16
-typedef YYTYPE_INT16 yytype_int16;
-#else
-typedef short int yytype_int16;
-#endif
-#ifndef YYSIZE_T
-# ifdef __SIZE_TYPE__
-#  define YYSIZE_T __SIZE_TYPE__
-# elif defined size_t
-#  define YYSIZE_T size_t
-# elif ! defined YYSIZE_T
-#  include <stddef.h> /* INFRINGES ON USER NAME SPACE */
-#  define YYSIZE_T size_t
-# else
-#  define YYSIZE_T unsigned int
-# endif
-#endif
-#define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
-#ifndef YY_
-# if defined YYENABLE_NLS && YYENABLE_NLS
-#  if ENABLE_NLS
-#   include <libintl.h> /* INFRINGES ON USER NAME SPACE */
-#   define YY_(Msgid) dgettext ("bison-runtime", Msgid)
-#  endif
-# endif
-# ifndef YY_
-#  define YY_(Msgid) Msgid
-# endif
-#endif
-#ifndef YY_ATTRIBUTE
-# if (defined __GNUC__                                               \
-      && (2 < __GNUC__ || (__GNUC__ == 2 && 96 <= __GNUC_MINOR__)))  \
-     || defined __SUNPRO_C && 0x5110 <= __SUNPRO_C
-#  define YY_ATTRIBUTE(Spec) __attribute__(Spec)
-# else
-#  define YY_ATTRIBUTE(Spec) /* empty */
-# endif
-#endif
-#ifndef YY_ATTRIBUTE_PURE
-# define YY_ATTRIBUTE_PURE   YY_ATTRIBUTE ((__pure__))
-#endif
-#ifndef YY_ATTRIBUTE_UNUSED
-# define YY_ATTRIBUTE_UNUSED YY_ATTRIBUTE ((__unused__))
-#endif
-#if !defined _Noreturn \
-     && (!defined __STDC_VERSION__ || __STDC_VERSION__ < 201112)
-# if defined _MSC_VER && 1200 <= _MSC_VER
-#  define _Noreturn __declspec (noreturn)
-# else
-#  define _Noreturn YY_ATTRIBUTE ((__noreturn__))
-# endif
-#endif
-/* Suppress unused-variable warnings by "using" E.  */
-#if ! defined lint || defined __GNUC__
-# define YYUSE(E) ((void) (E))
-#else
-# define YYUSE(E) /* empty */
-#endif
-#if defined __GNUC__ && 407 <= __GNUC__ * 100 + __GNUC_MINOR__
-/* Suppress an incorrect diagnostic about yylval being uninitialized.  */
-# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \
-    _Pragma ("GCC diagnostic push") \
-    _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"")\
-    _Pragma ("GCC diagnostic ignored \"-Wmaybe-uninitialized\"")
-# define YY_IGNORE_MAYBE_UNINITIALIZED_END \
-    _Pragma ("GCC diagnostic pop")
-#else
-# define YY_INITIAL_VALUE(Value) Value
-#endif
-#ifndef YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
-# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
-# define YY_IGNORE_MAYBE_UNINITIALIZED_END
-#endif
-#ifndef YY_INITIAL_VALUE
-# define YY_INITIAL_VALUE(Value) /* Nothing. */
-#endif
-#if ! defined yyoverflow || YYERROR_VERBOSE
-/* The parser invokes alloca or malloc; define the necessary symbols.  */
-# ifdef YYSTACK_USE_ALLOCA
-#  if YYSTACK_USE_ALLOCA
-#   ifdef __GNUC__
-#    define YYSTACK_ALLOC __builtin_alloca
-#   elif defined __BUILTIN_VA_ARG_INCR
-#    include <alloca.h> /* INFRINGES ON USER NAME SPACE */
-#   elif defined _AIX
-#    define YYSTACK_ALLOC __alloca
-#   elif defined _MSC_VER
-#    include <malloc.h> /* INFRINGES ON USER NAME SPACE */
-#    define alloca _alloca
-#   else
-#    define YYSTACK_ALLOC alloca
-#    if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS
-#     include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-      /* Use EXIT_SUCCESS as a witness for stdlib.h.  */
-#     ifndef EXIT_SUCCESS
-#      define EXIT_SUCCESS 0
-#     endif
-#    endif
-#   endif
-#  endif
-# endif
-# ifdef YYSTACK_ALLOC
-   /* Pacify GCC's 'empty if-body' warning.  */
-#  define YYSTACK_FREE(Ptr) do { /* empty */; } while (0)
-#  ifndef YYSTACK_ALLOC_MAXIMUM
-    /* The OS might guarantee only one guard page at the bottom of the stack,
-       and a page size can be as small as 4096 bytes.  So we cannot safely
-       invoke alloca (N) if N exceeds 4096.  Use a slightly smaller number
-       to allow for a few compiler-allocated temporary stack slots.  */
-#   define YYSTACK_ALLOC_MAXIMUM 4032 /* reasonable circa 2006 */
-#  endif
-# else
-#  define YYSTACK_ALLOC YYMALLOC
-#  define YYSTACK_FREE YYFREE
-#  ifndef YYSTACK_ALLOC_MAXIMUM
-#   define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM
-#  endif
-#  if (defined __cplusplus && ! defined EXIT_SUCCESS \
-       && ! ((defined YYMALLOC || defined malloc) \
-             && (defined YYFREE || defined free)))
-#   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-#   ifndef EXIT_SUCCESS
-#    define EXIT_SUCCESS 0
-#   endif
-#  endif
-#  ifndef YYMALLOC
-#   define YYMALLOC malloc
-#   if ! defined malloc && ! defined EXIT_SUCCESS
-void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
-#   endif
-#  endif
-#  ifndef YYFREE
-#   define YYFREE free
-#   if ! defined free && ! defined EXIT_SUCCESS
-void free (void *); /* INFRINGES ON USER NAME SPACE */
-#   endif
-#  endif
-# endif
-#endif /* ! defined yyoverflow || YYERROR_VERBOSE */
-#if (! defined yyoverflow \
-     && (! defined __cplusplus \
-         || (defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL \
-             && defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
-/* A type that is properly aligned for any stack member.  */
-union yyalloc
-{
-  yytype_int16 yyss_alloc;
-  YYSTYPE yyvs_alloc;
-  YYLTYPE yyls_alloc;
-};
-/* The size of the maximum gap between one aligned stack and the next.  */
-# define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1)
-/* The size of an array large to enough to hold all stacks, each with
-   N elements.  */
-# define YYSTACK_BYTES(N) \
-     ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE) + sizeof (YYLTYPE)) \
-      + 2 * YYSTACK_GAP_MAXIMUM)
-# define YYCOPY_NEEDED 1
-/* Relocate STACK from its old location to the new one.  The
-   local variables YYSIZE and YYSTACKSIZE give the old and new number of
-   elements in the stack, and YYPTR gives the new location of the
-   stack.  Advance YYPTR to a properly aligned location for the next
-   stack.  */
-# define YYSTACK_RELOCATE(Stack_alloc, Stack)                           \
-    do                                                                  \
-      {                                                                 \
-        YYSIZE_T yynewbytes;                                            \
-        YYCOPY (&yyptr->Stack_alloc, Stack, yysize);                    \
-        Stack = &yyptr->Stack_alloc;                                    \
-        yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
-        yyptr += yynewbytes / sizeof (*yyptr);                          \
-      }                                                                 \
-    while (0)
-#endif
-#if defined YYCOPY_NEEDED && YYCOPY_NEEDED
-/* Copy COUNT objects from SRC to DST.  The source and destination do
-   not overlap.  */
-# ifndef YYCOPY
-#  if defined __GNUC__ && 1 < __GNUC__
-#   define YYCOPY(Dst, Src, Count) \
-      __builtin_memcpy (Dst, Src, (Count) * sizeof (*(Src)))
-#  else
-#   define YYCOPY(Dst, Src, Count)              \
-      do                                        \
-        {                                       \
-          YYSIZE_T yyi;                         \
-          for (yyi = 0; yyi < (Count); yyi++)   \
-            (Dst)[yyi] = (Src)[yyi];            \
-        }                                       \
-      while (0)
-#  endif
-# endif
-#endif /* !YYCOPY_NEEDED */
-/* YYFINAL -- State number of the termination state.  */
-#define YYFINAL  6
-/* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   138
-/* YYNTOKENS -- Number of terminals.  */
-#define YYNTOKENS  48
-/* YYNNTS -- Number of nonterminals.  */
-#define YYNNTS  30
-/* YYNRULES -- Number of rules.  */
-#define YYNRULES  85
-/* YYNSTATES -- Number of states.  */
-#define YYNSTATES  149
-/* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned
-   by yylex, with out-of-bounds checking.  */
-#define YYUNDEFTOK  2
-#define YYMAXUTOK   279
-#define YYTRANSLATE(YYX)                                                \
-  ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
-/* YYTRANSLATE[TOKEN-NUM] -- Symbol number corresponding to TOKEN-NUM
-   as returned by yylex, without out-of-bounds checking.  */
-static const yytype_uint8 yytranslate[] =
-{
-       0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,    47,     2,     2,     2,    45,    41,     2,
-      33,    35,    44,    42,    34,    43,     2,    26,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,    38,    25,
-      36,    29,    30,    37,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,    31,     2,    32,    40,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,    27,    39,    28,    46,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     1,     2,     3,     4,
-       5,     6,     7,     8,     9,    10,    11,    12,    13,    14,
-      15,    16,    17,    18,    19,    20,    21,    22,    23,    24
-};
-#if YYDEBUG
-  /* YYRLINE[YYN] -- Source line where rule number YYN was defined.  */
-static const yytype_uint16 yyrline[] =
-{
-       0,   109,   109,   117,   121,   128,   129,   139,   142,   149,
-     153,   161,   165,   170,   181,   200,   213,   220,   228,   231,
-     238,   242,   246,   250,   258,   262,   266,   270,   274,   290,
-     300,   308,   311,   315,   322,   338,   343,   362,   376,   383,
-     384,   385,   392,   396,   397,   401,   402,   406,   407,   411,
-     412,   416,   417,   421,   422,   426,   427,   428,   432,   433,
-     434,   435,   436,   440,   441,   442,   446,   447,   448,   452,
-     453,   462,   471,   475,   476,   477,   478,   483,   486,   490,
-     498,   501,   505,   513,   517,   521
-};
-#endif
-#if YYDEBUG || YYERROR_VERBOSE || 0
-/* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
-   First, the terminals, then, starting at YYNTOKENS, nonterminals.  */
-static const char *const yytname[] =
-{
-  "$end", "error", "$undefined", "DT_V1", "DT_PLUGIN", "DT_MEMRESERVE",
-  "DT_LSHIFT", "DT_RSHIFT", "DT_LE", "DT_GE", "DT_EQ", "DT_NE", "DT_AND",
-  "DT_OR", "DT_BITS", "DT_DEL_PROP", "DT_DEL_NODE", "DT_PROPNODENAME",
-  "DT_LITERAL", "DT_CHAR_LITERAL", "DT_BYTE", "DT_STRING", "DT_LABEL",
-  "DT_REF", "DT_INCBIN", "';'", "'/'", "'{'", "'}'", "'='", "'>'", "'['",
-  "']'", "'('", "','", "')'", "'<'", "'?'", "':'", "'|'", "'^'", "'&'",
-  "'+'", "'-'", "'*'", "'%'", "'~'", "'!'", "$accept", "sourcefile",
-  "header", "headers", "memreserves", "memreserve", "devicetree",
-  "nodedef", "proplist", "propdef", "propdata", "propdataprefix",
-  "arrayprefix", "integer_prim", "integer_expr", "integer_trinary",
-  "integer_or", "integer_and", "integer_bitor", "integer_bitxor",
-  "integer_bitand", "integer_eq", "integer_rela", "integer_shift",
-  "integer_add", "integer_mul", "integer_unary", "bytestring", "subnodes",
-  "subnode", YY_NULLPTR
-};
-#endif
-# ifdef YYPRINT
-/* YYTOKNUM[NUM] -- (External) token number corresponding to the
-   (internal) symbol number NUM (which must be that of a token).  */
-static const yytype_uint16 yytoknum[] =
-{
-       0,   256,   257,   258,   259,   260,   261,   262,   263,   264,
-     265,   266,   267,   268,   269,   270,   271,   272,   273,   274,
-     275,   276,   277,   278,   279,    59,    47,   123,   125,    61,
-      62,    91,    93,    40,    44,    41,    60,    63,    58,   124,
-      94,    38,    43,    45,    42,    37,   126,    33
-};
-# endif
-#define YYPACT_NINF -44
-#define yypact_value_is_default(Yystate) \
-  (!!((Yystate) == (-44)))
-#define YYTABLE_NINF -1
-#define yytable_value_is_error(Yytable_value) \
-  0
-  /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
-     STATE-NUM.  */
-static const yytype_int8 yypact[] =
-{
-      14,    27,    61,    14,     8,    18,   -44,   -44,    37,     8,
-      40,     8,    64,   -44,   -44,   -12,    37,   -44,    50,    52,
-     -44,   -44,   -12,   -12,   -12,   -44,    51,   -44,    -4,    78,
-      53,    54,    55,    17,     2,    30,    38,    -3,   -44,    66,
-     -44,   -44,    70,    72,    50,    50,   -44,   -44,   -44,   -44,
-     -12,   -12,   -12,   -12,   -12,   -12,   -12,   -12,   -12,   -12,
-     -12,   -12,   -12,   -12,   -12,   -12,   -12,   -12,   -12,   -44,
-       3,    73,    50,   -44,   -44,    78,    59,    53,    54,    55,
-      17,     2,     2,    30,    30,    30,    30,    38,    38,    -3,
-      -3,   -44,   -44,   -44,    82,    83,    44,     3,   -44,    74,
-       3,   -44,   -44,   -12,    76,    79,   -44,   -44,   -44,   -44,
-     -44,    80,   -44,   -44,   -44,   -44,   -44,   -10,    36,   -44,
-     -44,   -44,   -44,    85,   -44,   -44,   -44,    75,   -44,   -44,
-      21,    71,    88,    -6,   -44,   -44,   -44,   -44,   -44,    11,
-     -44,   -44,   -44,    37,   -44,    77,    37,    81,   -44
-};
-  /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM.
-     Performed when YYTABLE does not specify something else to do.  Zero
-     means the default is an error.  */
-static const yytype_uint8 yydefact[] =
-{
-       0,     0,     0,     5,     7,     3,     1,     6,     0,     0,
-      16,     7,     0,    39,    40,     0,     0,    10,     0,     2,
-       8,     4,     0,     0,     0,    73,     0,    42,    43,    45,
-      47,    49,    51,    53,    55,    58,    65,    68,    72,     0,
-      18,    11,     0,     0,     0,     0,    74,    75,    76,    41,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     9,
-      80,     0,     0,    14,    12,    46,     0,    48,    50,    52,
-      54,    56,    57,    61,    62,    60,    59,    63,    64,    66,
-      67,    70,    69,    71,     0,     0,     0,     0,    19,     0,
-      80,    15,    13,     0,     0,     0,    21,    31,    83,    23,
-      85,     0,    82,    81,    44,    22,    84,     0,     0,    17,
-      30,    20,    32,     0,    24,    33,    27,     0,    77,    35,
-       0,     0,     0,     0,    38,    37,    25,    36,    34,     0,
-      78,    79,    26,     0,    29,     0,     0,     0,    28
-};
-  /* YYPGOTO[NTERM-NUM].  */
-static const yytype_int8 yypgoto[] =
-{
-     -44,   -44,   -44,   103,    99,   104,   -44,   -43,   -44,   -21,
-     -44,   -44,   -44,    -8,    63,     9,   -44,    65,    67,    68,
-      69,    62,    26,     4,    22,    23,   -19,   -44,    20,    28
-};
-  /* YYDEFGOTO[NTERM-NUM].  */
-static const yytype_int16 yydefgoto[] =
-{
-      -1,     2,     3,     4,    10,    11,    19,    41,    70,    98,
-     117,   118,   130,    25,    26,    27,    28,    29,    30,    31,
-      32,    33,    34,    35,    36,    37,    38,   133,    99,   100
-};
-  /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM.  If
-     positive, shift that token.  If negative, reduce the rule whose
-     number is the opposite.  If YYTABLE_NINF, syntax error.  */
-static const yytype_uint8 yytable[] =
-{
-      16,    73,    74,    46,    47,    48,    13,    14,    39,    50,
-      58,    59,   120,     8,   140,   121,   141,     1,    94,    95,
-      96,    15,    12,    66,   122,    97,   142,    56,    57,   102,
-       9,    22,    60,    51,    23,    24,    62,    63,    61,    13,
-      14,    67,    68,   134,   135,   143,   144,    91,    92,    93,
-     123,   136,     5,   108,    15,    13,    14,   124,   125,   126,
-     127,     6,    83,    84,    85,    86,    18,   128,    42,   106,
-      15,    40,   129,   107,    43,    44,   109,    40,    45,   112,
-      64,    65,    81,    82,    87,    88,    49,    89,    90,    21,
-      52,    69,    53,    71,    54,    72,    55,   103,   101,   104,
-     105,   115,   111,   131,   116,   119,     7,   138,   132,   139,
-      20,   146,   114,    17,    76,    75,   148,    80,     0,    77,
-     113,    78,   137,    79,     0,   110,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   145,     0,     0,   147
-};
-static const yytype_int16 yycheck[] =
-{
-       8,    44,    45,    22,    23,    24,    18,    19,    16,    13,
-       8,     9,    22,     5,    20,    25,    22,     3,    15,    16,
-      17,    33,     4,    26,    34,    22,    32,    10,    11,    72,
-      22,    43,    30,    37,    46,    47,     6,     7,    36,    18,
-      19,    44,    45,    22,    23,    34,    35,    66,    67,    68,
-      14,    30,    25,    96,    33,    18,    19,    21,    22,    23,
-      24,     0,    58,    59,    60,    61,    26,    31,    16,    25,
-      33,    27,    36,    29,    22,    23,    97,    27,    26,   100,
-      42,    43,    56,    57,    62,    63,    35,    64,    65,    25,
-      12,    25,    39,    23,    40,    23,    41,    38,    25,    17,
-      17,    25,    28,    18,    25,    25,     3,    36,    33,    21,
-      11,    34,   103,     9,    51,    50,    35,    55,    -1,    52,
-     100,    53,   130,    54,    -1,    97,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   143,    -1,    -1,   146
-};
-  /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
-     symbol of state STATE-NUM.  */
-static const yytype_uint8 yystos[] =
-{
-       0,     3,    49,    50,    51,    25,     0,    51,     5,    22,
-      52,    53,     4,    18,    19,    33,    61,    53,    26,    54,
-      52,    25,    43,    46,    47,    61,    62,    63,    64,    65,
-      66,    67,    68,    69,    70,    71,    72,    73,    74,    61,
-      27,    55,    16,    22,    23,    26,    74,    74,    74,    35,
-      13,    37,    12,    39,    40,    41,    10,    11,     8,     9,
-      30,    36,     6,     7,    42,    43,    26,    44,    45,    25,
-      56,    23,    23,    55,    55,    65,    62,    66,    67,    68,
-      69,    70,    70,    71,    71,    71,    71,    72,    72,    73,
-      73,    74,    74,    74,    15,    16,    17,    22,    57,    76,
-      77,    25,    55,    38,    17,    17,    25,    29,    55,    57,
-      77,    28,    57,    76,    63,    25,    25,    58,    59,    25,
-      22,    25,    34,    14,    21,    22,    23,    24,    31,    36,
-      60,    18,    33,    75,    22,    23,    30,    61,    36,    21,
-      20,    22,    32,    34,    35,    61,    34,    61,    35
-};
-  /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
-static const yytype_uint8 yyr1[] =
-{
-       0,    48,    49,    50,    50,    51,    51,    52,    52,    53,
-      53,    54,    54,    54,    54,    54,    54,    55,    56,    56,
-      57,    57,    57,    57,    58,    58,    58,    58,    58,    58,
-      58,    59,    59,    59,    60,    60,    60,    60,    60,    61,
-      61,    61,    62,    63,    63,    64,    64,    65,    65,    66,
-      66,    67,    67,    68,    68,    69,    69,    69,    70,    70,
-      70,    70,    70,    71,    71,    71,    72,    72,    72,    73,
-      73,    73,    73,    74,    74,    74,    74,    75,    75,    75,
-      76,    76,    76,    77,    77,    77
-};
-  /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN.  */
-static const yytype_uint8 yyr2[] =
-{
-       0,     2,     3,     2,     4,     1,     2,     0,     2,     4,
-       2,     2,     3,     4,     3,     4,     0,     5,     0,     2,
-       4,     2,     3,     2,     2,     3,     4,     2,     9,     5,
-       2,     0,     2,     2,     3,     1,     2,     2,     2,     1,
-       1,     3,     1,     1,     5,     1,     3,     1,     3,     1,
-       3,     1,     3,     1,     3,     1,     3,     3,     1,     3,
-       3,     3,     3,     3,     3,     1,     3,     3,     1,     3,
-       3,     3,     1,     1,     2,     2,     2,     0,     2,     2,
-       0,     2,     2,     2,     3,     2
-};
-#define yyerrok         (yyerrstatus = 0)
-#define yyclearin       (yychar = YYEMPTY)
-#define YYEMPTY         (-2)
-#define YYEOF           0
-#define YYACCEPT        goto yyacceptlab
-#define YYABORT         goto yyabortlab
-#define YYERROR         goto yyerrorlab
-#define YYRECOVERING()  (!!yyerrstatus)
-#define YYBACKUP(Token, Value)                                  \
-do                                                              \
-  if (yychar == YYEMPTY)                                        \
-    {                                                           \
-      yychar = (Token);                                         \
-      yylval = (Value);                                         \
-      YYPOPSTACK (yylen);                                       \
-      yystate = *yyssp;                                         \
-      goto yybackup;                                            \
-    }                                                           \
-  else                                                          \
-    {                                                           \
-      yyerror (YY_("syntax error: cannot back up")); \
-      YYERROR;                                                  \
-    }                                                           \
-while (0)
-/* Error token number */
-#define YYTERROR        1
-#define YYERRCODE       256
-/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N].
-   If N is 0, then set CURRENT to the empty location which ends
-   the previous symbol: RHS[0] (always defined).  */
-#ifndef YYLLOC_DEFAULT
-# define YYLLOC_DEFAULT(Current, Rhs, N)                                \
-    do                                                                  \
-      if (N)                                                            \
-        {                                                               \
-          (Current).first_line   = YYRHSLOC (Rhs, 1).first_line;        \
-          (Current).first_column = YYRHSLOC (Rhs, 1).first_column;      \
-          (Current).last_line    = YYRHSLOC (Rhs, N).last_line;         \
-          (Current).last_column  = YYRHSLOC (Rhs, N).last_column;       \
-        }                                                               \
-      else                                                              \
-        {                                                               \
-          (Current).first_line   = (Current).last_line   =              \
-            YYRHSLOC (Rhs, 0).last_line;                                \
-          (Current).first_column = (Current).last_column =              \
-            YYRHSLOC (Rhs, 0).last_column;                              \
-        }                                                               \
-    while (0)
-#endif
-#define YYRHSLOC(Rhs, K) ((Rhs)[K])
-/* Enable debugging if requested.  */
-#if YYDEBUG
-# ifndef YYFPRINTF
-#  include <stdio.h> /* INFRINGES ON USER NAME SPACE */
-#  define YYFPRINTF fprintf
-# endif
-# define YYDPRINTF(Args)                        \
-do {                                            \
-  if (yydebug)                                  \
-    YYFPRINTF Args;                             \
-} while (0)
-/* YY_LOCATION_PRINT -- Print the location on the stream.
-   This macro was not mandated originally: define only if we know
-   we won't break user code: when these are the locations we know.  */
-#ifndef YY_LOCATION_PRINT
-# if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL
-/* Print *YYLOCP on YYO.  Private, do not rely on its existence. */
-YY_ATTRIBUTE_UNUSED
-static unsigned
-yy_location_print_ (FILE *yyo, YYLTYPE const * const yylocp)
-{
-  unsigned res = 0;
-  int end_col = 0 != yylocp->last_column ? yylocp->last_column - 1 : 0;
-  if (0 <= yylocp->first_line)
-    {
-      res += YYFPRINTF (yyo, "%d", yylocp->first_line);
-      if (0 <= yylocp->first_column)
-        res += YYFPRINTF (yyo, ".%d", yylocp->first_column);
-    }
-  if (0 <= yylocp->last_line)
-    {
-      if (yylocp->first_line < yylocp->last_line)
-        {
-          res += YYFPRINTF (yyo, "-%d", yylocp->last_line);
-          if (0 <= end_col)
-            res += YYFPRINTF (yyo, ".%d", end_col);
-        }
-      else if (0 <= end_col && yylocp->first_column < end_col)
-        res += YYFPRINTF (yyo, "-%d", end_col);
-    }
-  return res;
- }
-#  define YY_LOCATION_PRINT(File, Loc)          \
-  yy_location_print_ (File, &(Loc))
-# else
-#  define YY_LOCATION_PRINT(File, Loc) ((void) 0)
-# endif
-#endif
-# define YY_SYMBOL_PRINT(Title, Type, Value, Location)                    \
-do {                                                                      \
-  if (yydebug)                                                            \
-    {                                                                     \
-      YYFPRINTF (stderr, "%s ", Title);                                   \
-      yy_symbol_print (stderr,                                            \
-                  Type, Value, Location); \
-      YYFPRINTF (stderr, "\n");                                           \
-    }                                                                     \
-} while (0)
-/*----------------------------------------.
-| Print this symbol's value on YYOUTPUT.  |
-`----------------------------------------*/
-static void
-yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep, YYLTYPE const * const yylocationp)
-{
-  FILE *yyo = yyoutput;
-  YYUSE (yyo);
-  YYUSE (yylocationp);
-  if (!yyvaluep)
-    return;
-# ifdef YYPRINT
-  if (yytype < YYNTOKENS)
-    YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
-# endif
-  YYUSE (yytype);
-}
-/*--------------------------------.
-| Print this symbol on YYOUTPUT.  |
-`--------------------------------*/
-static void
-yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep, YYLTYPE const * const yylocationp)
-{
-  YYFPRINTF (yyoutput, "%s %s (",
-             yytype < YYNTOKENS ? "token" : "nterm", yytname[yytype]);
-  YY_LOCATION_PRINT (yyoutput, *yylocationp);
-  YYFPRINTF (yyoutput, ": ");
-  yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp);
-  YYFPRINTF (yyoutput, ")");
-}
-/*------------------------------------------------------------------.
-| yy_stack_print -- Print the state stack from its BOTTOM up to its |
-| TOP (included).                                                   |
-`------------------------------------------------------------------*/
-static void
-yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop)
-{
-  YYFPRINTF (stderr, "Stack now");
-  for (; yybottom <= yytop; yybottom++)
-    {
-      int yybot = *yybottom;
-      YYFPRINTF (stderr, " %d", yybot);
-    }
-  YYFPRINTF (stderr, "\n");
-}
-# define YY_STACK_PRINT(Bottom, Top)                            \
-do {                                                            \
-  if (yydebug)                                                  \
-    yy_stack_print ((Bottom), (Top));                           \
-} while (0)
-/*------------------------------------------------.
-| Report that the YYRULE is going to be reduced.  |
-`------------------------------------------------*/
-static void
-yy_reduce_print (yytype_int16 *yyssp, YYSTYPE *yyvsp, YYLTYPE *yylsp, int yyrule)
-{
-  unsigned long int yylno = yyrline[yyrule];
-  int yynrhs = yyr2[yyrule];
-  int yyi;
-  YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n",
-             yyrule - 1, yylno);
-  /* The symbols being reduced.  */
-  for (yyi = 0; yyi < yynrhs; yyi++)
-    {
-      YYFPRINTF (stderr, "   $%d = ", yyi + 1);
-      yy_symbol_print (stderr,
-                       yystos[yyssp[yyi + 1 - yynrhs]],
-                       &(yyvsp[(yyi + 1) - (yynrhs)])
-                       , &(yylsp[(yyi + 1) - (yynrhs)])                       );
-      YYFPRINTF (stderr, "\n");
-    }
-}
-# define YY_REDUCE_PRINT(Rule)          \
-do {                                    \
-  if (yydebug)                          \
-    yy_reduce_print (yyssp, yyvsp, yylsp, Rule); \
-} while (0)
-/* Nonzero means print parse trace.  It is left uninitialized so that
-   multiple parsers can coexist.  */
-int yydebug;
-#else /* !YYDEBUG */
-# define YYDPRINTF(Args)
-# define YY_SYMBOL_PRINT(Title, Type, Value, Location)
-# define YY_STACK_PRINT(Bottom, Top)
-# define YY_REDUCE_PRINT(Rule)
-#endif /* !YYDEBUG */
-/* YYINITDEPTH -- initial size of the parser's stacks.  */
-#ifndef YYINITDEPTH
-# define YYINITDEPTH 200
-#endif
-/* YYMAXDEPTH -- maximum size the stacks can grow to (effective only
-   if the built-in stack extension method is used).
-   Do not make this value too large; the results are undefined if
-   YYSTACK_ALLOC_MAXIMUM < YYSTACK_BYTES (YYMAXDEPTH)
-   evaluated with infinite-precision integer arithmetic.  */
-#ifndef YYMAXDEPTH
-# define YYMAXDEPTH 10000
-#endif
-#if YYERROR_VERBOSE
-# ifndef yystrlen
-#  if defined __GLIBC__ && defined _STRING_H
-#   define yystrlen strlen
-#  else
-/* Return the length of YYSTR.  */
-static YYSIZE_T
-yystrlen (const char *yystr)
-{
-  YYSIZE_T yylen;
-  for (yylen = 0; yystr[yylen]; yylen++)
-    continue;
-  return yylen;
-}
-#  endif
-# endif
-# ifndef yystpcpy
-#  if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE
-#   define yystpcpy stpcpy
-#  else
-/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
-   YYDEST.  */
-static char *
-yystpcpy (char *yydest, const char *yysrc)
-{
-  char *yyd = yydest;
-  const char *yys = yysrc;
-  while ((*yyd++ = *yys++) != '\0')
-    continue;
-  return yyd - 1;
-}
-#  endif
-# endif
-# ifndef yytnamerr
-/* Copy to YYRES the contents of YYSTR after stripping away unnecessary
-   quotes and backslashes, so that it's suitable for yyerror.  The
-   heuristic is that double-quoting is unnecessary unless the string
-   contains an apostrophe, a comma, or backslash (other than
-   backslash-backslash).  YYSTR is taken from yytname.  If YYRES is
-   null, do not copy; instead, return the length of what the result
-   would have been.  */
-static YYSIZE_T
-yytnamerr (char *yyres, const char *yystr)
-{
-  if (*yystr == '"')
-    {
-      YYSIZE_T yyn = 0;
-      char const *yyp = yystr;
-      for (;;)
-        switch (*++yyp)
-          {
-          case '\'':
-          case ',':
-            goto do_not_strip_quotes;
-          case '\\':
-            if (*++yyp != '\\')
-              goto do_not_strip_quotes;
-            /* Fall through.  */
-          default:
-            if (yyres)
-              yyres[yyn] = *yyp;
-            yyn++;
-            break;
-          case '"':
-            if (yyres)
-              yyres[yyn] = '\0';
-            return yyn;
-          }
-    do_not_strip_quotes: ;
-    }
-  if (! yyres)
-    return yystrlen (yystr);
-  return yystpcpy (yyres, yystr) - yyres;
-}
-# endif
-/* Copy into *YYMSG, which is of size *YYMSG_ALLOC, an error message
-   about the unexpected token YYTOKEN for the state stack whose top is
-   YYSSP.
-   Return 0 if *YYMSG was successfully written.  Return 1 if *YYMSG is
-   not large enough to hold the message.  In that case, also set
-   *YYMSG_ALLOC to the required number of bytes.  Return 2 if the
-   required number of bytes is too large to store.  */
-static int
-yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
-                yytype_int16 *yyssp, int yytoken)
-{
-  YYSIZE_T yysize0 = yytnamerr (YY_NULLPTR, yytname[yytoken]);
-  YYSIZE_T yysize = yysize0;
-  enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
-  /* Internationalized format string. */
-  const char *yyformat = YY_NULLPTR;
-  /* Arguments of yyformat. */
-  char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
-  /* Number of reported tokens (one for the "unexpected", one per
-     "expected"). */
-  int yycount = 0;
-  /* There are many possibilities here to consider:
-     - If this state is a consistent state with a default action, then
-       the only way this function was invoked is if the default action
-       is an error action.  In that case, don't check for expected
-       tokens because there are none.
-     - The only way there can be no lookahead present (in yychar) is if
-       this state is a consistent state with a default action.  Thus,
-       detecting the absence of a lookahead is sufficient to determine
-       that there is no unexpected or expected token to report.  In that
-       case, just report a simple "syntax error".
-     - Don't assume there isn't a lookahead just because this state is a
-       consistent state with a default action.  There might have been a
-       previous inconsistent state, consistent state with a non-default
-       action, or user semantic action that manipulated yychar.
-     - Of course, the expected token list depends on states to have
-       correct lookahead information, and it depends on the parser not
-       to perform extra reductions after fetching a lookahead from the
-       scanner and before detecting a syntax error.  Thus, state merging
-       (from LALR or IELR) and default reductions corrupt the expected
-       token list.  However, the list is correct for canonical LR with
-       one exception: it will still contain any token that will not be
-       accepted due to an error action in a later state.
-  */
-  if (yytoken != YYEMPTY)
-    {
-      int yyn = yypact[*yyssp];
-      yyarg[yycount++] = yytname[yytoken];
-      if (!yypact_value_is_default (yyn))
-        {
-          /* Start YYX at -YYN if negative to avoid negative indexes in
-             YYCHECK.  In other words, skip the first -YYN actions for
-             this state because they are default actions.  */
-          int yyxbegin = yyn < 0 ? -yyn : 0;
-          /* Stay within bounds of both yycheck and yytname.  */
-          int yychecklim = YYLAST - yyn + 1;
-          int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
-          int yyx;
-          for (yyx = yyxbegin; yyx < yyxend; ++yyx)
-            if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR
-                && !yytable_value_is_error (yytable[yyx + yyn]))
-              {
-                if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
-                  {
-                    yycount = 1;
-                    yysize = yysize0;
-                    break;
-                  }
-                yyarg[yycount++] = yytname[yyx];
-                {
-                  YYSIZE_T yysize1 = yysize + yytnamerr (YY_NULLPTR, yytname[yyx]);
-                  if (! (yysize <= yysize1
-                         && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
-                    return 2;
-                  yysize = yysize1;
-                }
-              }
-        }
-    }
-  switch (yycount)
-    {
-# define YYCASE_(N, S)                      \
-      case N:                               \
-        yyformat = S;                       \
-      break
-      YYCASE_(0, YY_("syntax error"));
-      YYCASE_(1, YY_("syntax error, unexpected %s"));
-      YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s"));
-      YYCASE_(3, YY_("syntax error, unexpected %s, expecting %s or %s"));
-      YYCASE_(4, YY_("syntax error, unexpected %s, expecting %s or %s or %s"));
-      YYCASE_(5, YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s"));
-# undef YYCASE_
-    }
-  {
-    YYSIZE_T yysize1 = yysize + yystrlen (yyformat);
-    if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
-      return 2;
-    yysize = yysize1;
-  }
-  if (*yymsg_alloc < yysize)
-    {
-      *yymsg_alloc = 2 * yysize;
-      if (! (yysize <= *yymsg_alloc
-             && *yymsg_alloc <= YYSTACK_ALLOC_MAXIMUM))
-        *yymsg_alloc = YYSTACK_ALLOC_MAXIMUM;
-      return 1;
-    }
-  /* Avoid sprintf, as that infringes on the user's name space.
-     Don't have undefined behavior even if the translation
-     produced a string with the wrong number of "%s"s.  */
-  {
-    char *yyp = *yymsg;
-    int yyi = 0;
-    while ((*yyp = *yyformat) != '\0')
-      if (*yyp == '%' && yyformat[1] == 's' && yyi < yycount)
-        {
-          yyp += yytnamerr (yyp, yyarg[yyi++]);
-          yyformat += 2;
-        }
-      else
-        {
-          yyp++;
-          yyformat++;
-        }
-  }
-  return 0;
-}
-#endif /* YYERROR_VERBOSE */
-/*-----------------------------------------------.
-| Release the memory associated to this symbol.  |
-`-----------------------------------------------*/
-static void
-yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep, YYLTYPE *yylocationp)
-{
-  YYUSE (yyvaluep);
-  YYUSE (yylocationp);
-  if (!yymsg)
-    yymsg = "Deleting";
-  YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);
-  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
-  YYUSE (yytype);
-  YY_IGNORE_MAYBE_UNINITIALIZED_END
-}
-/* The lookahead symbol.  */
-int yychar;
-/* The semantic value of the lookahead symbol.  */
-YYSTYPE yylval;
-/* Location data for the lookahead symbol.  */
-YYLTYPE yylloc
-# if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL
-  = { 1, 1, 1, 1 }
-# endif
-;
-/* Number of syntax errors so far.  */
-int yynerrs;
-/*----------.
-| yyparse.  |
-`----------*/
-int
-yyparse (void)
-{
-    int yystate;
-    /* Number of tokens to shift before error messages enabled.  */
-    int yyerrstatus;
-    /* The stacks and their tools:
-       'yyss': related to states.
-       'yyvs': related to semantic values.
-       'yyls': related to locations.
-       Refer to the stacks through separate pointers, to allow yyoverflow
-       to reallocate them elsewhere.  */
-    /* The state stack.  */
-    yytype_int16 yyssa[YYINITDEPTH];
-    yytype_int16 *yyss;
-    yytype_int16 *yyssp;
-    /* The semantic value stack.  */
-    YYSTYPE yyvsa[YYINITDEPTH];
-    YYSTYPE *yyvs;
-    YYSTYPE *yyvsp;
-    /* The location stack.  */
-    YYLTYPE yylsa[YYINITDEPTH];
-    YYLTYPE *yyls;
-    YYLTYPE *yylsp;
-    /* The locations where the error started and ended.  */
-    YYLTYPE yyerror_range[3];
-    YYSIZE_T yystacksize;
-  int yyn;
-  int yyresult;
-  /* Lookahead token as an internal (translated) token number.  */
-  int yytoken = 0;
-  /* The variables used to return semantic value and location from the
-     action routines.  */
-  YYSTYPE yyval;
-  YYLTYPE yyloc;
-#if YYERROR_VERBOSE
-  /* Buffer for error messages, and its allocated size.  */
-  char yymsgbuf[128];
-  char *yymsg = yymsgbuf;
-  YYSIZE_T yymsg_alloc = sizeof yymsgbuf;
-#endif
-#define YYPOPSTACK(N)   (yyvsp -= (N), yyssp -= (N), yylsp -= (N))
-  /* The number of symbols on the RHS of the reduced rule.
-     Keep to zero when no symbol should be popped.  */
-  int yylen = 0;
-  yyssp = yyss = yyssa;
-  yyvsp = yyvs = yyvsa;
-  yylsp = yyls = yylsa;
-  yystacksize = YYINITDEPTH;
-  YYDPRINTF ((stderr, "Starting parse\n"));
-  yystate = 0;
-  yyerrstatus = 0;
-  yynerrs = 0;
-  yychar = YYEMPTY; /* Cause a token to be read.  */
-  yylsp[0] = yylloc;
-  goto yysetstate;
-/*------------------------------------------------------------.
-| yynewstate -- Push a new state, which is found in yystate.  |
-`------------------------------------------------------------*/
- yynewstate:
-  /* In all cases, when you get here, the value and location stacks
-     have just been pushed.  So pushing a state here evens the stacks.  */
-  yyssp++;
- yysetstate:
-  *yyssp = yystate;
-  if (yyss + yystacksize - 1 <= yyssp)
-    {
-      /* Get the current used size of the three stacks, in elements.  */
-      YYSIZE_T yysize = yyssp - yyss + 1;
-#ifdef yyoverflow
-      {
-        /* Give user a chance to reallocate the stack.  Use copies of
-           these so that the &'s don't force the real ones into
-           memory.  */
-        YYSTYPE *yyvs1 = yyvs;
-        yytype_int16 *yyss1 = yyss;
-        YYLTYPE *yyls1 = yyls;
-        /* Each stack pointer address is followed by the size of the
-           data in use in that stack, in bytes.  This used to be a
-           conditional around just the two extra args, but that might
-           be undefined if yyoverflow is a macro.  */
-        yyoverflow (YY_("memory exhausted"),
-                    &yyss1, yysize * sizeof (*yyssp),
-                    &yyvs1, yysize * sizeof (*yyvsp),
-                    &yyls1, yysize * sizeof (*yylsp),
-                    &yystacksize);
-        yyls = yyls1;
-        yyss = yyss1;
-        yyvs = yyvs1;
-      }
-#else /* no yyoverflow */
-# ifndef YYSTACK_RELOCATE
-      goto yyexhaustedlab;
-# else
-      /* Extend the stack our own way.  */
-      if (YYMAXDEPTH <= yystacksize)
-        goto yyexhaustedlab;
-      yystacksize *= 2;
-      if (YYMAXDEPTH < yystacksize)
-        yystacksize = YYMAXDEPTH;
-      {
-        yytype_int16 *yyss1 = yyss;
-        union yyalloc *yyptr =
-          (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
-        if (! yyptr)
-          goto yyexhaustedlab;
-        YYSTACK_RELOCATE (yyss_alloc, yyss);
-        YYSTACK_RELOCATE (yyvs_alloc, yyvs);
-        YYSTACK_RELOCATE (yyls_alloc, yyls);
-#  undef YYSTACK_RELOCATE
-        if (yyss1 != yyssa)
-          YYSTACK_FREE (yyss1);
-      }
-# endif
-#endif /* no yyoverflow */
-      yyssp = yyss + yysize - 1;
-      yyvsp = yyvs + yysize - 1;
-      yylsp = yyls + yysize - 1;
-      YYDPRINTF ((stderr, "Stack size increased to %lu\n",
-                  (unsigned long int) yystacksize));
-      if (yyss + yystacksize - 1 <= yyssp)
-        YYABORT;
-    }
-  YYDPRINTF ((stderr, "Entering state %d\n", yystate));
-  if (yystate == YYFINAL)
-    YYACCEPT;
-  goto yybackup;
-/*-----------.
-| yybackup.  |
-`-----------*/
-yybackup:
-  /* Do appropriate processing given the current state.  Read a
-     lookahead token if we need one and don't already have one.  */
-  /* First try to decide what to do without reference to lookahead token.  */
-  yyn = yypact[yystate];
-  if (yypact_value_is_default (yyn))
-    goto yydefault;
-  /* Not known => get a lookahead token if don't already have one.  */
-  /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol.  */
-  if (yychar == YYEMPTY)
-    {
-      YYDPRINTF ((stderr, "Reading a token: "));
-      yychar = yylex ();
-    }
-  if (yychar <= YYEOF)
-    {
-      yychar = yytoken = YYEOF;
-      YYDPRINTF ((stderr, "Now at end of input.\n"));
-    }
-  else
-    {
-      yytoken = YYTRANSLATE (yychar);
-      YY_SYMBOL_PRINT ("Next token is", yytoken, &yylval, &yylloc);
-    }
-  /* If the proper action on seeing token YYTOKEN is to reduce or to
-     detect an error, take that action.  */
-  yyn += yytoken;
-  if (yyn < 0 || YYLAST < yyn || yycheck[yyn] != yytoken)
-    goto yydefault;
-  yyn = yytable[yyn];
-  if (yyn <= 0)
-    {
-      if (yytable_value_is_error (yyn))
-        goto yyerrlab;
-      yyn = -yyn;
-      goto yyreduce;
-    }
-  /* Count tokens shifted since error; after three, turn off error
-     status.  */
-  if (yyerrstatus)
-    yyerrstatus--;
-  /* Shift the lookahead token.  */
-  YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);
-  /* Discard the shifted token.  */
-  yychar = YYEMPTY;
-  yystate = yyn;
-  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
-  *++yyvsp = yylval;
-  YY_IGNORE_MAYBE_UNINITIALIZED_END
-  *++yylsp = yylloc;
-  goto yynewstate;
-/*-----------------------------------------------------------.
-| yydefault -- do the default action for the current state.  |
-`-----------------------------------------------------------*/
-yydefault:
-  yyn = yydefact[yystate];
-  if (yyn == 0)
-    goto yyerrlab;
-  goto yyreduce;
-/*-----------------------------.
-| yyreduce -- Do a reduction.  |
-`-----------------------------*/
-yyreduce:
-  /* yyn is the number of a rule to reduce with.  */
-  yylen = yyr2[yyn];
-  /* If YYLEN is nonzero, implement the default value of the action:
-     '$$ = $1'.
-     Otherwise, the following line sets YYVAL to garbage.
-     This behavior is undocumented and Bison
-     users should not rely upon it.  Assigning to YYVAL
-     unconditionally makes the parser a bit smaller, and it avoids a
-     GCC warning that YYVAL may be used uninitialized.  */
-  yyval = yyvsp[1-yylen];
-  /* Default location.  */
-  YYLLOC_DEFAULT (yyloc, (yylsp - yylen), yylen);
-  YY_REDUCE_PRINT (yyn);
-  switch (yyn)
-    {
-        case 2:
-#line 110 "dtc-parser.y" /* yacc.c:1646  */
-    {
-                        parser_output = build_dt_info((yyvsp[-2].flags), (yyvsp[-1].re), (yyvsp[0].node),
-                                                      guess_boot_cpuid((yyvsp[0].node)));
-                }
-#line 1478 "dtc-parser.tab.c" /* yacc.c:1646  */
-    break;
-  case 3:
-#line 118 "dtc-parser.y" /* yacc.c:1646  */
-    {
-                        (yyval.flags) = DTSF_V1;
-                }
-#line 1486 "dtc-parser.tab.c" /* yacc.c:1646  */
-    break;
-  case 4:
-#line 122 "dtc-parser.y" /* yacc.c:1646  */
-    {
-                        (yyval.flags) = DTSF_V1 | DTSF_PLUGIN;
-                }
-#line 1494 "dtc-parser.tab.c" /* yacc.c:1646  */
-    break;
-  case 6:
-#line 130 "dtc-parser.y" /* yacc.c:1646  */
-    {
-                        if ((yyvsp[0].flags) != (yyvsp[-1].flags))
-                                ERROR(&(yylsp[0]), "Header flags don't match earlier ones");
-                        (yyval.flags) = (yyvsp[-1].flags);
-                }
-#line 1504 "dtc-parser.tab.c" /* yacc.c:1646  */
-    break;
-  case 7:
-#line 139 "dtc-parser.y" /* yacc.c:1646  */
-    {
-                        (yyval.re) = NULL;
-                }
-#line 1512 "dtc-parser.tab.c" /* yacc.c:1646  */
-    break;
-  case 8:
-#line 143 "dtc-parser.y" /* yacc.c:1646  */
-    {
-                        (yyval.re) = chain_reserve_entry((yyvsp[-1].re), (yyvsp[0].re));
-                }
-#line 1520 "dtc-parser.tab.c" /* yacc.c:1646  */
-    break;
-  case 9:
-#line 150 "dtc-parser.y" /* yacc.c:1646  */
-    {
-                        (yyval.re) = build_reserve_entry((yyvsp[-2].integer), (yyvsp[-1].integer));
-                }
-#line 1528 "dtc-parser.tab.c" /* yacc.c:1646  */
-    break;
-  case 10:
-#line 154 "dtc-parser.y" /* yacc.c:1646  */
-    {
-                        add_label(&(yyvsp[0].re)->labels, (yyvsp[-1].labelref));
-                        (yyval.re) = (yyvsp[0].re);
-                }
-#line 1537 "dtc-parser.tab.c" /* yacc.c:1646  */
-    break;
-  case 11:
-#line 162 "dtc-parser.y" /* yacc.c:1646  */
-    {
-                        (yyval.node) = name_node((yyvsp[0].node), "");
-                }
-#line 1545 "dtc-parser.tab.c" /* yacc.c:1646  */
-    break;
-  case 12:
-#line 166 "dtc-parser.y" /* yacc.c:1646  */
-    {
-                        (yyval.node) = merge_nodes((yyvsp[-2].node), (yyvsp[0].node));
-                }
-#line 1553 "dtc-parser.tab.c" /* yacc.c:1646  */
-    break;
-  case 13:
-#line 171 "dtc-parser.y" /* yacc.c:1646  */
-    {
-                        struct node *target = get_node_by_ref((yyvsp[-3].node), (yyvsp[-1].labelref));
-                        if (target) {
-                                add_label(&target->labels, (yyvsp[-2].labelref));
-                                merge_nodes(target, (yyvsp[0].node));
-                        } else
-                                ERROR(&(yylsp[-1]), "Label or path %s not found", (yyvsp[-1].labelref));
-                        (yyval.node) = (yyvsp[-3].node);
-                }
-#line 1568 "dtc-parser.tab.c" /* yacc.c:1646  */
-    break;
-  case 14:
-#line 182 "dtc-parser.y" /* yacc.c:1646  */
-    {
-                        struct node *target = get_node_by_ref((yyvsp[-2].node), (yyvsp[-1].labelref));
-                        if (target) {
-                                merge_nodes(target, (yyvsp[0].node));
-                        } else {
-                                /*
-                                 * We rely on the rule being always:
-                                 *   versioninfo plugindecl memreserves devicetree
-                                 * so $-1 is what we want (plugindecl)
-                                 */
-                                if ((yyvsp[(-1) - (3)].flags) & DTSF_PLUGIN)
-                                        add_orphan_node((yyvsp[-2].node), (yyvsp[0].node), (yyvsp[-1].labelref));
-                                else
-                                        ERROR(&(yylsp[-1]), "Label or path %s not found", (yyvsp[-1].labelref));
-                        }
-                        (yyval.node) = (yyvsp[-2].node);
-                }
-#line 1591 "dtc-parser.tab.c" /* yacc.c:1646  */
-    break;
-  case 15:
-#line 201 "dtc-parser.y" /* yacc.c:1646  */
-    {
-                        struct node *target = get_node_by_ref((yyvsp[-3].node), (yyvsp[-1].labelref));
-                        if (target)
-                                delete_node(target);
-                        else
-                                ERROR(&(yylsp[-1]), "Label or path %s not found", (yyvsp[-1].labelref));
-                        (yyval.node) = (yyvsp[-3].node);
-                }
-#line 1607 "dtc-parser.tab.c" /* yacc.c:1646  */
-    break;
-  case 16:
-#line 213 "dtc-parser.y" /* yacc.c:1646  */
-    {
-                        /* build empty node */
-                        (yyval.node) = name_node(build_node(NULL, NULL), "");
-                }
-#line 1616 "dtc-parser.tab.c" /* yacc.c:1646  */
-    break;
-  case 17:
-#line 221 "dtc-parser.y" /* yacc.c:1646  */
-    {
-                        (yyval.node) = build_node((yyvsp[-3].proplist), (yyvsp[-2].nodelist));
-                }
-#line 1624 "dtc-parser.tab.c" /* yacc.c:1646  */
-    break;
-  case 18:
-#line 228 "dtc-parser.y" /* yacc.c:1646  */
-    {
-                        (yyval.proplist) = NULL;
-                }
-#line 1632 "dtc-parser.tab.c" /* yacc.c:1646  */
-    break;
-  case 19:
-#line 232 "dtc-parser.y" /* yacc.c:1646  */
-    {
-                        (yyval.proplist) = chain_property((yyvsp[0].prop), (yyvsp[-1].proplist));
-                }
-#line 1640 "dtc-parser.tab.c" /* yacc.c:1646  */
-    break;
-  case 20:
-#line 239 "dtc-parser.y" /* yacc.c:1646  */
-    {
-                        (yyval.prop) = build_property((yyvsp[-3].propnodename), (yyvsp[-1].data));
-                }
-#line 1648 "dtc-parser.tab.c" /* yacc.c:1646  */
-    break;
-  case 21:
-#line 243 "dtc-parser.y" /* yacc.c:1646  */
-    {
-                        (yyval.prop) = build_property((yyvsp[-1].propnodename), empty_data);
-                }
-#line 1656 "dtc-parser.tab.c" /* yacc.c:1646  */
-    break;
-  case 22:
-#line 247 "dtc-parser.y" /* yacc.c:1646  */
-    {
-                        (yyval.prop) = build_property_delete((yyvsp[-1].propnodename));
-                }
-#line 1664 "dtc-parser.tab.c" /* yacc.c:1646  */
-    break;
-  case 23:
-#line 251 "dtc-parser.y" /* yacc.c:1646  */
-    {
-                        add_label(&(yyvsp[0].prop)->labels, (yyvsp[-1].labelref));
-                        (yyval.prop) = (yyvsp[0].prop);
-                }
-#line 1673 "dtc-parser.tab.c" /* yacc.c:1646  */
-    break;
-  case 24:
-#line 259 "dtc-parser.y" /* yacc.c:1646  */
-    {
-                        (yyval.data) = data_merge((yyvsp[-1].data), (yyvsp[0].data));
-                }
-#line 1681 "dtc-parser.tab.c" /* yacc.c:1646  */
-    break;
-  case 25:
-#line 263 "dtc-parser.y" /* yacc.c:1646  */
-    {
-                        (yyval.data) = data_merge((yyvsp[-2].data), (yyvsp[-1].array).data);
-                }
-#line 1689 "dtc-parser.tab.c" /* yacc.c:1646  */
-    break;
-  case 26:
-#line 267 "dtc-parser.y" /* yacc.c:1646  */
-    {
-                        (yyval.data) = data_merge((yyvsp[-3].data), (yyvsp[-1].data));
-                }
-#line 1697 "dtc-parser.tab.c" /* yacc.c:1646  */
-    break;
-  case 27:
-#line 271 "dtc-parser.y" /* yacc.c:1646  */
-    {
-                        (yyval.data) = data_add_marker((yyvsp[-1].data), REF_PATH, (yyvsp[0].labelref));
-                }
-#line 1705 "dtc-parser.tab.c" /* yacc.c:1646  */
-    break;
-  case 28:
-#line 275 "dtc-parser.y" /* yacc.c:1646  */
-    {
-                        FILE *f = srcfile_relative_open((yyvsp[-5].data).val, NULL);
-                        struct data d;
-                        if ((yyvsp[-3].integer) != 0)
-                                if (fseek(f, (yyvsp[-3].integer), SEEK_SET) != 0)
-                                        die("Couldn't seek to offset %llu in \"%s\": %s",
-                                            (unsigned long long)(yyvsp[-3].integer), (yyvsp[-5].data).val,
-                                            strerror(errno));
-                        d = data_copy_file(f, (yyvsp[-1].integer));
-                        (yyval.data) = data_merge((yyvsp[-8].data), d);
-                        fclose(f);
-                }
-#line 1725 "dtc-parser.tab.c" /* yacc.c:1646  */
-    break;
-  case 29:
-#line 291 "dtc-parser.y" /* yacc.c:1646  */
-    {
-                        FILE *f = srcfile_relative_open((yyvsp[-1].data).val, NULL);
-                        struct data d = empty_data;
-                        d = data_copy_file(f, -1);
-                        (yyval.data) = data_merge((yyvsp[-4].data), d);
-                        fclose(f);
-                }
-#line 1739 "dtc-parser.tab.c" /* yacc.c:1646  */
-    break;
-  case 30:
-#line 301 "dtc-parser.y" /* yacc.c:1646  */
-    {
-                        (yyval.data) = data_add_marker((yyvsp[-1].data), LABEL, (yyvsp[0].labelref));
-                }
-#line 1747 "dtc-parser.tab.c" /* yacc.c:1646  */
-    break;
-  case 31:
-#line 308 "dtc-parser.y" /* yacc.c:1646  */
-    {
-                        (yyval.data) = empty_data;
-                }
-#line 1755 "dtc-parser.tab.c" /* yacc.c:1646  */
-    break;
-  case 32:
-#line 312 "dtc-parser.y" /* yacc.c:1646  */
-    {
-                        (yyval.data) = (yyvsp[-1].data);
-                }
-#line 1763 "dtc-parser.tab.c" /* yacc.c:1646  */
-    break;
-  case 33:
-#line 316 "dtc-parser.y" /* yacc.c:1646  */
-    {
-                        (yyval.data) = data_add_marker((yyvsp[-1].data), LABEL, (yyvsp[0].labelref));
-                }
-#line 1771 "dtc-parser.tab.c" /* yacc.c:1646  */
-    break;
-  case 34:
-#line 323 "dtc-parser.y" /* yacc.c:1646  */
-    {
-                        unsigned long long bits;
-                        bits = (yyvsp[-1].integer);
-                        if ((bits !=  8) && (bits != 16) &&
-                            (bits != 32) && (bits != 64)) {
-                                ERROR(&(yylsp[-1]), "Array elements must be"
-                                      " 8, 16, 32 or 64-bits");
-                                bits = 32;
-                        }
-                        (yyval.array).data = empty_data;
-                        (yyval.array).bits = bits;
-                }
-#line 1791 "dtc-parser.tab.c" /* yacc.c:1646  */
-    break;
-  case 35:
-#line 339 "dtc-parser.y" /* yacc.c:1646  */
-    {
-                        (yyval.array).data = empty_data;
-                        (yyval.array).bits = 32;
-                }
-#line 1800 "dtc-parser.tab.c" /* yacc.c:1646  */
-    break;
-  case 36:
-#line 344 "dtc-parser.y" /* yacc.c:1646  */
-    {
-                        if ((yyvsp[-1].array).bits < 64) {
-                                uint64_t mask = (1ULL << (yyvsp[-1].array).bits) - 1;
-                                /*
-                                 * Bits above mask must either be all zero
-                                 * (positive within range of mask) or all one
-                                 * (negative and sign-extended). The second
-                                 * condition is true if when we set all bits
-                                 * within the mask to one (i.e. | in the
-                                 * mask), all bits are one.
-                                 */
-                                if (((yyvsp[0].integer) > mask) && (((yyvsp[0].integer) | mask) != -1ULL))
-                                        ERROR(&(yylsp[0]), "Value out of range for"
-                                              " %d-bit array element", (yyvsp[-1].array).bits);
-                        }
-                        (yyval.array).data = data_append_integer((yyvsp[-1].array).data, (yyvsp[0].integer), (yyvsp[-1].array).bits);
-                }
-#line 1823 "dtc-parser.tab.c" /* yacc.c:1646  */
-    break;
-  case 37:
-#line 363 "dtc-parser.y" /* yacc.c:1646  */
-    {
-                        uint64_t val = ~0ULL >> (64 - (yyvsp[-1].array).bits);
-                        if ((yyvsp[-1].array).bits == 32)
-                                (yyvsp[-1].array).data = data_add_marker((yyvsp[-1].array).data,
-                                                          REF_PHANDLE,
-                                                          (yyvsp[0].labelref));
-                        else
-                                ERROR(&(yylsp[0]), "References are only allowed in "
-                                            "arrays with 32-bit elements.");
-                        (yyval.array).data = data_append_integer((yyvsp[-1].array).data, val, (yyvsp[-1].array).bits);
-                }
-#line 1841 "dtc-parser.tab.c" /* yacc.c:1646  */
-    break;
-  case 38:
-#line 377 "dtc-parser.y" /* yacc.c:1646  */
-    {
-                        (yyval.array).data = data_add_marker((yyvsp[-1].array).data, LABEL, (yyvsp[0].labelref));
-                }
-#line 1849 "dtc-parser.tab.c" /* yacc.c:1646  */
-    break;
-  case 41:
-#line 386 "dtc-parser.y" /* yacc.c:1646  */
-    {
-                        (yyval.integer) = (yyvsp[-1].integer);
-                }
-#line 1857 "dtc-parser.tab.c" /* yacc.c:1646  */
-    break;
-  case 44:
-#line 397 "dtc-parser.y" /* yacc.c:1646  */
-    { (yyval.integer) = (yyvsp[-4].integer) ? (yyvsp[-2].integer) : (yyvsp[0].integer); }
-#line 1863 "dtc-parser.tab.c" /* yacc.c:1646  */
-    break;
-  case 46:
-#line 402 "dtc-parser.y" /* yacc.c:1646  */
-    { (yyval.integer) = (yyvsp[-2].integer) || (yyvsp[0].integer); }
-#line 1869 "dtc-parser.tab.c" /* yacc.c:1646  */
-    break;
-  case 48:
-#line 407 "dtc-parser.y" /* yacc.c:1646  */
-    { (yyval.integer) = (yyvsp[-2].integer) && (yyvsp[0].integer); }
-#line 1875 "dtc-parser.tab.c" /* yacc.c:1646  */
-    break;
-  case 50:
-#line 412 "dtc-parser.y" /* yacc.c:1646  */
-    { (yyval.integer) = (yyvsp[-2].integer) | (yyvsp[0].integer); }
-#line 1881 "dtc-parser.tab.c" /* yacc.c:1646  */
-    break;
-  case 52:
-#line 417 "dtc-parser.y" /* yacc.c:1646  */
-    { (yyval.integer) = (yyvsp[-2].integer) ^ (yyvsp[0].integer); }
-#line 1887 "dtc-parser.tab.c" /* yacc.c:1646  */
-    break;
-  case 54:
-#line 422 "dtc-parser.y" /* yacc.c:1646  */
-    { (yyval.integer) = (yyvsp[-2].integer) & (yyvsp[0].integer); }
-#line 1893 "dtc-parser.tab.c" /* yacc.c:1646  */
-    break;
-  case 56:
-#line 427 "dtc-parser.y" /* yacc.c:1646  */
-    { (yyval.integer) = (yyvsp[-2].integer) == (yyvsp[0].integer); }
-#line 1899 "dtc-parser.tab.c" /* yacc.c:1646  */
-    break;
-  case 57:
-#line 428 "dtc-parser.y" /* yacc.c:1646  */
-    { (yyval.integer) = (yyvsp[-2].integer) != (yyvsp[0].integer); }
-#line 1905 "dtc-parser.tab.c" /* yacc.c:1646  */
-    break;
-  case 59:
-#line 433 "dtc-parser.y" /* yacc.c:1646  */
-    { (yyval.integer) = (yyvsp[-2].integer) < (yyvsp[0].integer); }
-#line 1911 "dtc-parser.tab.c" /* yacc.c:1646  */
-    break;
-  case 60:
-#line 434 "dtc-parser.y" /* yacc.c:1646  */
-    { (yyval.integer) = (yyvsp[-2].integer) > (yyvsp[0].integer); }
-#line 1917 "dtc-parser.tab.c" /* yacc.c:1646  */
-    break;
-  case 61:
-#line 435 "dtc-parser.y" /* yacc.c:1646  */
-    { (yyval.integer) = (yyvsp[-2].integer) <= (yyvsp[0].integer); }
-#line 1923 "dtc-parser.tab.c" /* yacc.c:1646  */
-    break;
-  case 62:
-#line 436 "dtc-parser.y" /* yacc.c:1646  */
-    { (yyval.integer) = (yyvsp[-2].integer) >= (yyvsp[0].integer); }
-#line 1929 "dtc-parser.tab.c" /* yacc.c:1646  */
-    break;
-  case 63:
-#line 440 "dtc-parser.y" /* yacc.c:1646  */
-    { (yyval.integer) = (yyvsp[-2].integer) << (yyvsp[0].integer); }
-#line 1935 "dtc-parser.tab.c" /* yacc.c:1646  */
-    break;
-  case 64:
-#line 441 "dtc-parser.y" /* yacc.c:1646  */
-    { (yyval.integer) = (yyvsp[-2].integer) >> (yyvsp[0].integer); }
-#line 1941 "dtc-parser.tab.c" /* yacc.c:1646  */
-    break;
-  case 66:
-#line 446 "dtc-parser.y" /* yacc.c:1646  */
-    { (yyval.integer) = (yyvsp[-2].integer) + (yyvsp[0].integer); }
-#line 1947 "dtc-parser.tab.c" /* yacc.c:1646  */
-    break;
-  case 67:
-#line 447 "dtc-parser.y" /* yacc.c:1646  */
-    { (yyval.integer) = (yyvsp[-2].integer) - (yyvsp[0].integer); }
-#line 1953 "dtc-parser.tab.c" /* yacc.c:1646  */
-    break;
-  case 69:
-#line 452 "dtc-parser.y" /* yacc.c:1646  */
-    { (yyval.integer) = (yyvsp[-2].integer) * (yyvsp[0].integer); }
-#line 1959 "dtc-parser.tab.c" /* yacc.c:1646  */
-    break;
-  case 70:
-#line 454 "dtc-parser.y" /* yacc.c:1646  */
-    {
-                        if ((yyvsp[0].integer) != 0) {
-                                (yyval.integer) = (yyvsp[-2].integer) / (yyvsp[0].integer);
-                        } else {
-                                ERROR(&(yyloc), "Division by zero");
-                                (yyval.integer) = 0;
-                        }
-                }
-#line 1972 "dtc-parser.tab.c" /* yacc.c:1646  */
-    break;
-  case 71:
-#line 463 "dtc-parser.y" /* yacc.c:1646  */
-    {
-                        if ((yyvsp[0].integer) != 0) {
-                                (yyval.integer) = (yyvsp[-2].integer) % (yyvsp[0].integer);
-                        } else {
-                                ERROR(&(yyloc), "Division by zero");
-                                (yyval.integer) = 0;
-                        }
-                }
-#line 1985 "dtc-parser.tab.c" /* yacc.c:1646  */
-    break;
-  case 74:
-#line 476 "dtc-parser.y" /* yacc.c:1646  */
-    { (yyval.integer) = -(yyvsp[0].integer); }
-#line 1991 "dtc-parser.tab.c" /* yacc.c:1646  */
-    break;
-  case 75:
-#line 477 "dtc-parser.y" /* yacc.c:1646  */
-    { (yyval.integer) = ~(yyvsp[0].integer); }
-#line 1997 "dtc-parser.tab.c" /* yacc.c:1646  */
-    break;
-  case 76:
-#line 478 "dtc-parser.y" /* yacc.c:1646  */
-    { (yyval.integer) = !(yyvsp[0].integer); }
-#line 2003 "dtc-parser.tab.c" /* yacc.c:1646  */
-    break;
-  case 77:
-#line 483 "dtc-parser.y" /* yacc.c:1646  */
-    {
-                        (yyval.data) = empty_data;
-                }
-#line 2011 "dtc-parser.tab.c" /* yacc.c:1646  */
-    break;
-  case 78:
-#line 487 "dtc-parser.y" /* yacc.c:1646  */
-    {
-                        (yyval.data) = data_append_byte((yyvsp[-1].data), (yyvsp[0].byte));
-                }
-#line 2019 "dtc-parser.tab.c" /* yacc.c:1646  */
-    break;
-  case 79:
-#line 491 "dtc-parser.y" /* yacc.c:1646  */
-    {
-                        (yyval.data) = data_add_marker((yyvsp[-1].data), LABEL, (yyvsp[0].labelref));
-                }
-#line 2027 "dtc-parser.tab.c" /* yacc.c:1646  */
-    break;
-  case 80:
-#line 498 "dtc-parser.y" /* yacc.c:1646  */
-    {
-                        (yyval.nodelist) = NULL;
-                }
-#line 2035 "dtc-parser.tab.c" /* yacc.c:1646  */
-    break;
-  case 81:
-#line 502 "dtc-parser.y" /* yacc.c:1646  */
-    {
-                        (yyval.nodelist) = chain_node((yyvsp[-1].node), (yyvsp[0].nodelist));
-                }
-#line 2043 "dtc-parser.tab.c" /* yacc.c:1646  */
-    break;
-  case 82:
-#line 506 "dtc-parser.y" /* yacc.c:1646  */
-    {
-                        ERROR(&(yylsp[0]), "Properties must precede subnodes");
-                        YYERROR;
-                }
-#line 2052 "dtc-parser.tab.c" /* yacc.c:1646  */
-    break;
-  case 83:
-#line 514 "dtc-parser.y" /* yacc.c:1646  */
-    {
-                        (yyval.node) = name_node((yyvsp[0].node), (yyvsp[-1].propnodename));
-                }
-#line 2060 "dtc-parser.tab.c" /* yacc.c:1646  */
-    break;
-  case 84:
-#line 518 "dtc-parser.y" /* yacc.c:1646  */
-    {
-                        (yyval.node) = name_node(build_node_delete(), (yyvsp[-1].propnodename));
-                }
-#line 2068 "dtc-parser.tab.c" /* yacc.c:1646  */
-    break;
-  case 85:
-#line 522 "dtc-parser.y" /* yacc.c:1646  */
-    {
-                        add_label(&(yyvsp[0].node)->labels, (yyvsp[-1].labelref));
-                        (yyval.node) = (yyvsp[0].node);
-                }
-#line 2077 "dtc-parser.tab.c" /* yacc.c:1646  */
-    break;
-#line 2081 "dtc-parser.tab.c" /* yacc.c:1646  */
-      default: break;
-    }
-  /* User semantic actions sometimes alter yychar, and that requires
-     that yytoken be updated with the new translation.  We take the
-     approach of translating immediately before every use of yytoken.
-     One alternative is translating here after every semantic action,
-     but that translation would be missed if the semantic action invokes
-     YYABORT, YYACCEPT, or YYERROR immediately after altering yychar or
-     if it invokes YYBACKUP.  In the case of YYABORT or YYACCEPT, an
-     incorrect destructor might then be invoked immediately.  In the
-     case of YYERROR or YYBACKUP, subsequent parser actions might lead
-     to an incorrect destructor call or verbose syntax error message
-     before the lookahead is translated.  */
-  YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
-  YYPOPSTACK (yylen);
-  yylen = 0;
-  YY_STACK_PRINT (yyss, yyssp);
-  *++yyvsp = yyval;
-  *++yylsp = yyloc;
-  /* Now 'shift' the result of the reduction.  Determine what state
-     that goes to, based on the state we popped back to and the rule
-     number reduced by.  */
-  yyn = yyr1[yyn];
-  yystate = yypgoto[yyn - YYNTOKENS] + *yyssp;
-  if (0 <= yystate && yystate <= YYLAST && yycheck[yystate] == *yyssp)
-    yystate = yytable[yystate];
-  else
-    yystate = yydefgoto[yyn - YYNTOKENS];
-  goto yynewstate;
-/*--------------------------------------.
-| yyerrlab -- here on detecting error.  |
-`--------------------------------------*/
-yyerrlab:
-  /* Make sure we have latest lookahead translation.  See comments at
-     user semantic actions for why this is necessary.  */
-  yytoken = yychar == YYEMPTY ? YYEMPTY : YYTRANSLATE (yychar);
-  /* If not already recovering from an error, report this error.  */
-  if (!yyerrstatus)
-    {
-      ++yynerrs;
-#if ! YYERROR_VERBOSE
-      yyerror (YY_("syntax error"));
-#else
-# define YYSYNTAX_ERROR yysyntax_error (&yymsg_alloc, &yymsg, \
-                                        yyssp, yytoken)
-      {
-        char const *yymsgp = YY_("syntax error");
-        int yysyntax_error_status;
-        yysyntax_error_status = YYSYNTAX_ERROR;
-        if (yysyntax_error_status == 0)
-          yymsgp = yymsg;
-        else if (yysyntax_error_status == 1)
-          {
-            if (yymsg != yymsgbuf)
-              YYSTACK_FREE (yymsg);
-            yymsg = (char *) YYSTACK_ALLOC (yymsg_alloc);
-            if (!yymsg)
-              {
-                yymsg = yymsgbuf;
-                yymsg_alloc = sizeof yymsgbuf;
-                yysyntax_error_status = 2;
-              }
-            else
-              {
-                yysyntax_error_status = YYSYNTAX_ERROR;
-                yymsgp = yymsg;
-              }
-          }
-        yyerror (yymsgp);
-        if (yysyntax_error_status == 2)
-          goto yyexhaustedlab;
-      }
-# undef YYSYNTAX_ERROR
-#endif
-    }
-  yyerror_range[1] = yylloc;
-  if (yyerrstatus == 3)
-    {
-      /* If just tried and failed to reuse lookahead token after an
-         error, discard it.  */
-      if (yychar <= YYEOF)
-        {
-          /* Return failure if at end of input.  */
-          if (yychar == YYEOF)
-            YYABORT;
-        }
-      else
-        {
-          yydestruct ("Error: discarding",
-                      yytoken, &yylval, &yylloc);
-          yychar = YYEMPTY;
-        }
-    }
-  /* Else will try to reuse lookahead token after shifting the error
-     token.  */
-  goto yyerrlab1;
-/*---------------------------------------------------.
-| yyerrorlab -- error raised explicitly by YYERROR.  |
-`---------------------------------------------------*/
-yyerrorlab:
-  /* Pacify compilers like GCC when the user code never invokes
-     YYERROR and the label yyerrorlab therefore never appears in user
-     code.  */
-  if (/*CONSTCOND*/ 0)
-     goto yyerrorlab;
-  yyerror_range[1] = yylsp[1-yylen];
-  /* Do not reclaim the symbols of the rule whose action triggered
-     this YYERROR.  */
-  YYPOPSTACK (yylen);
-  yylen = 0;
-  YY_STACK_PRINT (yyss, yyssp);
-  yystate = *yyssp;
-  goto yyerrlab1;
-/*-------------------------------------------------------------.
-| yyerrlab1 -- common code for both syntax error and YYERROR.  |
-`-------------------------------------------------------------*/
-yyerrlab1:
-  yyerrstatus = 3;      /* Each real token shifted decrements this.  */
-  for (;;)
-    {
-      yyn = yypact[yystate];
-      if (!yypact_value_is_default (yyn))
-        {
-          yyn += YYTERROR;
-          if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
-            {
-              yyn = yytable[yyn];
-              if (0 < yyn)
-                break;
-            }
-        }
-      /* Pop the current state because it cannot handle the error token.  */
-      if (yyssp == yyss)
-        YYABORT;
-      yyerror_range[1] = *yylsp;
-      yydestruct ("Error: popping",
-                  yystos[yystate], yyvsp, yylsp);
-      YYPOPSTACK (1);
-      yystate = *yyssp;
-      YY_STACK_PRINT (yyss, yyssp);
-    }
-  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
-  *++yyvsp = yylval;
-  YY_IGNORE_MAYBE_UNINITIALIZED_END
-  yyerror_range[2] = yylloc;
-  /* Using YYLLOC is tempting, but would change the location of
-     the lookahead.  YYLOC is available though.  */
-  YYLLOC_DEFAULT (yyloc, yyerror_range, 2);
-  *++yylsp = yyloc;
-  /* Shift the error token.  */
-  YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp);
-  yystate = yyn;
-  goto yynewstate;
-/*-------------------------------------.
-| yyacceptlab -- YYACCEPT comes here.  |
-`-------------------------------------*/
-yyacceptlab:
-  yyresult = 0;
-  goto yyreturn;
-/*-----------------------------------.
-| yyabortlab -- YYABORT comes here.  |
-`-----------------------------------*/
-yyabortlab:
-  yyresult = 1;
-  goto yyreturn;
-#if !defined yyoverflow || YYERROR_VERBOSE
-/*-------------------------------------------------.
-| yyexhaustedlab -- memory exhaustion comes here.  |
-`-------------------------------------------------*/
-yyexhaustedlab:
-  yyerror (YY_("memory exhausted"));
-  yyresult = 2;
-  /* Fall through.  */
-#endif
-yyreturn:
-  if (yychar != YYEMPTY)
-    {
-      /* Make sure we have latest lookahead translation.  See comments at
-         user semantic actions for why this is necessary.  */
-      yytoken = YYTRANSLATE (yychar);
-      yydestruct ("Cleanup: discarding lookahead",
-                  yytoken, &yylval, &yylloc);
-    }
-  /* Do not reclaim the symbols of the rule whose action triggered
-     this YYABORT or YYACCEPT.  */
-  YYPOPSTACK (yylen);
-  YY_STACK_PRINT (yyss, yyssp);
-  while (yyssp != yyss)
-    {
-      yydestruct ("Cleanup: popping",
-                  yystos[*yyssp], yyvsp, yylsp);
-      YYPOPSTACK (1);
-    }
-#ifndef yyoverflow
-  if (yyss != yyssa)
-    YYSTACK_FREE (yyss);
-#endif
-#if YYERROR_VERBOSE
-  if (yymsg != yymsgbuf)
-    YYSTACK_FREE (yymsg);
-#endif
-  return yyresult;
-}
-#line 528 "dtc-parser.y" /* yacc.c:1906  */
-void yyerror(char const *s)
-{
-        ERROR(&yylloc, "%s", s);
-}
diff --git a/scripts/dtc/dtc-parser.tab.h_shipped b/scripts/dtc/dtc-parser.tab.h_shipped
deleted file mode 100644
index 6aa512c1b337..000000000000
--- a/scripts/dtc/dtc-parser.tab.h_shipped
+++ /dev/null
@@ -1,125 +0,0 @@
-/* A Bison parser, made by GNU Bison 3.0.4.  */
-/* Bison interface for Yacc-like parsers in C
-   Copyright (C) 1984, 1989-1990, 2000-2015 Free Software Foundation, Inc.
-   This program is free software: you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
-/* As a special exception, you may create a larger work that contains
-   part or all of the Bison parser skeleton and distribute that work
-   under terms of your choice, so long as that work isn't itself a
-   parser generator using the skeleton or a modified version thereof
-   as a parser skeleton.  Alternatively, if you modify or redistribute
-   the parser skeleton itself, you may (at your option) remove this
-   special exception, which will cause the skeleton and the resulting
-   Bison output files to be licensed under the GNU General Public
-   License without this special exception.
-   This special exception was added by the Free Software Foundation in
-   version 2.2 of Bison.  */
-#ifndef YY_YY_DTC_PARSER_TAB_H_INCLUDED
-# define YY_YY_DTC_PARSER_TAB_H_INCLUDED
-/* Debug traces.  */
-#ifndef YYDEBUG
-# define YYDEBUG 0
-#endif
-#if YYDEBUG
-extern int yydebug;
-#endif
-/* Token type.  */
-#ifndef YYTOKENTYPE
-# define YYTOKENTYPE
-  enum yytokentype
-  {
-    DT_V1 = 258,
-    DT_PLUGIN = 259,
-    DT_MEMRESERVE = 260,
-    DT_LSHIFT = 261,
-    DT_RSHIFT = 262,
-    DT_LE = 263,
-    DT_GE = 264,
-    DT_EQ = 265,
-    DT_NE = 266,
-    DT_AND = 267,
-    DT_OR = 268,
-    DT_BITS = 269,
-    DT_DEL_PROP = 270,
-    DT_DEL_NODE = 271,
-    DT_PROPNODENAME = 272,
-    DT_LITERAL = 273,
-    DT_CHAR_LITERAL = 274,
-    DT_BYTE = 275,
-    DT_STRING = 276,
-    DT_LABEL = 277,
-    DT_REF = 278,
-    DT_INCBIN = 279
-  };
-#endif
-/* Value type.  */
-#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
-union YYSTYPE
-{
-#line 39 "dtc-parser.y" /* yacc.c:1909  */
-        char *propnodename;
-        char *labelref;
-        uint8_t byte;
-        struct data data;
-        struct {
-                struct data     data;
-                int             bits;
-        } array;
-        struct property *prop;
-        struct property *proplist;
-        struct node *node;
-        struct node *nodelist;
-        struct reserve_info *re;
-        uint64_t integer;
-        unsigned int flags;
-#line 99 "dtc-parser.tab.h" /* yacc.c:1909  */
-};
-typedef union YYSTYPE YYSTYPE;
-# define YYSTYPE_IS_TRIVIAL 1
-# define YYSTYPE_IS_DECLARED 1
-#endif
-/* Location type.  */
-#if ! defined YYLTYPE && ! defined YYLTYPE_IS_DECLARED
-typedef struct YYLTYPE YYLTYPE;
-struct YYLTYPE
-{
-  int first_line;
-  int first_column;
-  int last_line;
-  int last_column;
-};
-# define YYLTYPE_IS_DECLARED 1
-# define YYLTYPE_IS_TRIVIAL 1
-#endif
-extern YYSTYPE yylval;
-extern YYLTYPE yylloc;
-int yyparse (void);
-#endif /* !YY_YY_DTC_PARSER_TAB_H_INCLUDED  */
diff --git a/scripts/dtc/dtc-parser.y b/scripts/dtc/dtc-parser.y
index affc81a8f9ab..dd70ebf386f4 100644
--- a/scripts/dtc/dtc-parser.y
+++ b/scripts/dtc/dtc-parser.y
@@ -63,6 +63,7 @@ extern bool treesource_error;
 %token DT_BITS
 %token DT_DEL_PROP
 %token DT_DEL_NODE
+%token DT_OMIT_NO_REF
 %token <propnodename> DT_PROPNODENAME
 %token <integer> DT_LITERAL
 %token <integer> DT_CHAR_LITERAL
@@ -166,7 +167,17 @@ devicetree:
                {
                        $$ = merge_nodes($1, $3);
                }
+        | DT_REF nodedef
+                {
+                        /*
+                         * We rely on the rule being always:
+                         *   versioninfo plugindecl memreserves devicetree
+                         * so $-1 is what we want (plugindecl)
+                         */
+                        if (!($<flags>-1 & DTSF_PLUGIN))
+                                ERROR(&@2, "Label or path %s not found", $1);
+                        $$ = add_orphan_node(name_node(build_node(NULL, NULL), ""), $2, $1);
+                }
        | devicetree DT_LABEL DT_REF nodedef
                {
                        struct node *target = get_node_by_ref($1, $3);
@@ -180,18 +191,18 @@ devicetree:
                }
        | devicetree DT_REF nodedef
                {
-                        struct node *target = get_node_by_ref($1, $2);
+                        /*
+                         * We rely on the rule being always:
-                        if (target) {
+                         *   versioninfo plugindecl memreserves devicetree
-                                merge_nodes(target, $3);
+                         * so $-1 is what we want (plugindecl)
+                         */
+                        if ($<flags>-1 & DTSF_PLUGIN) {
+                                add_orphan_node($1, $3, $2);
                        } else {
-                                /*
+                                struct node *target = get_node_by_ref($1, $2);
-                                 * We rely on the rule being always:
-                                 *   versioninfo plugindecl memreserves devicetree
+                                if (target)
-                                 * so $-1 is what we want (plugindecl)
+                                        merge_nodes(target, $3);
-                                 */
-                                if ($<flags>-1 & DTSF_PLUGIN)
-                                        add_orphan_node($1, $3, $2);
                                else
                                        ERROR(&@2, "Label or path %s not found", $2);
                        }
@@ -209,10 +220,17 @@ devicetree:
                        $$ = $1;
                }
-        | /* empty */
+        | devicetree DT_OMIT_NO_REF DT_REF ';'
                {
-                        /* build empty node */
+                        struct node *target = get_node_by_ref($1, $3);
-                        $$ = name_node(build_node(NULL, NULL), "");
+                        if (target)
+                                omit_node_if_unused(target);
+                        else
+                                ERROR(&@3, "Label or path %s not found", $3);
+                        $$ = $1;
                }
        ;
@@ -269,6 +287,7 @@ propdata:
                }
        | propdataprefix DT_REF
                {
+                        $1 = data_add_marker($1, TYPE_STRING, $2);
                        $$ = data_add_marker($1, REF_PATH, $2);
                }
        | propdataprefix DT_INCBIN '(' DT_STRING ',' integer_prim ',' integer_prim ')'
@@ -322,22 +341,27 @@ arrayprefix:
        DT_BITS DT_LITERAL '<'
                {
                        unsigned long long bits;
+                        enum markertype type = TYPE_UINT32;
                        bits = $2;
-                        if ((bits !=  8) && (bits != 16) &&
+                        switch (bits) {
-                            (bits != 32) && (bits != 64)) {
+                        case 8: type = TYPE_UINT8; break;
+                        case 16: type = TYPE_UINT16; break;
+                        case 32: type = TYPE_UINT32; break;
+                        case 64: type = TYPE_UINT64; break;
+                        default:
                                ERROR(&@2, "Array elements must be"
                                      " 8, 16, 32 or 64-bits");
                                bits = 32;
                        }
-                        $$.data = empty_data;
+                        $$.data = data_add_marker(empty_data, type, NULL);
                        $$.bits = bits;
                }
        | '<'
                {
-                        $$.data = empty_data;
+                        $$.data = data_add_marker(empty_data, TYPE_UINT32, NULL);
                        $$.bits = 32;
                }
        | arrayprefix integer_prim
@@ -481,7 +505,7 @@ integer_unary:
 bytestring:
          /* empty */
                {
-                        $$ = empty_data;
+                        $$ = data_add_marker(empty_data, TYPE_UINT8, NULL);
                }
        | bytestring DT_BYTE
                {
@@ -518,6 +542,10 @@ subnode:
                {
                        $$ = name_node(build_node_delete(), $2);
                }
+        | DT_OMIT_NO_REF subnode
+                {
+                        $$ = omit_node_if_unused($2);
+                }
        | DT_LABEL subnode
                {
                        add_label(&$2->labels, $1);
diff --git a/scripts/dtc/dtc.c b/scripts/dtc/dtc.c
index 5ed873c72ad1..64134aadb997 100644
--- a/scripts/dtc/dtc.c
+++ b/scripts/dtc/dtc.c
@@ -59,8 +59,6 @@ static void fill_fullpaths(struct node *tree, const char *prefix)
 }
 /* Usage related data. */
-#define FDT_VERSION(version)    _FDT_VERSION(version)
-#define _FDT_VERSION(version)   #version
 static const char usage_synopsis[] = "dtc [options] <input file>";
 static const char usage_short_opts[] = "qI:O:o:V:d:R:S:p:a:fb:i:H:sW:E:@Ahv";
 static struct option const usage_long_opts[] = {
@@ -97,8 +95,11 @@ static const char * const usage_opts_help[] = {
        "\n\tOutput formats are:\n"
         "\t\tdts - device tree source text\n"
         "\t\tdtb - device tree blob\n"
+#ifndef NO_YAML
+         "\t\tyaml - device tree encoded as YAML\n"
+#endif
         "\t\tasm - assembler source",
-        "\n\tBlob version to produce, defaults to "FDT_VERSION(DEFAULT_FDT_VERSION)" (for dtb and asm output)",
+        "\n\tBlob version to produce, defaults to "stringify(DEFAULT_FDT_VERSION)" (for dtb and asm output)",
        "\n\tOutput dependency file",
        "\n\tMake space for <number> reserve map entries (for dtb and asm output)",
        "\n\tMake the blob at least <bytes> long (extra space)",
@@ -130,6 +131,8 @@ static const char *guess_type_by_name(const char *fname, const char *fallback)
                return fallback;
        if (!strcasecmp(s, ".dts"))
                return "dts";
+        if (!strcasecmp(s, ".yaml"))
+                return "yaml";
        if (!strcasecmp(s, ".dtb"))
                return "dtb";
        return fallback;
@@ -319,13 +322,14 @@ int main(int argc, char *argv[])
                dti->boot_cpuid_phys = cmdline_boot_cpuid;
        fill_fullpaths(dti->dt, "");
-        process_checks(force, dti);
        /* on a plugin, generate by default */
        if (dti->dtsflags & DTSF_PLUGIN) {
                generate_fixups = 1;
        }
+        process_checks(force, dti);
        if (auto_label_aliases)
                generate_label_tree(dti, "aliases", false);
@@ -351,6 +355,12 @@ int main(int argc, char *argv[])
        if (streq(outform, "dts")) {
                dt_to_source(outf, dti);
+#ifndef NO_YAML
+        } else if (streq(outform, "yaml")) {
+                if (!streq(inform, "dts"))
+                        die("YAML output format requires dts input format\n");
+                dt_to_yaml(outf, dti);
+#endif
        } else if (streq(outform, "dtb")) {
                dt_to_blob(outf, dti, outversion);
        } else if (streq(outform, "asm")) {
diff --git a/scripts/dtc/dtc.h b/scripts/dtc/dtc.h
index 35cf926cc14a..cbe541525c2c 100644
--- a/scripts/dtc/dtc.h
+++ b/scripts/dtc/dtc.h
@@ -1,5 +1,5 @@
-#ifndef _DTC_H
+#ifndef DTC_H
-#define _DTC_H
+#define DTC_H
 /*
 * (C) Copyright David Gibson <dwg@au1.ibm.com>, IBM Corporation.  2005.
@@ -67,16 +67,24 @@ typedef uint32_t cell_t;
 #define streq(a, b)     (strcmp((a), (b)) == 0)
-#define strneq(a, b, n) (strncmp((a), (b), (n)) == 0)
+#define strstarts(s, prefix)    (strncmp((s), (prefix), strlen(prefix)) == 0)
+#define strprefixeq(a, n, b)    (strlen(b) == (n) && (memcmp(a, b, n) == 0))
 #define ALIGN(x, a)     (((x) + (a) - 1) & ~((a) - 1))
 /* Data blobs */
 enum markertype {
+        TYPE_NONE,
        REF_PHANDLE,
        REF_PATH,
        LABEL,
+        TYPE_UINT8,
+        TYPE_UINT16,
+        TYPE_UINT32,
+        TYPE_UINT64,
+        TYPE_STRING,
 };
+extern const char *markername(enum markertype markertype);
 struct  marker {
        enum markertype type;
@@ -100,6 +108,8 @@ struct data {
        for_each_marker(m) \
                if ((m)->type == (t))
+size_t type_marker_length(struct marker *m);
 void data_free(struct data d);
 struct data data_grow_for(struct data d, int xlen);
@@ -167,6 +177,8 @@ struct node {
        struct label *labels;
        const struct bus_type *bus;
+        bool omit_if_unused, is_referenced;
 };
 #define for_each_label_withdel(l0, l) \
@@ -201,9 +213,11 @@ struct property *reverse_properties(struct property *first);
 struct node *build_node(struct property *proplist, struct node *children);
 struct node *build_node_delete(void);
 struct node *name_node(struct node *node, char *name);
+struct node *omit_node_if_unused(struct node *node);
+struct node *reference_node(struct node *node);
 struct node *chain_node(struct node *first, struct node *list);
 struct node *merge_nodes(struct node *old_node, struct node *new_node);
-void add_orphan_node(struct node *old_node, struct node *new_node, char *ref);
+struct node *add_orphan_node(struct node *old_node, struct node *new_node, char *ref);
 void add_property(struct node *node, struct property *prop);
 void delete_property_by_name(struct node *node, char *name);
@@ -285,8 +299,12 @@ struct dt_info *dt_from_blob(const char *fname);
 void dt_to_source(FILE *f, struct dt_info *dti);
 struct dt_info *dt_from_source(const char *f);
+/* YAML source */
+void dt_to_yaml(FILE *f, struct dt_info *dti);
 /* FS trees */
 struct dt_info *dt_from_fs(const char *dirname);
-#endif /* _DTC_H */
+#endif /* DTC_H */
diff --git a/scripts/dtc/flattree.c b/scripts/dtc/flattree.c
index fcf71541d8a7..851ea87dbc0f 100644
--- a/scripts/dtc/flattree.c
+++ b/scripts/dtc/flattree.c
@@ -393,7 +393,7 @@ void dt_to_blob(FILE *f, struct dt_info *dti, int version)
                        padlen = 0;
                        if (quiet < 1)
                                fprintf(stderr,
-                                        "Warning: blob size %d >= minimum size %d\n",
+                                        "Warning: blob size %"PRIu32" >= minimum size %d\n",
                                        fdt32_to_cpu(fdt.totalsize), minsize);
                }
        }
@@ -731,7 +731,7 @@ static char *nodename_from_path(const char *ppath, const char *cpath)
        plen = strlen(ppath);
-        if (!strneq(ppath, cpath, plen))
+        if (!strstarts(cpath, ppath))
                die("Path \"%s\" is not valid as a child of \"%s\"\n",
                    cpath, ppath);
diff --git a/scripts/dtc/include-prefixes/cris b/scripts/dtc/include-prefixes/cris
deleted file mode 120000
index 736d998ba506..000000000000
--- a/scripts/dtc/include-prefixes/cris
+++ /dev/null
@@ -1 +0,0 @@
-../../../arch/cris/boot/dts
-\ No newline at end of file
diff --git a/scripts/dtc/include-prefixes/metag b/scripts/dtc/include-prefixes/metag
deleted file mode 120000
index 87a3c847db8f..000000000000
--- a/scripts/dtc/include-prefixes/metag
+++ /dev/null
@@ -1 +0,0 @@
-../../../arch/metag/boot/dts
-\ No newline at end of file
diff --git a/scripts/dtc/libfdt/fdt.c b/scripts/dtc/libfdt/fdt.c
index 22286a1aaeaf..ae03b1112961 100644
--- a/scripts/dtc/libfdt/fdt.c
+++ b/scripts/dtc/libfdt/fdt.c
@@ -55,7 +55,12 @@
 #include "libfdt_internal.h"
-int fdt_check_header(const void *fdt)
+/*
+ * Minimal sanity check for a read-only tree. fdt_ro_probe_() checks
+ * that the given buffer contains what appears to be a flattened
+ * device tree with sane information in its header.
+ */
+int fdt_ro_probe_(const void *fdt)
 {
        if (fdt_magic(fdt) == FDT_MAGIC) {
                /* Complete tree */
@@ -74,6 +79,78 @@ int fdt_check_header(const void *fdt)
        return 0;
 }
+static int check_off_(uint32_t hdrsize, uint32_t totalsize, uint32_t off)
+{
+        return (off >= hdrsize) && (off <= totalsize);
+}
+static int check_block_(uint32_t hdrsize, uint32_t totalsize,
+                        uint32_t base, uint32_t size)
+{
+        if (!check_off_(hdrsize, totalsize, base))
+                return 0; /* block start out of bounds */
+        if ((base + size) < base)
+                return 0; /* overflow */
+        if (!check_off_(hdrsize, totalsize, base + size))
+                return 0; /* block end out of bounds */
+        return 1;
+}
+size_t fdt_header_size_(uint32_t version)
+{
+        if (version <= 1)
+                return FDT_V1_SIZE;
+        else if (version <= 2)
+                return FDT_V2_SIZE;
+        else if (version <= 3)
+                return FDT_V3_SIZE;
+        else if (version <= 16)
+                return FDT_V16_SIZE;
+        else
+                return FDT_V17_SIZE;
+}
+int fdt_check_header(const void *fdt)
+{
+        size_t hdrsize;
+        if (fdt_magic(fdt) != FDT_MAGIC)
+                return -FDT_ERR_BADMAGIC;
+        hdrsize = fdt_header_size(fdt);
+        if ((fdt_version(fdt) < FDT_FIRST_SUPPORTED_VERSION)
+            || (fdt_last_comp_version(fdt) > FDT_LAST_SUPPORTED_VERSION))
+                return -FDT_ERR_BADVERSION;
+        if (fdt_version(fdt) < fdt_last_comp_version(fdt))
+                return -FDT_ERR_BADVERSION;
+        if ((fdt_totalsize(fdt) < hdrsize)
+            || (fdt_totalsize(fdt) > INT_MAX))
+                return -FDT_ERR_TRUNCATED;
+        /* Bounds check memrsv block */
+        if (!check_off_(hdrsize, fdt_totalsize(fdt), fdt_off_mem_rsvmap(fdt)))
+                return -FDT_ERR_TRUNCATED;
+        /* Bounds check structure block */
+        if (fdt_version(fdt) < 17) {
+                if (!check_off_(hdrsize, fdt_totalsize(fdt),
+                                fdt_off_dt_struct(fdt)))
+                        return -FDT_ERR_TRUNCATED;
+        } else {
+                if (!check_block_(hdrsize, fdt_totalsize(fdt),
+                                  fdt_off_dt_struct(fdt),
+                                  fdt_size_dt_struct(fdt)))
+                        return -FDT_ERR_TRUNCATED;
+        }
+        /* Bounds check strings block */
+        if (!check_block_(hdrsize, fdt_totalsize(fdt),
+                          fdt_off_dt_strings(fdt), fdt_size_dt_strings(fdt)))
+                return -FDT_ERR_TRUNCATED;
+        return 0;
+}
 const void *fdt_offset_ptr(const void *fdt, int offset, unsigned int len)
 {
        unsigned absoffset = offset + fdt_off_dt_struct(fdt);
@@ -88,7 +165,7 @@ const void *fdt_offset_ptr(const void *fdt, int offset, unsigned int len)
                    || ((offset + len) > fdt_size_dt_struct(fdt)))
                        return NULL;
-        return _fdt_offset_ptr(fdt, offset);
+        return fdt_offset_ptr_(fdt, offset);
 }
 uint32_t fdt_next_tag(const void *fdt, int startoffset, int *nextoffset)
@@ -123,6 +200,9 @@ uint32_t fdt_next_tag(const void *fdt, int startoffset, int *nextoffset)
                /* skip-name offset, length and value */
                offset += sizeof(struct fdt_property) - FDT_TAGSIZE
                        + fdt32_to_cpu(*lenp);
+                if (fdt_version(fdt) < 0x10 && fdt32_to_cpu(*lenp) >= 8 &&
+                    ((offset - fdt32_to_cpu(*lenp)) % 8) != 0)
+                        offset += 4;
                break;
        case FDT_END:
@@ -141,7 +221,7 @@ uint32_t fdt_next_tag(const void *fdt, int startoffset, int *nextoffset)
        return tag;
 }
-int _fdt_check_node_offset(const void *fdt, int offset)
+int fdt_check_node_offset_(const void *fdt, int offset)
 {
        if ((offset < 0) || (offset % FDT_TAGSIZE)
            || (fdt_next_tag(fdt, offset, &offset) != FDT_BEGIN_NODE))
@@ -150,7 +230,7 @@ int _fdt_check_node_offset(const void *fdt, int offset)
        return offset;
 }
-int _fdt_check_prop_offset(const void *fdt, int offset)
+int fdt_check_prop_offset_(const void *fdt, int offset)
 {
        if ((offset < 0) || (offset % FDT_TAGSIZE)
            || (fdt_next_tag(fdt, offset, &offset) != FDT_PROP))
@@ -165,7 +245,7 @@ int fdt_next_node(const void *fdt, int offset, int *depth)
        uint32_t tag;
        if (offset >= 0)
-                if ((nextoffset = _fdt_check_node_offset(fdt, offset)) < 0)
+                if ((nextoffset = fdt_check_node_offset_(fdt, offset)) < 0)
                        return nextoffset;
        do {
@@ -227,7 +307,7 @@ int fdt_next_subnode(const void *fdt, int offset)
        return offset;
 }
-const char *_fdt_find_string(const char *strtab, int tabsize, const char *s)
+const char *fdt_find_string_(const char *strtab, int tabsize, const char *s)
 {
        int len = strlen(s) + 1;
        const char *last = strtab + tabsize - len;
@@ -241,7 +321,7 @@ const char *_fdt_find_string(const char *strtab, int tabsize, const char *s)
 int fdt_move(const void *fdt, void *buf, int bufsize)
 {
-        FDT_CHECK_HEADER(fdt);
+        FDT_RO_PROBE(fdt);
        if (fdt_totalsize(fdt) > bufsize)
                return -FDT_ERR_NOSPACE;
diff --git a/scripts/dtc/libfdt/fdt.h b/scripts/dtc/libfdt/fdt.h
index 526aedb51556..74961f9026d1 100644
--- a/scripts/dtc/libfdt/fdt.h
+++ b/scripts/dtc/libfdt/fdt.h
@@ -1,5 +1,5 @@
-#ifndef _FDT_H
+#ifndef FDT_H
-#define _FDT_H
+#define FDT_H
 /*
 * libfdt - Flat Device Tree manipulation
 * Copyright (C) 2006 David Gibson, IBM Corporation.
@@ -108,4 +108,4 @@ struct fdt_property {
 #define FDT_V16_SIZE    FDT_V3_SIZE
 #define FDT_V17_SIZE    (FDT_V16_SIZE + sizeof(fdt32_t))
-#endif /* _FDT_H */
+#endif /* FDT_H */
diff --git a/scripts/dtc/libfdt/fdt_addresses.c b/scripts/dtc/libfdt/fdt_addresses.c
index eff4dbcc729d..49537b578d03 100644
--- a/scripts/dtc/libfdt/fdt_addresses.c
+++ b/scripts/dtc/libfdt/fdt_addresses.c
@@ -1,6 +1,7 @@
 /*
 * libfdt - Flat Device Tree manipulation
 * Copyright (C) 2014 David Gibson <david@gibson.dropbear.id.au>
+ * Copyright (C) 2018 embedded brains GmbH
 *
 * libfdt is dual licensed: you can use it either under the terms of
 * the GPL, or the BSD license, at your option.
@@ -55,42 +56,32 @@
 #include "libfdt_internal.h"
-int fdt_address_cells(const void *fdt, int nodeoffset)
+static int fdt_cells(const void *fdt, int nodeoffset, const char *name)
 {
-        const fdt32_t *ac;
+        const fdt32_t *c;
        int val;
        int len;
-        ac = fdt_getprop(fdt, nodeoffset, "#address-cells", &len);
+        c = fdt_getprop(fdt, nodeoffset, name, &len);
-        if (!ac)
+        if (!c)
                return 2;
-        if (len != sizeof(*ac))
+        if (len != sizeof(*c))
                return -FDT_ERR_BADNCELLS;
-        val = fdt32_to_cpu(*ac);
+        val = fdt32_to_cpu(*c);
        if ((val <= 0) || (val > FDT_MAX_NCELLS))
                return -FDT_ERR_BADNCELLS;
        return val;
 }
-int fdt_size_cells(const void *fdt, int nodeoffset)
+int fdt_address_cells(const void *fdt, int nodeoffset)
 {
-        const fdt32_t *sc;
+        return fdt_cells(fdt, nodeoffset, "#address-cells");
-        int val;
+}
-        int len;
-        sc = fdt_getprop(fdt, nodeoffset, "#size-cells", &len);
-        if (!sc)
-                return 2;
-        if (len != sizeof(*sc))
-                return -FDT_ERR_BADNCELLS;
-        val = fdt32_to_cpu(*sc);
-        if ((val < 0) || (val > FDT_MAX_NCELLS))
-                return -FDT_ERR_BADNCELLS;
-        return val;
+int fdt_size_cells(const void *fdt, int nodeoffset)
+{
+        return fdt_cells(fdt, nodeoffset, "#size-cells");
 }
diff --git a/scripts/dtc/libfdt/fdt_overlay.c b/scripts/dtc/libfdt/fdt_overlay.c
index bd81241e6658..5fdab6c6371d 100644
--- a/scripts/dtc/libfdt/fdt_overlay.c
+++ b/scripts/dtc/libfdt/fdt_overlay.c
@@ -1,3 +1,54 @@
+/*
+ * libfdt - Flat Device Tree manipulation
+ * Copyright (C) 2016 Free Electrons
+ * Copyright (C) 2016 NextThing Co.
+ *
+ * libfdt is dual licensed: you can use it either under the terms of
+ * the GPL, or the BSD license, at your option.
+ *
+ *  a) This library is free software; you can redistribute it and/or
+ *     modify it under the terms of the GNU General Public License as
+ *     published by the Free Software Foundation; either version 2 of the
+ *     License, or (at your option) any later version.
+ *
+ *     This library is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public
+ *     License along with this library; if not, write to the Free
+ *     Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+ *     MA 02110-1301 USA
+ *
+ * Alternatively,
+ *
+ *  b) Redistribution and use in source and binary forms, with or
+ *     without modification, are permitted provided that the following
+ *     conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer.
+ *     2. Redistributions in binary form must reproduce the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
+ *     CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ *     INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ *     MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *     DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ *     CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *     SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ *     NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ *     HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ *     CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ *     OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+ *     EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 #include "libfdt_env.h"
 #include <fdt.h>
@@ -646,7 +697,7 @@ static int get_path_len(const void *fdt, int nodeoffset)
        int len = 0, namelen;
        const char *name;
-        FDT_CHECK_HEADER(fdt);
+        FDT_RO_PROBE(fdt);
        for (;;) {
                name = fdt_get_name(fdt, nodeoffset, &namelen);
@@ -815,8 +866,8 @@ int fdt_overlay_apply(void *fdt, void *fdto)
        uint32_t delta = fdt_get_max_phandle(fdt);
        int ret;
-        FDT_CHECK_HEADER(fdt);
+        FDT_RO_PROBE(fdt);
-        FDT_CHECK_HEADER(fdto);
+        FDT_RO_PROBE(fdto);
        ret = overlay_adjust_local_phandles(fdto, delta);
        if (ret)
diff --git a/scripts/dtc/libfdt/fdt_ro.c b/scripts/dtc/libfdt/fdt_ro.c
index 08de2cce674d..eafc14282892 100644
--- a/scripts/dtc/libfdt/fdt_ro.c
+++ b/scripts/dtc/libfdt/fdt_ro.c
@@ -55,12 +55,13 @@
 #include "libfdt_internal.h"
-static int _fdt_nodename_eq(const void *fdt, int offset,
+static int fdt_nodename_eq_(const void *fdt, int offset,
                            const char *s, int len)
 {
-        const char *p = fdt_offset_ptr(fdt, offset + FDT_TAGSIZE, len+1);
+        int olen;
+        const char *p = fdt_get_name(fdt, offset, &olen);
-        if (!p)
+        if (!p || olen < len)
                /* short match */
                return 0;
@@ -75,17 +76,72 @@ static int _fdt_nodename_eq(const void *fdt, int offset,
                return 0;
 }
+const char *fdt_get_string(const void *fdt, int stroffset, int *lenp)
+{
+        uint32_t absoffset = stroffset + fdt_off_dt_strings(fdt);
+        size_t len;
+        int err;
+        const char *s, *n;
+        err = fdt_ro_probe_(fdt);
+        if (err != 0)
+                goto fail;
+        err = -FDT_ERR_BADOFFSET;
+        if (absoffset >= fdt_totalsize(fdt))
+                goto fail;
+        len = fdt_totalsize(fdt) - absoffset;
+        if (fdt_magic(fdt) == FDT_MAGIC) {
+                if (stroffset < 0)
+                        goto fail;
+                if (fdt_version(fdt) >= 17) {
+                        if (stroffset >= fdt_size_dt_strings(fdt))
+                                goto fail;
+                        if ((fdt_size_dt_strings(fdt) - stroffset) < len)
+                                len = fdt_size_dt_strings(fdt) - stroffset;
+                }
+        } else if (fdt_magic(fdt) == FDT_SW_MAGIC) {
+                if ((stroffset >= 0)
+                    || (stroffset < -fdt_size_dt_strings(fdt)))
+                        goto fail;
+                if ((-stroffset) < len)
+                        len = -stroffset;
+        } else {
+                err = -FDT_ERR_INTERNAL;
+                goto fail;
+        }
+        s = (const char *)fdt + absoffset;
+        n = memchr(s, '\0', len);
+        if (!n) {
+                /* missing terminating NULL */
+                err = -FDT_ERR_TRUNCATED;
+                goto fail;
+        }
+        if (lenp)
+                *lenp = n - s;
+        return s;
+fail:
+        if (lenp)
+                *lenp = err;
+        return NULL;
+}
 const char *fdt_string(const void *fdt, int stroffset)
 {
-        return (const char *)fdt + fdt_off_dt_strings(fdt) + stroffset;
+        return fdt_get_string(fdt, stroffset, NULL);
 }
-static int _fdt_string_eq(const void *fdt, int stroffset,
+static int fdt_string_eq_(const void *fdt, int stroffset,
                          const char *s, int len)
 {
-        const char *p = fdt_string(fdt, stroffset);
+        int slen;
+        const char *p = fdt_get_string(fdt, stroffset, &slen);
-        return (strlen(p) == len) && (memcmp(p, s, len) == 0);
+        return p && (slen == len) && (memcmp(p, s, len) == 0);
 }
 uint32_t fdt_get_max_phandle(const void *fdt)
@@ -114,24 +170,45 @@ uint32_t fdt_get_max_phandle(const void *fdt)
        return 0;
 }
+static const struct fdt_reserve_entry *fdt_mem_rsv(const void *fdt, int n)
+{
+        int offset = n * sizeof(struct fdt_reserve_entry);
+        int absoffset = fdt_off_mem_rsvmap(fdt) + offset;
+        if (absoffset < fdt_off_mem_rsvmap(fdt))
+                return NULL;
+        if (absoffset > fdt_totalsize(fdt) - sizeof(struct fdt_reserve_entry))
+                return NULL;
+        return fdt_mem_rsv_(fdt, n);
+}
 int fdt_get_mem_rsv(const void *fdt, int n, uint64_t *address, uint64_t *size)
 {
-        FDT_CHECK_HEADER(fdt);
+        const struct fdt_reserve_entry *re;
-        *address = fdt64_to_cpu(_fdt_mem_rsv(fdt, n)->address);
-        *size = fdt64_to_cpu(_fdt_mem_rsv(fdt, n)->size);
+        FDT_RO_PROBE(fdt);
+        re = fdt_mem_rsv(fdt, n);
+        if (!re)
+                return -FDT_ERR_BADOFFSET;
+        *address = fdt64_ld(&re->address);
+        *size = fdt64_ld(&re->size);
        return 0;
 }
 int fdt_num_mem_rsv(const void *fdt)
 {
-        int i = 0;
+        int i;
+        const struct fdt_reserve_entry *re;
-        while (fdt64_to_cpu(_fdt_mem_rsv(fdt, i)->size) != 0)
+        for (i = 0; (re = fdt_mem_rsv(fdt, i)) != NULL; i++) {
-                i++;
+                if (fdt64_ld(&re->size) == 0)
-        return i;
+                        return i;
+        }
+        return -FDT_ERR_TRUNCATED;
 }
-static int _nextprop(const void *fdt, int offset)
+static int nextprop_(const void *fdt, int offset)
 {
        uint32_t tag;
        int nextoffset;
@@ -160,13 +237,13 @@ int fdt_subnode_offset_namelen(const void *fdt, int offset,
 {
        int depth;
-        FDT_CHECK_HEADER(fdt);
+        FDT_RO_PROBE(fdt);
        for (depth = 0;
             (offset >= 0) && (depth >= 0);
             offset = fdt_next_node(fdt, offset, &depth))
                if ((depth == 1)
-                    && _fdt_nodename_eq(fdt, offset, name, namelen))
+                    && fdt_nodename_eq_(fdt, offset, name, namelen))
                        return offset;
        if (depth < 0)
@@ -186,7 +263,7 @@ int fdt_path_offset_namelen(const void *fdt, const char *path, int namelen)
        const char *p = path;
        int offset = 0;
-        FDT_CHECK_HEADER(fdt);
+        FDT_RO_PROBE(fdt);
        /* see if we have an alias */
        if (*path != '/') {
@@ -232,17 +309,35 @@ int fdt_path_offset(const void *fdt, const char *path)
 const char *fdt_get_name(const void *fdt, int nodeoffset, int *len)
 {
-        const struct fdt_node_header *nh = _fdt_offset_ptr(fdt, nodeoffset);
+        const struct fdt_node_header *nh = fdt_offset_ptr_(fdt, nodeoffset);
+        const char *nameptr;
        int err;
-        if (((err = fdt_check_header(fdt)) != 0)
+        if (((err = fdt_ro_probe_(fdt)) != 0)
-            || ((err = _fdt_check_node_offset(fdt, nodeoffset)) < 0))
+            || ((err = fdt_check_node_offset_(fdt, nodeoffset)) < 0))
                        goto fail;
+        nameptr = nh->name;
+        if (fdt_version(fdt) < 0x10) {
+                /*
+                 * For old FDT versions, match the naming conventions of V16:
+                 * give only the leaf name (after all /). The actual tree
+                 * contents are loosely checked.
+                 */
+                const char *leaf;
+                leaf = strrchr(nameptr, '/');
+                if (leaf == NULL) {
+                        err = -FDT_ERR_BADSTRUCTURE;
+                        goto fail;
+                }
+                nameptr = leaf+1;
+        }
        if (len)
-                *len = strlen(nh->name);
+                *len = strlen(nameptr);
-        return nh->name;
+        return nameptr;
 fail:
        if (len)
@@ -254,58 +349,79 @@ int fdt_first_property_offset(const void *fdt, int nodeoffset)
 {
        int offset;
-        if ((offset = _fdt_check_node_offset(fdt, nodeoffset)) < 0)
+        if ((offset = fdt_check_node_offset_(fdt, nodeoffset)) < 0)
                return offset;
-        return _nextprop(fdt, offset);
+        return nextprop_(fdt, offset);
 }
 int fdt_next_property_offset(const void *fdt, int offset)
 {
-        if ((offset = _fdt_check_prop_offset(fdt, offset)) < 0)
+        if ((offset = fdt_check_prop_offset_(fdt, offset)) < 0)
                return offset;
-        return _nextprop(fdt, offset);
+        return nextprop_(fdt, offset);
 }
-const struct fdt_property *fdt_get_property_by_offset(const void *fdt,
+static const struct fdt_property *fdt_get_property_by_offset_(const void *fdt,
-                                                      int offset,
+                                                              int offset,
-                                                      int *lenp)
+                                                              int *lenp)
 {
        int err;
        const struct fdt_property *prop;
-        if ((err = _fdt_check_prop_offset(fdt, offset)) < 0) {
+        if ((err = fdt_check_prop_offset_(fdt, offset)) < 0) {
                if (lenp)
                        *lenp = err;
                return NULL;
        }
-        prop = _fdt_offset_ptr(fdt, offset);
+        prop = fdt_offset_ptr_(fdt, offset);
        if (lenp)
-                *lenp = fdt32_to_cpu(prop->len);
+                *lenp = fdt32_ld(&prop->len);
        return prop;
 }
-const struct fdt_property *fdt_get_property_namelen(const void *fdt,
+const struct fdt_property *fdt_get_property_by_offset(const void *fdt,
-                                                    int offset,
+                                                      int offset,
-                                                    const char *name,
+                                                      int *lenp)
-                                                    int namelen, int *lenp)
+{
+        /* Prior to version 16, properties may need realignment
+         * and this API does not work. fdt_getprop_*() will, however. */
+        if (fdt_version(fdt) < 0x10) {
+                if (lenp)
+                        *lenp = -FDT_ERR_BADVERSION;
+                return NULL;
+        }
+        return fdt_get_property_by_offset_(fdt, offset, lenp);
+}
+static const struct fdt_property *fdt_get_property_namelen_(const void *fdt,
+                                                            int offset,
+                                                            const char *name,
+                                                            int namelen,
+                                                            int *lenp,
+                                                            int *poffset)
 {
        for (offset = fdt_first_property_offset(fdt, offset);
             (offset >= 0);
             (offset = fdt_next_property_offset(fdt, offset))) {
                const struct fdt_property *prop;
-                if (!(prop = fdt_get_property_by_offset(fdt, offset, lenp))) {
+                if (!(prop = fdt_get_property_by_offset_(fdt, offset, lenp))) {
                        offset = -FDT_ERR_INTERNAL;
                        break;
                }
-                if (_fdt_string_eq(fdt, fdt32_to_cpu(prop->nameoff),
+                if (fdt_string_eq_(fdt, fdt32_ld(&prop->nameoff),
-                                   name, namelen))
+                                   name, namelen)) {
+                        if (poffset)
+                                *poffset = offset;
                        return prop;
+                }
        }
        if (lenp)
@@ -313,6 +429,25 @@ const struct fdt_property *fdt_get_property_namelen(const void *fdt,
        return NULL;
 }
+const struct fdt_property *fdt_get_property_namelen(const void *fdt,
+                                                    int offset,
+                                                    const char *name,
+                                                    int namelen, int *lenp)
+{
+        /* Prior to version 16, properties may need realignment
+         * and this API does not work. fdt_getprop_*() will, however. */
+        if (fdt_version(fdt) < 0x10) {
+                if (lenp)
+                        *lenp = -FDT_ERR_BADVERSION;
+                return NULL;
+        }
+        return fdt_get_property_namelen_(fdt, offset, name, namelen, lenp,
+                                         NULL);
+}
 const struct fdt_property *fdt_get_property(const void *fdt,
                                            int nodeoffset,
                                            const char *name, int *lenp)
@@ -324,12 +459,18 @@ const struct fdt_property *fdt_get_property(const void *fdt,
 const void *fdt_getprop_namelen(const void *fdt, int nodeoffset,
                                const char *name, int namelen, int *lenp)
 {
+        int poffset;
        const struct fdt_property *prop;
-        prop = fdt_get_property_namelen(fdt, nodeoffset, name, namelen, lenp);
+        prop = fdt_get_property_namelen_(fdt, nodeoffset, name, namelen, lenp,
+                                         &poffset);
        if (!prop)
                return NULL;
+        /* Handle realignment */
+        if (fdt_version(fdt) < 0x10 && (poffset + sizeof(*prop)) % 8 &&
+            fdt32_ld(&prop->len) >= 8)
+                return prop->data + 4;
        return prop->data;
 }
@@ -338,11 +479,26 @@ const void *fdt_getprop_by_offset(const void *fdt, int offset,
 {
        const struct fdt_property *prop;
-        prop = fdt_get_property_by_offset(fdt, offset, lenp);
+        prop = fdt_get_property_by_offset_(fdt, offset, lenp);
        if (!prop)
                return NULL;
-        if (namep)
+        if (namep) {
-                *namep = fdt_string(fdt, fdt32_to_cpu(prop->nameoff));
+                const char *name;
+                int namelen;
+                name = fdt_get_string(fdt, fdt32_ld(&prop->nameoff),
+                                      &namelen);
+                if (!name) {
+                        if (lenp)
+                                *lenp = namelen;
+                        return NULL;
+                }
+                *namep = name;
+        }
+        /* Handle realignment */
+        if (fdt_version(fdt) < 0x10 && (offset + sizeof(*prop)) % 8 &&
+            fdt32_ld(&prop->len) >= 8)
+                return prop->data + 4;
        return prop->data;
 }
@@ -366,7 +522,7 @@ uint32_t fdt_get_phandle(const void *fdt, int nodeoffset)
                        return 0;
        }
-        return fdt32_to_cpu(*php);
+        return fdt32_ld(php);
 }
 const char *fdt_get_alias_namelen(const void *fdt,
@@ -392,7 +548,7 @@ int fdt_get_path(const void *fdt, int nodeoffset, char *buf, int buflen)
        int offset, depth, namelen;
        const char *name;
-        FDT_CHECK_HEADER(fdt);
+        FDT_RO_PROBE(fdt);
        if (buflen < 2)
                return -FDT_ERR_NOSPACE;
@@ -444,7 +600,7 @@ int fdt_supernode_atdepth_offset(const void *fdt, int nodeoffset,
        int offset, depth;
        int supernodeoffset = -FDT_ERR_INTERNAL;
-        FDT_CHECK_HEADER(fdt);
+        FDT_RO_PROBE(fdt);
        if (supernodedepth < 0)
                return -FDT_ERR_NOTFOUND;
@@ -503,7 +659,7 @@ int fdt_node_offset_by_prop_value(const void *fdt, int startoffset,
        const void *val;
        int len;
-        FDT_CHECK_HEADER(fdt);
+        FDT_RO_PROBE(fdt);
        /* FIXME: The algorithm here is pretty horrible: we scan each
         * property of a node in fdt_getprop(), then if that didn't
@@ -529,7 +685,7 @@ int fdt_node_offset_by_phandle(const void *fdt, uint32_t phandle)
        if ((phandle == 0) || (phandle == -1))
                return -FDT_ERR_BADPHANDLE;
-        FDT_CHECK_HEADER(fdt);
+        FDT_RO_PROBE(fdt);
        /* FIXME: The algorithm here is pretty horrible: we
         * potentially scan each property of a node in
@@ -682,7 +838,7 @@ int fdt_node_offset_by_compatible(const void *fdt, int startoffset,
 {
        int offset, err;
-        FDT_CHECK_HEADER(fdt);
+        FDT_RO_PROBE(fdt);
        /* FIXME: The algorithm here is pretty horrible: we scan each
         * property of a node in fdt_node_check_compatible(), then if
@@ -701,3 +857,66 @@ int fdt_node_offset_by_compatible(const void *fdt, int startoffset,
        return offset; /* error from fdt_next_node() */
 }
+int fdt_check_full(const void *fdt, size_t bufsize)
+{
+        int err;
+        int num_memrsv;
+        int offset, nextoffset = 0;
+        uint32_t tag;
+        unsigned depth = 0;
+        const void *prop;
+        const char *propname;
+        if (bufsize < FDT_V1_SIZE)
+                return -FDT_ERR_TRUNCATED;
+        err = fdt_check_header(fdt);
+        if (err != 0)
+                return err;
+        if (bufsize < fdt_totalsize(fdt))
+                return -FDT_ERR_TRUNCATED;
+        num_memrsv = fdt_num_mem_rsv(fdt);
+        if (num_memrsv < 0)
+                return num_memrsv;
+        while (1) {
+                offset = nextoffset;
+                tag = fdt_next_tag(fdt, offset, &nextoffset);
+                if (nextoffset < 0)
+                        return nextoffset;
+                switch (tag) {
+                case FDT_NOP:
+                        break;
+                case FDT_END:
+                        if (depth != 0)
+                                return -FDT_ERR_BADSTRUCTURE;
+                        return 0;
+                case FDT_BEGIN_NODE:
+                        depth++;
+                        if (depth > INT_MAX)
+                                return -FDT_ERR_BADSTRUCTURE;
+                        break;
+                case FDT_END_NODE:
+                        if (depth == 0)
+                                return -FDT_ERR_BADSTRUCTURE;
+                        depth--;
+                        break;
+                case FDT_PROP:
+                        prop = fdt_getprop_by_offset(fdt, offset, &propname,
+                                                     &err);
+                        if (!prop)
+                                return err;
+                        break;
+                default:
+                        return -FDT_ERR_INTERNAL;
+                }
+        }
+}
diff --git a/scripts/dtc/libfdt/fdt_rw.c b/scripts/dtc/libfdt/fdt_rw.c
index 5c3a2bb0bc6b..2e49855d7cf8 100644
--- a/scripts/dtc/libfdt/fdt_rw.c
+++ b/scripts/dtc/libfdt/fdt_rw.c
@@ -55,8 +55,8 @@
 #include "libfdt_internal.h"
-static int _fdt_blocks_misordered(const void *fdt,
+static int fdt_blocks_misordered_(const void *fdt,
-                              int mem_rsv_size, int struct_size)
+                                  int mem_rsv_size, int struct_size)
 {
        return (fdt_off_mem_rsvmap(fdt) < FDT_ALIGN(sizeof(struct fdt_header), 8))
                || (fdt_off_dt_struct(fdt) <
@@ -67,13 +67,13 @@ static int _fdt_blocks_misordered(const void *fdt,
                    (fdt_off_dt_strings(fdt) + fdt_size_dt_strings(fdt)));
 }
-static int _fdt_rw_check_header(void *fdt)
+static int fdt_rw_probe_(void *fdt)
 {
-        FDT_CHECK_HEADER(fdt);
+        FDT_RO_PROBE(fdt);
        if (fdt_version(fdt) < 17)
                return -FDT_ERR_BADVERSION;
-        if (_fdt_blocks_misordered(fdt, sizeof(struct fdt_reserve_entry),
+        if (fdt_blocks_misordered_(fdt, sizeof(struct fdt_reserve_entry),
                                   fdt_size_dt_struct(fdt)))
                return -FDT_ERR_BADLAYOUT;
        if (fdt_version(fdt) > 17)
@@ -82,22 +82,22 @@ static int _fdt_rw_check_header(void *fdt)
        return 0;
 }
-#define FDT_RW_CHECK_HEADER(fdt) \
+#define FDT_RW_PROBE(fdt) \
        { \
-                int __err; \
+                int err_; \
-                if ((__err = _fdt_rw_check_header(fdt)) != 0) \
+                if ((err_ = fdt_rw_probe_(fdt)) != 0) \
-                        return __err; \
+                        return err_; \
        }
-static inline int _fdt_data_size(void *fdt)
+static inline int fdt_data_size_(void *fdt)
 {
        return fdt_off_dt_strings(fdt) + fdt_size_dt_strings(fdt);
 }
-static int _fdt_splice(void *fdt, void *splicepoint, int oldlen, int newlen)
+static int fdt_splice_(void *fdt, void *splicepoint, int oldlen, int newlen)
 {
        char *p = splicepoint;
-        char *end = (char *)fdt + _fdt_data_size(fdt);
+        char *end = (char *)fdt + fdt_data_size_(fdt);
        if (((p + oldlen) < p) || ((p + oldlen) > end))
                return -FDT_ERR_BADOFFSET;
@@ -109,12 +109,12 @@ static int _fdt_splice(void *fdt, void *splicepoint, int oldlen, int newlen)
        return 0;
 }
-static int _fdt_splice_mem_rsv(void *fdt, struct fdt_reserve_entry *p,
+static int fdt_splice_mem_rsv_(void *fdt, struct fdt_reserve_entry *p,
                               int oldn, int newn)
 {
        int delta = (newn - oldn) * sizeof(*p);
        int err;
-        err = _fdt_splice(fdt, p, oldn * sizeof(*p), newn * sizeof(*p));
+        err = fdt_splice_(fdt, p, oldn * sizeof(*p), newn * sizeof(*p));
        if (err)
                return err;
        fdt_set_off_dt_struct(fdt, fdt_off_dt_struct(fdt) + delta);
@@ -122,13 +122,13 @@ static int _fdt_splice_mem_rsv(void *fdt, struct fdt_reserve_entry *p,
        return 0;
 }
-static int _fdt_splice_struct(void *fdt, void *p,
+static int fdt_splice_struct_(void *fdt, void *p,
                              int oldlen, int newlen)
 {
        int delta = newlen - oldlen;
        int err;
-        if ((err = _fdt_splice(fdt, p, oldlen, newlen)))
+        if ((err = fdt_splice_(fdt, p, oldlen, newlen)))
                return err;
        fdt_set_size_dt_struct(fdt, fdt_size_dt_struct(fdt) + delta);
@@ -136,20 +136,20 @@ static int _fdt_splice_struct(void *fdt, void *p,
        return 0;
 }
-static int _fdt_splice_string(void *fdt, int newlen)
+static int fdt_splice_string_(void *fdt, int newlen)
 {
        void *p = (char *)fdt
                + fdt_off_dt_strings(fdt) + fdt_size_dt_strings(fdt);
        int err;
-        if ((err = _fdt_splice(fdt, p, 0, newlen)))
+        if ((err = fdt_splice_(fdt, p, 0, newlen)))
                return err;
        fdt_set_size_dt_strings(fdt, fdt_size_dt_strings(fdt) + newlen);
        return 0;
 }
-static int _fdt_find_add_string(void *fdt, const char *s)
+static int fdt_find_add_string_(void *fdt, const char *s)
 {
        char *strtab = (char *)fdt + fdt_off_dt_strings(fdt);
        const char *p;
@@ -157,13 +157,13 @@ static int _fdt_find_add_string(void *fdt, const char *s)
        int len = strlen(s) + 1;
        int err;
-        p = _fdt_find_string(strtab, fdt_size_dt_strings(fdt), s);
+        p = fdt_find_string_(strtab, fdt_size_dt_strings(fdt), s);
        if (p)
                /* found it */
                return (p - strtab);
        new = strtab + fdt_size_dt_strings(fdt);
-        err = _fdt_splice_string(fdt, len);
+        err = fdt_splice_string_(fdt, len);
        if (err)
                return err;
@@ -176,10 +176,10 @@ int fdt_add_mem_rsv(void *fdt, uint64_t address, uint64_t size)
        struct fdt_reserve_entry *re;
        int err;
-        FDT_RW_CHECK_HEADER(fdt);
+        FDT_RW_PROBE(fdt);
-        re = _fdt_mem_rsv_w(fdt, fdt_num_mem_rsv(fdt));
+        re = fdt_mem_rsv_w_(fdt, fdt_num_mem_rsv(fdt));
-        err = _fdt_splice_mem_rsv(fdt, re, 0, 1);
+        err = fdt_splice_mem_rsv_(fdt, re, 0, 1);
        if (err)
                return err;
@@ -190,17 +190,17 @@ int fdt_add_mem_rsv(void *fdt, uint64_t address, uint64_t size)
 int fdt_del_mem_rsv(void *fdt, int n)
 {
-        struct fdt_reserve_entry *re = _fdt_mem_rsv_w(fdt, n);
+        struct fdt_reserve_entry *re = fdt_mem_rsv_w_(fdt, n);
-        FDT_RW_CHECK_HEADER(fdt);
+        FDT_RW_PROBE(fdt);
        if (n >= fdt_num_mem_rsv(fdt))
                return -FDT_ERR_NOTFOUND;
-        return _fdt_splice_mem_rsv(fdt, re, 1, 0);
+        return fdt_splice_mem_rsv_(fdt, re, 1, 0);
 }
-static int _fdt_resize_property(void *fdt, int nodeoffset, const char *name,
+static int fdt_resize_property_(void *fdt, int nodeoffset, const char *name,
                                int len, struct fdt_property **prop)
 {
        int oldlen;
@@ -210,7 +210,7 @@ static int _fdt_resize_property(void *fdt, int nodeoffset, const char *name,
        if (!*prop)
                return oldlen;
-        if ((err = _fdt_splice_struct(fdt, (*prop)->data, FDT_TAGALIGN(oldlen),
+        if ((err = fdt_splice_struct_(fdt, (*prop)->data, FDT_TAGALIGN(oldlen),
                                      FDT_TAGALIGN(len))))
                return err;
@@ -218,7 +218,7 @@ static int _fdt_resize_property(void *fdt, int nodeoffset, const char *name,
        return 0;
 }
-static int _fdt_add_property(void *fdt, int nodeoffset, const char *name,
+static int fdt_add_property_(void *fdt, int nodeoffset, const char *name,
                             int len, struct fdt_property **prop)
 {
        int proplen;
@@ -226,17 +226,17 @@ static int _fdt_add_property(void *fdt, int nodeoffset, const char *name,
        int namestroff;
        int err;
-        if ((nextoffset = _fdt_check_node_offset(fdt, nodeoffset)) < 0)
+        if ((nextoffset = fdt_check_node_offset_(fdt, nodeoffset)) < 0)
                return nextoffset;
-        namestroff = _fdt_find_add_string(fdt, name);
+        namestroff = fdt_find_add_string_(fdt, name);
        if (namestroff < 0)
                return namestroff;
-        *prop = _fdt_offset_ptr_w(fdt, nextoffset);
+        *prop = fdt_offset_ptr_w_(fdt, nextoffset);
        proplen = sizeof(**prop) + FDT_TAGALIGN(len);
-        err = _fdt_splice_struct(fdt, *prop, 0, proplen);
+        err = fdt_splice_struct_(fdt, *prop, 0, proplen);
        if (err)
                return err;
@@ -252,7 +252,7 @@ int fdt_set_name(void *fdt, int nodeoffset, const char *name)
        int oldlen, newlen;
        int err;
-        FDT_RW_CHECK_HEADER(fdt);
+        FDT_RW_PROBE(fdt);
        namep = (char *)(uintptr_t)fdt_get_name(fdt, nodeoffset, &oldlen);
        if (!namep)
@@ -260,7 +260,7 @@ int fdt_set_name(void *fdt, int nodeoffset, const char *name)
        newlen = strlen(name);
-        err = _fdt_splice_struct(fdt, namep, FDT_TAGALIGN(oldlen+1),
+        err = fdt_splice_struct_(fdt, namep, FDT_TAGALIGN(oldlen+1),
                                 FDT_TAGALIGN(newlen+1));
        if (err)
                return err;
@@ -275,11 +275,11 @@ int fdt_setprop_placeholder(void *fdt, int nodeoffset, const char *name,
        struct fdt_property *prop;
        int err;
-        FDT_RW_CHECK_HEADER(fdt);
+        FDT_RW_PROBE(fdt);
-        err = _fdt_resize_property(fdt, nodeoffset, name, len, &prop);
+        err = fdt_resize_property_(fdt, nodeoffset, name, len, &prop);
        if (err == -FDT_ERR_NOTFOUND)
-                err = _fdt_add_property(fdt, nodeoffset, name, len, &prop);
+                err = fdt_add_property_(fdt, nodeoffset, name, len, &prop);
        if (err)
                return err;
@@ -308,12 +308,12 @@ int fdt_appendprop(void *fdt, int nodeoffset, const char *name,
        struct fdt_property *prop;
        int err, oldlen, newlen;
-        FDT_RW_CHECK_HEADER(fdt);
+        FDT_RW_PROBE(fdt);
        prop = fdt_get_property_w(fdt, nodeoffset, name, &oldlen);
        if (prop) {
                newlen = len + oldlen;
-                err = _fdt_splice_struct(fdt, prop->data,
+                err = fdt_splice_struct_(fdt, prop->data,
                                         FDT_TAGALIGN(oldlen),
                                         FDT_TAGALIGN(newlen));
                if (err)
@@ -321,7 +321,7 @@ int fdt_appendprop(void *fdt, int nodeoffset, const char *name,
                prop->len = cpu_to_fdt32(newlen);
                memcpy(prop->data + oldlen, val, len);
        } else {
-                err = _fdt_add_property(fdt, nodeoffset, name, len, &prop);
+                err = fdt_add_property_(fdt, nodeoffset, name, len, &prop);
                if (err)
                        return err;
                memcpy(prop->data, val, len);
@@ -334,14 +334,14 @@ int fdt_delprop(void *fdt, int nodeoffset, const char *name)
        struct fdt_property *prop;
        int len, proplen;
-        FDT_RW_CHECK_HEADER(fdt);
+        FDT_RW_PROBE(fdt);
        prop = fdt_get_property_w(fdt, nodeoffset, name, &len);
        if (!prop)
                return len;
        proplen = sizeof(*prop) + FDT_TAGALIGN(len);
-        return _fdt_splice_struct(fdt, prop, proplen, 0);
+        return fdt_splice_struct_(fdt, prop, proplen, 0);
 }
 int fdt_add_subnode_namelen(void *fdt, int parentoffset,
@@ -354,7 +354,7 @@ int fdt_add_subnode_namelen(void *fdt, int parentoffset,
        uint32_t tag;
        fdt32_t *endtag;
-        FDT_RW_CHECK_HEADER(fdt);
+        FDT_RW_PROBE(fdt);
        offset = fdt_subnode_offset_namelen(fdt, parentoffset, name, namelen);
        if (offset >= 0)
@@ -369,10 +369,10 @@ int fdt_add_subnode_namelen(void *fdt, int parentoffset,
                tag = fdt_next_tag(fdt, offset, &nextoffset);
        } while ((tag == FDT_PROP) || (tag == FDT_NOP));
-        nh = _fdt_offset_ptr_w(fdt, offset);
+        nh = fdt_offset_ptr_w_(fdt, offset);
        nodelen = sizeof(*nh) + FDT_TAGALIGN(namelen+1) + FDT_TAGSIZE;
-        err = _fdt_splice_struct(fdt, nh, 0, nodelen);
+        err = fdt_splice_struct_(fdt, nh, 0, nodelen);
        if (err)
                return err;
@@ -394,17 +394,17 @@ int fdt_del_node(void *fdt, int nodeoffset)
 {
        int endoffset;
-        FDT_RW_CHECK_HEADER(fdt);
+        FDT_RW_PROBE(fdt);
-        endoffset = _fdt_node_end_offset(fdt, nodeoffset);
+        endoffset = fdt_node_end_offset_(fdt, nodeoffset);
        if (endoffset < 0)
                return endoffset;
-        return _fdt_splice_struct(fdt, _fdt_offset_ptr_w(fdt, nodeoffset),
+        return fdt_splice_struct_(fdt, fdt_offset_ptr_w_(fdt, nodeoffset),
                                  endoffset - nodeoffset, 0);
 }
-static void _fdt_packblocks(const char *old, char *new,
+static void fdt_packblocks_(const char *old, char *new,
                            int mem_rsv_size, int struct_size)
 {
        int mem_rsv_off, struct_off, strings_off;
@@ -435,7 +435,7 @@ int fdt_open_into(const void *fdt, void *buf, int bufsize)
        const char *fdtend = fdtstart + fdt_totalsize(fdt);
        char *tmp;
-        FDT_CHECK_HEADER(fdt);
+        FDT_RO_PROBE(fdt);
        mem_rsv_size = (fdt_num_mem_rsv(fdt)+1)
                * sizeof(struct fdt_reserve_entry);
@@ -450,7 +450,7 @@ int fdt_open_into(const void *fdt, void *buf, int bufsize)
                        return struct_size;
        }
-        if (!_fdt_blocks_misordered(fdt, mem_rsv_size, struct_size)) {
+        if (!fdt_blocks_misordered_(fdt, mem_rsv_size, struct_size)) {
                /* no further work necessary */
                err = fdt_move(fdt, buf, bufsize);
                if (err)
@@ -478,7 +478,7 @@ int fdt_open_into(const void *fdt, void *buf, int bufsize)
                        return -FDT_ERR_NOSPACE;
        }
-        _fdt_packblocks(fdt, tmp, mem_rsv_size, struct_size);
+        fdt_packblocks_(fdt, tmp, mem_rsv_size, struct_size);
        memmove(buf, tmp, newsize);
        fdt_set_magic(buf, FDT_MAGIC);
@@ -494,12 +494,12 @@ int fdt_pack(void *fdt)
 {
        int mem_rsv_size;
-        FDT_RW_CHECK_HEADER(fdt);
+        FDT_RW_PROBE(fdt);
        mem_rsv_size = (fdt_num_mem_rsv(fdt)+1)
                * sizeof(struct fdt_reserve_entry);
-        _fdt_packblocks(fdt, fdt, mem_rsv_size, fdt_size_dt_struct(fdt));
+        fdt_packblocks_(fdt, fdt, mem_rsv_size, fdt_size_dt_struct(fdt));
-        fdt_set_totalsize(fdt, _fdt_data_size(fdt));
+        fdt_set_totalsize(fdt, fdt_data_size_(fdt));
        return 0;
 }
diff --git a/scripts/dtc/libfdt/fdt_sw.c b/scripts/dtc/libfdt/fdt_sw.c
index 2bd15e7aef87..9fa4a94d83c3 100644
--- a/scripts/dtc/libfdt/fdt_sw.c
+++ b/scripts/dtc/libfdt/fdt_sw.c
@@ -55,22 +55,78 @@
 #include "libfdt_internal.h"
-static int _fdt_sw_check_header(void *fdt)
+static int fdt_sw_probe_(void *fdt)
 {
-        if (fdt_magic(fdt) != FDT_SW_MAGIC)
+        if (fdt_magic(fdt) == FDT_MAGIC)
+                return -FDT_ERR_BADSTATE;
+        else if (fdt_magic(fdt) != FDT_SW_MAGIC)
                return -FDT_ERR_BADMAGIC;
-        /* FIXME: should check more details about the header state */
        return 0;
 }
-#define FDT_SW_CHECK_HEADER(fdt) \
+#define FDT_SW_PROBE(fdt) \
+        { \
+                int err; \
+                if ((err = fdt_sw_probe_(fdt)) != 0) \
+                        return err; \
+        }
+/* 'memrsv' state:      Initial state after fdt_create()
+ *
+ * Allowed functions:
+ *      fdt_add_reservmap_entry()
+ *      fdt_finish_reservemap()         [moves to 'struct' state]
+ */
+static int fdt_sw_probe_memrsv_(void *fdt)
+{
+        int err = fdt_sw_probe_(fdt);
+        if (err)
+                return err;
+        if (fdt_off_dt_strings(fdt) != 0)
+                return -FDT_ERR_BADSTATE;
+        return 0;
+}
+#define FDT_SW_PROBE_MEMRSV(fdt) \
+        { \
+                int err; \
+                if ((err = fdt_sw_probe_memrsv_(fdt)) != 0) \
+                        return err; \
+        }
+/* 'struct' state:      Enter this state after fdt_finish_reservemap()
+ *
+ * Allowed functions:
+ *      fdt_begin_node()
+ *      fdt_end_node()
+ *      fdt_property*()
+ *      fdt_finish()                    [moves to 'complete' state]
+ */
+static int fdt_sw_probe_struct_(void *fdt)
+{
+        int err = fdt_sw_probe_(fdt);
+        if (err)
+                return err;
+        if (fdt_off_dt_strings(fdt) != fdt_totalsize(fdt))
+                return -FDT_ERR_BADSTATE;
+        return 0;
+}
+#define FDT_SW_PROBE_STRUCT(fdt) \
        { \
                int err; \
-                if ((err = _fdt_sw_check_header(fdt)) != 0) \
+                if ((err = fdt_sw_probe_struct_(fdt)) != 0) \
                        return err; \
        }
-static void *_fdt_grab_space(void *fdt, size_t len)
+/* 'complete' state:    Enter this state after fdt_finish()
+ *
+ * Allowed functions: none
+ */
+static void *fdt_grab_space_(void *fdt, size_t len)
 {
        int offset = fdt_size_dt_struct(fdt);
        int spaceleft;
@@ -82,14 +138,16 @@ static void *_fdt_grab_space(void *fdt, size_t len)
                return NULL;
        fdt_set_size_dt_struct(fdt, offset + len);
-        return _fdt_offset_ptr_w(fdt, offset);
+        return fdt_offset_ptr_w_(fdt, offset);
 }
 int fdt_create(void *buf, int bufsize)
 {
+        const size_t hdrsize = FDT_ALIGN(sizeof(struct fdt_header),
+                                         sizeof(struct fdt_reserve_entry));
        void *fdt = buf;
-        if (bufsize < sizeof(struct fdt_header))
+        if (bufsize < hdrsize)
                return -FDT_ERR_NOSPACE;
        memset(buf, 0, bufsize);
@@ -99,10 +157,9 @@ int fdt_create(void *buf, int bufsize)
        fdt_set_last_comp_version(fdt, FDT_FIRST_SUPPORTED_VERSION);
        fdt_set_totalsize(fdt,  bufsize);
-        fdt_set_off_mem_rsvmap(fdt, FDT_ALIGN(sizeof(struct fdt_header),
+        fdt_set_off_mem_rsvmap(fdt, hdrsize);
-                                              sizeof(struct fdt_reserve_entry)));
        fdt_set_off_dt_struct(fdt, fdt_off_mem_rsvmap(fdt));
-        fdt_set_off_dt_strings(fdt, bufsize);
+        fdt_set_off_dt_strings(fdt, 0);
        return 0;
 }
@@ -112,11 +169,14 @@ int fdt_resize(void *fdt, void *buf, int bufsize)
        size_t headsize, tailsize;
        char *oldtail, *newtail;
-        FDT_SW_CHECK_HEADER(fdt);
+        FDT_SW_PROBE(fdt);
-        headsize = fdt_off_dt_struct(fdt);
+        headsize = fdt_off_dt_struct(fdt) + fdt_size_dt_struct(fdt);
        tailsize = fdt_size_dt_strings(fdt);
+        if ((headsize + tailsize) > fdt_totalsize(fdt))
+                return -FDT_ERR_INTERNAL;
        if ((headsize + tailsize) > bufsize)
                return -FDT_ERR_NOSPACE;
@@ -133,8 +193,9 @@ int fdt_resize(void *fdt, void *buf, int bufsize)
                memmove(buf, fdt, headsize);
        }
-        fdt_set_off_dt_strings(buf, bufsize);
        fdt_set_totalsize(buf, bufsize);
+        if (fdt_off_dt_strings(buf))
+                fdt_set_off_dt_strings(buf, bufsize);
        return 0;
 }
@@ -144,10 +205,7 @@ int fdt_add_reservemap_entry(void *fdt, uint64_t addr, uint64_t size)
        struct fdt_reserve_entry *re;
        int offset;
-        FDT_SW_CHECK_HEADER(fdt);
+        FDT_SW_PROBE_MEMRSV(fdt);
-        if (fdt_size_dt_struct(fdt))
-                return -FDT_ERR_BADSTATE;
        offset = fdt_off_dt_struct(fdt);
        if ((offset + sizeof(*re)) > fdt_totalsize(fdt))
@@ -164,17 +222,24 @@ int fdt_add_reservemap_entry(void *fdt, uint64_t addr, uint64_t size)
 int fdt_finish_reservemap(void *fdt)
 {
-        return fdt_add_reservemap_entry(fdt, 0, 0);
+        int err = fdt_add_reservemap_entry(fdt, 0, 0);
+        if (err)
+                return err;
+        fdt_set_off_dt_strings(fdt, fdt_totalsize(fdt));
+        return 0;
 }
 int fdt_begin_node(void *fdt, const char *name)
 {
        struct fdt_node_header *nh;
-        int namelen = strlen(name) + 1;
+        int namelen;
-        FDT_SW_CHECK_HEADER(fdt);
+        FDT_SW_PROBE_STRUCT(fdt);
-        nh = _fdt_grab_space(fdt, sizeof(*nh) + FDT_TAGALIGN(namelen));
+        namelen = strlen(name) + 1;
+        nh = fdt_grab_space_(fdt, sizeof(*nh) + FDT_TAGALIGN(namelen));
        if (! nh)
                return -FDT_ERR_NOSPACE;
@@ -187,9 +252,9 @@ int fdt_end_node(void *fdt)
 {
        fdt32_t *en;
-        FDT_SW_CHECK_HEADER(fdt);
+        FDT_SW_PROBE_STRUCT(fdt);
-        en = _fdt_grab_space(fdt, FDT_TAGSIZE);
+        en = fdt_grab_space_(fdt, FDT_TAGSIZE);
        if (! en)
                return -FDT_ERR_NOSPACE;
@@ -197,7 +262,7 @@ int fdt_end_node(void *fdt)
        return 0;
 }
-static int _fdt_find_add_string(void *fdt, const char *s)
+static int fdt_find_add_string_(void *fdt, const char *s)
 {
        char *strtab = (char *)fdt + fdt_totalsize(fdt);
        const char *p;
@@ -205,7 +270,7 @@ static int _fdt_find_add_string(void *fdt, const char *s)
        int len = strlen(s) + 1;
        int struct_top, offset;
-        p = _fdt_find_string(strtab - strtabsize, strtabsize, s);
+        p = fdt_find_string_(strtab - strtabsize, strtabsize, s);
        if (p)
                return p - strtab;
@@ -225,13 +290,13 @@ int fdt_property_placeholder(void *fdt, const char *name, int len, void **valp)
        struct fdt_property *prop;
        int nameoff;
-        FDT_SW_CHECK_HEADER(fdt);
+        FDT_SW_PROBE_STRUCT(fdt);
-        nameoff = _fdt_find_add_string(fdt, name);
+        nameoff = fdt_find_add_string_(fdt, name);
        if (nameoff == 0)
                return -FDT_ERR_NOSPACE;
-        prop = _fdt_grab_space(fdt, sizeof(*prop) + FDT_TAGALIGN(len));
+        prop = fdt_grab_space_(fdt, sizeof(*prop) + FDT_TAGALIGN(len));
        if (! prop)
                return -FDT_ERR_NOSPACE;
@@ -262,10 +327,10 @@ int fdt_finish(void *fdt)
        uint32_t tag;
        int offset, nextoffset;
-        FDT_SW_CHECK_HEADER(fdt);
+        FDT_SW_PROBE_STRUCT(fdt);
        /* Add terminator */
-        end = _fdt_grab_space(fdt, sizeof(*end));
+        end = fdt_grab_space_(fdt, sizeof(*end));
        if (! end)
                return -FDT_ERR_NOSPACE;
        *end = cpu_to_fdt32(FDT_END);
@@ -281,7 +346,7 @@ int fdt_finish(void *fdt)
        while ((tag = fdt_next_tag(fdt, offset, &nextoffset)) != FDT_END) {
                if (tag == FDT_PROP) {
                        struct fdt_property *prop =
-                                _fdt_offset_ptr_w(fdt, offset);
+                                fdt_offset_ptr_w_(fdt, offset);
                        int nameoff;
                        nameoff = fdt32_to_cpu(prop->nameoff);
diff --git a/scripts/dtc/libfdt/fdt_wip.c b/scripts/dtc/libfdt/fdt_wip.c
index 5e859198622b..534c1cbbb2f3 100644
--- a/scripts/dtc/libfdt/fdt_wip.c
+++ b/scripts/dtc/libfdt/fdt_wip.c
@@ -93,7 +93,7 @@ int fdt_setprop_inplace(void *fdt, int nodeoffset, const char *name,
                                                   val, len);
 }
-static void _fdt_nop_region(void *start, int len)
+static void fdt_nop_region_(void *start, int len)
 {
        fdt32_t *p;
@@ -110,12 +110,12 @@ int fdt_nop_property(void *fdt, int nodeoffset, const char *name)
        if (!prop)
                return len;
-        _fdt_nop_region(prop, len + sizeof(*prop));
+        fdt_nop_region_(prop, len + sizeof(*prop));
        return 0;
 }
-int _fdt_node_end_offset(void *fdt, int offset)
+int fdt_node_end_offset_(void *fdt, int offset)
 {
        int depth = 0;
@@ -129,11 +129,11 @@ int fdt_nop_node(void *fdt, int nodeoffset)
 {
        int endoffset;
-        endoffset = _fdt_node_end_offset(fdt, nodeoffset);
+        endoffset = fdt_node_end_offset_(fdt, nodeoffset);
        if (endoffset < 0)
                return endoffset;
-        _fdt_nop_region(fdt_offset_ptr_w(fdt, nodeoffset, 0),
+        fdt_nop_region_(fdt_offset_ptr_w(fdt, nodeoffset, 0),
                        endoffset - nodeoffset);
        return 0;
 }
diff --git a/scripts/dtc/libfdt/libfdt.h b/scripts/dtc/libfdt/libfdt.h
index 7f83023ee109..2bd151dd355f 100644
--- a/scripts/dtc/libfdt/libfdt.h
+++ b/scripts/dtc/libfdt/libfdt.h
@@ -1,5 +1,5 @@
-#ifndef _LIBFDT_H
+#ifndef LIBFDT_H
-#define _LIBFDT_H
+#define LIBFDT_H
 /*
 * libfdt - Flat Device Tree manipulation
 * Copyright (C) 2006 David Gibson, IBM Corporation.
@@ -54,7 +54,7 @@
 #include "libfdt_env.h"
 #include "fdt.h"
-#define FDT_FIRST_SUPPORTED_VERSION     0x10
+#define FDT_FIRST_SUPPORTED_VERSION     0x02
 #define FDT_LAST_SUPPORTED_VERSION      0x11
 /* Error codes: informative error codes */
@@ -90,8 +90,9 @@
 /* Error codes: codes for bad device tree blobs */
 #define FDT_ERR_TRUNCATED       8
-        /* FDT_ERR_TRUNCATED: Structure block of the given device tree
+        /* FDT_ERR_TRUNCATED: FDT or a sub-block is improperly
-         * ends without an FDT_END tag. */
+         * terminated (overflows, goes outside allowed bounds, or
+         * isn't properly terminated).  */
 #define FDT_ERR_BADMAGIC        9
        /* FDT_ERR_BADMAGIC: Given "device tree" appears not to be a
         * device tree at all - it is missing the flattened device
@@ -153,6 +154,29 @@ static inline void *fdt_offset_ptr_w(void *fdt, int offset, int checklen)
 uint32_t fdt_next_tag(const void *fdt, int offset, int *nextoffset);
+/*
+ * Alignment helpers:
+ *     These helpers access words from a device tree blob.  They're
+ *     built to work even with unaligned pointers on platforms (ike
+ *     ARM) that don't like unaligned loads and stores
+ */
+static inline uint32_t fdt32_ld(const fdt32_t *p)
+{
+        fdt32_t v;
+        memcpy(&v, p, sizeof(v));
+        return fdt32_to_cpu(v);
+}
+static inline uint64_t fdt64_ld(const fdt64_t *p)
+{
+        fdt64_t v;
+        memcpy(&v, p, sizeof(v));
+        return fdt64_to_cpu(v);
+}
 /**********************************************************************/
 /* Traversal functions                                                */
 /**********************************************************************/
@@ -213,7 +237,7 @@ int fdt_next_subnode(const void *fdt, int offset);
 /* General functions                                                  */
 /**********************************************************************/
 #define fdt_get_header(fdt, field) \
-        (fdt32_to_cpu(((const struct fdt_header *)(fdt))->field))
+        (fdt32_ld(&((const struct fdt_header *)(fdt))->field))
 #define fdt_magic(fdt)                  (fdt_get_header(fdt, magic))
 #define fdt_totalsize(fdt)              (fdt_get_header(fdt, totalsize))
 #define fdt_off_dt_struct(fdt)          (fdt_get_header(fdt, off_dt_struct))
@@ -225,37 +249,50 @@ int fdt_next_subnode(const void *fdt, int offset);
 #define fdt_size_dt_strings(fdt)        (fdt_get_header(fdt, size_dt_strings))
 #define fdt_size_dt_struct(fdt)         (fdt_get_header(fdt, size_dt_struct))
-#define __fdt_set_hdr(name) \
+#define fdt_set_hdr_(name) \
        static inline void fdt_set_##name(void *fdt, uint32_t val) \
        { \
                struct fdt_header *fdth = (struct fdt_header *)fdt; \
                fdth->name = cpu_to_fdt32(val); \
        }
-__fdt_set_hdr(magic);
+fdt_set_hdr_(magic);
-__fdt_set_hdr(totalsize);
+fdt_set_hdr_(totalsize);
-__fdt_set_hdr(off_dt_struct);
+fdt_set_hdr_(off_dt_struct);
-__fdt_set_hdr(off_dt_strings);
+fdt_set_hdr_(off_dt_strings);
-__fdt_set_hdr(off_mem_rsvmap);
+fdt_set_hdr_(off_mem_rsvmap);
-__fdt_set_hdr(version);
+fdt_set_hdr_(version);
-__fdt_set_hdr(last_comp_version);
+fdt_set_hdr_(last_comp_version);
-__fdt_set_hdr(boot_cpuid_phys);
+fdt_set_hdr_(boot_cpuid_phys);
-__fdt_set_hdr(size_dt_strings);
+fdt_set_hdr_(size_dt_strings);
-__fdt_set_hdr(size_dt_struct);
+fdt_set_hdr_(size_dt_struct);
-#undef __fdt_set_hdr
+#undef fdt_set_hdr_
-/**
+/**
- * fdt_check_header - sanity check a device tree or possible device tree
+ * fdt_header_size - return the size of the tree's header
+ * @fdt: pointer to a flattened device tree
+ */
+size_t fdt_header_size_(uint32_t version);
+static inline size_t fdt_header_size(const void *fdt)
+{
+        return fdt_header_size_(fdt_version(fdt));
+}
+/**
+ * fdt_check_header - sanity check a device tree header
 * @fdt: pointer to data which might be a flattened device tree
 *
 * fdt_check_header() checks that the given buffer contains what
- * appears to be a flattened device tree with sane information in its
+ * appears to be a flattened device tree, and that the header contains
- * header.
+ * valid information (to the extent that can be determined from the
+ * header alone).
 *
 * returns:
 *     0, if the buffer appears to contain a valid device tree
 *     -FDT_ERR_BADMAGIC,
 *     -FDT_ERR_BADVERSION,
- *     -FDT_ERR_BADSTATE, standard meanings, as above
+ *     -FDT_ERR_BADSTATE,
+ *     -FDT_ERR_TRUNCATED, standard meanings, as above
 */
 int fdt_check_header(const void *fdt);
@@ -284,6 +321,24 @@ int fdt_move(const void *fdt, void *buf, int bufsize);
 /* Read-only functions                                                */
 /**********************************************************************/
+int fdt_check_full(const void *fdt, size_t bufsize);
+/**
+ * fdt_get_string - retrieve a string from the strings block of a device tree
+ * @fdt: pointer to the device tree blob
+ * @stroffset: offset of the string within the strings block (native endian)
+ * @lenp: optional pointer to return the string's length
+ *
+ * fdt_get_string() retrieves a pointer to a single string from the
+ * strings block of the device tree blob at fdt, and optionally also
+ * returns the string's length in *lenp.
+ *
+ * returns:
+ *     a pointer to the string, on success
+ *     NULL, if stroffset is out of bounds, or doesn't point to a valid string
+ */
+const char *fdt_get_string(const void *fdt, int stroffset, int *lenp);
 /**
 * fdt_string - retrieve a string from the strings block of a device tree
 * @fdt: pointer to the device tree blob
@@ -294,7 +349,7 @@ int fdt_move(const void *fdt, void *buf, int bufsize);
 *
 * returns:
 *     a pointer to the string, on success
- *     NULL, if stroffset is out of bounds
+ *     NULL, if stroffset is out of bounds, or doesn't point to a valid string
 */
 const char *fdt_string(const void *fdt, int stroffset);
@@ -527,6 +582,9 @@ int fdt_next_property_offset(const void *fdt, int offset);
 * offset.  If lenp is non-NULL, the length of the property value is
 * also returned, in the integer pointed to by lenp.
 *
+ * Note that this code only works on device tree versions >= 16. fdt_getprop()
+ * works on all versions.
+ *
 * returns:
 *      pointer to the structure representing the property
 *              if lenp is non-NULL, *lenp contains the length of the property
@@ -1087,7 +1145,7 @@ int fdt_address_cells(const void *fdt, int nodeoffset);
 *
 * returns:
 *      0 <= n < FDT_MAX_NCELLS, on success
- *      2, if the node has no #address-cells property
+ *      2, if the node has no #size-cells property
 *      -FDT_ERR_BADNCELLS, if the node has a badly formatted or invalid
 *              #size-cells property
 *      -FDT_ERR_BADMAGIC,
@@ -1310,10 +1368,13 @@ static inline int fdt_property_u64(void *fdt, const char *name, uint64_t val)
        fdt64_t tmp = cpu_to_fdt64(val);
        return fdt_property(fdt, name, &tmp, sizeof(tmp));
 }
+#ifndef SWIG /* Not available in Python */
 static inline int fdt_property_cell(void *fdt, const char *name, uint32_t val)
 {
        return fdt_property_u32(fdt, name, val);
 }
+#endif
 /**
 * fdt_property_placeholder - add a new property and return a ptr to its value
@@ -1449,7 +1510,7 @@ int fdt_setprop(void *fdt, int nodeoffset, const char *name,
                const void *val, int len);
 /**
- * fdt_setprop _placeholder - allocate space for a property
+ * fdt_setprop_placeholder - allocate space for a property
 * @fdt: pointer to the device tree blob
 * @nodeoffset: offset of the node whose property to change
 * @name: name of the property to change
@@ -1896,4 +1957,4 @@ int fdt_overlay_apply(void *fdt, void *fdto);
 const char *fdt_strerror(int errval);
-#endif /* _LIBFDT_H */
+#endif /* LIBFDT_H */
diff --git a/scripts/dtc/libfdt/libfdt_env.h b/scripts/dtc/libfdt/libfdt_env.h
index 952056cddf09..eb2053845c9c 100644
--- a/scripts/dtc/libfdt/libfdt_env.h
+++ b/scripts/dtc/libfdt/libfdt_env.h
@@ -1,5 +1,5 @@
-#ifndef _LIBFDT_ENV_H
+#ifndef LIBFDT_ENV_H
-#define _LIBFDT_ENV_H
+#define LIBFDT_ENV_H
 /*
 * libfdt - Flat Device Tree manipulation
 * Copyright (C) 2006 David Gibson, IBM Corporation.
@@ -56,6 +56,7 @@
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
+#include <limits.h>
 #ifdef __CHECKER__
 #define FDT_FORCE __attribute__((force))
@@ -109,4 +110,31 @@ static inline fdt64_t cpu_to_fdt64(uint64_t x)
 #undef CPU_TO_FDT16
 #undef EXTRACT_BYTE
-#endif /* _LIBFDT_ENV_H */
+#ifdef __APPLE__
+#include <AvailabilityMacros.h>
+/* strnlen() is not available on Mac OS < 10.7 */
+# if !defined(MAC_OS_X_VERSION_10_7) || (MAC_OS_X_VERSION_MAX_ALLOWED < \
+                                         MAC_OS_X_VERSION_10_7)
+#define strnlen fdt_strnlen
+/*
+ * fdt_strnlen: returns the length of a string or max_count - which ever is
+ * smallest.
+ * Input 1 string: the string whose size is to be determined
+ * Input 2 max_count: the maximum value returned by this function
+ * Output: length of the string or max_count (the smallest of the two)
+ */
+static inline size_t fdt_strnlen(const char *string, size_t max_count)
+{
+    const char *p = memchr(string, 0, max_count);
+    return p ? p - string : max_count;
+}
+#endif /* !defined(MAC_OS_X_VERSION_10_7) || (MAC_OS_X_VERSION_MAX_ALLOWED <
+          MAC_OS_X_VERSION_10_7) */
+#endif /* __APPLE__ */
+#endif /* LIBFDT_ENV_H */
diff --git a/scripts/dtc/libfdt/libfdt_internal.h b/scripts/dtc/libfdt/libfdt_internal.h
index 02cfa6fb612d..4109f890ae60 100644
--- a/scripts/dtc/libfdt/libfdt_internal.h
+++ b/scripts/dtc/libfdt/libfdt_internal.h
@@ -1,5 +1,5 @@
-#ifndef _LIBFDT_INTERNAL_H
+#ifndef LIBFDT_INTERNAL_H
-#define _LIBFDT_INTERNAL_H
+#define LIBFDT_INTERNAL_H
 /*
 * libfdt - Flat Device Tree manipulation
 * Copyright (C) 2006 David Gibson, IBM Corporation.
@@ -55,29 +55,30 @@
 #define FDT_ALIGN(x, a)         (((x) + (a) - 1) & ~((a) - 1))
 #define FDT_TAGALIGN(x)         (FDT_ALIGN((x), FDT_TAGSIZE))
-#define FDT_CHECK_HEADER(fdt) \
+int fdt_ro_probe_(const void *fdt);
+#define FDT_RO_PROBE(fdt)                       \
        { \
-                int __err; \
+                int err_; \
-                if ((__err = fdt_check_header(fdt)) != 0) \
+                if ((err_ = fdt_ro_probe_(fdt)) != 0)   \
-                        return __err; \
+                        return err_; \
        }
-int _fdt_check_node_offset(const void *fdt, int offset);
+int fdt_check_node_offset_(const void *fdt, int offset);
-int _fdt_check_prop_offset(const void *fdt, int offset);
+int fdt_check_prop_offset_(const void *fdt, int offset);
-const char *_fdt_find_string(const char *strtab, int tabsize, const char *s);
+const char *fdt_find_string_(const char *strtab, int tabsize, const char *s);
-int _fdt_node_end_offset(void *fdt, int nodeoffset);
+int fdt_node_end_offset_(void *fdt, int nodeoffset);
-static inline const void *_fdt_offset_ptr(const void *fdt, int offset)
+static inline const void *fdt_offset_ptr_(const void *fdt, int offset)
 {
        return (const char *)fdt + fdt_off_dt_struct(fdt) + offset;
 }
-static inline void *_fdt_offset_ptr_w(void *fdt, int offset)
+static inline void *fdt_offset_ptr_w_(void *fdt, int offset)
 {
-        return (void *)(uintptr_t)_fdt_offset_ptr(fdt, offset);
+        return (void *)(uintptr_t)fdt_offset_ptr_(fdt, offset);
 }
-static inline const struct fdt_reserve_entry *_fdt_mem_rsv(const void *fdt, int n)
+static inline const struct fdt_reserve_entry *fdt_mem_rsv_(const void *fdt, int n)
 {
        const struct fdt_reserve_entry *rsv_table =
                (const struct fdt_reserve_entry *)
@@ -85,11 +86,11 @@ static inline const struct fdt_reserve_entry *_fdt_mem_rsv(const void *fdt, int
        return rsv_table + n;
 }
-static inline struct fdt_reserve_entry *_fdt_mem_rsv_w(void *fdt, int n)
+static inline struct fdt_reserve_entry *fdt_mem_rsv_w_(void *fdt, int n)
 {
-        return (void *)(uintptr_t)_fdt_mem_rsv(fdt, n);
+        return (void *)(uintptr_t)fdt_mem_rsv_(fdt, n);
 }
 #define FDT_SW_MAGIC            (~FDT_MAGIC)
-#endif /* _LIBFDT_INTERNAL_H */
+#endif /* LIBFDT_INTERNAL_H */
diff --git a/scripts/dtc/livetree.c b/scripts/dtc/livetree.c
index 6846ad2fd6d2..4ff0679e0062 100644
--- a/scripts/dtc/livetree.c
+++ b/scripts/dtc/livetree.c
@@ -134,6 +134,20 @@ struct node *name_node(struct node *node, char *name)
        return node;
 }
+struct node *omit_node_if_unused(struct node *node)
+{
+        node->omit_if_unused = 1;
+        return node;
+}
+struct node *reference_node(struct node *node)
+{
+        node->is_referenced = 1;
+        return node;
+}
 struct node *merge_nodes(struct node *old_node, struct node *new_node)
 {
        struct property *new_prop, *old_prop;
@@ -216,7 +230,7 @@ struct node *merge_nodes(struct node *old_node, struct node *new_node)
        return old_node;
 }
-void add_orphan_node(struct node *dt, struct node *new_node, char *ref)
+struct node * add_orphan_node(struct node *dt, struct node *new_node, char *ref)
 {
        static unsigned int next_orphan_fragment = 0;
        struct node *node;
@@ -224,10 +238,16 @@ void add_orphan_node(struct node *dt, struct node *new_node, char *ref)
        struct data d = empty_data;
        char *name;
-        d = data_add_marker(d, REF_PHANDLE, ref);
+        if (ref[0] == '/') {
-        d = data_append_integer(d, 0xffffffff, 32);
+                d = data_append_data(d, ref, strlen(ref) + 1);
+                p = build_property("target-path", d);
+        } else {
+                d = data_add_marker(d, REF_PHANDLE, ref);
+                d = data_append_integer(d, 0xffffffff, 32);
-        p = build_property("target", d);
+                p = build_property("target", d);
+        }
        xasprintf(&name, "fragment@%u",
                        next_orphan_fragment++);
@@ -236,6 +256,7 @@ void add_orphan_node(struct node *dt, struct node *new_node, char *ref)
        name_node(node, name);
        add_child(dt, node);
+        return dt;
 }
 struct node *chain_node(struct node *first, struct node *list)
@@ -507,7 +528,7 @@ struct node *get_node_by_path(struct node *tree, const char *path)
        for_each_child(tree, child) {
                if (p && (strlen(child->name) == p-path) &&
-                                strneq(path, child->name, p-path))
+                    strprefixeq(path, p - path, child->name))
                        return get_node_by_path(child, p+1);
                else if (!p && streq(path, child->name))
                        return child;
@@ -540,7 +561,10 @@ struct node *get_node_by_phandle(struct node *tree, cell_t phandle)
 {
        struct node *child, *node;
-        assert((phandle != 0) && (phandle != -1));
+        if ((phandle == 0) || (phandle == -1)) {
+                assert(generate_fixups);
+                return NULL;
+        }
        if (tree->phandle == phandle) {
                if (tree->deleted)
@@ -570,6 +594,7 @@ struct node *get_node_by_ref(struct node *tree, const char *ref)
 cell_t get_node_phandle(struct node *root, struct node *node)
 {
        static cell_t phandle = 1; /* FIXME: ick, static local */
+        struct data d = empty_data;
        if ((node->phandle != 0) && (node->phandle != -1))
                return node->phandle;
@@ -579,17 +604,16 @@ cell_t get_node_phandle(struct node *root, struct node *node)
        node->phandle = phandle;
+        d = data_add_marker(d, TYPE_UINT32, NULL);
+        d = data_append_cell(d, phandle);
        if (!get_property(node, "linux,phandle")
            && (phandle_format & PHANDLE_LEGACY))
-                add_property(node,
+                add_property(node, build_property("linux,phandle", d));
-                             build_property("linux,phandle",
-                                            data_append_cell(empty_data, phandle)));
        if (!get_property(node, "phandle")
            && (phandle_format & PHANDLE_EPAPR))
-                add_property(node,
+                add_property(node, build_property("phandle", d));
-                             build_property("phandle",
-                                            data_append_cell(empty_data, phandle)));
        /* If the node *does* have a phandle property, we must
         * be dealing with a self-referencing phandle, which will be
diff --git a/scripts/dtc/srcpos.c b/scripts/dtc/srcpos.c
index 9d38459902f3..cb6ed0e3e5e4 100644
--- a/scripts/dtc/srcpos.c
+++ b/scripts/dtc/srcpos.c
@@ -209,8 +209,6 @@ struct srcpos srcpos_empty = {
        .file = NULL,
 };
-#define TAB_SIZE      8
 void srcpos_update(struct srcpos *pos, const char *text, int len)
 {
        int i;
@@ -224,9 +222,6 @@ void srcpos_update(struct srcpos *pos, const char *text, int len)
                if (text[i] == '\n') {
                        current_srcfile->lineno++;
                        current_srcfile->colno = 1;
-                } else if (text[i] == '\t') {
-                        current_srcfile->colno =
-                                ALIGN(current_srcfile->colno, TAB_SIZE);
                } else {
                        current_srcfile->colno++;
                }
diff --git a/scripts/dtc/srcpos.h b/scripts/dtc/srcpos.h
index 7caca8257c6d..9ded12a3830a 100644
--- a/scripts/dtc/srcpos.h
+++ b/scripts/dtc/srcpos.h
@@ -17,8 +17,8 @@
 *                                                                   USA
 */
-#ifndef _SRCPOS_H_
+#ifndef SRCPOS_H
-#define _SRCPOS_H_
+#define SRCPOS_H
 #include <stdio.h>
 #include <stdbool.h>
@@ -114,4 +114,4 @@ extern void PRINTF(3, 4) srcpos_error(struct srcpos *pos, const char *prefix,
 extern void srcpos_set_line(char *f, int l);
-#endif /* _SRCPOS_H_ */
+#endif /* SRCPOS_H */
diff --git a/scripts/dtc/treesource.c b/scripts/dtc/treesource.c
index 2461a3d068a0..f2874f1d1465 100644
--- a/scripts/dtc/treesource.c
+++ b/scripts/dtc/treesource.c
@@ -61,24 +61,14 @@ static bool isstring(char c)
                || strchr("\a\b\t\n\v\f\r", c));
 }
-static void write_propval_string(FILE *f, struct data val)
+static void write_propval_string(FILE *f, const char *s, size_t len)
 {
-        const char *str = val.val;
+        const char *end = s + len - 1;
-        int i;
+        assert(*end == '\0');
-        struct marker *m = val.markers;
-        assert(str[val.len-1] == '\0');
-        while (m && (m->offset == 0)) {
-                if (m->type == LABEL)
-                        fprintf(f, "%s: ", m->ref);
-                m = m->next;
-        }
        fprintf(f, "\"");
+        while (s < end) {
-        for (i = 0; i < (val.len-1); i++) {
+                char c = *s++;
-                char c = str[i];
                switch (c) {
                case '\a':
                        fprintf(f, "\\a");
@@ -108,91 +98,78 @@ static void write_propval_string(FILE *f, struct data val)
                        fprintf(f, "\\\"");
                        break;
                case '\0':
-                        fprintf(f, "\", ");
+                        fprintf(f, "\\0");
-                        while (m && (m->offset <= (i + 1))) {
-                                if (m->type == LABEL) {
-                                        assert(m->offset == (i+1));
-                                        fprintf(f, "%s: ", m->ref);
-                                }
-                                m = m->next;
-                        }
-                        fprintf(f, "\"");
                        break;
                default:
                        if (isprint((unsigned char)c))
                                fprintf(f, "%c", c);
                        else
-                                fprintf(f, "\\x%02hhx", c);
+                                fprintf(f, "\\x%02"PRIx8, c);
                }
        }
        fprintf(f, "\"");
-        /* Wrap up any labels at the end of the value */
-        for_each_marker_of_type(m, LABEL) {
-                assert (m->offset == val.len);
-                fprintf(f, " %s:", m->ref);
-        }
 }
-static void write_propval_cells(FILE *f, struct data val)
+static void write_propval_int(FILE *f, const char *p, size_t len, size_t width)
 {
-        void *propend = val.val + val.len;
+        const char *end = p + len;
-        fdt32_t *cp = (fdt32_t *)val.val;
+        assert(len % width == 0);
-        struct marker *m = val.markers;
-        fprintf(f, "<");
-        for (;;) {
-                while (m && (m->offset <= ((char *)cp - val.val))) {
-                        if (m->type == LABEL) {
-                                assert(m->offset == ((char *)cp - val.val));
-                                fprintf(f, "%s: ", m->ref);
-                        }
-                        m = m->next;
-                }
-                fprintf(f, "0x%x", fdt32_to_cpu(*cp++));
+        for (; p < end; p += width) {
-                if ((void *)cp >= propend)
+                switch (width) {
+                case 1:
+                        fprintf(f, " %02"PRIx8, *(const uint8_t*)p);
+                        break;
+                case 2:
+                        fprintf(f, " 0x%02"PRIx16, fdt16_to_cpu(*(const fdt16_t*)p));
+                        break;
+                case 4:
+                        fprintf(f, " 0x%02"PRIx32, fdt32_to_cpu(*(const fdt32_t*)p));
+                        break;
+                case 8:
+                        fprintf(f, " 0x%02"PRIx64, fdt64_to_cpu(*(const fdt64_t*)p));
                        break;
-                fprintf(f, " ");
+                }
        }
+}
-        /* Wrap up any labels at the end of the value */
+static bool has_data_type_information(struct marker *m)
-        for_each_marker_of_type(m, LABEL) {
+{
-                assert (m->offset == val.len);
+        return m->type >= TYPE_UINT8;
-                fprintf(f, " %s:", m->ref);
-        }
-        fprintf(f, ">");
 }
-static void write_propval_bytes(FILE *f, struct data val)
+static struct marker *next_type_marker(struct marker *m)
 {
-        void *propend = val.val + val.len;
+        while (m && !has_data_type_information(m))
-        const char *bp = val.val;
+                m = m->next;
-        struct marker *m = val.markers;
+        return m;
+}
-        fprintf(f, "[");
-        for (;;) {
-                while (m && (m->offset == (bp-val.val))) {
-                        if (m->type == LABEL)
-                                fprintf(f, "%s: ", m->ref);
-                        m = m->next;
-                }
-                fprintf(f, "%02hhx", (unsigned char)(*bp++));
+size_t type_marker_length(struct marker *m)
-                if ((const void *)bp >= propend)
+{
-                        break;
+        struct marker *next = next_type_marker(m->next);
-                fprintf(f, " ");
-        }
-        /* Wrap up any labels at the end of the value */
+        if (next)
-        for_each_marker_of_type(m, LABEL) {
+                return next->offset - m->offset;
-                assert (m->offset == val.len);
+        return 0;
-                fprintf(f, " %s:", m->ref);
-        }
-        fprintf(f, "]");
 }
-static void write_propval(FILE *f, struct property *prop)
+static const char *delim_start[] = {
+        [TYPE_UINT8] = "[",
+        [TYPE_UINT16] = "/bits/ 16 <",
+        [TYPE_UINT32] = "<",
+        [TYPE_UINT64] = "/bits/ 64 <",
+        [TYPE_STRING] = "",
+};
+static const char *delim_end[] = {
+        [TYPE_UINT8] = " ]",
+        [TYPE_UINT16] = " >",
+        [TYPE_UINT32] = " >",
+        [TYPE_UINT64] = " >",
+        [TYPE_STRING] = "",
+};
+static enum markertype guess_value_type(struct property *prop)
 {
        int len = prop->val.len;
        const char *p = prop->val.val;
@@ -201,11 +178,6 @@ static void write_propval(FILE *f, struct property *prop)
        int nnotstringlbl = 0, nnotcelllbl = 0;
        int i;
-        if (len == 0) {
-                fprintf(f, ";\n");
-                return;
-        }
        for (i = 0; i < len; i++) {
                if (! isstring(p[i]))
                        nnotstring++;
@@ -220,17 +192,91 @@ static void write_propval(FILE *f, struct property *prop)
                        nnotcelllbl++;
        }
-        fprintf(f, " = ");
        if ((p[len-1] == '\0') && (nnotstring == 0) && (nnul < (len-nnul))
            && (nnotstringlbl == 0)) {
-                write_propval_string(f, prop->val);
+                return TYPE_STRING;
        } else if (((len % sizeof(cell_t)) == 0) && (nnotcelllbl == 0)) {
-                write_propval_cells(f, prop->val);
+                return TYPE_UINT32;
-        } else {
-                write_propval_bytes(f, prop->val);
        }
-        fprintf(f, ";\n");
+        return TYPE_UINT8;
+}
+static void write_propval(FILE *f, struct property *prop)
+{
+        size_t len = prop->val.len;
+        struct marker *m = prop->val.markers;
+        struct marker dummy_marker;
+        enum markertype emit_type = TYPE_NONE;
+        if (len == 0) {
+                fprintf(f, ";\n");
+                return;
+        }
+        fprintf(f, " = ");
+        if (!next_type_marker(m)) {
+                /* data type information missing, need to guess */
+                dummy_marker.type = guess_value_type(prop);
+                dummy_marker.next = prop->val.markers;
+                dummy_marker.offset = 0;
+                dummy_marker.ref = NULL;
+                m = &dummy_marker;
+        }
+        struct marker *m_label = prop->val.markers;
+        for_each_marker(m) {
+                size_t chunk_len;
+                const char *p = &prop->val.val[m->offset];
+                if (!has_data_type_information(m))
+                        continue;
+                chunk_len = type_marker_length(m);
+                if (!chunk_len)
+                        chunk_len = len - m->offset;
+                if (emit_type != TYPE_NONE)
+                        fprintf(f, "%s, ", delim_end[emit_type]);
+                emit_type = m->type;
+                for_each_marker_of_type(m_label, LABEL) {
+                        if (m_label->offset > m->offset)
+                                break;
+                        fprintf(f, "%s: ", m_label->ref);
+                }
+                fprintf(f, "%s", delim_start[emit_type]);
+                if (chunk_len <= 0)
+                        continue;
+                switch(emit_type) {
+                case TYPE_UINT16:
+                        write_propval_int(f, p, chunk_len, 2);
+                        break;
+                case TYPE_UINT32:
+                        write_propval_int(f, p, chunk_len, 4);
+                        break;
+                case TYPE_UINT64:
+                        write_propval_int(f, p, chunk_len, 8);
+                        break;
+                case TYPE_STRING:
+                        write_propval_string(f, p, chunk_len);
+                        break;
+                default:
+                        write_propval_int(f, p, chunk_len, 1);
+                }
+        }
+        /* Wrap up any labels at the end of the value */
+        for_each_marker_of_type(m_label, LABEL) {
+                assert (m_label->offset == len);
+                fprintf(f, " %s:", m_label->ref);
+        }
+        fprintf(f, "%s;\n", delim_end[emit_type] ? : "");
 }
 static void write_tree_source_node(FILE *f, struct node *tree, int level)
@@ -281,4 +327,3 @@ void dt_to_source(FILE *f, struct dt_info *dti)
        write_tree_source_node(f, dti->dt, 0);
 }
diff --git a/scripts/dtc/update-dtc-source.sh b/scripts/dtc/update-dtc-source.sh
index fe8926bb3b54..7dd29a0362b8 100755
--- a/scripts/dtc/update-dtc-source.sh
+++ b/scripts/dtc/update-dtc-source.sh
@@ -4,7 +4,7 @@
 #
 # This script assumes that the dtc and the linux git trees are in the
 # same directory. After building dtc in the dtc directory, it copies the
-# source files and generated source files into the scripts/dtc directory
+# source files and generated source file(s) into the scripts/dtc directory
 # in the kernel and creates a git commit updating them to the new
 # version.
 #
@@ -32,9 +32,8 @@ DTC_UPSTREAM_PATH=`pwd`/../dtc
 DTC_LINUX_PATH=`pwd`/scripts/dtc
 DTC_SOURCE="checks.c data.c dtc.c dtc.h flattree.c fstree.c livetree.c srcpos.c \
-                srcpos.h treesource.c util.c util.h version_gen.h Makefile.dtc \
+                srcpos.h treesource.c util.c util.h version_gen.h yamltree.c Makefile.dtc \
                dtc-lexer.l dtc-parser.y"
-DTC_GENERATED="dtc-lexer.lex.c dtc-parser.tab.c dtc-parser.tab.h"
 LIBFDT_SOURCE="Makefile.libfdt fdt.c fdt.h fdt_addresses.c fdt_empty_tree.c \
                fdt_overlay.c fdt_ro.c fdt_rw.c fdt_strerror.c fdt_sw.c \
                fdt_wip.c libfdt.h libfdt_env.h libfdt_internal.h"
@@ -59,10 +58,6 @@ for f in $DTC_SOURCE; do
        cp ${DTC_UPSTREAM_PATH}/${f} ${f}
        git add ${f}
 done
-for f in $DTC_GENERATED; do
-        cp ${DTC_UPSTREAM_PATH}/$f ${f}_shipped
-        git add ${f}_shipped
-done
 for f in $LIBFDT_SOURCE; do
       cp ${DTC_UPSTREAM_PATH}/libfdt/${f} libfdt/${f}
       git add libfdt/${f}
diff --git a/scripts/dtc/util.c b/scripts/dtc/util.c
index 9953c32a0244..a69b7a13463d 100644
--- a/scripts/dtc/util.c
+++ b/scripts/dtc/util.c
@@ -227,11 +227,11 @@ char get_escape_char(const char *s, int *i)
        return val;
 }
-int utilfdt_read_err_len(const char *filename, char **buffp, off_t *len)
+int utilfdt_read_err(const char *filename, char **buffp, size_t *len)
 {
        int fd = 0;     /* assume stdin */
        char *buf = NULL;
-        off_t bufsize = 1024, offset = 0;
+        size_t bufsize = 1024, offset = 0;
        int ret = 0;
        *buffp = NULL;
@@ -264,20 +264,15 @@ int utilfdt_read_err_len(const char *filename, char **buffp, off_t *len)
                free(buf);
        else
                *buffp = buf;
-        *len = bufsize;
+        if (len)
+                *len = bufsize;
        return ret;
 }
-int utilfdt_read_err(const char *filename, char **buffp)
+char *utilfdt_read(const char *filename, size_t *len)
-{
-        off_t len;
-        return utilfdt_read_err_len(filename, buffp, &len);
-}
-char *utilfdt_read_len(const char *filename, off_t *len)
 {
        char *buff;
-        int ret = utilfdt_read_err_len(filename, &buff, len);
+        int ret = utilfdt_read_err(filename, &buff, len);
        if (ret) {
                fprintf(stderr, "Couldn't open blob from '%s': %s\n", filename,
@@ -288,12 +283,6 @@ char *utilfdt_read_len(const char *filename, off_t *len)
        return buff;
 }
-char *utilfdt_read(const char *filename)
-{
-        off_t len;
-        return utilfdt_read_len(filename, &len);
-}
 int utilfdt_write_err(const char *filename, const void *blob)
 {
        int fd = 1;     /* assume stdout */
diff --git a/scripts/dtc/util.h b/scripts/dtc/util.h
index ad5f41199edb..f6cea8274174 100644
--- a/scripts/dtc/util.h
+++ b/scripts/dtc/util.h
@@ -1,5 +1,5 @@
-#ifndef _UTIL_H
+#ifndef UTIL_H
-#define _UTIL_H
+#define UTIL_H
 #include <stdarg.h>
 #include <stdbool.h>
@@ -35,6 +35,9 @@
 #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
+#define stringify(s)    stringify_(s)
+#define stringify_(s)   #s
 static inline void NORETURN PRINTF(1, 2) die(const char *str, ...)
 {
        va_list ap;
@@ -95,16 +98,10 @@ char get_escape_char(const char *s, int *i);
 * stderr.
 *
 * @param filename      The filename to read, or - for stdin
- * @return Pointer to allocated buffer containing fdt, or NULL on error
- */
-char *utilfdt_read(const char *filename);
-/**
- * Like utilfdt_read(), but also passes back the size of the file read.
- *
 * @param len           If non-NULL, the amount of data we managed to read
+ * @return Pointer to allocated buffer containing fdt, or NULL on error
 */
-char *utilfdt_read_len(const char *filename, off_t *len);
+char *utilfdt_read(const char *filename, size_t *len);
 /**
 * Read a device tree file into a buffer. Does not report errors, but only
@@ -113,16 +110,10 @@ char *utilfdt_read_len(const char *filename, off_t *len);
 *
 * @param filename      The filename to read, or - for stdin
 * @param buffp         Returns pointer to buffer containing fdt
- * @return 0 if ok, else an errno value representing the error
- */
-int utilfdt_read_err(const char *filename, char **buffp);
-/**
- * Like utilfdt_read_err(), but also passes back the size of the file read.
- *
 * @param len           If non-NULL, the amount of data we managed to read
+ * @return 0 if ok, else an errno value representing the error
 */
-int utilfdt_read_err_len(const char *filename, char **buffp, off_t *len);
+int utilfdt_read_err(const char *filename, char **buffp, size_t *len);
 /**
 * Write a device tree buffer to a file. This will report any errors on
@@ -260,4 +251,4 @@ void NORETURN util_usage(const char *errmsg, const char *synopsis,
        case 'V': util_version(); \
        case '?': usage("unknown option");
-#endif /* _UTIL_H */
+#endif /* UTIL_H */
diff --git a/scripts/dtc/version_gen.h b/scripts/dtc/version_gen.h
index 6a4e84798966..6d23fd095f16 100644
--- a/scripts/dtc/version_gen.h
+++ b/scripts/dtc/version_gen.h
@@ -1 +1 @@
-#define DTC_VERSION "DTC 1.4.5-gc1e55a55"
+#define DTC_VERSION "DTC 1.4.7-gc86da84d"
diff --git a/scripts/dtc/yamltree.c b/scripts/dtc/yamltree.c
new file mode 100644
index 000000000000..a00285a5a9ec
--- /dev/null
+++ b/scripts/dtc/yamltree.c
@@ -0,0 +1,247 @@
+/*
+ * (C) Copyright Linaro, Ltd. 2018
+ * (C) Copyright Arm Holdings.  2017
+ * (C) Copyright David Gibson <dwg@au1.ibm.com>, IBM Corporation.  2005.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+ *                                                                   USA
+ */
+#include <stdlib.h>
+#include <yaml.h>
+#include "dtc.h"
+#include "srcpos.h"
+char *yaml_error_name[] = {
+        [YAML_NO_ERROR] = "no error",
+        [YAML_MEMORY_ERROR] = "memory error",
+        [YAML_READER_ERROR] = "reader error",
+        [YAML_SCANNER_ERROR] = "scanner error",
+        [YAML_PARSER_ERROR] = "parser error",
+        [YAML_COMPOSER_ERROR] = "composer error",
+        [YAML_WRITER_ERROR] = "writer error",
+        [YAML_EMITTER_ERROR] = "emitter error",
+};
+#define yaml_emitter_emit_or_die(emitter, event) (                      \
+{                                                                       \
+        if (!yaml_emitter_emit(emitter, event))                         \
+                die("yaml '%s': %s in %s, line %i\n",                   \
+                    yaml_error_name[(emitter)->error],                  \
+                    (emitter)->problem, __func__, __LINE__);            \
+})
+static void yaml_propval_int(yaml_emitter_t *emitter, struct marker *markers, char *data, int len, int width)
+{
+        yaml_event_t event;
+        void *tag;
+        int off, start_offset = markers->offset;
+        switch(width) {
+                case 1: tag = "!u8"; break;
+                case 2: tag = "!u16"; break;
+                case 4: tag = "!u32"; break;
+                case 8: tag = "!u64"; break;
+                default:
+                        die("Invalid width %i", width);
+        }
+        assert(len % width == 0);
+        yaml_sequence_start_event_initialize(&event, NULL,
+                (yaml_char_t *)tag, width == 4, YAML_FLOW_SEQUENCE_STYLE);
+        yaml_emitter_emit_or_die(emitter, &event);
+        for (off = 0; off < len; off += width) {
+                char buf[32];
+                struct marker *m;
+                bool is_phandle = false;
+                switch(width) {
+                case 1:
+                        sprintf(buf, "0x%"PRIx8, *(uint8_t*)(data + off));
+                        break;
+                case 2:
+                        sprintf(buf, "0x%"PRIx16, fdt16_to_cpu(*(fdt16_t*)(data + off)));
+                        break;
+                case 4:
+                        sprintf(buf, "0x%"PRIx32, fdt32_to_cpu(*(fdt32_t*)(data + off)));
+                        m = markers;
+                        is_phandle = false;
+                        for_each_marker_of_type(m, REF_PHANDLE) {
+                                if (m->offset == (start_offset + off)) {
+                                        is_phandle = true;
+                                        break;
+                                }
+                        }
+                        break;
+                case 8:
+                        sprintf(buf, "0x%"PRIx64, fdt64_to_cpu(*(fdt64_t*)(data + off)));
+                        break;
+                }
+                if (is_phandle)
+                        yaml_scalar_event_initialize(&event, NULL,
+                                (yaml_char_t*)"!phandle", (yaml_char_t *)buf,
+                                strlen(buf), 0, 0, YAML_PLAIN_SCALAR_STYLE);
+                else
+                        yaml_scalar_event_initialize(&event, NULL,
+                                (yaml_char_t*)YAML_INT_TAG, (yaml_char_t *)buf,
+                                strlen(buf), 1, 1, YAML_PLAIN_SCALAR_STYLE);
+                yaml_emitter_emit_or_die(emitter, &event);
+        }
+        yaml_sequence_end_event_initialize(&event);
+        yaml_emitter_emit_or_die(emitter, &event);
+}
+static void yaml_propval_string(yaml_emitter_t *emitter, char *str, int len)
+{
+        yaml_event_t event;
+        int i;
+        assert(str[len-1] == '\0');
+        /* Make sure the entire string is in the lower 7-bit ascii range */
+        for (i = 0; i < len; i++)
+                assert(isascii(str[i]));
+        yaml_scalar_event_initialize(&event, NULL,
+                (yaml_char_t *)YAML_STR_TAG, (yaml_char_t*)str,
+                len-1, 0, 1, YAML_DOUBLE_QUOTED_SCALAR_STYLE);
+        yaml_emitter_emit_or_die(emitter, &event);
+}
+static void yaml_propval(yaml_emitter_t *emitter, struct property *prop)
+{
+        yaml_event_t event;
+        int len = prop->val.len;
+        struct marker *m = prop->val.markers;
+        /* Emit the property name */
+        yaml_scalar_event_initialize(&event, NULL,
+                (yaml_char_t *)YAML_STR_TAG, (yaml_char_t*)prop->name,
+                strlen(prop->name), 1, 1, YAML_PLAIN_SCALAR_STYLE);
+        yaml_emitter_emit_or_die(emitter, &event);
+        /* Boolean properties are easiest to deal with. Length is zero, so just emit 'true' */
+        if (len == 0) {
+                yaml_scalar_event_initialize(&event, NULL,
+                        (yaml_char_t *)YAML_BOOL_TAG,
+                        (yaml_char_t*)"true",
+                        strlen("true"), 1, 0, YAML_PLAIN_SCALAR_STYLE);
+                yaml_emitter_emit_or_die(emitter, &event);
+                return;
+        }
+        if (!m)
+                die("No markers present in property '%s' value\n", prop->name);
+        yaml_sequence_start_event_initialize(&event, NULL,
+                (yaml_char_t *)YAML_SEQ_TAG, 1, YAML_FLOW_SEQUENCE_STYLE);
+        yaml_emitter_emit_or_die(emitter, &event);
+        for_each_marker(m) {
+                int chunk_len;
+                char *data = &prop->val.val[m->offset];
+                if (m->type < TYPE_UINT8)
+                        continue;
+                chunk_len = type_marker_length(m) ? : len;
+                assert(chunk_len > 0);
+                len -= chunk_len;
+                switch(m->type) {
+                case TYPE_UINT16:
+                        yaml_propval_int(emitter, m, data, chunk_len, 2);
+                        break;
+                case TYPE_UINT32:
+                        yaml_propval_int(emitter, m, data, chunk_len, 4);
+                        break;
+                case TYPE_UINT64:
+                        yaml_propval_int(emitter, m, data, chunk_len, 8);
+                        break;
+                case TYPE_STRING:
+                        yaml_propval_string(emitter, data, chunk_len);
+                        break;
+                default:
+                        yaml_propval_int(emitter, m, data, chunk_len, 1);
+                        break;
+                }
+        }
+        yaml_sequence_end_event_initialize(&event);
+        yaml_emitter_emit_or_die(emitter, &event);
+}
+static void yaml_tree(struct node *tree, yaml_emitter_t *emitter)
+{
+        struct property *prop;
+        struct node *child;
+        yaml_event_t event;
+        if (tree->deleted)
+                return;
+        yaml_mapping_start_event_initialize(&event, NULL,
+                (yaml_char_t *)YAML_MAP_TAG, 1, YAML_ANY_MAPPING_STYLE);
+        yaml_emitter_emit_or_die(emitter, &event);
+        for_each_property(tree, prop)
+                yaml_propval(emitter, prop);
+        /* Loop over all the children, emitting them into the map */
+        for_each_child(tree, child) {
+                yaml_scalar_event_initialize(&event, NULL,
+                        (yaml_char_t *)YAML_STR_TAG, (yaml_char_t*)child->name,
+                        strlen(child->name), 1, 0, YAML_PLAIN_SCALAR_STYLE);
+                yaml_emitter_emit_or_die(emitter, &event);
+                yaml_tree(child, emitter);
+        }
+        yaml_mapping_end_event_initialize(&event);
+        yaml_emitter_emit_or_die(emitter, &event);
+}
+void dt_to_yaml(FILE *f, struct dt_info *dti)
+{
+        yaml_emitter_t emitter;
+        yaml_event_t event;
+        yaml_emitter_initialize(&emitter);
+        yaml_emitter_set_output_file(&emitter, f);
+        yaml_stream_start_event_initialize(&event, YAML_UTF8_ENCODING);
+        yaml_emitter_emit_or_die(&emitter, &event);
+        yaml_document_start_event_initialize(&event, NULL, NULL, NULL, 0);
+        yaml_emitter_emit_or_die(&emitter, &event);
+        yaml_sequence_start_event_initialize(&event, NULL, (yaml_char_t *)YAML_SEQ_TAG, 1, YAML_ANY_SEQUENCE_STYLE);
+        yaml_emitter_emit_or_die(&emitter, &event);
+        yaml_tree(dti->dt, &emitter);
+        yaml_sequence_end_event_initialize(&event);
+        yaml_emitter_emit_or_die(&emitter, &event);
+        yaml_document_end_event_initialize(&event, 0);
+        yaml_emitter_emit_or_die(&emitter, &event);
+        yaml_stream_end_event_initialize(&event);
+        yaml_emitter_emit_or_die(&emitter, &event);
+        yaml_emitter_delete(&emitter);
+}
diff --git a/scripts/extract-vmlinux b/scripts/extract-vmlinux
index 5061abcc2540..85e1f32fb4a0 100755
--- a/scripts/extract-vmlinux
+++ b/scripts/extract-vmlinux
@@ -48,15 +48,17 @@ fi
 tmp=$(mktemp /tmp/vmlinux-XXX)
 trap "rm -f $tmp" 0
-# Initial attempt for uncompressed images or objects:
-check_vmlinux $img
 # That didn't work, so retry after decompression.
 try_decompress '\037\213\010' xy    gunzip
 try_decompress '\3757zXZ\000' abcde unxz
 try_decompress 'BZh'          xy    bunzip2
 try_decompress '\135\0\0\0'   xxx   unlzma
 try_decompress '\211\114\132' xy    'lzop -d'
+try_decompress '\002!L\030'   xxx   'lz4 -d'
+try_decompress '(\265/\375'   xxx   unzstd
+# Finally check for uncompressed images or objects:
+check_vmlinux $img
 # Bail out:
 echo "$me: Cannot find vmlinux." >&2
diff --git a/scripts/extract_xc3028.pl b/scripts/extract_xc3028.pl
index 61d9b256c658..a1c51b7e4baf 100755
--- a/scripts/extract_xc3028.pl
+++ b/scripts/extract_xc3028.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/env perl
-# Copyright (c) Mauro Carvalho Chehab <mchehab@infradead.org>
+# Copyright (c) Mauro Carvalho Chehab <mchehab@kernel.org>
 # Released under GPLv2
 #
 # In order to use, you need to:
diff --git a/scripts/faddr2line b/scripts/faddr2line
index 7721d5b2b0c0..a0149db00be7 100755
--- a/scripts/faddr2line
+++ b/scripts/faddr2line
@@ -56,7 +56,7 @@ command -v ${SIZE} >/dev/null 2>&1 || die "size isn't installed"
 command -v ${NM} >/dev/null 2>&1 || die "nm isn't installed"
 usage() {
-        echo "usage: faddr2line <object file> <func+offset> <func+offset>..." >&2
+        echo "usage: faddr2line [--list] <object file> <func+offset> <func+offset>..." >&2
        exit 1
 }
@@ -163,7 +163,30 @@ __faddr2line() {
                # pass real address to addr2line
                echo "$func+$offset/$sym_size:"
-                ${ADDR2LINE} -fpie $objfile $addr | sed "s; $dir_prefix\(\./\)*; ;"
+                local file_lines=$(${ADDR2LINE} -fpie $objfile $addr | sed "s; $dir_prefix\(\./\)*; ;")
+                [[ -z $file_lines ]] && return
+                if [[ $LIST = 0 ]]; then
+                        echo "$file_lines" | while read -r line
+                        do
+                                echo $line
+                        done
+                        DONE=1;
+                        return
+                fi
+                # show each line with context
+                echo "$file_lines" | while read -r line
+                do
+                        echo
+                        echo $line
+                        n=$(echo $line | sed 's/.*:\([0-9]\+\).*/\1/g')
+                        n1=$[$n-5]
+                        n2=$[$n+5]
+                        f=$(echo $line | sed 's/.*at \(.\+\):.*/\1/g')
+                        awk 'NR>=strtonum("'$n1'") && NR<=strtonum("'$n2'") { if (NR=='$n') printf(">%d<", NR); else printf(" %d ", NR); printf("\t%s\n", $0)}' $f
+                done
                DONE=1
        done < <(${NM} -n $objfile | awk -v fn=$func -v end=$file_end '$3 == fn { found=1; line=$0; start=$1; next } found == 1 { found=0; print line, "0x"$1 } END {if (found == 1) print line, end; }')
@@ -172,6 +195,10 @@ __faddr2line() {
 [[ $# -lt 2 ]] && usage
 objfile=$1
+LIST=0
+[[ "$objfile" == "--list" ]] && LIST=1 && shift && objfile=$1
 [[ ! -f $objfile ]] && die "can't find objfile $objfile"
 shift
diff --git a/scripts/file-size.sh b/scripts/file-size.sh
new file mode 100755
index 000000000000..7eb7423416b5
--- /dev/null
+++ b/scripts/file-size.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
+set -- $(ls -dn "$1")
+printf '%s\n' "$5"
diff --git a/scripts/gcc-plugins/Kconfig b/scripts/gcc-plugins/Kconfig
new file mode 100644
index 000000000000..0d5c799688f0
--- /dev/null
+++ b/scripts/gcc-plugins/Kconfig
@@ -0,0 +1,193 @@
+preferred-plugin-hostcc := $(if-success,[ $(gcc-version) -ge 40800 ],$(HOSTCXX),$(HOSTCC))
+config PLUGIN_HOSTCC
+        string
+        default "$(shell,$(srctree)/scripts/gcc-plugin.sh "$(preferred-plugin-hostcc)" "$(HOSTCXX)" "$(CC)")" if CC_IS_GCC
+        help
+          Host compiler used to build GCC plugins.  This can be $(HOSTCXX),
+          $(HOSTCC), or a null string if GCC plugin is unsupported.
+config HAVE_GCC_PLUGINS
+        bool
+        help
+          An arch should select this symbol if it supports building with
+          GCC plugins.
+menuconfig GCC_PLUGINS
+        bool "GCC plugins"
+        depends on HAVE_GCC_PLUGINS
+        depends on PLUGIN_HOSTCC != ""
+        help
+          GCC plugins are loadable modules that provide extra features to the
+          compiler. They are useful for runtime instrumentation and static analysis.
+          See Documentation/gcc-plugins.txt for details.
+if GCC_PLUGINS
+config GCC_PLUGIN_CYC_COMPLEXITY
+        bool "Compute the cyclomatic complexity of a function" if EXPERT
+        depends on !COMPILE_TEST        # too noisy
+        help
+          The complexity M of a function's control flow graph is defined as:
+           M = E - N + 2P
+          where
+          E = the number of edges
+          N = the number of nodes
+          P = the number of connected components (exit nodes).
+          Enabling this plugin reports the complexity to stderr during the
+          build. It mainly serves as a simple example of how to create a
+          gcc plugin for the kernel.
+config GCC_PLUGIN_SANCOV
+        bool
+        help
+          This plugin inserts a __sanitizer_cov_trace_pc() call at the start of
+          basic blocks. It supports all gcc versions with plugin support (from
+          gcc-4.5 on). It is based on the commit "Add fuzzing coverage support"
+          by Dmitry Vyukov <dvyukov@google.com>.
+config GCC_PLUGIN_LATENT_ENTROPY
+        bool "Generate some entropy during boot and runtime"
+        help
+          By saying Y here the kernel will instrument some kernel code to
+          extract some entropy from both original and artificially created
+          program state.  This will help especially embedded systems where
+          there is little 'natural' source of entropy normally.  The cost
+          is some slowdown of the boot process (about 0.5%) and fork and
+          irq processing.
+          Note that entropy extracted this way is not cryptographically
+          secure!
+          This plugin was ported from grsecurity/PaX. More information at:
+           * https://grsecurity.net/
+           * https://pax.grsecurity.net/
+config GCC_PLUGIN_STRUCTLEAK
+        bool "Force initialization of variables containing userspace addresses"
+        # Currently STRUCTLEAK inserts initialization out of live scope of
+        # variables from KASAN point of view. This leads to KASAN false
+        # positive reports. Prohibit this combination for now.
+        depends on !KASAN_EXTRA
+        help
+          This plugin zero-initializes any structures containing a
+          __user attribute. This can prevent some classes of information
+          exposures.
+          This plugin was ported from grsecurity/PaX. More information at:
+           * https://grsecurity.net/
+           * https://pax.grsecurity.net/
+config GCC_PLUGIN_STRUCTLEAK_BYREF_ALL
+        bool "Force initialize all struct type variables passed by reference"
+        depends on GCC_PLUGIN_STRUCTLEAK
+        depends on !COMPILE_TEST
+        help
+          Zero initialize any struct type local variable that may be passed by
+          reference without having been initialized.
+config GCC_PLUGIN_STRUCTLEAK_VERBOSE
+        bool "Report forcefully initialized variables"
+        depends on GCC_PLUGIN_STRUCTLEAK
+        depends on !COMPILE_TEST        # too noisy
+        help
+          This option will cause a warning to be printed each time the
+          structleak plugin finds a variable it thinks needs to be
+          initialized. Since not all existing initializers are detected
+          by the plugin, this can produce false positive warnings.
+config GCC_PLUGIN_RANDSTRUCT
+        bool "Randomize layout of sensitive kernel structures"
+        select MODVERSIONS if MODULES
+        help
+          If you say Y here, the layouts of structures that are entirely
+          function pointers (and have not been manually annotated with
+          __no_randomize_layout), or structures that have been explicitly
+          marked with __randomize_layout, will be randomized at compile-time.
+          This can introduce the requirement of an additional information
+          exposure vulnerability for exploits targeting these structure
+          types.
+          Enabling this feature will introduce some performance impact,
+          slightly increase memory usage, and prevent the use of forensic
+          tools like Volatility against the system (unless the kernel
+          source tree isn't cleaned after kernel installation).
+          The seed used for compilation is located at
+          scripts/gcc-plgins/randomize_layout_seed.h.  It remains after
+          a make clean to allow for external modules to be compiled with
+          the existing seed and will be removed by a make mrproper or
+          make distclean.
+          Note that the implementation requires gcc 4.7 or newer.
+          This plugin was ported from grsecurity/PaX. More information at:
+           * https://grsecurity.net/
+           * https://pax.grsecurity.net/
+config GCC_PLUGIN_RANDSTRUCT_PERFORMANCE
+        bool "Use cacheline-aware structure randomization"
+        depends on GCC_PLUGIN_RANDSTRUCT
+        depends on !COMPILE_TEST        # do not reduce test coverage
+        help
+          If you say Y here, the RANDSTRUCT randomization will make a
+          best effort at restricting randomization to cacheline-sized
+          groups of elements.  It will further not randomize bitfields
+          in structures.  This reduces the performance hit of RANDSTRUCT
+          at the cost of weakened randomization.
+config GCC_PLUGIN_STACKLEAK
+        bool "Erase the kernel stack before returning from syscalls"
+        depends on GCC_PLUGINS
+        depends on HAVE_ARCH_STACKLEAK
+        help
+          This option makes the kernel erase the kernel stack before
+          returning from system calls. That reduces the information which
+          kernel stack leak bugs can reveal and blocks some uninitialized
+          stack variable attacks.
+          The tradeoff is the performance impact: on a single CPU system kernel
+          compilation sees a 1% slowdown, other systems and workloads may vary
+          and you are advised to test this feature on your expected workload
+          before deploying it.
+          This plugin was ported from grsecurity/PaX. More information at:
+           * https://grsecurity.net/
+           * https://pax.grsecurity.net/
+config STACKLEAK_TRACK_MIN_SIZE
+        int "Minimum stack frame size of functions tracked by STACKLEAK"
+        default 100
+        range 0 4096
+        depends on GCC_PLUGIN_STACKLEAK
+        help
+          The STACKLEAK gcc plugin instruments the kernel code for tracking
+          the lowest border of the kernel stack (and for some other purposes).
+          It inserts the stackleak_track_stack() call for the functions with
+          a stack frame size greater than or equal to this parameter.
+          If unsure, leave the default value 100.
+config STACKLEAK_METRICS
+        bool "Show STACKLEAK metrics in the /proc file system"
+        depends on GCC_PLUGIN_STACKLEAK
+        depends on PROC_FS
+        help
+          If this is set, STACKLEAK metrics for every task are available in
+          the /proc file system. In particular, /proc/<pid>/stack_depth
+          shows the maximum kernel stack consumption for the current and
+          previous syscalls. Although this information is not precise, it
+          can be useful for estimating the STACKLEAK performance impact for
+          your workloads.
+config STACKLEAK_RUNTIME_DISABLE
+        bool "Allow runtime disabling of kernel stack erasing"
+        depends on GCC_PLUGIN_STACKLEAK
+        help
+          This option provides 'stack_erasing' sysctl, which can be used in
+          runtime to control kernel stack erasing for kernels built with
+          CONFIG_GCC_PLUGIN_STACKLEAK.
+endif
diff --git a/scripts/gcc-plugins/Makefile b/scripts/gcc-plugins/Makefile
index e2ff425f4c7e..aa0d0ec6936d 100644
--- a/scripts/gcc-plugins/Makefile
+++ b/scripts/gcc-plugins/Makefile
@@ -1,4 +1,5 @@
 # SPDX-License-Identifier: GPL-2.0
+PLUGINCC := $(CONFIG_PLUGIN_HOSTCC:"%"=%)
 GCC_PLUGINS_DIR := $(shell $(CC) -print-file-name=plugin)
 ifeq ($(PLUGINCC),$(HOSTCC))
@@ -13,12 +14,6 @@ else
  export HOST_EXTRACXXFLAGS
 endif
-ifneq ($(CFLAGS_KCOV), $(SANCOV_PLUGIN))
-  GCC_PLUGIN := $(filter-out $(SANCOV_PLUGIN), $(GCC_PLUGIN))
-endif
-export HOSTLIBS
 $(obj)/randomize_layout_plugin.o: $(objtree)/$(obj)/randomize_layout_seed.h
 quiet_cmd_create_randomize_layout_seed = GENSEED $@
 cmd_create_randomize_layout_seed = \
@@ -32,7 +27,4 @@ always := $($(HOSTLIBS)-y)
 $(foreach p,$($(HOSTLIBS)-y:%.so=%),$(eval $(p)-objs := $(p).o))
-subdir-y := $(GCC_PLUGIN_SUBDIR)
-subdir-  += $(GCC_PLUGIN_SUBDIR)
 clean-files += *.so
diff --git a/scripts/gcc-plugins/gcc-common.h b/scripts/gcc-plugins/gcc-common.h
index f46750053377..552d5efd7cb7 100644
--- a/scripts/gcc-plugins/gcc-common.h
+++ b/scripts/gcc-plugins/gcc-common.h
@@ -392,13 +392,6 @@ static inline struct cgraph_node *cgraph_alias_target(struct cgraph_node *n)
 }
 #endif
-#if BUILDING_GCC_VERSION >= 4007 && BUILDING_GCC_VERSION <= 4009
-#define cgraph_create_edge(caller, callee, call_stmt, count, freq, nest) \
-        cgraph_create_edge((caller), (callee), (call_stmt), (count), (freq))
-#define cgraph_create_edge_including_clones(caller, callee, old_call_stmt, call_stmt, count, freq, nest, reason) \
-        cgraph_create_edge_including_clones((caller), (callee), (old_call_stmt), (call_stmt), (count), (freq), (reason))
-#endif
 #if BUILDING_GCC_VERSION <= 4008
 #define ENTRY_BLOCK_PTR_FOR_FN(FN)      ENTRY_BLOCK_PTR_FOR_FUNCTION(FN)
 #define EXIT_BLOCK_PTR_FOR_FN(FN)       EXIT_BLOCK_PTR_FOR_FUNCTION(FN)
@@ -723,10 +716,23 @@ static inline const char *get_decl_section_name(const_tree decl)
 #define varpool_get_node(decl) varpool_node::get(decl)
 #define dump_varpool_node(file, node) (node)->dump(file)
-#define cgraph_create_edge(caller, callee, call_stmt, count, freq, nest) \
+#if BUILDING_GCC_VERSION >= 8000
+#define cgraph_create_edge(caller, callee, call_stmt, count, freq) \
+        (caller)->create_edge((callee), (call_stmt), (count))
+#define cgraph_create_edge_including_clones(caller, callee,     \
+                old_call_stmt, call_stmt, count, freq, reason)  \
+        (caller)->create_edge_including_clones((callee),        \
+                (old_call_stmt), (call_stmt), (count), (reason))
+#else
+#define cgraph_create_edge(caller, callee, call_stmt, count, freq) \
        (caller)->create_edge((callee), (call_stmt), (count), (freq))
-#define cgraph_create_edge_including_clones(caller, callee, old_call_stmt, call_stmt, count, freq, nest, reason) \
-        (caller)->create_edge_including_clones((callee), (old_call_stmt), (call_stmt), (count), (freq), (reason))
+#define cgraph_create_edge_including_clones(caller, callee,     \
+                old_call_stmt, call_stmt, count, freq, reason)  \
+        (caller)->create_edge_including_clones((callee),        \
+                (old_call_stmt), (call_stmt), (count), (freq), (reason))
+#endif
 typedef struct cgraph_node *cgraph_node_ptr;
 typedef struct cgraph_edge *cgraph_edge_p;
diff --git a/scripts/gcc-plugins/randomize_layout_plugin.c b/scripts/gcc-plugins/randomize_layout_plugin.c
index c4a345c3715b..6d5bbd31db7f 100644
--- a/scripts/gcc-plugins/randomize_layout_plugin.c
+++ b/scripts/gcc-plugins/randomize_layout_plugin.c
@@ -52,8 +52,8 @@ static const struct whitelist_entry whitelist[] = {
        { "net/unix/af_unix.c", "unix_skb_parms", "char" },
        /* big_key payload.data struct splashing */
        { "security/keys/big_key.c", "path", "void *" },
-        /* walk struct security_hook_heads as an array of struct list_head */
+        /* walk struct security_hook_heads as an array of struct hlist_head */
-        { "security/security.c", "list_head", "security_hook_heads" },
+        { "security/security.c", "hlist_head", "security_hook_heads" },
        { }
 };
diff --git a/scripts/gcc-plugins/stackleak_plugin.c b/scripts/gcc-plugins/stackleak_plugin.c
new file mode 100644
index 000000000000..2f48da98b5d4
--- /dev/null
+++ b/scripts/gcc-plugins/stackleak_plugin.c
@@ -0,0 +1,427 @@
+/*
+ * Copyright 2011-2017 by the PaX Team <pageexec@freemail.hu>
+ * Modified by Alexander Popov <alex.popov@linux.com>
+ * Licensed under the GPL v2
+ *
+ * Note: the choice of the license means that the compilation process is
+ * NOT 'eligible' as defined by gcc's library exception to the GPL v3,
+ * but for the kernel it doesn't matter since it doesn't link against
+ * any of the gcc libraries
+ *
+ * This gcc plugin is needed for tracking the lowest border of the kernel stack.
+ * It instruments the kernel code inserting stackleak_track_stack() calls:
+ *  - after alloca();
+ *  - for the functions with a stack frame size greater than or equal
+ *     to the "track-min-size" plugin parameter.
+ *
+ * This plugin is ported from grsecurity/PaX. For more information see:
+ *   https://grsecurity.net/
+ *   https://pax.grsecurity.net/
+ *
+ * Debugging:
+ *  - use fprintf() to stderr, debug_generic_expr(), debug_gimple_stmt(),
+ *     print_rtl() and print_simple_rtl();
+ *  - add "-fdump-tree-all -fdump-rtl-all" to the plugin CFLAGS in
+ *     Makefile.gcc-plugins to see the verbose dumps of the gcc passes;
+ *  - use gcc -E to understand the preprocessing shenanigans;
+ *  - use gcc with enabled CFG/GIMPLE/SSA verification (--enable-checking).
+ */
+#include "gcc-common.h"
+__visible int plugin_is_GPL_compatible;
+static int track_frame_size = -1;
+static const char track_function[] = "stackleak_track_stack";
+/*
+ * Mark these global variables (roots) for gcc garbage collector since
+ * they point to the garbage-collected memory.
+ */
+static GTY(()) tree track_function_decl;
+static struct plugin_info stackleak_plugin_info = {
+        .version = "201707101337",
+        .help = "track-min-size=nn\ttrack stack for functions with a stack frame size >= nn bytes\n"
+                "disable\t\tdo not activate the plugin\n"
+};
+static void stackleak_add_track_stack(gimple_stmt_iterator *gsi, bool after)
+{
+        gimple stmt;
+        gcall *stackleak_track_stack;
+        cgraph_node_ptr node;
+        int frequency;
+        basic_block bb;
+        /* Insert call to void stackleak_track_stack(void) */
+        stmt = gimple_build_call(track_function_decl, 0);
+        stackleak_track_stack = as_a_gcall(stmt);
+        if (after) {
+                gsi_insert_after(gsi, stackleak_track_stack,
+                                                GSI_CONTINUE_LINKING);
+        } else {
+                gsi_insert_before(gsi, stackleak_track_stack, GSI_SAME_STMT);
+        }
+        /* Update the cgraph */
+        bb = gimple_bb(stackleak_track_stack);
+        node = cgraph_get_create_node(track_function_decl);
+        gcc_assert(node);
+        frequency = compute_call_stmt_bb_frequency(current_function_decl, bb);
+        cgraph_create_edge(cgraph_get_node(current_function_decl), node,
+                        stackleak_track_stack, bb->count, frequency);
+}
+static bool is_alloca(gimple stmt)
+{
+        if (gimple_call_builtin_p(stmt, BUILT_IN_ALLOCA))
+                return true;
+#if BUILDING_GCC_VERSION >= 4007
+        if (gimple_call_builtin_p(stmt, BUILT_IN_ALLOCA_WITH_ALIGN))
+                return true;
+#endif
+        return false;
+}
+/*
+ * Work with the GIMPLE representation of the code. Insert the
+ * stackleak_track_stack() call after alloca() and into the beginning
+ * of the function if it is not instrumented.
+ */
+static unsigned int stackleak_instrument_execute(void)
+{
+        basic_block bb, entry_bb;
+        bool prologue_instrumented = false, is_leaf = true;
+        gimple_stmt_iterator gsi;
+        /*
+         * ENTRY_BLOCK_PTR is a basic block which represents possible entry
+         * point of a function. This block does not contain any code and
+         * has a CFG edge to its successor.
+         */
+        gcc_assert(single_succ_p(ENTRY_BLOCK_PTR_FOR_FN(cfun)));
+        entry_bb = single_succ(ENTRY_BLOCK_PTR_FOR_FN(cfun));
+        /*
+         * Loop through the GIMPLE statements in each of cfun basic blocks.
+         * cfun is a global variable which represents the function that is
+         * currently processed.
+         */
+        FOR_EACH_BB_FN(bb, cfun) {
+                for (gsi = gsi_start_bb(bb); !gsi_end_p(gsi); gsi_next(&gsi)) {
+                        gimple stmt;
+                        stmt = gsi_stmt(gsi);
+                        /* Leaf function is a function which makes no calls */
+                        if (is_gimple_call(stmt))
+                                is_leaf = false;
+                        if (!is_alloca(stmt))
+                                continue;
+                        /* Insert stackleak_track_stack() call after alloca() */
+                        stackleak_add_track_stack(&gsi, true);
+                        if (bb == entry_bb)
+                                prologue_instrumented = true;
+                }
+        }
+        if (prologue_instrumented)
+                return 0;
+        /*
+         * Special cases to skip the instrumentation.
+         *
+         * Taking the address of static inline functions materializes them,
+         * but we mustn't instrument some of them as the resulting stack
+         * alignment required by the function call ABI will break other
+         * assumptions regarding the expected (but not otherwise enforced)
+         * register clobbering ABI.
+         *
+         * Case in point: native_save_fl on amd64 when optimized for size
+         * clobbers rdx if it were instrumented here.
+         *
+         * TODO: any more special cases?
+         */
+        if (is_leaf &&
+            !TREE_PUBLIC(current_function_decl) &&
+            DECL_DECLARED_INLINE_P(current_function_decl)) {
+                return 0;
+        }
+        if (is_leaf &&
+            !strncmp(IDENTIFIER_POINTER(DECL_NAME(current_function_decl)),
+                     "_paravirt_", 10)) {
+                return 0;
+        }
+        /* Insert stackleak_track_stack() call at the function beginning */
+        bb = entry_bb;
+        if (!single_pred_p(bb)) {
+                /* gcc_assert(bb_loop_depth(bb) ||
+                                (bb->flags & BB_IRREDUCIBLE_LOOP)); */
+                split_edge(single_succ_edge(ENTRY_BLOCK_PTR_FOR_FN(cfun)));
+                gcc_assert(single_succ_p(ENTRY_BLOCK_PTR_FOR_FN(cfun)));
+                bb = single_succ(ENTRY_BLOCK_PTR_FOR_FN(cfun));
+        }
+        gsi = gsi_after_labels(bb);
+        stackleak_add_track_stack(&gsi, false);
+        return 0;
+}
+static bool large_stack_frame(void)
+{
+#if BUILDING_GCC_VERSION >= 8000
+        return maybe_ge(get_frame_size(), track_frame_size);
+#else
+        return (get_frame_size() >= track_frame_size);
+#endif
+}
+/*
+ * Work with the RTL representation of the code.
+ * Remove the unneeded stackleak_track_stack() calls from the functions
+ * which don't call alloca() and don't have a large enough stack frame size.
+ */
+static unsigned int stackleak_cleanup_execute(void)
+{
+        rtx_insn *insn, *next;
+        if (cfun->calls_alloca)
+                return 0;
+        if (large_stack_frame())
+                return 0;
+        /*
+         * Find stackleak_track_stack() calls. Loop through the chain of insns,
+         * which is an RTL representation of the code for a function.
+         *
+         * The example of a matching insn:
+         *  (call_insn 8 4 10 2 (call (mem (symbol_ref ("stackleak_track_stack")
+         *  [flags 0x41] <function_decl 0x7f7cd3302a80 stackleak_track_stack>)
+         *  [0 stackleak_track_stack S1 A8]) (0)) 675 {*call} (expr_list
+         *  (symbol_ref ("stackleak_track_stack") [flags 0x41] <function_decl
+         *  0x7f7cd3302a80 stackleak_track_stack>) (expr_list (0) (nil))) (nil))
+         */
+        for (insn = get_insns(); insn; insn = next) {
+                rtx body;
+                next = NEXT_INSN(insn);
+                /* Check the expression code of the insn */
+                if (!CALL_P(insn))
+                        continue;
+                /*
+                 * Check the expression code of the insn body, which is an RTL
+                 * Expression (RTX) describing the side effect performed by
+                 * that insn.
+                 */
+                body = PATTERN(insn);
+                if (GET_CODE(body) == PARALLEL)
+                        body = XVECEXP(body, 0, 0);
+                if (GET_CODE(body) != CALL)
+                        continue;
+                /*
+                 * Check the first operand of the call expression. It should
+                 * be a mem RTX describing the needed subroutine with a
+                 * symbol_ref RTX.
+                 */
+                body = XEXP(body, 0);
+                if (GET_CODE(body) != MEM)
+                        continue;
+                body = XEXP(body, 0);
+                if (GET_CODE(body) != SYMBOL_REF)
+                        continue;
+                if (SYMBOL_REF_DECL(body) != track_function_decl)
+                        continue;
+                /* Delete the stackleak_track_stack() call */
+                delete_insn_and_edges(insn);
+#if BUILDING_GCC_VERSION >= 4007 && BUILDING_GCC_VERSION < 8000
+                if (GET_CODE(next) == NOTE &&
+                    NOTE_KIND(next) == NOTE_INSN_CALL_ARG_LOCATION) {
+                        insn = next;
+                        next = NEXT_INSN(insn);
+                        delete_insn_and_edges(insn);
+                }
+#endif
+        }
+        return 0;
+}
+static bool stackleak_gate(void)
+{
+        tree section;
+        section = lookup_attribute("section",
+                                   DECL_ATTRIBUTES(current_function_decl));
+        if (section && TREE_VALUE(section)) {
+                section = TREE_VALUE(TREE_VALUE(section));
+                if (!strncmp(TREE_STRING_POINTER(section), ".init.text", 10))
+                        return false;
+                if (!strncmp(TREE_STRING_POINTER(section), ".devinit.text", 13))
+                        return false;
+                if (!strncmp(TREE_STRING_POINTER(section), ".cpuinit.text", 13))
+                        return false;
+                if (!strncmp(TREE_STRING_POINTER(section), ".meminit.text", 13))
+                        return false;
+        }
+        return track_frame_size >= 0;
+}
+/* Build the function declaration for stackleak_track_stack() */
+static void stackleak_start_unit(void *gcc_data __unused,
+                                 void *user_data __unused)
+{
+        tree fntype;
+        /* void stackleak_track_stack(void) */
+        fntype = build_function_type_list(void_type_node, NULL_TREE);
+        track_function_decl = build_fn_decl(track_function, fntype);
+        DECL_ASSEMBLER_NAME(track_function_decl); /* for LTO */
+        TREE_PUBLIC(track_function_decl) = 1;
+        TREE_USED(track_function_decl) = 1;
+        DECL_EXTERNAL(track_function_decl) = 1;
+        DECL_ARTIFICIAL(track_function_decl) = 1;
+        DECL_PRESERVE_P(track_function_decl) = 1;
+}
+/*
+ * Pass gate function is a predicate function that gets executed before the
+ * corresponding pass. If the return value is 'true' the pass gets executed,
+ * otherwise, it is skipped.
+ */
+static bool stackleak_instrument_gate(void)
+{
+        return stackleak_gate();
+}
+#define PASS_NAME stackleak_instrument
+#define PROPERTIES_REQUIRED PROP_gimple_leh | PROP_cfg
+#define TODO_FLAGS_START TODO_verify_ssa | TODO_verify_flow | TODO_verify_stmts
+#define TODO_FLAGS_FINISH TODO_verify_ssa | TODO_verify_stmts | TODO_dump_func \
+                        | TODO_update_ssa | TODO_rebuild_cgraph_edges
+#include "gcc-generate-gimple-pass.h"
+static bool stackleak_cleanup_gate(void)
+{
+        return stackleak_gate();
+}
+#define PASS_NAME stackleak_cleanup
+#define TODO_FLAGS_FINISH TODO_dump_func
+#include "gcc-generate-rtl-pass.h"
+/*
+ * Every gcc plugin exports a plugin_init() function that is called right
+ * after the plugin is loaded. This function is responsible for registering
+ * the plugin callbacks and doing other required initialization.
+ */
+__visible int plugin_init(struct plugin_name_args *plugin_info,
+                          struct plugin_gcc_version *version)
+{
+        const char * const plugin_name = plugin_info->base_name;
+        const int argc = plugin_info->argc;
+        const struct plugin_argument * const argv = plugin_info->argv;
+        int i = 0;
+        /* Extra GGC root tables describing our GTY-ed data */
+        static const struct ggc_root_tab gt_ggc_r_gt_stackleak[] = {
+                {
+                        .base = &track_function_decl,
+                        .nelt = 1,
+                        .stride = sizeof(track_function_decl),
+                        .cb = &gt_ggc_mx_tree_node,
+                        .pchw = &gt_pch_nx_tree_node
+                },
+                LAST_GGC_ROOT_TAB
+        };
+        /*
+         * The stackleak_instrument pass should be executed before the
+         * "optimized" pass, which is the control flow graph cleanup that is
+         * performed just before expanding gcc trees to the RTL. In former
+         * versions of the plugin this new pass was inserted before the
+         * "tree_profile" pass, which is currently called "profile".
+         */
+        PASS_INFO(stackleak_instrument, "optimized", 1,
+                                                PASS_POS_INSERT_BEFORE);
+        /*
+         * The stackleak_cleanup pass should be executed after the
+         * "reload" pass, when the stack frame size is final.
+         */
+        PASS_INFO(stackleak_cleanup, "reload", 1, PASS_POS_INSERT_AFTER);
+        if (!plugin_default_version_check(version, &gcc_version)) {
+                error(G_("incompatible gcc/plugin versions"));
+                return 1;
+        }
+        /* Parse the plugin arguments */
+        for (i = 0; i < argc; i++) {
+                if (!strcmp(argv[i].key, "disable"))
+                        return 0;
+                if (!strcmp(argv[i].key, "track-min-size")) {
+                        if (!argv[i].value) {
+                                error(G_("no value supplied for option '-fplugin-arg-%s-%s'"),
+                                        plugin_name, argv[i].key);
+                                return 1;
+                        }
+                        track_frame_size = atoi(argv[i].value);
+                        if (track_frame_size < 0) {
+                                error(G_("invalid option argument '-fplugin-arg-%s-%s=%s'"),
+                                        plugin_name, argv[i].key, argv[i].value);
+                                return 1;
+                        }
+                } else {
+                        error(G_("unknown option '-fplugin-arg-%s-%s'"),
+                                        plugin_name, argv[i].key);
+                        return 1;
+                }
+        }
+        /* Give the information about the plugin */
+        register_callback(plugin_name, PLUGIN_INFO, NULL,
+                                                &stackleak_plugin_info);
+        /* Register to be called before processing a translation unit */
+        register_callback(plugin_name, PLUGIN_START_UNIT,
+                                        &stackleak_start_unit, NULL);
+        /* Register an extra GCC garbage collector (GGC) root table */
+        register_callback(plugin_name, PLUGIN_REGISTER_GGC_ROOTS, NULL,
+                                        (void *)&gt_ggc_r_gt_stackleak);
+        /*
+         * Hook into the Pass Manager to register new gcc passes.
+         *
+         * The stack frame size info is available only at the last RTL pass,
+         * when it's too late to insert complex code like a function call.
+         * So we register two gcc passes to instrument every function at first
+         * and remove the unneeded instrumentation later.
+         */
+        register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL,
+                                        &stackleak_instrument_pass_info);
+        register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL,
+                                        &stackleak_cleanup_pass_info);
+        return 0;
+}
diff --git a/scripts/gcc-x86_32-has-stack-protector.sh b/scripts/gcc-x86_32-has-stack-protector.sh
index 6b2aeefb9cd3..f5c119495254 100755
--- a/scripts/gcc-x86_32-has-stack-protector.sh
+++ b/scripts/gcc-x86_32-has-stack-protector.sh
@@ -1,9 +1,4 @@
 #!/bin/sh
 # SPDX-License-Identifier: GPL-2.0
-echo "int foo(void) { char X[200]; return 3; }" | $* -S -x c -c -O0 -fstack-protector - -o - 2> /dev/null | grep -q "%gs"
+echo "int foo(void) { char X[200]; return 3; }" | $* -S -x c -c -m32 -O0 -fstack-protector - -o - 2> /dev/null | grep -q "%gs"
-if [ "$?" -eq "0" ] ; then
-        echo y
-else
-        echo n
-fi
diff --git a/scripts/gcc-x86_64-has-stack-protector.sh b/scripts/gcc-x86_64-has-stack-protector.sh
index 4a48bdcd4d6b..75e4e22b986a 100755
--- a/scripts/gcc-x86_64-has-stack-protector.sh
+++ b/scripts/gcc-x86_64-has-stack-protector.sh
@@ -1,9 +1,4 @@
 #!/bin/sh
 # SPDX-License-Identifier: GPL-2.0
-echo "int foo(void) { char X[200]; return 3; }" | $* -S -x c -c -O0 -mcmodel=kernel -fno-PIE -fstack-protector - -o - 2> /dev/null | grep -q "%gs"
+echo "int foo(void) { char X[200]; return 3; }" | $* -S -x c -c -m64 -O0 -mcmodel=kernel -fno-PIE -fstack-protector - -o - 2> /dev/null | grep -q "%gs"
-if [ "$?" -eq "0" ] ; then
-        echo y
-else
-        echo n
-fi
diff --git a/scripts/gen_initramfs_list.sh b/scripts/gen_initramfs_list.sh
deleted file mode 100755
index 86a3c0e5cfbc..000000000000
--- a/scripts/gen_initramfs_list.sh
+++ /dev/null
@@ -1,328 +0,0 @@
-#!/bin/sh
-# Copyright (C) Martin Schlemmer <azarah@nosferatu.za.org>
-# Copyright (C) 2006 Sam Ravnborg <sam@ravnborg.org>
-#
-# Released under the terms of the GNU GPL
-#
-# Generate a cpio packed initramfs. It uses gen_init_cpio to generate
-# the cpio archive, and then compresses it.
-# The script may also be used to generate the inputfile used for gen_init_cpio
-# This script assumes that gen_init_cpio is located in usr/ directory
-# error out on errors
-set -e
-usage() {
-cat << EOF
-Usage:
-$0 [-o <file>] [-u <uid>] [-g <gid>] {-d | <cpio_source>} ...
-        -o <file>      Create compressed initramfs file named <file> using
-                       gen_init_cpio and compressor depending on the extension
-        -u <uid>       User ID to map to user ID 0 (root).
-                       <uid> is only meaningful if <cpio_source> is a
-                       directory.  "squash" forces all files to uid 0.
-        -g <gid>       Group ID to map to group ID 0 (root).
-                       <gid> is only meaningful if <cpio_source> is a
-                       directory.  "squash" forces all files to gid 0.
-        <cpio_source>  File list or directory for cpio archive.
-                       If <cpio_source> is a .cpio file it will be used
-                       as direct input to initramfs.
-        -d             Output the default cpio list.
-All options except -o and -l may be repeated and are interpreted
-sequentially and immediately.  -u and -g states are preserved across
-<cpio_source> options so an explicit "-u 0 -g 0" is required
-to reset the root/group mapping.
-EOF
-}
-# awk style field access
-# $1 - field number; rest is argument string
-field() {
-        shift $1 ; echo $1
-}
-list_default_initramfs() {
-        # echo usr/kinit/kinit
-        :
-}
-default_initramfs() {
-        cat <<-EOF >> ${output}
-                # This is a very simple, default initramfs
-                dir /dev 0755 0 0
-                nod /dev/console 0600 0 0 c 5 1
-                dir /root 0700 0 0
-                # file /kinit usr/kinit/kinit 0755 0 0
-                # slink /init kinit 0755 0 0
-        EOF
-}
-filetype() {
-        local argv1="$1"
-        # symlink test must come before file test
-        if [ -L "${argv1}" ]; then
-                echo "slink"
-        elif [ -f "${argv1}" ]; then
-                echo "file"
-        elif [ -d "${argv1}" ]; then
-                echo "dir"
-        elif [ -b "${argv1}" -o -c "${argv1}" ]; then
-                echo "nod"
-        elif [ -p "${argv1}" ]; then
-                echo "pipe"
-        elif [ -S "${argv1}" ]; then
-                echo "sock"
-        else
-                echo "invalid"
-        fi
-        return 0
-}
-list_print_mtime() {
-        :
-}
-print_mtime() {
-        local my_mtime="0"
-        if [ -e "$1" ]; then
-                my_mtime=$(find "$1" -printf "%T@\n" | sort -r | head -n 1)
-        fi
-        echo "# Last modified: ${my_mtime}" >> ${output}
-        echo "" >> ${output}
-}
-list_parse() {
-        if [ -L "$1" ]; then
-                return
-        fi
-        echo "$1" | sed 's/:/\\:/g; s/$/ \\/'
-}
-# for each file print a line in following format
-# <filetype> <name> <path to file> <octal mode> <uid> <gid>
-# for links, devices etc the format differs. See gen_init_cpio for details
-parse() {
-        local location="$1"
-        local name="/${location#${srcdir}}"
-        # change '//' into '/'
-        name=$(echo "$name" | sed -e 's://*:/:g')
-        local mode="$2"
-        local uid="$3"
-        local gid="$4"
-        local ftype=$(filetype "${location}")
-        # remap uid/gid to 0 if necessary
-        [ "$root_uid" = "squash" ] && uid=0 || [ "$uid" -eq "$root_uid" ] && uid=0
-        [ "$root_gid" = "squash" ] && gid=0 || [ "$gid" -eq "$root_gid" ] && gid=0
-        local str="${mode} ${uid} ${gid}"
-        [ "${ftype}" = "invalid" ] && return 0
-        [ "${location}" = "${srcdir}" ] && return 0
-        case "${ftype}" in
-                "file")
-                        str="${ftype} ${name} ${location} ${str}"
-                        ;;
-                "nod")
-                        local dev=`LC_ALL=C ls -l "${location}"`
-                        local maj=`field 5 ${dev}`
-                        local min=`field 6 ${dev}`
-                        maj=${maj%,}
-                        [ -b "${location}" ] && dev="b" || dev="c"
-                        str="${ftype} ${name} ${str} ${dev} ${maj} ${min}"
-                        ;;
-                "slink")
-                        local target=`readlink "${location}"`
-                        str="${ftype} ${name} ${target} ${str}"
-                        ;;
-                *)
-                        str="${ftype} ${name} ${str}"
-                        ;;
-        esac
-        echo "${str}" >> ${output}
-        return 0
-}
-unknown_option() {
-        printf "ERROR: unknown option \"$arg\"\n" >&2
-        printf "If the filename validly begins with '-', " >&2
-        printf "then it must be prefixed\n" >&2
-        printf "by './' so that it won't be interpreted as an option." >&2
-        printf "\n" >&2
-        usage >&2
-        exit 1
-}
-list_header() {
-        :
-}
-header() {
-        printf "\n#####################\n# $1\n" >> ${output}
-}
-# process one directory (incl sub-directories)
-dir_filelist() {
-        ${dep_list}header "$1"
-        srcdir=$(echo "$1" | sed -e 's://*:/:g')
-        dirlist=$(find "${srcdir}" -printf "%p %m %U %G\n" | sort)
-        # If $dirlist is only one line, then the directory is empty
-        if [  "$(echo "${dirlist}" | wc -l)" -gt 1 ]; then
-                ${dep_list}print_mtime "$1"
-                echo "${dirlist}" | \
-                while read x; do
-                        ${dep_list}parse ${x}
-                done
-        fi
-}
-# if only one file is specified and it is .cpio file then use it direct as fs
-# if a directory is specified then add all files in given direcotry to fs
-# if a regular file is specified assume it is in gen_initramfs format
-input_file() {
-        source="$1"
-        if [ -f "$1" ]; then
-                ${dep_list}header "$1"
-                is_cpio="$(echo "$1" | sed 's/^.*\.cpio\(\..*\)\?/cpio/')"
-                if [ $2 -eq 0 -a ${is_cpio} = "cpio" ]; then
-                        cpio_file=$1
-                        echo "$1" | grep -q '^.*\.cpio\..*' && is_cpio_compressed="compressed"
-                        [ ! -z ${dep_list} ] && echo "$1"
-                        return 0
-                fi
-                if [ -z ${dep_list} ]; then
-                        print_mtime "$1" >> ${output}
-                        cat "$1"         >> ${output}
-                else
-                        echo "$1 \\"
-                        cat "$1" | while read type dir file perm ; do
-                                if [ "$type" = "file" ]; then
-                                        echo "$file \\";
-                                fi
-                        done
-                fi
-        elif [ -d "$1" ]; then
-                dir_filelist "$1"
-        else
-                echo "  ${prog}: Cannot open '$1'" >&2
-                exit 1
-        fi
-}
-prog=$0
-root_uid=0
-root_gid=0
-dep_list=
-cpio_file=
-cpio_list=
-output="/dev/stdout"
-output_file=""
-is_cpio_compressed=
-compr="gzip -n -9 -f"
-arg="$1"
-case "$arg" in
-        "-l")   # files included in initramfs - used by kbuild
-                dep_list="list_"
-                echo "deps_initramfs := $0 \\"
-                shift
-                ;;
-        "-o")   # generate compressed cpio image named $1
-                shift
-                output_file="$1"
-                cpio_list="$(mktemp ${TMPDIR:-/tmp}/cpiolist.XXXXXX)"
-                output=${cpio_list}
-                echo "$output_file" | grep -q "\.gz$" \
-                && [ -x "`which gzip 2> /dev/null`" ] \
-                && compr="gzip -n -9 -f"
-                echo "$output_file" | grep -q "\.bz2$" \
-                && [ -x "`which bzip2 2> /dev/null`" ] \
-                && compr="bzip2 -9 -f"
-                echo "$output_file" | grep -q "\.lzma$" \
-                && [ -x "`which lzma 2> /dev/null`" ] \
-                && compr="lzma -9 -f"
-                echo "$output_file" | grep -q "\.xz$" \
-                && [ -x "`which xz 2> /dev/null`" ] \
-                && compr="xz --check=crc32 --lzma2=dict=1MiB"
-                echo "$output_file" | grep -q "\.lzo$" \
-                && [ -x "`which lzop 2> /dev/null`" ] \
-                && compr="lzop -9 -f"
-                echo "$output_file" | grep -q "\.lz4$" \
-                && [ -x "`which lz4 2> /dev/null`" ] \
-                && compr="lz4 -l -9 -f"
-                echo "$output_file" | grep -q "\.cpio$" && compr="cat"
-                shift
-                ;;
-esac
-while [ $# -gt 0 ]; do
-        arg="$1"
-        shift
-        case "$arg" in
-                "-u")   # map $1 to uid=0 (root)
-                        root_uid="$1"
-                        [ "$root_uid" = "-1" ] && root_uid=$(id -u || echo 0)
-                        shift
-                        ;;
-                "-g")   # map $1 to gid=0 (root)
-                        root_gid="$1"
-                        [ "$root_gid" = "-1" ] && root_gid=$(id -g || echo 0)
-                        shift
-                        ;;
-                "-d")   # display default initramfs list
-                        default_list="$arg"
-                        ${dep_list}default_initramfs
-                        ;;
-                "-h")
-                        usage
-                        exit 0
-                        ;;
-                *)
-                        case "$arg" in
-                                "-"*)
-                                        unknown_option
-                                        ;;
-                                *)      # input file/dir - process it
-                                        input_file "$arg" "$#"
-                                        ;;
-                        esac
-                        ;;
-        esac
-done
-# If output_file is set we will generate cpio archive and compress it
-# we are careful to delete tmp files
-if [ ! -z ${output_file} ]; then
-        if [ -z ${cpio_file} ]; then
-                timestamp=
-                if test -n "$KBUILD_BUILD_TIMESTAMP"; then
-                        timestamp="$(date -d"$KBUILD_BUILD_TIMESTAMP" +%s || :)"
-                        if test -n "$timestamp"; then
-                                timestamp="-t $timestamp"
-                        fi
-                fi
-                cpio_tfile="$(mktemp ${TMPDIR:-/tmp}/cpiofile.XXXXXX)"
-                usr/gen_init_cpio $timestamp ${cpio_list} > ${cpio_tfile}
-        else
-                cpio_tfile=${cpio_file}
-        fi
-        rm ${cpio_list}
-        if [ "${is_cpio_compressed}" = "compressed" ]; then
-                cat ${cpio_tfile} > ${output_file}
-        else
-                (cat ${cpio_tfile} | ${compr}  - > ${output_file}) \
-                || (rm -f ${output_file} ; false)
-        fi
-        [ -z ${cpio_file} ] && rm ${cpio_tfile}
-fi
-exit 0
diff --git a/scripts/genksyms/.gitignore b/scripts/genksyms/.gitignore
index e7836b47f060..b119c7da2863 100644
--- a/scripts/genksyms/.gitignore
+++ b/scripts/genksyms/.gitignore
@@ -1,4 +1 @@
-*.lex.c
-*.tab.c
-*.tab.h
 genksyms
diff --git a/scripts/genksyms/Makefile b/scripts/genksyms/Makefile
index 34d6ab1811a4..03b7ce97de14 100644
--- a/scripts/genksyms/Makefile
+++ b/scripts/genksyms/Makefile
@@ -5,11 +5,34 @@ always		:= $(hostprogs-y)
 genksyms-objs   := genksyms.o parse.tab.o lex.lex.o
+# FIXME: fix the ambiguous grammar in parse.y and delete this hack
+#
+# Suppress shift/reduce, reduce/reduce conflicts warnings
+# unless W=1 is specified.
+#
+# Just in case, run "$(YACC) --version" without suppressing stderr
+# so that 'bison: not found' will be displayed if it is missing.
+ifeq ($(findstring 1,$(KBUILD_ENABLE_EXTRA_GCC_CHECKS)),)
+quiet_cmd_bison_no_warn = $(quiet_cmd_bison)
+      cmd_bison_no_warn = $(YACC) --version >/dev/null; \
+                          $(cmd_bison) 2>/dev/null
+$(obj)/parse.tab.c: $(src)/parse.y FORCE
+        $(call if_changed,bison_no_warn)
+quiet_cmd_bison_h_no_warn = $(quiet_cmd_bison_h)
+      cmd_bison_h_no_warn = $(YACC) --version >/dev/null; \
+                            $(cmd_bison_h) 2>/dev/null
+$(obj)/parse.tab.h: $(src)/parse.y FORCE
+        $(call if_changed,bison_h_no_warn)
+endif
 # -I needed for generated C source (shipped source)
 HOSTCFLAGS_parse.tab.o := -I$(src)
 HOSTCFLAGS_lex.lex.o := -I$(src)
 # dependencies on generated files need to be listed explicitly
 $(obj)/lex.lex.o: $(obj)/parse.tab.h
-clean-files     := lex.lex.c parse.tab.c parse.tab.h
diff --git a/scripts/genksyms/genksyms.c b/scripts/genksyms/genksyms.c
index c9235d8340f1..e007840f45b9 100644
--- a/scripts/genksyms/genksyms.c
+++ b/scripts/genksyms/genksyms.c
@@ -45,7 +45,6 @@ int in_source_file;
 static int flag_debug, flag_dump_defs, flag_reference, flag_dump_types,
           flag_preserve, flag_warnings, flag_rel_crcs;
-static const char *mod_prefix = "";
 static int errors;
 static int nsyms;
@@ -693,10 +692,10 @@ void export_symbol(const char *name)
                        fputs(">\n", debugfile);
                /* Used as a linker script. */
-                printf(!flag_rel_crcs ? "%s__crc_%s = 0x%08lx;\n" :
+                printf(!flag_rel_crcs ? "__crc_%s = 0x%08lx;\n" :
                       "SECTIONS { .rodata : ALIGN(4) { "
-                       "%s__crc_%s = .; LONG(0x%08lx); } }\n",
+                       "__crc_%s = .; LONG(0x%08lx); } }\n",
-                       mod_prefix, name, crc);
+                       name, crc);
        }
 }
@@ -769,7 +768,6 @@ int main(int argc, char **argv)
 #ifdef __GNU_LIBRARY__
        struct option long_opts[] = {
-                {"symbol-prefix", 1, 0, 's'},
                {"debug", 0, 0, 'd'},
                {"warnings", 0, 0, 'w'},
                {"quiet", 0, 0, 'q'},
@@ -789,9 +787,6 @@ int main(int argc, char **argv)
        while ((o = getopt(argc, argv, "s:dwqVDr:T:phR")) != EOF)
 #endif                          /* __GNU_LIBRARY__ */
                switch (o) {
-                case 's':
-                        mod_prefix = optarg;
-                        break;
                case 'd':
                        flag_debug++;
                        break;
diff --git a/scripts/genksyms/lex.lex.c_shipped b/scripts/genksyms/lex.lex.c_shipped
deleted file mode 100644
index ba2fda8dfdb2..000000000000
--- a/scripts/genksyms/lex.lex.c_shipped
+++ /dev/null
@@ -1,2291 +0,0 @@
-#line 3 "scripts/genksyms/lex.lex.c_shipped"
-#define  YY_INT_ALIGNED short int
-/* A lexical scanner generated by flex */
-#define FLEX_SCANNER
-#define YY_FLEX_MAJOR_VERSION 2
-#define YY_FLEX_MINOR_VERSION 5
-#define YY_FLEX_SUBMINOR_VERSION 35
-#if YY_FLEX_SUBMINOR_VERSION > 0
-#define FLEX_BETA
-#endif
-/* First, we deal with  platform-specific or compiler-specific issues. */
-/* begin standard C headers. */
-#include <stdio.h>
-#include <string.h>
-#include <errno.h>
-#include <stdlib.h>
-/* end standard C headers. */
-/* flex integer type definitions */
-#ifndef FLEXINT_H
-#define FLEXINT_H
-/* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */
-#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
-/* C99 says to define __STDC_LIMIT_MACROS before including stdint.h,
- * if you want the limit (max/min) macros for int types. 
- */
-#ifndef __STDC_LIMIT_MACROS
-#define __STDC_LIMIT_MACROS 1
-#endif
-#include <inttypes.h>
-typedef int8_t flex_int8_t;
-typedef uint8_t flex_uint8_t;
-typedef int16_t flex_int16_t;
-typedef uint16_t flex_uint16_t;
-typedef int32_t flex_int32_t;
-typedef uint32_t flex_uint32_t;
-#else
-typedef signed char flex_int8_t;
-typedef short int flex_int16_t;
-typedef int flex_int32_t;
-typedef unsigned char flex_uint8_t; 
-typedef unsigned short int flex_uint16_t;
-typedef unsigned int flex_uint32_t;
-#endif /* ! C99 */
-/* Limits of integral types. */
-#ifndef INT8_MIN
-#define INT8_MIN               (-128)
-#endif
-#ifndef INT16_MIN
-#define INT16_MIN              (-32767-1)
-#endif
-#ifndef INT32_MIN
-#define INT32_MIN              (-2147483647-1)
-#endif
-#ifndef INT8_MAX
-#define INT8_MAX               (127)
-#endif
-#ifndef INT16_MAX
-#define INT16_MAX              (32767)
-#endif
-#ifndef INT32_MAX
-#define INT32_MAX              (2147483647)
-#endif
-#ifndef UINT8_MAX
-#define UINT8_MAX              (255U)
-#endif
-#ifndef UINT16_MAX
-#define UINT16_MAX             (65535U)
-#endif
-#ifndef UINT32_MAX
-#define UINT32_MAX             (4294967295U)
-#endif
-#endif /* ! FLEXINT_H */
-#ifdef __cplusplus
-/* The "const" storage-class-modifier is valid. */
-#define YY_USE_CONST
-#else   /* ! __cplusplus */
-/* C99 requires __STDC__ to be defined as 1. */
-#if defined (__STDC__)
-#define YY_USE_CONST
-#endif  /* defined (__STDC__) */
-#endif  /* ! __cplusplus */
-#ifdef YY_USE_CONST
-#define yyconst const
-#else
-#define yyconst
-#endif
-/* Returned upon end-of-file. */
-#define YY_NULL 0
-/* Promotes a possibly negative, possibly signed char to an unsigned
- * integer for use as an array index.  If the signed char is negative,
- * we want to instead treat it as an 8-bit unsigned char, hence the
- * double cast.
- */
-#define YY_SC_TO_UI(c) ((unsigned int) (unsigned char) c)
-/* Enter a start condition.  This macro really ought to take a parameter,
- * but we do it the disgusting crufty way forced on us by the ()-less
- * definition of BEGIN.
- */
-#define BEGIN (yy_start) = 1 + 2 *
-/* Translate the current start state into a value that can be later handed
- * to BEGIN to return to the state.  The YYSTATE alias is for lex
- * compatibility.
- */
-#define YY_START (((yy_start) - 1) / 2)
-#define YYSTATE YY_START
-/* Action number for EOF rule of a given start state. */
-#define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1)
-/* Special action meaning "start processing a new file". */
-#define YY_NEW_FILE yyrestart(yyin  )
-#define YY_END_OF_BUFFER_CHAR 0
-/* Size of default input buffer. */
-#ifndef YY_BUF_SIZE
-#define YY_BUF_SIZE 16384
-#endif
-/* The state buf must be large enough to hold one state per character in the main buffer.
- */
-#define YY_STATE_BUF_SIZE   ((YY_BUF_SIZE + 2) * sizeof(yy_state_type))
-#ifndef YY_TYPEDEF_YY_BUFFER_STATE
-#define YY_TYPEDEF_YY_BUFFER_STATE
-typedef struct yy_buffer_state *YY_BUFFER_STATE;
-#endif
-extern int yyleng;
-extern FILE *yyin, *yyout;
-#define EOB_ACT_CONTINUE_SCAN 0
-#define EOB_ACT_END_OF_FILE 1
-#define EOB_ACT_LAST_MATCH 2
-    #define YY_LESS_LINENO(n)
-    
-/* Return all but the first "n" matched characters back to the input stream. */
-#define yyless(n) \
-        do \
-                { \
-                /* Undo effects of setting up yytext. */ \
-        int yyless_macro_arg = (n); \
-        YY_LESS_LINENO(yyless_macro_arg);\
-                *yy_cp = (yy_hold_char); \
-                YY_RESTORE_YY_MORE_OFFSET \
-                (yy_c_buf_p) = yy_cp = yy_bp + yyless_macro_arg - YY_MORE_ADJ; \
-                YY_DO_BEFORE_ACTION; /* set up yytext again */ \
-                } \
-        while ( 0 )
-#define unput(c) yyunput( c, (yytext_ptr)  )
-#ifndef YY_TYPEDEF_YY_SIZE_T
-#define YY_TYPEDEF_YY_SIZE_T
-typedef size_t yy_size_t;
-#endif
-#ifndef YY_STRUCT_YY_BUFFER_STATE
-#define YY_STRUCT_YY_BUFFER_STATE
-struct yy_buffer_state
-        {
-        FILE *yy_input_file;
-        char *yy_ch_buf;                /* input buffer */
-        char *yy_buf_pos;               /* current position in input buffer */
-        /* Size of input buffer in bytes, not including room for EOB
-         * characters.
-         */
-        yy_size_t yy_buf_size;
-        /* Number of characters read into yy_ch_buf, not including EOB
-         * characters.
-         */
-        int yy_n_chars;
-        /* Whether we "own" the buffer - i.e., we know we created it,
-         * and can realloc() it to grow it, and should free() it to
-         * delete it.
-         */
-        int yy_is_our_buffer;
-        /* Whether this is an "interactive" input source; if so, and
-         * if we're using stdio for input, then we want to use getc()
-         * instead of fread(), to make sure we stop fetching input after
-         * each newline.
-         */
-        int yy_is_interactive;
-        /* Whether we're considered to be at the beginning of a line.
-         * If so, '^' rules will be active on the next match, otherwise
-         * not.
-         */
-        int yy_at_bol;
-    int yy_bs_lineno; /**< The line count. */
-    int yy_bs_column; /**< The column count. */
-    
-        /* Whether to try to fill the input buffer when we reach the
-         * end of it.
-         */
-        int yy_fill_buffer;
-        int yy_buffer_status;
-#define YY_BUFFER_NEW 0
-#define YY_BUFFER_NORMAL 1
-        /* When an EOF's been seen but there's still some text to process
-         * then we mark the buffer as YY_EOF_PENDING, to indicate that we
-         * shouldn't try reading from the input source any more.  We might
-         * still have a bunch of tokens to match, though, because of
-         * possible backing-up.
-         *
-         * When we actually see the EOF, we change the status to "new"
-         * (via yyrestart()), so that the user can continue scanning by
-         * just pointing yyin at a new input file.
-         */
-#define YY_BUFFER_EOF_PENDING 2
-        };
-#endif /* !YY_STRUCT_YY_BUFFER_STATE */
-/* Stack of input buffers. */
-static size_t yy_buffer_stack_top = 0; /**< index of top of stack. */
-static size_t yy_buffer_stack_max = 0; /**< capacity of stack. */
-static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */
-/* We provide macros for accessing buffer states in case in the
- * future we want to put the buffer states in a more general
- * "scanner state".
- *
- * Returns the top of the stack, or NULL.
- */
-#define YY_CURRENT_BUFFER ( (yy_buffer_stack) \
-                          ? (yy_buffer_stack)[(yy_buffer_stack_top)] \
-                          : NULL)
-/* Same as previous macro, but useful when we know that the buffer stack is not
- * NULL or when we need an lvalue. For internal use only.
- */
-#define YY_CURRENT_BUFFER_LVALUE (yy_buffer_stack)[(yy_buffer_stack_top)]
-/* yy_hold_char holds the character lost when yytext is formed. */
-static char yy_hold_char;
-static int yy_n_chars;          /* number of characters read into yy_ch_buf */
-int yyleng;
-/* Points to current character in buffer. */
-static char *yy_c_buf_p = (char *) 0;
-static int yy_init = 0;         /* whether we need to initialize */
-static int yy_start = 0;        /* start state number */
-/* Flag which is used to allow yywrap()'s to do buffer switches
- * instead of setting up a fresh yyin.  A bit of a hack ...
- */
-static int yy_did_buffer_switch_on_eof;
-void yyrestart (FILE *input_file  );
-void yy_switch_to_buffer (YY_BUFFER_STATE new_buffer  );
-YY_BUFFER_STATE yy_create_buffer (FILE *file,int size  );
-void yy_delete_buffer (YY_BUFFER_STATE b  );
-void yy_flush_buffer (YY_BUFFER_STATE b  );
-void yypush_buffer_state (YY_BUFFER_STATE new_buffer  );
-void yypop_buffer_state (void );
-static void yyensure_buffer_stack (void );
-static void yy_load_buffer_state (void );
-static void yy_init_buffer (YY_BUFFER_STATE b,FILE *file  );
-#define YY_FLUSH_BUFFER yy_flush_buffer(YY_CURRENT_BUFFER )
-YY_BUFFER_STATE yy_scan_buffer (char *base,yy_size_t size  );
-YY_BUFFER_STATE yy_scan_string (yyconst char *yy_str  );
-YY_BUFFER_STATE yy_scan_bytes (yyconst char *bytes,int len  );
-void *yyalloc (yy_size_t  );
-void *yyrealloc (void *,yy_size_t  );
-void yyfree (void *  );
-#define yy_new_buffer yy_create_buffer
-#define yy_set_interactive(is_interactive) \
-        { \
-        if ( ! YY_CURRENT_BUFFER ){ \
-        yyensure_buffer_stack (); \
-                YY_CURRENT_BUFFER_LVALUE =    \
-            yy_create_buffer(yyin,YY_BUF_SIZE ); \
-        } \
-        YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \
-        }
-#define yy_set_bol(at_bol) \
-        { \
-        if ( ! YY_CURRENT_BUFFER ){\
-        yyensure_buffer_stack (); \
-                YY_CURRENT_BUFFER_LVALUE =    \
-            yy_create_buffer(yyin,YY_BUF_SIZE ); \
-        } \
-        YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \
-        }
-#define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol)
-/* Begin user sect3 */
-#define yywrap(n) 1
-#define YY_SKIP_YYWRAP
-typedef unsigned char YY_CHAR;
-FILE *yyin = (FILE *) 0, *yyout = (FILE *) 0;
-typedef int yy_state_type;
-extern int yylineno;
-int yylineno = 1;
-extern char *yytext;
-#define yytext_ptr yytext
-static yy_state_type yy_get_previous_state (void );
-static yy_state_type yy_try_NUL_trans (yy_state_type current_state  );
-static int yy_get_next_buffer (void );
-static void yy_fatal_error (yyconst char msg[]  );
-/* Done after the current pattern has been matched and before the
- * corresponding action - sets up yytext.
- */
-#define YY_DO_BEFORE_ACTION \
-        (yytext_ptr) = yy_bp; \
-        yyleng = (size_t) (yy_cp - yy_bp); \
-        (yy_hold_char) = *yy_cp; \
-        *yy_cp = '\0'; \
-        (yy_c_buf_p) = yy_cp;
-#define YY_NUM_RULES 13
-#define YY_END_OF_BUFFER 14
-/* This struct is not used in this scanner,
-   but its presence is necessary. */
-struct yy_trans_info
-        {
-        flex_int32_t yy_verify;
-        flex_int32_t yy_nxt;
-        };
-static yyconst flex_int16_t yy_accept[73] =
-    {   0,
-        0,    0,   14,   12,    4,    3,   12,    7,   12,   12,
-       12,   12,   12,    9,    9,   12,   12,    7,   12,   12,
-        4,    0,    5,    0,    7,    8,    0,    6,    0,    0,
-       10,   10,    9,    0,    0,    9,    9,    0,    9,    0,
-        0,    0,    0,    2,    0,    0,   11,    0,   10,    0,
-       10,    9,    9,    0,    0,    0,   10,   10,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        1,    0
-    } ;
-static yyconst flex_int32_t yy_ec[256] =
-    {   0,
-        1,    1,    1,    1,    1,    1,    1,    1,    2,    3,
-        4,    4,    4,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    2,    1,    5,    6,    7,    8,    9,   10,    1,
-        1,    8,   11,    1,   12,   13,    8,   14,   15,   15,
-       15,   15,   15,   15,   15,   16,   16,    1,    1,   17,
-       18,   19,    1,    1,   20,   20,   20,   20,   21,   22,
-        7,    7,    7,    7,    7,   23,    7,    7,    7,    7,
-        7,    7,    7,    7,   24,    7,    7,   25,    7,    7,
-        1,   26,    1,    8,    7,    1,   20,   20,   20,   20,
-       21,   22,    7,    7,    7,    7,    7,   27,    7,    7,
-        7,    7,    7,    7,    7,    7,   24,    7,    7,   25,
-        7,    7,    1,   28,    1,    8,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1
-    } ;
-static yyconst flex_int32_t yy_meta[29] =
-    {   0,
-        1,    1,    2,    1,    1,    1,    3,    1,    1,    1,
-        4,    4,    5,    6,    6,    6,    1,    1,    1,    7,
-        8,    7,    3,    3,    3,    1,    3,    1
-    } ;
-static yyconst flex_int16_t yy_base[85] =
-    {   0,
-        0,  145,  150,  266,   27,  266,   25,    0,  131,   23,
-       23,   16,   23,   39,   31,   25,   39,   60,   22,   65,
-       57,   43,  266,    0,    0,  266,   61,  266,    0,  128,
-       74,    0,  113,   59,   62,  113,   52,    0,    0,   72,
-       66,  110,  100,  266,   73,   74,  266,   70,  266,   90,
-      103,  266,   84,  129,  108,  113,  143,  266,  107,   66,
-      118,  137,  168,  120,   80,   91,  145,  143,   83,   41,
-      266,  266,  190,  196,  204,  212,  220,  228,  232,  237,
-      238,  243,  249,  257
-    } ;
-static yyconst flex_int16_t yy_def[85] =
-    {   0,
-       72,    1,   72,   72,   72,   72,   73,   74,   72,   72,
-       75,   72,   72,   72,   14,   72,   72,   74,   72,   76,
-       72,   73,   72,   77,   74,   72,   75,   72,   78,   72,
-       72,   31,   14,   79,   80,   72,   72,   81,   15,   73,
-       75,   76,   76,   72,   73,   75,   72,   82,   72,   72,
-       72,   72,   81,   76,   54,   72,   72,   72,   76,   54,
-       76,   76,   76,   54,   83,   76,   63,   83,   84,   84,
-       72,    0,   72,   72,   72,   72,   72,   72,   72,   72,
-       72,   72,   72,   72
-    } ;
-static yyconst flex_int16_t yy_nxt[295] =
-    {   0,
-        4,    5,    6,    5,    7,    4,    8,    9,   10,   11,
-        9,   12,   13,   14,   15,   15,   16,    9,   17,    8,
-        8,    8,   18,    8,    8,    4,    8,   19,   21,   23,
-       21,   26,   28,   26,   26,   30,   31,   31,   31,   26,
-       26,   26,   26,   71,   39,   39,   39,   23,   29,   26,
-       24,   32,   33,   33,   34,   72,   26,   26,   21,   35,
-       21,   36,   37,   38,   40,   36,   43,   44,   24,   41,
-       28,   32,   50,   50,   52,   28,   23,   23,   52,   35,
-       56,   56,   44,   28,   42,   71,   29,   31,   31,   31,
-       42,   29,   59,   44,   48,   49,   49,   24,   24,   29,
-       49,   43,   44,   51,   51,   51,   36,   37,   59,   44,
-       36,   65,   44,   54,   55,   55,   51,   51,   51,   59,
-       44,   64,   64,   64,   58,   58,   57,   57,   57,   58,
-       59,   44,   42,   64,   64,   64,   52,   72,   59,   44,
-       47,   66,   60,   60,   42,   44,   59,   69,   26,   72,
-       20,   61,   62,   63,   72,   61,   57,   57,   57,   66,
-       72,   72,   72,   66,   49,   49,   72,   61,   62,   49,
-       44,   61,   72,   72,   72,   72,   72,   72,   72,   72,
-       72,   67,   67,   67,   72,   72,   72,   67,   67,   67,
-       22,   22,   22,   22,   22,   22,   22,   22,   25,   72,
-       72,   25,   25,   25,   27,   27,   27,   27,   27,   27,
-       27,   27,   42,   42,   42,   42,   42,   42,   42,   42,
-       45,   72,   45,   45,   45,   45,   45,   45,   46,   72,
-       46,   46,   46,   46,   46,   46,   34,   34,   72,   34,
-       51,   72,   51,   53,   53,   53,   57,   72,   57,   68,
-       68,   68,   68,   68,   68,   68,   68,   70,   70,   70,
-       70,   70,   70,   70,   70,    3,   72,   72,   72,   72,
-       72,   72,   72,   72,   72,   72,   72,   72,   72,   72,
-       72,   72,   72,   72,   72,   72,   72,   72,   72,   72,
-       72,   72,   72,   72
-    } ;
-static yyconst flex_int16_t yy_chk[295] =
-    {   0,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    1,    1,    1,    5,    7,
-        5,   10,   11,   12,   12,   13,   13,   13,   13,   19,
-       10,   16,   16,   70,   15,   15,   15,   22,   11,   19,
-        7,   14,   14,   14,   14,   15,   17,   17,   21,   14,
-       21,   14,   14,   14,   18,   14,   20,   20,   22,   18,
-       27,   34,   35,   35,   37,   41,   40,   45,   37,   34,
-       48,   48,   65,   46,   65,   69,   27,   31,   31,   31,
-       60,   41,   66,   66,   31,   31,   31,   40,   45,   46,
-       31,   43,   43,   50,   50,   50,   53,   53,   59,   59,
-       53,   59,   42,   43,   43,   43,   51,   51,   51,   61,
-       61,   55,   55,   55,   51,   51,   56,   56,   56,   51,
-       54,   54,   55,   64,   64,   64,   36,   33,   62,   62,
-       30,   61,   54,   54,   64,   68,   67,   68,    9,    3,
-        2,   54,   54,   54,    0,   54,   57,   57,   57,   62,
-        0,    0,    0,   62,   57,   57,    0,   67,   67,   57,
-       63,   67,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,   63,   63,   63,    0,    0,    0,   63,   63,   63,
-       73,   73,   73,   73,   73,   73,   73,   73,   74,    0,
-        0,   74,   74,   74,   75,   75,   75,   75,   75,   75,
-       75,   75,   76,   76,   76,   76,   76,   76,   76,   76,
-       77,    0,   77,   77,   77,   77,   77,   77,   78,    0,
-       78,   78,   78,   78,   78,   78,   79,   79,    0,   79,
-       80,    0,   80,   81,   81,   81,   82,    0,   82,   83,
-       83,   83,   83,   83,   83,   83,   83,   84,   84,   84,
-       84,   84,   84,   84,   84,   72,   72,   72,   72,   72,
-       72,   72,   72,   72,   72,   72,   72,   72,   72,   72,
-       72,   72,   72,   72,   72,   72,   72,   72,   72,   72,
-       72,   72,   72,   72
-    } ;
-static yy_state_type yy_last_accepting_state;
-static char *yy_last_accepting_cpos;
-extern int yy_flex_debug;
-int yy_flex_debug = 0;
-/* The intent behind this definition is that it'll catch
- * any uses of REJECT which flex missed.
- */
-#define REJECT reject_used_but_not_detected
-#define yymore() yymore_used_but_not_detected
-#define YY_MORE_ADJ 0
-#define YY_RESTORE_YY_MORE_OFFSET
-char *yytext;
-/* Lexical analysis for genksyms.
-   Copyright 1996, 1997 Linux International.
-   New implementation contributed by Richard Henderson <rth@tamu.edu>
-   Based on original work by Bjorn Ekwall <bj0rn@blox.se>
-   Taken from Linux modutils 2.4.22.
-   This program is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2 of the License, or (at your
-   option) any later version.
-   This program is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-#include <limits.h>
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-#include "genksyms.h"
-#include "parse.tab.h"
-/* We've got a two-level lexer here.  We let flex do basic tokenization
-   and then we categorize those basic tokens in the second stage.  */
-#define YY_DECL         static int yylex1(void)
-/* We don't do multiple input files.  */
-#define YY_NO_INPUT 1
-#define INITIAL 0
-#ifndef YY_NO_UNISTD_H
-/* Special case for "unistd.h", since it is non-ANSI. We include it way
- * down here because we want the user's section 1 to have been scanned first.
- * The user has a chance to override it with an option.
- */
-#include <unistd.h>
-#endif
-#ifndef YY_EXTRA_TYPE
-#define YY_EXTRA_TYPE void *
-#endif
-static int yy_init_globals (void );
-/* Accessor methods to globals.
-   These are made visible to non-reentrant scanners for convenience. */
-int yylex_destroy (void );
-int yyget_debug (void );
-void yyset_debug (int debug_flag  );
-YY_EXTRA_TYPE yyget_extra (void );
-void yyset_extra (YY_EXTRA_TYPE user_defined  );
-FILE *yyget_in (void );
-void yyset_in  (FILE * in_str  );
-FILE *yyget_out (void );
-void yyset_out  (FILE * out_str  );
-int yyget_leng (void );
-char *yyget_text (void );
-int yyget_lineno (void );
-void yyset_lineno (int line_number  );
-/* Macros after this point can all be overridden by user definitions in
- * section 1.
- */
-#ifndef YY_SKIP_YYWRAP
-#ifdef __cplusplus
-extern "C" int yywrap (void );
-#else
-extern int yywrap (void );
-#endif
-#endif
-    static void yyunput (int c,char *buf_ptr  );
-    
-#ifndef yytext_ptr
-static void yy_flex_strncpy (char *,yyconst char *,int );
-#endif
-#ifdef YY_NEED_STRLEN
-static int yy_flex_strlen (yyconst char * );
-#endif
-#ifndef YY_NO_INPUT
-#ifdef __cplusplus
-static int yyinput (void );
-#else
-static int input (void );
-#endif
-#endif
-/* Amount of stuff to slurp up with each read. */
-#ifndef YY_READ_BUF_SIZE
-#define YY_READ_BUF_SIZE 8192
-#endif
-/* Copy whatever the last rule matched to the standard output. */
-#ifndef ECHO
-/* This used to be an fputs(), but since the string might contain NUL's,
- * we now use fwrite().
- */
-#define ECHO fwrite( yytext, yyleng, 1, yyout )
-#endif
-/* Gets input and stuffs it into "buf".  number of characters read, or YY_NULL,
- * is returned in "result".
- */
-#ifndef YY_INPUT
-#define YY_INPUT(buf,result,max_size) \
-        if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
-                { \
-                int c = '*'; \
-                int n; \
-                for ( n = 0; n < max_size && \
-                             (c = getc( yyin )) != EOF && c != '\n'; ++n ) \
-                        buf[n] = (char) c; \
-                if ( c == '\n' ) \
-                        buf[n++] = (char) c; \
-                if ( c == EOF && ferror( yyin ) ) \
-                        YY_FATAL_ERROR( "input in flex scanner failed" ); \
-                result = n; \
-                } \
-        else \
-                { \
-                errno=0; \
-                while ( (result = fread(buf, 1, max_size, yyin))==0 && ferror(yyin)) \
-                        { \
-                        if( errno != EINTR) \
-                                { \
-                                YY_FATAL_ERROR( "input in flex scanner failed" ); \
-                                break; \
-                                } \
-                        errno=0; \
-                        clearerr(yyin); \
-                        } \
-                }\
-\
-#endif
-/* No semi-colon after return; correct usage is to write "yyterminate();" -
- * we don't want an extra ';' after the "return" because that will cause
- * some compilers to complain about unreachable statements.
- */
-#ifndef yyterminate
-#define yyterminate() return YY_NULL
-#endif
-/* Number of entries by which start-condition stack grows. */
-#ifndef YY_START_STACK_INCR
-#define YY_START_STACK_INCR 25
-#endif
-/* Report a fatal error. */
-#ifndef YY_FATAL_ERROR
-#define YY_FATAL_ERROR(msg) yy_fatal_error( msg )
-#endif
-/* end tables serialization structures and prototypes */
-/* Default declaration of generated scanner - a define so the user can
- * easily add parameters.
- */
-#ifndef YY_DECL
-#define YY_DECL_IS_OURS 1
-extern int yylex (void);
-#define YY_DECL int yylex (void)
-#endif /* !YY_DECL */
-/* Code executed at the beginning of each rule, after yytext and yyleng
- * have been set up.
- */
-#ifndef YY_USER_ACTION
-#define YY_USER_ACTION
-#endif
-/* Code executed at the end of each rule. */
-#ifndef YY_BREAK
-#define YY_BREAK break;
-#endif
-#define YY_RULE_SETUP \
-        if ( yyleng > 0 ) \
-                YY_CURRENT_BUFFER_LVALUE->yy_at_bol = \
-                                (yytext[yyleng - 1] == '\n'); \
-        YY_USER_ACTION
-/** The main scanner function which does all the work.
- */
-YY_DECL
-{
-        register yy_state_type yy_current_state;
-        register char *yy_cp, *yy_bp;
-        register int yy_act;
-    
- /* Keep track of our location in the original source files.  */
-        if ( !(yy_init) )
-                {
-                (yy_init) = 1;
-#ifdef YY_USER_INIT
-                YY_USER_INIT;
-#endif
-                if ( ! (yy_start) )
-                        (yy_start) = 1; /* first start state */
-                if ( ! yyin )
-                        yyin = stdin;
-                if ( ! yyout )
-                        yyout = stdout;
-                if ( ! YY_CURRENT_BUFFER ) {
-                        yyensure_buffer_stack ();
-                        YY_CURRENT_BUFFER_LVALUE =
-                                yy_create_buffer(yyin,YY_BUF_SIZE );
-                }
-                yy_load_buffer_state( );
-                }
-        while ( 1 )             /* loops until end-of-file is reached */
-                {
-                yy_cp = (yy_c_buf_p);
-                /* Support of yytext. */
-                *yy_cp = (yy_hold_char);
-                /* yy_bp points to the position in yy_ch_buf of the start of
-                 * the current run.
-                 */
-                yy_bp = yy_cp;
-                yy_current_state = (yy_start);
-                yy_current_state += YY_AT_BOL();
-yy_match:
-                do
-                        {
-                        register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];
-                        if ( yy_accept[yy_current_state] )
-                                {
-                                (yy_last_accepting_state) = yy_current_state;
-                                (yy_last_accepting_cpos) = yy_cp;
-                                }
-                        while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
-                                {
-                                yy_current_state = (int) yy_def[yy_current_state];
-                                if ( yy_current_state >= 73 )
-                                        yy_c = yy_meta[(unsigned int) yy_c];
-                                }
-                        yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
-                        ++yy_cp;
-                        }
-                while ( yy_base[yy_current_state] != 266 );
-yy_find_action:
-                yy_act = yy_accept[yy_current_state];
-                if ( yy_act == 0 )
-                        { /* have to back up */
-                        yy_cp = (yy_last_accepting_cpos);
-                        yy_current_state = (yy_last_accepting_state);
-                        yy_act = yy_accept[yy_current_state];
-                        }
-                YY_DO_BEFORE_ACTION;
-do_action:      /* This label is used only to access EOF actions. */
-                switch ( yy_act )
-        { /* beginning of action switch */
-                        case 0: /* must back up */
-                        /* undo the effects of YY_DO_BEFORE_ACTION */
-                        *yy_cp = (yy_hold_char);
-                        yy_cp = (yy_last_accepting_cpos);
-                        yy_current_state = (yy_last_accepting_state);
-                        goto yy_find_action;
-case 1:
-/* rule 1 can match eol */
-YY_RULE_SETUP
-return FILENAME;
-        YY_BREAK
-case 2:
-/* rule 2 can match eol */
-YY_RULE_SETUP
-cur_line++;
-        YY_BREAK
-case 3:
-/* rule 3 can match eol */
-YY_RULE_SETUP
-cur_line++;
-        YY_BREAK
-/* Ignore all other whitespace.  */
-case 4:
-YY_RULE_SETUP
-;
-        YY_BREAK
-case 5:
-/* rule 5 can match eol */
-YY_RULE_SETUP
-return STRING;
-        YY_BREAK
-case 6:
-/* rule 6 can match eol */
-YY_RULE_SETUP
-return CHAR;
-        YY_BREAK
-case 7:
-YY_RULE_SETUP
-return IDENT;
-        YY_BREAK
-/* The Pedant requires that the other C multi-character tokens be
-    recognized as tokens.  We don't actually use them since we don't
-    parse expressions, but we do want whitespace to be arranged
-    around them properly.  */
-case 8:
-YY_RULE_SETUP
-return OTHER;
-        YY_BREAK
-case 9:
-YY_RULE_SETUP
-return INT;
-        YY_BREAK
-case 10:
-YY_RULE_SETUP
-return REAL;
-        YY_BREAK
-case 11:
-YY_RULE_SETUP
-return DOTS;
-        YY_BREAK
-/* All other tokens are single characters.  */
-case 12:
-YY_RULE_SETUP
-return yytext[0];
-        YY_BREAK
-case 13:
-YY_RULE_SETUP
-ECHO;
-        YY_BREAK
-case YY_STATE_EOF(INITIAL):
-        yyterminate();
-        case YY_END_OF_BUFFER:
-                {
-                /* Amount of text matched not including the EOB char. */
-                int yy_amount_of_matched_text = (int) (yy_cp - (yytext_ptr)) - 1;
-                /* Undo the effects of YY_DO_BEFORE_ACTION. */
-                *yy_cp = (yy_hold_char);
-                YY_RESTORE_YY_MORE_OFFSET
-                if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_NEW )
-                        {
-                        /* We're scanning a new file or input source.  It's
-                         * possible that this happened because the user
-                         * just pointed yyin at a new source and called
-                         * yylex().  If so, then we have to assure
-                         * consistency between YY_CURRENT_BUFFER and our
-                         * globals.  Here is the right place to do so, because
-                         * this is the first action (other than possibly a
-                         * back-up) that will match for the new input source.
-                         */
-                        (yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
-                        YY_CURRENT_BUFFER_LVALUE->yy_input_file = yyin;
-                        YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = YY_BUFFER_NORMAL;
-                        }
-                /* Note that here we test for yy_c_buf_p "<=" to the position
-                 * of the first EOB in the buffer, since yy_c_buf_p will
-                 * already have been incremented past the NUL character
-                 * (since all states make transitions on EOB to the
-                 * end-of-buffer state).  Contrast this with the test
-                 * in input().
-                 */
-                if ( (yy_c_buf_p) <= &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] )
-                        { /* This was really a NUL. */
-                        yy_state_type yy_next_state;
-                        (yy_c_buf_p) = (yytext_ptr) + yy_amount_of_matched_text;
-                        yy_current_state = yy_get_previous_state(  );
-                        /* Okay, we're now positioned to make the NUL
-                         * transition.  We couldn't have
-                         * yy_get_previous_state() go ahead and do it
-                         * for us because it doesn't know how to deal
-                         * with the possibility of jamming (and we don't
-                         * want to build jamming into it because then it
-                         * will run more slowly).
-                         */
-                        yy_next_state = yy_try_NUL_trans( yy_current_state );
-                        yy_bp = (yytext_ptr) + YY_MORE_ADJ;
-                        if ( yy_next_state )
-                                {
-                                /* Consume the NUL. */
-                                yy_cp = ++(yy_c_buf_p);
-                                yy_current_state = yy_next_state;
-                                goto yy_match;
-                                }
-                        else
-                                {
-                                yy_cp = (yy_c_buf_p);
-                                goto yy_find_action;
-                                }
-                        }
-                else switch ( yy_get_next_buffer(  ) )
-                        {
-                        case EOB_ACT_END_OF_FILE:
-                                {
-                                (yy_did_buffer_switch_on_eof) = 0;
-                                if ( yywrap( ) )
-                                        {
-                                        /* Note: because we've taken care in
-                                         * yy_get_next_buffer() to have set up
-                                         * yytext, we can now set up
-                                         * yy_c_buf_p so that if some total
-                                         * hoser (like flex itself) wants to
-                                         * call the scanner after we return the
-                                         * YY_NULL, it'll still work - another
-                                         * YY_NULL will get returned.
-                                         */
-                                        (yy_c_buf_p) = (yytext_ptr) + YY_MORE_ADJ;
-                                        yy_act = YY_STATE_EOF(YY_START);
-                                        goto do_action;
-                                        }
-                                else
-                                        {
-                                        if ( ! (yy_did_buffer_switch_on_eof) )
-                                                YY_NEW_FILE;
-                                        }
-                                break;
-                                }
-                        case EOB_ACT_CONTINUE_SCAN:
-                                (yy_c_buf_p) =
-                                        (yytext_ptr) + yy_amount_of_matched_text;
-                                yy_current_state = yy_get_previous_state(  );
-                                yy_cp = (yy_c_buf_p);
-                                yy_bp = (yytext_ptr) + YY_MORE_ADJ;
-                                goto yy_match;
-                        case EOB_ACT_LAST_MATCH:
-                                (yy_c_buf_p) =
-                                &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)];
-                                yy_current_state = yy_get_previous_state(  );
-                                yy_cp = (yy_c_buf_p);
-                                yy_bp = (yytext_ptr) + YY_MORE_ADJ;
-                                goto yy_find_action;
-                        }
-                break;
-                }
-        default:
-                YY_FATAL_ERROR(
-                        "fatal flex scanner internal error--no action found" );
-        } /* end of action switch */
-                } /* end of scanning one token */
-} /* end of yylex */
-/* yy_get_next_buffer - try to read in a new buffer
- *
- * Returns a code representing an action:
- *      EOB_ACT_LAST_MATCH -
- *      EOB_ACT_CONTINUE_SCAN - continue scanning from current position
- *      EOB_ACT_END_OF_FILE - end of file
- */
-static int yy_get_next_buffer (void)
-{
-        register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
-        register char *source = (yytext_ptr);
-        register int number_to_move, i;
-        int ret_val;
-        if ( (yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] )
-                YY_FATAL_ERROR(
-                "fatal flex scanner internal error--end of buffer missed" );
-        if ( YY_CURRENT_BUFFER_LVALUE->yy_fill_buffer == 0 )
-                { /* Don't try to fill the buffer, so this is an EOF. */
-                if ( (yy_c_buf_p) - (yytext_ptr) - YY_MORE_ADJ == 1 )
-                        {
-                        /* We matched a single character, the EOB, so
-                         * treat this as a final EOF.
-                         */
-                        return EOB_ACT_END_OF_FILE;
-                        }
-                else
-                        {
-                        /* We matched some text prior to the EOB, first
-                         * process it.
-                         */
-                        return EOB_ACT_LAST_MATCH;
-                        }
-                }
-        /* Try to read more data. */
-        /* First move last chars to start of buffer. */
-        number_to_move = (int) ((yy_c_buf_p) - (yytext_ptr)) - 1;
-        for ( i = 0; i < number_to_move; ++i )
-                *(dest++) = *(source++);
-        if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_EOF_PENDING )
-                /* don't do the read, it's not guaranteed to return an EOF,
-                 * just force an EOF
-                 */
-                YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars) = 0;
-        else
-                {
-                        int num_to_read =
-                        YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
-                while ( num_to_read <= 0 )
-                        { /* Not enough room in the buffer - grow it. */
-                        /* just a shorter name for the current buffer */
-                        YY_BUFFER_STATE b = YY_CURRENT_BUFFER;
-                        int yy_c_buf_p_offset =
-                                (int) ((yy_c_buf_p) - b->yy_ch_buf);
-                        if ( b->yy_is_our_buffer )
-                                {
-                                int new_size = b->yy_buf_size * 2;
-                                if ( new_size <= 0 )
-                                        b->yy_buf_size += b->yy_buf_size / 8;
-                                else
-                                        b->yy_buf_size *= 2;
-                                b->yy_ch_buf = (char *)
-                                        /* Include room in for 2 EOB chars. */
-                                        yyrealloc((void *) b->yy_ch_buf,b->yy_buf_size + 2  );
-                                }
-                        else
-                                /* Can't grow it, we don't own it. */
-                                b->yy_ch_buf = 0;
-                        if ( ! b->yy_ch_buf )
-                                YY_FATAL_ERROR(
-                                "fatal error - scanner input buffer overflow" );
-                        (yy_c_buf_p) = &b->yy_ch_buf[yy_c_buf_p_offset];
-                        num_to_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size -
-                                                number_to_move - 1;
-                        }
-                if ( num_to_read > YY_READ_BUF_SIZE )
-                        num_to_read = YY_READ_BUF_SIZE;
-                /* Read in more data. */
-                YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]),
-                        (yy_n_chars), (size_t) num_to_read );
-                YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
-                }
-        if ( (yy_n_chars) == 0 )
-                {
-                if ( number_to_move == YY_MORE_ADJ )
-                        {
-                        ret_val = EOB_ACT_END_OF_FILE;
-                        yyrestart(yyin  );
-                        }
-                else
-                        {
-                        ret_val = EOB_ACT_LAST_MATCH;
-                        YY_CURRENT_BUFFER_LVALUE->yy_buffer_status =
-                                YY_BUFFER_EOF_PENDING;
-                        }
-                }
-        else
-                ret_val = EOB_ACT_CONTINUE_SCAN;
-        if ((yy_size_t) ((yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) {
-                /* Extend the array by 50%, plus the number we really need. */
-                yy_size_t new_size = (yy_n_chars) + number_to_move + ((yy_n_chars) >> 1);
-                YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) yyrealloc((void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,new_size  );
-                if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
-                        YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" );
-        }
-        (yy_n_chars) += number_to_move;
-        YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] = YY_END_OF_BUFFER_CHAR;
-        YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] = YY_END_OF_BUFFER_CHAR;
-        (yytext_ptr) = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[0];
-        return ret_val;
-}
-/* yy_get_previous_state - get the state just before the EOB char was reached */
-    static yy_state_type yy_get_previous_state (void)
-{
-        register yy_state_type yy_current_state;
-        register char *yy_cp;
-    
-        yy_current_state = (yy_start);
-        yy_current_state += YY_AT_BOL();
-        for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp )
-                {
-                register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
-                if ( yy_accept[yy_current_state] )
-                        {
-                        (yy_last_accepting_state) = yy_current_state;
-                        (yy_last_accepting_cpos) = yy_cp;
-                        }
-                while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
-                        {
-                        yy_current_state = (int) yy_def[yy_current_state];
-                        if ( yy_current_state >= 73 )
-                                yy_c = yy_meta[(unsigned int) yy_c];
-                        }
-                yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
-                }
-        return yy_current_state;
-}
-/* yy_try_NUL_trans - try to make a transition on the NUL character
- *
- * synopsis
- *      next_state = yy_try_NUL_trans( current_state );
- */
-    static yy_state_type yy_try_NUL_trans  (yy_state_type yy_current_state )
-{
-        register int yy_is_jam;
-        register char *yy_cp = (yy_c_buf_p);
-        register YY_CHAR yy_c = 1;
-        if ( yy_accept[yy_current_state] )
-                {
-                (yy_last_accepting_state) = yy_current_state;
-                (yy_last_accepting_cpos) = yy_cp;
-                }
-        while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
-                {
-                yy_current_state = (int) yy_def[yy_current_state];
-                if ( yy_current_state >= 73 )
-                        yy_c = yy_meta[(unsigned int) yy_c];
-                }
-        yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
-        yy_is_jam = (yy_current_state == 72);
-        return yy_is_jam ? 0 : yy_current_state;
-}
-    static void yyunput (int c, register char * yy_bp )
-{
-        register char *yy_cp;
-    
-    yy_cp = (yy_c_buf_p);
-        /* undo effects of setting up yytext */
-        *yy_cp = (yy_hold_char);
-        if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 )
-                { /* need to shift things up to make room */
-                /* +2 for EOB chars. */
-                register int number_to_move = (yy_n_chars) + 2;
-                register char *dest = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[
-                                        YY_CURRENT_BUFFER_LVALUE->yy_buf_size + 2];
-                register char *source =
-                                &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move];
-                while ( source > YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
-                        *--dest = *--source;
-                yy_cp += (int) (dest - source);
-                yy_bp += (int) (dest - source);
-                YY_CURRENT_BUFFER_LVALUE->yy_n_chars =
-                        (yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_buf_size;
-                if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 )
-                        YY_FATAL_ERROR( "flex scanner push-back overflow" );
-                }
-        *--yy_cp = (char) c;
-        (yytext_ptr) = yy_bp;
-        (yy_hold_char) = *yy_cp;
-        (yy_c_buf_p) = yy_cp;
-}
-#ifndef YY_NO_INPUT
-#ifdef __cplusplus
-    static int yyinput (void)
-#else
-    static int input  (void)
-#endif
-{
-        int c;
-    
-        *(yy_c_buf_p) = (yy_hold_char);
-        if ( *(yy_c_buf_p) == YY_END_OF_BUFFER_CHAR )
-                {
-                /* yy_c_buf_p now points to the character we want to return.
-                 * If this occurs *before* the EOB characters, then it's a
-                 * valid NUL; if not, then we've hit the end of the buffer.
-                 */
-                if ( (yy_c_buf_p) < &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] )
-                        /* This was really a NUL. */
-                        *(yy_c_buf_p) = '\0';
-                else
-                        { /* need more input */
-                        int offset = (yy_c_buf_p) - (yytext_ptr);
-                        ++(yy_c_buf_p);
-                        switch ( yy_get_next_buffer(  ) )
-                                {
-                                case EOB_ACT_LAST_MATCH:
-                                        /* This happens because yy_g_n_b()
-                                         * sees that we've accumulated a
-                                         * token and flags that we need to
-                                         * try matching the token before
-                                         * proceeding.  But for input(),
-                                         * there's no matching to consider.
-                                         * So convert the EOB_ACT_LAST_MATCH
-                                         * to EOB_ACT_END_OF_FILE.
-                                         */
-                                        /* Reset buffer status. */
-                                        yyrestart(yyin );
-                                        /*FALLTHROUGH*/
-                                case EOB_ACT_END_OF_FILE:
-                                        {
-                                        if ( yywrap( ) )
-                                                return EOF;
-                                        if ( ! (yy_did_buffer_switch_on_eof) )
-                                                YY_NEW_FILE;
-#ifdef __cplusplus
-                                        return yyinput();
-#else
-                                        return input();
-#endif
-                                        }
-                                case EOB_ACT_CONTINUE_SCAN:
-                                        (yy_c_buf_p) = (yytext_ptr) + offset;
-                                        break;
-                                }
-                        }
-                }
-        c = *(unsigned char *) (yy_c_buf_p);    /* cast for 8-bit char's */
-        *(yy_c_buf_p) = '\0';   /* preserve yytext */
-        (yy_hold_char) = *++(yy_c_buf_p);
-        YY_CURRENT_BUFFER_LVALUE->yy_at_bol = (c == '\n');
-        return c;
-}
-#endif  /* ifndef YY_NO_INPUT */
-/** Immediately switch to a different input stream.
- * @param input_file A readable stream.
- * 
- * @note This function does not reset the start condition to @c INITIAL .
- */
-    void yyrestart  (FILE * input_file )
-{
-    
-        if ( ! YY_CURRENT_BUFFER ){
-        yyensure_buffer_stack ();
-                YY_CURRENT_BUFFER_LVALUE =
-            yy_create_buffer(yyin,YY_BUF_SIZE );
-        }
-        yy_init_buffer(YY_CURRENT_BUFFER,input_file );
-        yy_load_buffer_state( );
-}
-/** Switch to a different input buffer.
- * @param new_buffer The new input buffer.
- * 
- */
-    void yy_switch_to_buffer  (YY_BUFFER_STATE  new_buffer )
-{
-    
-        /* TODO. We should be able to replace this entire function body
-         * with
-         *              yypop_buffer_state();
-         *              yypush_buffer_state(new_buffer);
-     */
-        yyensure_buffer_stack ();
-        if ( YY_CURRENT_BUFFER == new_buffer )
-                return;
-        if ( YY_CURRENT_BUFFER )
-                {
-                /* Flush out information for old buffer. */
-                *(yy_c_buf_p) = (yy_hold_char);
-                YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p);
-                YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
-                }
-        YY_CURRENT_BUFFER_LVALUE = new_buffer;
-        yy_load_buffer_state( );
-        /* We don't actually know whether we did this switch during
-         * EOF (yywrap()) processing, but the only time this flag
-         * is looked at is after yywrap() is called, so it's safe
-         * to go ahead and always set it.
-         */
-        (yy_did_buffer_switch_on_eof) = 1;
-}
-static void yy_load_buffer_state  (void)
-{
-        (yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
-        (yytext_ptr) = (yy_c_buf_p) = YY_CURRENT_BUFFER_LVALUE->yy_buf_pos;
-        yyin = YY_CURRENT_BUFFER_LVALUE->yy_input_file;
-        (yy_hold_char) = *(yy_c_buf_p);
-}
-/** Allocate and initialize an input buffer state.
- * @param file A readable stream.
- * @param size The character buffer size in bytes. When in doubt, use @c YY_BUF_SIZE.
- * 
- * @return the allocated buffer state.
- */
-    YY_BUFFER_STATE yy_create_buffer  (FILE * file, int  size )
-{
-        YY_BUFFER_STATE b;
-    
-        b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state )  );
-        if ( ! b )
-                YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
-        b->yy_buf_size = size;
-        /* yy_ch_buf has to be 2 characters longer than the size given because
-         * we need to put in 2 end-of-buffer characters.
-         */
-        b->yy_ch_buf = (char *) yyalloc(b->yy_buf_size + 2  );
-        if ( ! b->yy_ch_buf )
-                YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
-        b->yy_is_our_buffer = 1;
-        yy_init_buffer(b,file );
-        return b;
-}
-/** Destroy the buffer.
- * @param b a buffer created with yy_create_buffer()
- * 
- */
-    void yy_delete_buffer (YY_BUFFER_STATE  b )
-{
-    
-        if ( ! b )
-                return;
-        if ( b == YY_CURRENT_BUFFER ) /* Not sure if we should pop here. */
-                YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0;
-        if ( b->yy_is_our_buffer )
-                yyfree((void *) b->yy_ch_buf  );
-        yyfree((void *) b  );
-}
-#ifndef __cplusplus
-extern int isatty (int );
-#endif /* __cplusplus */
-    
-/* Initializes or reinitializes a buffer.
- * This function is sometimes called more than once on the same buffer,
- * such as during a yyrestart() or at EOF.
- */
-    static void yy_init_buffer  (YY_BUFFER_STATE  b, FILE * file )
-{
-        int oerrno = errno;
-    
-        yy_flush_buffer(b );
-        b->yy_input_file = file;
-        b->yy_fill_buffer = 1;
-    /* If b is the current buffer, then yy_init_buffer was _probably_
-     * called from yyrestart() or through yy_get_next_buffer.
-     * In that case, we don't want to reset the lineno or column.
-     */
-    if (b != YY_CURRENT_BUFFER){
-        b->yy_bs_lineno = 1;
-        b->yy_bs_column = 0;
-    }
-        b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0;
-    
-        errno = oerrno;
-}
-/** Discard all buffered characters. On the next scan, YY_INPUT will be called.
- * @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER.
- * 
- */
-    void yy_flush_buffer (YY_BUFFER_STATE  b )
-{
-        if ( ! b )
-                return;
-        b->yy_n_chars = 0;
-        /* We always need two end-of-buffer characters.  The first causes
-         * a transition to the end-of-buffer state.  The second causes
-         * a jam in that state.
-         */
-        b->yy_ch_buf[0] = YY_END_OF_BUFFER_CHAR;
-        b->yy_ch_buf[1] = YY_END_OF_BUFFER_CHAR;
-        b->yy_buf_pos = &b->yy_ch_buf[0];
-        b->yy_at_bol = 1;
-        b->yy_buffer_status = YY_BUFFER_NEW;
-        if ( b == YY_CURRENT_BUFFER )
-                yy_load_buffer_state( );
-}
-/** Pushes the new state onto the stack. The new state becomes
- *  the current state. This function will allocate the stack
- *  if necessary.
- *  @param new_buffer The new state.
- *  
- */
-void yypush_buffer_state (YY_BUFFER_STATE new_buffer )
-{
-        if (new_buffer == NULL)
-                return;
-        yyensure_buffer_stack();
-        /* This block is copied from yy_switch_to_buffer. */
-        if ( YY_CURRENT_BUFFER )
-                {
-                /* Flush out information for old buffer. */
-                *(yy_c_buf_p) = (yy_hold_char);
-                YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p);
-                YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
-                }
-        /* Only push if top exists. Otherwise, replace top. */
-        if (YY_CURRENT_BUFFER)
-                (yy_buffer_stack_top)++;
-        YY_CURRENT_BUFFER_LVALUE = new_buffer;
-        /* copied from yy_switch_to_buffer. */
-        yy_load_buffer_state( );
-        (yy_did_buffer_switch_on_eof) = 1;
-}
-/** Removes and deletes the top of the stack, if present.
- *  The next element becomes the new top.
- *  
- */
-void yypop_buffer_state (void)
-{
-        if (!YY_CURRENT_BUFFER)
-                return;
-        yy_delete_buffer(YY_CURRENT_BUFFER );
-        YY_CURRENT_BUFFER_LVALUE = NULL;
-        if ((yy_buffer_stack_top) > 0)
-                --(yy_buffer_stack_top);
-        if (YY_CURRENT_BUFFER) {
-                yy_load_buffer_state( );
-                (yy_did_buffer_switch_on_eof) = 1;
-        }
-}
-/* Allocates the stack if it does not exist.
- *  Guarantees space for at least one push.
- */
-static void yyensure_buffer_stack (void)
-{
-        int num_to_alloc;
-    
-        if (!(yy_buffer_stack)) {
-                /* First allocation is just for 2 elements, since we don't know if this
-                 * scanner will even need a stack. We use 2 instead of 1 to avoid an
-                 * immediate realloc on the next call.
-         */
-                num_to_alloc = 1;
-                (yy_buffer_stack) = (struct yy_buffer_state**)yyalloc
-                                                                (num_to_alloc * sizeof(struct yy_buffer_state*)
-                                                                );
-                if ( ! (yy_buffer_stack) )
-                        YY_FATAL_ERROR( "out of dynamic memory in yyensure_buffer_stack()" );
-                                                                  
-                memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*));
-                                
-                (yy_buffer_stack_max) = num_to_alloc;
-                (yy_buffer_stack_top) = 0;
-                return;
-        }
-        if ((yy_buffer_stack_top) >= ((yy_buffer_stack_max)) - 1){
-                /* Increase the buffer to prepare for a possible push. */
-                int grow_size = 8 /* arbitrary grow size */;
-                num_to_alloc = (yy_buffer_stack_max) + grow_size;
-                (yy_buffer_stack) = (struct yy_buffer_state**)yyrealloc
-                                                                ((yy_buffer_stack),
-                                                                num_to_alloc * sizeof(struct yy_buffer_state*)
-                                                                );
-                if ( ! (yy_buffer_stack) )
-                        YY_FATAL_ERROR( "out of dynamic memory in yyensure_buffer_stack()" );
-                /* zero only the new slots.*/
-                memset((yy_buffer_stack) + (yy_buffer_stack_max), 0, grow_size * sizeof(struct yy_buffer_state*));
-                (yy_buffer_stack_max) = num_to_alloc;
-        }
-}
-/** Setup the input buffer state to scan directly from a user-specified character buffer.
- * @param base the character buffer
- * @param size the size in bytes of the character buffer
- * 
- * @return the newly allocated buffer state object. 
- */
-YY_BUFFER_STATE yy_scan_buffer  (char * base, yy_size_t  size )
-{
-        YY_BUFFER_STATE b;
-    
-        if ( size < 2 ||
-             base[size-2] != YY_END_OF_BUFFER_CHAR ||
-             base[size-1] != YY_END_OF_BUFFER_CHAR )
-                /* They forgot to leave room for the EOB's. */
-                return 0;
-        b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state )  );
-        if ( ! b )
-                YY_FATAL_ERROR( "out of dynamic memory in yy_scan_buffer()" );
-        b->yy_buf_size = size - 2;      /* "- 2" to take care of EOB's */
-        b->yy_buf_pos = b->yy_ch_buf = base;
-        b->yy_is_our_buffer = 0;
-        b->yy_input_file = 0;
-        b->yy_n_chars = b->yy_buf_size;
-        b->yy_is_interactive = 0;
-        b->yy_at_bol = 1;
-        b->yy_fill_buffer = 0;
-        b->yy_buffer_status = YY_BUFFER_NEW;
-        yy_switch_to_buffer(b  );
-        return b;
-}
-/** Setup the input buffer state to scan a string. The next call to yylex() will
- * scan from a @e copy of @a str.
- * @param yystr a NUL-terminated string to scan
- * 
- * @return the newly allocated buffer state object.
- * @note If you want to scan bytes that may contain NUL values, then use
- *       yy_scan_bytes() instead.
- */
-YY_BUFFER_STATE yy_scan_string (yyconst char * yystr )
-{
-    
-        return yy_scan_bytes(yystr,strlen(yystr) );
-}
-/** Setup the input buffer state to scan the given bytes. The next call to yylex() will
- * scan from a @e copy of @a bytes.
- * @param bytes the byte buffer to scan
- * @param len the number of bytes in the buffer pointed to by @a bytes.
- * 
- * @return the newly allocated buffer state object.
- */
-YY_BUFFER_STATE yy_scan_bytes  (yyconst char * yybytes, int  _yybytes_len )
-{
-        YY_BUFFER_STATE b;
-        char *buf;
-        yy_size_t n;
-        int i;
-    
-        /* Get memory for full buffer, including space for trailing EOB's. */
-        n = _yybytes_len + 2;
-        buf = (char *) yyalloc(n  );
-        if ( ! buf )
-                YY_FATAL_ERROR( "out of dynamic memory in yy_scan_bytes()" );
-        for ( i = 0; i < _yybytes_len; ++i )
-                buf[i] = yybytes[i];
-        buf[_yybytes_len] = buf[_yybytes_len+1] = YY_END_OF_BUFFER_CHAR;
-        b = yy_scan_buffer(buf,n );
-        if ( ! b )
-                YY_FATAL_ERROR( "bad buffer in yy_scan_bytes()" );
-        /* It's okay to grow etc. this buffer, and we should throw it
-         * away when we're done.
-         */
-        b->yy_is_our_buffer = 1;
-        return b;
-}
-#ifndef YY_EXIT_FAILURE
-#define YY_EXIT_FAILURE 2
-#endif
-static void yy_fatal_error (yyconst char* msg )
-{
-        (void) fprintf( stderr, "%s\n", msg );
-        exit( YY_EXIT_FAILURE );
-}
-/* Redefine yyless() so it works in section 3 code. */
-#undef yyless
-#define yyless(n) \
-        do \
-                { \
-                /* Undo effects of setting up yytext. */ \
-        int yyless_macro_arg = (n); \
-        YY_LESS_LINENO(yyless_macro_arg);\
-                yytext[yyleng] = (yy_hold_char); \
-                (yy_c_buf_p) = yytext + yyless_macro_arg; \
-                (yy_hold_char) = *(yy_c_buf_p); \
-                *(yy_c_buf_p) = '\0'; \
-                yyleng = yyless_macro_arg; \
-                } \
-        while ( 0 )
-/* Accessor  methods (get/set functions) to struct members. */
-/** Get the current line number.
- * 
- */
-int yyget_lineno  (void)
-{
-        
-    return yylineno;
-}
-/** Get the input stream.
- * 
- */
-FILE *yyget_in  (void)
-{
-        return yyin;
-}
-/** Get the output stream.
- * 
- */
-FILE *yyget_out  (void)
-{
-        return yyout;
-}
-/** Get the length of the current token.
- * 
- */
-int yyget_leng  (void)
-{
-        return yyleng;
-}
-/** Get the current token.
- * 
- */
-char *yyget_text  (void)
-{
-        return yytext;
-}
-/** Set the current line number.
- * @param line_number
- * 
- */
-void yyset_lineno (int  line_number )
-{
-    
-    yylineno = line_number;
-}
-/** Set the input stream. This does not discard the current
- * input buffer.
- * @param in_str A readable stream.
- * 
- * @see yy_switch_to_buffer
- */
-void yyset_in (FILE *  in_str )
-{
-        yyin = in_str ;
-}
-void yyset_out (FILE *  out_str )
-{
-        yyout = out_str ;
-}
-int yyget_debug  (void)
-{
-        return yy_flex_debug;
-}
-void yyset_debug (int  bdebug )
-{
-        yy_flex_debug = bdebug ;
-}
-static int yy_init_globals (void)
-{
-        /* Initialization is the same as for the non-reentrant scanner.
-     * This function is called from yylex_destroy(), so don't allocate here.
-     */
-    (yy_buffer_stack) = 0;
-    (yy_buffer_stack_top) = 0;
-    (yy_buffer_stack_max) = 0;
-    (yy_c_buf_p) = (char *) 0;
-    (yy_init) = 0;
-    (yy_start) = 0;
-/* Defined in main.c */
-#ifdef YY_STDINIT
-    yyin = stdin;
-    yyout = stdout;
-#else
-    yyin = (FILE *) 0;
-    yyout = (FILE *) 0;
-#endif
-    /* For future reference: Set errno on error, since we are called by
-     * yylex_init()
-     */
-    return 0;
-}
-/* yylex_destroy is for both reentrant and non-reentrant scanners. */
-int yylex_destroy  (void)
-{
-    
-    /* Pop the buffer stack, destroying each element. */
-        while(YY_CURRENT_BUFFER){
-                yy_delete_buffer(YY_CURRENT_BUFFER  );
-                YY_CURRENT_BUFFER_LVALUE = NULL;
-                yypop_buffer_state();
-        }
-        /* Destroy the stack itself. */
-        yyfree((yy_buffer_stack) );
-        (yy_buffer_stack) = NULL;
-    /* Reset the globals. This is important in a non-reentrant scanner so the next time
-     * yylex() is called, initialization will occur. */
-    yy_init_globals( );
-    return 0;
-}
-/*
- * Internal utility routines.
- */
-#ifndef yytext_ptr
-static void yy_flex_strncpy (char* s1, yyconst char * s2, int n )
-{
-        register int i;
-        for ( i = 0; i < n; ++i )
-                s1[i] = s2[i];
-}
-#endif
-#ifdef YY_NEED_STRLEN
-static int yy_flex_strlen (yyconst char * s )
-{
-        register int n;
-        for ( n = 0; s[n]; ++n )
-                ;
-        return n;
-}
-#endif
-void *yyalloc (yy_size_t  size )
-{
-        return (void *) malloc( size );
-}
-void *yyrealloc  (void * ptr, yy_size_t  size )
-{
-        /* The cast to (char *) in the following accommodates both
-         * implementations that use char* generic pointers, and those
-         * that use void* generic pointers.  It works with the latter
-         * because both ANSI C and C++ allow castless assignment from
-         * any pointer type to void*, and deal with argument conversions
-         * as though doing an assignment.
-         */
-        return (void *) realloc( (char *) ptr, size );
-}
-void yyfree (void * ptr )
-{
-        free( (char *) ptr );   /* see yyrealloc() for (char *) cast */
-}
-#define YYTABLES_NAME "yytables"
-/* Bring in the keyword recognizer.  */
-#include "keywords.c"
-/* Macros to append to our phrase collection list.  */
-/*
- * We mark any token, that that equals to a known enumerator, as
- * SYM_ENUM_CONST. The parser will change this for struct and union tags later,
- * the only problem is struct and union members:
- *    enum e { a, b }; struct s { int a, b; }
- * but in this case, the only effect will be, that the ABI checksums become
- * more volatile, which is acceptable. Also, such collisions are quite rare,
- * so far it was only observed in include/linux/telephony.h.
- */
-#define _APP(T,L)       do {                                               \
-                          cur_node = next_node;                            \
-                          next_node = xmalloc(sizeof(*next_node));         \
-                          next_node->next = cur_node;                      \
-                          cur_node->string = memcpy(xmalloc(L+1), T, L+1); \
-                          cur_node->tag =                                  \
-                            find_symbol(cur_node->string, SYM_ENUM_CONST, 1)?\
-                            SYM_ENUM_CONST : SYM_NORMAL ;                  \
-                          cur_node->in_source_file = in_source_file;       \
-                        } while (0)
-#define APP             _APP(yytext, yyleng)
-/* The second stage lexer.  Here we incorporate knowledge of the state
-   of the parser to tailor the tokens that are returned.  */
-int
-yylex(void)
-{
-  static enum {
-    ST_NOTSTARTED, ST_NORMAL, ST_ATTRIBUTE, ST_ASM, ST_TYPEOF, ST_TYPEOF_1,
-    ST_BRACKET, ST_BRACE, ST_EXPRESSION,
-    ST_TABLE_1, ST_TABLE_2, ST_TABLE_3, ST_TABLE_4,
-    ST_TABLE_5, ST_TABLE_6
-  } lexstate = ST_NOTSTARTED;
-  static int suppress_type_lookup, dont_want_brace_phrase;
-  static struct string_list *next_node;
-  int token, count = 0;
-  struct string_list *cur_node;
-  if (lexstate == ST_NOTSTARTED)
-    {
-      next_node = xmalloc(sizeof(*next_node));
-      next_node->next = NULL;
-      lexstate = ST_NORMAL;
-    }
-repeat:
-  token = yylex1();
-  if (token == 0)
-    return 0;
-  else if (token == FILENAME)
-    {
-      char *file, *e;
-      /* Save the filename and line number for later error messages.  */
-      if (cur_filename)
-        free(cur_filename);
-      file = strchr(yytext, '\"')+1;
-      e = strchr(file, '\"');
-      *e = '\0';
-      cur_filename = memcpy(xmalloc(e-file+1), file, e-file+1);
-      cur_line = atoi(yytext+2);
-      if (!source_file) {
-        source_file = xstrdup(cur_filename);
-        in_source_file = 1;
-      } else {
-        in_source_file = (strcmp(cur_filename, source_file) == 0);
-      }
-      goto repeat;
-    }
-  switch (lexstate)
-    {
-    case ST_NORMAL:
-      switch (token)
-        {
-        case IDENT:
-          APP;
-          {
-            int r = is_reserved_word(yytext, yyleng);
-            if (r >= 0)
-              {
-                switch (token = r)
-                  {
-                  case ATTRIBUTE_KEYW:
-                    lexstate = ST_ATTRIBUTE;
-                    count = 0;
-                    goto repeat;
-                  case ASM_KEYW:
-                    lexstate = ST_ASM;
-                    count = 0;
-                    goto repeat;
-                  case TYPEOF_KEYW:
-                    lexstate = ST_TYPEOF;
-                    count = 0;
-                    goto repeat;
-                  case STRUCT_KEYW:
-                  case UNION_KEYW:
-                  case ENUM_KEYW:
-                    dont_want_brace_phrase = 3;
-                    suppress_type_lookup = 2;
-                    goto fini;
-                  case EXPORT_SYMBOL_KEYW:
-                      goto fini;
-                  }
-              }
-            if (!suppress_type_lookup)
-              {
-                if (find_symbol(yytext, SYM_TYPEDEF, 1))
-                  token = TYPE;
-              }
-          }
-          break;
-        case '[':
-          APP;
-          lexstate = ST_BRACKET;
-          count = 1;
-          goto repeat;
-        case '{':
-          APP;
-          if (dont_want_brace_phrase)
-            break;
-          lexstate = ST_BRACE;
-          count = 1;
-          goto repeat;
-        case '=': case ':':
-          APP;
-          lexstate = ST_EXPRESSION;
-          break;
-        case DOTS:
-        default:
-          APP;
-          break;
-        }
-      break;
-    case ST_ATTRIBUTE:
-      APP;
-      switch (token)
-        {
-        case '(':
-          ++count;
-          goto repeat;
-        case ')':
-          if (--count == 0)
-            {
-              lexstate = ST_NORMAL;
-              token = ATTRIBUTE_PHRASE;
-              break;
-            }
-          goto repeat;
-        default:
-          goto repeat;
-        }
-      break;
-    case ST_ASM:
-      APP;
-      switch (token)
-        {
-        case '(':
-          ++count;
-          goto repeat;
-        case ')':
-          if (--count == 0)
-            {
-              lexstate = ST_NORMAL;
-              token = ASM_PHRASE;
-              break;
-            }
-          goto repeat;
-        default:
-          goto repeat;
-        }
-      break;
-    case ST_TYPEOF_1:
-      if (token == IDENT)
-        {
-          if (is_reserved_word(yytext, yyleng) >= 0
-              || find_symbol(yytext, SYM_TYPEDEF, 1))
-            {
-              yyless(0);
-              unput('(');
-              lexstate = ST_NORMAL;
-              token = TYPEOF_KEYW;
-              break;
-            }
-          _APP("(", 1);
-        }
-        lexstate = ST_TYPEOF;
-        /* FALLTHRU */
-    case ST_TYPEOF:
-      switch (token)
-        {
-        case '(':
-          if ( ++count == 1 )
-            lexstate = ST_TYPEOF_1;
-          else
-            APP;
-          goto repeat;
-        case ')':
-          APP;
-          if (--count == 0)
-            {
-              lexstate = ST_NORMAL;
-              token = TYPEOF_PHRASE;
-              break;
-            }
-          goto repeat;
-        default:
-          APP;
-          goto repeat;
-        }
-      break;
-    case ST_BRACKET:
-      APP;
-      switch (token)
-        {
-        case '[':
-          ++count;
-          goto repeat;
-        case ']':
-          if (--count == 0)
-            {
-              lexstate = ST_NORMAL;
-              token = BRACKET_PHRASE;
-              break;
-            }
-          goto repeat;
-        default:
-          goto repeat;
-        }
-      break;
-    case ST_BRACE:
-      APP;
-      switch (token)
-        {
-        case '{':
-          ++count;
-          goto repeat;
-        case '}':
-          if (--count == 0)
-            {
-              lexstate = ST_NORMAL;
-              token = BRACE_PHRASE;
-              break;
-            }
-          goto repeat;
-        default:
-          goto repeat;
-        }
-      break;
-    case ST_EXPRESSION:
-      switch (token)
-        {
-        case '(': case '[': case '{':
-          ++count;
-          APP;
-          goto repeat;
-        case '}':
-          /* is this the last line of an enum declaration? */
-          if (count == 0)
-            {
-              /* Put back the token we just read so's we can find it again
-                 after registering the expression.  */
-              unput(token);
-              lexstate = ST_NORMAL;
-              token = EXPRESSION_PHRASE;
-              break;
-            }
-          /* FALLTHRU */
-        case ')': case ']':
-          --count;
-          APP;
-          goto repeat;
-        case ',': case ';':
-          if (count == 0)
-            {
-              /* Put back the token we just read so's we can find it again
-                 after registering the expression.  */
-              unput(token);
-              lexstate = ST_NORMAL;
-              token = EXPRESSION_PHRASE;
-              break;
-            }
-          APP;
-          goto repeat;
-        default:
-          APP;
-          goto repeat;
-        }
-      break;
-    case ST_TABLE_1:
-      goto repeat;
-    case ST_TABLE_2:
-      if (token == IDENT && yyleng == 1 && yytext[0] == 'X')
-        {
-          token = EXPORT_SYMBOL_KEYW;
-          lexstate = ST_TABLE_5;
-          APP;
-          break;
-        }
-      lexstate = ST_TABLE_6;
-      /* FALLTHRU */
-    case ST_TABLE_6:
-      switch (token)
-        {
-        case '{': case '[': case '(':
-          ++count;
-          break;
-        case '}': case ']': case ')':
-          --count;
-          break;
-        case ',':
-          if (count == 0)
-            lexstate = ST_TABLE_2;
-          break;
-        };
-      goto repeat;
-    case ST_TABLE_3:
-      goto repeat;
-    case ST_TABLE_4:
-      if (token == ';')
-        lexstate = ST_NORMAL;
-      goto repeat;
-    case ST_TABLE_5:
-      switch (token)
-        {
-        case ',':
-          token = ';';
-          lexstate = ST_TABLE_2;
-          APP;
-          break;
-        default:
-          APP;
-          break;
-        }
-      break;
-    default:
-      exit(1);
-    }
-fini:
-  if (suppress_type_lookup > 0)
-    --suppress_type_lookup;
-  if (dont_want_brace_phrase > 0)
-    --dont_want_brace_phrase;
-  yylval = &next_node->next;
-  return token;
-}
diff --git a/scripts/genksyms/parse.tab.c_shipped b/scripts/genksyms/parse.tab.c_shipped
deleted file mode 100644
index d02258bafe7b..000000000000
--- a/scripts/genksyms/parse.tab.c_shipped
+++ /dev/null
@@ -1,2394 +0,0 @@
-/* A Bison parser, made by GNU Bison 2.7.  */
-/* Bison implementation for Yacc-like parsers in C
-   
-      Copyright (C) 1984, 1989-1990, 2000-2012 Free Software Foundation, Inc.
-   
-   This program is free software: you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-   
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-   
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
-/* As a special exception, you may create a larger work that contains
-   part or all of the Bison parser skeleton and distribute that work
-   under terms of your choice, so long as that work isn't itself a
-   parser generator using the skeleton or a modified version thereof
-   as a parser skeleton.  Alternatively, if you modify or redistribute
-   the parser skeleton itself, you may (at your option) remove this
-   special exception, which will cause the skeleton and the resulting
-   Bison output files to be licensed under the GNU General Public
-   License without this special exception.
-   
-   This special exception was added by the Free Software Foundation in
-   version 2.2 of Bison.  */
-/* C LALR(1) parser skeleton written by Richard Stallman, by
-   simplifying the original so-called "semantic" parser.  */
-/* All symbols defined below should begin with yy or YY, to avoid
-   infringing on user name space.  This should be done even for local
-   variables, as they might otherwise be expanded by user macros.
-   There are some unavoidable exceptions within include files to
-   define necessary library symbols; they are noted "INFRINGES ON
-   USER NAME SPACE" below.  */
-/* Identify Bison output.  */
-#define YYBISON 1
-/* Bison version.  */
-#define YYBISON_VERSION "2.7"
-/* Skeleton name.  */
-#define YYSKELETON_NAME "yacc.c"
-/* Pure parsers.  */
-#define YYPURE 0
-/* Push parsers.  */
-#define YYPUSH 0
-/* Pull parsers.  */
-#define YYPULL 1
-/* Copy the first part of user declarations.  */
-#include <assert.h>
-#include <stdlib.h>
-#include <string.h>
-#include "genksyms.h"
-static int is_typedef;
-static int is_extern;
-static char *current_name;
-static struct string_list *decl_spec;
-static void yyerror(const char *);
-static inline void
-remove_node(struct string_list **p)
-{
-  struct string_list *node = *p;
-  *p = node->next;
-  free_node(node);
-}
-static inline void
-remove_list(struct string_list **pb, struct string_list **pe)
-{
-  struct string_list *b = *pb, *e = *pe;
-  *pb = e;
-  free_list(b, e);
-}
-/* Record definition of a struct/union/enum */
-static void record_compound(struct string_list **keyw,
-                       struct string_list **ident,
-                       struct string_list **body,
-                       enum symbol_type type)
-{
-        struct string_list *b = *body, *i = *ident, *r;
-        if (i->in_source_file) {
-                remove_node(keyw);
-                (*ident)->tag = type;
-                remove_list(body, ident);
-                return;
-        }
-        r = copy_node(i); r->tag = type;
-        r->next = (*keyw)->next; *body = r; (*keyw)->next = NULL;
-        add_symbol(i->string, type, b, is_extern);
-}
-# ifndef YY_NULL
-#  if defined __cplusplus && 201103L <= __cplusplus
-#   define YY_NULL nullptr
-#  else
-#   define YY_NULL 0
-#  endif
-# endif
-/* Enabling verbose error messages.  */
-#ifdef YYERROR_VERBOSE
-# undef YYERROR_VERBOSE
-# define YYERROR_VERBOSE 1
-#else
-# define YYERROR_VERBOSE 0
-#endif
-/* Enabling traces.  */
-#ifndef YYDEBUG
-# define YYDEBUG 1
-#endif
-#if YYDEBUG
-extern int yydebug;
-#endif
-/* Tokens.  */
-#ifndef YYTOKENTYPE
-# define YYTOKENTYPE
-   /* Put the tokens into the symbol table, so that GDB and other debuggers
-      know about them.  */
-   enum yytokentype {
-     ASM_KEYW = 258,
-     ATTRIBUTE_KEYW = 259,
-     AUTO_KEYW = 260,
-     BOOL_KEYW = 261,
-     CHAR_KEYW = 262,
-     CONST_KEYW = 263,
-     DOUBLE_KEYW = 264,
-     ENUM_KEYW = 265,
-     EXTERN_KEYW = 266,
-     EXTENSION_KEYW = 267,
-     FLOAT_KEYW = 268,
-     INLINE_KEYW = 269,
-     INT_KEYW = 270,
-     LONG_KEYW = 271,
-     REGISTER_KEYW = 272,
-     RESTRICT_KEYW = 273,
-     SHORT_KEYW = 274,
-     SIGNED_KEYW = 275,
-     STATIC_KEYW = 276,
-     STRUCT_KEYW = 277,
-     TYPEDEF_KEYW = 278,
-     UNION_KEYW = 279,
-     UNSIGNED_KEYW = 280,
-     VOID_KEYW = 281,
-     VOLATILE_KEYW = 282,
-     TYPEOF_KEYW = 283,
-     VA_LIST_KEYW = 284,
-     EXPORT_SYMBOL_KEYW = 285,
-     ASM_PHRASE = 286,
-     ATTRIBUTE_PHRASE = 287,
-     TYPEOF_PHRASE = 288,
-     BRACE_PHRASE = 289,
-     BRACKET_PHRASE = 290,
-     EXPRESSION_PHRASE = 291,
-     CHAR = 292,
-     DOTS = 293,
-     IDENT = 294,
-     INT = 295,
-     REAL = 296,
-     STRING = 297,
-     TYPE = 298,
-     OTHER = 299,
-     FILENAME = 300
-   };
-#endif
-#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
-typedef int YYSTYPE;
-# define YYSTYPE_IS_TRIVIAL 1
-# define yystype YYSTYPE /* obsolescent; will be withdrawn */
-# define YYSTYPE_IS_DECLARED 1
-#endif
-extern YYSTYPE yylval;
-#ifdef YYPARSE_PARAM
-#if defined __STDC__ || defined __cplusplus
-int yyparse (void *YYPARSE_PARAM);
-#else
-int yyparse ();
-#endif
-#else /* ! YYPARSE_PARAM */
-#if defined __STDC__ || defined __cplusplus
-int yyparse (void);
-#else
-int yyparse ();
-#endif
-#endif /* ! YYPARSE_PARAM */
-/* Copy the second part of user declarations.  */
-#ifdef short
-# undef short
-#endif
-#ifdef YYTYPE_UINT8
-typedef YYTYPE_UINT8 yytype_uint8;
-#else
-typedef unsigned char yytype_uint8;
-#endif
-#ifdef YYTYPE_INT8
-typedef YYTYPE_INT8 yytype_int8;
-#elif (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
-typedef signed char yytype_int8;
-#else
-typedef short int yytype_int8;
-#endif
-#ifdef YYTYPE_UINT16
-typedef YYTYPE_UINT16 yytype_uint16;
-#else
-typedef unsigned short int yytype_uint16;
-#endif
-#ifdef YYTYPE_INT16
-typedef YYTYPE_INT16 yytype_int16;
-#else
-typedef short int yytype_int16;
-#endif
-#ifndef YYSIZE_T
-# ifdef __SIZE_TYPE__
-#  define YYSIZE_T __SIZE_TYPE__
-# elif defined size_t
-#  define YYSIZE_T size_t
-# elif ! defined YYSIZE_T && (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
-#  include <stddef.h> /* INFRINGES ON USER NAME SPACE */
-#  define YYSIZE_T size_t
-# else
-#  define YYSIZE_T unsigned int
-# endif
-#endif
-#define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
-#ifndef YY_
-# if defined YYENABLE_NLS && YYENABLE_NLS
-#  if ENABLE_NLS
-#   include <libintl.h> /* INFRINGES ON USER NAME SPACE */
-#   define YY_(Msgid) dgettext ("bison-runtime", Msgid)
-#  endif
-# endif
-# ifndef YY_
-#  define YY_(Msgid) Msgid
-# endif
-#endif
-/* Suppress unused-variable warnings by "using" E.  */
-#if ! defined lint || defined __GNUC__
-# define YYUSE(E) ((void) (E))
-#else
-# define YYUSE(E) /* empty */
-#endif
-/* Identity function, used to suppress warnings about constant conditions.  */
-#ifndef lint
-# define YYID(N) (N)
-#else
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
-static int
-YYID (int yyi)
-#else
-static int
-YYID (yyi)
-    int yyi;
-#endif
-{
-  return yyi;
-}
-#endif
-#if ! defined yyoverflow || YYERROR_VERBOSE
-/* The parser invokes alloca or malloc; define the necessary symbols.  */
-# ifdef YYSTACK_USE_ALLOCA
-#  if YYSTACK_USE_ALLOCA
-#   ifdef __GNUC__
-#    define YYSTACK_ALLOC __builtin_alloca
-#   elif defined __BUILTIN_VA_ARG_INCR
-#    include <alloca.h> /* INFRINGES ON USER NAME SPACE */
-#   elif defined _AIX
-#    define YYSTACK_ALLOC __alloca
-#   elif defined _MSC_VER
-#    include <malloc.h> /* INFRINGES ON USER NAME SPACE */
-#    define alloca _alloca
-#   else
-#    define YYSTACK_ALLOC alloca
-#    if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
-#     include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-      /* Use EXIT_SUCCESS as a witness for stdlib.h.  */
-#     ifndef EXIT_SUCCESS
-#      define EXIT_SUCCESS 0
-#     endif
-#    endif
-#   endif
-#  endif
-# endif
-# ifdef YYSTACK_ALLOC
-   /* Pacify GCC's `empty if-body' warning.  */
-#  define YYSTACK_FREE(Ptr) do { /* empty */; } while (YYID (0))
-#  ifndef YYSTACK_ALLOC_MAXIMUM
-    /* The OS might guarantee only one guard page at the bottom of the stack,
-       and a page size can be as small as 4096 bytes.  So we cannot safely
-       invoke alloca (N) if N exceeds 4096.  Use a slightly smaller number
-       to allow for a few compiler-allocated temporary stack slots.  */
-#   define YYSTACK_ALLOC_MAXIMUM 4032 /* reasonable circa 2006 */
-#  endif
-# else
-#  define YYSTACK_ALLOC YYMALLOC
-#  define YYSTACK_FREE YYFREE
-#  ifndef YYSTACK_ALLOC_MAXIMUM
-#   define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM
-#  endif
-#  if (defined __cplusplus && ! defined EXIT_SUCCESS \
-       && ! ((defined YYMALLOC || defined malloc) \
-             && (defined YYFREE || defined free)))
-#   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-#   ifndef EXIT_SUCCESS
-#    define EXIT_SUCCESS 0
-#   endif
-#  endif
-#  ifndef YYMALLOC
-#   define YYMALLOC malloc
-#   if ! defined malloc && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
-void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
-#   endif
-#  endif
-#  ifndef YYFREE
-#   define YYFREE free
-#   if ! defined free && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
-void free (void *); /* INFRINGES ON USER NAME SPACE */
-#   endif
-#  endif
-# endif
-#endif /* ! defined yyoverflow || YYERROR_VERBOSE */
-#if (! defined yyoverflow \
-     && (! defined __cplusplus \
-         || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
-/* A type that is properly aligned for any stack member.  */
-union yyalloc
-{
-  yytype_int16 yyss_alloc;
-  YYSTYPE yyvs_alloc;
-};
-/* The size of the maximum gap between one aligned stack and the next.  */
-# define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1)
-/* The size of an array large to enough to hold all stacks, each with
-   N elements.  */
-# define YYSTACK_BYTES(N) \
-     ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \
-      + YYSTACK_GAP_MAXIMUM)
-# define YYCOPY_NEEDED 1
-/* Relocate STACK from its old location to the new one.  The
-   local variables YYSIZE and YYSTACKSIZE give the old and new number of
-   elements in the stack, and YYPTR gives the new location of the
-   stack.  Advance YYPTR to a properly aligned location for the next
-   stack.  */
-# define YYSTACK_RELOCATE(Stack_alloc, Stack)                           \
-    do                                                                  \
-      {                                                                 \
-        YYSIZE_T yynewbytes;                                            \
-        YYCOPY (&yyptr->Stack_alloc, Stack, yysize);                    \
-        Stack = &yyptr->Stack_alloc;                                    \
-        yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
-        yyptr += yynewbytes / sizeof (*yyptr);                          \
-      }                                                                 \
-    while (YYID (0))
-#endif
-#if defined YYCOPY_NEEDED && YYCOPY_NEEDED
-/* Copy COUNT objects from SRC to DST.  The source and destination do
-   not overlap.  */
-# ifndef YYCOPY
-#  if defined __GNUC__ && 1 < __GNUC__
-#   define YYCOPY(Dst, Src, Count) \
-      __builtin_memcpy (Dst, Src, (Count) * sizeof (*(Src)))
-#  else
-#   define YYCOPY(Dst, Src, Count)              \
-      do                                        \
-        {                                       \
-          YYSIZE_T yyi;                         \
-          for (yyi = 0; yyi < (Count); yyi++)   \
-            (Dst)[yyi] = (Src)[yyi];            \
-        }                                       \
-      while (YYID (0))
-#  endif
-# endif
-#endif /* !YYCOPY_NEEDED */
-/* YYFINAL -- State number of the termination state.  */
-#define YYFINAL  4
-/* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   522
-/* YYNTOKENS -- Number of terminals.  */
-#define YYNTOKENS  55
-/* YYNNTS -- Number of nonterminals.  */
-#define YYNNTS  49
-/* YYNRULES -- Number of rules.  */
-#define YYNRULES  133
-/* YYNRULES -- Number of states.  */
-#define YYNSTATES  187
-/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
-#define YYUNDEFTOK  2
-#define YYMAXUTOK   300
-#define YYTRANSLATE(YYX)                                                \
-  ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
-/* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX.  */
-static const yytype_uint8 yytranslate[] =
-{
-       0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-      49,    50,    51,     2,    48,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,    54,    46,
-       2,    52,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,    53,     2,    47,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     1,     2,     3,     4,
-       5,     6,     7,     8,     9,    10,    11,    12,    13,    14,
-      15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
-      25,    26,    27,    28,    29,    30,    31,    32,    33,    34,
-      35,    36,    37,    38,    39,    40,    41,    42,    43,    44,
-      45
-};
-#if YYDEBUG
-/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in
-   YYRHS.  */
-static const yytype_uint16 yyprhs[] =
-{
-       0,     0,     3,     5,     8,     9,    12,    13,    18,    19,
-      23,    25,    27,    29,    31,    34,    37,    41,    42,    44,
-      46,    50,    55,    56,    58,    60,    63,    65,    67,    69,
-      71,    73,    75,    77,    79,    81,    86,    88,    91,    94,
-      97,   101,   105,   109,   112,   115,   118,   120,   122,   124,
-     126,   128,   130,   132,   134,   136,   138,   140,   142,   145,
-     146,   148,   150,   153,   155,   157,   159,   161,   164,   166,
-     168,   170,   175,   180,   183,   187,   190,   192,   194,   196,
-     201,   206,   209,   213,   217,   220,   222,   226,   227,   229,
-     231,   235,   238,   241,   243,   244,   246,   248,   253,   258,
-     261,   265,   269,   273,   274,   276,   279,   283,   287,   288,
-     290,   292,   295,   299,   302,   303,   305,   307,   311,   314,
-     317,   319,   322,   323,   326,   330,   335,   337,   341,   343,
-     347,   350,   351,   353
-};
-/* YYRHS -- A `-1'-separated list of the rules' RHS.  */
-static const yytype_int8 yyrhs[] =
-{
-      56,     0,    -1,    57,    -1,    56,    57,    -1,    -1,    58,
-      59,    -1,    -1,    12,    23,    60,    62,    -1,    -1,    23,
-      61,    62,    -1,    62,    -1,    86,    -1,   101,    -1,   103,
-      -1,     1,    46,    -1,     1,    47,    -1,    66,    63,    46,
-      -1,    -1,    64,    -1,    65,    -1,    64,    48,    65,    -1,
-      76,   102,    97,    87,    -1,    -1,    67,    -1,    68,    -1,
-      67,    68,    -1,    69,    -1,    70,    -1,     5,    -1,    17,
-      -1,    21,    -1,    11,    -1,    14,    -1,    71,    -1,    75,
-      -1,    28,    49,    83,    50,    -1,    33,    -1,    22,    39,
-      -1,    24,    39,    -1,    10,    39,    -1,    22,    39,    89,
-      -1,    24,    39,    89,    -1,    10,    39,    98,    -1,    10,
-      98,    -1,    22,    89,    -1,    24,    89,    -1,     7,    -1,
-      19,    -1,    15,    -1,    16,    -1,    20,    -1,    25,    -1,
-      13,    -1,     9,    -1,    26,    -1,     6,    -1,    29,    -1,
-      43,    -1,    51,    73,    -1,    -1,    74,    -1,    75,    -1,
-      74,    75,    -1,     8,    -1,    27,    -1,    32,    -1,    18,
-      -1,    72,    76,    -1,    77,    -1,    39,    -1,    43,    -1,
-      77,    49,    80,    50,    -1,    77,    49,     1,    50,    -1,
-      77,    35,    -1,    49,    76,    50,    -1,    72,    78,    -1,
-      79,    -1,    39,    -1,    43,    -1,    79,    49,    80,    50,
-      -1,    79,    49,     1,    50,    -1,    79,    35,    -1,    49,
-      78,    50,    -1,    49,     1,    50,    -1,    81,    38,    -1,
-      81,    -1,    82,    48,    38,    -1,    -1,    82,    -1,    83,
-      -1,    82,    48,    83,    -1,    67,    84,    -1,    72,    84,
-      -1,    85,    -1,    -1,    39,    -1,    43,    -1,    85,    49,
-      80,    50,    -1,    85,    49,     1,    50,    -1,    85,    35,
-      -1,    49,    84,    50,    -1,    49,     1,    50,    -1,    66,
-      76,    34,    -1,    -1,    88,    -1,    52,    36,    -1,    53,
-      90,    47,    -1,    53,     1,    47,    -1,    -1,    91,    -1,
-      92,    -1,    91,    92,    -1,    66,    93,    46,    -1,     1,
-      46,    -1,    -1,    94,    -1,    95,    -1,    94,    48,    95,
-      -1,    78,    97,    -1,    39,    96,    -1,    96,    -1,    54,
-      36,    -1,    -1,    97,    32,    -1,    53,    99,    47,    -1,
-      53,    99,    48,    47,    -1,   100,    -1,    99,    48,   100,
-      -1,    39,    -1,    39,    52,    36,    -1,    31,    46,    -1,
-      -1,    31,    -1,    30,    49,    39,    50,    46,    -1
-};
-/* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
-static const yytype_uint16 yyrline[] =
-{
-       0,   125,   125,   126,   130,   130,   136,   136,   138,   138,
-     140,   141,   142,   143,   144,   145,   149,   163,   164,   168,
-     176,   189,   195,   196,   200,   201,   205,   211,   215,   216,
-     217,   218,   219,   223,   224,   225,   226,   230,   232,   234,
-     238,   240,   242,   247,   250,   251,   255,   256,   257,   258,
-     259,   260,   261,   262,   263,   264,   265,   266,   270,   275,
-     276,   280,   281,   285,   285,   285,   286,   294,   295,   299,
-     308,   317,   319,   321,   323,   330,   331,   335,   336,   337,
-     339,   341,   343,   345,   350,   351,   352,   356,   357,   361,
-     362,   367,   372,   374,   378,   379,   387,   391,   393,   395,
-     397,   399,   404,   413,   414,   419,   424,   425,   429,   430,
-     434,   435,   439,   441,   446,   447,   451,   452,   456,   457,
-     458,   462,   466,   467,   471,   472,   476,   477,   480,   485,
-     493,   497,   498,   502
-};
-#endif
-#if YYDEBUG || YYERROR_VERBOSE || 0
-/* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
-   First, the terminals, then, starting at YYNTOKENS, nonterminals.  */
-static const char *const yytname[] =
-{
-  "$end", "error", "$undefined", "ASM_KEYW", "ATTRIBUTE_KEYW",
-  "AUTO_KEYW", "BOOL_KEYW", "CHAR_KEYW", "CONST_KEYW", "DOUBLE_KEYW",
-  "ENUM_KEYW", "EXTERN_KEYW", "EXTENSION_KEYW", "FLOAT_KEYW",
-  "INLINE_KEYW", "INT_KEYW", "LONG_KEYW", "REGISTER_KEYW", "RESTRICT_KEYW",
-  "SHORT_KEYW", "SIGNED_KEYW", "STATIC_KEYW", "STRUCT_KEYW",
-  "TYPEDEF_KEYW", "UNION_KEYW", "UNSIGNED_KEYW", "VOID_KEYW",
-  "VOLATILE_KEYW", "TYPEOF_KEYW", "VA_LIST_KEYW", "EXPORT_SYMBOL_KEYW",
-  "ASM_PHRASE", "ATTRIBUTE_PHRASE", "TYPEOF_PHRASE", "BRACE_PHRASE",
-  "BRACKET_PHRASE", "EXPRESSION_PHRASE", "CHAR", "DOTS", "IDENT", "INT",
-  "REAL", "STRING", "TYPE", "OTHER", "FILENAME", "';'", "'}'", "','",
-  "'('", "')'", "'*'", "'='", "'{'", "':'", "$accept", "declaration_seq",
-  "declaration", "$@1", "declaration1", "$@2", "$@3", "simple_declaration",
-  "init_declarator_list_opt", "init_declarator_list", "init_declarator",
-  "decl_specifier_seq_opt", "decl_specifier_seq", "decl_specifier",
-  "storage_class_specifier", "type_specifier", "simple_type_specifier",
-  "ptr_operator", "cvar_qualifier_seq_opt", "cvar_qualifier_seq",
-  "cvar_qualifier", "declarator", "direct_declarator", "nested_declarator",
-  "direct_nested_declarator", "parameter_declaration_clause",
-  "parameter_declaration_list_opt", "parameter_declaration_list",
-  "parameter_declaration", "m_abstract_declarator",
-  "direct_m_abstract_declarator", "function_definition", "initializer_opt",
-  "initializer", "class_body", "member_specification_opt",
-  "member_specification", "member_declaration",
-  "member_declarator_list_opt", "member_declarator_list",
-  "member_declarator", "member_bitfield_declarator", "attribute_opt",
-  "enum_body", "enumerator_list", "enumerator", "asm_definition",
-  "asm_phrase_opt", "export_definition", YY_NULL
-};
-#endif
-# ifdef YYPRINT
-/* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to
-   token YYLEX-NUM.  */
-static const yytype_uint16 yytoknum[] =
-{
-       0,   256,   257,   258,   259,   260,   261,   262,   263,   264,
-     265,   266,   267,   268,   269,   270,   271,   272,   273,   274,
-     275,   276,   277,   278,   279,   280,   281,   282,   283,   284,
-     285,   286,   287,   288,   289,   290,   291,   292,   293,   294,
-     295,   296,   297,   298,   299,   300,    59,   125,    44,    40,
-      41,    42,    61,   123,    58
-};
-# endif
-/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
-static const yytype_uint8 yyr1[] =
-{
-       0,    55,    56,    56,    58,    57,    60,    59,    61,    59,
-      59,    59,    59,    59,    59,    59,    62,    63,    63,    64,
-      64,    65,    66,    66,    67,    67,    68,    68,    69,    69,
-      69,    69,    69,    70,    70,    70,    70,    70,    70,    70,
-      70,    70,    70,    70,    70,    70,    71,    71,    71,    71,
-      71,    71,    71,    71,    71,    71,    71,    71,    72,    73,
-      73,    74,    74,    75,    75,    75,    75,    76,    76,    77,
-      77,    77,    77,    77,    77,    78,    78,    79,    79,    79,
-      79,    79,    79,    79,    80,    80,    80,    81,    81,    82,
-      82,    83,    84,    84,    85,    85,    85,    85,    85,    85,
-      85,    85,    86,    87,    87,    88,    89,    89,    90,    90,
-      91,    91,    92,    92,    93,    93,    94,    94,    95,    95,
-      95,    96,    97,    97,    98,    98,    99,    99,   100,   100,
-     101,   102,   102,   103
-};
-/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
-static const yytype_uint8 yyr2[] =
-{
-       0,     2,     1,     2,     0,     2,     0,     4,     0,     3,
-       1,     1,     1,     1,     2,     2,     3,     0,     1,     1,
-       3,     4,     0,     1,     1,     2,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     4,     1,     2,     2,     2,
-       3,     3,     3,     2,     2,     2,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     1,     1,     1,     2,     0,
-       1,     1,     2,     1,     1,     1,     1,     2,     1,     1,
-       1,     4,     4,     2,     3,     2,     1,     1,     1,     4,
-       4,     2,     3,     3,     2,     1,     3,     0,     1,     1,
-       3,     2,     2,     1,     0,     1,     1,     4,     4,     2,
-       3,     3,     3,     0,     1,     2,     3,     3,     0,     1,
-       1,     2,     3,     2,     0,     1,     1,     3,     2,     2,
-       1,     2,     0,     2,     3,     4,     1,     3,     1,     3,
-       2,     0,     1,     5
-};
-/* YYDEFACT[STATE-NAME] -- Default reduction number in state STATE-NUM.
-   Performed when YYTABLE doesn't specify something else to do.  Zero
-   means the default is an error.  */
-static const yytype_uint8 yydefact[] =
-{
-       4,     4,     2,     0,     1,     3,     0,    28,    55,    46,
-      63,    53,     0,    31,     0,    52,    32,    48,    49,    29,
-      66,    47,    50,    30,     0,     8,     0,    51,    54,    64,
-       0,    56,     0,     0,    65,    36,    57,     5,    10,    17,
-      23,    24,    26,    27,    33,    34,    11,    12,    13,    14,
-      15,    39,     0,    43,     6,    37,     0,    44,    22,    38,
-      45,     0,     0,   130,    69,    70,     0,    59,     0,    18,
-      19,     0,   131,    68,    25,    42,   128,     0,   126,    22,
-      40,     0,   114,     0,     0,   110,     9,    17,    41,    94,
-       0,     0,     0,    58,    60,    61,    16,     0,    67,   132,
-     102,   122,    73,     0,     0,   124,     0,     7,   113,   107,
-      77,    78,     0,     0,     0,   122,    76,     0,   115,   116,
-     120,   106,     0,   111,   131,    95,    57,     0,    94,    91,
-      93,    35,     0,    74,    62,    20,   103,     0,     0,    85,
-      88,    89,   129,   125,   127,   119,     0,    77,     0,   121,
-      75,   118,    81,     0,   112,     0,     0,    96,     0,    92,
-      99,     0,   133,   123,     0,    21,   104,    72,    71,    84,
-       0,    83,    82,     0,     0,   117,   101,   100,     0,     0,
-     105,    86,    90,    80,    79,    98,    97
-};
-/* YYDEFGOTO[NTERM-NUM].  */
-static const yytype_int16 yydefgoto[] =
-{
-      -1,     1,     2,     3,    37,    79,    58,    38,    68,    69,
-      70,    82,    40,    41,    42,    43,    44,    71,    93,    94,
-      45,   124,    73,   115,   116,   138,   139,   140,   141,   129,
-     130,    46,   165,   166,    57,    83,    84,    85,   117,   118,
-     119,   120,   136,    53,    77,    78,    47,   101,    48
-};
-/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
-   STATE-NUM.  */
-#define YYPACT_NINF -94
-static const yytype_int16 yypact[] =
-{
-     -94,    15,   -94,   208,   -94,   -94,    34,   -94,   -94,   -94,
-     -94,   -94,   -27,   -94,    -5,   -94,   -94,   -94,   -94,   -94,
-     -94,   -94,   -94,   -94,   -25,   -94,   -16,   -94,   -94,   -94,
-      -4,   -94,    19,   -24,   -94,   -94,   -94,   -94,   -94,    24,
-     479,   -94,   -94,   -94,   -94,   -94,   -94,   -94,   -94,   -94,
-     -94,    29,    48,   -94,   -94,    37,   106,   -94,   479,    37,
-     -94,   479,    54,   -94,   -94,   -94,    24,    -2,    49,    53,
-     -94,    24,   -14,   -11,   -94,   -94,    47,    38,   -94,   479,
-     -94,    51,    23,    55,   157,   -94,   -94,    24,   -94,   393,
-      56,    58,    68,   -94,    -2,   -94,   -94,    24,   -94,   -94,
-     -94,   -94,   -94,   255,    67,   -94,     5,   -94,   -94,   -94,
-      50,   -94,     7,    69,    40,   -94,    -8,    83,    88,   -94,
-     -94,   -94,    91,   -94,   109,   -94,   -94,     4,    45,   -94,
-      16,   -94,    95,   -94,   -94,   -94,   -23,    92,    93,   108,
-      96,   -94,   -94,   -94,   -94,   -94,    97,   -94,    98,   -94,
-     -94,   118,   -94,   301,   -94,    23,   101,   -94,   104,   -94,
-     -94,   347,   -94,   -94,   120,   -94,   -94,   -94,   -94,   -94,
-     440,   -94,   -94,   111,   119,   -94,   -94,   -94,   130,   137,
-     -94,   -94,   -94,   -94,   -94,   -94,   -94
-};
-/* YYPGOTO[NTERM-NUM].  */
-static const yytype_int16 yypgoto[] =
-{
-     -94,   -94,   158,   -94,   -94,   -94,   -94,   -45,   -94,   -94,
-      94,    -1,   -61,   -29,   -94,   -94,   -94,   -79,   -94,   -94,
-     -63,    -7,   -94,   -93,   -94,   -92,   -94,   -94,   -60,   -57,
-     -94,   -94,   -94,   -94,   -19,   -94,   -94,   110,   -94,   -94,
-      33,    82,    78,   144,   -94,    99,   -94,   -94,   -94
-};
-/* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
-   positive, shift that token.  If negative, reduce the rule which
-   number is the opposite.  If YYTABLE_NINF, syntax error.  */
-#define YYTABLE_NINF -110
-static const yytype_int16 yytable[] =
-{
-      89,    90,    39,   114,    95,   156,    10,    60,   146,   163,
-     128,    74,    51,    86,    55,     4,    20,    99,    54,   148,
-     100,   150,    63,    59,   102,    29,    52,   152,    56,   164,
-      34,   134,    72,   114,   107,   114,    80,    56,   103,   -94,
-      88,   153,    89,   125,    76,    61,   147,   157,   128,   128,
-     111,   160,   143,   127,   -94,    67,   112,    87,    67,    92,
-      74,   174,   110,    64,    98,   161,   111,    65,    62,   179,
-     158,   159,   112,    66,    67,    67,   114,   113,    87,   147,
-      49,    50,    52,   111,   125,   105,   106,    76,   157,   112,
-      56,    67,    89,    91,   127,    96,    67,   108,   109,   104,
-      89,    97,   121,   142,   113,   149,   131,    81,   132,    89,
-     182,     7,     8,     9,    10,    11,    12,    13,   133,    15,
-      16,    17,    18,    19,    20,    21,    22,    23,    24,   154,
-      26,    27,    28,    29,    30,    31,   155,   108,    34,    35,
-      99,   162,   167,   168,   170,   -22,   169,   171,   172,    36,
-     163,   176,   -22,  -108,   177,   -22,   180,   -22,   122,     5,
-     -22,   183,     7,     8,     9,    10,    11,    12,    13,   184,
-      15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
-     185,    26,    27,    28,    29,    30,    31,   186,   175,    34,
-      35,   135,   145,   151,   123,    75,   -22,     0,     0,     0,
-      36,     0,     0,   -22,  -109,   144,   -22,     0,   -22,     6,
-       0,   -22,     0,     7,     8,     9,    10,    11,    12,    13,
-      14,    15,    16,    17,    18,    19,    20,    21,    22,    23,
-      24,    25,    26,    27,    28,    29,    30,    31,    32,    33,
-      34,    35,     0,     0,     0,     0,     0,   -22,     0,     0,
-       0,    36,     0,     0,   -22,     0,   137,   -22,     0,   -22,
-       7,     8,     9,    10,    11,    12,    13,     0,    15,    16,
-      17,    18,    19,    20,    21,    22,    23,    24,     0,    26,
-      27,    28,    29,    30,    31,     0,     0,    34,    35,     0,
-       0,     0,     0,   -87,     0,     0,     0,     0,    36,     0,
-       0,     0,   173,     0,     0,   -87,     7,     8,     9,    10,
-      11,    12,    13,     0,    15,    16,    17,    18,    19,    20,
-      21,    22,    23,    24,     0,    26,    27,    28,    29,    30,
-      31,     0,     0,    34,    35,     0,     0,     0,     0,   -87,
-       0,     0,     0,     0,    36,     0,     0,     0,   178,     0,
-       0,   -87,     7,     8,     9,    10,    11,    12,    13,     0,
-      15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
-       0,    26,    27,    28,    29,    30,    31,     0,     0,    34,
-      35,     0,     0,     0,     0,   -87,     0,     0,     0,     0,
-      36,     0,     0,     0,     0,     0,     0,   -87,     7,     8,
-       9,    10,    11,    12,    13,     0,    15,    16,    17,    18,
-      19,    20,    21,    22,    23,    24,     0,    26,    27,    28,
-      29,    30,    31,     0,     0,    34,    35,     0,     0,     0,
-       0,     0,   125,     0,     0,     0,   126,     0,     0,     0,
-       0,     0,   127,     0,    67,     7,     8,     9,    10,    11,
-      12,    13,     0,    15,    16,    17,    18,    19,    20,    21,
-      22,    23,    24,     0,    26,    27,    28,    29,    30,    31,
-       0,     0,    34,    35,     0,     0,     0,     0,   181,     0,
-       0,     0,     0,    36,     7,     8,     9,    10,    11,    12,
-      13,     0,    15,    16,    17,    18,    19,    20,    21,    22,
-      23,    24,     0,    26,    27,    28,    29,    30,    31,     0,
-       0,    34,    35,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,    36
-};
-#define yypact_value_is_default(Yystate) \
-  (!!((Yystate) == (-94)))
-#define yytable_value_is_error(Yytable_value) \
-  YYID (0)
-static const yytype_int16 yycheck[] =
-{
-      61,    61,     3,    82,    67,     1,     8,    26,     1,    32,
-      89,    40,    39,    58,    39,     0,    18,    31,    23,   112,
-      34,   114,    46,    39,    35,    27,    53,    35,    53,    52,
-      32,    94,    39,   112,    79,   114,    55,    53,    49,    35,
-      59,    49,   103,    39,    39,    49,    39,    43,   127,   128,
-      43,    35,    47,    49,    50,    51,    49,    58,    51,    66,
-      89,   153,    39,    39,    71,    49,    43,    43,    49,   161,
-     127,   128,    49,    49,    51,    51,   155,    54,    79,    39,
-      46,    47,    53,    43,    39,    47,    48,    39,    43,    49,
-      53,    51,   153,    39,    49,    46,    51,    46,    47,    52,
-     161,    48,    47,    36,    54,    36,    50,     1,    50,   170,
-     170,     5,     6,     7,     8,     9,    10,    11,    50,    13,
-      14,    15,    16,    17,    18,    19,    20,    21,    22,    46,
-      24,    25,    26,    27,    28,    29,    48,    46,    32,    33,
-      31,    46,    50,    50,    48,    39,    38,    50,    50,    43,
-      32,    50,    46,    47,    50,    49,    36,    51,     1,     1,
-      54,    50,     5,     6,     7,     8,     9,    10,    11,    50,
-      13,    14,    15,    16,    17,    18,    19,    20,    21,    22,
-      50,    24,    25,    26,    27,    28,    29,    50,   155,    32,
-      33,    97,   110,   115,    84,    51,    39,    -1,    -1,    -1,
-      43,    -1,    -1,    46,    47,   106,    49,    -1,    51,     1,
-      -1,    54,    -1,     5,     6,     7,     8,     9,    10,    11,
-      12,    13,    14,    15,    16,    17,    18,    19,    20,    21,
-      22,    23,    24,    25,    26,    27,    28,    29,    30,    31,
-      32,    33,    -1,    -1,    -1,    -1,    -1,    39,    -1,    -1,
-      -1,    43,    -1,    -1,    46,    -1,     1,    49,    -1,    51,
-       5,     6,     7,     8,     9,    10,    11,    -1,    13,    14,
-      15,    16,    17,    18,    19,    20,    21,    22,    -1,    24,
-      25,    26,    27,    28,    29,    -1,    -1,    32,    33,    -1,
-      -1,    -1,    -1,    38,    -1,    -1,    -1,    -1,    43,    -1,
-      -1,    -1,     1,    -1,    -1,    50,     5,     6,     7,     8,
-       9,    10,    11,    -1,    13,    14,    15,    16,    17,    18,
-      19,    20,    21,    22,    -1,    24,    25,    26,    27,    28,
-      29,    -1,    -1,    32,    33,    -1,    -1,    -1,    -1,    38,
-      -1,    -1,    -1,    -1,    43,    -1,    -1,    -1,     1,    -1,
-      -1,    50,     5,     6,     7,     8,     9,    10,    11,    -1,
-      13,    14,    15,    16,    17,    18,    19,    20,    21,    22,
-      -1,    24,    25,    26,    27,    28,    29,    -1,    -1,    32,
-      33,    -1,    -1,    -1,    -1,    38,    -1,    -1,    -1,    -1,
-      43,    -1,    -1,    -1,    -1,    -1,    -1,    50,     5,     6,
-       7,     8,     9,    10,    11,    -1,    13,    14,    15,    16,
-      17,    18,    19,    20,    21,    22,    -1,    24,    25,    26,
-      27,    28,    29,    -1,    -1,    32,    33,    -1,    -1,    -1,
-      -1,    -1,    39,    -1,    -1,    -1,    43,    -1,    -1,    -1,
-      -1,    -1,    49,    -1,    51,     5,     6,     7,     8,     9,
-      10,    11,    -1,    13,    14,    15,    16,    17,    18,    19,
-      20,    21,    22,    -1,    24,    25,    26,    27,    28,    29,
-      -1,    -1,    32,    33,    -1,    -1,    -1,    -1,    38,    -1,
-      -1,    -1,    -1,    43,     5,     6,     7,     8,     9,    10,
-      11,    -1,    13,    14,    15,    16,    17,    18,    19,    20,
-      21,    22,    -1,    24,    25,    26,    27,    28,    29,    -1,
-      -1,    32,    33,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    43
-};
-/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
-   symbol of state STATE-NUM.  */
-static const yytype_uint8 yystos[] =
-{
-       0,    56,    57,    58,     0,    57,     1,     5,     6,     7,
-       8,     9,    10,    11,    12,    13,    14,    15,    16,    17,
-      18,    19,    20,    21,    22,    23,    24,    25,    26,    27,
-      28,    29,    30,    31,    32,    33,    43,    59,    62,    66,
-      67,    68,    69,    70,    71,    75,    86,   101,   103,    46,
-      47,    39,    53,    98,    23,    39,    53,    89,    61,    39,
-      89,    49,    49,    46,    39,    43,    49,    51,    63,    64,
-      65,    72,    76,    77,    68,    98,    39,    99,   100,    60,
-      89,     1,    66,    90,    91,    92,    62,    66,    89,    67,
-      83,    39,    76,    73,    74,    75,    46,    48,    76,    31,
-      34,   102,    35,    49,    52,    47,    48,    62,    46,    47,
-      39,    43,    49,    54,    72,    78,    79,    93,    94,    95,
-      96,    47,     1,    92,    76,    39,    43,    49,    72,    84,
-      85,    50,    50,    50,    75,    65,    97,     1,    80,    81,
-      82,    83,    36,    47,   100,    96,     1,    39,    78,    36,
-      78,    97,    35,    49,    46,    48,     1,    43,    84,    84,
-      35,    49,    46,    32,    52,    87,    88,    50,    50,    38,
-      48,    50,    50,     1,    80,    95,    50,    50,     1,    80,
-      36,    38,    83,    50,    50,    50,    50
-};
-#define yyerrok         (yyerrstatus = 0)
-#define yyclearin       (yychar = YYEMPTY)
-#define YYEMPTY         (-2)
-#define YYEOF           0
-#define YYACCEPT        goto yyacceptlab
-#define YYABORT         goto yyabortlab
-#define YYERROR         goto yyerrorlab
-/* Like YYERROR except do call yyerror.  This remains here temporarily
-   to ease the transition to the new meaning of YYERROR, for GCC.
-   Once GCC version 2 has supplanted version 1, this can go.  However,
-   YYFAIL appears to be in use.  Nevertheless, it is formally deprecated
-   in Bison 2.4.2's NEWS entry, where a plan to phase it out is
-   discussed.  */
-#define YYFAIL          goto yyerrlab
-#if defined YYFAIL
-  /* This is here to suppress warnings from the GCC cpp's
-     -Wunused-macros.  Normally we don't worry about that warning, but
-     some users do, and we want to make it easy for users to remove
-     YYFAIL uses, which will produce warnings from Bison 2.5.  */
-#endif
-#define YYRECOVERING()  (!!yyerrstatus)
-#define YYBACKUP(Token, Value)                                  \
-do                                                              \
-  if (yychar == YYEMPTY)                                        \
-    {                                                           \
-      yychar = (Token);                                         \
-      yylval = (Value);                                         \
-      YYPOPSTACK (yylen);                                       \
-      yystate = *yyssp;                                         \
-      goto yybackup;                                            \
-    }                                                           \
-  else                                                          \
-    {                                                           \
-      yyerror (YY_("syntax error: cannot back up")); \
-      YYERROR;                                                  \
-    }                                                           \
-while (YYID (0))
-/* Error token number */
-#define YYTERROR        1
-#define YYERRCODE       256
-/* This macro is provided for backward compatibility. */
-#ifndef YY_LOCATION_PRINT
-# define YY_LOCATION_PRINT(File, Loc) ((void) 0)
-#endif
-/* YYLEX -- calling `yylex' with the right arguments.  */
-#ifdef YYLEX_PARAM
-# define YYLEX yylex (YYLEX_PARAM)
-#else
-# define YYLEX yylex ()
-#endif
-/* Enable debugging if requested.  */
-#if YYDEBUG
-# ifndef YYFPRINTF
-#  include <stdio.h> /* INFRINGES ON USER NAME SPACE */
-#  define YYFPRINTF fprintf
-# endif
-# define YYDPRINTF(Args)                        \
-do {                                            \
-  if (yydebug)                                  \
-    YYFPRINTF Args;                             \
-} while (YYID (0))
-# define YY_SYMBOL_PRINT(Title, Type, Value, Location)                    \
-do {                                                                      \
-  if (yydebug)                                                            \
-    {                                                                     \
-      YYFPRINTF (stderr, "%s ", Title);                                   \
-      yy_symbol_print (stderr,                                            \
-                  Type, Value); \
-      YYFPRINTF (stderr, "\n");                                           \
-    }                                                                     \
-} while (YYID (0))
-/*--------------------------------.
-| Print this symbol on YYOUTPUT.  |
-`--------------------------------*/
-/*ARGSUSED*/
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
-static void
-yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
-#else
-static void
-yy_symbol_value_print (yyoutput, yytype, yyvaluep)
-    FILE *yyoutput;
-    int yytype;
-    YYSTYPE const * const yyvaluep;
-#endif
-{
-  FILE *yyo = yyoutput;
-  YYUSE (yyo);
-  if (!yyvaluep)
-    return;
-# ifdef YYPRINT
-  if (yytype < YYNTOKENS)
-    YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
-# else
-  YYUSE (yyoutput);
-# endif
-  switch (yytype)
-    {
-      default:
-        break;
-    }
-}
-/*--------------------------------.
-| Print this symbol on YYOUTPUT.  |
-`--------------------------------*/
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
-static void
-yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
-#else
-static void
-yy_symbol_print (yyoutput, yytype, yyvaluep)
-    FILE *yyoutput;
-    int yytype;
-    YYSTYPE const * const yyvaluep;
-#endif
-{
-  if (yytype < YYNTOKENS)
-    YYFPRINTF (yyoutput, "token %s (", yytname[yytype]);
-  else
-    YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]);
-  yy_symbol_value_print (yyoutput, yytype, yyvaluep);
-  YYFPRINTF (yyoutput, ")");
-}
-/*------------------------------------------------------------------.
-| yy_stack_print -- Print the state stack from its BOTTOM up to its |
-| TOP (included).                                                   |
-`------------------------------------------------------------------*/
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
-static void
-yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop)
-#else
-static void
-yy_stack_print (yybottom, yytop)
-    yytype_int16 *yybottom;
-    yytype_int16 *yytop;
-#endif
-{
-  YYFPRINTF (stderr, "Stack now");
-  for (; yybottom <= yytop; yybottom++)
-    {
-      int yybot = *yybottom;
-      YYFPRINTF (stderr, " %d", yybot);
-    }
-  YYFPRINTF (stderr, "\n");
-}
-# define YY_STACK_PRINT(Bottom, Top)                            \
-do {                                                            \
-  if (yydebug)                                                  \
-    yy_stack_print ((Bottom), (Top));                           \
-} while (YYID (0))
-/*------------------------------------------------.
-| Report that the YYRULE is going to be reduced.  |
-`------------------------------------------------*/
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
-static void
-yy_reduce_print (YYSTYPE *yyvsp, int yyrule)
-#else
-static void
-yy_reduce_print (yyvsp, yyrule)
-    YYSTYPE *yyvsp;
-    int yyrule;
-#endif
-{
-  int yynrhs = yyr2[yyrule];
-  int yyi;
-  unsigned long int yylno = yyrline[yyrule];
-  YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n",
-             yyrule - 1, yylno);
-  /* The symbols being reduced.  */
-  for (yyi = 0; yyi < yynrhs; yyi++)
-    {
-      YYFPRINTF (stderr, "   $%d = ", yyi + 1);
-      yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi],
-                       &(yyvsp[(yyi + 1) - (yynrhs)])
-                                       );
-      YYFPRINTF (stderr, "\n");
-    }
-}
-# define YY_REDUCE_PRINT(Rule)          \
-do {                                    \
-  if (yydebug)                          \
-    yy_reduce_print (yyvsp, Rule); \
-} while (YYID (0))
-/* Nonzero means print parse trace.  It is left uninitialized so that
-   multiple parsers can coexist.  */
-int yydebug;
-#else /* !YYDEBUG */
-# define YYDPRINTF(Args)
-# define YY_SYMBOL_PRINT(Title, Type, Value, Location)
-# define YY_STACK_PRINT(Bottom, Top)
-# define YY_REDUCE_PRINT(Rule)
-#endif /* !YYDEBUG */
-/* YYINITDEPTH -- initial size of the parser's stacks.  */
-#ifndef YYINITDEPTH
-# define YYINITDEPTH 200
-#endif
-/* YYMAXDEPTH -- maximum size the stacks can grow to (effective only
-   if the built-in stack extension method is used).
-   Do not make this value too large; the results are undefined if
-   YYSTACK_ALLOC_MAXIMUM < YYSTACK_BYTES (YYMAXDEPTH)
-   evaluated with infinite-precision integer arithmetic.  */
-#ifndef YYMAXDEPTH
-# define YYMAXDEPTH 10000
-#endif
-#if YYERROR_VERBOSE
-# ifndef yystrlen
-#  if defined __GLIBC__ && defined _STRING_H
-#   define yystrlen strlen
-#  else
-/* Return the length of YYSTR.  */
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
-static YYSIZE_T
-yystrlen (const char *yystr)
-#else
-static YYSIZE_T
-yystrlen (yystr)
-    const char *yystr;
-#endif
-{
-  YYSIZE_T yylen;
-  for (yylen = 0; yystr[yylen]; yylen++)
-    continue;
-  return yylen;
-}
-#  endif
-# endif
-# ifndef yystpcpy
-#  if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE
-#   define yystpcpy stpcpy
-#  else
-/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
-   YYDEST.  */
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
-static char *
-yystpcpy (char *yydest, const char *yysrc)
-#else
-static char *
-yystpcpy (yydest, yysrc)
-    char *yydest;
-    const char *yysrc;
-#endif
-{
-  char *yyd = yydest;
-  const char *yys = yysrc;
-  while ((*yyd++ = *yys++) != '\0')
-    continue;
-  return yyd - 1;
-}
-#  endif
-# endif
-# ifndef yytnamerr
-/* Copy to YYRES the contents of YYSTR after stripping away unnecessary
-   quotes and backslashes, so that it's suitable for yyerror.  The
-   heuristic is that double-quoting is unnecessary unless the string
-   contains an apostrophe, a comma, or backslash (other than
-   backslash-backslash).  YYSTR is taken from yytname.  If YYRES is
-   null, do not copy; instead, return the length of what the result
-   would have been.  */
-static YYSIZE_T
-yytnamerr (char *yyres, const char *yystr)
-{
-  if (*yystr == '"')
-    {
-      YYSIZE_T yyn = 0;
-      char const *yyp = yystr;
-      for (;;)
-        switch (*++yyp)
-          {
-          case '\'':
-          case ',':
-            goto do_not_strip_quotes;
-          case '\\':
-            if (*++yyp != '\\')
-              goto do_not_strip_quotes;
-            /* Fall through.  */
-          default:
-            if (yyres)
-              yyres[yyn] = *yyp;
-            yyn++;
-            break;
-          case '"':
-            if (yyres)
-              yyres[yyn] = '\0';
-            return yyn;
-          }
-    do_not_strip_quotes: ;
-    }
-  if (! yyres)
-    return yystrlen (yystr);
-  return yystpcpy (yyres, yystr) - yyres;
-}
-# endif
-/* Copy into *YYMSG, which is of size *YYMSG_ALLOC, an error message
-   about the unexpected token YYTOKEN for the state stack whose top is
-   YYSSP.
-   Return 0 if *YYMSG was successfully written.  Return 1 if *YYMSG is
-   not large enough to hold the message.  In that case, also set
-   *YYMSG_ALLOC to the required number of bytes.  Return 2 if the
-   required number of bytes is too large to store.  */
-static int
-yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
-                yytype_int16 *yyssp, int yytoken)
-{
-  YYSIZE_T yysize0 = yytnamerr (YY_NULL, yytname[yytoken]);
-  YYSIZE_T yysize = yysize0;
-  enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
-  /* Internationalized format string. */
-  const char *yyformat = YY_NULL;
-  /* Arguments of yyformat. */
-  char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
-  /* Number of reported tokens (one for the "unexpected", one per
-     "expected"). */
-  int yycount = 0;
-  /* There are many possibilities here to consider:
-     - Assume YYFAIL is not used.  It's too flawed to consider.  See
-       <http://lists.gnu.org/archive/html/bison-patches/2009-12/msg00024.html>
-       for details.  YYERROR is fine as it does not invoke this
-       function.
-     - If this state is a consistent state with a default action, then
-       the only way this function was invoked is if the default action
-       is an error action.  In that case, don't check for expected
-       tokens because there are none.
-     - The only way there can be no lookahead present (in yychar) is if
-       this state is a consistent state with a default action.  Thus,
-       detecting the absence of a lookahead is sufficient to determine
-       that there is no unexpected or expected token to report.  In that
-       case, just report a simple "syntax error".
-     - Don't assume there isn't a lookahead just because this state is a
-       consistent state with a default action.  There might have been a
-       previous inconsistent state, consistent state with a non-default
-       action, or user semantic action that manipulated yychar.
-     - Of course, the expected token list depends on states to have
-       correct lookahead information, and it depends on the parser not
-       to perform extra reductions after fetching a lookahead from the
-       scanner and before detecting a syntax error.  Thus, state merging
-       (from LALR or IELR) and default reductions corrupt the expected
-       token list.  However, the list is correct for canonical LR with
-       one exception: it will still contain any token that will not be
-       accepted due to an error action in a later state.
-  */
-  if (yytoken != YYEMPTY)
-    {
-      int yyn = yypact[*yyssp];
-      yyarg[yycount++] = yytname[yytoken];
-      if (!yypact_value_is_default (yyn))
-        {
-          /* Start YYX at -YYN if negative to avoid negative indexes in
-             YYCHECK.  In other words, skip the first -YYN actions for
-             this state because they are default actions.  */
-          int yyxbegin = yyn < 0 ? -yyn : 0;
-          /* Stay within bounds of both yycheck and yytname.  */
-          int yychecklim = YYLAST - yyn + 1;
-          int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
-          int yyx;
-          for (yyx = yyxbegin; yyx < yyxend; ++yyx)
-            if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR
-                && !yytable_value_is_error (yytable[yyx + yyn]))
-              {
-                if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
-                  {
-                    yycount = 1;
-                    yysize = yysize0;
-                    break;
-                  }
-                yyarg[yycount++] = yytname[yyx];
-                {
-                  YYSIZE_T yysize1 = yysize + yytnamerr (YY_NULL, yytname[yyx]);
-                  if (! (yysize <= yysize1
-                         && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
-                    return 2;
-                  yysize = yysize1;
-                }
-              }
-        }
-    }
-  switch (yycount)
-    {
-# define YYCASE_(N, S)                      \
-      case N:                               \
-        yyformat = S;                       \
-      break
-      YYCASE_(0, YY_("syntax error"));
-      YYCASE_(1, YY_("syntax error, unexpected %s"));
-      YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s"));
-      YYCASE_(3, YY_("syntax error, unexpected %s, expecting %s or %s"));
-      YYCASE_(4, YY_("syntax error, unexpected %s, expecting %s or %s or %s"));
-      YYCASE_(5, YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s"));
-# undef YYCASE_
-    }
-  {
-    YYSIZE_T yysize1 = yysize + yystrlen (yyformat);
-    if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
-      return 2;
-    yysize = yysize1;
-  }
-  if (*yymsg_alloc < yysize)
-    {
-      *yymsg_alloc = 2 * yysize;
-      if (! (yysize <= *yymsg_alloc
-             && *yymsg_alloc <= YYSTACK_ALLOC_MAXIMUM))
-        *yymsg_alloc = YYSTACK_ALLOC_MAXIMUM;
-      return 1;
-    }
-  /* Avoid sprintf, as that infringes on the user's name space.
-     Don't have undefined behavior even if the translation
-     produced a string with the wrong number of "%s"s.  */
-  {
-    char *yyp = *yymsg;
-    int yyi = 0;
-    while ((*yyp = *yyformat) != '\0')
-      if (*yyp == '%' && yyformat[1] == 's' && yyi < yycount)
-        {
-          yyp += yytnamerr (yyp, yyarg[yyi++]);
-          yyformat += 2;
-        }
-      else
-        {
-          yyp++;
-          yyformat++;
-        }
-  }
-  return 0;
-}
-#endif /* YYERROR_VERBOSE */
-/*-----------------------------------------------.
-| Release the memory associated to this symbol.  |
-`-----------------------------------------------*/
-/*ARGSUSED*/
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
-static void
-yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep)
-#else
-static void
-yydestruct (yymsg, yytype, yyvaluep)
-    const char *yymsg;
-    int yytype;
-    YYSTYPE *yyvaluep;
-#endif
-{
-  YYUSE (yyvaluep);
-  if (!yymsg)
-    yymsg = "Deleting";
-  YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);
-  switch (yytype)
-    {
-      default:
-        break;
-    }
-}
-/* The lookahead symbol.  */
-int yychar;
-#ifndef YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
-# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
-# define YY_IGNORE_MAYBE_UNINITIALIZED_END
-#endif
-#ifndef YY_INITIAL_VALUE
-# define YY_INITIAL_VALUE(Value) /* Nothing. */
-#endif
-/* The semantic value of the lookahead symbol.  */
-YYSTYPE yylval YY_INITIAL_VALUE(yyval_default);
-/* Number of syntax errors so far.  */
-int yynerrs;
-/*----------.
-| yyparse.  |
-`----------*/
-#ifdef YYPARSE_PARAM
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
-int
-yyparse (void *YYPARSE_PARAM)
-#else
-int
-yyparse (YYPARSE_PARAM)
-    void *YYPARSE_PARAM;
-#endif
-#else /* ! YYPARSE_PARAM */
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
-int
-yyparse (void)
-#else
-int
-yyparse ()
-#endif
-#endif
-{
-    int yystate;
-    /* Number of tokens to shift before error messages enabled.  */
-    int yyerrstatus;
-    /* The stacks and their tools:
-       `yyss': related to states.
-       `yyvs': related to semantic values.
-       Refer to the stacks through separate pointers, to allow yyoverflow
-       to reallocate them elsewhere.  */
-    /* The state stack.  */
-    yytype_int16 yyssa[YYINITDEPTH];
-    yytype_int16 *yyss;
-    yytype_int16 *yyssp;
-    /* The semantic value stack.  */
-    YYSTYPE yyvsa[YYINITDEPTH];
-    YYSTYPE *yyvs;
-    YYSTYPE *yyvsp;
-    YYSIZE_T yystacksize;
-  int yyn;
-  int yyresult;
-  /* Lookahead token as an internal (translated) token number.  */
-  int yytoken = 0;
-  /* The variables used to return semantic value and location from the
-     action routines.  */
-  YYSTYPE yyval;
-#if YYERROR_VERBOSE
-  /* Buffer for error messages, and its allocated size.  */
-  char yymsgbuf[128];
-  char *yymsg = yymsgbuf;
-  YYSIZE_T yymsg_alloc = sizeof yymsgbuf;
-#endif
-#define YYPOPSTACK(N)   (yyvsp -= (N), yyssp -= (N))
-  /* The number of symbols on the RHS of the reduced rule.
-     Keep to zero when no symbol should be popped.  */
-  int yylen = 0;
-  yyssp = yyss = yyssa;
-  yyvsp = yyvs = yyvsa;
-  yystacksize = YYINITDEPTH;
-  YYDPRINTF ((stderr, "Starting parse\n"));
-  yystate = 0;
-  yyerrstatus = 0;
-  yynerrs = 0;
-  yychar = YYEMPTY; /* Cause a token to be read.  */
-  goto yysetstate;
-/*------------------------------------------------------------.
-| yynewstate -- Push a new state, which is found in yystate.  |
-`------------------------------------------------------------*/
- yynewstate:
-  /* In all cases, when you get here, the value and location stacks
-     have just been pushed.  So pushing a state here evens the stacks.  */
-  yyssp++;
- yysetstate:
-  *yyssp = yystate;
-  if (yyss + yystacksize - 1 <= yyssp)
-    {
-      /* Get the current used size of the three stacks, in elements.  */
-      YYSIZE_T yysize = yyssp - yyss + 1;
-#ifdef yyoverflow
-      {
-        /* Give user a chance to reallocate the stack.  Use copies of
-           these so that the &'s don't force the real ones into
-           memory.  */
-        YYSTYPE *yyvs1 = yyvs;
-        yytype_int16 *yyss1 = yyss;
-        /* Each stack pointer address is followed by the size of the
-           data in use in that stack, in bytes.  This used to be a
-           conditional around just the two extra args, but that might
-           be undefined if yyoverflow is a macro.  */
-        yyoverflow (YY_("memory exhausted"),
-                    &yyss1, yysize * sizeof (*yyssp),
-                    &yyvs1, yysize * sizeof (*yyvsp),
-                    &yystacksize);
-        yyss = yyss1;
-        yyvs = yyvs1;
-      }
-#else /* no yyoverflow */
-# ifndef YYSTACK_RELOCATE
-      goto yyexhaustedlab;
-# else
-      /* Extend the stack our own way.  */
-      if (YYMAXDEPTH <= yystacksize)
-        goto yyexhaustedlab;
-      yystacksize *= 2;
-      if (YYMAXDEPTH < yystacksize)
-        yystacksize = YYMAXDEPTH;
-      {
-        yytype_int16 *yyss1 = yyss;
-        union yyalloc *yyptr =
-          (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
-        if (! yyptr)
-          goto yyexhaustedlab;
-        YYSTACK_RELOCATE (yyss_alloc, yyss);
-        YYSTACK_RELOCATE (yyvs_alloc, yyvs);
-#  undef YYSTACK_RELOCATE
-        if (yyss1 != yyssa)
-          YYSTACK_FREE (yyss1);
-      }
-# endif
-#endif /* no yyoverflow */
-      yyssp = yyss + yysize - 1;
-      yyvsp = yyvs + yysize - 1;
-      YYDPRINTF ((stderr, "Stack size increased to %lu\n",
-                  (unsigned long int) yystacksize));
-      if (yyss + yystacksize - 1 <= yyssp)
-        YYABORT;
-    }
-  YYDPRINTF ((stderr, "Entering state %d\n", yystate));
-  if (yystate == YYFINAL)
-    YYACCEPT;
-  goto yybackup;
-/*-----------.
-| yybackup.  |
-`-----------*/
-yybackup:
-  /* Do appropriate processing given the current state.  Read a
-     lookahead token if we need one and don't already have one.  */
-  /* First try to decide what to do without reference to lookahead token.  */
-  yyn = yypact[yystate];
-  if (yypact_value_is_default (yyn))
-    goto yydefault;
-  /* Not known => get a lookahead token if don't already have one.  */
-  /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol.  */
-  if (yychar == YYEMPTY)
-    {
-      YYDPRINTF ((stderr, "Reading a token: "));
-      yychar = YYLEX;
-    }
-  if (yychar <= YYEOF)
-    {
-      yychar = yytoken = YYEOF;
-      YYDPRINTF ((stderr, "Now at end of input.\n"));
-    }
-  else
-    {
-      yytoken = YYTRANSLATE (yychar);
-      YY_SYMBOL_PRINT ("Next token is", yytoken, &yylval, &yylloc);
-    }
-  /* If the proper action on seeing token YYTOKEN is to reduce or to
-     detect an error, take that action.  */
-  yyn += yytoken;
-  if (yyn < 0 || YYLAST < yyn || yycheck[yyn] != yytoken)
-    goto yydefault;
-  yyn = yytable[yyn];
-  if (yyn <= 0)
-    {
-      if (yytable_value_is_error (yyn))
-        goto yyerrlab;
-      yyn = -yyn;
-      goto yyreduce;
-    }
-  /* Count tokens shifted since error; after three, turn off error
-     status.  */
-  if (yyerrstatus)
-    yyerrstatus--;
-  /* Shift the lookahead token.  */
-  YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);
-  /* Discard the shifted token.  */
-  yychar = YYEMPTY;
-  yystate = yyn;
-  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
-  *++yyvsp = yylval;
-  YY_IGNORE_MAYBE_UNINITIALIZED_END
-  goto yynewstate;
-/*-----------------------------------------------------------.
-| yydefault -- do the default action for the current state.  |
-`-----------------------------------------------------------*/
-yydefault:
-  yyn = yydefact[yystate];
-  if (yyn == 0)
-    goto yyerrlab;
-  goto yyreduce;
-/*-----------------------------.
-| yyreduce -- Do a reduction.  |
-`-----------------------------*/
-yyreduce:
-  /* yyn is the number of a rule to reduce with.  */
-  yylen = yyr2[yyn];
-  /* If YYLEN is nonzero, implement the default value of the action:
-     `$$ = $1'.
-     Otherwise, the following line sets YYVAL to garbage.
-     This behavior is undocumented and Bison
-     users should not rely upon it.  Assigning to YYVAL
-     unconditionally makes the parser a bit smaller, and it avoids a
-     GCC warning that YYVAL may be used uninitialized.  */
-  yyval = yyvsp[1-yylen];
-  YY_REDUCE_PRINT (yyn);
-  switch (yyn)
-    {
-        case 4:
-    { is_typedef = 0; is_extern = 0; current_name = NULL; decl_spec = NULL; }
-    break;
-  case 5:
-    { free_list(*(yyvsp[(2) - (2)]), NULL); *(yyvsp[(2) - (2)]) = NULL; }
-    break;
-  case 6:
-    { is_typedef = 1; }
-    break;
-  case 7:
-    { (yyval) = (yyvsp[(4) - (4)]); }
-    break;
-  case 8:
-    { is_typedef = 1; }
-    break;
-  case 9:
-    { (yyval) = (yyvsp[(3) - (3)]); }
-    break;
-  case 14:
-    { (yyval) = (yyvsp[(2) - (2)]); }
-    break;
-  case 15:
-    { (yyval) = (yyvsp[(2) - (2)]); }
-    break;
-  case 16:
-    { if (current_name) {
-                    struct string_list *decl = (*(yyvsp[(3) - (3)]))->next;
-                    (*(yyvsp[(3) - (3)]))->next = NULL;
-                    add_symbol(current_name,
-                               is_typedef ? SYM_TYPEDEF : SYM_NORMAL,
-                               decl, is_extern);
-                    current_name = NULL;
-                  }
-                  (yyval) = (yyvsp[(3) - (3)]);
-                }
-    break;
-  case 17:
-    { (yyval) = NULL; }
-    break;
-  case 19:
-    { struct string_list *decl = *(yyvsp[(1) - (1)]);
-                  *(yyvsp[(1) - (1)]) = NULL;
-                  add_symbol(current_name,
-                             is_typedef ? SYM_TYPEDEF : SYM_NORMAL, decl, is_extern);
-                  current_name = NULL;
-                  (yyval) = (yyvsp[(1) - (1)]);
-                }
-    break;
-  case 20:
-    { struct string_list *decl = *(yyvsp[(3) - (3)]);
-                  *(yyvsp[(3) - (3)]) = NULL;
-                  free_list(*(yyvsp[(2) - (3)]), NULL);
-                  *(yyvsp[(2) - (3)]) = decl_spec;
-                  add_symbol(current_name,
-                             is_typedef ? SYM_TYPEDEF : SYM_NORMAL, decl, is_extern);
-                  current_name = NULL;
-                  (yyval) = (yyvsp[(3) - (3)]);
-                }
-    break;
-  case 21:
-    { (yyval) = (yyvsp[(4) - (4)]) ? (yyvsp[(4) - (4)]) : (yyvsp[(3) - (4)]) ? (yyvsp[(3) - (4)]) : (yyvsp[(2) - (4)]) ? (yyvsp[(2) - (4)]) : (yyvsp[(1) - (4)]); }
-    break;
-  case 22:
-    { decl_spec = NULL; }
-    break;
-  case 24:
-    { decl_spec = *(yyvsp[(1) - (1)]); }
-    break;
-  case 25:
-    { decl_spec = *(yyvsp[(2) - (2)]); }
-    break;
-  case 26:
-    { /* Version 2 checksumming ignores storage class, as that
-                     is really irrelevant to the linkage.  */
-                  remove_node((yyvsp[(1) - (1)]));
-                  (yyval) = (yyvsp[(1) - (1)]);
-                }
-    break;
-  case 31:
-    { is_extern = 1; (yyval) = (yyvsp[(1) - (1)]); }
-    break;
-  case 32:
-    { is_extern = 0; (yyval) = (yyvsp[(1) - (1)]); }
-    break;
-  case 37:
-    { remove_node((yyvsp[(1) - (2)])); (*(yyvsp[(2) - (2)]))->tag = SYM_STRUCT; (yyval) = (yyvsp[(2) - (2)]); }
-    break;
-  case 38:
-    { remove_node((yyvsp[(1) - (2)])); (*(yyvsp[(2) - (2)]))->tag = SYM_UNION; (yyval) = (yyvsp[(2) - (2)]); }
-    break;
-  case 39:
-    { remove_node((yyvsp[(1) - (2)])); (*(yyvsp[(2) - (2)]))->tag = SYM_ENUM; (yyval) = (yyvsp[(2) - (2)]); }
-    break;
-  case 40:
-    { record_compound((yyvsp[(1) - (3)]), (yyvsp[(2) - (3)]), (yyvsp[(3) - (3)]), SYM_STRUCT); (yyval) = (yyvsp[(3) - (3)]); }
-    break;
-  case 41:
-    { record_compound((yyvsp[(1) - (3)]), (yyvsp[(2) - (3)]), (yyvsp[(3) - (3)]), SYM_UNION); (yyval) = (yyvsp[(3) - (3)]); }
-    break;
-  case 42:
-    { record_compound((yyvsp[(1) - (3)]), (yyvsp[(2) - (3)]), (yyvsp[(3) - (3)]), SYM_ENUM); (yyval) = (yyvsp[(3) - (3)]); }
-    break;
-  case 43:
-    { add_symbol(NULL, SYM_ENUM, NULL, 0); (yyval) = (yyvsp[(2) - (2)]); }
-    break;
-  case 44:
-    { (yyval) = (yyvsp[(2) - (2)]); }
-    break;
-  case 45:
-    { (yyval) = (yyvsp[(2) - (2)]); }
-    break;
-  case 57:
-    { (*(yyvsp[(1) - (1)]))->tag = SYM_TYPEDEF; (yyval) = (yyvsp[(1) - (1)]); }
-    break;
-  case 58:
-    { (yyval) = (yyvsp[(2) - (2)]) ? (yyvsp[(2) - (2)]) : (yyvsp[(1) - (2)]); }
-    break;
-  case 59:
-    { (yyval) = NULL; }
-    break;
-  case 62:
-    { (yyval) = (yyvsp[(2) - (2)]); }
-    break;
-  case 66:
-    { /* restrict has no effect in prototypes so ignore it */
-                  remove_node((yyvsp[(1) - (1)]));
-                  (yyval) = (yyvsp[(1) - (1)]);
-                }
-    break;
-  case 67:
-    { (yyval) = (yyvsp[(2) - (2)]); }
-    break;
-  case 69:
-    { if (current_name != NULL) {
-                    error_with_pos("unexpected second declaration name");
-                    YYERROR;
-                  } else {
-                    current_name = (*(yyvsp[(1) - (1)]))->string;
-                    (yyval) = (yyvsp[(1) - (1)]);
-                  }
-                }
-    break;
-  case 70:
-    { if (current_name != NULL) {
-                    error_with_pos("unexpected second declaration name");
-                    YYERROR;
-                  } else {
-                    current_name = (*(yyvsp[(1) - (1)]))->string;
-                    (yyval) = (yyvsp[(1) - (1)]);
-                  }
-                }
-    break;
-  case 71:
-    { (yyval) = (yyvsp[(4) - (4)]); }
-    break;
-  case 72:
-    { (yyval) = (yyvsp[(4) - (4)]); }
-    break;
-  case 73:
-    { (yyval) = (yyvsp[(2) - (2)]); }
-    break;
-  case 74:
-    { (yyval) = (yyvsp[(3) - (3)]); }
-    break;
-  case 75:
-    { (yyval) = (yyvsp[(2) - (2)]); }
-    break;
-  case 79:
-    { (yyval) = (yyvsp[(4) - (4)]); }
-    break;
-  case 80:
-    { (yyval) = (yyvsp[(4) - (4)]); }
-    break;
-  case 81:
-    { (yyval) = (yyvsp[(2) - (2)]); }
-    break;
-  case 82:
-    { (yyval) = (yyvsp[(3) - (3)]); }
-    break;
-  case 83:
-    { (yyval) = (yyvsp[(3) - (3)]); }
-    break;
-  case 84:
-    { (yyval) = (yyvsp[(2) - (2)]); }
-    break;
-  case 86:
-    { (yyval) = (yyvsp[(3) - (3)]); }
-    break;
-  case 87:
-    { (yyval) = NULL; }
-    break;
-  case 90:
-    { (yyval) = (yyvsp[(3) - (3)]); }
-    break;
-  case 91:
-    { (yyval) = (yyvsp[(2) - (2)]) ? (yyvsp[(2) - (2)]) : (yyvsp[(1) - (2)]); }
-    break;
-  case 92:
-    { (yyval) = (yyvsp[(2) - (2)]) ? (yyvsp[(2) - (2)]) : (yyvsp[(1) - (2)]); }
-    break;
-  case 94:
-    { (yyval) = NULL; }
-    break;
-  case 95:
-    { /* For version 2 checksums, we don't want to remember
-                     private parameter names.  */
-                  remove_node((yyvsp[(1) - (1)]));
-                  (yyval) = (yyvsp[(1) - (1)]);
-                }
-    break;
-  case 96:
-    { remove_node((yyvsp[(1) - (1)]));
-                  (yyval) = (yyvsp[(1) - (1)]);
-                }
-    break;
-  case 97:
-    { (yyval) = (yyvsp[(4) - (4)]); }
-    break;
-  case 98:
-    { (yyval) = (yyvsp[(4) - (4)]); }
-    break;
-  case 99:
-    { (yyval) = (yyvsp[(2) - (2)]); }
-    break;
-  case 100:
-    { (yyval) = (yyvsp[(3) - (3)]); }
-    break;
-  case 101:
-    { (yyval) = (yyvsp[(3) - (3)]); }
-    break;
-  case 102:
-    { struct string_list *decl = *(yyvsp[(2) - (3)]);
-                  *(yyvsp[(2) - (3)]) = NULL;
-                  add_symbol(current_name, SYM_NORMAL, decl, is_extern);
-                  (yyval) = (yyvsp[(3) - (3)]);
-                }
-    break;
-  case 103:
-    { (yyval) = NULL; }
-    break;
-  case 105:
-    { remove_list((yyvsp[(2) - (2)]), &(*(yyvsp[(1) - (2)]))->next); (yyval) = (yyvsp[(2) - (2)]); }
-    break;
-  case 106:
-    { (yyval) = (yyvsp[(3) - (3)]); }
-    break;
-  case 107:
-    { (yyval) = (yyvsp[(3) - (3)]); }
-    break;
-  case 108:
-    { (yyval) = NULL; }
-    break;
-  case 111:
-    { (yyval) = (yyvsp[(2) - (2)]); }
-    break;
-  case 112:
-    { (yyval) = (yyvsp[(3) - (3)]); }
-    break;
-  case 113:
-    { (yyval) = (yyvsp[(2) - (2)]); }
-    break;
-  case 114:
-    { (yyval) = NULL; }
-    break;
-  case 117:
-    { (yyval) = (yyvsp[(3) - (3)]); }
-    break;
-  case 118:
-    { (yyval) = (yyvsp[(2) - (2)]) ? (yyvsp[(2) - (2)]) : (yyvsp[(1) - (2)]); }
-    break;
-  case 119:
-    { (yyval) = (yyvsp[(2) - (2)]); }
-    break;
-  case 121:
-    { (yyval) = (yyvsp[(2) - (2)]); }
-    break;
-  case 122:
-    { (yyval) = NULL; }
-    break;
-  case 124:
-    { (yyval) = (yyvsp[(3) - (3)]); }
-    break;
-  case 125:
-    { (yyval) = (yyvsp[(4) - (4)]); }
-    break;
-  case 128:
-    {
-                        const char *name = strdup((*(yyvsp[(1) - (1)]))->string);
-                        add_symbol(name, SYM_ENUM_CONST, NULL, 0);
-                }
-    break;
-  case 129:
-    {
-                        const char *name = strdup((*(yyvsp[(1) - (3)]))->string);
-                        struct string_list *expr = copy_list_range(*(yyvsp[(3) - (3)]), *(yyvsp[(2) - (3)]));
-                        add_symbol(name, SYM_ENUM_CONST, expr, 0);
-                }
-    break;
-  case 130:
-    { (yyval) = (yyvsp[(2) - (2)]); }
-    break;
-  case 131:
-    { (yyval) = NULL; }
-    break;
-  case 133:
-    { export_symbol((*(yyvsp[(3) - (5)]))->string); (yyval) = (yyvsp[(5) - (5)]); }
-    break;
-      default: break;
-    }
-  /* User semantic actions sometimes alter yychar, and that requires
-     that yytoken be updated with the new translation.  We take the
-     approach of translating immediately before every use of yytoken.
-     One alternative is translating here after every semantic action,
-     but that translation would be missed if the semantic action invokes
-     YYABORT, YYACCEPT, or YYERROR immediately after altering yychar or
-     if it invokes YYBACKUP.  In the case of YYABORT or YYACCEPT, an
-     incorrect destructor might then be invoked immediately.  In the
-     case of YYERROR or YYBACKUP, subsequent parser actions might lead
-     to an incorrect destructor call or verbose syntax error message
-     before the lookahead is translated.  */
-  YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
-  YYPOPSTACK (yylen);
-  yylen = 0;
-  YY_STACK_PRINT (yyss, yyssp);
-  *++yyvsp = yyval;
-  /* Now `shift' the result of the reduction.  Determine what state
-     that goes to, based on the state we popped back to and the rule
-     number reduced by.  */
-  yyn = yyr1[yyn];
-  yystate = yypgoto[yyn - YYNTOKENS] + *yyssp;
-  if (0 <= yystate && yystate <= YYLAST && yycheck[yystate] == *yyssp)
-    yystate = yytable[yystate];
-  else
-    yystate = yydefgoto[yyn - YYNTOKENS];
-  goto yynewstate;
-/*------------------------------------.
-| yyerrlab -- here on detecting error |
-`------------------------------------*/
-yyerrlab:
-  /* Make sure we have latest lookahead translation.  See comments at
-     user semantic actions for why this is necessary.  */
-  yytoken = yychar == YYEMPTY ? YYEMPTY : YYTRANSLATE (yychar);
-  /* If not already recovering from an error, report this error.  */
-  if (!yyerrstatus)
-    {
-      ++yynerrs;
-#if ! YYERROR_VERBOSE
-      yyerror (YY_("syntax error"));
-#else
-# define YYSYNTAX_ERROR yysyntax_error (&yymsg_alloc, &yymsg, \
-                                        yyssp, yytoken)
-      {
-        char const *yymsgp = YY_("syntax error");
-        int yysyntax_error_status;
-        yysyntax_error_status = YYSYNTAX_ERROR;
-        if (yysyntax_error_status == 0)
-          yymsgp = yymsg;
-        else if (yysyntax_error_status == 1)
-          {
-            if (yymsg != yymsgbuf)
-              YYSTACK_FREE (yymsg);
-            yymsg = (char *) YYSTACK_ALLOC (yymsg_alloc);
-            if (!yymsg)
-              {
-                yymsg = yymsgbuf;
-                yymsg_alloc = sizeof yymsgbuf;
-                yysyntax_error_status = 2;
-              }
-            else
-              {
-                yysyntax_error_status = YYSYNTAX_ERROR;
-                yymsgp = yymsg;
-              }
-          }
-        yyerror (yymsgp);
-        if (yysyntax_error_status == 2)
-          goto yyexhaustedlab;
-      }
-# undef YYSYNTAX_ERROR
-#endif
-    }
-  if (yyerrstatus == 3)
-    {
-      /* If just tried and failed to reuse lookahead token after an
-         error, discard it.  */
-      if (yychar <= YYEOF)
-        {
-          /* Return failure if at end of input.  */
-          if (yychar == YYEOF)
-            YYABORT;
-        }
-      else
-        {
-          yydestruct ("Error: discarding",
-                      yytoken, &yylval);
-          yychar = YYEMPTY;
-        }
-    }
-  /* Else will try to reuse lookahead token after shifting the error
-     token.  */
-  goto yyerrlab1;
-/*---------------------------------------------------.
-| yyerrorlab -- error raised explicitly by YYERROR.  |
-`---------------------------------------------------*/
-yyerrorlab:
-  /* Pacify compilers like GCC when the user code never invokes
-     YYERROR and the label yyerrorlab therefore never appears in user
-     code.  */
-  if (/*CONSTCOND*/ 0)
-     goto yyerrorlab;
-  /* Do not reclaim the symbols of the rule which action triggered
-     this YYERROR.  */
-  YYPOPSTACK (yylen);
-  yylen = 0;
-  YY_STACK_PRINT (yyss, yyssp);
-  yystate = *yyssp;
-  goto yyerrlab1;
-/*-------------------------------------------------------------.
-| yyerrlab1 -- common code for both syntax error and YYERROR.  |
-`-------------------------------------------------------------*/
-yyerrlab1:
-  yyerrstatus = 3;      /* Each real token shifted decrements this.  */
-  for (;;)
-    {
-      yyn = yypact[yystate];
-      if (!yypact_value_is_default (yyn))
-        {
-          yyn += YYTERROR;
-          if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
-            {
-              yyn = yytable[yyn];
-              if (0 < yyn)
-                break;
-            }
-        }
-      /* Pop the current state because it cannot handle the error token.  */
-      if (yyssp == yyss)
-        YYABORT;
-      yydestruct ("Error: popping",
-                  yystos[yystate], yyvsp);
-      YYPOPSTACK (1);
-      yystate = *yyssp;
-      YY_STACK_PRINT (yyss, yyssp);
-    }
-  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
-  *++yyvsp = yylval;
-  YY_IGNORE_MAYBE_UNINITIALIZED_END
-  /* Shift the error token.  */
-  YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp);
-  yystate = yyn;
-  goto yynewstate;
-/*-------------------------------------.
-| yyacceptlab -- YYACCEPT comes here.  |
-`-------------------------------------*/
-yyacceptlab:
-  yyresult = 0;
-  goto yyreturn;
-/*-----------------------------------.
-| yyabortlab -- YYABORT comes here.  |
-`-----------------------------------*/
-yyabortlab:
-  yyresult = 1;
-  goto yyreturn;
-#if !defined yyoverflow || YYERROR_VERBOSE
-/*-------------------------------------------------.
-| yyexhaustedlab -- memory exhaustion comes here.  |
-`-------------------------------------------------*/
-yyexhaustedlab:
-  yyerror (YY_("memory exhausted"));
-  yyresult = 2;
-  /* Fall through.  */
-#endif
-yyreturn:
-  if (yychar != YYEMPTY)
-    {
-      /* Make sure we have latest lookahead translation.  See comments at
-         user semantic actions for why this is necessary.  */
-      yytoken = YYTRANSLATE (yychar);
-      yydestruct ("Cleanup: discarding lookahead",
-                  yytoken, &yylval);
-    }
-  /* Do not reclaim the symbols of the rule which action triggered
-     this YYABORT or YYACCEPT.  */
-  YYPOPSTACK (yylen);
-  YY_STACK_PRINT (yyss, yyssp);
-  while (yyssp != yyss)
-    {
-      yydestruct ("Cleanup: popping",
-                  yystos[*yyssp], yyvsp);
-      YYPOPSTACK (1);
-    }
-#ifndef yyoverflow
-  if (yyss != yyssa)
-    YYSTACK_FREE (yyss);
-#endif
-#if YYERROR_VERBOSE
-  if (yymsg != yymsgbuf)
-    YYSTACK_FREE (yymsg);
-#endif
-  /* Make sure YYID is used.  */
-  return YYID (yyresult);
-}
-static void
-yyerror(const char *e)
-{
-  error_with_pos("%s", e);
-}
diff --git a/scripts/genksyms/parse.tab.h_shipped b/scripts/genksyms/parse.tab.h_shipped
deleted file mode 100644
index 46a5e124eda1..000000000000
--- a/scripts/genksyms/parse.tab.h_shipped
+++ /dev/null
@@ -1,119 +0,0 @@
-/* A Bison parser, made by GNU Bison 2.7.  */
-/* Bison interface for Yacc-like parsers in C
-   
-      Copyright (C) 1984, 1989-1990, 2000-2012 Free Software Foundation, Inc.
-   
-   This program is free software: you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-   
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-   
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
-/* As a special exception, you may create a larger work that contains
-   part or all of the Bison parser skeleton and distribute that work
-   under terms of your choice, so long as that work isn't itself a
-   parser generator using the skeleton or a modified version thereof
-   as a parser skeleton.  Alternatively, if you modify or redistribute
-   the parser skeleton itself, you may (at your option) remove this
-   special exception, which will cause the skeleton and the resulting
-   Bison output files to be licensed under the GNU General Public
-   License without this special exception.
-   
-   This special exception was added by the Free Software Foundation in
-   version 2.2 of Bison.  */
-#ifndef YY_YY_SCRIPTS_GENKSYMS_PARSE_TAB_H_SHIPPED_INCLUDED
-# define YY_YY_SCRIPTS_GENKSYMS_PARSE_TAB_H_SHIPPED_INCLUDED
-/* Enabling traces.  */
-#ifndef YYDEBUG
-# define YYDEBUG 1
-#endif
-#if YYDEBUG
-extern int yydebug;
-#endif
-/* Tokens.  */
-#ifndef YYTOKENTYPE
-# define YYTOKENTYPE
-   /* Put the tokens into the symbol table, so that GDB and other debuggers
-      know about them.  */
-   enum yytokentype {
-     ASM_KEYW = 258,
-     ATTRIBUTE_KEYW = 259,
-     AUTO_KEYW = 260,
-     BOOL_KEYW = 261,
-     CHAR_KEYW = 262,
-     CONST_KEYW = 263,
-     DOUBLE_KEYW = 264,
-     ENUM_KEYW = 265,
-     EXTERN_KEYW = 266,
-     EXTENSION_KEYW = 267,
-     FLOAT_KEYW = 268,
-     INLINE_KEYW = 269,
-     INT_KEYW = 270,
-     LONG_KEYW = 271,
-     REGISTER_KEYW = 272,
-     RESTRICT_KEYW = 273,
-     SHORT_KEYW = 274,
-     SIGNED_KEYW = 275,
-     STATIC_KEYW = 276,
-     STRUCT_KEYW = 277,
-     TYPEDEF_KEYW = 278,
-     UNION_KEYW = 279,
-     UNSIGNED_KEYW = 280,
-     VOID_KEYW = 281,
-     VOLATILE_KEYW = 282,
-     TYPEOF_KEYW = 283,
-     VA_LIST_KEYW = 284,
-     EXPORT_SYMBOL_KEYW = 285,
-     ASM_PHRASE = 286,
-     ATTRIBUTE_PHRASE = 287,
-     TYPEOF_PHRASE = 288,
-     BRACE_PHRASE = 289,
-     BRACKET_PHRASE = 290,
-     EXPRESSION_PHRASE = 291,
-     CHAR = 292,
-     DOTS = 293,
-     IDENT = 294,
-     INT = 295,
-     REAL = 296,
-     STRING = 297,
-     TYPE = 298,
-     OTHER = 299,
-     FILENAME = 300
-   };
-#endif
-#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
-typedef int YYSTYPE;
-# define YYSTYPE_IS_TRIVIAL 1
-# define yystype YYSTYPE /* obsolescent; will be withdrawn */
-# define YYSTYPE_IS_DECLARED 1
-#endif
-extern YYSTYPE yylval;
-#ifdef YYPARSE_PARAM
-#if defined __STDC__ || defined __cplusplus
-int yyparse (void *YYPARSE_PARAM);
-#else
-int yyparse ();
-#endif
-#else /* ! YYPARSE_PARAM */
-#if defined __STDC__ || defined __cplusplus
-int yyparse (void);
-#else
-int yyparse ();
-#endif
-#endif /* ! YYPARSE_PARAM */
-#endif /* !YY_YY_SCRIPTS_GENKSYMS_PARSE_TAB_H_SHIPPED_INCLUDED  */
diff --git a/scripts/get_maintainer.pl b/scripts/get_maintainer.pl
index 99c96e86eccb..c1c088ef1420 100755
--- a/scripts/get_maintainer.pl
+++ b/scripts/get_maintainer.pl
@@ -1,4 +1,6 @@
 #!/usr/bin/env perl
+# SPDX-License-Identifier: GPL-2.0
+#
 # (c) 2007, Joe Perches <joe@perches.com>
 #           created from checkpatch.pl
 #
@@ -7,8 +9,6 @@
 #
 # usage: perl scripts/get_maintainer.pl [OPTIONS] <patch>
 #        perl scripts/get_maintainer.pl [OPTIONS] -f <file>
-#
-# Licensed under the terms of the GNU GPL License version 2
 use warnings;
 use strict;
@@ -48,6 +48,7 @@ my $output_roles = 0;
 my $output_rolestats = 1;
 my $output_section_maxlen = 50;
 my $scm = 0;
+my $tree = 1;
 my $web = 0;
 my $subsystem = 0;
 my $status = 0;
@@ -61,7 +62,7 @@ my $self_test = undef;
 my $version = 0;
 my $help = 0;
 my $find_maintainer_files = 0;
+my $maintainer_path;
 my $vcs_used = 0;
 my $exit = 0;
@@ -255,6 +256,7 @@ if (!GetOptions(
                'subsystem!' => \$subsystem,
                'status!' => \$status,
                'scm!' => \$scm,
+                'tree!' => \$tree,
                'web!' => \$web,
                'letters=s' => \$letters,
                'pattern-depth=i' => \$pattern_depth,
@@ -263,6 +265,7 @@ if (!GetOptions(
                'fe|file-emails!' => \$file_emails,
                'f|file' => \$from_filename,
                'find-maintainer-files' => \$find_maintainer_files,
+                'mpath|maintainer-path=s' => \$maintainer_path,
                'self-test:s' => \$self_test,
                'v|version' => \$version,
                'h|help|usage' => \$help,
@@ -319,7 +322,7 @@ if ($email &&
    die "$P: Please select at least 1 email option\n";
 }
-if (!top_of_kernel_tree($lk_path)) {
+if ($tree && !top_of_kernel_tree($lk_path)) {
    die "$P: The current directory does not appear to be "
        . "a linux kernel source tree.\n";
 }
@@ -384,26 +387,36 @@ sub find_ignore_git {
 read_all_maintainer_files();
 sub read_all_maintainer_files {
-    if (-d "${lk_path}MAINTAINERS") {
+    my $path = "${lk_path}MAINTAINERS";
-        opendir(DIR, "${lk_path}MAINTAINERS") or die $!;
+    if (defined $maintainer_path) {
-        my @files = readdir(DIR);
+        $path = $maintainer_path;
-        closedir(DIR);
+        # Perl Cookbook tilde expansion if necessary
-        foreach my $file (@files) {
+        $path =~ s@^~([^/]*)@ $1 ? (getpwnam($1))[7] : ( $ENV{HOME} || $ENV{LOGDIR} || (getpwuid($<))[7])@ex;
-            push(@mfiles, "${lk_path}MAINTAINERS/$file") if ($file !~ /^\./);
+    }
-        }
-    }
+    if (-d $path) {
+        $path .= '/' if ($path !~ m@/$@);
-    if ($find_maintainer_files) {
+        if ($find_maintainer_files) {
-        find( { wanted => \&find_is_maintainer_file,
+            find( { wanted => \&find_is_maintainer_file,
-                preprocess => \&find_ignore_git,
+                    preprocess => \&find_ignore_git,
-                no_chdir => 1,
+                    no_chdir => 1,
-        }, "${lk_path}");
+                }, "$path");
+        } else {
+            opendir(DIR, "$path") or die $!;
+            my @files = readdir(DIR);
+            closedir(DIR);
+            foreach my $file (@files) {
+                push(@mfiles, "$path$file") if ($file !~ /^\./);
+            }
+        }
+    } elsif (-f "$path") {
+        push(@mfiles, "$path");
    } else {
-        push(@mfiles, "${lk_path}MAINTAINERS") if -f "${lk_path}MAINTAINERS";
+        die "$P: MAINTAINER file not found '$path'\n";
    }
+    die "$P: No MAINTAINER files found in '$path'\n" if (scalar(@mfiles) == 0);
    foreach my $file (@mfiles) {
-        read_maintainer_file("$file");
+        read_maintainer_file("$file");
    }
 }
@@ -542,7 +555,18 @@ foreach my $file (@ARGV) {
        while (<$patch>) {
            my $patch_line = $_;
-            if (m/^\+\+\+\s+(\S+)/ or m/^---\s+(\S+)/) {
+            if (m/^ mode change [0-7]+ => [0-7]+ (\S+)\s*$/) {
+                my $filename = $1;
+                push(@files, $filename);
+            } elsif (m/^rename (?:from|to) (\S+)\s*$/) {
+                my $filename = $1;
+                push(@files, $filename);
+            } elsif (m/^diff --git a\/(\S+) b\/(\S+)\s*$/) {
+                my $filename1 = $1;
+                my $filename2 = $2;
+                push(@files, $filename1);
+                push(@files, $filename2);
+            } elsif (m/^\+\+\+\s+(\S+)/ or m/^---\s+(\S+)/) {
                my $filename = $1;
                $filename =~ s@^[^/]*/@@;
                $filename =~ s@\n@@;
@@ -1020,13 +1044,14 @@ Other options:
  --sections => print all of the subsystem sections with pattern matches
  --letters => print all matching 'letter' types from all matching sections
  --mailmap => use .mailmap file (default: $email_use_mailmap)
+  --no-tree => run without a kernel tree
  --self-test => show potential issues with MAINTAINERS file content
  --version => show version
  --help => show this help information
 Default options:
-  [--email --nogit --git-fallback --m --r --n --l --multiline --pattern-depth=0
+  [--email --tree --nogit --git-fallback --m --r --n --l --multiline
-   --remove-duplicates --rolestats]
+   --pattern-depth=0 --remove-duplicates --rolestats]
 Notes:
  Using "-f directory" may give unexpected results:
diff --git a/scripts/headers_install.sh b/scripts/headers_install.sh
index a18bca720995..593f8879c641 100755
--- a/scripts/headers_install.sh
+++ b/scripts/headers_install.sh
@@ -31,13 +31,13 @@ trap 'rm -f "$OUTDIR/$FILE" "$OUTDIR/$FILE.sed"' EXIT
 for i in "$@"
 do
        FILE="$(basename "$i")"
-        sed -r \
+        sed -E \
-                -e 's/([ \t(])(__user|__force|__iomem)[ \t]/\1/g' \
+                -e 's/([[:space:](])(__user|__force|__iomem)[[:space:]]/\1/g' \
-                -e 's/__attribute_const__([ \t]|$)/\1/g' \
+                -e 's/__attribute_const__([[:space:]]|$)/\1/g' \
                -e 's@^#include <linux/compiler(|_types).h>@@' \
                -e 's/(^|[^a-zA-Z0-9])__packed([^a-zA-Z0-9_]|$)/\1__attribute__((packed))\2/g' \
-                -e 's/(^|[ \t(])(inline|asm|volatile)([ \t(]|$)/\1__\2__\3/g' \
+                -e 's/(^|[[:space:](])(inline|asm|volatile)([[:space:](]|$)/\1__\2__\3/g' \
-                -e 's@#(ifndef|define|endif[ \t]*/[*])[ \t]*_UAPI@#\1 @' \
+                -e 's@#(ifndef|define|endif[[:space:]]*/[*])[[:space:]]*_UAPI@#\1 @' \
                "$SRCDIR/$i" > "$OUTDIR/$FILE.sed" || exit 1
        scripts/unifdef -U__KERNEL__ -D__EXPORTED_HEADERS__ "$OUTDIR/$FILE.sed" \
                > "$OUTDIR/$FILE"
diff --git a/scripts/kallsyms.c b/scripts/kallsyms.c
index 65792650c630..109a1af7e444 100644
--- a/scripts/kallsyms.c
+++ b/scripts/kallsyms.c
@@ -48,8 +48,6 @@ static unsigned long long relative_base;
 static struct addr_range text_ranges[] = {
        { "_stext",     "_etext"     },
        { "_sinittext", "_einittext" },
-        { "_stext_l1",  "_etext_l1"  }, /* Blackfin on-chip L1 inst SRAM */
-        { "_stext_l2",  "_etext_l2"  }, /* Blackfin on-chip L2 SRAM */
 };
 #define text_range_text     (&text_ranges[0])
 #define text_range_inittext (&text_ranges[1])
@@ -62,7 +60,6 @@ static struct sym_entry *table;
 static unsigned int table_size, table_cnt;
 static int all_symbols = 0;
 static int absolute_percpu = 0;
-static char symbol_prefix_char = '\0';
 static int base_relative = 0;
 int token_profit[0x10000];
@@ -75,7 +72,6 @@ unsigned char best_table_len[256];
 static void usage(void)
 {
        fprintf(stderr, "Usage: kallsyms [--all-symbols] "
-                        "[--symbol-prefix=<prefix char>] "
                        "[--base-relative] < in.map > out.S\n");
        exit(1);
 }
@@ -113,28 +109,22 @@ static int check_symbol_range(const char *sym, unsigned long long addr,
 static int read_symbol(FILE *in, struct sym_entry *s)
 {
-        char str[500];
+        char sym[500], stype;
-        char *sym, stype;
        int rc;
-        rc = fscanf(in, "%llx %c %499s\n", &s->addr, &stype, str);
+        rc = fscanf(in, "%llx %c %499s\n", &s->addr, &stype, sym);
        if (rc != 3) {
-                if (rc != EOF && fgets(str, 500, in) == NULL)
+                if (rc != EOF && fgets(sym, 500, in) == NULL)
                        fprintf(stderr, "Read error or end of file.\n");
                return -1;
        }
-        if (strlen(str) > KSYM_NAME_LEN) {
+        if (strlen(sym) > KSYM_NAME_LEN) {
                fprintf(stderr, "Symbol %s too long for kallsyms (%zu vs %d).\n"
                                "Please increase KSYM_NAME_LEN both in kernel and kallsyms.c\n",
-                        str, strlen(str), KSYM_NAME_LEN);
+                        sym, strlen(sym), KSYM_NAME_LEN);
                return -1;
        }
-        sym = str;
-        /* skip prefix char */
-        if (symbol_prefix_char && str[0] == symbol_prefix_char)
-                sym++;
        /* Ignore most absolute/undefined (?) symbols. */
        if (strcmp(sym, "_text") == 0)
                _text = s->addr;
@@ -155,7 +145,7 @@ static int read_symbol(FILE *in, struct sym_entry *s)
                 is_arm_mapping_symbol(sym))
                return -1;
        /* exclude also MIPS ELF local symbols ($L123 instead of .L123) */
-        else if (str[0] == '$')
+        else if (sym[0] == '$')
                return -1;
        /* exclude debugging symbols */
        else if (stype == 'N' || stype == 'n')
@@ -163,14 +153,14 @@ static int read_symbol(FILE *in, struct sym_entry *s)
        /* include the type field in the symbol name, so that it gets
         * compressed together */
-        s->len = strlen(str) + 1;
+        s->len = strlen(sym) + 1;
        s->sym = malloc(s->len + 1);
        if (!s->sym) {
                fprintf(stderr, "kallsyms failure: "
                        "unable to allocate required amount of memory\n");
                exit(EXIT_FAILURE);
        }
-        strcpy((char *)s->sym + 1, str);
+        strcpy((char *)s->sym + 1, sym);
        s->sym[0] = stype;
        s->percpu_absolute = 0;
@@ -221,6 +211,7 @@ static int symbol_valid(struct sym_entry *s)
        static char *special_prefixes[] = {
                "__crc_",               /* modversions */
+                "__efistub_",           /* arm64 EFI stub namespace */
                NULL };
        static char *special_suffixes[] = {
@@ -232,11 +223,6 @@ static int symbol_valid(struct sym_entry *s)
        int i;
        char *sym_name = (char *)s->sym + 1;
-        /* skip prefix char */
-        if (symbol_prefix_char && *sym_name == symbol_prefix_char)
-                sym_name++;
        /* if --all-symbols is not specified, then symbols outside the text
         * and inittext sections are discarded */
        if (!all_symbols) {
@@ -301,15 +287,9 @@ static void read_map(FILE *in)
 static void output_label(char *label)
 {
-        if (symbol_prefix_char)
+        printf(".globl %s\n", label);
-                printf(".globl %c%s\n", symbol_prefix_char, label);
-        else
-                printf(".globl %s\n", label);
        printf("\tALGN\n");
-        if (symbol_prefix_char)
+        printf("%s:\n", label);
-                printf("%c%s:\n", symbol_prefix_char, label);
-        else
-                printf("%s:\n", label);
 }
 /* uncompress a compressed symbol. When this function is called, the best table
@@ -423,7 +403,7 @@ static void write_src(void)
        }
        output_label("kallsyms_num_syms");
-        printf("\tPTR\t%d\n", table_cnt);
+        printf("\t.long\t%u\n", table_cnt);
        printf("\n");
        /* table of offset markers, that give the offset in the compressed stream
@@ -452,7 +432,7 @@ static void write_src(void)
        output_label("kallsyms_markers");
        for (i = 0; i < ((table_cnt + 255) >> 8); i++)
-                printf("\tPTR\t%d\n", markers[i]);
+                printf("\t.long\t%u\n", markers[i]);
        printf("\n");
        free(markers);
@@ -767,13 +747,7 @@ int main(int argc, char **argv)
                                all_symbols = 1;
                        else if (strcmp(argv[i], "--absolute-percpu") == 0)
                                absolute_percpu = 1;
-                        else if (strncmp(argv[i], "--symbol-prefix=", 16) == 0) {
+                        else if (strcmp(argv[i], "--base-relative") == 0)
-                                char *p = &argv[i][16];
-                                /* skip quote */
-                                if ((*p == '"' && *(p+2) == '"') || (*p == '\'' && *(p+2) == '\''))
-                                        p++;
-                                symbol_prefix_char = *p;
-                        } else if (strcmp(argv[i], "--base-relative") == 0)
                                base_relative = 1;
                        else
                                usage();
diff --git a/scripts/kconfig/.gitignore b/scripts/kconfig/.gitignore
index a76856e559c0..0aabc1d6a182 100644
--- a/scripts/kconfig/.gitignore
+++ b/scripts/kconfig/.gitignore
@@ -1,13 +1,7 @@
 #
 # Generated files
 #
-*.lex.c
-*.tab.c
-*.tab.h
 *.moc
-gconf.glade.h
-*.pot
-*.mo
 #
 # configuration programs
@@ -17,4 +11,3 @@ mconf
 nconf
 qconf
 gconf
-kxgettext
diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
index cb3ec53a7c29..63b609243d03 100644
--- a/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile
@@ -3,8 +3,8 @@
 # Kernel configuration targets
 # These targets are used from top-level makefile
-PHONY += xconfig gconfig menuconfig config silentoldconfig update-po-config \
+PHONY += xconfig gconfig menuconfig config localmodconfig localyesconfig \
-        localmodconfig localyesconfig
+        build_menuconfig build_nconfig build_gconfig build_xconfig
 ifdef KBUILD_KCONFIG
 Kconfig := $(KBUILD_KCONFIG)
@@ -34,68 +34,41 @@ config: $(obj)/conf
 nconfig: $(obj)/nconf
        $< $(silent) $(Kconfig)
-# This has become an internal implementation detail and is now deprecated
+build_menuconfig: $(obj)/mconf
-# for external use.
-silentoldconfig: $(obj)/conf
+build_nconfig: $(obj)/nconf
-        $(Q)mkdir -p include/config include/generated
-        $(Q)test -e include/generated/autoksyms.h || \
+build_gconfig: $(obj)/gconf
-            touch   include/generated/autoksyms.h
-        $< $(silent) --$@ $(Kconfig)
-localyesconfig localmodconfig: $(obj)/streamline_config.pl $(obj)/conf
+build_xconfig: $(obj)/qconf
-        $(Q)mkdir -p include/config include/generated
-        $(Q)perl $< --$@ $(srctree) $(Kconfig) > .tmp.config
+localyesconfig localmodconfig: $(obj)/conf
+        $(Q)perl $(srctree)/$(src)/streamline_config.pl --$@ $(srctree) $(Kconfig) > .tmp.config
        $(Q)if [ -f .config ]; then                                     \
                        cmp -s .tmp.config .config ||                   \
                        (mv -f .config .config.old.1;                   \
                         mv -f .tmp.config .config;                     \
-                         $(obj)/conf $(silent) --silentoldconfig $(Kconfig); \
+                         $< $(silent) --oldconfig $(Kconfig);           \
                         mv -f .config.old.1 .config.old)               \
        else                                                            \
                        mv -f .tmp.config .config;                      \
-                        $(obj)/conf $(silent) --silentoldconfig $(Kconfig); \
+                        $< $(silent) --oldconfig $(Kconfig);            \
        fi
        $(Q)rm -f .tmp.config
-# Create new linux.pot file
-# Adjust charset to UTF-8 in .po file to accept UTF-8 in Kconfig files
-update-po-config: $(obj)/kxgettext $(obj)/gconf.glade.h
-        $(Q)$(kecho) "  GEN     config.pot"
-        $(Q)xgettext --default-domain=linux                         \
-            --add-comments --keyword=_ --keyword=N_                 \
-            --from-code=UTF-8                                       \
-            --files-from=$(srctree)/scripts/kconfig/POTFILES.in     \
-            --directory=$(srctree) --directory=$(objtree)           \
-            --output $(obj)/config.pot
-        $(Q)sed -i s/CHARSET/UTF-8/ $(obj)/config.pot
-        $(Q)(for i in `ls $(srctree)/arch/*/Kconfig      \
-            $(srctree)/arch/*/um/Kconfig`;               \
-            do                                           \
-                $(kecho) "  GEN     $$i";                    \
-                $(obj)/kxgettext $$i                     \
-                     >> $(obj)/config.pot;               \
-            done )
-        $(Q)$(kecho) "  GEN     linux.pot"
-        $(Q)msguniq --sort-by-file --to-code=UTF-8 $(obj)/config.pot \
-            --output $(obj)/linux.pot
-        $(Q)rm -f $(obj)/config.pot
 # These targets map 1:1 to the commandline options of 'conf'
+#
+# Note:
+#  syncconfig has become an internal implementation detail and is now
+#  deprecated for external use
 simple-targets := oldconfig allnoconfig allyesconfig allmodconfig \
-        alldefconfig randconfig listnewconfig olddefconfig
+        alldefconfig randconfig listnewconfig olddefconfig syncconfig
 PHONY += $(simple-targets)
 $(simple-targets): $(obj)/conf
        $< $(silent) --$@ $(Kconfig)
-PHONY += oldnoconfig savedefconfig defconfig
+PHONY += savedefconfig defconfig
-# oldnoconfig is an alias of olddefconfig, because people already are dependent
-# on its behavior (sets new symbols to their default value but not 'n') with the
-# counter-intuitive name.
-oldnoconfig: olddefconfig
-        @echo "  WARNING: \"oldnoconfig\" target will be removed after Linux 4.19"
-        @echo "            Please use \"olddefconfig\" instead, which is an alias."
 savedefconfig: $(obj)/conf
        $< $(silent) --$@=defconfig $(Kconfig)
@@ -135,11 +108,18 @@ PHONY += tinyconfig
 tinyconfig:
        $(Q)$(MAKE) -f $(srctree)/Makefile allnoconfig tiny.config
+# CHECK: -o cache_dir=<path> working?
+PHONY += testconfig
+testconfig: $(obj)/conf
+        $(PYTHON3) -B -m pytest $(srctree)/$(src)/tests \
+        -o cache_dir=$(abspath $(obj)/tests/.cache) \
+        $(if $(findstring 1,$(KBUILD_VERBOSE)),--capture=no)
+clean-dirs += tests/.cache
 # Help text used by make help
 help:
        @echo  '  config          - Update current config utilising a line-oriented program'
-        @echo  '  nconfig         - Update current config utilising a ncurses menu based'
+        @echo  '  nconfig         - Update current config utilising a ncurses menu based program'
-        @echo  '                    program'
        @echo  '  menuconfig      - Update current config utilising a menu based program'
        @echo  '  xconfig         - Update current config utilising a Qt based front-end'
        @echo  '  gconfig         - Update current config utilising a GTK+ based front-end'
@@ -159,141 +139,78 @@ help:
        @echo  '  kvmconfig       - Enable additional options for kvm guest kernel support'
        @echo  '  xenconfig       - Enable additional options for xen dom0 and guest kernel support'
        @echo  '  tinyconfig      - Configure the tiniest possible kernel'
+        @echo  '  testconfig      - Run Kconfig unit tests (requires python3 and pytest)'
-# lxdialog stuff
-check-lxdialog  := $(srctree)/$(src)/lxdialog/check-lxdialog.sh
-# Use recursively expanded variables so we do not call gcc unless
-# we really need to do so. (Do not call gcc as part of make mrproper)
-HOST_EXTRACFLAGS += $(shell $(CONFIG_SHELL) $(check-lxdialog) -ccflags) \
-                    -DLOCALE
 # ===========================================================================
 # Shared Makefile for the various kconfig executables:
 # conf:   Used for defconfig, oldconfig and related targets
-# nconf:  Used for the nconfig target.
-#         Utilizes ncurses
-# mconf:  Used for the menuconfig target
-#         Utilizes the lxdialog package
-# qconf:  Used for the xconfig target
-#         Based on Qt which needs to be installed to compile it
-# gconf:  Used for the gconfig target
-#         Based on GTK+ which needs to be installed to compile it
 # object files used by all kconfig flavours
-lxdialog := lxdialog/checklist.o lxdialog/util.o lxdialog/inputbox.o
-lxdialog += lxdialog/textbox.o lxdialog/yesno.o lxdialog/menubox.o
 conf-objs       := conf.o  zconf.tab.o
-mconf-objs     := mconf.o zconf.tab.o $(lxdialog)
-nconf-objs     := nconf.o zconf.tab.o nconf.gui.o
-kxgettext-objs  := kxgettext.o zconf.tab.o
-qconf-cxxobjs   := qconf.o
-qconf-objs      := zconf.tab.o
-gconf-objs      := gconf.o zconf.tab.o
-hostprogs-y := conf nconf mconf kxgettext qconf gconf
-targets         += zconf.tab.c zconf.lex.c
+hostprogs-y := conf
-clean-files     := qconf.moc .tmp_qtcheck .tmp_gtkcheck
-clean-files     += zconf.tab.c zconf.lex.c gconf.glade.h
-clean-files     += config.pot linux.pot
-# Check that we have the required ncurses stuff installed for lxdialog (menuconfig)
+targets         += zconf.lex.c
-PHONY += $(obj)/dochecklxdialog
-$(addprefix $(obj)/, mconf.o $(lxdialog)): $(obj)/dochecklxdialog
-$(obj)/dochecklxdialog:
-        $(Q)$(CONFIG_SHELL) $(check-lxdialog) -check $(HOSTCC) $(HOST_EXTRACFLAGS) $(HOSTLOADLIBES_mconf)
-always := dochecklxdialog
-# Add environment specific flags
-HOST_EXTRACFLAGS += $(shell $(CONFIG_SHELL) $(srctree)/$(src)/check.sh $(HOSTCC) $(HOSTCFLAGS))
-HOST_EXTRACXXFLAGS += $(shell $(CONFIG_SHELL) $(srctree)/$(src)/check.sh $(HOSTCXX) $(HOSTCXXFLAGS))
 # generated files seem to need this to find local include files
 HOSTCFLAGS_zconf.lex.o  := -I$(src)
 HOSTCFLAGS_zconf.tab.o  := -I$(src)
-HOSTLOADLIBES_qconf     = $(KC_QT_LIBS)
+# nconf: Used for the nconfig target based on ncurses
-HOSTCXXFLAGS_qconf.o    = $(KC_QT_CFLAGS)
+hostprogs-y     += nconf
+nconf-objs      := nconf.o zconf.tab.o nconf.gui.o
-HOSTLOADLIBES_gconf     = `pkg-config --libs gtk+-2.0 gmodule-2.0 libglade-2.0`
-HOSTCFLAGS_gconf.o      = `pkg-config --cflags gtk+-2.0 gmodule-2.0 libglade-2.0` \
-                          -Wno-missing-prototypes
-HOSTLOADLIBES_mconf   = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ldflags $(HOSTCC))
-HOSTLOADLIBES_nconf     = $(shell \
-                                pkg-config --libs menuw panelw ncursesw 2>/dev/null \
-                                || pkg-config --libs menu panel ncurses 2>/dev/null \
-                                || echo "-lmenu -lpanel -lncurses"  )
-$(obj)/qconf.o: $(obj)/.tmp_qtcheck
-ifeq ($(MAKECMDGOALS),xconfig)
-$(obj)/.tmp_qtcheck: $(src)/Makefile
-include $(obj)/.tmp_qtcheck
-# Qt needs some extra effort...
-$(obj)/.tmp_qtcheck:
-        @set -e; $(kecho) "  CHECK   qt"; \
-        if pkg-config --exists Qt5Core; then \
-            cflags="-std=c++11 -fPIC `pkg-config --cflags Qt5Core Qt5Gui Qt5Widgets`"; \
-            libs=`pkg-config --libs Qt5Core Qt5Gui Qt5Widgets`; \
-            moc=`pkg-config --variable=host_bins Qt5Core`/moc; \
-        elif pkg-config --exists QtCore; then \
-            cflags=`pkg-config --cflags QtCore QtGui`; \
-            libs=`pkg-config --libs QtCore QtGui`; \
-            moc=`pkg-config --variable=moc_location QtCore`; \
-        else \
-            echo >&2 "*"; \
-            echo >&2 "* Could not find Qt via pkg-config."; \
-            echo >&2 "* Please install either Qt 4.8 or 5.x. and make sure it's in PKG_CONFIG_PATH"; \
-            echo >&2 "*"; \
-            exit 1; \
-        fi; \
-        echo "KC_QT_CFLAGS=$$cflags" > $@; \
-        echo "KC_QT_LIBS=$$libs" >> $@; \
-        echo "KC_QT_MOC=$$moc" >> $@
-endif
-$(obj)/gconf.o: $(obj)/.tmp_gtkcheck
+HOSTLDLIBS_nconf        = $(shell . $(obj)/.nconf-cfg && echo $$libs)
+HOSTCFLAGS_nconf.o      = $(shell . $(obj)/.nconf-cfg && echo $$cflags)
-ifeq ($(MAKECMDGOALS),gconfig)
+HOSTCFLAGS_nconf.gui.o  = $(shell . $(obj)/.nconf-cfg && echo $$cflags)
-include $(obj)/.tmp_gtkcheck
-# GTK+ needs some extra effort, too...
-$(obj)/.tmp_gtkcheck:
-        @if `pkg-config --exists gtk+-2.0 gmodule-2.0 libglade-2.0`; then               \
-                if `pkg-config --atleast-version=2.0.0 gtk+-2.0`; then                  \
-                        touch $@;                                                               \
-                else                                                                    \
-                        echo >&2 "*";                                                   \
-                        echo >&2 "* GTK+ is present but version >= 2.0.0 is required."; \
-                        echo >&2 "*";                                                   \
-                        false;                                                          \
-                fi                                                                      \
-        else                                                                            \
-                echo >&2 "*";                                                           \
-                echo >&2 "* Unable to find the GTK+ installation. Please make sure that";       \
-                echo >&2 "* the GTK+ 2.0 development package is correctly installed...";        \
-                echo >&2 "* You need gtk+-2.0, glib-2.0 and libglade-2.0.";             \
-                echo >&2 "*";                                                           \
-                false;                                                                  \
-        fi
-endif
-$(obj)/zconf.tab.o: $(obj)/zconf.lex.c
+$(obj)/nconf.o $(obj)/nconf.gui.o: $(obj)/.nconf-cfg
+# mconf: Used for the menuconfig target based on lxdialog
+hostprogs-y     += mconf
+lxdialog        := checklist.o inputbox.o menubox.o textbox.o util.o yesno.o
+mconf-objs      := mconf.o zconf.tab.o $(addprefix lxdialog/, $(lxdialog))
+HOSTLDLIBS_mconf = $(shell . $(obj)/.mconf-cfg && echo $$libs)
+$(foreach f, mconf.o $(lxdialog), \
+  $(eval HOSTCFLAGS_$f = $$(shell . $(obj)/.mconf-cfg && echo $$$$cflags)))
+$(obj)/mconf.o: $(obj)/.mconf-cfg
+$(addprefix $(obj)/lxdialog/, $(lxdialog)): $(obj)/.mconf-cfg
+# qconf: Used for the xconfig target based on Qt
+hostprogs-y     += qconf
+qconf-cxxobjs   := qconf.o
+qconf-objs      := zconf.tab.o
+HOSTLDLIBS_qconf        = $(shell . $(obj)/.qconf-cfg && echo $$libs)
+HOSTCXXFLAGS_qconf.o    = $(shell . $(obj)/.qconf-cfg && echo $$cflags)
-$(obj)/qconf.o: $(obj)/qconf.moc
+$(obj)/qconf.o: $(obj)/.qconf-cfg $(obj)/qconf.moc
 quiet_cmd_moc = MOC     $@
-      cmd_moc = $(KC_QT_MOC) -i $< -o $@
+      cmd_moc = $(shell . $(obj)/.qconf-cfg && echo $$moc) -i $< -o $@
-$(obj)/%.moc: $(src)/%.h $(obj)/.tmp_qtcheck
+$(obj)/%.moc: $(src)/%.h $(obj)/.qconf-cfg
        $(call cmd,moc)
-# Extract gconf menu items for i18n support
+# gconf: Used for the gconfig target based on GTK+
-$(obj)/gconf.glade.h: $(obj)/gconf.glade
+hostprogs-y     += gconf
-        $(Q)intltool-extract --type=gettext/glade --srcdir=$(srctree) \
+gconf-objs      := gconf.o zconf.tab.o
-        $(obj)/gconf.glade
+HOSTLDLIBS_gconf    = $(shell . $(obj)/.gconf-cfg && echo $$libs)
+HOSTCFLAGS_gconf.o  = $(shell . $(obj)/.gconf-cfg && echo $$cflags)
+$(obj)/gconf.o: $(obj)/.gconf-cfg
+$(obj)/zconf.tab.o: $(obj)/zconf.lex.c
+# check if necessary packages are available, and configure build flags
+define filechk_conf_cfg
+        $(CONFIG_SHELL) $<
+endef
+$(obj)/.%conf-cfg: $(src)/%conf-cfg.sh FORCE
+        $(call filechk,conf_cfg)
+clean-files += .*conf-cfg
diff --git a/scripts/kconfig/POTFILES.in b/scripts/kconfig/POTFILES.in
deleted file mode 100644
index 967457396990..000000000000
--- a/scripts/kconfig/POTFILES.in
+++ /dev/null
@@ -1,12 +0,0 @@
-scripts/kconfig/lxdialog/checklist.c
-scripts/kconfig/lxdialog/inputbox.c
-scripts/kconfig/lxdialog/menubox.c
-scripts/kconfig/lxdialog/textbox.c
-scripts/kconfig/lxdialog/util.c
-scripts/kconfig/lxdialog/yesno.c
-scripts/kconfig/mconf.c
-scripts/kconfig/conf.c
-scripts/kconfig/confdata.c
-scripts/kconfig/gconf.c
-scripts/kconfig/gconf.glade.h
-scripts/kconfig/qconf.cc
diff --git a/scripts/kconfig/check.sh b/scripts/kconfig/check.sh
deleted file mode 100755
index 97f0fee7d173..000000000000
--- a/scripts/kconfig/check.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-# SPDX-License-Identifier: GPL-2.0
-# Needed for systems without gettext
-$* -x c -o /dev/null - > /dev/null 2>&1 << EOF
-#include <libintl.h>
-int main()
-{
-        gettext("");
-        return 0;
-}
-EOF
-if [ ! "$?" -eq "0"  ]; then
-        echo -DKBUILD_NO_NLS;
-fi
diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c
index 822dc51923d6..98e0c7a34699 100644
--- a/scripts/kconfig/conf.c
+++ b/scripts/kconfig/conf.c
@@ -3,7 +3,6 @@
 * Released under the terms of the GNU GPL v2.0.
 */
-#include <locale.h>
 #include <ctype.h>
 #include <limits.h>
 #include <stdio.h>
@@ -23,7 +22,7 @@ static void check_conf(struct menu *menu);
 enum input_mode {
        oldaskconfig,
-        silentoldconfig,
+        syncconfig,
        oldconfig,
        allnoconfig,
        allyesconfig,
@@ -86,7 +85,7 @@ static int conf_askvalue(struct symbol *sym, const char *def)
        enum symbol_type type = sym_get_type(sym);
        if (!sym_has_value(sym))
-                printf(_("(NEW) "));
+                printf("(NEW) ");
        line[0] = '\n';
        line[1] = 0;
@@ -100,7 +99,7 @@ static int conf_askvalue(struct symbol *sym, const char *def)
        switch (input_mode) {
        case oldconfig:
-        case silentoldconfig:
+        case syncconfig:
                if (sym_has_value(sym)) {
                        printf("%s\n", def);
                        return 0;
@@ -133,7 +132,7 @@ static int conf_string(struct menu *menu)
        const char *def;
        while (1) {
-                printf("%*s%s ", indent - 1, "", _(menu->prompt->text));
+                printf("%*s%s ", indent - 1, "", menu->prompt->text);
                printf("(%s) ", sym->name);
                def = sym_get_string_value(sym);
                if (sym_get_string_value(sym))
@@ -166,7 +165,7 @@ static int conf_sym(struct menu *menu)
        tristate oldval, newval;
        while (1) {
-                printf("%*s%s ", indent - 1, "", _(menu->prompt->text));
+                printf("%*s%s ", indent - 1, "", menu->prompt->text);
                if (sym->name)
                        printf("(%s) ", sym->name);
                putchar('[');
@@ -251,7 +250,7 @@ static int conf_choice(struct menu *menu)
                case no:
                        return 1;
                case mod:
-                        printf("%*s%s\n", indent - 1, "", _(menu_get_prompt(menu)));
+                        printf("%*s%s\n", indent - 1, "", menu_get_prompt(menu));
                        return 0;
                case yes:
                        break;
@@ -261,7 +260,7 @@ static int conf_choice(struct menu *menu)
        while (1) {
                int cnt, def;
-                printf("%*s%s\n", indent - 1, "", _(menu_get_prompt(menu)));
+                printf("%*s%s\n", indent - 1, "", menu_get_prompt(menu));
                def_sym = sym_get_choice_value(sym);
                cnt = def = 0;
                line[0] = 0;
@@ -269,7 +268,7 @@ static int conf_choice(struct menu *menu)
                        if (!menu_is_visible(child))
                                continue;
                        if (!child->sym) {
-                                printf("%*c %s\n", indent, '*', _(menu_get_prompt(child)));
+                                printf("%*c %s\n", indent, '*', menu_get_prompt(child));
                                continue;
                        }
                        cnt++;
@@ -278,14 +277,14 @@ static int conf_choice(struct menu *menu)
                                printf("%*c", indent, '>');
                        } else
                                printf("%*c", indent, ' ');
-                        printf(" %d. %s", cnt, _(menu_get_prompt(child)));
+                        printf(" %d. %s", cnt, menu_get_prompt(child));
                        if (child->sym->name)
                                printf(" (%s)", child->sym->name);
                        if (!sym_has_value(child->sym))
-                                printf(_(" (NEW)"));
+                                printf(" (NEW)");
                        printf("\n");
                }
-                printf(_("%*schoice"), indent - 1, "");
+                printf("%*schoice", indent - 1, "");
                if (cnt == 1) {
                        printf("[1]: 1\n");
                        goto conf_childs;
@@ -293,7 +292,7 @@ static int conf_choice(struct menu *menu)
                printf("[1-%d?]: ", cnt);
                switch (input_mode) {
                case oldconfig:
-                case silentoldconfig:
+                case syncconfig:
                        if (!is_new) {
                                cnt = def;
                                printf("%d\n", cnt);
@@ -358,10 +357,11 @@ static void conf(struct menu *menu)
                switch (prop->type) {
                case P_MENU:
-                        if ((input_mode == silentoldconfig ||
+                        /*
-                             input_mode == listnewconfig ||
+                         * Except in oldaskconfig mode, we show only menus that
-                             input_mode == olddefconfig) &&
+                         * contain new symbols.
-                            rootEntry != menu) {
+                         */
+                        if (input_mode != oldaskconfig && rootEntry != menu) {
                                check_conf(menu);
                                return;
                        }
@@ -371,7 +371,7 @@ static void conf(struct menu *menu)
                        if (prompt)
                                printf("%*c\n%*c %s\n%*c\n",
                                        indent, '*',
-                                        indent, '*', _(prompt),
+                                        indent, '*', prompt,
                                        indent, '*');
                default:
                        ;
@@ -421,12 +421,22 @@ static void check_conf(struct menu *menu)
                if (sym_is_changable(sym) ||
                    (sym_is_choice(sym) && sym_get_tristate_value(sym) == yes)) {
                        if (input_mode == listnewconfig) {
-                                if (sym->name && !sym_is_choice_value(sym)) {
+                                if (sym->name) {
-                                        printf("%s%s\n", CONFIG_, sym->name);
+                                        const char *str;
+                                        if (sym->type == S_STRING) {
+                                                str = sym_get_string_value(sym);
+                                                str = sym_escape_string_value(str);
+                                                printf("%s%s=%s\n", CONFIG_, sym->name, str);
+                                                free((void *)str);
+                                        } else {
+                                                str = sym_get_string_value(sym);
+                                                printf("%s%s=%s\n", CONFIG_, sym->name, str);
+                                        }
                                }
-                        } else if (input_mode != olddefconfig) {
+                        } else {
                                if (!conf_cnt++)
-                                        printf(_("*\n* Restart config...\n*\n"));
+                                        printf("*\n* Restart config...\n*\n");
                                rootEntry = menu_get_parent_menu(menu);
                                conf(rootEntry);
                        }
@@ -440,7 +450,7 @@ static void check_conf(struct menu *menu)
 static struct option long_opts[] = {
        {"oldaskconfig",    no_argument,       NULL, oldaskconfig},
        {"oldconfig",       no_argument,       NULL, oldconfig},
-        {"silentoldconfig", no_argument,       NULL, silentoldconfig},
+        {"syncconfig",      no_argument,       NULL, syncconfig},
        {"defconfig",       optional_argument, NULL, defconfig},
        {"savedefconfig",   required_argument, NULL, savedefconfig},
        {"allnoconfig",     no_argument,       NULL, allnoconfig},
@@ -450,12 +460,6 @@ static struct option long_opts[] = {
        {"randconfig",      no_argument,       NULL, randconfig},
        {"listnewconfig",   no_argument,       NULL, listnewconfig},
        {"olddefconfig",    no_argument,       NULL, olddefconfig},
-        /*
-         * oldnoconfig is an alias of olddefconfig, because people already
-         * are dependent on its behavior(sets new symbols to their default
-         * value but not 'n') with the counter-intuitive name.
-         */
-        {"oldnoconfig",     no_argument,       NULL, olddefconfig},
        {NULL, 0, NULL, 0}
 };
@@ -467,10 +471,9 @@ static void conf_usage(const char *progname)
        printf("  --listnewconfig         List new options\n");
        printf("  --oldaskconfig          Start a new configuration using a line-oriented program\n");
        printf("  --oldconfig             Update a configuration using a provided .config as base\n");
-        printf("  --silentoldconfig       Similar to oldconfig but generates configuration in\n"
+        printf("  --syncconfig            Similar to oldconfig but generates configuration in\n"
-               "                          include/{generated/,config/} (oldconfig used to be more verbose)\n");
+               "                          include/{generated/,config/}\n");
        printf("  --olddefconfig          Same as oldconfig but sets new symbols to their default value\n");
-        printf("  --oldnoconfig           An alias of olddefconfig\n");
        printf("  --defconfig <file>      New config with default defined in <file>\n");
        printf("  --savedefconfig <file>  Save the minimal current configuration to <file>\n");
        printf("  --allnoconfig           New config where all options are answered with no\n");
@@ -486,10 +489,7 @@ int main(int ac, char **av)
        int opt;
        const char *name, *defconfig_file = NULL /* gcc uninit */;
        struct stat tmpstat;
+        int no_conf_write = 0;
-        setlocale(LC_ALL, "");
-        bindtextdomain(PACKAGE, LOCALEDIR);
-        textdomain(PACKAGE);
        tty_stdio = isatty(0) && isatty(1);
@@ -500,7 +500,12 @@ int main(int ac, char **av)
                }
                input_mode = (enum input_mode)opt;
                switch (opt) {
-                case silentoldconfig:
+                case syncconfig:
+                        /*
+                         * syncconfig is invoked during the build stage.
+                         * Suppress distracting "configuration written to ..."
+                         */
+                        conf_set_message_callback(NULL);
                        sync_kconfig = 1;
                        break;
                case defconfig:
@@ -548,7 +553,7 @@ int main(int ac, char **av)
                }
        }
        if (ac == optind) {
-                fprintf(stderr, _("%s: Kconfig file missing\n"), av[0]);
+                fprintf(stderr, "%s: Kconfig file missing\n", av[0]);
                conf_usage(progname);
                exit(1);
        }
@@ -558,12 +563,12 @@ int main(int ac, char **av)
        if (sync_kconfig) {
                name = conf_get_configname();
                if (stat(name, &tmpstat)) {
-                        fprintf(stderr, _("***\n"
+                        fprintf(stderr, "***\n"
                                "*** Configuration file \"%s\" not found!\n"
                                "***\n"
                                "*** Please run some configurator (e.g. \"make oldconfig\" or\n"
                                "*** \"make menuconfig\" or \"make xconfig\").\n"
-                                "***\n"), name);
+                                "***\n", name);
                        exit(1);
                }
        }
@@ -574,15 +579,15 @@ int main(int ac, char **av)
                        defconfig_file = conf_get_default_confname();
                if (conf_read(defconfig_file)) {
                        fprintf(stderr,
-                                _("***\n"
+                                "***\n"
                                  "*** Can't find default configuration \"%s\"!\n"
-                                  "***\n"),
+                                  "***\n",
                                defconfig_file);
                        exit(1);
                }
                break;
        case savedefconfig:
-        case silentoldconfig:
+        case syncconfig:
        case oldaskconfig:
        case oldconfig:
        case listnewconfig:
@@ -600,7 +605,7 @@ int main(int ac, char **av)
                if ((strcmp(name, "") != 0) && (strcmp(name, "1") != 0)) {
                        if (conf_read_simple(name, S_DEF_USER)) {
                                fprintf(stderr,
-                                        _("*** Can't read seed configuration \"%s\"!\n"),
+                                        "*** Can't read seed configuration \"%s\"!\n",
                                        name);
                                exit(1);
                        }
@@ -617,7 +622,7 @@ int main(int ac, char **av)
                if (conf_read_simple(name, S_DEF_USER) &&
                    conf_read_simple("all.config", S_DEF_USER)) {
                        fprintf(stderr,
-                                _("*** KCONFIG_ALLCONFIG set, but no \"%s\" or \"all.config\" file found\n"),
+                                "*** KCONFIG_ALLCONFIG set, but no \"%s\" or \"all.config\" file found\n",
                                name);
                        exit(1);
                }
@@ -627,13 +632,14 @@ int main(int ac, char **av)
        }
        if (sync_kconfig) {
-                if (conf_get_changed()) {
+                name = getenv("KCONFIG_NOSILENTUPDATE");
-                        name = getenv("KCONFIG_NOSILENTUPDATE");
+                if (name && *name) {
-                        if (name && *name) {
+                        if (conf_get_changed()) {
                                fprintf(stderr,
-                                        _("\n*** The configuration requires explicit update.\n\n"));
+                                        "\n*** The configuration requires explicit update.\n\n");
                                return 1;
                        }
+                        no_conf_write = 1;
                }
        }
@@ -662,45 +668,48 @@ int main(int ac, char **av)
        case oldaskconfig:
                rootEntry = &rootmenu;
                conf(&rootmenu);
-                input_mode = silentoldconfig;
+                input_mode = oldconfig;
                /* fall through */
        case oldconfig:
        case listnewconfig:
-        case olddefconfig:
+        case syncconfig:
-        case silentoldconfig:
                /* Update until a loop caused no more changes */
                do {
                        conf_cnt = 0;
                        check_conf(&rootmenu);
-                } while (conf_cnt &&
+                } while (conf_cnt);
-                         (input_mode != listnewconfig &&
+                break;
-                          input_mode != olddefconfig));
+        case olddefconfig:
+        default:
                break;
        }
-        if (sync_kconfig) {
+        if (input_mode == savedefconfig) {
-                /* silentoldconfig is used during the build so we shall update autoconf.
-                 * All other commands are only used to generate a config.
-                 */
-                if (conf_get_changed() && conf_write(NULL)) {
-                        fprintf(stderr, _("\n*** Error during writing of the configuration.\n\n"));
-                        exit(1);
-                }
-                if (conf_write_autoconf()) {
-                        fprintf(stderr, _("\n*** Error during update of the configuration.\n\n"));
-                        return 1;
-                }
-        } else if (input_mode == savedefconfig) {
                if (conf_write_defconfig(defconfig_file)) {
-                        fprintf(stderr, _("n*** Error while saving defconfig to: %s\n\n"),
+                        fprintf(stderr, "n*** Error while saving defconfig to: %s\n\n",
                                defconfig_file);
                        return 1;
                }
        } else if (input_mode != listnewconfig) {
-                if (conf_write(NULL)) {
+                if (!no_conf_write && conf_write(NULL)) {
-                        fprintf(stderr, _("\n*** Error during writing of the configuration.\n\n"));
+                        fprintf(stderr, "\n*** Error during writing of the configuration.\n\n");
                        exit(1);
                }
+                /*
+                 * Create auto.conf if it does not exist.
+                 * This prevents GNU Make 4.1 or older from emitting
+                 * "include/config/auto.conf: No such file or directory"
+                 * in the top-level Makefile
+                 *
+                 * syncconfig always creates or updates auto.conf because it is
+                 * used during the build.
+                 */
+                if (conf_write_autoconf(sync_kconfig) && sync_kconfig) {
+                        fprintf(stderr,
+                                "\n*** Error during sync of the configuration.\n\n");
+                        return 1;
+                }
        }
        return 0;
 }
diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c
index df26c7b0fe13..91d0a5c014ac 100644
--- a/scripts/kconfig/confdata.c
+++ b/scripts/kconfig/confdata.c
@@ -16,6 +16,64 @@
 #include "lkc.h"
+/* return true if 'path' exists, false otherwise */
+static bool is_present(const char *path)
+{
+        struct stat st;
+        return !stat(path, &st);
+}
+/* return true if 'path' exists and it is a directory, false otherwise */
+static bool is_dir(const char *path)
+{
+        struct stat st;
+        if (stat(path, &st))
+                return 0;
+        return S_ISDIR(st.st_mode);
+}
+/*
+ * Create the parent directory of the given path.
+ *
+ * For example, if 'include/config/auto.conf' is given, create 'include/config'.
+ */
+static int make_parent_dir(const char *path)
+{
+        char tmp[PATH_MAX + 1];
+        char *p;
+        strncpy(tmp, path, sizeof(tmp));
+        tmp[sizeof(tmp) - 1] = 0;
+        /* Remove the base name. Just return if nothing is left */
+        p = strrchr(tmp, '/');
+        if (!p)
+                return 0;
+        *(p + 1) = 0;
+        /* Just in case it is an absolute path */
+        p = tmp;
+        while (*p == '/')
+                p++;
+        while ((p = strchr(p, '/'))) {
+                *p = 0;
+                /* skip if the directory exists */
+                if (!is_dir(tmp) && mkdir(tmp, 0755))
+                        return -1;
+                *p = '/';
+                while (*p == '/')
+                        p++;
+        }
+        return 0;
+}
 struct conf_printer {
        void (*print_symbol)(FILE *, struct symbol *, const char *, void *);
        void (*print_comment)(FILE *, const char *, void *);
@@ -30,7 +88,7 @@ static void conf_message(const char *fmt, ...)
 static const char *conf_filename;
 static int conf_lineno, conf_warnings;
-const char conf_defname[] = "arch/$ARCH/defconfig";
+const char conf_defname[] = "arch/$(ARCH)/defconfig";
 static void conf_warning(const char *fmt, ...)
 {
@@ -43,16 +101,16 @@ static void conf_warning(const char *fmt, ...)
        conf_warnings++;
 }
-static void conf_default_message_callback(const char *fmt, va_list ap)
+static void conf_default_message_callback(const char *s)
 {
        printf("#\n# ");
-        vprintf(fmt, ap);
+        printf("%s", s);
        printf("\n#\n");
 }
-static void (*conf_message_callback) (const char *fmt, va_list ap) =
+static void (*conf_message_callback)(const char *s) =
        conf_default_message_callback;
-void conf_set_message_callback(void (*fn) (const char *fmt, va_list ap))
+void conf_set_message_callback(void (*fn)(const char *s))
 {
        conf_message_callback = fn;
 }
@@ -60,10 +118,15 @@ void conf_set_message_callback(void (*fn) (const char *fmt, va_list ap))
 static void conf_message(const char *fmt, ...)
 {
        va_list ap;
+        char buf[4096];
+        if (!conf_message_callback)
+                return;
        va_start(ap, fmt);
-        if (conf_message_callback)
-                conf_message_callback(fmt, ap);
+        vsnprintf(buf, sizeof(buf), fmt, ap);
+        conf_message_callback(buf);
        va_end(ap);
 }
@@ -81,43 +144,16 @@ const char *conf_get_autoconfig_name(void)
        return name ? name : "include/config/auto.conf";
 }
-static char *conf_expand_value(const char *in)
-{
-        struct symbol *sym;
-        const char *src;
-        static char res_value[SYMBOL_MAXLENGTH];
-        char *dst, name[SYMBOL_MAXLENGTH];
-        res_value[0] = 0;
-        dst = name;
-        while ((src = strchr(in, '$'))) {
-                strncat(res_value, in, src - in);
-                src++;
-                dst = name;
-                while (isalnum(*src) || *src == '_')
-                        *dst++ = *src++;
-                *dst = 0;
-                sym = sym_lookup(name, 0);
-                sym_calc_value(sym);
-                strcat(res_value, sym_get_string_value(sym));
-                in = src;
-        }
-        strcat(res_value, in);
-        return res_value;
-}
 char *conf_get_default_confname(void)
 {
-        struct stat buf;
        static char fullname[PATH_MAX+1];
        char *env, *name;
-        name = conf_expand_value(conf_defname);
+        name = expand_string(conf_defname);
        env = getenv(SRCTREE);
        if (env) {
                sprintf(fullname, "%s/%s", env, name);
-                if (!stat(fullname, &buf))
+                if (is_present(fullname))
                        return fullname;
        }
        return name;
@@ -274,10 +310,11 @@ int conf_read_simple(const char *name, int def)
                        if (expr_calc_value(prop->visible.expr) == no ||
                            prop->expr->type != E_SYMBOL)
                                continue;
-                        name = conf_expand_value(prop->expr->left.sym->name);
+                        sym_calc_value(prop->expr->left.sym);
+                        name = sym_get_string_value(prop->expr->left.sym);
                        in = zconf_fopen(name);
                        if (in) {
-                                conf_message(_("using defaults found in %s"),
+                                conf_message("using defaults found in %s",
                                         name);
                                goto load;
                        }
@@ -422,7 +459,7 @@ int conf_read(const char *name)
        for_all_symbols(i, sym) {
                sym_calc_value(sym);
-                if (sym_is_choice(sym) || (sym->flags & SYMBOL_AUTO))
+                if (sym_is_choice(sym) || (sym->flags & SYMBOL_NO_WRITE))
                        continue;
                if (sym_has_value(sym) && (sym->flags & SYMBOL_WRITE)) {
                        /* check that calculated value agrees with saved value */
@@ -745,15 +782,14 @@ int conf_write(const char *name)
        struct menu *menu;
        const char *basename;
        const char *str;
-        char dirname[PATH_MAX+1], tmpname[PATH_MAX+1], newname[PATH_MAX+1];
+        char dirname[PATH_MAX+1], tmpname[PATH_MAX+22], newname[PATH_MAX+8];
        char *env;
        dirname[0] = 0;
        if (name && name[0]) {
-                struct stat st;
                char *slash;
-                if (!stat(name, &st) && S_ISDIR(st.st_mode)) {
+                if (is_dir(name)) {
                        strcpy(dirname, name);
                        strcat(dirname, "/");
                        basename = conf_get_configname();
@@ -831,33 +867,66 @@ next:
                        return 1;
        }
-        conf_message(_("configuration written to %s"), newname);
+        conf_message("configuration written to %s", newname);
        sym_set_change_count(0);
        return 0;
 }
+/* write a dependency file as used by kbuild to track dependencies */
+static int conf_write_dep(const char *name)
+{
+        struct file *file;
+        FILE *out;
+        if (!name)
+                name = ".kconfig.d";
+        out = fopen("..config.tmp", "w");
+        if (!out)
+                return 1;
+        fprintf(out, "deps_config := \\\n");
+        for (file = file_list; file; file = file->next) {
+                if (file->next)
+                        fprintf(out, "\t%s \\\n", file->name);
+                else
+                        fprintf(out, "\t%s\n", file->name);
+        }
+        fprintf(out, "\n%s: \\\n"
+                     "\t$(deps_config)\n\n", conf_get_autoconfig_name());
+        env_write_dep(out, conf_get_autoconfig_name());
+        fprintf(out, "\n$(deps_config): ;\n");
+        fclose(out);
+        if (make_parent_dir(name))
+                return 1;
+        rename("..config.tmp", name);
+        return 0;
+}
 static int conf_split_config(void)
 {
        const char *name;
        char path[PATH_MAX+1];
        char *s, *d, c;
        struct symbol *sym;
-        struct stat sb;
        int res, i, fd;
        name = conf_get_autoconfig_name();
        conf_read_simple(name, S_DEF_AUTO);
        sym_calc_value(modules_sym);
+        if (make_parent_dir("include/config/foo.h"))
+                return 1;
        if (chdir("include/config"))
                return 1;
        res = 0;
        for_all_symbols(i, sym) {
                sym_calc_value(sym);
-                if ((sym->flags & SYMBOL_AUTO) || !sym->name)
+                if ((sym->flags & SYMBOL_NO_WRITE) || !sym->name)
                        continue;
                if (sym->flags & SYMBOL_WRITE) {
                        if (sym->flags & SYMBOL_DEF_AUTO) {
@@ -922,19 +991,12 @@ static int conf_split_config(void)
                                res = 1;
                                break;
                        }
-                        /*
-                         * Create directory components,
+                        if (make_parent_dir(path)) {
-                         * unless they exist already.
+                                res = 1;
-                         */
+                                goto out;
-                        d = path;
-                        while ((d = strchr(d, '/'))) {
-                                *d = 0;
-                                if (stat(path, &sb) && mkdir(path, 0755)) {
-                                        res = 1;
-                                        goto out;
-                                }
-                                *d++ = '/';
                        }
                        /* Try it again. */
                        fd = open(path, O_WRONLY | O_CREAT | O_TRUNC, 0644);
                        if (fd == -1) {
@@ -951,16 +1013,20 @@ out:
        return res;
 }
-int conf_write_autoconf(void)
+int conf_write_autoconf(int overwrite)
 {
        struct symbol *sym;
        const char *name;
+        const char *autoconf_name = conf_get_autoconfig_name();
        FILE *out, *tristate, *out_h;
        int i;
+        if (!overwrite && is_present(autoconf_name))
+                return 0;
        sym_clear_all_valid();
-        file_write_dep("include/config/auto.conf.cmd");
+        conf_write_dep("include/config/auto.conf.cmd");
        if (conf_split_config())
                return 1;
@@ -1007,19 +1073,26 @@ int conf_write_autoconf(void)
        name = getenv("KCONFIG_AUTOHEADER");
        if (!name)
                name = "include/generated/autoconf.h";
+        if (make_parent_dir(name))
+                return 1;
        if (rename(".tmpconfig.h", name))
                return 1;
        name = getenv("KCONFIG_TRISTATE");
        if (!name)
                name = "include/config/tristate.conf";
+        if (make_parent_dir(name))
+                return 1;
        if (rename(".tmpconfig_tristate", name))
                return 1;
-        name = conf_get_autoconfig_name();
+        if (make_parent_dir(autoconf_name))
+                return 1;
        /*
         * This must be the last step, kbuild has a dependency on auto.conf
         * and this marks the successful completion of the previous steps.
         */
-        if (rename(".tmpconfig", name))
+        if (rename(".tmpconfig", autoconf_name))
                return 1;
        return 0;
diff --git a/scripts/kconfig/expr.c b/scripts/kconfig/expr.c
index d45381986ac7..e1a39e90841d 100644
--- a/scripts/kconfig/expr.c
+++ b/scripts/kconfig/expr.c
@@ -1137,49 +1137,9 @@ static int expr_compare_type(enum expr_type t1, enum expr_type t2)
        return 0;
 }
-static inline struct expr *
+void expr_print(struct expr *e,
-expr_get_leftmost_symbol(const struct expr *e)
+                void (*fn)(void *, struct symbol *, const char *),
-{
+                void *data, int prevtoken)
-        if (e == NULL)
-                return NULL;
-        while (e->type != E_SYMBOL)
-                e = e->left.expr;
-        return expr_copy(e);
-}
-/*
- * Given expression `e1' and `e2', returns the leaf of the longest
- * sub-expression of `e1' not containing 'e2.
- */
-struct expr *expr_simplify_unmet_dep(struct expr *e1, struct expr *e2)
-{
-        struct expr *ret;
-        switch (e1->type) {
-        case E_OR:
-                return expr_alloc_and(
-                    expr_simplify_unmet_dep(e1->left.expr, e2),
-                    expr_simplify_unmet_dep(e1->right.expr, e2));
-        case E_AND: {
-                struct expr *e;
-                e = expr_alloc_and(expr_copy(e1), expr_copy(e2));
-                e = expr_eliminate_dups(e);
-                ret = (!expr_eq(e, e1)) ? e1 : NULL;
-                expr_free(e);
-                break;
-                }
-        default:
-                ret = e1;
-                break;
-        }
-        return expr_get_leftmost_symbol(ret);
-}
-static void __expr_print(struct expr *e, void (*fn)(void *, struct symbol *, const char *), void *data, int prevtoken, bool revdep)
 {
        if (!e) {
                fn(data, NULL, "y");
@@ -1234,14 +1194,9 @@ static void __expr_print(struct expr *e, void (*fn)(void *, struct symbol *, con
                fn(data, e->right.sym, e->right.sym->name);
                break;
        case E_OR:
-                if (revdep && e->left.expr->type != E_OR)
+                expr_print(e->left.expr, fn, data, E_OR);
-                        fn(data, NULL, "\n  - ");
+                fn(data, NULL, " || ");
-                __expr_print(e->left.expr, fn, data, E_OR, revdep);
+                expr_print(e->right.expr, fn, data, E_OR);
-                if (revdep)
-                        fn(data, NULL, "\n  - ");
-                else
-                        fn(data, NULL, " || ");
-                __expr_print(e->right.expr, fn, data, E_OR, revdep);
                break;
        case E_AND:
                expr_print(e->left.expr, fn, data, E_AND);
@@ -1274,11 +1229,6 @@ static void __expr_print(struct expr *e, void (*fn)(void *, struct symbol *, con
                fn(data, NULL, ")");
 }
-void expr_print(struct expr *e, void (*fn)(void *, struct symbol *, const char *), void *data, int prevtoken)
-{
-        __expr_print(e, fn, data, prevtoken, false);
-}
 static void expr_print_file_helper(void *data, struct symbol *sym, const char *str)
 {
        xfwrite(str, strlen(str), 1, data);
@@ -1329,7 +1279,27 @@ void expr_gstr_print(struct expr *e, struct gstr *gs)
 * line with a minus. This makes expressions much easier to read.
 * Suitable for reverse dependency expressions.
 */
-void expr_gstr_print_revdep(struct expr *e, struct gstr *gs)
+static void expr_print_revdep(struct expr *e,
+                              void (*fn)(void *, struct symbol *, const char *),
+                              void *data, tristate pr_type, const char **title)
+{
+        if (e->type == E_OR) {
+                expr_print_revdep(e->left.expr, fn, data, pr_type, title);
+                expr_print_revdep(e->right.expr, fn, data, pr_type, title);
+        } else if (expr_calc_value(e) == pr_type) {
+                if (*title) {
+                        fn(data, NULL, *title);
+                        *title = NULL;
+                }
+                fn(data, NULL, "  - ");
+                expr_print(e, fn, data, E_NONE);
+                fn(data, NULL, "\n");
+        }
+}
+void expr_gstr_print_revdep(struct expr *e, struct gstr *gs,
+                            tristate pr_type, const char *title)
 {
-        __expr_print(e, expr_print_gstr_helper, gs, E_NONE, true);
+        expr_print_revdep(e, expr_print_gstr_helper, gs, pr_type, &title);
 }
diff --git a/scripts/kconfig/expr.h b/scripts/kconfig/expr.h
index c16e82e302a2..7c329e179007 100644
--- a/scripts/kconfig/expr.h
+++ b/scripts/kconfig/expr.h
@@ -141,7 +141,7 @@ struct symbol {
 #define SYMBOL_OPTIONAL   0x0100  /* choice is optional - values can be 'n' */
 #define SYMBOL_WRITE      0x0200  /* write symbol to file (KCONFIG_CONFIG) */
 #define SYMBOL_CHANGED    0x0400  /* ? */
-#define SYMBOL_AUTO       0x1000  /* value from environment variable */
+#define SYMBOL_NO_WRITE   0x1000  /* Symbol for internal use only; it will not be written */
 #define SYMBOL_CHECKED    0x2000  /* used during dependency checking */
 #define SYMBOL_WARNED     0x8000  /* warning has been issued */
@@ -171,6 +171,9 @@ struct symbol {
 * config BAZ
 *         int "BAZ Value"
 *         range 1..255
+ *
+ * Please, also check zconf.y:print_symbol() when modifying the
+ * list of property types!
 */
 enum prop_type {
        P_UNKNOWN,
@@ -182,7 +185,6 @@ enum prop_type {
        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 */
 };
@@ -305,12 +307,12 @@ struct expr *expr_transform(struct expr *e);
 int expr_contains_symbol(struct expr *dep, struct symbol *sym);
 bool expr_depends_symbol(struct expr *dep, struct symbol *sym);
 struct expr *expr_trans_compare(struct expr *e, enum expr_type type, struct symbol *sym);
-struct expr *expr_simplify_unmet_dep(struct expr *e1, struct expr *e2);
 void expr_fprint(struct expr *e, FILE *out);
 struct gstr; /* forward */
 void expr_gstr_print(struct expr *e, struct gstr *gs);
-void expr_gstr_print_revdep(struct expr *e, struct gstr *gs);
+void expr_gstr_print_revdep(struct expr *e, struct gstr *gs,
+                            tristate pr_type, const char *title);
 static inline int expr_is_yes(struct expr *e)
 {
diff --git a/scripts/kconfig/gconf-cfg.sh b/scripts/kconfig/gconf-cfg.sh
new file mode 100755
index 000000000000..480ecd8b9f41
--- /dev/null
+++ b/scripts/kconfig/gconf-cfg.sh
@@ -0,0 +1,30 @@
+#!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
+PKG="gtk+-2.0 gmodule-2.0 libglade-2.0"
+if [ -z "$(command -v pkg-config)" ]; then
+        echo >&2 "*"
+        echo >&2 "* 'make gconfig' requires 'pkg-config'. Please install it."
+        echo >&2 "*"
+        exit 1
+fi
+if ! pkg-config --exists $PKG; then
+        echo >&2 "*"
+        echo >&2 "* Unable to find the GTK+ installation. Please make sure that"
+        echo >&2 "* the GTK+ 2.0 development package is correctly installed."
+        echo >&2 "* You need $PKG"
+        echo >&2 "*"
+        exit 1
+fi
+if ! pkg-config --atleast-version=2.0.0 gtk+-2.0; then
+        echo >&2 "*"
+        echo >&2 "* GTK+ is present but version >= 2.0.0 is required."
+        echo >&2 "*"
+        exit 1
+fi
+echo cflags=\"$(pkg-config --cflags $PKG)\"
+echo libs=\"$(pkg-config --libs $PKG)\"
diff --git a/scripts/kconfig/gconf.c b/scripts/kconfig/gconf.c
index cfddddb9c9d7..36f578415c4a 100644
--- a/scripts/kconfig/gconf.c
+++ b/scripts/kconfig/gconf.c
@@ -101,8 +101,8 @@ const char *dbg_sym_flags(int val)
                strcat(buf, "write/");
        if (val & SYMBOL_CHANGED)
                strcat(buf, "changed/");
-        if (val & SYMBOL_AUTO)
+        if (val & SYMBOL_NO_WRITE)
-                strcat(buf, "auto/");
+                strcat(buf, "no_write/");
        buf[strlen(buf) - 1] = '\0';
@@ -137,7 +137,7 @@ void init_main_window(const gchar * glade_file)
        xml = glade_xml_new(glade_file, "window1", NULL);
        if (!xml)
-                g_error(_("GUI loading failed !\n"));
+                g_error("GUI loading failed !\n");
        glade_xml_signal_autoconnect(xml);
        main_wnd = glade_xml_get_widget(xml, "window1");
@@ -233,7 +233,7 @@ void init_left_tree(void)
        column = gtk_tree_view_column_new();
        gtk_tree_view_append_column(view, column);
-        gtk_tree_view_column_set_title(column, _("Options"));
+        gtk_tree_view_column_set_title(column, "Options");
        renderer = gtk_cell_renderer_toggle_new();
        gtk_tree_view_column_pack_start(GTK_TREE_VIEW_COLUMN(column),
@@ -276,7 +276,7 @@ void init_right_tree(void)
        column = gtk_tree_view_column_new();
        gtk_tree_view_append_column(view, column);
-        gtk_tree_view_column_set_title(column, _("Options"));
+        gtk_tree_view_column_set_title(column, "Options");
        renderer = gtk_cell_renderer_pixbuf_new();
        gtk_tree_view_column_pack_start(GTK_TREE_VIEW_COLUMN(column),
@@ -305,7 +305,7 @@ void init_right_tree(void)
        renderer = gtk_cell_renderer_text_new();
        gtk_tree_view_insert_column_with_attributes(view, -1,
-                                                    _("Name"), renderer,
+                                                    "Name", renderer,
                                                    "text", COL_NAME,
                                                    "foreground-gdk",
                                                    COL_COLOR, NULL);
@@ -329,7 +329,7 @@ void init_right_tree(void)
                                                    COL_COLOR, NULL);
        renderer = gtk_cell_renderer_text_new();
        gtk_tree_view_insert_column_with_attributes(view, -1,
-                                                    _("Value"), renderer,
+                                                    "Value", renderer,
                                                    "text", COL_VALUE,
                                                    "editable",
                                                    COL_EDIT,
@@ -368,7 +368,7 @@ static void text_insert_help(struct menu *menu)
 {
        GtkTextBuffer *buffer;
        GtkTextIter start, end;
-        const char *prompt = _(menu_get_prompt(menu));
+        const char *prompt = menu_get_prompt(menu);
        struct gstr help = str_new();
        menu_get_ext_help(menu, &help);
@@ -422,7 +422,7 @@ gboolean on_window1_delete_event(GtkWidget * widget, GdkEvent * event,
        if (!conf_get_changed())
                return FALSE;
-        dialog = gtk_dialog_new_with_buttons(_("Warning !"),
+        dialog = gtk_dialog_new_with_buttons("Warning !",
                                             GTK_WINDOW(main_wnd),
                                             (GtkDialogFlags)
                                             (GTK_DIALOG_MODAL |
@@ -436,7 +436,7 @@ gboolean on_window1_delete_event(GtkWidget * widget, GdkEvent * event,
        gtk_dialog_set_default_response(GTK_DIALOG(dialog),
                                        GTK_RESPONSE_CANCEL);
-        label = gtk_label_new(_("\nSave configuration ?\n"));
+        label = gtk_label_new("\nSave configuration ?\n");
        gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), label);
        gtk_widget_show(label);
@@ -496,7 +496,7 @@ load_filename(GtkFileSelection * file_selector, gpointer user_data)
                                             (user_data));
        if (conf_read(fn))
-                text_insert_msg(_("Error"), _("Unable to load configuration !"));
+                text_insert_msg("Error", "Unable to load configuration !");
        else
                display_tree(&rootmenu);
 }
@@ -505,7 +505,7 @@ void on_load1_activate(GtkMenuItem * menuitem, gpointer user_data)
 {
        GtkWidget *fs;
-        fs = gtk_file_selection_new(_("Load file..."));
+        fs = gtk_file_selection_new("Load file...");
        g_signal_connect(GTK_OBJECT(GTK_FILE_SELECTION(fs)->ok_button),
                         "clicked",
                         G_CALLBACK(load_filename), (gpointer) fs);
@@ -524,7 +524,8 @@ void on_load1_activate(GtkMenuItem * menuitem, gpointer user_data)
 void on_save_activate(GtkMenuItem * menuitem, gpointer user_data)
 {
        if (conf_write(NULL))
-                text_insert_msg(_("Error"), _("Unable to save configuration !"));
+                text_insert_msg("Error", "Unable to save configuration !");
+        conf_write_autoconf(0);
 }
@@ -537,7 +538,7 @@ store_filename(GtkFileSelection * file_selector, gpointer user_data)
                                             (user_data));
        if (conf_write(fn))
-                text_insert_msg(_("Error"), _("Unable to save configuration !"));
+                text_insert_msg("Error", "Unable to save configuration !");
        gtk_widget_destroy(GTK_WIDGET(user_data));
 }
@@ -546,7 +547,7 @@ void on_save_as1_activate(GtkMenuItem * menuitem, gpointer user_data)
 {
        GtkWidget *fs;
-        fs = gtk_file_selection_new(_("Save file as..."));
+        fs = gtk_file_selection_new("Save file as...");
        g_signal_connect(GTK_OBJECT(GTK_FILE_SELECTION(fs)->ok_button),
                         "clicked",
                         G_CALLBACK(store_filename), (gpointer) fs);
@@ -639,7 +640,7 @@ on_set_option_mode3_activate(GtkMenuItem *menuitem, gpointer user_data)
 void on_introduction1_activate(GtkMenuItem * menuitem, gpointer user_data)
 {
        GtkWidget *dialog;
-        const gchar *intro_text = _(
+        const gchar *intro_text = 
            "Welcome to gkc, the GTK+ graphical configuration tool\n"
            "For each option, a blank box indicates the feature is disabled, a\n"
            "check indicates it is enabled, and a dot indicates that it is to\n"
@@ -654,7 +655,7 @@ void on_introduction1_activate(GtkMenuItem * menuitem, gpointer user_data)
            "option.\n"
            "\n"
            "Toggling Show Debug Info under the Options menu will show \n"
-            "the dependencies, which you can then match by examining other options.");
+            "the dependencies, which you can then match by examining other options.";
        dialog = gtk_message_dialog_new(GTK_WINDOW(main_wnd),
                                        GTK_DIALOG_DESTROY_WITH_PARENT,
@@ -671,8 +672,8 @@ void on_about1_activate(GtkMenuItem * menuitem, gpointer user_data)
 {
        GtkWidget *dialog;
        const gchar *about_text =
-            _("gkc is copyright (c) 2002 Romain Lievin <roms@lpg.ticalc.org>.\n"
+            "gkc is copyright (c) 2002 Romain Lievin <roms@lpg.ticalc.org>.\n"
-              "Based on the source code from Roman Zippel.\n");
+              "Based on the source code from Roman Zippel.\n";
        dialog = gtk_message_dialog_new(GTK_WINDOW(main_wnd),
                                        GTK_DIALOG_DESTROY_WITH_PARENT,
@@ -689,9 +690,9 @@ void on_license1_activate(GtkMenuItem * menuitem, gpointer user_data)
 {
        GtkWidget *dialog;
        const gchar *license_text =
-            _("gkc is released under the terms of the GNU GPL v2.\n"
+            "gkc is released under the terms of the GNU GPL v2.\n"
              "For more information, please see the source code or\n"
-              "visit http://www.fsf.org/licenses/licenses.html\n");
+              "visit http://www.fsf.org/licenses/licenses.html\n";
        dialog = gtk_message_dialog_new(GTK_WINDOW(main_wnd),
                                        GTK_DIALOG_DESTROY_WITH_PARENT,
@@ -1049,7 +1050,7 @@ static gchar **fill_row(struct menu *menu)
        bzero(row, sizeof(row));
        row[COL_OPTION] =
-            g_strdup_printf("%s %s", _(menu_get_prompt(menu)),
+            g_strdup_printf("%s %s", menu_get_prompt(menu),
                            sym && !sym_has_value(sym) ? "(NEW)" : "");
        if (opt_mode == OPT_ALL && !menu_is_visible(menu))
@@ -1102,7 +1103,7 @@ static gchar **fill_row(struct menu *menu)
                if (def_menu)
                        row[COL_VALUE] =
-                            g_strdup(_(menu_get_prompt(def_menu)));
+                            g_strdup(menu_get_prompt(def_menu));
        }
        if (sym->flags & SYMBOL_CHOICEVAL)
                row[COL_BTNRAD] = GINT_TO_POINTER(TRUE);
@@ -1447,10 +1448,6 @@ int main(int ac, char *av[])
        char *env;
        gchar *glade_file;
-        bindtextdomain(PACKAGE, LOCALEDIR);
-        bind_textdomain_codeset(PACKAGE, "UTF-8");
-        textdomain(PACKAGE);
        /* GTK stuffs */
        gtk_set_locale();
        gtk_init(&ac, &av);
diff --git a/scripts/kconfig/kconf_id.c b/scripts/kconfig/kconf_id.c
index 3ea9c5f9f730..b3e0ea0ac732 100644
--- a/scripts/kconfig/kconf_id.c
+++ b/scripts/kconfig/kconf_id.c
@@ -32,7 +32,6 @@ static struct kconf_id kconf_id_array[] = {
        { "on",                 T_ON,                   TF_PARAM },
        { "modules",            T_OPT_MODULES,          TF_OPTION },
        { "defconfig_list",     T_OPT_DEFCONFIG_LIST,   TF_OPTION },
-        { "env",                T_OPT_ENV,              TF_OPTION },
        { "allnoconfig_y",      T_OPT_ALLNOCONFIG_Y,    TF_OPTION },
 };
diff --git a/scripts/kconfig/kxgettext.c b/scripts/kconfig/kxgettext.c
deleted file mode 100644
index 240880a89111..000000000000
--- a/scripts/kconfig/kxgettext.c
+++ /dev/null
@@ -1,235 +0,0 @@
-/*
- * Arnaldo Carvalho de Melo <acme@conectiva.com.br>, 2005
- *
- * Released under the terms of the GNU GPL v2.0
- */
-#include <stdlib.h>
-#include <string.h>
-#include "lkc.h"
-static char *escape(const char* text, char *bf, int len)
-{
-        char *bfp = bf;
-        int multiline = strchr(text, '\n') != NULL;
-        int eol = 0;
-        int textlen = strlen(text);
-        if ((textlen > 0) && (text[textlen-1] == '\n'))
-                eol = 1;
-        *bfp++ = '"';
-        --len;
-        if (multiline) {
-                *bfp++ = '"';
-                *bfp++ = '\n';
-                *bfp++ = '"';
-                len -= 3;
-        }
-        while (*text != '\0' && len > 1) {
-                if (*text == '"')
-                        *bfp++ = '\\';
-                else if (*text == '\n') {
-                        *bfp++ = '\\';
-                        *bfp++ = 'n';
-                        *bfp++ = '"';
-                        *bfp++ = '\n';
-                        *bfp++ = '"';
-                        len -= 5;
-                        ++text;
-                        goto next;
-                }
-                else if (*text == '\\') {
-                        *bfp++ = '\\';
-                        len--;
-                }
-                *bfp++ = *text++;
-next:
-                --len;
-        }
-        if (multiline && eol)
-                bfp -= 3;
-        *bfp++ = '"';
-        *bfp = '\0';
-        return bf;
-}
-struct file_line {
-        struct file_line *next;
-        const char *file;
-        int lineno;
-};
-static struct file_line *file_line__new(const char *file, int lineno)
-{
-        struct file_line *self = malloc(sizeof(*self));
-        if (self == NULL)
-                goto out;
-        self->file   = file;
-        self->lineno = lineno;
-        self->next   = NULL;
-out:
-        return self;
-}
-struct message {
-        const char       *msg;
-        const char       *option;
-        struct message   *next;
-        struct file_line *files;
-};
-static struct message *message__list;
-static struct message *message__new(const char *msg, char *option,
-                                    const char *file, int lineno)
-{
-        struct message *self = malloc(sizeof(*self));
-        if (self == NULL)
-                goto out;
-        self->files = file_line__new(file, lineno);
-        if (self->files == NULL)
-                goto out_fail;
-        self->msg = xstrdup(msg);
-        if (self->msg == NULL)
-                goto out_fail_msg;
-        self->option = option;
-        self->next = NULL;
-out:
-        return self;
-out_fail_msg:
-        free(self->files);
-out_fail:
-        free(self);
-        self = NULL;
-        goto out;
-}
-static struct message *mesage__find(const char *msg)
-{
-        struct message *m = message__list;
-        while (m != NULL) {
-                if (strcmp(m->msg, msg) == 0)
-                        break;
-                m = m->next;
-        }
-        return m;
-}
-static int message__add_file_line(struct message *self, const char *file,
-                                  int lineno)
-{
-        int rc = -1;
-        struct file_line *fl = file_line__new(file, lineno);
-        if (fl == NULL)
-                goto out;
-        fl->next    = self->files;
-        self->files = fl;
-        rc = 0;
-out:
-        return rc;
-}
-static int message__add(const char *msg, char *option, const char *file,
-                        int lineno)
-{
-        int rc = 0;
-        char bf[16384];
-        char *escaped = escape(msg, bf, sizeof(bf));
-        struct message *m = mesage__find(escaped);
-        if (m != NULL)
-                rc = message__add_file_line(m, file, lineno);
-        else {
-                m = message__new(escaped, option, file, lineno);
-                if (m != NULL) {
-                        m->next       = message__list;
-                        message__list = m;
-                } else
-                        rc = -1;
-        }
-        return rc;
-}
-static void menu_build_message_list(struct menu *menu)
-{
-        struct menu *child;
-        message__add(menu_get_prompt(menu), NULL,
-                     menu->file == NULL ? "Root Menu" : menu->file->name,
-                     menu->lineno);
-        if (menu->sym != NULL && menu_has_help(menu))
-                message__add(menu_get_help(menu), menu->sym->name,
-                             menu->file == NULL ? "Root Menu" : menu->file->name,
-                             menu->lineno);
-        for (child = menu->list; child != NULL; child = child->next)
-                if (child->prompt != NULL)
-                        menu_build_message_list(child);
-}
-static void message__print_file_lineno(struct message *self)
-{
-        struct file_line *fl = self->files;
-        putchar('\n');
-        if (self->option != NULL)
-                printf("# %s:00000\n", self->option);
-        printf("#: %s:%d", fl->file, fl->lineno);
-        fl = fl->next;
-        while (fl != NULL) {
-                printf(", %s:%d", fl->file, fl->lineno);
-                fl = fl->next;
-        }
-        putchar('\n');
-}
-static void message__print_gettext_msgid_msgstr(struct message *self)
-{
-        message__print_file_lineno(self);
-        printf("msgid %s\n"
-               "msgstr \"\"\n", self->msg);
-}
-static void menu__xgettext(void)
-{
-        struct message *m = message__list;
-        while (m != NULL) {
-                /* skip empty lines ("") */
-                if (strlen(m->msg) > sizeof("\"\""))
-                        message__print_gettext_msgid_msgstr(m);
-                m = m->next;
-        }
-}
-int main(int ac, char **av)
-{
-        conf_parse(av[1]);
-        menu_build_message_list(menu_get_root_menu(NULL));
-        menu__xgettext();
-        return 0;
-}
diff --git a/scripts/kconfig/lkc.h b/scripts/kconfig/lkc.h
index 2d5ec2d0e952..9eb7c837cd8f 100644
--- a/scripts/kconfig/lkc.h
+++ b/scripts/kconfig/lkc.h
@@ -8,15 +8,6 @@
 #include "expr.h"
-#ifndef KBUILD_NO_NLS
-# include <libintl.h>
-#else
-static inline const char *gettext(const char *txt) { return txt; }
-static inline void textdomain(const char *domainname) {}
-static inline void bindtextdomain(const char *name, const char *dir) {}
-static inline char *bind_textdomain_codeset(const char *dn, char *c) { return c; }
-#endif
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -29,11 +20,6 @@ extern "C" {
 #define PACKAGE "linux"
 #endif
-#define LOCALEDIR "/usr/share/locale"
-#define _(text) gettext(text)
-#define N_(text) (text)
 #ifndef CONFIG_
 #define CONFIG_ "CONFIG_"
 #endif
@@ -58,7 +44,6 @@ enum conf_def_mode {
 #define T_OPT_MODULES           1
 #define T_OPT_DEFCONFIG_LIST    2
-#define T_OPT_ENV               3
 #define T_OPT_ALLNOCONFIG_Y     4
 struct kconf_id {
@@ -68,6 +53,7 @@ struct kconf_id {
        enum symbol_type stype;
 };
+extern int yylineno;
 void zconfdump(FILE *out);
 void zconf_starthelp(void);
 FILE *zconf_fopen(const char *name);
@@ -111,11 +97,11 @@ void menu_set_type(int type);
 /* util.c */
 struct file *file_lookup(const char *name);
-int file_write_dep(const char *name);
 void *xmalloc(size_t size);
 void *xcalloc(size_t nmemb, size_t size);
 void *xrealloc(void *p, size_t size);
 char *xstrdup(const char *s);
+char *xstrndup(const char *s, size_t n);
 struct gstr {
        size_t len;
@@ -133,16 +119,12 @@ void str_printf(struct gstr *gs, const char *fmt, ...);
 const char *str_get(struct gstr *gs);
 /* symbol.c */
-extern struct expr *sym_env_list;
-void sym_init(void);
 void sym_clear_all_valid(void);
 struct symbol *sym_choice_default(struct symbol *sym);
 const char *sym_get_string_default(struct symbol *sym);
 struct symbol *sym_check_deps(struct symbol *sym);
 struct property *prop_alloc(enum prop_type type, struct symbol *sym);
 struct symbol *prop_get_symbol(struct property *prop);
-struct property *sym_get_env_prop(struct symbol *sym);
 static inline tristate sym_get_tristate_value(struct symbol *sym)
 {
diff --git a/scripts/kconfig/lkc_proto.h b/scripts/kconfig/lkc_proto.h
index 9dc8abfb1dc3..86c267540ccc 100644
--- a/scripts/kconfig/lkc_proto.h
+++ b/scripts/kconfig/lkc_proto.h
@@ -7,10 +7,10 @@ int conf_read(const char *name);
 int conf_read_simple(const char *name, int);
 int conf_write_defconfig(const char *name);
 int conf_write(const char *name);
-int conf_write_autoconf(void);
+int conf_write_autoconf(int overwrite);
 bool conf_get_changed(void);
 void conf_set_changed_callback(void (*fn)(void));
-void conf_set_message_callback(void (*fn)(const char *fmt, va_list ap));
+void conf_set_message_callback(void (*fn)(const char *s));
 /* menu.c */
 extern struct menu rootmenu;
@@ -31,7 +31,6 @@ extern struct symbol * symbol_hash[SYMBOL_HASHSIZE];
 struct symbol * sym_lookup(const char *name, int flags);
 struct symbol * sym_find(const char *name);
-char *sym_expand_string_value(const char *in);
 const char * sym_escape_string_value(const char *in);
 struct symbol ** sym_re_search(const char *pattern);
 const char * sym_type_name(enum symbol_type type);
@@ -49,5 +48,19 @@ const char * sym_get_string_value(struct symbol *sym);
 const char * prop_get_type_name(enum prop_type type);
+/* preprocess.c */
+enum variable_flavor {
+        VAR_SIMPLE,
+        VAR_RECURSIVE,
+        VAR_APPEND,
+};
+void env_write_dep(FILE *f, const char *auto_conf_name);
+void variable_add(const char *name, const char *value,
+                  enum variable_flavor flavor);
+void variable_all_del(void);
+char *expand_string(const char *in);
+char *expand_dollar(const char **str);
+char *expand_one_token(const char **str);
 /* expr.c */
 void expr_print(struct expr *e, void (*fn)(void *, struct symbol *, const char *), void *data, int prevtoken);
diff --git a/scripts/kconfig/lxdialog/check-lxdialog.sh b/scripts/kconfig/lxdialog/check-lxdialog.sh
deleted file mode 100755
index 6c0bcd9c472d..000000000000
--- a/scripts/kconfig/lxdialog/check-lxdialog.sh
+++ /dev/null
@@ -1,93 +0,0 @@
-#!/bin/sh
-# SPDX-License-Identifier: GPL-2.0
-# Check ncurses compatibility
-# What library to link
-ldflags()
-{
-        pkg-config --libs ncursesw 2>/dev/null && exit
-        pkg-config --libs ncurses 2>/dev/null && exit
-        for ext in so a dll.a dylib ; do
-                for lib in ncursesw ncurses curses ; do
-                        $cc -print-file-name=lib${lib}.${ext} | grep -q /
-                        if [ $? -eq 0 ]; then
-                                echo "-l${lib}"
-                                exit
-                        fi
-                done
-        done
-        exit 1
-}
-# Where is ncurses.h?
-ccflags()
-{
-        if pkg-config --cflags ncursesw 2>/dev/null; then
-                echo '-DCURSES_LOC="<ncurses.h>" -DNCURSES_WIDECHAR=1'
-        elif pkg-config --cflags ncurses 2>/dev/null; then
-                echo '-DCURSES_LOC="<ncurses.h>"'
-        elif [ -f /usr/include/ncursesw/curses.h ]; then
-                echo '-I/usr/include/ncursesw -DCURSES_LOC="<curses.h>"'
-                echo ' -DNCURSES_WIDECHAR=1'
-        elif [ -f /usr/include/ncurses/ncurses.h ]; then
-                echo '-I/usr/include/ncurses -DCURSES_LOC="<ncurses.h>"'
-        elif [ -f /usr/include/ncurses/curses.h ]; then
-                echo '-I/usr/include/ncurses -DCURSES_LOC="<curses.h>"'
-        elif [ -f /usr/include/ncurses.h ]; then
-                echo '-DCURSES_LOC="<ncurses.h>"'
-        else
-                echo '-DCURSES_LOC="<curses.h>"'
-        fi
-}
-# Temp file, try to clean up after us
-tmp=.lxdialog.tmp
-trap "rm -f $tmp" 0 1 2 3 15
-# Check if we can link to ncurses
-check() {
-        $cc -x c - -o $tmp 2>/dev/null <<'EOF'
-#include CURSES_LOC
-main() {}
-EOF
-        if [ $? != 0 ]; then
-            echo " *** Unable to find the ncurses libraries or the"       1>&2
-            echo " *** required header files."                            1>&2
-            echo " *** 'make menuconfig' requires the ncurses libraries." 1>&2
-            echo " *** "                                                  1>&2
-            echo " *** Install ncurses (ncurses-devel or libncurses-dev " 1>&2
-            echo " *** depending on your distribution) and try again."    1>&2
-            echo " *** "                                                  1>&2
-            exit 1
-        fi
-}
-usage() {
-        printf "Usage: $0 [-check compiler options|-ccflags|-ldflags compiler options]\n"
-}
-if [ $# -eq 0 ]; then
-        usage
-        exit 1
-fi
-cc=""
-case "$1" in
-        "-check")
-                shift
-                cc="$@"
-                check
-                ;;
-        "-ccflags")
-                ccflags
-                ;;
-        "-ldflags")
-                shift
-                cc="$@"
-                ldflags
-                ;;
-        "*")
-                usage
-                exit 1
-                ;;
-esac
diff --git a/scripts/kconfig/lxdialog/checklist.c b/scripts/kconfig/lxdialog/checklist.c
index 8d016faa28d7..2e96323ad11b 100644
--- a/scripts/kconfig/lxdialog/checklist.c
+++ b/scripts/kconfig/lxdialog/checklist.c
@@ -103,8 +103,8 @@ static void print_buttons(WINDOW * dialog, int height, int width, int selected)
        int x = width / 2 - 11;
        int y = height - 2;
-        print_button(dialog, gettext("Select"), y, x, selected == 0);
+        print_button(dialog, "Select", y, x, selected == 0);
-        print_button(dialog, gettext(" Help "), y, x + 14, selected == 1);
+        print_button(dialog, " Help ", y, x + 14, selected == 1);
        wmove(dialog, y, x + 1 + 14 * selected);
        wrefresh(dialog);
diff --git a/scripts/kconfig/lxdialog/dialog.h b/scripts/kconfig/lxdialog/dialog.h
index fcffd5b41fb0..0b00be5abaa6 100644
--- a/scripts/kconfig/lxdialog/dialog.h
+++ b/scripts/kconfig/lxdialog/dialog.h
@@ -26,16 +26,10 @@
 #include <string.h>
 #include <stdbool.h>
-#ifndef KBUILD_NO_NLS
-# include <libintl.h>
-#else
-# define gettext(Msgid) ((const char *) (Msgid))
-#endif
 #ifdef __sun__
 #define CURS_MACROS
 #endif
-#include CURSES_LOC
+#include <ncurses.h>
 /*
 * Colors in ncurses 1.9.9e do not work properly since foreground and
diff --git a/scripts/kconfig/lxdialog/inputbox.c b/scripts/kconfig/lxdialog/inputbox.c
index d58de1dc5360..fe82ff6d744e 100644
--- a/scripts/kconfig/lxdialog/inputbox.c
+++ b/scripts/kconfig/lxdialog/inputbox.c
@@ -31,8 +31,8 @@ static void print_buttons(WINDOW * dialog, int height, int width, int selected)
        int x = width / 2 - 11;
        int y = height - 2;
-        print_button(dialog, gettext("  Ok  "), y, x, selected == 0);
+        print_button(dialog, "  Ok  ", y, x, selected == 0);
-        print_button(dialog, gettext(" Help "), y, x + 14, selected == 1);
+        print_button(dialog, " Help ", y, x + 14, selected == 1);
        wmove(dialog, y, x + 1 + 14 * selected);
        wrefresh(dialog);
diff --git a/scripts/kconfig/lxdialog/menubox.c b/scripts/kconfig/lxdialog/menubox.c
index 11ae9ad7ac7b..d70cab36137e 100644
--- a/scripts/kconfig/lxdialog/menubox.c
+++ b/scripts/kconfig/lxdialog/menubox.c
@@ -157,11 +157,11 @@ static void print_buttons(WINDOW * win, int height, int width, int selected)
        int x = width / 2 - 28;
        int y = height - 2;
-        print_button(win, gettext("Select"), y, x, selected == 0);
+        print_button(win, "Select", y, x, selected == 0);
-        print_button(win, gettext(" Exit "), y, x + 12, selected == 1);
+        print_button(win, " Exit ", y, x + 12, selected == 1);
-        print_button(win, gettext(" Help "), y, x + 24, selected == 2);
+        print_button(win, " Help ", y, x + 24, selected == 2);
-        print_button(win, gettext(" Save "), y, x + 36, selected == 3);
+        print_button(win, " Save ", y, x + 36, selected == 3);
-        print_button(win, gettext(" Load "), y, x + 48, selected == 4);
+        print_button(win, " Load ", y, x + 48, selected == 4);
        wmove(win, y, x + 1 + 12 * selected);
        wrefresh(win);
diff --git a/scripts/kconfig/lxdialog/textbox.c b/scripts/kconfig/lxdialog/textbox.c
index 1773319b95e7..88d2818ed956 100644
--- a/scripts/kconfig/lxdialog/textbox.c
+++ b/scripts/kconfig/lxdialog/textbox.c
@@ -129,7 +129,7 @@ do_resize:
        print_title(dialog, title, width);
-        print_button(dialog, gettext(" Exit "), height - 2, width / 2 - 4, TRUE);
+        print_button(dialog, " Exit ", height - 2, width / 2 - 4, TRUE);
        wnoutrefresh(dialog);
        getyx(dialog, cur_y, cur_x);    /* Save cursor position */
diff --git a/scripts/kconfig/lxdialog/yesno.c b/scripts/kconfig/lxdialog/yesno.c
index 676fb2f824a3..cd1223c903d1 100644
--- a/scripts/kconfig/lxdialog/yesno.c
+++ b/scripts/kconfig/lxdialog/yesno.c
@@ -29,8 +29,8 @@ static void print_buttons(WINDOW * dialog, int height, int width, int selected)
        int x = width / 2 - 10;
        int y = height - 2;
-        print_button(dialog, gettext(" Yes "), y, x, selected == 0);
+        print_button(dialog, " Yes ", y, x, selected == 0);
-        print_button(dialog, gettext("  No  "), y, x + 13, selected == 1);
+        print_button(dialog, "  No  ", y, x + 13, selected == 1);
        wmove(dialog, y, x + 1 + 13 * selected);
        wrefresh(dialog);
diff --git a/scripts/kconfig/mconf-cfg.sh b/scripts/kconfig/mconf-cfg.sh
new file mode 100755
index 000000000000..c812872d7f9d
--- /dev/null
+++ b/scripts/kconfig/mconf-cfg.sh
@@ -0,0 +1,47 @@
+#!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
+PKG="ncursesw"
+PKG2="ncurses"
+if [ -n "$(command -v pkg-config)" ]; then
+        if pkg-config --exists $PKG; then
+                echo cflags=\"$(pkg-config --cflags $PKG)\"
+                echo libs=\"$(pkg-config --libs $PKG)\"
+                exit 0
+        fi
+        if pkg-config --exists $PKG2; then
+                echo cflags=\"$(pkg-config --cflags $PKG2)\"
+                echo libs=\"$(pkg-config --libs $PKG2)\"
+                exit 0
+        fi
+fi
+# Check the default paths in case pkg-config is not installed.
+# (Even if it is installed, some distributions such as openSUSE cannot
+# find ncurses by pkg-config.)
+if [ -f /usr/include/ncursesw/ncurses.h ]; then
+        echo cflags=\"-D_GNU_SOURCE -I/usr/include/ncursesw\"
+        echo libs=\"-lncursesw\"
+        exit 0
+fi
+if [ -f /usr/include/ncurses/ncurses.h ]; then
+        echo cflags=\"-D_GNU_SOURCE -I/usr/include/ncurses\"
+        echo libs=\"-lncurses\"
+        exit 0
+fi
+if [ -f /usr/include/ncurses.h ]; then
+        echo cflags=\"-D_GNU_SOURCE\"
+        echo libs=\"-lncurses\"
+        exit 0
+fi
+echo >&2 "*"
+echo >&2 "* Unable to find the ncurses package."
+echo >&2 "* Install ncurses (ncurses-devel or libncurses-dev"
+echo >&2 "* depending on your distribution)."
+echo >&2 "*"
+exit 1
diff --git a/scripts/kconfig/mconf.c b/scripts/kconfig/mconf.c
index c829be8bb19f..143c05fec161 100644
--- a/scripts/kconfig/mconf.c
+++ b/scripts/kconfig/mconf.c
@@ -17,12 +17,11 @@
 #include <string.h>
 #include <signal.h>
 #include <unistd.h>
-#include <locale.h>
 #include "lkc.h"
 #include "lxdialog/dialog.h"
-static const char mconf_readme[] = N_(
+static const char mconf_readme[] =
 "Overview\n"
 "--------\n"
 "This interface lets you select features and parameters for the build.\n"
@@ -171,37 +170,37 @@ static const char mconf_readme[] = N_(
 " blackbg    => selects a color scheme with black background\n"
 " classic    => theme with blue background. The classic look\n"
 " bluetitle  => an LCD friendly version of classic. (default)\n"
-"\n"),
+"\n",
-menu_instructions[] = N_(
+menu_instructions[] =
        "Arrow keys navigate the menu.  "
        "<Enter> selects submenus ---> (or empty submenus ----).  "
        "Highlighted letters are hotkeys.  "
        "Pressing <Y> includes, <N> excludes, <M> modularizes features.  "
        "Press <Esc><Esc> to exit, <?> for Help, </> for Search.  "
-        "Legend: [*] built-in  [ ] excluded  <M> module  < > module capable"),
+        "Legend: [*] built-in  [ ] excluded  <M> module  < > module capable",
-radiolist_instructions[] = N_(
+radiolist_instructions[] =
        "Use the arrow keys to navigate this window or "
        "press the hotkey of the item you wish to select "
        "followed by the <SPACE BAR>. "
-        "Press <?> for additional information about this option."),
+        "Press <?> for additional information about this option.",
-inputbox_instructions_int[] = N_(
+inputbox_instructions_int[] =
        "Please enter a decimal value. "
        "Fractions will not be accepted.  "
-        "Use the <TAB> key to move from the input field to the buttons below it."),
+        "Use the <TAB> key to move from the input field to the buttons below it.",
-inputbox_instructions_hex[] = N_(
+inputbox_instructions_hex[] =
        "Please enter a hexadecimal value. "
-        "Use the <TAB> key to move from the input field to the buttons below it."),
+        "Use the <TAB> key to move from the input field to the buttons below it.",
-inputbox_instructions_string[] = N_(
+inputbox_instructions_string[] =
        "Please enter a string value. "
-        "Use the <TAB> key to move from the input field to the buttons below it."),
+        "Use the <TAB> key to move from the input field to the buttons below it.",
-setmod_text[] = N_(
+setmod_text[] =
        "This feature depends on another which has been configured as a module.\n"
-        "As a result, this feature will be built as a module."),
+        "As a result, this feature will be built as a module.",
-load_config_text[] = N_(
+load_config_text[] =
        "Enter the name of the configuration file you wish to load.  "
        "Accept the name shown to restore the configuration you "
-        "last retrieved.  Leave blank to abort."),
+        "last retrieved.  Leave blank to abort.",
-load_config_help[] = N_(
+load_config_help[] =
        "\n"
        "For various reasons, one may wish to keep several different\n"
        "configurations available on a single machine.\n"
@@ -211,11 +210,11 @@ load_config_help[] = N_(
        "configuration.\n"
        "\n"
        "If you are uncertain, then you have probably never used alternate\n"
-        "configuration files. You should therefore leave this blank to abort.\n"),
+        "configuration files. You should therefore leave this blank to abort.\n",
-save_config_text[] = N_(
+save_config_text[] =
        "Enter a filename to which this configuration should be saved "
-        "as an alternate.  Leave blank to abort."),
+        "as an alternate.  Leave blank to abort.",
-save_config_help[] = N_(
+save_config_help[] =
        "\n"
        "For various reasons, one may wish to keep different configurations\n"
        "available on a single machine.\n"
@@ -225,8 +224,8 @@ save_config_help[] = N_(
        "configuration options you have selected at that time.\n"
        "\n"
        "If you are uncertain what all this means then you should probably\n"
-        "leave this blank.\n"),
+        "leave this blank.\n",
-search_help[] = N_(
+search_help[] =
        "\n"
        "Search for symbols and display their relations.\n"
        "Regular expressions are allowed.\n"
@@ -271,7 +270,7 @@ search_help[] = N_(
        "Examples: USB  => find all symbols containing USB\n"
        "          ^USB => find all symbols starting with USB\n"
        "          USB$ => find all symbols ending with USB\n"
-        "\n");
+        "\n";
 static int indent;
 static struct menu *current_menu;
@@ -400,19 +399,19 @@ static void search_conf(void)
        struct subtitle_part stpart;
        title = str_new();
-        str_printf( &title, _("Enter (sub)string or regexp to search for "
+        str_printf( &title, "Enter (sub)string or regexp to search for "
-                              "(with or without \"%s\")"), CONFIG_);
+                              "(with or without \"%s\")", CONFIG_);
 again:
        dialog_clear();
-        dres = dialog_inputbox(_("Search Configuration Parameter"),
+        dres = dialog_inputbox("Search Configuration Parameter",
                              str_get(&title),
                              10, 75, "");
        switch (dres) {
        case 0:
                break;
        case 1:
-                show_helptext(_("Search Configuration"), search_help);
+                show_helptext("Search Configuration", search_help);
                goto again;
        default:
                str_free(&title);
@@ -443,7 +442,7 @@ again:
                res = get_relations_str(sym_arr, &head);
                set_subtitle();
-                dres = show_textbox_ext(_("Search Results"), (char *)
+                dres = show_textbox_ext("Search Results", (char *)
                                        str_get(&res), 0, 0, keys, &vscroll,
                                        &hscroll, &update_text, (void *)
                                        &data);
@@ -491,7 +490,6 @@ static void build_conf(struct menu *menu)
                        switch (prop->type) {
                        case P_MENU:
                                child_count++;
-                                prompt = _(prompt);
                                if (single_menu_mode) {
                                        item_make("%s%*c%s",
                                                  menu->data ? "-->" : "++>",
@@ -508,7 +506,7 @@ static void build_conf(struct menu *menu)
                        case P_COMMENT:
                                if (prompt) {
                                        child_count++;
-                                        item_make("   %*c*** %s ***", indent + 1, ' ', _(prompt));
+                                        item_make("   %*c*** %s ***", indent + 1, ' ', prompt);
                                        item_set_tag(':');
                                        item_set_data(menu);
                                }
@@ -516,7 +514,7 @@ static void build_conf(struct menu *menu)
                        default:
                                if (prompt) {
                                        child_count++;
-                                        item_make("---%*c%s", indent + 1, ' ', _(prompt));
+                                        item_make("---%*c%s", indent + 1, ' ', prompt);
                                        item_set_tag(':');
                                        item_set_data(menu);
                                }
@@ -560,10 +558,10 @@ static void build_conf(struct menu *menu)
                        item_set_data(menu);
                }
-                item_add_str("%*c%s", indent + 1, ' ', _(menu_get_prompt(menu)));
+                item_add_str("%*c%s", indent + 1, ' ', menu_get_prompt(menu));
                if (val == yes) {
                        if (def_menu) {
-                                item_add_str(" (%s)", _(menu_get_prompt(def_menu)));
+                                item_add_str(" (%s)", menu_get_prompt(def_menu));
                                item_add_str("  --->");
                                if (def_menu->list) {
                                        indent += 2;
@@ -575,7 +573,7 @@ static void build_conf(struct menu *menu)
                }
        } else {
                if (menu == current_menu) {
-                        item_make("---%*c%s", indent + 1, ' ', _(menu_get_prompt(menu)));
+                        item_make("---%*c%s", indent + 1, ' ', menu_get_prompt(menu));
                        item_set_tag(':');
                        item_set_data(menu);
                        goto conf_childs;
@@ -618,17 +616,17 @@ static void build_conf(struct menu *menu)
                                tmp = indent - tmp + 4;
                                if (tmp < 0)
                                        tmp = 0;
-                                item_add_str("%*c%s%s", tmp, ' ', _(menu_get_prompt(menu)),
+                                item_add_str("%*c%s%s", tmp, ' ', menu_get_prompt(menu),
                                             (sym_has_value(sym) || !sym_is_changable(sym)) ?
-                                             "" : _(" (NEW)"));
+                                             "" : " (NEW)");
                                item_set_tag('s');
                                item_set_data(menu);
                                goto conf_childs;
                        }
                }
-                item_add_str("%*c%s%s", indent + 1, ' ', _(menu_get_prompt(menu)),
+                item_add_str("%*c%s%s", indent + 1, ' ', menu_get_prompt(menu),
                          (sym_has_value(sym) || !sym_is_changable(sym)) ?
-                          "" : _(" (NEW)"));
+                          "" : " (NEW)");
                if (menu->prompt->type == P_MENU) {
                        item_add_str("  %s", menu_is_empty(menu) ? "----" : "--->");
                        return;
@@ -665,8 +663,8 @@ static void conf(struct menu *menu, struct menu *active_menu)
                        break;
                set_subtitle();
                dialog_clear();
-                res = dialog_menu(prompt ? _(prompt) : _("Main Menu"),
+                res = dialog_menu(prompt ? prompt : "Main Menu",
-                                  _(menu_instructions),
+                                  menu_instructions,
                                  active_menu, &s_scroll);
                if (res == 1 || res == KEY_ESC || res == -ERRDISPLAYTOOSMALL)
                        break;
@@ -708,7 +706,7 @@ static void conf(struct menu *menu, struct menu *active_menu)
                                show_help(submenu);
                        else {
                                reset_subtitle();
-                                show_helptext(_("README"), _(mconf_readme));
+                                show_helptext("README", mconf_readme);
                        }
                        break;
                case 3:
@@ -773,16 +771,13 @@ static void show_helptext(const char *title, const char *text)
        show_textbox(title, text, 0, 0);
 }
-static void conf_message_callback(const char *fmt, va_list ap)
+static void conf_message_callback(const char *s)
 {
-        char buf[PATH_MAX+1];
-        vsnprintf(buf, sizeof(buf), fmt, ap);
        if (save_and_exit) {
                if (!silent)
-                        printf("%s", buf);
+                        printf("%s", s);
        } else {
-                show_textbox(NULL, buf, 6, 60);
+                show_textbox(NULL, s, 6, 60);
        }
 }
@@ -793,13 +788,13 @@ static void show_help(struct menu *menu)
        help.max_width = getmaxx(stdscr) - 10;
        menu_get_ext_help(menu, &help);
-        show_helptext(_(menu_get_prompt(menu)), str_get(&help));
+        show_helptext(menu_get_prompt(menu), str_get(&help));
        str_free(&help);
 }
 static void conf_choice(struct menu *menu)
 {
-        const char *prompt = _(menu_get_prompt(menu));
+        const char *prompt = menu_get_prompt(menu);
        struct menu *child;
        struct symbol *active;
@@ -814,9 +809,9 @@ static void conf_choice(struct menu *menu)
                        if (!menu_is_visible(child))
                                continue;
                        if (child->sym)
-                                item_make("%s", _(menu_get_prompt(child)));
+                                item_make("%s", menu_get_prompt(child));
                        else {
-                                item_make("*** %s ***", _(menu_get_prompt(child)));
+                                item_make("*** %s ***", menu_get_prompt(child));
                                item_set_tag(':');
                        }
                        item_set_data(child);
@@ -826,8 +821,8 @@ static void conf_choice(struct menu *menu)
                                item_set_tag('X');
                }
                dialog_clear();
-                res = dialog_checklist(prompt ? _(prompt) : _("Main Menu"),
+                res = dialog_checklist(prompt ? prompt : "Main Menu",
-                                        _(radiolist_instructions),
+                                        radiolist_instructions,
                                        MENUBOX_HEIGTH_MIN,
                                        MENUBOX_WIDTH_MIN,
                                        CHECKLIST_HEIGTH_MIN);
@@ -868,26 +863,26 @@ static void conf_string(struct menu *menu)
                switch (sym_get_type(menu->sym)) {
                case S_INT:
-                        heading = _(inputbox_instructions_int);
+                        heading = inputbox_instructions_int;
                        break;
                case S_HEX:
-                        heading = _(inputbox_instructions_hex);
+                        heading = inputbox_instructions_hex;
                        break;
                case S_STRING:
-                        heading = _(inputbox_instructions_string);
+                        heading = inputbox_instructions_string;
                        break;
                default:
-                        heading = _("Internal mconf error!");
+                        heading = "Internal mconf error!";
                }
                dialog_clear();
-                res = dialog_inputbox(prompt ? _(prompt) : _("Main Menu"),
+                res = dialog_inputbox(prompt ? prompt : "Main Menu",
                                      heading, 10, 75,
                                      sym_get_string_value(menu->sym));
                switch (res) {
                case 0:
                        if (sym_set_string_value(menu->sym, dialog_input_result))
                                return;
-                        show_textbox(NULL, _("You have made an invalid entry."), 5, 43);
+                        show_textbox(NULL, "You have made an invalid entry.", 5, 43);
                        break;
                case 1:
                        show_help(menu);
@@ -915,10 +910,10 @@ static void conf_load(void)
                                sym_set_change_count(1);
                                return;
                        }
-                        show_textbox(NULL, _("File does not exist!"), 5, 38);
+                        show_textbox(NULL, "File does not exist!", 5, 38);
                        break;
                case 1:
-                        show_helptext(_("Load Alternate Configuration"), load_config_help);
+                        show_helptext("Load Alternate Configuration", load_config_help);
                        break;
                case KEY_ESC:
                        return;
@@ -941,10 +936,10 @@ static void conf_save(void)
                                set_config_filename(dialog_input_result);
                                return;
                        }
-                        show_textbox(NULL, _("Can't create file!  Probably a nonexistent directory."), 5, 60);
+                        show_textbox(NULL, "Can't create file!  Probably a nonexistent directory.", 5, 60);
                        break;
                case 1:
-                        show_helptext(_("Save Alternate Configuration"), save_config_help);
+                        show_helptext("Save Alternate Configuration", save_config_help);
                        break;
                case KEY_ESC:
                        return;
@@ -961,8 +956,8 @@ static int handle_exit(void)
        dialog_clear();
        if (conf_get_changed())
                res = dialog_yesno(NULL,
-                                   _("Do you wish to save your new configuration?\n"
+                                   "Do you wish to save your new configuration?\n"
-                                     "(Press <ESC><ESC> to continue kernel configuration.)"),
+                                     "(Press <ESC><ESC> to continue kernel configuration.)",
                                   6, 60);
        else
                res = -1;
@@ -972,26 +967,27 @@ static int handle_exit(void)
        switch (res) {
        case 0:
                if (conf_write(filename)) {
-                        fprintf(stderr, _("\n\n"
+                        fprintf(stderr, "\n\n"
                                          "Error while writing of the configuration.\n"
                                          "Your configuration changes were NOT saved."
-                                          "\n\n"));
+                                          "\n\n");
                        return 1;
                }
+                conf_write_autoconf(0);
                /* fall through */
        case -1:
                if (!silent)
-                        printf(_("\n\n"
+                        printf("\n\n"
                                 "*** End of the configuration.\n"
                                 "*** Execute 'make' to start the build or try 'make help'."
-                                 "\n\n"));
+                                 "\n\n");
                res = 0;
                break;
        default:
                if (!silent)
-                        fprintf(stderr, _("\n\n"
+                        fprintf(stderr, "\n\n"
                                          "Your configuration changes were NOT saved."
-                                          "\n\n"));
+                                          "\n\n");
                if (res != KEY_ESC)
                        res = 0;
        }
@@ -1009,10 +1005,6 @@ int main(int ac, char **av)
        char *mode;
        int res;
-        setlocale(LC_ALL, "");
-        bindtextdomain(PACKAGE, LOCALEDIR);
-        textdomain(PACKAGE);
        signal(SIGINT, sig_handler);
        if (ac > 1 && strcmp(av[1], "-s") == 0) {
@@ -1031,8 +1023,8 @@ int main(int ac, char **av)
        }
        if (init_dialog(NULL)) {
-                fprintf(stderr, N_("Your display is too small to run Menuconfig!\n"));
+                fprintf(stderr, "Your display is too small to run Menuconfig!\n");
-                fprintf(stderr, N_("It must be at least 19 lines by 80 columns.\n"));
+                fprintf(stderr, "It must be at least 19 lines by 80 columns.\n");
                return 1;
        }
diff --git a/scripts/kconfig/menu.c b/scripts/kconfig/menu.c
index 36cd3e1f1c28..4cf15d449c05 100644
--- a/scripts/kconfig/menu.c
+++ b/scripts/kconfig/menu.c
@@ -212,10 +212,7 @@ void menu_add_option(int token, char *arg)
                        sym_defconfig_list = current_entry->sym;
                else if (sym_defconfig_list != current_entry->sym)
                        zconf_error("trying to redefine defconfig symbol");
-                sym_defconfig_list->flags |= SYMBOL_AUTO;
+                sym_defconfig_list->flags |= SYMBOL_NO_WRITE;
-                break;
-        case T_OPT_ENV:
-                prop_add_env(arg);
                break;
        case T_OPT_ALLNOCONFIG_Y:
                current_entry->sym->flags |= SYMBOL_ALLNOCONFIG_Y;
@@ -711,7 +708,7 @@ static void get_prompt_str(struct gstr *r, struct property *prop,
        struct menu *submenu[8], *menu, *location = NULL;
        struct jump_key *jump = NULL;
-        str_printf(r, _("Prompt: %s\n"), _(prop->text));
+        str_printf(r, "Prompt: %s\n", prop->text);
        menu = prop->menu->parent;
        for (i = 0; menu != &rootmenu && i < 8; menu = menu->parent) {
                bool accessible = menu_is_visible(menu);
@@ -744,16 +741,16 @@ static void get_prompt_str(struct gstr *r, struct property *prop,
        }
        if (i > 0) {
-                str_printf(r, _("  Location:\n"));
+                str_printf(r, "  Location:\n");
                for (j = 4; --i >= 0; j += 2) {
                        menu = submenu[i];
                        if (jump && menu == location)
                                jump->offset = strlen(r->s);
                        str_printf(r, "%*c-> %s", j, ' ',
-                                   _(menu_get_prompt(menu)));
+                                   menu_get_prompt(menu));
                        if (menu->sym) {
                                str_printf(r, " (%s [=%s])", menu->sym->name ?
-                                        menu->sym->name : _("<choice>"),
+                                        menu->sym->name : "<choice>",
                                        sym_get_string_value(menu->sym));
                        }
                        str_append(r, "\n");
@@ -817,27 +814,27 @@ static void get_symbol_str(struct gstr *r, struct symbol *sym,
        prop = get_symbol_prop(sym);
        if (prop) {
-                str_printf(r, _("  Defined at %s:%d\n"), prop->menu->file->name,
+                str_printf(r, "  Defined at %s:%d\n", prop->menu->file->name,
                        prop->menu->lineno);
                if (!expr_is_yes(prop->visible.expr)) {
-                        str_append(r, _("  Depends on: "));
+                        str_append(r, "  Depends on: ");
                        expr_gstr_print(prop->visible.expr, r);
                        str_append(r, "\n");
                }
        }
-        get_symbol_props_str(r, sym, P_SELECT, _("  Selects: "));
+        get_symbol_props_str(r, sym, P_SELECT, "  Selects: ");
        if (sym->rev_dep.expr) {
-                str_append(r, _("  Selected by: "));
+                expr_gstr_print_revdep(sym->rev_dep.expr, r, yes, "  Selected by [y]:\n");
-                expr_gstr_print_revdep(sym->rev_dep.expr, r);
+                expr_gstr_print_revdep(sym->rev_dep.expr, r, mod, "  Selected by [m]:\n");
-                str_append(r, "\n");
+                expr_gstr_print_revdep(sym->rev_dep.expr, r, no, "  Selected by [n]:\n");
        }
-        get_symbol_props_str(r, sym, P_IMPLY, _("  Implies: "));
+        get_symbol_props_str(r, sym, P_IMPLY, "  Implies: ");
        if (sym->implied.expr) {
-                str_append(r, _("  Implied by: "));
+                expr_gstr_print_revdep(sym->implied.expr, r, yes, "  Implied by [y]:\n");
-                expr_gstr_print_revdep(sym->implied.expr, r);
+                expr_gstr_print_revdep(sym->implied.expr, r, mod, "  Implied by [m]:\n");
-                str_append(r, "\n");
+                expr_gstr_print_revdep(sym->implied.expr, r, no, "  Implied by [n]:\n");
        }
        str_append(r, "\n\n");
@@ -852,7 +849,7 @@ struct gstr get_relations_str(struct symbol **sym_arr, struct list_head *head)
        for (i = 0; sym_arr && (sym = sym_arr[i]); i++)
                get_symbol_str(&res, sym, head);
        if (!i)
-                str_append(&res, _("No matches found.\n"));
+                str_append(&res, "No matches found.\n");
        return res;
 }
@@ -867,7 +864,7 @@ void menu_get_ext_help(struct menu *menu, struct gstr *help)
                        str_printf(help, "%s%s:\n\n", CONFIG_, sym->name);
                help_text = menu_get_help(menu);
        }
-        str_printf(help, "%s\n", _(help_text));
+        str_printf(help, "%s\n", help_text);
        if (sym)
                get_symbol_str(help, sym, NULL);
 }
diff --git a/scripts/kconfig/merge_config.sh b/scripts/kconfig/merge_config.sh
index 67d131447631..0ef906499646 100755
--- a/scripts/kconfig/merge_config.sh
+++ b/scripts/kconfig/merge_config.sh
@@ -33,12 +33,15 @@ usage() {
        echo "  -n    use allnoconfig instead of alldefconfig"
        echo "  -r    list redundant entries when merging fragments"
        echo "  -O    dir to put generated output files.  Consider setting \$KCONFIG_CONFIG instead."
+        echo
+        echo "Used prefix: '$CONFIG_PREFIX'. You can redefine it with \$CONFIG_ environment variable."
 }
 RUNMAKE=true
 ALLTARGET=alldefconfig
 WARNREDUN=false
 OUTPUT=.
+CONFIG_PREFIX=${CONFIG_-CONFIG_}
 while true; do
        case $1 in
@@ -99,7 +102,9 @@ if [ ! -r "$INITFILE" ]; then
 fi
 MERGE_LIST=$*
-SED_CONFIG_EXP="s/^\(# \)\{0,1\}\(CONFIG_[a-zA-Z0-9_]*\)[= ].*/\2/p"
+SED_CONFIG_EXP1="s/^\(${CONFIG_PREFIX}[a-zA-Z0-9_]*\)=.*/\1/p"
+SED_CONFIG_EXP2="s/^# \(${CONFIG_PREFIX}[a-zA-Z0-9_]*\) is not set$/\1/p"
 TMP_FILE=$(mktemp ./.tmp.config.XXXXXXXXXX)
 echo "Using $INITFILE as base"
@@ -112,7 +117,7 @@ for MERGE_FILE in $MERGE_LIST ; do
                echo "The merge file '$MERGE_FILE' does not exist.  Exit." >&2
                exit 1
        fi
-        CFG_LIST=$(sed -n "$SED_CONFIG_EXP" $MERGE_FILE)
+        CFG_LIST=$(sed -n -e "$SED_CONFIG_EXP1" -e "$SED_CONFIG_EXP2" $MERGE_FILE)
        for CFG in $CFG_LIST ; do
                grep -q -w $CFG $TMP_FILE || continue
@@ -155,7 +160,7 @@ make KCONFIG_ALLCONFIG=$TMP_FILE $OUTPUT_ARG $ALLTARGET
 # Check all specified config values took (might have missed-dependency issues)
-for CFG in $(sed -n "$SED_CONFIG_EXP" $TMP_FILE); do
+for CFG in $(sed -n -e "$SED_CONFIG_EXP1" -e "$SED_CONFIG_EXP2" $TMP_FILE); do
        REQUESTED_VAL=$(grep -w -e "$CFG" $TMP_FILE)
        ACTUAL_VAL=$(grep -w -e "$CFG" "$KCONFIG_CONFIG")
diff --git a/scripts/kconfig/nconf-cfg.sh b/scripts/kconfig/nconf-cfg.sh
new file mode 100644
index 000000000000..001559ef0a60
--- /dev/null
+++ b/scripts/kconfig/nconf-cfg.sh
@@ -0,0 +1,47 @@
+#!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
+PKG="ncursesw menuw panelw"
+PKG2="ncurses menu panel"
+if [ -n "$(command -v pkg-config)" ]; then
+        if pkg-config --exists $PKG; then
+                echo cflags=\"$(pkg-config --cflags $PKG)\"
+                echo libs=\"$(pkg-config --libs $PKG)\"
+                exit 0
+        fi
+        if pkg-config --exists $PKG2; then
+                echo cflags=\"$(pkg-config --cflags $PKG2)\"
+                echo libs=\"$(pkg-config --libs $PKG2)\"
+                exit 0
+        fi
+fi
+# Check the default paths in case pkg-config is not installed.
+# (Even if it is installed, some distributions such as openSUSE cannot
+# find ncurses by pkg-config.)
+if [ -f /usr/include/ncursesw/ncurses.h ]; then
+        echo cflags=\"-D_GNU_SOURCE -I/usr/include/ncursesw\"
+        echo libs=\"-lncursesw -lmenuw -lpanelw\"
+        exit 0
+fi
+if [ -f /usr/include/ncurses/ncurses.h ]; then
+        echo cflags=\"-D_GNU_SOURCE -I/usr/include/ncurses\"
+        echo libs=\"-lncurses -lmenu -lpanel\"
+        exit 0
+fi
+if [ -f /usr/include/ncurses.h ]; then
+        echo cflags=\"-D_GNU_SOURCE\"
+        echo libs=\"-lncurses -lmenu -lpanel\"
+        exit 0
+fi
+echo >&2 "*"
+echo >&2 "* Unable to find the ncurses package."
+echo >&2 "* Install ncurses (ncurses-devel or libncurses-dev"
+echo >&2 "* depending on your distribution)."
+echo >&2 "*"
+exit 1
diff --git a/scripts/kconfig/nconf.c b/scripts/kconfig/nconf.c
index 003114779815..1ef232ae5ab9 100644
--- a/scripts/kconfig/nconf.c
+++ b/scripts/kconfig/nconf.c
@@ -15,7 +15,7 @@
 #include "nconf.h"
 #include <ctype.h>
-static const char nconf_global_help[] = N_(
+static const char nconf_global_help[] =
 "Help windows\n"
 "------------\n"
 "o  Global help:  Unless in a data entry window, pressing <F1> will give \n"
@@ -130,8 +130,8 @@ static const char nconf_global_help[] = N_(
 "\n"
 "Note that this mode can eventually be a little more CPU expensive than\n"
 "the default mode, especially with a larger number of unfolded submenus.\n"
-"\n"),
+"\n",
-menu_no_f_instructions[] = N_(
+menu_no_f_instructions[] =
 "Legend:  [*] built-in  [ ] excluded  <M> module  < > module capable.\n"
 "Submenus are designated by a trailing \"--->\", empty ones by \"----\".\n"
 "\n"
@@ -147,8 +147,8 @@ menu_no_f_instructions[] = N_(
 "You do not have function keys support.\n"
 "Press <1> instead of <F1>, <2> instead of <F2>, etc.\n"
 "For verbose global help use key <1>.\n"
-"For help related to the current menu entry press <?> or <h>.\n"),
+"For help related to the current menu entry press <?> or <h>.\n",
-menu_instructions[] = N_(
+menu_instructions[] =
 "Legend:  [*] built-in  [ ] excluded  <M> module  < > module capable.\n"
 "Submenus are designated by a trailing \"--->\", empty ones by \"----\".\n"
 "\n"
@@ -163,30 +163,30 @@ menu_instructions[] = N_(
 "\n"
 "Pressing <1> may be used instead of <F1>, <2> instead of <F2>, etc.\n"
 "For verbose global help press <F1>.\n"
-"For help related to the current menu entry press <?> or <h>.\n"),
+"For help related to the current menu entry press <?> or <h>.\n",
-radiolist_instructions[] = N_(
+radiolist_instructions[] =
 "Press <Up>, <Down>, <Home> or <End> to navigate a radiolist, select\n"
 "with <Space>.\n"
 "For help related to the current entry press <?> or <h>.\n"
-"For global help press <F1>.\n"),
+"For global help press <F1>.\n",
-inputbox_instructions_int[] = N_(
+inputbox_instructions_int[] =
 "Please enter a decimal value.\n"
 "Fractions will not be accepted.\n"
-"Press <Enter> to apply, <Esc> to cancel."),
+"Press <Enter> to apply, <Esc> to cancel.",
-inputbox_instructions_hex[] = N_(
+inputbox_instructions_hex[] =
 "Please enter a hexadecimal value.\n"
-"Press <Enter> to apply, <Esc> to cancel."),
+"Press <Enter> to apply, <Esc> to cancel.",
-inputbox_instructions_string[] = N_(
+inputbox_instructions_string[] =
 "Please enter a string value.\n"
-"Press <Enter> to apply, <Esc> to cancel."),
+"Press <Enter> to apply, <Esc> to cancel.",
-setmod_text[] = N_(
+setmod_text[] =
 "This feature depends on another feature which has been configured as a\n"
-"module.  As a result, the current feature will be built as a module too."),
+"module.  As a result, the current feature will be built as a module too.",
-load_config_text[] = N_(
+load_config_text[] =
 "Enter the name of the configuration file you wish to load.\n"
 "Accept the name shown to restore the configuration you last\n"
-"retrieved.  Leave empty to abort."),
+"retrieved.  Leave empty to abort.",
-load_config_help[] = N_(
+load_config_help[] =
 "For various reasons, one may wish to keep several different\n"
 "configurations available on a single machine.\n"
 "\n"
@@ -194,11 +194,11 @@ load_config_help[] = N_(
 "default one, entering its name here will allow you to load and modify\n"
 "that configuration.\n"
 "\n"
-"Leave empty to abort.\n"),
+"Leave empty to abort.\n",
-save_config_text[] = N_(
+save_config_text[] =
 "Enter a filename to which this configuration should be saved\n"
-"as an alternate.  Leave empty to abort."),
+"as an alternate.  Leave empty to abort.",
-save_config_help[] = N_(
+save_config_help[] =
 "For various reasons, one may wish to keep several different\n"
 "configurations available on a single machine.\n"
 "\n"
@@ -206,8 +206,8 @@ save_config_help[] = N_(
 "and use the current configuration as an alternate to whatever\n"
 "configuration options you have selected at that time.\n"
 "\n"
-"Leave empty to abort.\n"),
+"Leave empty to abort.\n",
-search_help[] = N_(
+search_help[] =
 "Search for symbols (configuration variable names CONFIG_*) and display\n"
 "their relations.  Regular expressions are supported.\n"
 "Example:  Search for \"^FOO\".\n"
@@ -244,7 +244,7 @@ search_help[] = N_(
 "USB  => find all symbols containing USB\n"
 "^USB => find all symbols starting with USB\n"
 "USB$ => find all symbols ending with USB\n"
-"\n");
+"\n";
 struct mitem {
        char str[256];
@@ -388,7 +388,7 @@ static void print_function_line(void)
 static void handle_f1(int *key, struct menu *current_item)
 {
        show_scroll_win(main_window,
-                        _("Global help"), _(nconf_global_help));
+                        "Global help", nconf_global_help);
        return;
 }
@@ -403,8 +403,8 @@ static void handle_f2(int *key, struct menu *current_item)
 static void handle_f3(int *key, struct menu *current_item)
 {
        show_scroll_win(main_window,
-                        _("Short help"),
+                        "Short help",
-                        _(current_instructions));
+                        current_instructions);
        return;
 }
@@ -412,7 +412,7 @@ static void handle_f3(int *key, struct menu *current_item)
 static void handle_f4(int *key, struct menu *current_item)
 {
        int res = btn_dialog(main_window,
-                        _("Show all symbols?"),
+                        "Show all symbols?",
                        2,
                        "   <Show All>   ",
                        "<Don't show all>");
@@ -653,8 +653,8 @@ static int do_exit(void)
                return 0;
        }
        res = btn_dialog(main_window,
-                        _("Do you wish to save your new configuration?\n"
+                        "Do you wish to save your new configuration?\n"
-                                "<ESC> to cancel and resume nconfig."),
+                                "<ESC> to cancel and resume nconfig.",
                        2,
                        "   <save>   ",
                        "<don't save>");
@@ -670,15 +670,16 @@ static int do_exit(void)
                if (res)
                        btn_dialog(
                                main_window,
-                                _("Error during writing of configuration.\n"
+                                "Error during writing of configuration.\n"
-                                  "Your configuration changes were NOT saved."),
+                                  "Your configuration changes were NOT saved.",
                                  1,
                                  "<OK>");
+                conf_write_autoconf(0);
                break;
        default:
                btn_dialog(
                        main_window,
-                        _("Your configuration changes were NOT saved."),
+                        "Your configuration changes were NOT saved.",
                        1,
                        "<OK>");
                break;
@@ -697,12 +698,12 @@ static void search_conf(void)
        int dres;
        title = str_new();
-        str_printf( &title, _("Enter (sub)string or regexp to search for "
+        str_printf( &title, "Enter (sub)string or regexp to search for "
-                              "(with or without \"%s\")"), CONFIG_);
+                              "(with or without \"%s\")", CONFIG_);
 again:
        dres = dialog_inputbox(main_window,
-                        _("Search Configuration Parameter"),
+                        "Search Configuration Parameter",
                        str_get(&title),
                        "", &dialog_input_result, &dialog_input_result_len);
        switch (dres) {
@@ -710,7 +711,7 @@ again:
                break;
        case 1:
                show_scroll_win(main_window,
-                                _("Search Configuration"), search_help);
+                                "Search Configuration", search_help);
                goto again;
        default:
                str_free(&title);
@@ -726,7 +727,7 @@ again:
        res = get_relations_str(sym_arr, NULL);
        free(sym_arr);
        show_scroll_win(main_window,
-                        _("Search Results"), str_get(&res));
+                        "Search Results", str_get(&res));
        str_free(&res);
        str_free(&title);
 }
@@ -754,7 +755,7 @@ static void build_conf(struct menu *menu)
                        switch (ptype) {
                        case P_MENU:
                                child_count++;
-                                prompt = _(prompt);
+                                prompt = prompt;
                                if (single_menu_mode) {
                                        item_make(menu, 'm',
                                                "%s%*c%s",
@@ -775,7 +776,7 @@ static void build_conf(struct menu *menu)
                                        item_make(menu, ':',
                                                "   %*c*** %s ***",
                                                indent + 1, ' ',
-                                                _(prompt));
+                                                prompt);
                                }
                                break;
                        default:
@@ -783,7 +784,7 @@ static void build_conf(struct menu *menu)
                                        child_count++;
                                        item_make(menu, ':', "---%*c%s",
                                                indent + 1, ' ',
-                                                _(prompt));
+                                                prompt);
                                }
                        }
                } else
@@ -829,11 +830,11 @@ static void build_conf(struct menu *menu)
                }
                item_add_str("%*c%s", indent + 1,
-                                ' ', _(menu_get_prompt(menu)));
+                                ' ', menu_get_prompt(menu));
                if (val == yes) {
                        if (def_menu) {
                                item_add_str(" (%s)",
-                                        _(menu_get_prompt(def_menu)));
+                                        menu_get_prompt(def_menu));
                                item_add_str("  --->");
                                if (def_menu->list) {
                                        indent += 2;
@@ -847,7 +848,7 @@ static void build_conf(struct menu *menu)
                if (menu == current_menu) {
                        item_make(menu, ':',
                                "---%*c%s", indent + 1,
-                                ' ', _(menu_get_prompt(menu)));
+                                ' ', menu_get_prompt(menu));
                        goto conf_childs;
                }
                child_count++;
@@ -894,17 +895,17 @@ static void build_conf(struct menu *menu)
                                if (tmp < 0)
                                        tmp = 0;
                                item_add_str("%*c%s%s", tmp, ' ',
-                                                _(menu_get_prompt(menu)),
+                                                menu_get_prompt(menu),
                                                (sym_has_value(sym) ||
                                                 !sym_is_changable(sym)) ? "" :
-                                                _(" (NEW)"));
+                                                " (NEW)");
                                goto conf_childs;
                        }
                }
                item_add_str("%*c%s%s", indent + 1, ' ',
-                                _(menu_get_prompt(menu)),
+                                menu_get_prompt(menu),
                                (sym_has_value(sym) || !sym_is_changable(sym)) ?
-                                "" : _(" (NEW)"));
+                                "" : " (NEW)");
                if (menu->prompt && menu->prompt->type == P_MENU) {
                        item_add_str("  %s", menu_is_empty(menu) ? "----" : "--->");
                        return;
@@ -1086,8 +1087,8 @@ static void conf(struct menu *menu)
                if (!child_count)
                        break;
-                show_menu(prompt ? _(prompt) : _("Main Menu"),
+                show_menu(prompt ? prompt : "Main Menu",
-                                _(menu_instructions),
+                                menu_instructions,
                                current_index, &last_top_row);
                keypad((menu_win(curses_menu)), TRUE);
                while (!global_exit) {
@@ -1210,12 +1211,9 @@ static void conf(struct menu *menu)
        }
 }
-static void conf_message_callback(const char *fmt, va_list ap)
+static void conf_message_callback(const char *s)
 {
-        char buf[1024];
+        btn_dialog(main_window, s, 1, "<OK>");
-        vsnprintf(buf, sizeof(buf), fmt, ap);
-        btn_dialog(main_window, buf, 1, "<OK>");
 }
 static void show_help(struct menu *menu)
@@ -1227,13 +1225,13 @@ static void show_help(struct menu *menu)
        help = str_new();
        menu_get_ext_help(menu, &help);
-        show_scroll_win(main_window, _(menu_get_prompt(menu)), str_get(&help));
+        show_scroll_win(main_window, menu_get_prompt(menu), str_get(&help));
        str_free(&help);
 }
 static void conf_choice(struct menu *menu)
 {
-        const char *prompt = _(menu_get_prompt(menu));
+        const char *prompt = menu_get_prompt(menu);
        struct menu *child = NULL;
        struct symbol *active;
        int selected_index = 0;
@@ -1256,13 +1254,13 @@ static void conf_choice(struct menu *menu)
                        if (child->sym == sym_get_choice_value(menu->sym))
                                item_make(child, ':', "<X> %s",
-                                                _(menu_get_prompt(child)));
+                                                menu_get_prompt(child));
                        else if (child->sym)
                                item_make(child, ':', "    %s",
-                                                _(menu_get_prompt(child)));
+                                                menu_get_prompt(child));
                        else
                                item_make(child, ':', "*** %s ***",
-                                                _(menu_get_prompt(child)));
+                                                menu_get_prompt(child));
                        if (child->sym == active){
                                last_top_row = top_row(curses_menu);
@@ -1270,8 +1268,8 @@ static void conf_choice(struct menu *menu)
                        }
                        i++;
                }
-                show_menu(prompt ? _(prompt) : _("Choice Menu"),
+                show_menu(prompt ? prompt : "Choice Menu",
-                                _(radiolist_instructions),
+                                radiolist_instructions,
                                selected_index,
                                &last_top_row);
                while (!global_exit) {
@@ -1358,19 +1356,19 @@ static void conf_string(struct menu *menu)
                switch (sym_get_type(menu->sym)) {
                case S_INT:
-                        heading = _(inputbox_instructions_int);
+                        heading = inputbox_instructions_int;
                        break;
                case S_HEX:
-                        heading = _(inputbox_instructions_hex);
+                        heading = inputbox_instructions_hex;
                        break;
                case S_STRING:
-                        heading = _(inputbox_instructions_string);
+                        heading = inputbox_instructions_string;
                        break;
                default:
-                        heading = _("Internal nconf error!");
+                        heading = "Internal nconf error!";
                }
                res = dialog_inputbox(main_window,
-                                prompt ? _(prompt) : _("Main Menu"),
+                                prompt ? prompt : "Main Menu",
                                heading,
                                sym_get_string_value(menu->sym),
                                &dialog_input_result,
@@ -1381,7 +1379,7 @@ static void conf_string(struct menu *menu)
                                                dialog_input_result))
                                return;
                        btn_dialog(main_window,
-                                _("You have made an invalid entry."), 0);
+                                "You have made an invalid entry.", 0);
                        break;
                case 1:
                        show_help(menu);
@@ -1410,11 +1408,11 @@ static void conf_load(void)
                                sym_set_change_count(1);
                                return;
                        }
-                        btn_dialog(main_window, _("File does not exist!"), 0);
+                        btn_dialog(main_window, "File does not exist!", 0);
                        break;
                case 1:
                        show_scroll_win(main_window,
-                                        _("Load Alternate Configuration"),
+                                        "Load Alternate Configuration",
                                        load_config_help);
                        break;
                case KEY_EXIT:
@@ -1441,13 +1439,13 @@ static void conf_save(void)
                                set_config_filename(dialog_input_result);
                                return;
                        }
-                        btn_dialog(main_window, _("Can't create file! "
+                        btn_dialog(main_window, "Can't create file! "
-                                "Probably a nonexistent directory."),
+                                "Probably a nonexistent directory.",
                                1, "<OK>");
                        break;
                case 1:
                        show_scroll_win(main_window,
-                                _("Save Alternate Configuration"),
+                                "Save Alternate Configuration",
                                save_config_help);
                        break;
                case KEY_EXIT:
@@ -1480,10 +1478,6 @@ int main(int ac, char **av)
        int lines, columns;
        char *mode;
-        setlocale(LC_ALL, "");
-        bindtextdomain(PACKAGE, LOCALEDIR);
-        textdomain(PACKAGE);
        if (ac > 1 && strcmp(av[1], "-s") == 0) {
                /* Silence conf_read() until the real callback is set up */
                conf_set_message_callback(NULL);
@@ -1541,8 +1535,8 @@ int main(int ac, char **av)
        /* check for KEY_FUNC(1) */
        if (has_key(KEY_F(1)) == FALSE) {
                show_scroll_win(main_window,
-                                _("Instructions"),
+                                "Instructions",
-                                _(menu_no_f_instructions));
+                                menu_no_f_instructions);
        }
        conf_set_message_callback(conf_message_callback);
diff --git a/scripts/kconfig/nconf.h b/scripts/kconfig/nconf.h
index 0d5261705ef5..2b9e19f603c4 100644
--- a/scripts/kconfig/nconf.h
+++ b/scripts/kconfig/nconf.h
@@ -14,8 +14,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <locale.h>
+#include <ncurses.h>
-#include <curses.h>
 #include <menu.h>
 #include <panel.h>
 #include <form.h>
@@ -24,8 +23,6 @@
 #include <time.h>
 #include <sys/time.h>
-#include "ncurses.h"
 #define max(a, b) ({\
                typeof(a) _a = a;\
                typeof(b) _b = b;\
diff --git a/scripts/kconfig/preprocess.c b/scripts/kconfig/preprocess.c
new file mode 100644
index 000000000000..5ca2df790d3c
--- /dev/null
+++ b/scripts/kconfig/preprocess.c
@@ -0,0 +1,572 @@
+// SPDX-License-Identifier: GPL-2.0
+//
+// Copyright (C) 2018 Masahiro Yamada <yamada.masahiro@socionext.com>
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include "list.h"
+#define ARRAY_SIZE(arr)         (sizeof(arr) / sizeof((arr)[0]))
+static char *expand_string_with_args(const char *in, int argc, char *argv[]);
+static void __attribute__((noreturn)) pperror(const char *format, ...)
+{
+        va_list ap;
+        fprintf(stderr, "%s:%d: ", current_file->name, yylineno);
+        va_start(ap, format);
+        vfprintf(stderr, format, ap);
+        va_end(ap);
+        fprintf(stderr, "\n");
+        exit(1);
+}
+/*
+ * Environment variables
+ */
+static LIST_HEAD(env_list);
+struct env {
+        char *name;
+        char *value;
+        struct list_head node;
+};
+static void env_add(const char *name, const char *value)
+{
+        struct env *e;
+        e = xmalloc(sizeof(*e));
+        e->name = xstrdup(name);
+        e->value = xstrdup(value);
+        list_add_tail(&e->node, &env_list);
+}
+static void env_del(struct env *e)
+{
+        list_del(&e->node);
+        free(e->name);
+        free(e->value);
+        free(e);
+}
+/* The returned pointer must be freed when done */
+static char *env_expand(const char *name)
+{
+        struct env *e;
+        const char *value;
+        if (!*name)
+                return NULL;
+        list_for_each_entry(e, &env_list, node) {
+                if (!strcmp(name, e->name))
+                        return xstrdup(e->value);
+        }
+        value = getenv(name);
+        if (!value)
+                return NULL;
+        /*
+         * We need to remember all referenced environment variables.
+         * They will be written out to include/config/auto.conf.cmd
+         */
+        env_add(name, value);
+        return xstrdup(value);
+}
+void env_write_dep(FILE *f, const char *autoconfig_name)
+{
+        struct env *e, *tmp;
+        list_for_each_entry_safe(e, tmp, &env_list, node) {
+                fprintf(f, "ifneq \"$(%s)\" \"%s\"\n", e->name, e->value);
+                fprintf(f, "%s: FORCE\n", autoconfig_name);
+                fprintf(f, "endif\n");
+                env_del(e);
+        }
+}
+/*
+ * Built-in functions
+ */
+struct function {
+        const char *name;
+        unsigned int min_args;
+        unsigned int max_args;
+        char *(*func)(int argc, char *argv[]);
+};
+static char *do_error_if(int argc, char *argv[])
+{
+        if (!strcmp(argv[0], "y"))
+                pperror("%s", argv[1]);
+        return NULL;
+}
+static char *do_filename(int argc, char *argv[])
+{
+        return xstrdup(current_file->name);
+}
+static char *do_info(int argc, char *argv[])
+{
+        printf("%s\n", argv[0]);
+        return xstrdup("");
+}
+static char *do_lineno(int argc, char *argv[])
+{
+        char buf[16];
+        sprintf(buf, "%d", yylineno);
+        return xstrdup(buf);
+}
+static char *do_shell(int argc, char *argv[])
+{
+        FILE *p;
+        char buf[256];
+        char *cmd;
+        size_t nread;
+        int i;
+        cmd = argv[0];
+        p = popen(cmd, "r");
+        if (!p) {
+                perror(cmd);
+                exit(1);
+        }
+        nread = fread(buf, 1, sizeof(buf), p);
+        if (nread == sizeof(buf))
+                nread--;
+        /* remove trailing new lines */
+        while (nread > 0 && buf[nread - 1] == '\n')
+                nread--;
+        buf[nread] = 0;
+        /* replace a new line with a space */
+        for (i = 0; i < nread; i++) {
+                if (buf[i] == '\n')
+                        buf[i] = ' ';
+        }
+        if (pclose(p) == -1) {
+                perror(cmd);
+                exit(1);
+        }
+        return xstrdup(buf);
+}
+static char *do_warning_if(int argc, char *argv[])
+{
+        if (!strcmp(argv[0], "y"))
+                fprintf(stderr, "%s:%d: %s\n",
+                        current_file->name, yylineno, argv[1]);
+        return xstrdup("");
+}
+static const struct function function_table[] = {
+        /* Name         MIN     MAX     Function */
+        { "error-if",   2,      2,      do_error_if },
+        { "filename",   0,      0,      do_filename },
+        { "info",       1,      1,      do_info },
+        { "lineno",     0,      0,      do_lineno },
+        { "shell",      1,      1,      do_shell },
+        { "warning-if", 2,      2,      do_warning_if },
+};
+#define FUNCTION_MAX_ARGS               16
+static char *function_expand(const char *name, int argc, char *argv[])
+{
+        const struct function *f;
+        int i;
+        for (i = 0; i < ARRAY_SIZE(function_table); i++) {
+                f = &function_table[i];
+                if (strcmp(f->name, name))
+                        continue;
+                if (argc < f->min_args)
+                        pperror("too few function arguments passed to '%s'",
+                                name);
+                if (argc > f->max_args)
+                        pperror("too many function arguments passed to '%s'",
+                                name);
+                return f->func(argc, argv);
+        }
+        return NULL;
+}
+/*
+ * Variables (and user-defined functions)
+ */
+static LIST_HEAD(variable_list);
+struct variable {
+        char *name;
+        char *value;
+        enum variable_flavor flavor;
+        int exp_count;
+        struct list_head node;
+};
+static struct variable *variable_lookup(const char *name)
+{
+        struct variable *v;
+        list_for_each_entry(v, &variable_list, node) {
+                if (!strcmp(name, v->name))
+                        return v;
+        }
+        return NULL;
+}
+static char *variable_expand(const char *name, int argc, char *argv[])
+{
+        struct variable *v;
+        char *res;
+        v = variable_lookup(name);
+        if (!v)
+                return NULL;
+        if (argc == 0 && v->exp_count)
+                pperror("Recursive variable '%s' references itself (eventually)",
+                        name);
+        if (v->exp_count > 1000)
+                pperror("Too deep recursive expansion");
+        v->exp_count++;
+        if (v->flavor == VAR_RECURSIVE)
+                res = expand_string_with_args(v->value, argc, argv);
+        else
+                res = xstrdup(v->value);
+        v->exp_count--;
+        return res;
+}
+void variable_add(const char *name, const char *value,
+                  enum variable_flavor flavor)
+{
+        struct variable *v;
+        char *new_value;
+        bool append = false;
+        v = variable_lookup(name);
+        if (v) {
+                /* For defined variables, += inherits the existing flavor */
+                if (flavor == VAR_APPEND) {
+                        flavor = v->flavor;
+                        append = true;
+                } else {
+                        free(v->value);
+                }
+        } else {
+                /* For undefined variables, += assumes the recursive flavor */
+                if (flavor == VAR_APPEND)
+                        flavor = VAR_RECURSIVE;
+                v = xmalloc(sizeof(*v));
+                v->name = xstrdup(name);
+                v->exp_count = 0;
+                list_add_tail(&v->node, &variable_list);
+        }
+        v->flavor = flavor;
+        if (flavor == VAR_SIMPLE)
+                new_value = expand_string(value);
+        else
+                new_value = xstrdup(value);
+        if (append) {
+                v->value = xrealloc(v->value,
+                                    strlen(v->value) + strlen(new_value) + 2);
+                strcat(v->value, " ");
+                strcat(v->value, new_value);
+                free(new_value);
+        } else {
+                v->value = new_value;
+        }
+}
+static void variable_del(struct variable *v)
+{
+        list_del(&v->node);
+        free(v->name);
+        free(v->value);
+        free(v);
+}
+void variable_all_del(void)
+{
+        struct variable *v, *tmp;
+        list_for_each_entry_safe(v, tmp, &variable_list, node)
+                variable_del(v);
+}
+/*
+ * Evaluate a clause with arguments.  argc/argv are arguments from the upper
+ * function call.
+ *
+ * Returned string must be freed when done
+ */
+static char *eval_clause(const char *str, size_t len, int argc, char *argv[])
+{
+        char *tmp, *name, *res, *endptr, *prev, *p;
+        int new_argc = 0;
+        char *new_argv[FUNCTION_MAX_ARGS];
+        int nest = 0;
+        int i;
+        unsigned long n;
+        tmp = xstrndup(str, len);
+        /*
+         * If variable name is '1', '2', etc.  It is generally an argument
+         * from a user-function call (i.e. local-scope variable).  If not
+         * available, then look-up global-scope variables.
+         */
+        n = strtoul(tmp, &endptr, 10);
+        if (!*endptr && n > 0 && n <= argc) {
+                res = xstrdup(argv[n - 1]);
+                goto free_tmp;
+        }
+        prev = p = tmp;
+        /*
+         * Split into tokens
+         * The function name and arguments are separated by a comma.
+         * For example, if the function call is like this:
+         *   $(foo,$(x),$(y))
+         *
+         * The input string for this helper should be:
+         *   foo,$(x),$(y)
+         *
+         * and split into:
+         *   new_argv[0] = 'foo'
+         *   new_argv[1] = '$(x)'
+         *   new_argv[2] = '$(y)'
+         */
+        while (*p) {
+                if (nest == 0 && *p == ',') {
+                        *p = 0;
+                        if (new_argc >= FUNCTION_MAX_ARGS)
+                                pperror("too many function arguments");
+                        new_argv[new_argc++] = prev;
+                        prev = p + 1;
+                } else if (*p == '(') {
+                        nest++;
+                } else if (*p == ')') {
+                        nest--;
+                }
+                p++;
+        }
+        new_argv[new_argc++] = prev;
+        /*
+         * Shift arguments
+         * new_argv[0] represents a function name or a variable name.  Put it
+         * into 'name', then shift the rest of the arguments.  This simplifies
+         * 'const' handling.
+         */
+        name = expand_string_with_args(new_argv[0], argc, argv);
+        new_argc--;
+        for (i = 0; i < new_argc; i++)
+                new_argv[i] = expand_string_with_args(new_argv[i + 1],
+                                                      argc, argv);
+        /* Search for variables */
+        res = variable_expand(name, new_argc, new_argv);
+        if (res)
+                goto free;
+        /* Look for built-in functions */
+        res = function_expand(name, new_argc, new_argv);
+        if (res)
+                goto free;
+        /* Last, try environment variable */
+        if (new_argc == 0) {
+                res = env_expand(name);
+                if (res)
+                        goto free;
+        }
+        res = xstrdup("");
+free:
+        for (i = 0; i < new_argc; i++)
+                free(new_argv[i]);
+        free(name);
+free_tmp:
+        free(tmp);
+        return res;
+}
+/*
+ * Expand a string that follows '$'
+ *
+ * For example, if the input string is
+ *     ($(FOO)$($(BAR)))$(BAZ)
+ * this helper evaluates
+ *     $($(FOO)$($(BAR)))
+ * and returns a new string containing the expansion (note that the string is
+ * recursively expanded), also advancing 'str' to point to the next character
+ * after the corresponding closing parenthesis, in this case, *str will be
+ *     $(BAR)
+ */
+static char *expand_dollar_with_args(const char **str, int argc, char *argv[])
+{
+        const char *p = *str;
+        const char *q;
+        int nest = 0;
+        /*
+         * In Kconfig, variable/function references always start with "$(".
+         * Neither single-letter variables as in $A nor curly braces as in ${CC}
+         * are supported.  '$' not followed by '(' loses its special meaning.
+         */
+        if (*p != '(') {
+                *str = p;
+                return xstrdup("$");
+        }
+        p++;
+        q = p;
+        while (*q) {
+                if (*q == '(') {
+                        nest++;
+                } else if (*q == ')') {
+                        if (nest-- == 0)
+                                break;
+                }
+                q++;
+        }
+        if (!*q)
+                pperror("unterminated reference to '%s': missing ')'", p);
+        /* Advance 'str' to after the expanded initial portion of the string */
+        *str = q + 1;
+        return eval_clause(p, q - p, argc, argv);
+}
+char *expand_dollar(const char **str)
+{
+        return expand_dollar_with_args(str, 0, NULL);
+}
+static char *__expand_string(const char **str, bool (*is_end)(char c),
+                             int argc, char *argv[])
+{
+        const char *in, *p;
+        char *expansion, *out;
+        size_t in_len, out_len;
+        out = xmalloc(1);
+        *out = 0;
+        out_len = 1;
+        p = in = *str;
+        while (1) {
+                if (*p == '$') {
+                        in_len = p - in;
+                        p++;
+                        expansion = expand_dollar_with_args(&p, argc, argv);
+                        out_len += in_len + strlen(expansion);
+                        out = xrealloc(out, out_len);
+                        strncat(out, in, in_len);
+                        strcat(out, expansion);
+                        free(expansion);
+                        in = p;
+                        continue;
+                }
+                if (is_end(*p))
+                        break;
+                p++;
+        }
+        in_len = p - in;
+        out_len += in_len;
+        out = xrealloc(out, out_len);
+        strncat(out, in, in_len);
+        /* Advance 'str' to the end character */
+        *str = p;
+        return out;
+}
+static bool is_end_of_str(char c)
+{
+        return !c;
+}
+/*
+ * Expand variables and functions in the given string.  Undefined variables
+ * expand to an empty string.
+ * The returned string must be freed when done.
+ */
+static char *expand_string_with_args(const char *in, int argc, char *argv[])
+{
+        return __expand_string(&in, is_end_of_str, argc, argv);
+}
+char *expand_string(const char *in)
+{
+        return expand_string_with_args(in, 0, NULL);
+}
+static bool is_end_of_token(char c)
+{
+        /* Why are '.' and '/' valid characters for symbols? */
+        return !(isalnum(c) || c == '_' || c == '-' || c == '.' || c == '/');
+}
+/*
+ * Expand variables in a token.  The parsing stops when a token separater
+ * (in most cases, it is a whitespace) is encountered.  'str' is updated to
+ * point to the next character.
+ *
+ * The returned string must be freed when done.
+ */
+char *expand_one_token(const char **str)
+{
+        return __expand_string(str, is_end_of_token, 0, NULL);
+}
diff --git a/scripts/kconfig/qconf-cfg.sh b/scripts/kconfig/qconf-cfg.sh
new file mode 100755
index 000000000000..02ccc0ae1031
--- /dev/null
+++ b/scripts/kconfig/qconf-cfg.sh
@@ -0,0 +1,32 @@
+#!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
+PKG="Qt5Core Qt5Gui Qt5Widgets"
+PKG2="QtCore QtGui"
+if [ -z "$(command -v pkg-config)" ]; then
+        echo >&2 "*"
+        echo >&2 "* 'make xconfig' requires 'pkg-config'. Please install it."
+        echo >&2 "*"
+        exit 1
+fi
+if pkg-config --exists $PKG; then
+        echo cflags=\"-std=c++11 -fPIC $(pkg-config --cflags Qt5Core Qt5Gui Qt5Widgets)\"
+        echo libs=\"$(pkg-config --libs $PKG)\"
+        echo moc=\"$(pkg-config --variable=host_bins Qt5Core)/moc\"
+        exit 0
+fi
+if pkg-config --exists $PKG2; then
+        echo cflags=\"$(pkg-config --cflags $PKG2)\"
+        echo libs=\"$(pkg-config --libs $PKG2)\"
+        echo moc=\"$(pkg-config --variable=moc_location QtCore)\"
+        exit 0
+fi
+echo >&2 "*"
+echo >&2 "* Could not find Qt via pkg-config."
+echo >&2 "* Please install either Qt 4.8 or 5.x. and make sure it's in PKG_CONFIG_PATH"
+echo >&2 "*"
+exit 1
diff --git a/scripts/kconfig/qconf.cc b/scripts/kconfig/qconf.cc
index ae6c72546411..ef4310f2558b 100644
--- a/scripts/kconfig/qconf.cc
+++ b/scripts/kconfig/qconf.cc
@@ -34,10 +34,6 @@
 #include "qconf.moc"
 #include "images.c"
-#ifdef _
-# undef _
-# define _ qgettext
-#endif
 static QApplication *configApp;
 static ConfigSettings *configSettings;
@@ -46,12 +42,7 @@ QAction *ConfigMainWindow::saveAction;
 static inline QString qgettext(const char* str)
 {
-        return QString::fromLocal8Bit(gettext(str));
+        return QString::fromLocal8Bit(str);
-}
-static inline QString qgettext(const QString& str)
-{
-        return QString::fromLocal8Bit(gettext(str.toLatin1()));
 }
 ConfigSettings::ConfigSettings()
@@ -127,7 +118,7 @@ void ConfigItem::updateMenu(void)
        sym = menu->sym;
        prop = menu->prompt;
-        prompt = _(menu_get_prompt(menu));
+        prompt = qgettext(menu_get_prompt(menu));
        if (prop) switch (prop->type) {
        case P_MENU:
@@ -216,7 +207,7 @@ void ConfigItem::updateMenu(void)
                break;
        }
        if (!sym_has_value(sym) && visible)
-                prompt += _(" (NEW)");
+                prompt += " (NEW)";
 set_prompt:
        setText(promptColIdx, prompt);
 }
@@ -327,7 +318,7 @@ ConfigList::ConfigList(ConfigView* p, const char *name)
        setVerticalScrollMode(ScrollPerPixel);
        setHorizontalScrollMode(ScrollPerPixel);
-        setHeaderLabels(QStringList() << _("Option") << _("Name") << "N" << "M" << "Y" << _("Value"));
+        setHeaderLabels(QStringList() << "Option" << "Name" << "N" << "M" << "Y" << "Value");
        connect(this, SIGNAL(itemSelectionChanged(void)),
                SLOT(updateSelection(void)));
@@ -883,7 +874,7 @@ void ConfigList::contextMenuEvent(QContextMenuEvent *e)
                        QAction *action;
                        headerPopup = new QMenu(this);
-                        action = new QAction(_("Show Name"), this);
+                        action = new QAction("Show Name", this);
                          action->setCheckable(true);
                          connect(action, SIGNAL(toggled(bool)),
                                  parent(), SLOT(setShowName(bool)));
@@ -891,7 +882,7 @@ void ConfigList::contextMenuEvent(QContextMenuEvent *e)
                                  action, SLOT(setOn(bool)));
                          action->setChecked(showName);
                          headerPopup->addAction(action);
-                        action = new QAction(_("Show Range"), this);
+                        action = new QAction("Show Range", this);
                          action->setCheckable(true);
                          connect(action, SIGNAL(toggled(bool)),
                                  parent(), SLOT(setShowRange(bool)));
@@ -899,7 +890,7 @@ void ConfigList::contextMenuEvent(QContextMenuEvent *e)
                                  action, SLOT(setOn(bool)));
                          action->setChecked(showRange);
                          headerPopup->addAction(action);
-                        action = new QAction(_("Show Data"), this);
+                        action = new QAction("Show Data", this);
                          action->setCheckable(true);
                          connect(action, SIGNAL(toggled(bool)),
                                  parent(), SLOT(setShowData(bool)));
@@ -1086,7 +1077,7 @@ void ConfigInfoView::menuInfo(void)
        if (sym) {
                if (_menu->prompt) {
                        head += "<big><b>";
-                        head += print_filter(_(_menu->prompt->text));
+                        head += print_filter(_menu->prompt->text);
                        head += "</b></big>";
                        if (sym->name) {
                                head += " (";
@@ -1117,7 +1108,7 @@ void ConfigInfoView::menuInfo(void)
                str_free(&help_gstr);
        } else if (_menu->prompt) {
                head += "<big><b>";
-                head += print_filter(_(_menu->prompt->text));
+                head += print_filter(_menu->prompt->text);
                head += "</b></big><br><br>";
                if (showDebug()) {
                        if (_menu->prompt->visible.expr) {
@@ -1152,13 +1143,12 @@ QString ConfigInfoView::debug_info(struct symbol *sym)
                case P_PROMPT:
                case P_MENU:
                        debug += QString().sprintf("prompt: <a href=\"m%p\">", prop->menu);
-                        debug += print_filter(_(prop->text));
+                        debug += print_filter(prop->text);
                        debug += "</a><br>";
                        break;
                case P_DEFAULT:
                case P_SELECT:
                case P_RANGE:
-                case P_ENV:
                        debug += prop_get_type_name(prop->type);
                        debug += ": ";
                        expr_print(prop->expr, expr_print_help, &debug, E_NONE);
@@ -1234,7 +1224,7 @@ void ConfigInfoView::expr_print_help(void *data, struct symbol *sym, const char
 QMenu* ConfigInfoView::createStandardContextMenu(const QPoint & pos)
 {
        QMenu* popup = Parent::createStandardContextMenu(pos);
-        QAction* action = new QAction(_("Show Debug Info"), popup);
+        QAction* action = new QAction("Show Debug Info", popup);
          action->setCheckable(true);
          connect(action, SIGNAL(toggled(bool)), SLOT(setShowDebug(bool)));
          connect(this, SIGNAL(showDebugChanged(bool)), action, SLOT(setOn(bool)));
@@ -1261,11 +1251,11 @@ ConfigSearchWindow::ConfigSearchWindow(ConfigMainWindow* parent, const char *nam
        QHBoxLayout* layout2 = new QHBoxLayout(0);
        layout2->setContentsMargins(0, 0, 0, 0);
        layout2->setSpacing(6);
-        layout2->addWidget(new QLabel(_("Find:"), this));
+        layout2->addWidget(new QLabel("Find:", this));
        editField = new QLineEdit(this);
        connect(editField, SIGNAL(returnPressed()), SLOT(search()));
        layout2->addWidget(editField);
-        searchButton = new QPushButton(_("Search"), this);
+        searchButton = new QPushButton("Search", this);
        searchButton->setAutoDefault(false);
        connect(searchButton, SIGNAL(clicked()), SLOT(search()));
        layout2->addWidget(searchButton);
@@ -1387,44 +1377,44 @@ ConfigMainWindow::ConfigMainWindow(void)
        toolBar = new QToolBar("Tools", this);
        addToolBar(toolBar);
-        backAction = new QAction(QPixmap(xpm_back), _("Back"), this);
+        backAction = new QAction(QPixmap(xpm_back), "Back", this);
          connect(backAction, SIGNAL(triggered(bool)), SLOT(goBack()));
          backAction->setEnabled(false);
-        QAction *quitAction = new QAction(_("&Quit"), this);
+        QAction *quitAction = new QAction("&Quit", this);
        quitAction->setShortcut(Qt::CTRL + Qt::Key_Q);
          connect(quitAction, SIGNAL(triggered(bool)), SLOT(close()));
-        QAction *loadAction = new QAction(QPixmap(xpm_load), _("&Load"), this);
+        QAction *loadAction = new QAction(QPixmap(xpm_load), "&Load", this);
        loadAction->setShortcut(Qt::CTRL + Qt::Key_L);
          connect(loadAction, SIGNAL(triggered(bool)), SLOT(loadConfig()));
-        saveAction = new QAction(QPixmap(xpm_save), _("&Save"), this);
+        saveAction = new QAction(QPixmap(xpm_save), "&Save", this);
        saveAction->setShortcut(Qt::CTRL + Qt::Key_S);
          connect(saveAction, SIGNAL(triggered(bool)), SLOT(saveConfig()));
        conf_set_changed_callback(conf_changed);
        // Set saveAction's initial state
        conf_changed();
-        QAction *saveAsAction = new QAction(_("Save &As..."), this);
+        QAction *saveAsAction = new QAction("Save &As...", this);
          connect(saveAsAction, SIGNAL(triggered(bool)), SLOT(saveConfigAs()));
-        QAction *searchAction = new QAction(_("&Find"), this);
+        QAction *searchAction = new QAction("&Find", this);
        searchAction->setShortcut(Qt::CTRL + Qt::Key_F);
          connect(searchAction, SIGNAL(triggered(bool)), SLOT(searchConfig()));
-        singleViewAction = new QAction(QPixmap(xpm_single_view), _("Single View"), this);
+        singleViewAction = new QAction(QPixmap(xpm_single_view), "Single View", this);
        singleViewAction->setCheckable(true);
          connect(singleViewAction, SIGNAL(triggered(bool)), SLOT(showSingleView()));
-        splitViewAction = new QAction(QPixmap(xpm_split_view), _("Split View"), this);
+        splitViewAction = new QAction(QPixmap(xpm_split_view), "Split View", this);
        splitViewAction->setCheckable(true);
          connect(splitViewAction, SIGNAL(triggered(bool)), SLOT(showSplitView()));
-        fullViewAction = new QAction(QPixmap(xpm_tree_view), _("Full View"), this);
+        fullViewAction = new QAction(QPixmap(xpm_tree_view), "Full View", this);
        fullViewAction->setCheckable(true);
          connect(fullViewAction, SIGNAL(triggered(bool)), SLOT(showFullView()));
-        QAction *showNameAction = new QAction(_("Show Name"), this);
+        QAction *showNameAction = new QAction("Show Name", this);
          showNameAction->setCheckable(true);
          connect(showNameAction, SIGNAL(toggled(bool)), configView, SLOT(setShowName(bool)));
          showNameAction->setChecked(configView->showName());
-        QAction *showRangeAction = new QAction(_("Show Range"), this);
+        QAction *showRangeAction = new QAction("Show Range", this);
          showRangeAction->setCheckable(true);
          connect(showRangeAction, SIGNAL(toggled(bool)), configView, SLOT(setShowRange(bool)));
-        QAction *showDataAction = new QAction(_("Show Data"), this);
+        QAction *showDataAction = new QAction("Show Data", this);
          showDataAction->setCheckable(true);
          connect(showDataAction, SIGNAL(toggled(bool)), configView, SLOT(setShowData(bool)));
@@ -1435,21 +1425,21 @@ ConfigMainWindow::ConfigMainWindow(void)
        connect(optGroup, SIGNAL(triggered(QAction *)), menuView,
                SLOT(setOptionMode(QAction *)));
-        configView->showNormalAction = new QAction(_("Show Normal Options"), optGroup);
+        configView->showNormalAction = new QAction("Show Normal Options", optGroup);
-        configView->showAllAction = new QAction(_("Show All Options"), optGroup);
+        configView->showAllAction = new QAction("Show All Options", optGroup);
-        configView->showPromptAction = new QAction(_("Show Prompt Options"), optGroup);
+        configView->showPromptAction = new QAction("Show Prompt Options", optGroup);
        configView->showNormalAction->setCheckable(true);
        configView->showAllAction->setCheckable(true);
        configView->showPromptAction->setCheckable(true);
-        QAction *showDebugAction = new QAction( _("Show Debug Info"), this);
+        QAction *showDebugAction = new QAction("Show Debug Info", this);
          showDebugAction->setCheckable(true);
          connect(showDebugAction, SIGNAL(toggled(bool)), helpText, SLOT(setShowDebug(bool)));
          showDebugAction->setChecked(helpText->showDebug());
-        QAction *showIntroAction = new QAction( _("Introduction"), this);
+        QAction *showIntroAction = new QAction("Introduction", this);
          connect(showIntroAction, SIGNAL(triggered(bool)), SLOT(showIntro()));
-        QAction *showAboutAction = new QAction( _("About"), this);
+        QAction *showAboutAction = new QAction("About", this);
          connect(showAboutAction, SIGNAL(triggered(bool)), SLOT(showAbout()));
        // init tool bar
@@ -1463,7 +1453,7 @@ ConfigMainWindow::ConfigMainWindow(void)
        toolBar->addAction(fullViewAction);
        // create config menu
-        QMenu* config = menu->addMenu(_("&File"));
+        QMenu* config = menu->addMenu("&File");
        config->addAction(loadAction);
        config->addAction(saveAction);
        config->addAction(saveAsAction);
@@ -1471,11 +1461,11 @@ ConfigMainWindow::ConfigMainWindow(void)
        config->addAction(quitAction);
        // create edit menu
-        QMenu* editMenu = menu->addMenu(_("&Edit"));
+        QMenu* editMenu = menu->addMenu("&Edit");
        editMenu->addAction(searchAction);
        // create options menu
-        QMenu* optionMenu = menu->addMenu(_("&Option"));
+        QMenu* optionMenu = menu->addMenu("&Option");
        optionMenu->addAction(showNameAction);
        optionMenu->addAction(showRangeAction);
        optionMenu->addAction(showDataAction);
@@ -1486,7 +1476,7 @@ ConfigMainWindow::ConfigMainWindow(void)
        // create help menu
        menu->addSeparator();
-        QMenu* helpMenu = menu->addMenu(_("&Help"));
+        QMenu* helpMenu = menu->addMenu("&Help");
        helpMenu->addAction(showIntroAction);
        helpMenu->addAction(showAboutAction);
@@ -1534,16 +1524,18 @@ void ConfigMainWindow::loadConfig(void)
        if (s.isNull())
                return;
        if (conf_read(QFile::encodeName(s)))
-                QMessageBox::information(this, "qconf", _("Unable to load configuration!"));
+                QMessageBox::information(this, "qconf", "Unable to load configuration!");
        ConfigView::updateListAll();
 }
 bool ConfigMainWindow::saveConfig(void)
 {
        if (conf_write(NULL)) {
-                QMessageBox::information(this, "qconf", _("Unable to save configuration!"));
+                QMessageBox::information(this, "qconf", "Unable to save configuration!");
                return false;
        }
+        conf_write_autoconf(0);
        return true;
 }
@@ -1723,11 +1715,11 @@ void ConfigMainWindow::closeEvent(QCloseEvent* e)
                e->accept();
                return;
        }
-        QMessageBox mb("qconf", _("Save configuration?"), QMessageBox::Warning,
+        QMessageBox mb("qconf", "Save configuration?", QMessageBox::Warning,
                        QMessageBox::Yes | QMessageBox::Default, QMessageBox::No, QMessageBox::Cancel | QMessageBox::Escape);
-        mb.setButtonText(QMessageBox::Yes, _("&Save Changes"));
+        mb.setButtonText(QMessageBox::Yes, "&Save Changes");
-        mb.setButtonText(QMessageBox::No, _("&Discard Changes"));
+        mb.setButtonText(QMessageBox::No, "&Discard Changes");
-        mb.setButtonText(QMessageBox::Cancel, _("Cancel Exit"));
+        mb.setButtonText(QMessageBox::Cancel, "Cancel Exit");
        switch (mb.exec()) {
        case QMessageBox::Yes:
                if (saveConfig())
@@ -1746,7 +1738,7 @@ void ConfigMainWindow::closeEvent(QCloseEvent* e)
 void ConfigMainWindow::showIntro(void)
 {
-        static const QString str = _("Welcome to the qconf graphical configuration tool.\n\n"
+        static const QString str = "Welcome to the qconf graphical configuration tool.\n\n"
                "For each option, a blank box indicates the feature is disabled, a check\n"
                "indicates it is enabled, and a dot indicates that it is to be compiled\n"
                "as a module.  Clicking on the box will cycle through the three states.\n\n"
@@ -1756,16 +1748,16 @@ void ConfigMainWindow::showIntro(void)
                "options must be enabled to support the option you are interested in, you can\n"
                "still view the help of a grayed-out option.\n\n"
                "Toggling Show Debug Info under the Options menu will show the dependencies,\n"
-                "which you can then match by examining other options.\n\n");
+                "which you can then match by examining other options.\n\n";
        QMessageBox::information(this, "qconf", str);
 }
 void ConfigMainWindow::showAbout(void)
 {
-        static const QString str = _("qconf is Copyright (C) 2002 Roman Zippel <zippel@linux-m68k.org>.\n"
+        static const QString str = "qconf is Copyright (C) 2002 Roman Zippel <zippel@linux-m68k.org>.\n"
                "Copyright (C) 2015 Boris Barbulovski <bbarbulovski@gmail.com>.\n\n"
-                "Bug reports and feature request can also be entered at http://bugzilla.kernel.org/\n");
+                "Bug reports and feature request can also be entered at http://bugzilla.kernel.org/\n";
        QMessageBox::information(this, "qconf", str);
 }
@@ -1826,7 +1818,7 @@ static const char *progname;
 static void usage(void)
 {
-        printf(_("%s [-s] <config>\n").toLatin1().constData(), progname);
+        printf("%s [-s] <config>\n", progname);
        exit(0);
 }
@@ -1835,9 +1827,6 @@ int main(int ac, char** av)
        ConfigMainWindow* v;
        const char *name;
-        bindtextdomain(PACKAGE, LOCALEDIR);
-        textdomain(PACKAGE);
        progname = av[0];
        configApp = new QApplication(ac, av);
        if (ac > 1 && av[1][0] == '-') {
diff --git a/scripts/kconfig/streamline_config.pl b/scripts/kconfig/streamline_config.pl
index a2e83ab17de3..4686531e2f8c 100755
--- a/scripts/kconfig/streamline_config.pl
+++ b/scripts/kconfig/streamline_config.pl
@@ -165,10 +165,10 @@ sub read_kconfig {
    my $last_source = "";
    # Check for any environment variables used
-    while ($source =~ /\$(\w+)/ && $last_source ne $source) {
+    while ($source =~ /\$\((\w+)\)/ && $last_source ne $source) {
        my $env = $1;
        $last_source = $source;
-        $source =~ s/\$$env/$ENV{$env}/;
+        $source =~ s/\$\($env\)/$ENV{$env}/;
    }
    open(my $kinfile, '<', $source) || die "Can't open $kconfig";
diff --git a/scripts/kconfig/symbol.c b/scripts/kconfig/symbol.c
index 2220bc4b051b..703b9b899ee9 100644
--- a/scripts/kconfig/symbol.c
+++ b/scripts/kconfig/symbol.c
@@ -33,33 +33,6 @@ struct symbol *sym_defconfig_list;
 struct symbol *modules_sym;
 tristate modules_val;
-struct expr *sym_env_list;
-static void sym_add_default(struct symbol *sym, const char *def)
-{
-        struct property *prop = prop_alloc(P_DEFAULT, sym);
-        prop->expr = expr_alloc_symbol(sym_lookup(def, SYMBOL_CONST));
-}
-void sym_init(void)
-{
-        struct symbol *sym;
-        struct utsname uts;
-        static bool inited = false;
-        if (inited)
-                return;
-        inited = true;
-        uname(&uts);
-        sym = sym_lookup("UNAME_RELEASE", 0);
-        sym->type = S_STRING;
-        sym->flags |= SYMBOL_AUTO;
-        sym_add_default(sym, uts.release);
-}
 enum symbol_type sym_get_type(struct symbol *sym)
 {
        enum symbol_type type = sym->type;
@@ -103,15 +76,6 @@ struct property *sym_get_choice_prop(struct symbol *sym)
        return NULL;
 }
-struct property *sym_get_env_prop(struct symbol *sym)
-{
-        struct property *prop;
-        for_all_properties(sym, prop, P_ENV)
-                return prop;
-        return NULL;
-}
 static struct property *sym_get_default_prop(struct symbol *sym)
 {
        struct property *prop;
@@ -243,7 +207,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;
@@ -333,6 +297,27 @@ static struct symbol *sym_calc_choice(struct symbol *sym)
        return def_sym;
 }
+static void sym_warn_unmet_dep(struct symbol *sym)
+{
+        struct gstr gs = str_new();
+        str_printf(&gs,
+                   "\nWARNING: unmet direct dependencies detected for %s\n",
+                   sym->name);
+        str_printf(&gs,
+                   "  Depends on [%c]: ",
+                   sym->dir_dep.tri == mod ? 'm' : 'n');
+        expr_gstr_print(sym->dir_dep.expr, &gs);
+        str_printf(&gs, "\n");
+        expr_gstr_print_revdep(sym->rev_dep.expr, &gs, yes,
+                               "  Selected by [y]:\n");
+        expr_gstr_print_revdep(sym->rev_dep.expr, &gs, mod,
+                               "  Selected by [m]:\n");
+        fputs(str_get(&gs), stderr);
+}
 void sym_calc_value(struct symbol *sym)
 {
        struct symbol_value newval, oldval;
@@ -403,9 +388,10 @@ void sym_calc_value(struct symbol *sym)
                        if (!sym_is_choice(sym)) {
                                prop = sym_get_default_prop(sym);
                                if (prop) {
-                                        sym->flags |= SYMBOL_WRITE;
                                        newval.tri = EXPR_AND(expr_calc_value(prop->expr),
                                                              prop->visible.tri);
+                                        if (newval.tri != no)
+                                                sym->flags |= SYMBOL_WRITE;
                                }
                                if (sym->implied.tri != no) {
                                        sym->flags |= SYMBOL_WRITE;
@@ -413,18 +399,8 @@ void sym_calc_value(struct symbol *sym)
                                }
                        }
                calc_newval:
-                        if (sym->dir_dep.tri == no && sym->rev_dep.tri != no) {
+                        if (sym->dir_dep.tri < sym->rev_dep.tri)
-                                struct expr *e;
+                                sym_warn_unmet_dep(sym);
-                                e = expr_simplify_unmet_dep(sym->rev_dep.expr,
-                                    sym->dir_dep.expr);
-                                fprintf(stderr, "warning: (");
-                                expr_fprint(e, stderr);
-                                fprintf(stderr, ") selects %s which has unmet direct dependencies (",
-                                        sym->name);
-                                expr_fprint(sym->dir_dep.expr, stderr);
-                                fprintf(stderr, ")\n");
-                                expr_free(e);
-                        }
                        newval.tri = EXPR_OR(newval.tri, sym->rev_dep.tri);
                }
                if (newval.tri == mod &&
@@ -478,7 +454,7 @@ void sym_calc_value(struct symbol *sym)
                }
        }
-        if (sym->flags & SYMBOL_AUTO)
+        if (sym->flags & SYMBOL_NO_WRITE)
                sym->flags &= ~SYMBOL_WRITE;
        if (sym->flags & SYMBOL_NEED_SET_CHOICE_VALUES)
@@ -894,59 +870,6 @@ struct symbol *sym_find(const char *name)
        return symbol;
 }
-/*
- * Expand symbol's names embedded in the string given in argument. Symbols'
- * name to be expanded shall be prefixed by a '$'. Unknown symbol expands to
- * the empty string.
- */
-char *sym_expand_string_value(const char *in)
-{
-        const char *src;
-        char *res;
-        size_t reslen;
-        /*
-         * Note: 'in' might come from a token that's about to be
-         * freed, so make sure to always allocate a new string
-         */
-        reslen = strlen(in) + 1;
-        res = xmalloc(reslen);
-        res[0] = '\0';
-        while ((src = strchr(in, '$'))) {
-                char *p, name[SYMBOL_MAXLENGTH];
-                const char *symval = "";
-                struct symbol *sym;
-                size_t newlen;
-                strncat(res, in, src - in);
-                src++;
-                p = name;
-                while (isalnum(*src) || *src == '_')
-                        *p++ = *src++;
-                *p = '\0';
-                sym = sym_find(name);
-                if (sym != NULL) {
-                        sym_calc_value(sym);
-                        symval = sym_get_string_value(sym);
-                }
-                newlen = strlen(res) + strlen(symval) + strlen(src) + 1;
-                if (newlen > reslen) {
-                        reslen = newlen;
-                        res = xrealloc(res, reslen);
-                }
-                strcat(res, symval);
-                in = src;
-        }
-        strcat(res, in);
-        return res;
-}
 const char *sym_escape_string_value(const char *in)
 {
        const char *p;
@@ -1088,7 +1011,7 @@ static struct dep_stack {
        struct dep_stack *prev, *next;
        struct symbol *sym;
        struct property *prop;
-        struct expr *expr;
+        struct expr **expr;
 } *check_top;
 static void dep_stack_insert(struct dep_stack *stack, struct symbol *sym)
@@ -1153,31 +1076,42 @@ static void sym_check_print_recursive(struct symbol *last_sym)
                        fprintf(stderr, "%s:%d:error: recursive dependency detected!\n",
                                prop->file->name, prop->lineno);
-                if (stack->expr) {
+                if (sym_is_choice(sym)) {
-                        fprintf(stderr, "%s:%d:\tsymbol %s %s value contains %s\n",
+                        fprintf(stderr, "%s:%d:\tchoice %s contains symbol %s\n",
-                                prop->file->name, prop->lineno,
+                                menu->file->name, menu->lineno,
+                                sym->name ? sym->name : "<choice>",
+                                next_sym->name ? next_sym->name : "<choice>");
+                } else if (sym_is_choice_value(sym)) {
+                        fprintf(stderr, "%s:%d:\tsymbol %s is part of choice %s\n",
+                                menu->file->name, menu->lineno,
                                sym->name ? sym->name : "<choice>",
-                                prop_get_type_name(prop->type),
                                next_sym->name ? next_sym->name : "<choice>");
-                } else if (stack->prop) {
+                } else if (stack->expr == &sym->dir_dep.expr) {
                        fprintf(stderr, "%s:%d:\tsymbol %s depends on %s\n",
                                prop->file->name, prop->lineno,
                                sym->name ? sym->name : "<choice>",
                                next_sym->name ? next_sym->name : "<choice>");
-                } else if (sym_is_choice(sym)) {
+                } else if (stack->expr == &sym->rev_dep.expr) {
-                        fprintf(stderr, "%s:%d:\tchoice %s contains symbol %s\n",
+                        fprintf(stderr, "%s:%d:\tsymbol %s is selected by %s\n",
-                                menu->file->name, menu->lineno,
+                                prop->file->name, prop->lineno,
                                sym->name ? sym->name : "<choice>",
                                next_sym->name ? next_sym->name : "<choice>");
-                } else if (sym_is_choice_value(sym)) {
+                } else if (stack->expr == &sym->implied.expr) {
-                        fprintf(stderr, "%s:%d:\tsymbol %s is part of choice %s\n",
+                        fprintf(stderr, "%s:%d:\tsymbol %s is implied by %s\n",
-                                menu->file->name, menu->lineno,
+                                prop->file->name, prop->lineno,
+                                sym->name ? sym->name : "<choice>",
+                                next_sym->name ? next_sym->name : "<choice>");
+                } else if (stack->expr) {
+                        fprintf(stderr, "%s:%d:\tsymbol %s %s value contains %s\n",
+                                prop->file->name, prop->lineno,
                                sym->name ? sym->name : "<choice>",
+                                prop_get_type_name(prop->type),
                                next_sym->name ? next_sym->name : "<choice>");
                } else {
-                        fprintf(stderr, "%s:%d:\tsymbol %s is selected by %s\n",
+                        fprintf(stderr, "%s:%d:\tsymbol %s %s is visible depending on %s\n",
                                prop->file->name, prop->lineno,
                                sym->name ? sym->name : "<choice>",
+                                prop_get_type_name(prop->type),
                                next_sym->name ? next_sym->name : "<choice>");
                }
        }
@@ -1234,12 +1168,26 @@ static struct symbol *sym_check_sym_deps(struct symbol *sym)
        dep_stack_insert(&stack, sym);
+        stack.expr = &sym->dir_dep.expr;
+        sym2 = sym_check_expr_deps(sym->dir_dep.expr);
+        if (sym2)
+                goto out;
+        stack.expr = &sym->rev_dep.expr;
        sym2 = sym_check_expr_deps(sym->rev_dep.expr);
        if (sym2)
                goto out;
+        stack.expr = &sym->implied.expr;
+        sym2 = sym_check_expr_deps(sym->implied.expr);
+        if (sym2)
+                goto out;
+        stack.expr = NULL;
        for (prop = sym->prop; prop; prop = prop->next) {
-                if (prop->type == P_CHOICE || prop->type == P_SELECT)
+                if (prop->type == P_CHOICE || prop->type == P_SELECT ||
+                    prop->type == P_IMPLY)
                        continue;
                stack.prop = prop;
                sym2 = sym_check_expr_deps(prop->visible.expr);
@@ -1247,7 +1195,7 @@ static struct symbol *sym_check_sym_deps(struct symbol *sym)
                        break;
                if (prop->type != P_DEFAULT || sym_is_choice(sym))
                        continue;
-                stack.expr = prop->expr;
+                stack.expr = &prop->expr;
                sym2 = sym_check_expr_deps(prop->expr);
                if (sym2)
                        break;
@@ -1325,9 +1273,6 @@ struct symbol *sym_check_deps(struct symbol *sym)
                sym->flags &= ~SYMBOL_CHECK;
        }
-        if (sym2 && sym2 == sym)
-                sym2 = NULL;
        return sym2;
 }
@@ -1366,8 +1311,6 @@ const char *prop_get_type_name(enum prop_type type)
        switch (type) {
        case P_PROMPT:
                return "prompt";
-        case P_ENV:
-                return "env";
        case P_COMMENT:
                return "comment";
        case P_MENU:
@@ -1389,32 +1332,3 @@ const char *prop_get_type_name(enum prop_type type)
        }
        return "unknown";
 }
-static void prop_add_env(const char *env)
-{
-        struct symbol *sym, *sym2;
-        struct property *prop;
-        char *p;
-        sym = current_entry->sym;
-        sym->flags |= SYMBOL_AUTO;
-        for_all_properties(sym, prop, P_ENV) {
-                sym2 = prop_get_symbol(prop);
-                if (strcmp(sym2->name, env))
-                        menu_warn(current_entry, "redefining environment symbol from %s",
-                                  sym2->name);
-                return;
-        }
-        prop = prop_alloc(P_ENV, sym);
-        prop->expr = expr_alloc_symbol(sym_lookup(env, SYMBOL_CONST));
-        sym_env_list = expr_alloc_one(E_LIST, sym_env_list);
-        sym_env_list->right.sym = sym;
-        p = getenv(env);
-        if (p)
-                sym_add_default(sym, p);
-        else
-                menu_warn(current_entry, "environment variable %s undefined", env);
-}
diff --git a/scripts/kconfig/tests/auto_submenu/Kconfig b/scripts/kconfig/tests/auto_submenu/Kconfig
new file mode 100644
index 000000000000..c17bf2caa7e6
--- /dev/null
+++ b/scripts/kconfig/tests/auto_submenu/Kconfig
@@ -0,0 +1,50 @@
+config A
+        bool "A"
+        default y
+config A0
+        bool "A0"
+        depends on A
+        default y
+        help
+          This depends on A, so should be a submenu of A.
+config A0_0
+        bool "A1_0"
+        depends on A0
+        help
+          Submenus are created recursively.
+          This should be a submenu of A0.
+config A1
+        bool "A1"
+        depends on A
+        default y
+        help
+          This should line up with A0.
+choice
+        prompt "choice"
+        depends on A1
+        help
+          Choice should become a submenu as well.
+config A1_0
+        bool "A1_0"
+config A1_1
+        bool "A1_1"
+endchoice
+config B
+        bool "B"
+        help
+          This is independent of A.
+config C
+        bool "C"
+        depends on A
+        help
+          This depends on A, but not a consecutive item, so can/should not
+          be a submenu.
diff --git a/scripts/kconfig/tests/auto_submenu/__init__.py b/scripts/kconfig/tests/auto_submenu/__init__.py
new file mode 100644
index 000000000000..32e79b85faeb
--- /dev/null
+++ b/scripts/kconfig/tests/auto_submenu/__init__.py
@@ -0,0 +1,12 @@
+"""
+Create submenu for symbols that depend on the preceding one.
+If a symbols has dependency on the preceding symbol, the menu entry
+should become the submenu of the preceding one, and displayed with
+deeper indentation.
+"""
+def test(conf):
+    assert conf.oldaskconfig() == 0
+    assert conf.stdout_contains('expected_stdout')
diff --git a/scripts/kconfig/tests/auto_submenu/expected_stdout b/scripts/kconfig/tests/auto_submenu/expected_stdout
new file mode 100644
index 000000000000..bf5236f39a56
--- /dev/null
+++ b/scripts/kconfig/tests/auto_submenu/expected_stdout
@@ -0,0 +1,10 @@
+A (A) [Y/n/?] (NEW) 
+  A0 (A0) [Y/n/?] (NEW) 
+    A1_0 (A0_0) [N/y/?] (NEW) 
+  A1 (A1) [Y/n/?] (NEW) 
+    choice
+    > 1. A1_0 (A1_0) (NEW)
+      2. A1_1 (A1_1) (NEW)
+    choice[1-2?]: 
+B (B) [N/y/?] (NEW) 
+C (C) [N/y/?] (NEW) 
diff --git a/scripts/kconfig/tests/choice/Kconfig b/scripts/kconfig/tests/choice/Kconfig
new file mode 100644
index 000000000000..cc60e9ce2c03
--- /dev/null
+++ b/scripts/kconfig/tests/choice/Kconfig
@@ -0,0 +1,54 @@
+config MODULES
+        bool "Enable loadable module support"
+        option modules
+        default y
+choice
+        prompt "boolean choice"
+        default BOOL_CHOICE1
+config BOOL_CHOICE0
+        bool "choice 0"
+config BOOL_CHOICE1
+        bool "choice 1"
+endchoice
+choice
+        prompt "optional boolean choice"
+        optional
+        default OPT_BOOL_CHOICE1
+config OPT_BOOL_CHOICE0
+        bool "choice 0"
+config OPT_BOOL_CHOICE1
+        bool "choice 1"
+endchoice
+choice
+        prompt "tristate choice"
+        default TRI_CHOICE1
+config TRI_CHOICE0
+        tristate "choice 0"
+config TRI_CHOICE1
+        tristate "choice 1"
+endchoice
+choice
+        prompt "optional tristate choice"
+        optional
+        default OPT_TRI_CHOICE1
+config OPT_TRI_CHOICE0
+        tristate "choice 0"
+config OPT_TRI_CHOICE1
+        tristate "choice 1"
+endchoice
diff --git a/scripts/kconfig/tests/choice/__init__.py b/scripts/kconfig/tests/choice/__init__.py
new file mode 100644
index 000000000000..9edcc5262134
--- /dev/null
+++ b/scripts/kconfig/tests/choice/__init__.py
@@ -0,0 +1,40 @@
+"""
+Basic choice tests.
+The handling of 'choice' is a bit complicated part in Kconfig.
+The behavior of 'y' choice is intuitive.  If choice values are tristate,
+the choice can be 'm' where each value can be enabled independently.
+Also, if a choice is marked as 'optional', the whole choice can be
+invisible.
+"""
+def test_oldask0(conf):
+    assert conf.oldaskconfig() == 0
+    assert conf.stdout_contains('oldask0_expected_stdout')
+def test_oldask1(conf):
+    assert conf.oldaskconfig('oldask1_config') == 0
+    assert conf.stdout_contains('oldask1_expected_stdout')
+def test_allyes(conf):
+    assert conf.allyesconfig() == 0
+    assert conf.config_contains('allyes_expected_config')
+def test_allmod(conf):
+    assert conf.allmodconfig() == 0
+    assert conf.config_contains('allmod_expected_config')
+def test_allno(conf):
+    assert conf.allnoconfig() == 0
+    assert conf.config_contains('allno_expected_config')
+def test_alldef(conf):
+    assert conf.alldefconfig() == 0
+    assert conf.config_contains('alldef_expected_config')
diff --git a/scripts/kconfig/tests/choice/alldef_expected_config b/scripts/kconfig/tests/choice/alldef_expected_config
new file mode 100644
index 000000000000..7a754bf4be94
--- /dev/null
+++ b/scripts/kconfig/tests/choice/alldef_expected_config
@@ -0,0 +1,5 @@
+CONFIG_MODULES=y
+# CONFIG_BOOL_CHOICE0 is not set
+CONFIG_BOOL_CHOICE1=y
+# CONFIG_TRI_CHOICE0 is not set
+# CONFIG_TRI_CHOICE1 is not set
diff --git a/scripts/kconfig/tests/choice/allmod_expected_config b/scripts/kconfig/tests/choice/allmod_expected_config
new file mode 100644
index 000000000000..f1f5dcdb7923
--- /dev/null
+++ b/scripts/kconfig/tests/choice/allmod_expected_config
@@ -0,0 +1,9 @@
+CONFIG_MODULES=y
+# CONFIG_BOOL_CHOICE0 is not set
+CONFIG_BOOL_CHOICE1=y
+# CONFIG_OPT_BOOL_CHOICE0 is not set
+CONFIG_OPT_BOOL_CHOICE1=y
+CONFIG_TRI_CHOICE0=m
+CONFIG_TRI_CHOICE1=m
+CONFIG_OPT_TRI_CHOICE0=m
+CONFIG_OPT_TRI_CHOICE1=m
diff --git a/scripts/kconfig/tests/choice/allno_expected_config b/scripts/kconfig/tests/choice/allno_expected_config
new file mode 100644
index 000000000000..b88ee7a43136
--- /dev/null
+++ b/scripts/kconfig/tests/choice/allno_expected_config
@@ -0,0 +1,5 @@
+# CONFIG_MODULES is not set
+# CONFIG_BOOL_CHOICE0 is not set
+CONFIG_BOOL_CHOICE1=y
+# CONFIG_TRI_CHOICE0 is not set
+CONFIG_TRI_CHOICE1=y
diff --git a/scripts/kconfig/tests/choice/allyes_expected_config b/scripts/kconfig/tests/choice/allyes_expected_config
new file mode 100644
index 000000000000..e5a062a1157c
--- /dev/null
+++ b/scripts/kconfig/tests/choice/allyes_expected_config
@@ -0,0 +1,9 @@
+CONFIG_MODULES=y
+# CONFIG_BOOL_CHOICE0 is not set
+CONFIG_BOOL_CHOICE1=y
+# CONFIG_OPT_BOOL_CHOICE0 is not set
+CONFIG_OPT_BOOL_CHOICE1=y
+# CONFIG_TRI_CHOICE0 is not set
+CONFIG_TRI_CHOICE1=y
+# CONFIG_OPT_TRI_CHOICE0 is not set
+CONFIG_OPT_TRI_CHOICE1=y
diff --git a/scripts/kconfig/tests/choice/oldask0_expected_stdout b/scripts/kconfig/tests/choice/oldask0_expected_stdout
new file mode 100644
index 000000000000..b251bba9698b
--- /dev/null
+++ b/scripts/kconfig/tests/choice/oldask0_expected_stdout
@@ -0,0 +1,10 @@
+Enable loadable module support (MODULES) [Y/n/?] (NEW) 
+boolean choice
+  1. choice 0 (BOOL_CHOICE0) (NEW)
+> 2. choice 1 (BOOL_CHOICE1) (NEW)
+choice[1-2?]: 
+optional boolean choice [N/y/?] (NEW) 
+tristate choice [M/y/?] (NEW) 
+  choice 0 (TRI_CHOICE0) [N/m/?] (NEW) 
+  choice 1 (TRI_CHOICE1) [N/m/?] (NEW) 
+optional tristate choice [N/m/y/?] (NEW) 
diff --git a/scripts/kconfig/tests/choice/oldask1_config b/scripts/kconfig/tests/choice/oldask1_config
new file mode 100644
index 000000000000..b67bfe3c641f
--- /dev/null
+++ b/scripts/kconfig/tests/choice/oldask1_config
@@ -0,0 +1,2 @@
+# CONFIG_MODULES is not set
+CONFIG_OPT_BOOL_CHOICE0=y
diff --git a/scripts/kconfig/tests/choice/oldask1_expected_stdout b/scripts/kconfig/tests/choice/oldask1_expected_stdout
new file mode 100644
index 000000000000..c2125e9bf96a
--- /dev/null
+++ b/scripts/kconfig/tests/choice/oldask1_expected_stdout
@@ -0,0 +1,15 @@
+Enable loadable module support (MODULES) [N/y/?] 
+boolean choice
+  1. choice 0 (BOOL_CHOICE0) (NEW)
+> 2. choice 1 (BOOL_CHOICE1) (NEW)
+choice[1-2?]: 
+optional boolean choice [Y/n/?] (NEW) 
+optional boolean choice
+> 1. choice 0 (OPT_BOOL_CHOICE0)
+  2. choice 1 (OPT_BOOL_CHOICE1) (NEW)
+choice[1-2?]: 
+tristate choice
+  1. choice 0 (TRI_CHOICE0) (NEW)
+> 2. choice 1 (TRI_CHOICE1) (NEW)
+choice[1-2?]: 
+optional tristate choice [N/y/?] 
diff --git a/scripts/kconfig/tests/choice_value_with_m_dep/Kconfig b/scripts/kconfig/tests/choice_value_with_m_dep/Kconfig
new file mode 100644
index 000000000000..11ac25c26040
--- /dev/null
+++ b/scripts/kconfig/tests/choice_value_with_m_dep/Kconfig
@@ -0,0 +1,19 @@
+config MODULES
+        def_bool y
+        option modules
+config DEP
+        tristate
+        default m
+choice
+        prompt "Tristate Choice"
+config CHOICE0
+        tristate "Choice 0"
+config CHOICE1
+        tristate "Choice 1"
+        depends on DEP
+endchoice
diff --git a/scripts/kconfig/tests/choice_value_with_m_dep/__init__.py b/scripts/kconfig/tests/choice_value_with_m_dep/__init__.py
new file mode 100644
index 000000000000..f8d728c7b101
--- /dev/null
+++ b/scripts/kconfig/tests/choice_value_with_m_dep/__init__.py
@@ -0,0 +1,15 @@
+"""
+Hide tristate choice values with mod dependency in y choice.
+If tristate choice values depend on symbols set to 'm', they should be
+hidden when the choice containing them is changed from 'm' to 'y'
+(i.e. exclusive choice).
+Related Linux commit: fa64e5f6a35efd5e77d639125d973077ca506074
+"""
+def test(conf):
+    assert conf.oldaskconfig('config', 'y') == 0
+    assert conf.config_contains('expected_config')
+    assert conf.stdout_contains('expected_stdout')
diff --git a/scripts/kconfig/tests/choice_value_with_m_dep/config b/scripts/kconfig/tests/choice_value_with_m_dep/config
new file mode 100644
index 000000000000..3a126b7a2546
--- /dev/null
+++ b/scripts/kconfig/tests/choice_value_with_m_dep/config
@@ -0,0 +1,2 @@
+CONFIG_CHOICE0=m
+CONFIG_CHOICE1=m
diff --git a/scripts/kconfig/tests/choice_value_with_m_dep/expected_config b/scripts/kconfig/tests/choice_value_with_m_dep/expected_config
new file mode 100644
index 000000000000..4d07b449540e
--- /dev/null
+++ b/scripts/kconfig/tests/choice_value_with_m_dep/expected_config
@@ -0,0 +1,3 @@
+CONFIG_MODULES=y
+CONFIG_DEP=m
+CONFIG_CHOICE0=y
diff --git a/scripts/kconfig/tests/choice_value_with_m_dep/expected_stdout b/scripts/kconfig/tests/choice_value_with_m_dep/expected_stdout
new file mode 100644
index 000000000000..2b50ab65c86a
--- /dev/null
+++ b/scripts/kconfig/tests/choice_value_with_m_dep/expected_stdout
@@ -0,0 +1,4 @@
+Tristate Choice [M/y/?] y
+Tristate Choice
+> 1. Choice 0 (CHOICE0)
+choice[1]: 1
diff --git a/scripts/kconfig/tests/conftest.py b/scripts/kconfig/tests/conftest.py
new file mode 100644
index 000000000000..0345ef6e3273
--- /dev/null
+++ b/scripts/kconfig/tests/conftest.py
@@ -0,0 +1,291 @@
+# SPDX-License-Identifier: GPL-2.0
+#
+# Copyright (C) 2018 Masahiro Yamada <yamada.masahiro@socionext.com>
+#
+"""
+Kconfig unit testing framework.
+This provides fixture functions commonly used from test files.
+"""
+import os
+import pytest
+import shutil
+import subprocess
+import tempfile
+CONF_PATH = os.path.abspath(os.path.join('scripts', 'kconfig', 'conf'))
+class Conf:
+    """Kconfig runner and result checker.
+    This class provides methods to run text-based interface of Kconfig
+    (scripts/kconfig/conf) and retrieve the resulted configuration,
+    stdout, and stderr.  It also provides methods to compare those
+    results with expectations.
+    """
+    def __init__(self, request):
+        """Create a new Conf instance.
+        request: object to introspect the requesting test module
+        """
+        # the directory of the test being run
+        self._test_dir = os.path.dirname(str(request.fspath))
+    # runners
+    def _run_conf(self, mode, dot_config=None, out_file='.config',
+                  interactive=False, in_keys=None, extra_env={}):
+        """Run text-based Kconfig executable and save the result.
+        mode: input mode option (--oldaskconfig, --defconfig=<file> etc.)
+        dot_config: .config file to use for configuration base
+        out_file: file name to contain the output config data
+        interactive: flag to specify the interactive mode
+        in_keys: key inputs for interactive modes
+        extra_env: additional environments
+        returncode: exit status of the Kconfig executable
+        """
+        command = [CONF_PATH, mode, 'Kconfig']
+        # Override 'srctree' environment to make the test as the top directory
+        extra_env['srctree'] = self._test_dir
+        # Run Kconfig in a temporary directory.
+        # This directory is automatically removed when done.
+        with tempfile.TemporaryDirectory() as temp_dir:
+            # if .config is given, copy it to the working directory
+            if dot_config:
+                shutil.copyfile(os.path.join(self._test_dir, dot_config),
+                                os.path.join(temp_dir, '.config'))
+            ps = subprocess.Popen(command,
+                                  stdin=subprocess.PIPE,
+                                  stdout=subprocess.PIPE,
+                                  stderr=subprocess.PIPE,
+                                  cwd=temp_dir,
+                                  env=dict(os.environ, **extra_env))
+            # If input key sequence is given, feed it to stdin.
+            if in_keys:
+                ps.stdin.write(in_keys.encode('utf-8'))
+            while ps.poll() is None:
+                # For interactive modes such as oldaskconfig, oldconfig,
+                # send 'Enter' key until the program finishes.
+                if interactive:
+                    ps.stdin.write(b'\n')
+            self.retcode = ps.returncode
+            self.stdout = ps.stdout.read().decode()
+            self.stderr = ps.stderr.read().decode()
+            # Retrieve the resulted config data only when .config is supposed
+            # to exist.  If the command fails, the .config does not exist.
+            # 'listnewconfig' does not produce .config in the first place.
+            if self.retcode == 0 and out_file:
+                with open(os.path.join(temp_dir, out_file)) as f:
+                    self.config = f.read()
+            else:
+                self.config = None
+        # Logging:
+        # Pytest captures the following information by default.  In failure
+        # of tests, the captured log will be displayed.  This will be useful to
+        # figure out what has happened.
+        print("[command]\n{}\n".format(' '.join(command)))
+        print("[retcode]\n{}\n".format(self.retcode))
+        print("[stdout]")
+        print(self.stdout)
+        print("[stderr]")
+        print(self.stderr)
+        if self.config is not None:
+            print("[output for '{}']".format(out_file))
+            print(self.config)
+        return self.retcode
+    def oldaskconfig(self, dot_config=None, in_keys=None):
+        """Run oldaskconfig.
+        dot_config: .config file to use for configuration base (optional)
+        in_key: key inputs (optional)
+        returncode: exit status of the Kconfig executable
+        """
+        return self._run_conf('--oldaskconfig', dot_config=dot_config,
+                              interactive=True, in_keys=in_keys)
+    def oldconfig(self, dot_config=None, in_keys=None):
+        """Run oldconfig.
+        dot_config: .config file to use for configuration base (optional)
+        in_key: key inputs (optional)
+        returncode: exit status of the Kconfig executable
+        """
+        return self._run_conf('--oldconfig', dot_config=dot_config,
+                              interactive=True, in_keys=in_keys)
+    def olddefconfig(self, dot_config=None):
+        """Run olddefconfig.
+        dot_config: .config file to use for configuration base (optional)
+        returncode: exit status of the Kconfig executable
+        """
+        return self._run_conf('--olddefconfig', dot_config=dot_config)
+    def defconfig(self, defconfig):
+        """Run defconfig.
+        defconfig: defconfig file for input
+        returncode: exit status of the Kconfig executable
+        """
+        defconfig_path = os.path.join(self._test_dir, defconfig)
+        return self._run_conf('--defconfig={}'.format(defconfig_path))
+    def _allconfig(self, mode, all_config):
+        if all_config:
+            all_config_path = os.path.join(self._test_dir, all_config)
+            extra_env = {'KCONFIG_ALLCONFIG': all_config_path}
+        else:
+            extra_env = {}
+        return self._run_conf('--{}config'.format(mode), extra_env=extra_env)
+    def allyesconfig(self, all_config=None):
+        """Run allyesconfig.
+        all_config: fragment config file for KCONFIG_ALLCONFIG (optional)
+        returncode: exit status of the Kconfig executable
+        """
+        return self._allconfig('allyes', all_config)
+    def allmodconfig(self, all_config=None):
+        """Run allmodconfig.
+        all_config: fragment config file for KCONFIG_ALLCONFIG (optional)
+        returncode: exit status of the Kconfig executable
+        """
+        return self._allconfig('allmod', all_config)
+    def allnoconfig(self, all_config=None):
+        """Run allnoconfig.
+        all_config: fragment config file for KCONFIG_ALLCONFIG (optional)
+        returncode: exit status of the Kconfig executable
+        """
+        return self._allconfig('allno', all_config)
+    def alldefconfig(self, all_config=None):
+        """Run alldefconfig.
+        all_config: fragment config file for KCONFIG_ALLCONFIG (optional)
+        returncode: exit status of the Kconfig executable
+        """
+        return self._allconfig('alldef', all_config)
+    def randconfig(self, all_config=None):
+        """Run randconfig.
+        all_config: fragment config file for KCONFIG_ALLCONFIG (optional)
+        returncode: exit status of the Kconfig executable
+        """
+        return self._allconfig('rand', all_config)
+    def savedefconfig(self, dot_config):
+        """Run savedefconfig.
+        dot_config: .config file for input
+        returncode: exit status of the Kconfig executable
+        """
+        return self._run_conf('--savedefconfig', out_file='defconfig')
+    def listnewconfig(self, dot_config=None):
+        """Run listnewconfig.
+        dot_config: .config file to use for configuration base (optional)
+        returncode: exit status of the Kconfig executable
+        """
+        return self._run_conf('--listnewconfig', dot_config=dot_config,
+                              out_file=None)
+    # checkers
+    def _read_and_compare(self, compare, expected):
+        """Compare the result with expectation.
+        compare: function to compare the result with expectation
+        expected: file that contains the expected data
+        """
+        with open(os.path.join(self._test_dir, expected)) as f:
+            expected_data = f.read()
+        return compare(self, expected_data)
+    def _contains(self, attr, expected):
+        return self._read_and_compare(
+                                    lambda s, e: getattr(s, attr).find(e) >= 0,
+                                    expected)
+    def _matches(self, attr, expected):
+        return self._read_and_compare(lambda s, e: getattr(s, attr) == e,
+                                      expected)
+    def config_contains(self, expected):
+        """Check if resulted configuration contains expected data.
+        expected: file that contains the expected data
+        returncode: True if result contains the expected data, False otherwise
+        """
+        return self._contains('config', expected)
+    def config_matches(self, expected):
+        """Check if resulted configuration exactly matches expected data.
+        expected: file that contains the expected data
+        returncode: True if result matches the expected data, False otherwise
+        """
+        return self._matches('config', expected)
+    def stdout_contains(self, expected):
+        """Check if resulted stdout contains expected data.
+        expected: file that contains the expected data
+        returncode: True if result contains the expected data, False otherwise
+        """
+        return self._contains('stdout', expected)
+    def stdout_matches(self, expected):
+        """Check if resulted stdout exactly matches expected data.
+        expected: file that contains the expected data
+        returncode: True if result matches the expected data, False otherwise
+        """
+        return self._matches('stdout', expected)
+    def stderr_contains(self, expected):
+        """Check if resulted stderr contains expected data.
+        expected: file that contains the expected data
+        returncode: True if result contains the expected data, False otherwise
+        """
+        return self._contains('stderr', expected)
+    def stderr_matches(self, expected):
+        """Check if resulted stderr exactly matches expected data.
+        expected: file that contains the expected data
+        returncode: True if result matches the expected data, False otherwise
+        """
+        return self._matches('stderr', expected)
+@pytest.fixture(scope="module")
+def conf(request):
+    """Create a Conf instance and provide it to test functions."""
+    return Conf(request)
diff --git a/scripts/kconfig/tests/err_recursive_dep/Kconfig b/scripts/kconfig/tests/err_recursive_dep/Kconfig
new file mode 100644
index 000000000000..ebdb3ffd8717
--- /dev/null
+++ b/scripts/kconfig/tests/err_recursive_dep/Kconfig
@@ -0,0 +1,63 @@
+# SPDX-License-Identifier: GPL-2.0
+# depends on itself
+config A
+        bool "A"
+        depends on A
+# select itself
+config B
+        bool
+        select B
+# depends on each other
+config C1
+        bool "C1"
+        depends on C2
+config C2
+        bool "C2"
+        depends on C1
+# depends on and select
+config D1
+        bool "D1"
+        depends on D2
+        select D2
+config D2
+        bool
+# depends on and imply
+config E1
+        bool "E1"
+        depends on E2
+        imply E2
+config E2
+        bool "E2"
+# property
+config F1
+        bool "F1"
+        default F2
+config F2
+        bool "F2"
+        depends on F1
+# menu
+menu "menu depending on its content"
+        depends on G
+config G
+        bool "G"
+endmenu
diff --git a/scripts/kconfig/tests/err_recursive_dep/__init__.py b/scripts/kconfig/tests/err_recursive_dep/__init__.py
new file mode 100644
index 000000000000..5f3821b43ce6
--- /dev/null
+++ b/scripts/kconfig/tests/err_recursive_dep/__init__.py
@@ -0,0 +1,10 @@
+# SPDX-License-Identifier: GPL-2.0
+"""
+Detect recursive dependency error.
+Recursive dependency should be treated as an error.
+"""
+def test(conf):
+    assert conf.oldaskconfig() == 1
+    assert conf.stderr_contains('expected_stderr')
diff --git a/scripts/kconfig/tests/err_recursive_dep/expected_stderr b/scripts/kconfig/tests/err_recursive_dep/expected_stderr
new file mode 100644
index 000000000000..84679b104655
--- /dev/null
+++ b/scripts/kconfig/tests/err_recursive_dep/expected_stderr
@@ -0,0 +1,38 @@
+Kconfig:11:error: recursive dependency detected!
+Kconfig:11:     symbol B is selected by B
+For a resolution refer to Documentation/kbuild/kconfig-language.txt
+subsection "Kconfig recursive dependency limitations"
+Kconfig:5:error: recursive dependency detected!
+Kconfig:5:      symbol A depends on A
+For a resolution refer to Documentation/kbuild/kconfig-language.txt
+subsection "Kconfig recursive dependency limitations"
+Kconfig:17:error: recursive dependency detected!
+Kconfig:17:     symbol C1 depends on C2
+Kconfig:21:     symbol C2 depends on C1
+For a resolution refer to Documentation/kbuild/kconfig-language.txt
+subsection "Kconfig recursive dependency limitations"
+Kconfig:32:error: recursive dependency detected!
+Kconfig:32:     symbol D2 is selected by D1
+Kconfig:27:     symbol D1 depends on D2
+For a resolution refer to Documentation/kbuild/kconfig-language.txt
+subsection "Kconfig recursive dependency limitations"
+Kconfig:37:error: recursive dependency detected!
+Kconfig:37:     symbol E1 depends on E2
+Kconfig:42:     symbol E2 is implied by E1
+For a resolution refer to Documentation/kbuild/kconfig-language.txt
+subsection "Kconfig recursive dependency limitations"
+Kconfig:60:error: recursive dependency detected!
+Kconfig:60:     symbol G depends on G
+For a resolution refer to Documentation/kbuild/kconfig-language.txt
+subsection "Kconfig recursive dependency limitations"
+Kconfig:51:error: recursive dependency detected!
+Kconfig:51:     symbol F2 depends on F1
+Kconfig:49:     symbol F1 default value contains F2
+For a resolution refer to Documentation/kbuild/kconfig-language.txt
+subsection "Kconfig recursive dependency limitations"
diff --git a/scripts/kconfig/tests/err_recursive_inc/Kconfig b/scripts/kconfig/tests/err_recursive_inc/Kconfig
new file mode 100644
index 000000000000..0e4c8750ab65
--- /dev/null
+++ b/scripts/kconfig/tests/err_recursive_inc/Kconfig
@@ -0,0 +1 @@
+source "Kconfig.inc1"
diff --git a/scripts/kconfig/tests/err_recursive_inc/Kconfig.inc1 b/scripts/kconfig/tests/err_recursive_inc/Kconfig.inc1
new file mode 100644
index 000000000000..00e408d653fc
--- /dev/null
+++ b/scripts/kconfig/tests/err_recursive_inc/Kconfig.inc1
@@ -0,0 +1,4 @@
+source "Kconfig.inc2"
diff --git a/scripts/kconfig/tests/err_recursive_inc/Kconfig.inc2 b/scripts/kconfig/tests/err_recursive_inc/Kconfig.inc2
new file mode 100644
index 000000000000..349ea2db15dc
--- /dev/null
+++ b/scripts/kconfig/tests/err_recursive_inc/Kconfig.inc2
@@ -0,0 +1,3 @@
+source "Kconfig.inc3"
diff --git a/scripts/kconfig/tests/err_recursive_inc/Kconfig.inc3 b/scripts/kconfig/tests/err_recursive_inc/Kconfig.inc3
new file mode 100644
index 000000000000..0e4c8750ab65
--- /dev/null
+++ b/scripts/kconfig/tests/err_recursive_inc/Kconfig.inc3
@@ -0,0 +1 @@
+source "Kconfig.inc1"
diff --git a/scripts/kconfig/tests/err_recursive_inc/__init__.py b/scripts/kconfig/tests/err_recursive_inc/__init__.py
new file mode 100644
index 000000000000..0e4c839c54aa
--- /dev/null
+++ b/scripts/kconfig/tests/err_recursive_inc/__init__.py
@@ -0,0 +1,10 @@
+"""
+Detect recursive inclusion error.
+If recursive inclusion is detected, it should fail with error messages.
+"""
+def test(conf):
+    assert conf.oldaskconfig() != 0
+    assert conf.stderr_contains('expected_stderr')
diff --git a/scripts/kconfig/tests/err_recursive_inc/expected_stderr b/scripts/kconfig/tests/err_recursive_inc/expected_stderr
new file mode 100644
index 000000000000..6b582eee2176
--- /dev/null
+++ b/scripts/kconfig/tests/err_recursive_inc/expected_stderr
@@ -0,0 +1,6 @@
+Recursive inclusion detected.
+Inclusion path:
+  current file : Kconfig.inc1
+  included from: Kconfig.inc3:1
+  included from: Kconfig.inc2:3
+  included from: Kconfig.inc1:4
diff --git a/scripts/kconfig/tests/inter_choice/Kconfig b/scripts/kconfig/tests/inter_choice/Kconfig
new file mode 100644
index 000000000000..e44449f075df
--- /dev/null
+++ b/scripts/kconfig/tests/inter_choice/Kconfig
@@ -0,0 +1,23 @@
+config MODULES
+        def_bool y
+        option modules
+choice
+        prompt "Choice"
+config CHOICE_VAL0
+        tristate "Choice 0"
+config CHOIVE_VAL1
+        tristate "Choice 1"
+endchoice
+choice
+        prompt "Another choice"
+        depends on CHOICE_VAL0
+config DUMMY
+        bool "dummy"
+endchoice
diff --git a/scripts/kconfig/tests/inter_choice/__init__.py b/scripts/kconfig/tests/inter_choice/__init__.py
new file mode 100644
index 000000000000..5c7fc365ed40
--- /dev/null
+++ b/scripts/kconfig/tests/inter_choice/__init__.py
@@ -0,0 +1,14 @@
+"""
+Do not affect user-assigned choice value by another choice.
+Handling of state flags for choices is complecated.  In old days,
+the defconfig result of a choice could be affected by another choice
+if those choices interact by 'depends on', 'select', etc.
+Related Linux commit: fbe98bb9ed3dae23e320c6b113e35f129538d14a
+"""
+def test(conf):
+    assert conf.defconfig('defconfig') == 0
+    assert conf.config_contains('expected_config')
diff --git a/scripts/kconfig/tests/inter_choice/defconfig b/scripts/kconfig/tests/inter_choice/defconfig
new file mode 100644
index 000000000000..162c4148e2a5
--- /dev/null
+++ b/scripts/kconfig/tests/inter_choice/defconfig
@@ -0,0 +1 @@
+CONFIG_CHOICE_VAL0=y
diff --git a/scripts/kconfig/tests/inter_choice/expected_config b/scripts/kconfig/tests/inter_choice/expected_config
new file mode 100644
index 000000000000..5dceefb054e3
--- /dev/null
+++ b/scripts/kconfig/tests/inter_choice/expected_config
@@ -0,0 +1,4 @@
+CONFIG_MODULES=y
+CONFIG_CHOICE_VAL0=y
+# CONFIG_CHOIVE_VAL1 is not set
+CONFIG_DUMMY=y
diff --git a/scripts/kconfig/tests/new_choice_with_dep/Kconfig b/scripts/kconfig/tests/new_choice_with_dep/Kconfig
new file mode 100644
index 000000000000..53ef1b86e7bf
--- /dev/null
+++ b/scripts/kconfig/tests/new_choice_with_dep/Kconfig
@@ -0,0 +1,37 @@
+config A
+        bool "A"
+        help
+          This is a new symbol.
+choice
+        prompt "Choice ?"
+        depends on A
+        help
+          "depends on A" has been newly added.
+config CHOICE_B
+        bool "Choice B"
+config CHOICE_C
+        bool "Choice C"
+        help
+          This is a new symbol, so should be asked.
+endchoice
+choice
+        prompt "Choice2 ?"
+config CHOICE_D
+        bool "Choice D"
+config CHOICE_E
+        bool "Choice E"
+config CHOICE_F
+        bool "Choice F"
+        depends on A
+        help
+          This is a new symbol, so should be asked.
+endchoice
diff --git a/scripts/kconfig/tests/new_choice_with_dep/__init__.py b/scripts/kconfig/tests/new_choice_with_dep/__init__.py
new file mode 100644
index 000000000000..f0e0ead0f32f
--- /dev/null
+++ b/scripts/kconfig/tests/new_choice_with_dep/__init__.py
@@ -0,0 +1,14 @@
+"""
+Ask new choice values when they become visible.
+If new choice values are added with new dependency, and they become
+visible during user configuration, oldconfig should recognize them
+as (NEW), and ask the user for choice.
+Related Linux commit: 5d09598d488f081e3be23f885ed65cbbe2d073b5
+"""
+def test(conf):
+    assert conf.oldconfig('config', 'y') == 0
+    assert conf.stdout_contains('expected_stdout')
diff --git a/scripts/kconfig/tests/new_choice_with_dep/config b/scripts/kconfig/tests/new_choice_with_dep/config
new file mode 100644
index 000000000000..47ef95d567fd
--- /dev/null
+++ b/scripts/kconfig/tests/new_choice_with_dep/config
@@ -0,0 +1,3 @@
+CONFIG_CHOICE_B=y
+# CONFIG_CHOICE_D is not set
+CONFIG_CHOICE_E=y
diff --git a/scripts/kconfig/tests/new_choice_with_dep/expected_stdout b/scripts/kconfig/tests/new_choice_with_dep/expected_stdout
new file mode 100644
index 000000000000..74dc0bcb22bc
--- /dev/null
+++ b/scripts/kconfig/tests/new_choice_with_dep/expected_stdout
@@ -0,0 +1,10 @@
+A (A) [N/y/?] (NEW) y
+  Choice ?
+  > 1. Choice B (CHOICE_B)
+    2. Choice C (CHOICE_C) (NEW)
+  choice[1-2?]: 
+Choice2 ?
+  1. Choice D (CHOICE_D)
+> 2. Choice E (CHOICE_E)
+  3. Choice F (CHOICE_F) (NEW)
+choice[1-3?]: 
diff --git a/scripts/kconfig/tests/no_write_if_dep_unmet/Kconfig b/scripts/kconfig/tests/no_write_if_dep_unmet/Kconfig
new file mode 100644
index 000000000000..c00b8fe54f45
--- /dev/null
+++ b/scripts/kconfig/tests/no_write_if_dep_unmet/Kconfig
@@ -0,0 +1,14 @@
+config A
+        bool "A"
+choice
+        prompt "Choice ?"
+        depends on A
+config CHOICE_B
+        bool "Choice B"
+config CHOICE_C
+        bool "Choice C"
+endchoice
diff --git a/scripts/kconfig/tests/no_write_if_dep_unmet/__init__.py b/scripts/kconfig/tests/no_write_if_dep_unmet/__init__.py
new file mode 100644
index 000000000000..207261b0fe00
--- /dev/null
+++ b/scripts/kconfig/tests/no_write_if_dep_unmet/__init__.py
@@ -0,0 +1,19 @@
+"""
+Do not write choice values to .config if the dependency is unmet.
+"# CONFIG_... is not set" should not be written into the .config file
+for symbols with unmet dependency.
+This was not working correctly for choice values because choice needs
+a bit different symbol computation.
+This checks that no unneeded "# COFIG_... is not set" is contained in
+the .config file.
+Related Linux commit: cb67ab2cd2b8abd9650292c986c79901e3073a59
+"""
+def test(conf):
+    assert conf.oldaskconfig('config', 'n') == 0
+    assert conf.config_matches('expected_config')
diff --git a/scripts/kconfig/tests/no_write_if_dep_unmet/config b/scripts/kconfig/tests/no_write_if_dep_unmet/config
new file mode 100644
index 000000000000..abd280e2f616
--- /dev/null
+++ b/scripts/kconfig/tests/no_write_if_dep_unmet/config
@@ -0,0 +1 @@
+CONFIG_A=y
diff --git a/scripts/kconfig/tests/no_write_if_dep_unmet/expected_config b/scripts/kconfig/tests/no_write_if_dep_unmet/expected_config
new file mode 100644
index 000000000000..473228810c35
--- /dev/null
+++ b/scripts/kconfig/tests/no_write_if_dep_unmet/expected_config
@@ -0,0 +1,5 @@
+#
+# Automatically generated file; DO NOT EDIT.
+# Main menu
+#
+# CONFIG_A is not set
diff --git a/scripts/kconfig/tests/preprocess/builtin_func/Kconfig b/scripts/kconfig/tests/preprocess/builtin_func/Kconfig
new file mode 100644
index 000000000000..baa328827911
--- /dev/null
+++ b/scripts/kconfig/tests/preprocess/builtin_func/Kconfig
@@ -0,0 +1,27 @@
+# SPDX-License-Identifier: GPL-2.0
+# 'info' prints the argument to stdout.
+$(info,hello world 0)
+# 'warning-if', if the first argument is y, sends the second argument to stderr,
+# and the message is prefixed with the current file name and line number.
+$(warning-if,y,hello world 1)
+# 'error-if' is similar, but it terminates the parsing immediately.
+# The following is just no-op since the first argument is not y.
+$(error-if,n,this should not be printed)
+# Shorthand
+warning = $(warning-if,y,$(1))
+# 'shell' executes a command, and returns its stdout.
+$(warning,$(shell,echo hello world 3))
+# Every newline in the output is replaced with a space,
+# but any trailing newlines are deleted.
+$(warning,$(shell,printf 'hello\nworld\n\n4\n\n\n'))
+# 'filename' is expanded to the currently parsed file name,
+# 'lineno' to the line number.
+$(warning,filename=$(filename))
+$(warning,lineno=$(lineno))
diff --git a/scripts/kconfig/tests/preprocess/builtin_func/__init__.py b/scripts/kconfig/tests/preprocess/builtin_func/__init__.py
new file mode 100644
index 000000000000..2e53ba08fca1
--- /dev/null
+++ b/scripts/kconfig/tests/preprocess/builtin_func/__init__.py
@@ -0,0 +1,9 @@
+# SPDX-License-Identifier: GPL-2.0
+"""
+Built-in function tests.
+"""
+def test(conf):
+    assert conf.oldaskconfig() == 0
+    assert conf.stdout_contains('expected_stdout')
+    assert conf.stderr_matches('expected_stderr')
diff --git a/scripts/kconfig/tests/preprocess/builtin_func/expected_stderr b/scripts/kconfig/tests/preprocess/builtin_func/expected_stderr
new file mode 100644
index 000000000000..33ea9ca38400
--- /dev/null
+++ b/scripts/kconfig/tests/preprocess/builtin_func/expected_stderr
@@ -0,0 +1,5 @@
+Kconfig:8: hello world 1
+Kconfig:18: hello world 3
+Kconfig:22: hello world  4
+Kconfig:26: filename=Kconfig
+Kconfig:27: lineno=27
diff --git a/scripts/kconfig/tests/preprocess/builtin_func/expected_stdout b/scripts/kconfig/tests/preprocess/builtin_func/expected_stdout
new file mode 100644
index 000000000000..82de3a7e97de
--- /dev/null
+++ b/scripts/kconfig/tests/preprocess/builtin_func/expected_stdout
@@ -0,0 +1 @@
+hello world 0
diff --git a/scripts/kconfig/tests/preprocess/circular_expansion/Kconfig b/scripts/kconfig/tests/preprocess/circular_expansion/Kconfig
new file mode 100644
index 000000000000..6838997c23ba
--- /dev/null
+++ b/scripts/kconfig/tests/preprocess/circular_expansion/Kconfig
@@ -0,0 +1,5 @@
+# SPDX-License-Identifier: GPL-2.0
+X = $(Y)
+Y = $(X)
+$(info $(X))
diff --git a/scripts/kconfig/tests/preprocess/circular_expansion/__init__.py b/scripts/kconfig/tests/preprocess/circular_expansion/__init__.py
new file mode 100644
index 000000000000..419bda3e075c
--- /dev/null
+++ b/scripts/kconfig/tests/preprocess/circular_expansion/__init__.py
@@ -0,0 +1,11 @@
+# SPDX-License-Identifier: GPL-2.0
+"""
+Detect circular variable expansion.
+If a recursively expanded variable references itself (eventually),
+it should fail with an error message.
+"""
+def test(conf):
+    assert conf.oldaskconfig() != 0
+    assert conf.stderr_matches('expected_stderr')
diff --git a/scripts/kconfig/tests/preprocess/circular_expansion/expected_stderr b/scripts/kconfig/tests/preprocess/circular_expansion/expected_stderr
new file mode 100644
index 000000000000..cde68fa989d0
--- /dev/null
+++ b/scripts/kconfig/tests/preprocess/circular_expansion/expected_stderr
@@ -0,0 +1 @@
+Kconfig:5: Recursive variable 'X' references itself (eventually)
diff --git a/scripts/kconfig/tests/preprocess/escape/Kconfig b/scripts/kconfig/tests/preprocess/escape/Kconfig
new file mode 100644
index 000000000000..4e3f44445544
--- /dev/null
+++ b/scripts/kconfig/tests/preprocess/escape/Kconfig
@@ -0,0 +1,44 @@
+# SPDX-License-Identifier: GPL-2.0
+# Shorthand
+warning = $(warning-if,y,$(1))
+# You can not pass commas directly to a function since they are treated as
+# delimiters. You can use the following trick to do so.
+comma   := ,
+$(warning,hello$(comma) world)
+# Like Make, single quotes, double quotes, spaces are treated verbatim.
+# The following prints the text as-is.
+$(warning,  ' " '"   ' ''' "'")
+# Unlike Make, '$' has special meaning only when it is followed by '('.
+# No need to escape '$' itself.
+$(warning,$)
+$(warning,$$)
+$ := 1
+$(warning,$($))
+# You need a trick to escape '$' followed by '('
+# The following should print "$(X)". It should not be expanded further.
+dollar := $
+$(warning,$(dollar)(X))
+# You need a trick to treat unbalanced parentheses.
+# The following should print "(".
+left_paren := (
+$(warning,$(left_paren))
+# A simple expanded should not be expanded multiple times.
+# The following should print "$(X)". It should not be expanded further.
+Y := $(dollar)(X)
+$(warning,$(Y))
+# The following should print "$(X)" as well.
+Y = $(dollar)(X)
+$(warning,$(Y))
+# The following should print "$(".
+# It should not be emit "unterminated reference" error.
+unterminated := $(dollar)(
+$(warning,$(unterminated))
diff --git a/scripts/kconfig/tests/preprocess/escape/__init__.py b/scripts/kconfig/tests/preprocess/escape/__init__.py
new file mode 100644
index 000000000000..7ee8e747f546
--- /dev/null
+++ b/scripts/kconfig/tests/preprocess/escape/__init__.py
@@ -0,0 +1,8 @@
+# SPDX-License-Identifier: GPL-2.0
+"""
+Escape sequence tests.
+"""
+def test(conf):
+    assert conf.oldaskconfig() == 0
+    assert conf.stderr_matches('expected_stderr')
diff --git a/scripts/kconfig/tests/preprocess/escape/expected_stderr b/scripts/kconfig/tests/preprocess/escape/expected_stderr
new file mode 100644
index 000000000000..1c00957ddaa9
--- /dev/null
+++ b/scripts/kconfig/tests/preprocess/escape/expected_stderr
@@ -0,0 +1,10 @@
+Kconfig:9: hello, world
+Kconfig:13:   ' " '"   ' ''' "'"
+Kconfig:17: $
+Kconfig:18: $$
+Kconfig:20: 1
+Kconfig:25: $(X)
+Kconfig:30: (
+Kconfig:35: $(X)
+Kconfig:39: $(X)
+Kconfig:44: $(
diff --git a/scripts/kconfig/tests/preprocess/variable/Kconfig b/scripts/kconfig/tests/preprocess/variable/Kconfig
new file mode 100644
index 000000000000..9ce2f95cbd24
--- /dev/null
+++ b/scripts/kconfig/tests/preprocess/variable/Kconfig
@@ -0,0 +1,53 @@
+# SPDX-License-Identifier: GPL-2.0
+# Shorthand
+warning = $(warning-if,y,$(1))
+# Simply expanded variable.
+X := 1
+SIMPLE := $(X)
+X := 2
+$(warning,SIMPLE = $(SIMPLE))
+# Recursively expanded variable.
+X := 1
+RECURSIVE = $(X)
+X := 2
+$(warning,RECURSIVE = $(RECURSIVE))
+# Append something to a simply expanded variable.
+Y := 3
+SIMPLE += $(Y)
+Y := 4
+$(warning,SIMPLE = $(SIMPLE))
+# Append something to a recursively expanded variable.
+Y := 3
+RECURSIVE += $(Y)
+Y := 4
+$(warning,RECURSIVE = $(RECURSIVE))
+# Use += operator to an undefined variable.
+# This works as a recursively expanded variable.
+Y := 3
+UNDEFINED_VARIABLE += $(Y)
+Y := 4
+$(warning,UNDEFINED_VARIABLE = $(UNDEFINED_VARIABLE))
+# You can use variable references for the lefthand side of assignment statement.
+X := A
+Y := B
+$(X)$(Y) := 5
+$(warning,AB = $(AB))
+# User-defined function.
+greeting = $(1), my name is $(2).
+$(warning,$(greeting,Hello,John))
+# The number of arguments is not checked for user-defined functions.
+# If some arguments are optional, it is useful to pass fewer parameters.
+# $(2) will be blank in this case.
+$(warning,$(greeting,Hello))
+# Unreferenced parameters are just ignored.
+$(warning,$(greeting,Hello,John,ignored,ignored))
diff --git a/scripts/kconfig/tests/preprocess/variable/__init__.py b/scripts/kconfig/tests/preprocess/variable/__init__.py
new file mode 100644
index 000000000000..e88b1708d6d4
--- /dev/null
+++ b/scripts/kconfig/tests/preprocess/variable/__init__.py
@@ -0,0 +1,8 @@
+# SPDX-License-Identifier: GPL-2.0
+"""
+Variable and user-defined function tests.
+"""
+def test(conf):
+    assert conf.oldaskconfig() == 0
+    assert conf.stderr_matches('expected_stderr')
diff --git a/scripts/kconfig/tests/preprocess/variable/expected_stderr b/scripts/kconfig/tests/preprocess/variable/expected_stderr
new file mode 100644
index 000000000000..a4841c3fdff5
--- /dev/null
+++ b/scripts/kconfig/tests/preprocess/variable/expected_stderr
@@ -0,0 +1,9 @@
+Kconfig:10: SIMPLE = 1
+Kconfig:16: RECURSIVE = 2
+Kconfig:22: SIMPLE = 1 3
+Kconfig:28: RECURSIVE = 2 4
+Kconfig:35: UNDEFINED_VARIABLE = 4
+Kconfig:41: AB = 5
+Kconfig:45: Hello, my name is John.
+Kconfig:50: Hello, my name is .
+Kconfig:53: Hello, my name is John.
diff --git a/scripts/kconfig/tests/pytest.ini b/scripts/kconfig/tests/pytest.ini
new file mode 100644
index 000000000000..85d7ce8e448b
--- /dev/null
+++ b/scripts/kconfig/tests/pytest.ini
@@ -0,0 +1,7 @@
+[pytest]
+addopts = --verbose
+# Pytest requires that test files have unique names, because pytest imports
+# them as top-level modules.  It is silly to prefix or suffix a test file with
+# the directory name that contains it.  Use __init__.py for all test files.
+python_files = __init__.py
diff --git a/scripts/kconfig/tests/rand_nested_choice/Kconfig b/scripts/kconfig/tests/rand_nested_choice/Kconfig
new file mode 100644
index 000000000000..c591d512929f
--- /dev/null
+++ b/scripts/kconfig/tests/rand_nested_choice/Kconfig
@@ -0,0 +1,33 @@
+choice
+        prompt "choice"
+config A
+        bool "A"
+config B
+        bool "B"
+if B
+choice
+        prompt "sub choice"
+config C
+        bool "C"
+config D
+        bool "D"
+if D
+choice
+        prompt "subsub choice"
+config E
+        bool "E"
+endchoice
+endif # D
+endchoice
+endif # B
+endchoice
diff --git a/scripts/kconfig/tests/rand_nested_choice/__init__.py b/scripts/kconfig/tests/rand_nested_choice/__init__.py
new file mode 100644
index 000000000000..e729a4e85218
--- /dev/null
+++ b/scripts/kconfig/tests/rand_nested_choice/__init__.py
@@ -0,0 +1,16 @@
+"""
+Set random values recursively in nested choices.
+Kconfig can create a choice-in-choice structure by using 'if' statement.
+randconfig should correctly set random choice values.
+Related Linux commit: 3b9a19e08960e5cdad5253998637653e592a3c29
+"""
+def test(conf):
+    for i in range(20):
+        assert conf.randconfig() == 0
+        assert (conf.config_contains('expected_stdout0') or
+                conf.config_contains('expected_stdout1') or
+                conf.config_contains('expected_stdout2'))
diff --git a/scripts/kconfig/tests/rand_nested_choice/expected_stdout0 b/scripts/kconfig/tests/rand_nested_choice/expected_stdout0
new file mode 100644
index 000000000000..05450f3d4eb5
--- /dev/null
+++ b/scripts/kconfig/tests/rand_nested_choice/expected_stdout0
@@ -0,0 +1,2 @@
+CONFIG_A=y
+# CONFIG_B is not set
diff --git a/scripts/kconfig/tests/rand_nested_choice/expected_stdout1 b/scripts/kconfig/tests/rand_nested_choice/expected_stdout1
new file mode 100644
index 000000000000..37ab29584157
--- /dev/null
+++ b/scripts/kconfig/tests/rand_nested_choice/expected_stdout1
@@ -0,0 +1,4 @@
+# CONFIG_A is not set
+CONFIG_B=y
+CONFIG_C=y
+# CONFIG_D is not set
diff --git a/scripts/kconfig/tests/rand_nested_choice/expected_stdout2 b/scripts/kconfig/tests/rand_nested_choice/expected_stdout2
new file mode 100644
index 000000000000..849ff47e9848
--- /dev/null
+++ b/scripts/kconfig/tests/rand_nested_choice/expected_stdout2
@@ -0,0 +1,5 @@
+# CONFIG_A is not set
+CONFIG_B=y
+# CONFIG_C is not set
+CONFIG_D=y
+CONFIG_E=y
diff --git a/scripts/kconfig/util.c b/scripts/kconfig/util.c
index c6f6e21b809f..d999683bb2a7 100644
--- a/scripts/kconfig/util.c
+++ b/scripts/kconfig/util.c
@@ -14,69 +14,21 @@
 struct file *file_lookup(const char *name)
 {
        struct file *file;
-        char *file_name = sym_expand_string_value(name);
        for (file = file_list; file; file = file->next) {
                if (!strcmp(name, file->name)) {
-                        free(file_name);
                        return file;
                }
        }
        file = xmalloc(sizeof(*file));
        memset(file, 0, sizeof(*file));
-        file->name = file_name;
+        file->name = xstrdup(name);
        file->next = file_list;
        file_list = file;
        return file;
 }
-/* write a dependency file as used by kbuild to track dependencies */
-int file_write_dep(const char *name)
-{
-        struct symbol *sym, *env_sym;
-        struct expr *e;
-        struct file *file;
-        FILE *out;
-        if (!name)
-                name = ".kconfig.d";
-        out = fopen("..config.tmp", "w");
-        if (!out)
-                return 1;
-        fprintf(out, "deps_config := \\\n");
-        for (file = file_list; file; file = file->next) {
-                if (file->next)
-                        fprintf(out, "\t%s \\\n", file->name);
-                else
-                        fprintf(out, "\t%s\n", file->name);
-        }
-        fprintf(out, "\n%s: \\\n"
-                     "\t$(deps_config)\n\n", conf_get_autoconfig_name());
-        expr_list_for_each_sym(sym_env_list, e, sym) {
-                struct property *prop;
-                const char *value;
-                prop = sym_get_env_prop(sym);
-                env_sym = prop_get_symbol(prop);
-                if (!env_sym)
-                        continue;
-                value = getenv(env_sym->name);
-                if (!value)
-                        value = "";
-                fprintf(out, "ifneq \"$(%s)\" \"%s\"\n", env_sym->name, value);
-                fprintf(out, "%s: FORCE\n", conf_get_autoconfig_name());
-                fprintf(out, "endif\n");
-        }
-        fprintf(out, "\n$(deps_config): ;\n");
-        fclose(out);
-        rename("..config.tmp", name);
-        return 0;
-}
 /* Allocate initial growable string */
 struct gstr str_new(void)
 {
@@ -165,3 +117,14 @@ char *xstrdup(const char *s)
        fprintf(stderr, "Out of memory.\n");
        exit(1);
 }
+char *xstrndup(const char *s, size_t n)
+{
+        char *p;
+        p = strndup(s, n);
+        if (p)
+                return p;
+        fprintf(stderr, "Out of memory.\n");
+        exit(1);
+}
diff --git a/scripts/kconfig/zconf.l b/scripts/kconfig/zconf.l
index 88b650eb9cc9..25bd2b89fe3f 100644
--- a/scripts/kconfig/zconf.l
+++ b/scripts/kconfig/zconf.l
@@ -1,13 +1,13 @@
 %option nostdinit noyywrap never-interactive full ecs
-%option 8bit nodefault perf-report perf-report
+%option 8bit nodefault yylineno
-%option noinput
+%x COMMAND HELP STRING PARAM ASSIGN_VAL
-%x COMMAND HELP STRING PARAM
 %{
 /*
 * Copyright (C) 2002 Roman Zippel <zippel@linux-m68k.org>
 * Released under the terms of the GNU GPL v2.0.
 */
+#include <assert.h>
 #include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -35,6 +35,8 @@ struct buffer *current_buf;
 static int last_ts, first_ts;
+static char *expand_token(const char *in, size_t n);
+static void append_expanded_string(const char *in);
 static void zconf_endhelp(void);
 static void zconf_endfile(void);
@@ -83,7 +85,6 @@ n	[A-Za-z0-9_-]
 [ \t]*#.*\n     |
 [ \t]*\n        {
-        current_file->lineno++;
        return T_EOL;
 }
 [ \t]*#.*
@@ -102,25 +103,45 @@ n	[A-Za-z0-9_-]
 <COMMAND>{
        {n}+    {
                const struct kconf_id *id = kconf_id_lookup(yytext, yyleng);
-                BEGIN(PARAM);
                current_pos.file = current_file;
-                current_pos.lineno = current_file->lineno;
+                current_pos.lineno = yylineno;
                if (id && id->flags & TF_COMMAND) {
+                        BEGIN(PARAM);
                        yylval.id = id;
                        return id->token;
                }
                alloc_string(yytext, yyleng);
                yylval.string = text;
-                return T_WORD;
+                return T_VARIABLE;
+        }
+        ({n}|$)+        {
+                /* this token includes at least one '$' */
+                yylval.string = expand_token(yytext, yyleng);
+                if (strlen(yylval.string))
+                        return T_VARIABLE;
+                free(yylval.string);
        }
+        "="     { BEGIN(ASSIGN_VAL); yylval.flavor = VAR_RECURSIVE; return T_ASSIGN; }
+        ":="    { BEGIN(ASSIGN_VAL); yylval.flavor = VAR_SIMPLE; return T_ASSIGN; }
+        "+="    { BEGIN(ASSIGN_VAL); yylval.flavor = VAR_APPEND; return T_ASSIGN; }
+        [[:blank:]]+
        .       warn_ignored_character(*yytext);
        \n      {
                BEGIN(INITIAL);
-                current_file->lineno++;
                return T_EOL;
        }
 }
+<ASSIGN_VAL>{
+        [^[:blank:]\n]+.*       {
+                alloc_string(yytext, yyleng);
+                yylval.string = text;
+                return T_ASSIGN_VAL;
+        }
+        \n      { BEGIN(INITIAL); return T_EOL; }
+        .
+}
 <PARAM>{
        "&&"    return T_AND;
        "||"    return T_OR;
@@ -138,7 +159,7 @@ n	[A-Za-z0-9_-]
                new_string();
                BEGIN(STRING);
        }
-        \n      BEGIN(INITIAL); current_file->lineno++; return T_EOL;
+        \n      BEGIN(INITIAL); return T_EOL;
        ({n}|[/.])+     {
                const struct kconf_id *id = kconf_id_lookup(yytext, yyleng);
                if (id && id->flags & TF_PARAM) {
@@ -149,8 +170,15 @@ n	[A-Za-z0-9_-]
                yylval.string = text;
                return T_WORD;
        }
+        ({n}|[/.$])+    {
+                /* this token includes at least one '$' */
+                yylval.string = expand_token(yytext, yyleng);
+                if (strlen(yylval.string))
+                        return T_WORD;
+                free(yylval.string);
+        }
        #.*     /* comment */
-        \\\n    current_file->lineno++;
+        \\\n    ;
        [[:blank:]]+
        .       warn_ignored_character(*yytext);
        <<EOF>> {
@@ -159,12 +187,13 @@ n	[A-Za-z0-9_-]
 }
 <STRING>{
-        [^'"\\\n]+/\n   {
+        "$".*   append_expanded_string(yytext);
+        [^$'"\\\n]+/\n  {
                append_string(yytext, yyleng);
                yylval.string = text;
                return T_WORD_QUOTE;
        }
-        [^'"\\\n]+      {
+        [^$'"\\\n]+     {
                append_string(yytext, yyleng);
        }
        \\.?/\n {
@@ -187,7 +216,6 @@ n	[A-Za-z0-9_-]
                fprintf(stderr,
                        "%s:%d:warning: multi-line strings not supported\n",
                        zconf_curname(), zconf_lineno());
-                current_file->lineno++;
                BEGIN(INITIAL);
                return T_EOL;
        }
@@ -220,12 +248,10 @@ n	[A-Za-z0-9_-]
                }
        }
        [ \t]*\n/[^ \t\n] {
-                current_file->lineno++;
                zconf_endhelp();
                return T_HELPTEXT;
        }
        [ \t]*\n        {
-                current_file->lineno++;
                append_string("\n", 1);
        }
        [^ \t\n].* {
@@ -254,6 +280,58 @@ n	[A-Za-z0-9_-]
 }
 %%
+static char *expand_token(const char *in, size_t n)
+{
+        char *out;
+        int c;
+        char c2;
+        const char *rest, *end;
+        new_string();
+        append_string(in, n);
+        /* get the whole line because we do not know the end of token. */
+        while ((c = input()) != EOF) {
+                if (c == '\n') {
+                        unput(c);
+                        break;
+                }
+                c2 = c;
+                append_string(&c2, 1);
+        }
+        rest = text;
+        out = expand_one_token(&rest);
+        /* push back unused characters to the input stream */
+        end = rest + strlen(rest);
+        while (end > rest)
+                unput(*--end);
+        free(text);
+        return out;
+}
+static void append_expanded_string(const char *str)
+{
+        const char *end;
+        char *res;
+        str++;
+        res = expand_dollar(&str);
+        /* push back unused characters to the input stream */
+        end = str + strlen(str);
+        while (end > str)
+                unput(*--end);
+        append_string(res, strlen(res));
+        free(res);
+}
 void zconf_starthelp(void)
 {
        new_string();
@@ -304,7 +382,7 @@ void zconf_initscan(const char *name)
        memset(current_buf, 0, sizeof(*current_buf));
        current_file = file_lookup(name);
-        current_file->lineno = 1;
+        yylineno = 1;
 }
 void zconf_nextfile(const char *name)
@@ -325,24 +403,26 @@ void zconf_nextfile(const char *name)
        buf->parent = current_buf;
        current_buf = buf;
-        for (iter = current_file->parent; iter; iter = iter->parent ) {
+        current_file->lineno = yylineno;
-                if (!strcmp(current_file->name,iter->name) ) {
+        file->parent = current_file;
+        for (iter = current_file; iter; iter = iter->parent) {
+                if (!strcmp(iter->name, file->name)) {
                        fprintf(stderr,
-                                "%s:%d: recursive inclusion detected. "
+                                "Recursive inclusion detected.\n"
-                                "Inclusion path:\n  current file : '%s'\n",
+                                "Inclusion path:\n"
-                                zconf_curname(), zconf_lineno(),
+                                "  current file : %s\n", file->name);
-                                zconf_curname());
+                        iter = file;
-                        iter = current_file;
                        do {
                                iter = iter->parent;
-                                fprintf(stderr, "  included from: '%s:%d'\n",
+                                fprintf(stderr, "  included from: %s:%d\n",
                                        iter->name, iter->lineno - 1);
-                        } while (strcmp(iter->name, current_file->name));
+                        } while (strcmp(iter->name, file->name));
                        exit(1);
                }
        }
-        file->lineno = 1;
-        file->parent = current_file;
+        yylineno = 1;
        current_file = file;
 }
@@ -351,6 +431,8 @@ static void zconf_endfile(void)
        struct buffer *parent;
        current_file = current_file->parent;
+        if (current_file)
+                yylineno = current_file->lineno;
        parent = current_buf->parent;
        if (parent) {
diff --git a/scripts/kconfig/zconf.y b/scripts/kconfig/zconf.y
index ad6305b0f40c..22fceb264cf5 100644
--- a/scripts/kconfig/zconf.y
+++ b/scripts/kconfig/zconf.y
@@ -31,7 +31,7 @@ struct symbol *symbol_hash[SYMBOL_HASHSIZE];
 static struct menu *current_menu, *current_entry;
 %}
-%expect 32
+%expect 30
 %union
 {
@@ -41,6 +41,7 @@ static struct menu *current_menu, *current_entry;
        struct expr *expr;
        struct menu *menu;
        const struct kconf_id *id;
+        enum variable_flavor flavor;
 }
 %token <id>T_MAINMENU
@@ -77,6 +78,9 @@ static struct menu *current_menu, *current_entry;
 %token T_CLOSE_PAREN
 %token T_OPEN_PAREN
 %token T_EOL
+%token <string> T_VARIABLE
+%token <flavor> T_ASSIGN
+%token <string> T_ASSIGN_VAL
 %left T_OR
 %left T_AND
@@ -92,7 +96,7 @@ static struct menu *current_menu, *current_entry;
 %type <id> end
 %type <id> option_name
 %type <menu> if_entry menu_entry choice_entry
-%type <string> symbol_option_arg word_opt
+%type <string> symbol_option_arg word_opt assign_val
 %destructor {
        fprintf(stderr, "%s:%d: missing end statement for this entry\n",
@@ -109,28 +113,15 @@ static struct menu *current_menu, *current_entry;
 %%
 input: nl start | start;
-start: mainmenu_stmt stmt_list | no_mainmenu_stmt stmt_list;
+start: mainmenu_stmt stmt_list | stmt_list;
 /* mainmenu entry */
-mainmenu_stmt: T_MAINMENU prompt nl
+mainmenu_stmt: T_MAINMENU prompt T_EOL
 {
        menu_add_prompt(P_MENU, $2, NULL);
 };
-/* Default main menu, if there's no mainmenu entry */
-no_mainmenu_stmt: /* empty */
-{
-        /*
-         * Hack: Keep the main menu title on the heap so we can safely free it
-         * later regardless of whether it comes from the 'prompt' in
-         * mainmenu_stmt or here
-         */
-        menu_add_prompt(P_MENU, xstrdup("Linux Kernel Configuration"), NULL);
-};
 stmt_list:
          /* empty */
        | stmt_list common_stmt
@@ -156,6 +147,7 @@ common_stmt:
        | config_stmt
        | menuconfig_stmt
        | source_stmt
+        | assignment_stmt
 ;
 option_error:
@@ -273,7 +265,7 @@ symbol_option_arg:
 choice: T_CHOICE word_opt T_EOL
 {
        struct symbol *sym = sym_lookup($2, SYMBOL_CHOICE);
-        sym->flags |= SYMBOL_AUTO;
+        sym->flags |= SYMBOL_NO_WRITE;
        menu_add_entry(sym);
        menu_add_expr(P_CHOICE, NULL, NULL);
        free($2);
@@ -345,7 +337,7 @@ choice_block:
 /* if entry */
-if_entry: T_IF expr nl
+if_entry: T_IF expr T_EOL
 {
        printd(DEBUG_PARSE, "%s:%d:if\n", zconf_curname(), zconf_lineno());
        menu_add_entry(NULL);
@@ -524,31 +516,42 @@ symbol:	  nonconst_symbol
 word_opt: /* empty */                   { $$ = NULL; }
        | T_WORD
+/* assignment statement */
+assignment_stmt:  T_VARIABLE T_ASSIGN assign_val T_EOL  { variable_add($1, $3, $2); free($1); free($3); }
+assign_val:
+        /* empty */             { $$ = xstrdup(""); };
+        | T_ASSIGN_VAL
+;
 %%
 void conf_parse(const char *name)
 {
-        const char *tmp;
        struct symbol *sym;
        int i;
        zconf_initscan(name);
-        sym_init();
        _menu_init();
        if (getenv("ZCONF_DEBUG"))
                yydebug = 1;
        yyparse();
+        /* Variables are expanded in the parse phase. We can free them here. */
+        variable_all_del();
        if (yynerrs)
                exit(1);
        if (!modules_sym)
                modules_sym = sym_find( "n" );
-        tmp = rootmenu.prompt->text;
+        if (!menu_has_prompt(&rootmenu)) {
-        rootmenu.prompt->text = _(rootmenu.prompt->text);
+                current_entry = &rootmenu;
-        rootmenu.prompt->text = sym_expand_string_value(rootmenu.prompt->text);
+                menu_add_prompt(P_MENU, "Main menu", NULL);
-        free((char*)tmp);
+        }
        menu_finalize(&rootmenu);
        for_all_symbols(i, sym) {
@@ -714,6 +717,10 @@ static void print_symbol(FILE *out, struct menu *menu)
                        print_quoted_string(out, prop->text);
                        fputc('\n', out);
                        break;
+                case P_SYMBOL:
+                        fputs( "  symbol ", out);
+                        fprintf(out, "%s\n", prop->sym->name);
+                        break;
                default:
                        fprintf(out, "  unknown prop %d!\n", prop->type);
                        break;
@@ -780,3 +787,4 @@ void zconfdump(FILE *out)
 #include "expr.c"
 #include "symbol.c"
 #include "menu.c"
+#include "preprocess.c"
diff --git a/scripts/kernel-doc b/scripts/kernel-doc
index fee8952037b1..ffbe901a37b5 100755
--- a/scripts/kernel-doc
+++ b/scripts/kernel-doc
@@ -1,4 +1,5 @@
 #!/usr/bin/env perl
+# SPDX-License-Identifier: GPL-2.0
 use warnings;
 use strict;
@@ -328,13 +329,15 @@ my $lineprefix="";
 use constant {
    STATE_NORMAL        => 0, # normal code
    STATE_NAME          => 1, # looking for function name
-    STATE_FIELD         => 2, # scanning field start
+    STATE_BODY_MAYBE    => 2, # body - or maybe more description
-    STATE_PROTO         => 3, # scanning prototype
+    STATE_BODY          => 3, # the body of the comment
-    STATE_DOCBLOCK      => 4, # documentation block
+    STATE_PROTO         => 4, # scanning prototype
-    STATE_INLINE        => 5, # gathering documentation outside main block
+    STATE_DOCBLOCK      => 5, # documentation block
+    STATE_INLINE        => 6, # gathering documentation outside main block
 };
 my $state;
 my $in_doc_sect;
+my $leading_space;
 # Inline documentation state
 use constant {
@@ -363,7 +366,7 @@ my $doc_sect = $doc_com .
 my $doc_content = $doc_com_body . '(.*)';
 my $doc_block = $doc_com . 'DOC:\s*(.*)?';
 my $doc_inline_start = '^\s*/\*\*\s*$';
-my $doc_inline_sect = '\s*\*\s*(@[\w\s]+):(.*)';
+my $doc_inline_sect = '\s*\*\s*(@\s*[\w][\w\.]*\s*):(.*)';
 my $doc_inline_end = '^\s*\*/\s*$';
 my $doc_inline_oneline = '^\s*/\*\*\s*(@[\w\s]+):\s*(.*)\s*\*/\s*$';
 my $export_symbol = '^\s*EXPORT_SYMBOL(_GPL)?\s*\(\s*(\w+)\s*\)\s*;';
@@ -553,10 +556,9 @@ sub output_highlight {
        }
        if ($line eq ""){
            if (! $output_preformatted) {
-                print $lineprefix, local_unescape($blankline);
+                print $lineprefix, $blankline;
            }
        } else {
-            $line =~ s/\\\\\\/\&/g;
            if ($output_mode eq "man" && substr($line, 0, 1) eq ".") {
                print "\\&$line";
            } else {
@@ -747,17 +749,73 @@ sub output_blockhead_rst(%) {
    }
 }
-sub output_highlight_rst {
+#
-    my $contents = join "\n",@_;
+# Apply the RST highlights to a sub-block of text.
-    my $line;
+#   
+sub highlight_block($) {
-    # undo the evil effects of xml_escape() earlier
+    # The dohighlight kludge requires the text be called $contents
-    $contents = xml_unescape($contents);
+    my $contents = shift;
    eval $dohighlight;
    die $@ if $@;
+    return $contents;
+}
-    foreach $line (split "\n", $contents) {
+#
+# Regexes used only here.
+#
+my $sphinx_literal = '^[^.].*::$';
+my $sphinx_cblock = '^\.\.\ +code-block::';
+sub output_highlight_rst {
+    my $input = join "\n",@_;
+    my $output = "";
+    my $line;
+    my $in_literal = 0;
+    my $litprefix;
+    my $block = "";
+    foreach $line (split "\n",$input) {
+        #
+        # If we're in a literal block, see if we should drop out
+        # of it.  Otherwise pass the line straight through unmunged.
+        #
+        if ($in_literal) {
+            if (! ($line =~ /^\s*$/)) {
+                #
+                # If this is the first non-blank line in a literal
+                # block we need to figure out what the proper indent is.
+                #
+                if ($litprefix eq "") {
+                    $line =~ /^(\s*)/;
+                    $litprefix = '^' . $1;
+                    $output .= $line . "\n";
+                } elsif (! ($line =~ /$litprefix/)) {
+                    $in_literal = 0;
+                } else {
+                    $output .= $line . "\n";
+                }
+            } else {
+                $output .= $line . "\n";
+            }
+        }
+        #
+        # Not in a literal block (or just dropped out)
+        #
+        if (! $in_literal) {
+            $block .= $line . "\n";
+            if (($line =~ /$sphinx_literal/) || ($line =~ /$sphinx_cblock/)) {
+                $in_literal = 1;
+                $litprefix = "";
+                $output .= highlight_block($block);
+                $block = ""
+            }
+        }
+    }
+    if ($block) {
+        $output .= highlight_block($block);
+    }
+    foreach $line (split "\n", $output) {
        print $lineprefix . $line . "\n";
    }
 }
@@ -1004,7 +1062,7 @@ sub dump_struct($$) {
    my $x = shift;
    my $file = shift;
-    if ($x =~ /(struct|union)\s+(\w+)\s*{(.*)}/) {
+    if ($x =~ /(struct|union)\s+(\w+)\s*\{(.*)\}/) {
        my $decl_type = $1;
        $declaration_name = $2;
        my $members = $3;
@@ -1062,7 +1120,7 @@ sub dump_struct($$) {
                                        # Handle bitmaps
                                        $arg =~ s/:\s*\d+\s*//g;
                                        # Handle arrays
-                                        $arg =~ s/\[\S+\]//g;
+                                        $arg =~ s/\[.*\]//g;
                                        # The type may have multiple words,
                                        # and multiple IDs can be defined, like:
                                        #       const struct foo, *bar, foobar
@@ -1090,20 +1148,20 @@ sub dump_struct($$) {
                                }
                        }
                }
-                $members =~ s/(struct|union)([^\{\};]+)\{([^\{\}]*)}([^\{\}\;]*)\;/$newmember/;
+                $members =~ s/(struct|union)([^\{\};]+)\{([^\{\}]*)\}([^\{\}\;]*)\;/$newmember/;
        }
        # Ignore other nested elements, like enums
-        $members =~ s/({[^\{\}]*})//g;
+        $members =~ s/(\{[^\{\}]*\})//g;
        create_parameterlist($members, ';', $file, $declaration_name);
        check_sections($file, $declaration_name, $decl_type, $sectcheck, $struct_actual);
        # Adjust declaration for better display
-        $declaration =~ s/([{;])/$1\n/g;
+        $declaration =~ s/([\{;])/$1\n/g;
-        $declaration =~ s/}\s+;/};/g;
+        $declaration =~ s/\}\s+;/};/g;
        # Better handle inlined enums
-        do {} while ($declaration =~ s/(enum\s+{[^}]+),([^\n])/$1,\n$2/);
+        do {} while ($declaration =~ s/(enum\s+\{[^\}]+),([^\n])/$1,\n$2/);
        my @def_args = split /\n/, $declaration;
        my $level = 1;
@@ -1113,12 +1171,12 @@ sub dump_struct($$) {
                $clause =~ s/\s+$//;
                $clause =~ s/\s+/ /;
                next if (!$clause);
-                $level-- if ($clause =~ m/(})/ && $level > 1);
+                $level-- if ($clause =~ m/(\})/ && $level > 1);
                if (!($clause =~ m/^\s*#/)) {
                        $declaration .= "\t" x $level;
                }
                $declaration .= "\t" . $clause . "\n";
-                $level++ if ($clause =~ m/({)/ && !($clause =~m/}/));
+                $level++ if ($clause =~ m/(\{)/ && !($clause =~m/\}/));
        }
        output_declaration($declaration_name,
                           'struct',
@@ -1186,7 +1244,7 @@ sub dump_enum($$) {
    # strip #define macros inside enums
    $x =~ s@#\s*((define|ifdef)\s+|endif)[^;]*;@@gos;
-    if ($x =~ /enum\s+(\w+)\s*{(.*)}/) {
+    if ($x =~ /enum\s+(\w+)\s*\{(.*)\}/) {
        $declaration_name = $1;
        my $members = $2;
        my %_members;
@@ -1422,8 +1480,6 @@ sub push_parameter($$$$) {
                }
        }
-        $param = xml_escape($param);
        # strip spaces from $param so that it is one continuous string
        # on @parameterlist;
        # this fixes a problem where check_sections() cannot find
@@ -1522,6 +1578,7 @@ sub dump_function($$) {
    $prototype =~ s/__meminit +//;
    $prototype =~ s/__must_check +//;
    $prototype =~ s/__weak +//;
+    $prototype =~ s/__sched +//;
    my $define = $prototype =~ s/^#\s*define\s+//; #ak added
    $prototype =~ s/__attribute__\s*\(\(
            (?:
@@ -1728,7 +1785,7 @@ sub process_proto_type($$) {
    }
    while (1) {
-        if ( $x =~ /([^{};]*)([{};])(.*)/ ) {
+        if ( $x =~ /([^\{\};]*)([\{\};])(.*)/ ) {
            if( length $prototype ) {
                $prototype .= " "
            }
@@ -1748,47 +1805,6 @@ sub process_proto_type($$) {
    }
 }
-# xml_escape: replace <, >, and & in the text stream;
-#
-# however, formatting controls that are generated internally/locally in the
-# kernel-doc script are not escaped here; instead, they begin life like
-# $blankline_html (4 of '\' followed by a mnemonic + ':'), then these strings
-# are converted to their mnemonic-expected output, without the 4 * '\' & ':',
-# just before actual output; (this is done by local_unescape())
-sub xml_escape($) {
-        my $text = shift;
-        if ($output_mode eq "man") {
-                return $text;
-        }
-        $text =~ s/\&/\\\\\\amp;/g;
-        $text =~ s/\</\\\\\\lt;/g;
-        $text =~ s/\>/\\\\\\gt;/g;
-        return $text;
-}
-# xml_unescape: reverse the effects of xml_escape
-sub xml_unescape($) {
-        my $text = shift;
-        if ($output_mode eq "man") {
-                return $text;
-        }
-        $text =~ s/\\\\\\amp;/\&/g;
-        $text =~ s/\\\\\\lt;/</g;
-        $text =~ s/\\\\\\gt;/>/g;
-        return $text;
-}
-# convert local escape strings to html
-# local escape strings look like:  '\\\\menmonic:' (that's 4 backslashes)
-sub local_unescape($) {
-        my $text = shift;
-        if ($output_mode eq "man") {
-                return $text;
-        }
-        $text =~ s/\\\\\\\\lt:/</g;
-        $text =~ s/\\\\\\\\gt:/>/g;
-        return $text;
-}
 sub map_filename($) {
    my $file;
@@ -1826,15 +1842,291 @@ sub process_export_file($) {
    close(IN);
 }
-sub process_file($) {
+#
-    my $file;
+# Parsers for the various processing states.
+#
+# STATE_NORMAL: looking for the /** to begin everything.
+#
+sub process_normal() {
+    if (/$doc_start/o) {
+        $state = STATE_NAME;    # next line is always the function name
+        $in_doc_sect = 0;
+        $declaration_start_line = $. + 1;
+    }
+}
+#
+# STATE_NAME: Looking for the "name - description" line
+#
+sub process_name($$) {
+    my $file = shift;
    my $identifier;
-    my $func;
    my $descr;
-    my $in_purpose = 0;
+    if (/$doc_block/o) {
+        $state = STATE_DOCBLOCK;
+        $contents = "";
+        $new_start_line = $. + 1;
+        if ( $1 eq "" ) {
+            $section = $section_intro;
+        } else {
+            $section = $1;
+        }
+    }
+    elsif (/$doc_decl/o) {
+        $identifier = $1;
+        if (/\s*([\w\s]+?)(\(\))?\s*-/) {
+            $identifier = $1;
+        }
+        $state = STATE_BODY;
+        # if there's no @param blocks need to set up default section
+        # here
+        $contents = "";
+        $section = $section_default;
+        $new_start_line = $. + 1;
+        if (/-(.*)/) {
+            # strip leading/trailing/multiple spaces
+            $descr= $1;
+            $descr =~ s/^\s*//;
+            $descr =~ s/\s*$//;
+            $descr =~ s/\s+/ /g;
+            $declaration_purpose = $descr;
+            $state = STATE_BODY_MAYBE;
+        } else {
+            $declaration_purpose = "";
+        }
+        if (($declaration_purpose eq "") && $verbose) {
+            print STDERR "${file}:$.: warning: missing initial short description on line:\n";
+            print STDERR $_;
+            ++$warnings;
+        }
+        if ($identifier =~ m/^struct\b/) {
+            $decl_type = 'struct';
+        } elsif ($identifier =~ m/^union\b/) {
+            $decl_type = 'union';
+        } elsif ($identifier =~ m/^enum\b/) {
+            $decl_type = 'enum';
+        } elsif ($identifier =~ m/^typedef\b/) {
+            $decl_type = 'typedef';
+        } else {
+            $decl_type = 'function';
+        }
+        if ($verbose) {
+            print STDERR "${file}:$.: info: Scanning doc for $identifier\n";
+        }
+    } else {
+        print STDERR "${file}:$.: warning: Cannot understand $_ on line $.",
+            " - I thought it was a doc line\n";
+        ++$warnings;
+        $state = STATE_NORMAL;
+    }
+}
+#
+# STATE_BODY and STATE_BODY_MAYBE: the bulk of a kerneldoc comment.
+#
+sub process_body($$) {
+    my $file = shift;
+    if (/$doc_sect/i) { # case insensitive for supported section names
+        $newsection = $1;
+        $newcontents = $2;
+        # map the supported section names to the canonical names
+        if ($newsection =~ m/^description$/i) {
+            $newsection = $section_default;
+        } elsif ($newsection =~ m/^context$/i) {
+            $newsection = $section_context;
+        } elsif ($newsection =~ m/^returns?$/i) {
+            $newsection = $section_return;
+        } elsif ($newsection =~ m/^\@return$/) {
+            # special: @return is a section, not a param description
+            $newsection = $section_return;
+        }
+        if (($contents ne "") && ($contents ne "\n")) {
+            if (!$in_doc_sect && $verbose) {
+                print STDERR "${file}:$.: warning: contents before sections\n";
+                ++$warnings;
+            }
+            dump_section($file, $section, $contents);
+            $section = $section_default;
+        }
+        $in_doc_sect = 1;
+        $state = STATE_BODY;
+        $contents = $newcontents;
+        $new_start_line = $.;
+        while (substr($contents, 0, 1) eq " ") {
+            $contents = substr($contents, 1);
+        }
+        if ($contents ne "") {
+            $contents .= "\n";
+        }
+        $section = $newsection;
+        $leading_space = undef;
+    } elsif (/$doc_end/) {
+        if (($contents ne "") && ($contents ne "\n")) {
+            dump_section($file, $section, $contents);
+            $section = $section_default;
+            $contents = "";
+        }
+        # look for doc_com + <text> + doc_end:
+        if ($_ =~ m'\s*\*\s*[a-zA-Z_0-9:\.]+\*/') {
+            print STDERR "${file}:$.: warning: suspicious ending line: $_";
+            ++$warnings;
+        }
+        $prototype = "";
+        $state = STATE_PROTO;
+        $brcount = 0;
+    } elsif (/$doc_content/) {
+        # miguel-style comment kludge, look for blank lines after
+        # @parameter line to signify start of description
+        if ($1 eq "") {
+            if ($section =~ m/^@/ || $section eq $section_context) {
+                dump_section($file, $section, $contents);
+                $section = $section_default;
+                $contents = "";
+                $new_start_line = $.;
+            } else {
+                $contents .= "\n";
+            }
+            $state = STATE_BODY;
+        } elsif ($state == STATE_BODY_MAYBE) {
+            # Continued declaration purpose
+            chomp($declaration_purpose);
+            $declaration_purpose .= " " . $1;
+            $declaration_purpose =~ s/\s+/ /g;
+        } else {
+            my $cont = $1;
+            if ($section =~ m/^@/ || $section eq $section_context) {
+                if (!defined $leading_space) {
+                    if ($cont =~ m/^(\s+)/) {
+                        $leading_space = $1;
+                    } else {
+                        $leading_space = "";
+                    }
+                }
+                $cont =~ s/^$leading_space//;
+            }
+            $contents .= $cont . "\n";
+        }
+    } else {
+        # i dont know - bad line?  ignore.
+        print STDERR "${file}:$.: warning: bad line: $_";
+        ++$warnings;
+    }
+}
+#
+# STATE_PROTO: reading a function/whatever prototype.
+#
+sub process_proto($$) {
+    my $file = shift;
+    if (/$doc_inline_oneline/) {
+        $section = $1;
+        $contents = $2;
+        if ($contents ne "") {
+            $contents .= "\n";
+            dump_section($file, $section, $contents);
+            $section = $section_default;
+            $contents = "";
+        }
+    } elsif (/$doc_inline_start/) {
+        $state = STATE_INLINE;
+        $inline_doc_state = STATE_INLINE_NAME;
+    } elsif ($decl_type eq 'function') {
+        process_proto_function($_, $file);
+    } else {
+        process_proto_type($_, $file);
+    }
+}
+#
+# STATE_DOCBLOCK: within a DOC: block.
+#
+sub process_docblock($$) {
+    my $file = shift;
+    if (/$doc_end/) {
+        dump_doc_section($file, $section, $contents);
+        $section = $section_default;
+        $contents = "";
+        $function = "";
+        %parameterdescs = ();
+        %parametertypes = ();
+        @parameterlist = ();
+        %sections = ();
+        @sectionlist = ();
+        $prototype = "";
+        $state = STATE_NORMAL;
+    } elsif (/$doc_content/) {
+        if ( $1 eq "" ) {
+            $contents .= $blankline;
+        } else {
+            $contents .= $1 . "\n";
+        }
+    }
+}
+#
+# STATE_INLINE: docbook comments within a prototype.
+#
+sub process_inline($$) {
+    my $file = shift;
+    # First line (state 1) needs to be a @parameter
+    if ($inline_doc_state == STATE_INLINE_NAME && /$doc_inline_sect/o) {
+        $section = $1;
+        $contents = $2;
+        $new_start_line = $.;
+        if ($contents ne "") {
+            while (substr($contents, 0, 1) eq " ") {
+                $contents = substr($contents, 1);
+            }
+            $contents .= "\n";
+        }
+        $inline_doc_state = STATE_INLINE_TEXT;
+        # Documentation block end */
+    } elsif (/$doc_inline_end/) {
+        if (($contents ne "") && ($contents ne "\n")) {
+            dump_section($file, $section, $contents);
+            $section = $section_default;
+            $contents = "";
+        }
+        $state = STATE_PROTO;
+        $inline_doc_state = STATE_INLINE_NA;
+        # Regular text
+    } elsif (/$doc_content/) {
+        if ($inline_doc_state == STATE_INLINE_TEXT) {
+            $contents .= $1 . "\n";
+            # nuke leading blank lines
+            if ($contents =~ /^\s*$/) {
+                $contents = "";
+            }
+        } elsif ($inline_doc_state == STATE_INLINE_NAME) {
+            $inline_doc_state = STATE_INLINE_ERROR;
+            print STDERR "${file}:$.: warning: ";
+            print STDERR "Incorrect use of kernel-doc format: $_";
+            ++$warnings;
+        }
+    }
+}
+sub process_file($) {
+    my $file;
    my $initial_section_counter = $section_counter;
    my ($orig_file) = @_;
-    my $leading_space;
    $file = map_filename($orig_file);
@@ -1853,250 +2145,23 @@ sub process_file($) {
        }
        # Replace tabs by spaces
        while ($_ =~ s/\t+/' ' x (length($&) * 8 - length($`) % 8)/e) {};
+        # Hand this line to the appropriate state handler
        if ($state == STATE_NORMAL) {
-            if (/$doc_start/o) {
+            process_normal();
-                $state = STATE_NAME;    # next line is always the function name
+        } elsif ($state == STATE_NAME) {
-                $in_doc_sect = 0;
+            process_name($file, $_);
-                $declaration_start_line = $. + 1;
+        } elsif ($state == STATE_BODY || $state == STATE_BODY_MAYBE) {
-            }
+            process_body($file, $_);
-        } elsif ($state == STATE_NAME) {# this line is the function name (always)
-            if (/$doc_block/o) {
-                $state = STATE_DOCBLOCK;
-                $contents = "";
-                $new_start_line = $. + 1;
-                if ( $1 eq "" ) {
-                        $section = $section_intro;
-                } else {
-                        $section = $1;
-                }
-            }
-            elsif (/$doc_decl/o) {
-                $identifier = $1;
-                if (/\s*([\w\s]+?)\s*-/) {
-                    $identifier = $1;
-                }
-                $state = STATE_FIELD;
-                # if there's no @param blocks need to set up default section
-                # here
-                $contents = "";
-                $section = $section_default;
-                $new_start_line = $. + 1;
-                if (/-(.*)/) {
-                    # strip leading/trailing/multiple spaces
-                    $descr= $1;
-                    $descr =~ s/^\s*//;
-                    $descr =~ s/\s*$//;
-                    $descr =~ s/\s+/ /g;
-                    $declaration_purpose = xml_escape($descr);
-                    $in_purpose = 1;
-                } else {
-                    $declaration_purpose = "";
-                }
-                if (($declaration_purpose eq "") && $verbose) {
-                        print STDERR "${file}:$.: warning: missing initial short description on line:\n";
-                        print STDERR $_;
-                        ++$warnings;
-                }
-                if ($identifier =~ m/^struct/) {
-                    $decl_type = 'struct';
-                } elsif ($identifier =~ m/^union/) {
-                    $decl_type = 'union';
-                } elsif ($identifier =~ m/^enum/) {
-                    $decl_type = 'enum';
-                } elsif ($identifier =~ m/^typedef/) {
-                    $decl_type = 'typedef';
-                } else {
-                    $decl_type = 'function';
-                }
-                if ($verbose) {
-                    print STDERR "${file}:$.: info: Scanning doc for $identifier\n";
-                }
-            } else {
-                print STDERR "${file}:$.: warning: Cannot understand $_ on line $.",
-                " - I thought it was a doc line\n";
-                ++$warnings;
-                $state = STATE_NORMAL;
-            }
-        } elsif ($state == STATE_FIELD) {       # look for head: lines, and include content
-            if (/$doc_sect/i) { # case insensitive for supported section names
-                $newsection = $1;
-                $newcontents = $2;
-                # map the supported section names to the canonical names
-                if ($newsection =~ m/^description$/i) {
-                    $newsection = $section_default;
-                } elsif ($newsection =~ m/^context$/i) {
-                    $newsection = $section_context;
-                } elsif ($newsection =~ m/^returns?$/i) {
-                    $newsection = $section_return;
-                } elsif ($newsection =~ m/^\@return$/) {
-                    # special: @return is a section, not a param description
-                    $newsection = $section_return;
-                }
-                if (($contents ne "") && ($contents ne "\n")) {
-                    if (!$in_doc_sect && $verbose) {
-                        print STDERR "${file}:$.: warning: contents before sections\n";
-                        ++$warnings;
-                    }
-                    dump_section($file, $section, xml_escape($contents));
-                    $section = $section_default;
-                }
-                $in_doc_sect = 1;
-                $in_purpose = 0;
-                $contents = $newcontents;
-                $new_start_line = $.;
-                while (substr($contents, 0, 1) eq " ") {
-                    $contents = substr($contents, 1);
-                }
-                if ($contents ne "") {
-                    $contents .= "\n";
-                }
-                $section = $newsection;
-                $leading_space = undef;
-            } elsif (/$doc_end/) {
-                if (($contents ne "") && ($contents ne "\n")) {
-                    dump_section($file, $section, xml_escape($contents));
-                    $section = $section_default;
-                    $contents = "";
-                }
-                # look for doc_com + <text> + doc_end:
-                if ($_ =~ m'\s*\*\s*[a-zA-Z_0-9:\.]+\*/') {
-                    print STDERR "${file}:$.: warning: suspicious ending line: $_";
-                    ++$warnings;
-                }
-                $prototype = "";
-                $state = STATE_PROTO;
-                $brcount = 0;
-#               print STDERR "end of doc comment, looking for prototype\n";
-            } elsif (/$doc_content/) {
-                # miguel-style comment kludge, look for blank lines after
-                # @parameter line to signify start of description
-                if ($1 eq "") {
-                    if ($section =~ m/^@/ || $section eq $section_context) {
-                        dump_section($file, $section, xml_escape($contents));
-                        $section = $section_default;
-                        $contents = "";
-                        $new_start_line = $.;
-                    } else {
-                        $contents .= "\n";
-                    }
-                    $in_purpose = 0;
-                } elsif ($in_purpose == 1) {
-                    # Continued declaration purpose
-                    chomp($declaration_purpose);
-                    $declaration_purpose .= " " . xml_escape($1);
-                    $declaration_purpose =~ s/\s+/ /g;
-                } else {
-                    my $cont = $1;
-                    if ($section =~ m/^@/ || $section eq $section_context) {
-                        if (!defined $leading_space) {
-                            if ($cont =~ m/^(\s+)/) {
-                                $leading_space = $1;
-                            } else {
-                                $leading_space = "";
-                            }
-                        }
-                        $cont =~ s/^$leading_space//;
-                    }
-                    $contents .= $cont . "\n";
-                }
-            } else {
-                # i dont know - bad line?  ignore.
-                print STDERR "${file}:$.: warning: bad line: $_";
-                ++$warnings;
-            }
        } elsif ($state == STATE_INLINE) { # scanning for inline parameters
-            # First line (state 1) needs to be a @parameter
+            process_inline($file, $_);
-            if ($inline_doc_state == STATE_INLINE_NAME && /$doc_inline_sect/o) {
+        } elsif ($state == STATE_PROTO) {
-                $section = $1;
+            process_proto($file, $_);
-                $contents = $2;
-                $new_start_line = $.;
-                if ($contents ne "") {
-                    while (substr($contents, 0, 1) eq " ") {
-                        $contents = substr($contents, 1);
-                    }
-                    $contents .= "\n";
-                }
-                $inline_doc_state = STATE_INLINE_TEXT;
-            # Documentation block end */
-            } elsif (/$doc_inline_end/) {
-                if (($contents ne "") && ($contents ne "\n")) {
-                    dump_section($file, $section, xml_escape($contents));
-                    $section = $section_default;
-                    $contents = "";
-                }
-                $state = STATE_PROTO;
-                $inline_doc_state = STATE_INLINE_NA;
-            # Regular text
-            } elsif (/$doc_content/) {
-                if ($inline_doc_state == STATE_INLINE_TEXT) {
-                    $contents .= $1 . "\n";
-                    # nuke leading blank lines
-                    if ($contents =~ /^\s*$/) {
-                        $contents = "";
-                    }
-                } elsif ($inline_doc_state == STATE_INLINE_NAME) {
-                    $inline_doc_state = STATE_INLINE_ERROR;
-                    print STDERR "${file}:$.: warning: ";
-                    print STDERR "Incorrect use of kernel-doc format: $_";
-                    ++$warnings;
-                }
-            }
-        } elsif ($state == STATE_PROTO) {       # scanning for function '{' (end of prototype)
-            if (/$doc_inline_oneline/) {
-                $section = $1;
-                $contents = $2;
-                if ($contents ne "") {
-                    $contents .= "\n";
-                    dump_section($file, $section, xml_escape($contents));
-                    $section = $section_default;
-                    $contents = "";
-                }
-            } elsif (/$doc_inline_start/) {
-                $state = STATE_INLINE;
-                $inline_doc_state = STATE_INLINE_NAME;
-            } elsif ($decl_type eq 'function') {
-                process_proto_function($_, $file);
-            } else {
-                process_proto_type($_, $file);
-            }
        } elsif ($state == STATE_DOCBLOCK) {
-                if (/$doc_end/)
+            process_docblock($file, $_);
-                {
-                        dump_doc_section($file, $section, xml_escape($contents));
-                        $section = $section_default;
-                        $contents = "";
-                        $function = "";
-                        %parameterdescs = ();
-                        %parametertypes = ();
-                        @parameterlist = ();
-                        %sections = ();
-                        @sectionlist = ();
-                        $prototype = "";
-                        $state = STATE_NORMAL;
-                }
-                elsif (/$doc_content/)
-                {
-                        if ( $1 eq "" )
-                        {
-                                $contents .= $blankline;
-                        }
-                        else
-                        {
-                                $contents .= $1 . "\n";
-                        }
-                }
        }
    }
+    # Make sure we got something interesting.
    if ($initial_section_counter == $section_counter) {
        if ($output_mode ne "none") {
            print STDERR "${file}:1: warning: no structured comments found\n";
diff --git a/scripts/leaking_addresses.pl b/scripts/leaking_addresses.pl
index bc5788000018..6a897788f5a7 100755
--- a/scripts/leaking_addresses.pl
+++ b/scripts/leaking_addresses.pl
@@ -3,15 +3,20 @@
 # (c) 2017 Tobin C. Harding <me@tobin.cc>
 # Licensed under the terms of the GNU GPL License version 2
 #
-# leaking_addresses.pl: Scan 64 bit kernel for potential leaking addresses.
+# leaking_addresses.pl: Scan the kernel for potential leaking addresses.
 #  - Scans dmesg output.
 #  - Walks directory tree and parses each file (for each directory in @DIRS).
 #
 # Use --debug to output path before parsing, this is useful to find files that
 # cause the script to choke.
 #
-# You may like to set kptr_restrict=2 before running script
+# When the system is idle it is likely that most files under /proc/PID will be
-# (see Documentation/sysctl/kernel.txt).
+# identical for various processes.  Scanning _all_ the PIDs under /proc is
+# unnecessary and implies that we are thoroughly scanning /proc.  This is _not_
+# the case because there may be ways userspace can trigger creation of /proc
+# files that leak addresses but were not present during a scan.  For these two
+# reasons we exclude all PID directories under /proc except '1/'
 use warnings;
 use strict;
@@ -22,9 +27,10 @@ use Cwd 'abs_path';
 use Term::ANSIColor qw(:constants);
 use Getopt::Long qw(:config no_auto_abbrev);
 use Config;
+use bigint qw/hex/;
+use feature 'state';
 my $P = $0;
-my $V = '0.01';
 # Directories to scan.
 my @DIRS = ('/proc', '/sys');
@@ -32,10 +38,9 @@ my @DIRS = ('/proc', '/sys');
 # Timer for parsing each file, in seconds.
 my $TIMEOUT = 10;
-# Script can only grep for kernel addresses on the following architectures. If
+# Kernel addresses vary by architecture.  We can only auto-detect the following
-# your architecture is not listed here and has a grep'able kernel address please
+# architectures (using `uname -m`).  (flag --32-bit overrides auto-detection.)
-# consider submitting a patch.
+my @SUPPORTED_ARCHITECTURES = ('x86_64', 'ppc64', 'x86');
-my @SUPPORTED_ARCHITECTURES = ('x86_64', 'ppc64');
 # Command line options.
 my $help = 0;
@@ -43,46 +48,34 @@ my $debug = 0;
 my $raw = 0;
 my $output_raw = "";    # Write raw results to file.
 my $input_raw = "";     # Read raw results from file instead of scanning.
 my $suppress_dmesg = 0;         # Don't show dmesg in output.
 my $squash_by_path = 0;         # Summary report grouped by absolute path.
 my $squash_by_filename = 0;     # Summary report grouped by filename.
+my $kernel_config_file = "";    # Kernel configuration file.
-# Do not parse these files (absolute path).
+my $opt_32bit = 0;              # Scan 32-bit kernel.
-my @skip_parse_files_abs = ('/proc/kmsg',
+my $page_offset_32bit = 0;      # Page offset for 32-bit kernel.
-                            '/proc/kcore',
-                            '/proc/fs/ext4/sdb1/mb_groups',
+# Skip these absolute paths.
-                            '/proc/1/fd/3',
+my @skip_abs = (
-                            '/sys/firmware/devicetree',
+        '/proc/kmsg',
-                            '/proc/device-tree',
+        '/proc/device-tree',
-                            '/sys/kernel/debug/tracing/trace_pipe',
+        '/proc/1/syscall',
-                            '/sys/kernel/security/apparmor/revision');
+        '/sys/firmware/devicetree',
+        '/sys/kernel/debug/tracing/trace_pipe',
-# Do not parse these files under any subdirectory.
+        '/sys/kernel/security/apparmor/revision');
-my @skip_parse_files_any = ('0',
-                            '1',
+# Skip these under any subdirectory.
-                            '2',
+my @skip_any = (
-                            'pagemap',
+        'pagemap',
-                            'events',
+        'events',
-                            'access',
+        'access',
-                            'registers',
+        'registers',
-                            'snapshot_raw',
+        'snapshot_raw',
-                            'trace_pipe_raw',
+        'trace_pipe_raw',
-                            'ptmx',
+        'ptmx',
-                            'trace_pipe');
+        'trace_pipe',
+        'fd',
-# Do not walk these directories (absolute path).
+        'usbmon');
-my @skip_walk_dirs_abs = ();
-# Do not walk these directories under any subdirectory.
-my @skip_walk_dirs_any = ('self',
-                          'thread-self',
-                          'cwd',
-                          'fd',
-                          'usbmon',
-                          'stderr',
-                          'stdin',
-                          'stdout');
 sub help
 {
@@ -91,31 +84,22 @@ sub help
        print << "EOM";
 Usage: $P [OPTIONS]
-Version: $V
 Options:
-        -o, --output-raw=<file>  Save results for future processing.
+        -o, --output-raw=<file>         Save results for future processing.
-        -i, --input-raw=<file>   Read results from file instead of scanning.
+        -i, --input-raw=<file>          Read results from file instead of scanning.
-            --raw                Show raw results (default).
+              --raw                     Show raw results (default).
-            --suppress-dmesg     Do not show dmesg results.
+              --suppress-dmesg          Do not show dmesg results.
-            --squash-by-path     Show one result per unique path.
+              --squash-by-path          Show one result per unique path.
-            --squash-by-filename Show one result per unique filename.
+              --squash-by-filename      Show one result per unique filename.
-        -d, --debug              Display debugging output.
+        --kernel-config-file=<file>     Kernel configuration file (e.g /boot/config)
-        -h, --help, --version    Display this help and exit.
+        --32-bit                        Scan 32-bit kernel.
+        --page-offset-32-bit=o          Page offset (for 32-bit kernel 0xABCD1234).
-Examples:
+        -d, --debug                     Display debugging output.
+        -h, --help, --version           Display this help and exit.
-        # Scan kernel and dump raw results.
-        $0
-        # Scan kernel and save results to file.
-        $0 --output-raw scan.out
-        # View summary report.
+Scans the running kernel for potential leaking addresses.
-        $0 --input-raw scan.out --squash-by-filename
-Scans the running (64 bit) kernel for potential leaking addresses.
 EOM
        exit($exitcode);
@@ -131,6 +115,9 @@ GetOptions(
        'squash-by-path'        => \$squash_by_path,
        'squash-by-filename'    => \$squash_by_filename,
        'raw'                   => \$raw,
+        'kernel-config-file=s'  => \$kernel_config_file,
+        '32-bit'                => \$opt_32bit,
+        'page-offset-32-bit=o'  => \$page_offset_32bit,
 ) or help(1);
 help(0) if ($help);
@@ -146,16 +133,19 @@ if (!$input_raw and ($squash_by_path or $squash_by_filename)) {
        exit(128);
 }
-if (!is_supported_architecture()) {
+if (!(is_supported_architecture() or $opt_32bit or $page_offset_32bit)) {
        printf "\nScript does not support your architecture, sorry.\n";
        printf "\nCurrently we support: \n\n";
        foreach(@SUPPORTED_ARCHITECTURES) {
                printf "\t%s\n", $_;
        }
+        printf("\n");
+        printf("If you are running a 32-bit architecture you may use:\n");
+        printf("\n\t--32-bit or --page-offset-32-bit=<page offset>\n\n");
-        my $archname = $Config{archname};
+        my $archname = `uname -m`;
-        printf "\n\$ perl -MConfig -e \'print \"\$Config{archname}\\n\"\'\n";
+        printf("Machine hardware name (`uname -m`): %s\n", $archname);
-        printf "%s\n", $archname;
        exit(129);
 }
@@ -177,49 +167,183 @@ sub dprint
 sub is_supported_architecture
 {
-        return (is_x86_64() or is_ppc64());
+        return (is_x86_64() or is_ppc64() or is_ix86_32());
 }
-sub is_x86_64
+sub is_32bit
 {
-        my $archname = $Config{archname};
+        # Allow --32-bit or --page-offset-32-bit to override
+        if ($opt_32bit or $page_offset_32bit) {
-        if ($archname =~ m/x86_64/) {
                return 1;
        }
-        return 0;
+        return is_ix86_32();
+}
+sub is_ix86_32
+{
+       state $arch = `uname -m`;
+       chomp $arch;
+       if ($arch =~ m/i[3456]86/) {
+               return 1;
+       }
+       return 0;
+}
+sub is_arch
+{
+       my ($desc) = @_;
+       my $arch = `uname -m`;
+       chomp $arch;
+       if ($arch eq $desc) {
+               return 1;
+       }
+       return 0;
+}
+sub is_x86_64
+{
+        state $is = is_arch('x86_64');
+        return $is;
 }
 sub is_ppc64
 {
-        my $archname = $Config{archname};
+        state $is = is_arch('ppc64');
+        return $is;
+}
-        if ($archname =~ m/powerpc/ and $archname =~ m/64/) {
+# Gets config option value from kernel config file.
-                return 1;
+# Returns "" on error or if config option not found.
+sub get_kernel_config_option
+{
+        my ($option) = @_;
+        my $value = "";
+        my $tmp_file = "";
+        my @config_files;
+        # Allow --kernel-config-file to override.
+        if ($kernel_config_file ne "") {
+                @config_files = ($kernel_config_file);
+        } elsif (-R "/proc/config.gz") {
+                my $tmp_file = "/tmp/tmpkconf";
+                if (system("gunzip < /proc/config.gz > $tmp_file")) {
+                        dprint "$0: system(gunzip < /proc/config.gz) failed\n";
+                        return "";
+                } else {
+                        @config_files = ($tmp_file);
+                }
+        } else {
+                my $file = '/boot/config-' . `uname -r`;
+                chomp $file;
+                @config_files = ($file, '/boot/config');
        }
-        return 0;
+        foreach my $file (@config_files) {
+                dprint("parsing config file: %s\n", $file);
+                $value = option_from_file($option, $file);
+                if ($value ne "") {
+                        last;
+                }
+        }
+        if ($tmp_file ne "") {
+                system("rm -f $tmp_file");
+        }
+        return $value;
+}
+# Parses $file and returns kernel configuration option value.
+sub option_from_file
+{
+        my ($option, $file) = @_;
+        my $str = "";
+        my $val = "";
+        open(my $fh, "<", $file) or return "";
+        while (my $line = <$fh> ) {
+                if ($line =~ /^$option/) {
+                        ($str, $val) = split /=/, $line;
+                        chomp $val;
+                        last;
+                }
+        }
+        close $fh;
+        return $val;
 }
 sub is_false_positive
 {
        my ($match) = @_;
+        if (is_32bit()) {
+                return is_false_positive_32bit($match);
+        }
+        # 64 bit false positives.
        if ($match =~ '\b(0x)?(f|F){16}\b' or
            $match =~ '\b(0x)?0{16}\b') {
                return 1;
        }
-        if (is_x86_64) {
+        if (is_x86_64() and is_in_vsyscall_memory_region($match)) {
-                # vsyscall memory region, we should probably check against a range here.
+                return 1;
-                if ($match =~ '\bf{10}600000\b' or
-                    $match =~ '\bf{10}601000\b') {
-                        return 1;
-                }
        }
        return 0;
 }
+sub is_false_positive_32bit
+{
+       my ($match) = @_;
+       state $page_offset = get_page_offset();
+       if ($match =~ '\b(0x)?(f|F){8}\b') {
+               return 1;
+       }
+       if (hex($match) < $page_offset) {
+               return 1;
+       }
+       return 0;
+}
+# returns integer value
+sub get_page_offset
+{
+       my $page_offset;
+       my $default_offset = 0xc0000000;
+       # Allow --page-offset-32bit to override.
+       if ($page_offset_32bit != 0) {
+               return $page_offset_32bit;
+       }
+       $page_offset = get_kernel_config_option('CONFIG_PAGE_OFFSET');
+       if (!$page_offset) {
+               return $default_offset;
+       }
+       return $page_offset;
+}
+sub is_in_vsyscall_memory_region
+{
+        my ($match) = @_;
+        my $hex = hex($match);
+        my $region_min = hex("0xffffffffff600000");
+        my $region_max = hex("0xffffffffff601000");
+        return ($hex >= $region_min and $hex <= $region_max);
+}
 # True if argument potentially contains a kernel address.
 sub may_leak_address
 {
@@ -238,14 +362,8 @@ sub may_leak_address
                return 0;
        }
-        # One of these is guaranteed to be true.
+        $address_re = get_address_re();
-        if (is_x86_64()) {
+        while ($line =~ /($address_re)/g) {
-                $address_re = '\b(0x)?ffff[[:xdigit:]]{12}\b';
-        } elsif (is_ppc64()) {
-                $address_re = '\b(0x)?[89abcdef]00[[:xdigit:]]{13}\b';
-        }
-        while (/($address_re)/g) {
                if (!is_false_positive($1)) {
                        return 1;
                }
@@ -254,6 +372,31 @@ sub may_leak_address
        return 0;
 }
+sub get_address_re
+{
+        if (is_ppc64()) {
+                return '\b(0x)?[89abcdef]00[[:xdigit:]]{13}\b';
+        } elsif (is_32bit()) {
+                return '\b(0x)?[[:xdigit:]]{8}\b';
+        }
+        return get_x86_64_re();
+}
+sub get_x86_64_re
+{
+        # We handle page table levels but only if explicitly configured using
+        # CONFIG_PGTABLE_LEVELS.  If config file parsing fails or config option
+        # is not found we default to using address regular expression suitable
+        # for 4 page table levels.
+        state $ptl = get_kernel_config_option('CONFIG_PGTABLE_LEVELS');
+        if ($ptl == 5) {
+                return '\b(0x)?ff[[:xdigit:]]{14}\b';
+        }
+        return '\b(0x)?ffff[[:xdigit:]]{12}\b';
+}
 sub parse_dmesg
 {
        open my $cmd, '-|', 'dmesg';
@@ -268,26 +411,20 @@ sub parse_dmesg
 # True if we should skip this path.
 sub skip
 {
-        my ($path, $paths_abs, $paths_any) = @_;
+        my ($path) = @_;
-        foreach (@$paths_abs) {
+        foreach (@skip_abs) {
                return 1 if (/^$path$/);
        }
        my($filename, $dirs, $suffix) = fileparse($path);
-        foreach (@$paths_any) {
+        foreach (@skip_any) {
                return 1 if (/^$filename$/);
        }
        return 0;
 }
-sub skip_parse
-{
-        my ($path) = @_;
-        return skip($path, \@skip_parse_files_abs, \@skip_parse_files_any);
-}
 sub timed_parse_file
 {
        my ($file) = @_;
@@ -313,11 +450,9 @@ sub parse_file
                return;
        }
-        if (skip_parse($file)) {
+        if (! -T $file) {
-                dprint "skipping file: $file\n";
                return;
        }
-        dprint "parsing: $file\n";
        open my $fh, "<", $file or return;
        while ( <$fh> ) {
@@ -328,12 +463,14 @@ sub parse_file
        close $fh;
 }
+# Checks if the actual path name is leaking a kernel address.
-# True if we should skip walking this directory.
+sub check_path_for_leaks
-sub skip_walk
 {
        my ($path) = @_;
-        return skip($path, \@skip_walk_dirs_abs, \@skip_walk_dirs_any)
+        if (may_leak_address($path)) {
+                printf("Path name may contain address: $path\n");
+        }
 }
 # Recursively walk directory tree.
@@ -342,7 +479,6 @@ sub walk
        my @dirs = @_;
        while (my $pwd = shift @dirs) {
-                next if (skip_walk($pwd));
                next if (!opendir(DIR, $pwd));
                my @files = readdir(DIR);
                closedir(DIR);
@@ -353,11 +489,21 @@ sub walk
                        my $path = "$pwd/$file";
                        next if (-l $path);
+                        # skip /proc/PID except /proc/1
+                        next if (($path =~ /^\/proc\/[0-9]+$/) &&
+                                 ($path !~ /^\/proc\/1$/));
+                        next if (skip($path));
+                        check_path_for_leaks($path);
                        if (-d $path) {
                                push @dirs, $path;
-                        } else {
+                                next;
-                                timed_parse_file($path);
                        }
+                        dprint "parsing: $path\n";
+                        timed_parse_file($path);
                }
        }
 }
diff --git a/scripts/link-vmlinux.sh b/scripts/link-vmlinux.sh
index be56a1153014..c8cf45362bd6 100755
--- a/scripts/link-vmlinux.sh
+++ b/scripts/link-vmlinux.sh
@@ -4,7 +4,7 @@
 # link vmlinux
 #
 # vmlinux is linked from the objects selected by $(KBUILD_VMLINUX_INIT) and
-# $(KBUILD_VMLINUX_MAIN) and $(KBUILD_VMLINUX_LIBS). Most are built-in.o files
+# $(KBUILD_VMLINUX_MAIN) and $(KBUILD_VMLINUX_LIBS). Most are built-in.a files
 # from top-level directories in the kernel tree, others are specified in
 # arch/$(ARCH)/Makefile. Ordering when linking is important, and
 # $(KBUILD_VMLINUX_INIT) must be first. $(KBUILD_VMLINUX_LIBS) are archives
@@ -18,7 +18,7 @@
 #   |   +--< init/version.o + more
 #   |
 #   +--< $(KBUILD_VMLINUX_MAIN)
-#   |    +--< drivers/built-in.o mm/built-in.o + more
+#   |    +--< drivers/built-in.a mm/built-in.a + more
 #   |
 #   +--< $(KBUILD_VMLINUX_LIBS)
 #   |    +--< lib/lib.a + more
@@ -51,17 +51,15 @@ info()
 #
 # Traditional incremental style of link does not require this step
 #
-# built-in.o output file
+# built-in.a output file
 #
 archive_builtin()
 {
-        if [ -n "${CONFIG_THIN_ARCHIVES}" ]; then
+        info AR built-in.a
-                info AR built-in.o
+        rm -f built-in.a;
-                rm -f built-in.o;
+        ${AR} rcsTP${KBUILD_ARFLAGS} built-in.a                 \
-                ${AR} rcsTP${KBUILD_ARFLAGS} built-in.o                 \
+                                ${KBUILD_VMLINUX_INIT}          \
-                                        ${KBUILD_VMLINUX_INIT}          \
+                                ${KBUILD_VMLINUX_MAIN}
-                                        ${KBUILD_VMLINUX_MAIN}
-        fi
 }
 # Link of vmlinux.o used for section mismatch analysis
@@ -70,21 +68,14 @@ modpost_link()
 {
        local objects
-        if [ -n "${CONFIG_THIN_ARCHIVES}" ]; then
+        objects="--whole-archive                                \
-                objects="--whole-archive                                \
+                built-in.a                                      \
-                        built-in.o                                      \
+                --no-whole-archive                              \
-                        --no-whole-archive                              \
+                --start-group                                   \
-                        --start-group                                   \
+                ${KBUILD_VMLINUX_LIBS}                          \
-                        ${KBUILD_VMLINUX_LIBS}                          \
+                --end-group"
-                        --end-group"
-        else
+        ${LD} ${KBUILD_LDFLAGS} -r -o ${1} ${objects}
-                objects="${KBUILD_VMLINUX_INIT}                         \
-                        --start-group                                   \
-                        ${KBUILD_VMLINUX_MAIN}                          \
-                        ${KBUILD_VMLINUX_LIBS}                          \
-                        --end-group"
-        fi
-        ${LD} ${LDFLAGS} -r -o ${1} ${objects}
 }
 # Link of vmlinux
@@ -96,46 +87,28 @@ vmlinux_link()
        local objects
        if [ "${SRCARCH}" != "um" ]; then
-                if [ -n "${CONFIG_THIN_ARCHIVES}" ]; then
+                objects="--whole-archive                        \
-                        objects="--whole-archive                        \
+                        built-in.a                              \
-                                built-in.o                              \
+                        --no-whole-archive                      \
-                                --no-whole-archive                      \
+                        --start-group                           \
-                                --start-group                           \
+                        ${KBUILD_VMLINUX_LIBS}                  \
-                                ${KBUILD_VMLINUX_LIBS}                  \
+                        --end-group                             \
-                                --end-group                             \
+                        ${1}"
-                                ${1}"
-                else
+                ${LD} ${KBUILD_LDFLAGS} ${LDFLAGS_vmlinux} -o ${2}      \
-                        objects="${KBUILD_VMLINUX_INIT}                 \
-                                --start-group                           \
-                                ${KBUILD_VMLINUX_MAIN}                  \
-                                ${KBUILD_VMLINUX_LIBS}                  \
-                                --end-group                             \
-                                ${1}"
-                fi
-                ${LD} ${LDFLAGS} ${LDFLAGS_vmlinux} -o ${2}             \
                        -T ${lds} ${objects}
        else
-                if [ -n "${CONFIG_THIN_ARCHIVES}" ]; then
+                objects="-Wl,--whole-archive                    \
-                        objects="-Wl,--whole-archive                    \
+                        built-in.a                              \
-                                built-in.o                              \
+                        -Wl,--no-whole-archive                  \
-                                -Wl,--no-whole-archive                  \
+                        -Wl,--start-group                       \
-                                -Wl,--start-group                       \
+                        ${KBUILD_VMLINUX_LIBS}                  \
-                                ${KBUILD_VMLINUX_LIBS}                  \
+                        -Wl,--end-group                         \
-                                -Wl,--end-group                         \
+                        ${1}"
-                                ${1}"
-                else
+                ${CC} ${CFLAGS_vmlinux} -o ${2}                 \
-                        objects="${KBUILD_VMLINUX_INIT}                 \
+                        -Wl,-T,${lds}                           \
-                                -Wl,--start-group                       \
+                        ${objects}                              \
-                                ${KBUILD_VMLINUX_MAIN}                  \
-                                ${KBUILD_VMLINUX_LIBS}                  \
-                                -Wl,--end-group                         \
-                                ${1}"
-                fi
-                ${CC} ${CFLAGS_vmlinux} -o ${2}                         \
-                        -Wl,-T,${lds}                                   \
-                        ${objects}                                      \
                        -lutil -lrt -lpthread
                rm -f linux
        fi
@@ -148,10 +121,6 @@ kallsyms()
        info KSYM ${2}
        local kallsymopt;
-        if [ -n "${CONFIG_HAVE_UNDERSCORE_SYMBOL_PREFIX}" ]; then
-                kallsymopt="${kallsymopt} --symbol-prefix=_"
-        fi
        if [ -n "${CONFIG_KALLSYMS_ALL}" ]; then
                kallsymopt="${kallsymopt} --all-symbols"
        fi
@@ -191,7 +160,7 @@ cleanup()
        rm -f .tmp_System.map
        rm -f .tmp_kallsyms*
        rm -f .tmp_vmlinux*
-        rm -f built-in.o
+        rm -f built-in.a
        rm -f System.map
        rm -f vmlinux
        rm -f vmlinux.o
@@ -296,8 +265,8 @@ if [ -n "${CONFIG_KALLSYMS}" ]; then
        kallsyms .tmp_vmlinux2 .tmp_kallsyms2.o
        # step 3
-        size1=$(stat -c "%s" .tmp_kallsyms1.o)
+        size1=$(${CONFIG_SHELL} "${srctree}/scripts/file-size.sh" .tmp_kallsyms1.o)
-        size2=$(stat -c "%s" .tmp_kallsyms2.o)
+        size2=$(${CONFIG_SHELL} "${srctree}/scripts/file-size.sh" .tmp_kallsyms2.o)
        if [ $size1 -ne $size2 ] || [ -n "${KALLSYMS_EXTRA_PASS}" ]; then
                kallsymso=.tmp_kallsyms3.o
diff --git a/scripts/mkmakefile b/scripts/mkmakefile
index e19d6565f245..412f13fdff52 100755
--- a/scripts/mkmakefile
+++ b/scripts/mkmakefile
@@ -6,31 +6,20 @@
 # Usage
 # $1 - Kernel src directory
-# $2 - Output directory
-# $3 - version
-# $4 - patchlevel
-test ! -r $2/Makefile -o -O $2/Makefile || exit 0
 # Only overwrite automatically generated Makefiles
 # (so we do not overwrite kernel Makefile)
-if test -e $2/Makefile && ! grep -q Automatically $2/Makefile
+if test -e Makefile && ! grep -q Automatically Makefile
 then
        exit 0
 fi
 if [ "${quiet}" != "silent_" ]; then
-        echo "  GEN     $2/Makefile"
+        echo "  GEN     Makefile"
 fi
-cat << EOF > $2/Makefile
+cat << EOF > Makefile
 # Automatically generated by $0: don't edit
-VERSION = $3
-PATCHLEVEL = $4
-lastword = \$(word \$(words \$(1)),\$(1))
-makedir := \$(dir \$(call lastword,\$(MAKEFILE_LIST)))
 ifeq ("\$(origin V)", "command line")
 VERBOSE := \$(V)
 endif
@@ -38,15 +27,12 @@ ifneq (\$(VERBOSE),1)
 Q := @
 endif
-MAKEARGS := -C $1
-MAKEARGS += O=\$(if \$(patsubst /%,,\$(makedir)),\$(CURDIR)/)\$(patsubst %/,%,\$(makedir))
 MAKEFLAGS += --no-print-directory
 .PHONY: __sub-make \$(MAKECMDGOALS)
 __sub-make:
-        \$(Q)\$(MAKE) \$(MAKEARGS) \$(MAKECMDGOALS)
+        \$(Q)\$(MAKE) -C $1 O=\$(CURDIR) \$(MAKECMDGOALS)
 \$(filter-out __sub-make, \$(MAKECMDGOALS)): __sub-make
        @:
diff --git a/scripts/mod/Makefile b/scripts/mod/Makefile
index 42c5d50f2bcc..a5b4af47987a 100644
--- a/scripts/mod/Makefile
+++ b/scripts/mod/Makefile
@@ -4,6 +4,8 @@ OBJECT_FILES_NON_STANDARD := y
 hostprogs-y     := modpost mk_elfconfig
 always          := $(hostprogs-y) empty.o
+CFLAGS_REMOVE_empty.o := $(ASM_MACRO_FLAGS)
 modpost-objs    := modpost.o file2alias.o sumversion.o
 devicetable-offsets-file := devicetable-offsets.h
diff --git a/scripts/mod/devicetable-offsets.c b/scripts/mod/devicetable-offsets.c
index 9fad6afe4c41..293004499b4d 100644
--- a/scripts/mod/devicetable-offsets.c
+++ b/scripts/mod/devicetable-offsets.c
@@ -139,6 +139,9 @@ int main(void)
        DEVID(hv_vmbus_device_id);
        DEVID_FIELD(hv_vmbus_device_id, guid);
+        DEVID(rpmsg_device_id);
+        DEVID_FIELD(rpmsg_device_id, name);
        DEVID(i2c_device_id);
        DEVID_FIELD(i2c_device_id, name);
@@ -218,5 +221,9 @@ int main(void)
        DEVID_FIELD(tb_service_id, protocol_version);
        DEVID_FIELD(tb_service_id, protocol_revision);
+        DEVID(typec_device_id);
+        DEVID_FIELD(typec_device_id, svid);
+        DEVID_FIELD(typec_device_id, mode);
        return 0;
 }
diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c
index b9beeaa4695b..28a61665bb9c 100644
--- a/scripts/mod/file2alias.c
+++ b/scripts/mod/file2alias.c
@@ -95,12 +95,20 @@ extern struct devtable *__start___devtable[], *__stop___devtable[];
 */
 #define DEF_FIELD(m, devid, f) \
        typeof(((struct devid *)0)->f) f = TO_NATIVE(*(typeof(f) *)((m) + OFF_##devid##_##f))
+/* Define a variable v that holds the address of field f of struct devid
+ * based at address m.  Due to the way typeof works, for a field of type
+ * T[N] the variable has type T(*)[N], _not_ T*.
+ */
+#define DEF_FIELD_ADDR_VAR(m, devid, f, v) \
+        typeof(((struct devid *)0)->f) *v = ((m) + OFF_##devid##_##f)
 /* Define a variable f that holds the address of field f of struct devid
 * based at address m.  Due to the way typeof works, for a field of type
 * T[N] the variable has type T(*)[N], _not_ T*.
 */
 #define DEF_FIELD_ADDR(m, devid, f) \
-        typeof(((struct devid *)0)->f) *f = ((m) + OFF_##devid##_##f)
+        DEF_FIELD_ADDR_VAR(m, devid, f, f)
 /* Add a table entry.  We test function type matches while we're here. */
 #define ADD_TO_DEVTABLE(device_id, type, function) \
@@ -644,7 +652,7 @@ static void do_pnp_card_entries(void *symval, unsigned long size,
        for (i = 0; i < count; i++) {
                unsigned int j;
-                DEF_FIELD_ADDR(symval + i*id_size, pnp_card_device_id, devs);
+                DEF_FIELD_ADDR(symval + i * id_size, pnp_card_device_id, devs);
                for (j = 0; j < PNP_MAX_DEVICES; j++) {
                        const char *id = (char *)(*devs)[j].id;
@@ -656,10 +664,13 @@ static void do_pnp_card_entries(void *symval, unsigned long size,
                        /* find duplicate, already added value */
                        for (i2 = 0; i2 < i && !dup; i2++) {
-                                DEF_FIELD_ADDR(symval + i2*id_size, pnp_card_device_id, devs);
+                                DEF_FIELD_ADDR_VAR(symval + i2 * id_size,
+                                                   pnp_card_device_id,
+                                                   devs, devs_dup);
                                for (j2 = 0; j2 < PNP_MAX_DEVICES; j2++) {
-                                        const char *id2 = (char *)(*devs)[j2].id;
+                                        const char *id2 =
+                                                (char *)(*devs_dup)[j2].id;
                                        if (!id2[0])
                                                break;
@@ -944,6 +955,17 @@ static int do_vmbus_entry(const char *filename, void *symval,
 }
 ADD_TO_DEVTABLE("vmbus", hv_vmbus_device_id, do_vmbus_entry);
+/* Looks like: rpmsg:S */
+static int do_rpmsg_entry(const char *filename, void *symval,
+                          char *alias)
+{
+        DEF_FIELD_ADDR(symval, rpmsg_device_id, name);
+        sprintf(alias, RPMSG_DEVICE_MODALIAS_FMT, *name);
+        return 1;
+}
+ADD_TO_DEVTABLE("rpmsg", rpmsg_device_id, do_rpmsg_entry);
 /* Looks like: i2c:S */
 static int do_i2c_entry(const char *filename, void *symval,
                        char *alias)
@@ -1341,6 +1363,19 @@ static int do_tbsvc_entry(const char *filename, void *symval, char *alias)
 }
 ADD_TO_DEVTABLE("tbsvc", tb_service_id, do_tbsvc_entry);
+/* Looks like: typec:idNmN */
+static int do_typec_entry(const char *filename, void *symval, char *alias)
+{
+        DEF_FIELD(symval, typec_device_id, svid);
+        DEF_FIELD(symval, typec_device_id, mode);
+        sprintf(alias, "typec:id%04X", svid);
+        ADD(alias, "m", mode != TYPEC_ANY_MODE, mode);
+        return 1;
+}
+ADD_TO_DEVTABLE("typec", typec_device_id, do_typec_entry);
 /* Does namelen bytes of name exactly match the symbol? */
 static bool sym_is(const char *name, unsigned namelen, const char *symbol)
 {
@@ -1391,11 +1426,10 @@ void handle_moddevtable(struct module *mod, struct elf_info *info,
        if (ELF_ST_TYPE(sym->st_info) != STT_OBJECT)
                return;
-        /* All our symbols are of form <prefix>__mod_<name>__<identifier>_device_table. */
+        /* All our symbols are of form __mod_<name>__<identifier>_device_table. */
-        name = strstr(symname, "__mod_");
+        if (strncmp(symname, "__mod_", strlen("__mod_")))
-        if (!name)
                return;
-        name += strlen("__mod_");
+        name = symname + strlen("__mod_");
        namelen = strlen(name);
        if (namelen < strlen("_device_table"))
                return;
diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
index 9917f928d0fd..0d998c54564d 100644
--- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
@@ -19,9 +19,7 @@
 #include <stdbool.h>
 #include <errno.h>
 #include "modpost.h"
-#include "../../include/generated/autoconf.h"
 #include "../../include/linux/license.h"
-#include "../../include/linux/export.h"
 /* Are we using CONFIG_MODVERSIONS? */
 static int modversions = 0;
@@ -123,7 +121,7 @@ void *do_nofail(void *ptr, const char *expr)
 /* A list of all modules we processed */
 static struct module *modules;
-static struct module *find_module(char *modname)
+static struct module *find_module(const char *modname)
 {
        struct module *mod;
@@ -591,35 +589,32 @@ static void parse_elf_finish(struct elf_info *info)
 static int ignore_undef_symbol(struct elf_info *info, const char *symname)
 {
        /* ignore __this_module, it will be resolved shortly */
-        if (strcmp(symname, VMLINUX_SYMBOL_STR(__this_module)) == 0)
+        if (strcmp(symname, "__this_module") == 0)
                return 1;
        /* ignore global offset table */
        if (strcmp(symname, "_GLOBAL_OFFSET_TABLE_") == 0)
                return 1;
        if (info->hdr->e_machine == EM_PPC)
                /* Special register function linked on all modules during final link of .ko */
-                if (strncmp(symname, "_restgpr_", sizeof("_restgpr_") - 1) == 0 ||
+                if (strstarts(symname, "_restgpr_") ||
-                    strncmp(symname, "_savegpr_", sizeof("_savegpr_") - 1) == 0 ||
+                    strstarts(symname, "_savegpr_") ||
-                    strncmp(symname, "_rest32gpr_", sizeof("_rest32gpr_") - 1) == 0 ||
+                    strstarts(symname, "_rest32gpr_") ||
-                    strncmp(symname, "_save32gpr_", sizeof("_save32gpr_") - 1) == 0 ||
+                    strstarts(symname, "_save32gpr_") ||
-                    strncmp(symname, "_restvr_", sizeof("_restvr_") - 1) == 0 ||
+                    strstarts(symname, "_restvr_") ||
-                    strncmp(symname, "_savevr_", sizeof("_savevr_") - 1) == 0)
+                    strstarts(symname, "_savevr_"))
                        return 1;
        if (info->hdr->e_machine == EM_PPC64)
                /* Special register function linked on all modules during final link of .ko */
-                if (strncmp(symname, "_restgpr0_", sizeof("_restgpr0_") - 1) == 0 ||
+                if (strstarts(symname, "_restgpr0_") ||
-                    strncmp(symname, "_savegpr0_", sizeof("_savegpr0_") - 1) == 0 ||
+                    strstarts(symname, "_savegpr0_") ||
-                    strncmp(symname, "_restvr_", sizeof("_restvr_") - 1) == 0 ||
+                    strstarts(symname, "_restvr_") ||
-                    strncmp(symname, "_savevr_", sizeof("_savevr_") - 1) == 0 ||
+                    strstarts(symname, "_savevr_") ||
                    strcmp(symname, ".TOC.") == 0)
                        return 1;
        /* Do not ignore this symbol */
        return 0;
 }
-#define CRC_PFX     VMLINUX_SYMBOL_STR(__crc_)
-#define KSYMTAB_PFX VMLINUX_SYMBOL_STR(__ksymtab_)
 static void handle_modversions(struct module *mod, struct elf_info *info,
                               Elf_Sym *sym, const char *symname)
 {
@@ -628,13 +623,13 @@ static void handle_modversions(struct module *mod, struct elf_info *info,
        bool is_crc = false;
        if ((!is_vmlinux(mod->name) || mod->is_dot_o) &&
-            strncmp(symname, "__ksymtab", 9) == 0)
+            strstarts(symname, "__ksymtab"))
                export = export_from_secname(info, get_secindex(info, sym));
        else
                export = export_from_sec(info, get_secindex(info, sym));
        /* CRC'd symbol */
-        if (strncmp(symname, CRC_PFX, strlen(CRC_PFX)) == 0) {
+        if (strstarts(symname, "__crc_")) {
                is_crc = true;
                crc = (unsigned int) sym->st_value;
                if (sym->st_shndx != SHN_UNDEF && sym->st_shndx != SHN_ABS) {
@@ -647,13 +642,13 @@ static void handle_modversions(struct module *mod, struct elf_info *info,
                                info->sechdrs[sym->st_shndx].sh_addr : 0);
                        crc = *crcp;
                }
-                sym_update_crc(symname + strlen(CRC_PFX), mod, crc,
+                sym_update_crc(symname + strlen("__crc_"), mod, crc,
                                export);
        }
        switch (sym->st_shndx) {
        case SHN_COMMON:
-                if (!strncmp(symname, "__gnu_lto_", sizeof("__gnu_lto_")-1)) {
+                if (strstarts(symname, "__gnu_lto_")) {
                        /* Should warn here, but modpost runs before the linker */
                } else
                        warn("\"%s\" [%s] is COMMON symbol\n", symname, mod->name);
@@ -677,7 +672,7 @@ static void handle_modversions(struct module *mod, struct elf_info *info,
                        if (ELF_ST_TYPE(sym->st_info) == STT_SPARC_REGISTER)
                                break;
                        if (symname[0] == '.') {
-                                char *munged = strdup(symname);
+                                char *munged = NOFAIL(strdup(symname));
                                munged[0] = '_';
                                munged[1] = toupper(munged[1]);
                                symname = munged;
@@ -685,15 +680,10 @@ static void handle_modversions(struct module *mod, struct elf_info *info,
                }
 #endif
-#ifdef CONFIG_HAVE_UNDERSCORE_SYMBOL_PREFIX
-                if (symname[0] != '_')
-                        break;
-                else
-                        symname++;
-#endif
                if (is_crc) {
                        const char *e = is_vmlinux(mod->name) ?"":".ko";
-                        warn("EXPORT symbol \"%s\" [%s%s] version generation failed, symbol will not be versioned.\n", symname + strlen(CRC_PFX), mod->name, e);
+                        warn("EXPORT symbol \"%s\" [%s%s] version generation failed, symbol will not be versioned.\n",
+                             symname + strlen("__crc_"), mod->name, e);
                }
                mod->unres = alloc_symbol(symname,
                                          ELF_ST_BIND(sym->st_info) == STB_WEAK,
@@ -701,13 +691,13 @@ static void handle_modversions(struct module *mod, struct elf_info *info,
                break;
        default:
                /* All exported symbols */
-                if (strncmp(symname, KSYMTAB_PFX, strlen(KSYMTAB_PFX)) == 0) {
+                if (strstarts(symname, "__ksymtab_")) {
-                        sym_add_exported(symname + strlen(KSYMTAB_PFX), mod,
+                        sym_add_exported(symname + strlen("__ksymtab_"), mod,
                                        export);
                }
-                if (strcmp(symname, VMLINUX_SYMBOL_STR(init_module)) == 0)
+                if (strcmp(symname, "init_module") == 0)
                        mod->has_init = 1;
-                if (strcmp(symname, VMLINUX_SYMBOL_STR(cleanup_module)) == 0)
+                if (strcmp(symname, "cleanup_module") == 0)
                        mod->has_cleanup = 1;
                break;
        }
@@ -734,16 +724,17 @@ static char *next_string(char *string, unsigned long *secsize)
        return string;
 }
-static char *get_next_modinfo(void *modinfo, unsigned long modinfo_len,
+static char *get_next_modinfo(struct elf_info *info, const char *tag,
-                              const char *tag, char *info)
+                              char *prev)
 {
        char *p;
        unsigned int taglen = strlen(tag);
-        unsigned long size = modinfo_len;
+        char *modinfo = info->modinfo;
+        unsigned long size = info->modinfo_len;
-        if (info) {
+        if (prev) {
-                size -= info - (char *)modinfo;
+                size -= prev - modinfo;
-                modinfo = next_string(info, &size);
+                modinfo = next_string(prev, &size);
        }
        for (p = modinfo; p; p = next_string(p, &size)) {
@@ -753,11 +744,10 @@ static char *get_next_modinfo(void *modinfo, unsigned long modinfo_len,
        return NULL;
 }
-static char *get_modinfo(void *modinfo, unsigned long modinfo_len,
+static char *get_modinfo(struct elf_info *info, const char *tag)
-                         const char *tag)
 {
-        return get_next_modinfo(modinfo, modinfo_len, tag, NULL);
+        return get_next_modinfo(info, tag, NULL);
 }
 /**
@@ -840,8 +830,7 @@ static const char *const section_white_list[] =
        ".debug*",
        ".cranges",             /* sh64 */
        ".zdebug*",             /* Compressed debug sections. */
-        ".GCC-command-line",    /* mn10300 */
+        ".GCC.command.line",    /* record-gcc-switches */
-        ".GCC.command.line",    /* record-gcc-switches, non mn10300 */
        ".mdebug*",        /* alpha, score, mips etc. */
        ".pdr",            /* alpha, score, mips etc. */
        ".stab*",
@@ -1104,8 +1093,8 @@ static const struct sectioncheck *section_mismatch(
        /*
         * The target section could be the SHT_NUL section when we're
         * handling relocations to un-resolved symbols, trying to match it
-         * doesn't make much sense and causes build failures on parisc and
+         * doesn't make much sense and causes build failures on parisc
-         * mn10300 architectures.
+         * architectures.
         */
        if (*tosec == '\0')
                return NULL;
@@ -1182,13 +1171,13 @@ static int secref_whitelist(const struct sectioncheck *mismatch,
        /* Check for pattern 1 */
        if (match(tosec, init_data_sections) &&
            match(fromsec, data_sections) &&
-            (strncmp(fromsym, "__param", strlen("__param")) == 0))
+            strstarts(fromsym, "__param"))
                return 0;
        /* Check for pattern 1a */
        if (strcmp(tosec, ".init.text") == 0 &&
            match(fromsec, data_sections) &&
-            (strncmp(fromsym, "__param_ops_", strlen("__param_ops_")) == 0))
+            strstarts(fromsym, "__param_ops_"))
                return 0;
        /* Check for pattern 2 */
@@ -1329,7 +1318,7 @@ static Elf_Sym *find_elf_symbol2(struct elf_info *elf, Elf_Addr addr,
 static char *sec2annotation(const char *s)
 {
        if (match(s, init_exit_sections)) {
-                char *p = malloc(20);
+                char *p = NOFAIL(malloc(20));
                char *r = p;
                *p++ = '_';
@@ -1349,7 +1338,7 @@ static char *sec2annotation(const char *s)
                        strcat(p, " ");
                return r;
        } else {
-                return strdup("");
+                return NOFAIL(strdup(""));
        }
 }
@@ -1543,8 +1532,7 @@ static void default_mismatch_handler(const char *modname, struct elf_info *elf,
        from = find_elf_symbol2(elf, r->r_offset, fromsec);
        fromsym = sym_name(elf, from);
-        if (!strncmp(fromsym, "reference___initcall",
+        if (strstarts(fromsym, "reference___initcall"))
-                     sizeof("reference___initcall")-1))
                return;
        tosec = sec_name(elf, get_secindex(elf, sym));
@@ -1941,7 +1929,7 @@ static char *remove_dot(char *s)
        return s;
 }
-static void read_symbols(char *modname)
+static void read_symbols(const char *modname)
 {
        const char *symname;
        char *version;
@@ -1962,7 +1950,7 @@ static void read_symbols(char *modname)
                mod->skip = 1;
        }
-        license = get_modinfo(info.modinfo, info.modinfo_len, "license");
+        license = get_modinfo(&info, "license");
        if (!license && !is_vmlinux(modname))
                warn("modpost: missing MODULE_LICENSE() in %s\n"
                     "see include/linux/module.h for "
@@ -1974,8 +1962,7 @@ static void read_symbols(char *modname)
                        mod->gpl_compatible = 0;
                        break;
                }
-                license = get_next_modinfo(info.modinfo, info.modinfo_len,
+                license = get_next_modinfo(&info, "license", license);
-                                           "license", license);
        }
        for (sym = info.symtab_start; sym < info.symtab_stop; sym++) {
@@ -1984,11 +1971,10 @@ static void read_symbols(char *modname)
                handle_modversions(mod, &info, sym, symname);
                handle_moddevtable(mod, &info, sym, symname);
        }
-        if (!is_vmlinux(modname) ||
+        if (!is_vmlinux(modname) || vmlinux_section_warnings)
-             (is_vmlinux(modname) && vmlinux_section_warnings))
                check_sec_ref(mod, modname, &info);
-        version = get_modinfo(info.modinfo, info.modinfo_len, "version");
+        version = get_modinfo(&info, "version");
        if (version)
                maybe_frob_rcs_version(modname, version, info.modinfo,
                                       version - (char *)info.hdr);
@@ -2050,7 +2036,7 @@ void buf_write(struct buffer *buf, const char *s, int len)
 {
        if (buf->size - buf->pos < len) {
                buf->size += len + SZ;
-                buf->p = realloc(buf->p, buf->size);
+                buf->p = NOFAIL(realloc(buf->p, buf->size));
        }
        strncpy(buf->p + buf->pos, s, len);
        buf->pos += len;
@@ -2139,10 +2125,13 @@ static int check_modname_len(struct module *mod)
 **/
 static void add_header(struct buffer *b, struct module *mod)
 {
+        buf_printf(b, "#include <linux/build-salt.h>\n");
        buf_printf(b, "#include <linux/module.h>\n");
        buf_printf(b, "#include <linux/vermagic.h>\n");
        buf_printf(b, "#include <linux/compiler.h>\n");
        buf_printf(b, "\n");
+        buf_printf(b, "BUILD_SALT;\n");
+        buf_printf(b, "\n");
        buf_printf(b, "MODULE_INFO(vermagic, VERMAGIC_STRING);\n");
        buf_printf(b, "MODULE_INFO(name, KBUILD_MODNAME);\n");
        buf_printf(b, "\n");
@@ -2175,9 +2164,7 @@ static void add_retpoline(struct buffer *b)
 static void add_staging_flag(struct buffer *b, const char *name)
 {
-        static const char *staging_dir = "drivers/staging";
+        if (strstarts(name, "drivers/staging"))
-        if (strncmp(staging_dir, name, strlen(staging_dir)) == 0)
                buf_printf(b, "\nMODULE_INFO(staging, \"Y\");\n");
 }
@@ -2231,7 +2218,7 @@ static int add_versions(struct buffer *b, struct module *mod)
                        err = 1;
                        break;
                }
-                buf_printf(b, "\t{ %#8x, __VMLINUX_SYMBOL_STR(%s) },\n",
+                buf_printf(b, "\t{ %#8x, \"%s\" },\n",
                           s->crc, s->name);
        }
diff --git a/scripts/mod/sumversion.c b/scripts/mod/sumversion.c
index 944418da9fe3..0f6dcb4011a8 100644
--- a/scripts/mod/sumversion.c
+++ b/scripts/mod/sumversion.c
@@ -330,14 +330,7 @@ static int parse_source_files(const char *objfile, struct md4_ctx *md)
                goto out;
        }
-        /* There will be a line like so:
+        /* Sum all files in the same dir or subdirs. */
-                deps_drivers/net/dummy.o := \
-                  drivers/net/dummy.c \
-                    $(wildcard include/config/net/fastroute.h) \
-                  include/linux/module.h \
-           Sum all files in the same dir or subdirs.
-        */
        while ((line = get_next_line(&pos, file, flen)) != NULL) {
                char* p = line;
diff --git a/scripts/namespace.pl b/scripts/namespace.pl
index 729c547fc9e1..6135574a6f39 100755
--- a/scripts/namespace.pl
+++ b/scripts/namespace.pl
@@ -164,7 +164,7 @@ sub linux_objects
        s:^\./::;
        if (/.*\.o$/ &&
                ! (
-                m:/built-in.o$:
+                m:/built-in.a$:
                || m:arch/x86/vdso/:
                || m:arch/x86/boot/:
                || m:arch/ia64/ia32/ia32.o$:
diff --git a/scripts/package/Makefile b/scripts/package/Makefile
index 9fbcf5ed0ca7..73503ebce632 100644
--- a/scripts/package/Makefile
+++ b/scripts/package/Makefile
@@ -24,6 +24,7 @@
 # Remove hyphens since they have special meaning in RPM filenames
 KERNELPATH := kernel-$(subst -,_,$(KERNELRELEASE))
 KDEB_SOURCENAME ?= linux-$(KERNELRELEASE)
+KBUILD_PKG_ROOTCMD ?="fakeroot -u"
 export KDEB_SOURCENAME
 # Include only those top-level files that are needed by make, plus the GPL copy
 TAR_CONTENT := $(KBUILD_ALLDIRS) .config .scmversion Makefile \
@@ -66,35 +67,20 @@ binrpm-pkg: FORCE
 clean-files += $(objtree)/*.spec
-# Deb target
-# ---------------------------------------------------------------------------
-quiet_cmd_builddeb = BUILDDEB
-      cmd_builddeb = set -e; \
-        test `id -u` = 0 || \
-        test -n "$(KBUILD_PKG_ROOTCMD)" || { \
-                which fakeroot >/dev/null 2>&1 && \
-                KBUILD_PKG_ROOTCMD="fakeroot -u"; \
-        } || { \
-                echo; \
-                echo "builddeb must be run as root (or using fakeroot)."; \
-                echo "KBUILD_PKG_ROOTCMD is unset and fakeroot not found."; \
-                echo "Try setting KBUILD_PKG_ROOTCMD to a command to acquire"; \
-                echo "root privileges (e.g., 'fakeroot -u' or 'sudo')."; \
-                false; \
-        } && \
-        \
-        $$KBUILD_PKG_ROOTCMD $(CONFIG_SHELL) \
-                $(srctree)/scripts/package/builddeb $@
 deb-pkg: FORCE
        $(MAKE) clean
+        $(CONFIG_SHELL) $(srctree)/scripts/package/mkdebian
        $(call cmd,src_tar,$(KDEB_SOURCENAME))
-        $(MAKE) KBUILD_SRC=
+        origversion=$$(dpkg-parsechangelog -SVersion |sed 's/-[^-]*$$//');\
-        +$(call cmd,builddeb)
+                mv $(KDEB_SOURCENAME).tar.gz ../$(KDEB_SOURCENAME)_$${origversion}.orig.tar.gz
+        +dpkg-buildpackage -r$(KBUILD_PKG_ROOTCMD) -a$$(cat debian/arch) -i.git -us -uc
 bindeb-pkg: FORCE
-        $(MAKE) KBUILD_SRC=
+        $(CONFIG_SHELL) $(srctree)/scripts/package/mkdebian
-        +$(call cmd,builddeb)
+        +dpkg-buildpackage -r$(KBUILD_PKG_ROOTCMD) -a$$(cat debian/arch) -b -nc -uc
+intdeb-pkg: FORCE
+        +$(CONFIG_SHELL) $(srctree)/scripts/package/builddeb
 clean-dirs += $(objtree)/debian/
diff --git a/scripts/package/builddeb b/scripts/package/builddeb
index 13fabb1f81db..f43a274f4f1d 100755
--- a/scripts/package/builddeb
+++ b/scripts/package/builddeb
@@ -30,67 +30,11 @@ create_package() {
        chmod -R a+rX "$pdir"
        # Create the package
-        dpkg-gencontrol $forcearch -Vkernel:debarch="${debarch}" -p$pname -P"$pdir"
+        dpkg-gencontrol -p$pname -P"$pdir"
        dpkg --build "$pdir" ..
 }
-set_debarch() {
-        # Attempt to find the correct Debian architecture
-        case "$UTS_MACHINE" in
-        i386|ia64|alpha)
-                debarch="$UTS_MACHINE" ;;
-        x86_64)
-                debarch=amd64 ;;
-        sparc*)
-                debarch=sparc ;;
-        s390*)
-                debarch=s390$(grep -q CONFIG_64BIT=y $KCONFIG_CONFIG && echo x || true) ;;
-        ppc*)
-                debarch=$(grep -q CPU_LITTLE_ENDIAN=y $KCONFIG_CONFIG && echo ppc64el || echo powerpc) ;;
-        parisc*)
-                debarch=hppa ;;
-        mips*)
-                debarch=mips$(grep -q CPU_LITTLE_ENDIAN=y $KCONFIG_CONFIG && echo el || true) ;;
-        aarch64|arm64)
-                debarch=arm64 ;;
-        arm*)
-                if grep -q CONFIG_AEABI=y $KCONFIG_CONFIG; then
-                    if grep -q CONFIG_VFP=y $KCONFIG_CONFIG; then
-                        debarch=armhf
-                    else
-                        debarch=armel
-                    fi
-                else
-                    debarch=arm
-                fi
-                ;;
-        *)
-                debarch=$(dpkg --print-architecture)
-                echo "" >&2
-                echo "** ** **  WARNING  ** ** **" >&2
-                echo "" >&2
-                echo "Your architecture doesn't have its equivalent" >&2
-                echo "Debian userspace architecture defined!" >&2
-                echo "Falling back to using your current userspace instead!" >&2
-                echo "Please add support for $UTS_MACHINE to ${0} ..." >&2
-                echo "" >&2
-        esac
-        if [ -n "$KBUILD_DEBARCH" ] ; then
-                debarch="$KBUILD_DEBARCH"
-        fi
-        forcearch="-DArchitecture=$debarch"
-}
-# Some variables and settings used throughout the script
 version=$KERNELRELEASE
-revision=$(cat .version)
-if [ -n "$KDEB_PKGVERSION" ]; then
-        packageversion=$KDEB_PKGVERSION
-else
-        packageversion=$version-$revision
-fi
-sourcename=$KDEB_SOURCENAME
 tmpdir="$objtree/debian/tmp"
 kernel_headers_dir="$objtree/debian/hdrtmp"
 libc_headers_dir="$objtree/debian/headertmp"
@@ -99,9 +43,6 @@ packagename=linux-image-$version
 kernel_headers_packagename=linux-headers-$version
 libc_headers_packagename=linux-libc-dev
 dbg_packagename=$packagename-dbg
-debarch=
-forcearch=
-set_debarch
 if [ "$ARCH" = "um" ] ; then
        packagename=user-mode-linux-$version
@@ -140,11 +81,11 @@ else
        cp System.map "$tmpdir/boot/System.map-$version"
        cp $KCONFIG_CONFIG "$tmpdir/boot/config-$version"
 fi
-cp "$($MAKE -s image_name)" "$tmpdir/$installed_image_path"
+cp "$($MAKE -s -f $srctree/Makefile image_name)" "$tmpdir/$installed_image_path"
-if grep -q "^CONFIG_OF=y" $KCONFIG_CONFIG ; then
+if grep -q "^CONFIG_OF_EARLY_FLATTREE=y" $KCONFIG_CONFIG ; then
        # Only some architectures with OF support have this target
-        if grep -q dtbs_install "${srctree}/arch/$SRCARCH/Makefile"; then
+        if [ -d "${srctree}/arch/$SRCARCH/boot/dts" ]; then
                $MAKE KBUILD_SRC= INSTALL_DTBS_PATH="$tmpdir/usr/lib/$packagename" dtbs_install
        fi
 fi
@@ -212,105 +153,6 @@ EOF
        chmod 755 "$tmpdir/DEBIAN/$script"
 done
-# Try to determine maintainer and email values
-if [ -n "$DEBEMAIL" ]; then
-       email=$DEBEMAIL
-elif [ -n "$EMAIL" ]; then
-       email=$EMAIL
-else
-       email=$(id -nu)@$(hostname -f 2>/dev/null || hostname)
-fi
-if [ -n "$DEBFULLNAME" ]; then
-       name=$DEBFULLNAME
-elif [ -n "$NAME" ]; then
-       name=$NAME
-else
-       name="Anonymous"
-fi
-maintainer="$name <$email>"
-# Try to determine distribution
-if [ -n "$KDEB_CHANGELOG_DIST" ]; then
-        distribution=$KDEB_CHANGELOG_DIST
-# In some cases lsb_release returns the codename as n/a, which breaks dpkg-parsechangelog
-elif distribution=$(lsb_release -cs 2>/dev/null) && [ -n "$distribution" ] && [ "$distribution" != "n/a" ]; then
-        : # nothing to do in this case
-else
-        distribution="unstable"
-        echo >&2 "Using default distribution of 'unstable' in the changelog"
-        echo >&2 "Install lsb-release or set \$KDEB_CHANGELOG_DIST explicitly"
-fi
-# Generate a simple changelog template
-cat <<EOF > debian/changelog
-$sourcename ($packageversion) $distribution; urgency=low
-  * Custom built Linux kernel.
- -- $maintainer  $(date -R)
-EOF
-# Generate copyright file
-cat <<EOF > debian/copyright
-This is a packacked upstream version of the Linux kernel.
-The sources may be found at most Linux archive sites, including:
-https://www.kernel.org/pub/linux/kernel
-Copyright: 1991 - 2017 Linus Torvalds and others.
-The git repository for mainline kernel development is at:
-git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; version 2 dated June, 1991.
-On Debian GNU/Linux systems, the complete text of the GNU General Public
-License version 2 can be found in \`/usr/share/common-licenses/GPL-2'.
-EOF
-build_depends="bc, kmod, cpio "
-# Generate a control file
-cat <<EOF > debian/control
-Source: $sourcename
-Section: kernel
-Priority: optional
-Maintainer: $maintainer
-Build-Depends: $build_depends
-Homepage: http://www.kernel.org/
-EOF
-if [ "$ARCH" = "um" ]; then
-        cat <<EOF >> debian/control
-Package: $packagename
-Architecture: any
-Description: User Mode Linux kernel, version $version
- User-mode Linux is a port of the Linux kernel to its own system call
- interface.  It provides a kind of virtual machine, which runs Linux
- as a user process under another Linux kernel.  This is useful for
- kernel development, sandboxes, jails, experimentation, and
- many other things.
- .
- This package contains the Linux kernel, modules and corresponding other
- files, version: $version.
-EOF
-else
-        cat <<EOF >> debian/control
-Package: $packagename
-Architecture: any
-Description: Linux kernel, version $version
- This package contains the Linux kernel, modules and corresponding other
- files, version: $version.
-EOF
-fi
 # Build kernel header package
 (cd $srctree; find . -name Makefile\* -o -name Kconfig\* -o -name \*.pl) > "$objtree/debian/hdrsrcfiles"
 (cd $srctree; find arch/*/include include scripts -type f -o -type l) >> "$objtree/debian/hdrsrcfiles"
@@ -331,27 +173,6 @@ mkdir -p "$destdir"
 ln -sf "/usr/src/linux-headers-$version" "$kernel_headers_dir/lib/modules/$version/build"
 rm -f "$objtree/debian/hdrsrcfiles" "$objtree/debian/hdrobjfiles"
-cat <<EOF >> debian/control
-Package: $kernel_headers_packagename
-Architecture: any
-Description: Linux kernel headers for $KERNELRELEASE on \${kernel:debarch}
- This package provides kernel header files for $KERNELRELEASE on \${kernel:debarch}
- .
- This is useful for people who need to build external modules
-EOF
-cat <<EOF >> debian/control
-Package: $libc_headers_packagename
-Section: devel
-Provides: linux-kernel-headers
-Architecture: any
-Description: Linux support headers for userspace development
- This package provides userspaces headers from the Linux kernel.  These headers
- are used by the installed headers for GNU glibc and other system libraries.
-EOF
 if [ "$ARCH" != "um" ]; then
        create_package "$kernel_headers_packagename" "$kernel_headers_dir"
        create_package "$libc_headers_packagename" "$libc_headers_dir"
@@ -370,47 +191,7 @@ if [ -n "$BUILD_DEBUG" ] ; then
        ln -s ../lib/modules/$version/vmlinux $dbg_dir/usr/lib/debug/boot/vmlinux-$version
        # kdump-tools
        ln -s lib/modules/$version/vmlinux $dbg_dir/usr/lib/debug/vmlinux-$version
-        cat <<EOF >> debian/control
-Package: $dbg_packagename
-Section: debug
-Architecture: any
-Description: Linux kernel debugging symbols for $version
- This package will come in handy if you need to debug the kernel. It provides
- all the necessary debug symbols for the kernel and its modules.
-EOF
        create_package "$dbg_packagename" "$dbg_dir"
 fi
-if [ "x$1" = "xdeb-pkg" ]
-then
-    cat <<EOF > debian/rules
-#!/usr/bin/make -f
-build:
-        \$(MAKE)
-binary-arch:
-        \$(MAKE) KDEB_SOURCENAME=${sourcename} KDEB_PKGVERSION=${packageversion} bindeb-pkg
-clean:
-        rm -rf debian/*tmp debian/files
-        mv debian/ debian.backup # debian/ might be cleaned away
-        \$(MAKE) clean
-        mv debian.backup debian
-binary: binary-arch
-EOF
-        mv ${sourcename}.tar.gz ../${sourcename}_${version}.orig.tar.gz
-        tar caf ../${sourcename}_${packageversion}.debian.tar.gz debian/{copyright,rules,changelog,control}
-        dpkg-source -cdebian/control -ldebian/changelog --format="3.0 (custom)" --target-format="3.0 (quilt)" \
-                -b / ../${sourcename}_${version}.orig.tar.gz  ../${sourcename}_${packageversion}.debian.tar.gz
-        mv ${sourcename}_${packageversion}*dsc ..
-        dpkg-genchanges -Vkernel:debarch="${debarch}" > ../${sourcename}_${packageversion}_${debarch}.changes
-else
-        dpkg-genchanges -b -Vkernel:debarch="${debarch}" > ../${sourcename}_${packageversion}_${debarch}.changes
-fi
 exit 0
diff --git a/scripts/package/buildtar b/scripts/package/buildtar
index e8cc72a51b32..d624a07a4e77 100755
--- a/scripts/package/buildtar
+++ b/scripts/package/buildtar
@@ -84,10 +84,6 @@ case "${ARCH}" in
                [ -f "${KBUILD_IMAGE}" ] && cp -v -- "${KBUILD_IMAGE}" "${tmpdir}/boot/vmlinux-${KERNELRELEASE}"
                [ -f "${objtree}/lifimage" ] && cp -v -- "${objtree}/lifimage" "${tmpdir}/boot/lifimage-${KERNELRELEASE}"
                ;;
-        vax)
-                [ -f "${objtree}/vmlinux.SYS" ] && cp -v -- "${objtree}/vmlinux.SYS" "${tmpdir}/boot/vmlinux-${KERNELRELEASE}.SYS"
-                [ -f "${objtree}/vmlinux.dsk" ] && cp -v -- "${objtree}/vmlinux.dsk" "${tmpdir}/boot/vmlinux-${KERNELRELEASE}.dsk"
-                ;;
        mips)
                if [ -f "${objtree}/arch/mips/boot/compressed/vmlinux.bin" ]; then
                        cp -v -- "${objtree}/arch/mips/boot/compressed/vmlinux.bin" "${tmpdir}/boot/vmlinuz-${KERNELRELEASE}"
@@ -109,6 +105,14 @@ case "${ARCH}" in
                        cp -v -- "${objtree}/vmlinux" "${tmpdir}/boot/vmlinux-${KERNELRELEASE}"
                fi
                ;;
+        arm64)
+                for i in Image.bz2 Image.gz Image.lz4 Image.lzma Image.lzo ; do
+                        if [ -f "${objtree}/arch/arm64/boot/${i}" ] ; then
+                                cp -v -- "${objtree}/arch/arm64/boot/${i}" "${tmpdir}/boot/vmlinuz-${KERNELRELEASE}"
+                                break
+                        fi
+                done
+                ;;
        *)
                [ -f "${KBUILD_IMAGE}" ] && cp -v -- "${KBUILD_IMAGE}" "${tmpdir}/boot/vmlinux-kbuild-${KERNELRELEASE}"
                echo "" >&2
diff --git a/scripts/package/mkdebian b/scripts/package/mkdebian
new file mode 100755
index 000000000000..edcad61fe3cd
--- /dev/null
+++ b/scripts/package/mkdebian
@@ -0,0 +1,223 @@
+#!/bin/sh
+#
+# Copyright 2003 Wichert Akkerman <wichert@wiggy.net>
+#
+# Simple script to generate a debian/ directory for a Linux kernel.
+set -e
+is_enabled() {
+        grep -q "^CONFIG_$1=y" $KCONFIG_CONFIG
+}
+if_enabled_echo() {
+        if is_enabled "$1"; then
+                echo -n "$2"
+        elif [ $# -ge 3 ]; then
+                echo -n "$3"
+        fi
+}
+set_debarch() {
+        if [ -n "$KBUILD_DEBARCH" ] ; then
+                debarch="$KBUILD_DEBARCH"
+                return
+        fi
+        # Attempt to find the correct Debian architecture
+        case "$UTS_MACHINE" in
+        i386|ia64|alpha|m68k|riscv*)
+                debarch="$UTS_MACHINE" ;;
+        x86_64)
+                debarch=amd64 ;;
+        sparc*)
+                debarch=sparc$(if_enabled_echo 64BIT 64) ;;
+        s390*)
+                debarch=s390x ;;
+        ppc*)
+                if is_enabled 64BIT; then
+                        debarch=ppc64$(if_enabled_echo CPU_LITTLE_ENDIAN el)
+                else
+                        debarch=powerpc$(if_enabled_echo SPE spe)
+                fi
+                ;;
+        parisc*)
+                debarch=hppa ;;
+        mips*)
+                if is_enabled CPU_LITTLE_ENDIAN; then
+                        debarch=mips$(if_enabled_echo 64BIT 64)$(if_enabled_echo CPU_MIPSR6 r6)el
+                elif is_enabled CPU_MIPSR6; then
+                        debarch=mips$(if_enabled_echo 64BIT 64)r6
+                else
+                        debarch=mips
+                fi
+                ;;
+        aarch64|arm64)
+                debarch=arm64 ;;
+        arm*)
+                if is_enabled AEABI; then
+                        debarch=arm$(if_enabled_echo VFP hf el)
+                else
+                        debarch=arm
+                fi
+                ;;
+        openrisc)
+                debarch=or1k ;;
+        sh)
+                if is_enabled CPU_SH3; then
+                        debarch=sh3$(if_enabled_echo CPU_BIG_ENDIAN eb)
+                elif is_enabled CPU_SH4; then
+                        debarch=sh4$(if_enabled_echo CPU_BIG_ENDIAN eb)
+                fi
+                ;;
+        esac
+        if [ -z "$debarch" ]; then
+                debarch=$(dpkg-architecture -qDEB_HOST_ARCH)
+                echo "" >&2
+                echo "** ** **  WARNING  ** ** **" >&2
+                echo "" >&2
+                echo "Your architecture doesn't have its equivalent" >&2
+                echo "Debian userspace architecture defined!" >&2
+                echo "Falling back to the current host architecture ($debarch)." >&2
+                echo "Please add support for $UTS_MACHINE to ${0} ..." >&2
+                echo "" >&2
+        fi
+}
+# Some variables and settings used throughout the script
+version=$KERNELRELEASE
+if [ -n "$KDEB_PKGVERSION" ]; then
+        packageversion=$KDEB_PKGVERSION
+        revision=${packageversion##*-}
+else
+        revision=$(cat .version 2>/dev/null||echo 1)
+        packageversion=$version-$revision
+fi
+sourcename=$KDEB_SOURCENAME
+packagename=linux-image-$version
+kernel_headers_packagename=linux-headers-$version
+dbg_packagename=$packagename-dbg
+debarch=
+set_debarch
+if [ "$ARCH" = "um" ] ; then
+        packagename=user-mode-linux-$version
+fi
+email=${DEBEMAIL-$EMAIL}
+# use email string directly if it contains <email>
+if echo $email | grep -q '<.*>'; then
+        maintainer=$email
+else
+        # or construct the maintainer string
+        user=${KBUILD_BUILD_USER-$(id -nu)}
+        name=${DEBFULLNAME-$user}
+        if [ -z "$email" ]; then
+                buildhost=${KBUILD_BUILD_HOST-$(hostname -f 2>/dev/null || hostname)}
+                email="$user@$buildhost"
+        fi
+        maintainer="$name <$email>"
+fi
+# Try to determine distribution
+if [ -n "$KDEB_CHANGELOG_DIST" ]; then
+        distribution=$KDEB_CHANGELOG_DIST
+# In some cases lsb_release returns the codename as n/a, which breaks dpkg-parsechangelog
+elif distribution=$(lsb_release -cs 2>/dev/null) && [ -n "$distribution" ] && [ "$distribution" != "n/a" ]; then
+        : # nothing to do in this case
+else
+        distribution="unstable"
+        echo >&2 "Using default distribution of 'unstable' in the changelog"
+        echo >&2 "Install lsb-release or set \$KDEB_CHANGELOG_DIST explicitly"
+fi
+mkdir -p debian/
+echo $debarch > debian/arch
+# Generate a simple changelog template
+cat <<EOF > debian/changelog
+$sourcename ($packageversion) $distribution; urgency=low
+  * Custom built Linux kernel.
+ -- $maintainer  $(date -R)
+EOF
+# Generate copyright file
+cat <<EOF > debian/copyright
+This is a packacked upstream version of the Linux kernel.
+The sources may be found at most Linux archive sites, including:
+https://www.kernel.org/pub/linux/kernel
+Copyright: 1991 - 2018 Linus Torvalds and others.
+The git repository for mainline kernel development is at:
+git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; version 2 dated June, 1991.
+On Debian GNU/Linux systems, the complete text of the GNU General Public
+License version 2 can be found in \`/usr/share/common-licenses/GPL-2'.
+EOF
+# Generate a control file
+cat <<EOF > debian/control
+Source: $sourcename
+Section: kernel
+Priority: optional
+Maintainer: $maintainer
+Build-Depends: bc, kmod, cpio
+Homepage: http://www.kernel.org/
+Package: $packagename
+Architecture: $debarch
+Description: Linux kernel, version $version
+ This package contains the Linux kernel, modules and corresponding other
+ files, version: $version.
+Package: $kernel_headers_packagename
+Architecture: $debarch
+Description: Linux kernel headers for $version on $debarch
+ This package provides kernel header files for $version on $debarch
+ .
+ This is useful for people who need to build external modules
+Package: linux-libc-dev
+Section: devel
+Provides: linux-kernel-headers
+Architecture: $debarch
+Description: Linux support headers for userspace development
+ This package provides userspaces headers from the Linux kernel.  These headers
+ are used by the installed headers for GNU glibc and other system libraries.
+Package: $dbg_packagename
+Section: debug
+Architecture: $debarch
+Description: Linux kernel debugging symbols for $version
+ This package will come in handy if you need to debug the kernel. It provides
+ all the necessary debug symbols for the kernel and its modules.
+EOF
+cat <<EOF > debian/rules
+#!$(command -v $MAKE) -f
+build:
+        \$(MAKE) KERNELRELEASE=${version} ARCH=${ARCH} \
+        KBUILD_BUILD_VERSION=${revision} KBUILD_SRC=
+binary-arch:
+        \$(MAKE) KERNELRELEASE=${version} ARCH=${ARCH} \
+        KBUILD_BUILD_VERSION=${revision} KBUILD_SRC= intdeb-pkg
+clean:
+        rm -rf debian/*tmp debian/files
+        \$(MAKE) clean
+binary: binary-arch
+EOF
+exit 0
diff --git a/scripts/package/mkspec b/scripts/package/mkspec
index 61427c6f2209..009147d4718e 100755
--- a/scripts/package/mkspec
+++ b/scripts/package/mkspec
@@ -12,6 +12,7 @@
 # how we were called determines which rpms we build and how we build them
 if [ "$1" = prebuilt ]; then
        S=DEL
+        MAKE="$MAKE -f $srctree/Makefile"
 else
        S=
 fi
@@ -78,19 +79,19 @@ $S	%prep
 $S      %setup -q
 $S
 $S      %build
-$S      make %{?_smp_mflags} KBUILD_BUILD_VERSION=%{release}
+$S      $MAKE %{?_smp_mflags} KBUILD_BUILD_VERSION=%{release}
 $S
        %install
        mkdir -p %{buildroot}/boot
        %ifarch ia64
        mkdir -p %{buildroot}/boot/efi
-        cp \$(make image_name) %{buildroot}/boot/efi/vmlinuz-$KERNELRELEASE
+        cp \$($MAKE image_name) %{buildroot}/boot/efi/vmlinuz-$KERNELRELEASE
        ln -s efi/vmlinuz-$KERNELRELEASE %{buildroot}/boot/
        %else
-        cp \$(make image_name) %{buildroot}/boot/vmlinuz-$KERNELRELEASE
+        cp \$($MAKE image_name) %{buildroot}/boot/vmlinuz-$KERNELRELEASE
        %endif
-$M      make %{?_smp_mflags} INSTALL_MOD_PATH=%{buildroot} KBUILD_SRC= modules_install
+$M      $MAKE %{?_smp_mflags} INSTALL_MOD_PATH=%{buildroot} modules_install
-        make %{?_smp_mflags} INSTALL_HDR_PATH=%{buildroot}/usr KBUILD_SRC= headers_install
+        $MAKE %{?_smp_mflags} INSTALL_HDR_PATH=%{buildroot}/usr headers_install
        cp System.map %{buildroot}/boot/System.map-$KERNELRELEASE
        cp .config %{buildroot}/boot/config-$KERNELRELEASE
        bzip2 -9 --keep vmlinux
@@ -118,6 +119,8 @@ $S$M	ln -sf /usr/src/kernels/$KERNELRELEASE source
        %preun
        if [ -x /sbin/new-kernel-pkg ]; then
        new-kernel-pkg --remove $KERNELRELEASE --rminitrd --initrdfile=/boot/initramfs-$KERNELRELEASE.img
+        elif [ -x /usr/bin/kernel-install ]; then
+        kernel-install remove $KERNELRELEASE
        fi
        %postun
diff --git a/scripts/recordmcount.c b/scripts/recordmcount.c
index 16e086dcc567..895c40e8679f 100644
--- a/scripts/recordmcount.c
+++ b/scripts/recordmcount.c
@@ -33,20 +33,6 @@
 #include <string.h>
 #include <unistd.h>
-/*
- * glibc synced up and added the metag number but didn't add the relocations.
- * Work around this in a crude manner for now.
- */
-#ifndef EM_METAG
-#define EM_METAG      174
-#endif
-#ifndef R_METAG_ADDR32
-#define R_METAG_ADDR32                   2
-#endif
-#ifndef R_METAG_NONE
-#define R_METAG_NONE                     3
-#endif
 #ifndef EM_AARCH64
 #define EM_AARCH64      183
 #define R_AARCH64_NONE          0
@@ -514,7 +500,7 @@ do_file(char const *const fname)
        gpfx = 0;
        switch (w2(ehdr->e_machine)) {
        default:
-                fprintf(stderr, "unrecognized e_machine %d %s\n",
+                fprintf(stderr, "unrecognized e_machine %u %s\n",
                        w2(ehdr->e_machine), fname);
                fail_file();
                break;
@@ -538,12 +524,6 @@ do_file(char const *const fname)
                        gpfx = '_';
                        break;
        case EM_IA_64:   reltype = R_IA64_IMM64;   gpfx = '_'; break;
-        case EM_METAG:   reltype = R_METAG_ADDR32;
-                         altmcount = "_mcount_wrapper";
-                         rel_type_nop = R_METAG_NONE;
-                         /* We happen to have the same requirement as MIPS */
-                         is_fake_mcount32 = MIPS32_is_fake_mcount;
-                         break;
        case EM_MIPS:    /* reltype: e_class    */ gpfx = '_'; break;
        case EM_PPC:     reltype = R_PPC_ADDR32;   gpfx = '_'; break;
        case EM_PPC64:   reltype = R_PPC64_ADDR64; gpfx = '_'; break;
diff --git a/scripts/recordmcount.h b/scripts/recordmcount.h
index b9897e2be404..2e7793735e14 100644
--- a/scripts/recordmcount.h
+++ b/scripts/recordmcount.h
@@ -441,7 +441,7 @@ static unsigned find_secsym_ndx(unsigned const txtndx,
                        return symp - sym0;
                }
        }
-        fprintf(stderr, "Cannot find symbol for section %d: %s.\n",
+        fprintf(stderr, "Cannot find symbol for section %u: %s.\n",
                txtndx, txtname);
        fail_file();
 }
diff --git a/scripts/recordmcount.pl b/scripts/recordmcount.pl
index 2033af758173..f599031260d5 100755
--- a/scripts/recordmcount.pl
+++ b/scripts/recordmcount.pl
@@ -266,13 +266,29 @@ if ($arch eq "x86_64") {
    $objcopy .= " -O elf32-sh-linux";
 } elsif ($arch eq "powerpc") {
+    my $ldemulation;
    $local_regex = "^[0-9a-fA-F]+\\s+t\\s+(\\.?\\S+)";
    # See comment in the sparc64 section for why we use '\w'.
    $function_regex = "^([0-9a-fA-F]+)\\s+<(\\.?\\w*?)>:";
    $mcount_regex = "^\\s*([0-9a-fA-F]+):.*\\s\\.?_mcount\$";
+    if ($endian eq "big") {
+            $cc .= " -mbig-endian ";
+            $ld .= " -EB ";
+            $ldemulation = "ppc"
+    } else {
+            $cc .= " -mlittle-endian ";
+            $ld .= " -EL ";
+            $ldemulation = "lppc"
+    }
    if ($bits == 64) {
-        $type = ".quad";
+        $type = ".quad";
+        $cc .= " -m64 ";
+        $ld .= " -m elf64".$ldemulation." ";
+    } else {
+        $cc .= " -m32 ";
+        $ld .= " -m elf32".$ldemulation." ";
    }
 } elsif ($arch eq "arm") {
@@ -368,14 +384,14 @@ if ($arch eq "x86_64") {
 } elsif ($arch eq "microblaze") {
    # Microblaze calls '_mcount' instead of plain 'mcount'.
    $mcount_regex = "^\\s*([0-9a-fA-F]+):.*\\s_mcount\$";
-} elsif ($arch eq "blackfin") {
+} elsif ($arch eq "riscv") {
-    $mcount_regex = "^\\s*([0-9a-fA-F]+):.*\\s__mcount\$";
+    $function_regex = "^([0-9a-fA-F]+)\\s+<([^.0-9][0-9a-zA-Z_\\.]+)>:";
-    $mcount_adjust = -4;
+    $mcount_regex = "^\\s*([0-9a-fA-F]+):\\sR_RISCV_CALL\\s_mcount\$";
-} elsif ($arch eq "tilegx" || $arch eq "tile") {
-    # Default to the newer TILE-Gx architecture if only "tile" is given.
-    $mcount_regex = "^\\s*([0-9a-fA-F]+):.*\\s__mcount\$";
    $type = ".quad";
-    $alignment = 8;
+    $alignment = 2;
+} elsif ($arch eq "nds32") {
+    $mcount_regex = "^\\s*([0-9a-fA-F]+):\\s*R_NDS32_HI20_RELA\\s+_mcount\$";
+    $alignment = 2;
 } else {
    die "Arch $arch is not supported with CONFIG_FTRACE_MCOUNT_RECORD";
 }
diff --git a/scripts/selinux/mdp/mdp.c b/scripts/selinux/mdp/mdp.c
index ffe8179f5d41..073fe7537f6c 100644
--- a/scripts/selinux/mdp/mdp.c
+++ b/scripts/selinux/mdp/mdp.c
@@ -124,7 +124,6 @@ int main(int argc, char *argv[])
        fprintf(fout, "fs_use_xattr reiserfs user_u:base_r:base_t;\n");
        fprintf(fout, "fs_use_xattr jffs2 user_u:base_r:base_t;\n");
        fprintf(fout, "fs_use_xattr gfs2 user_u:base_r:base_t;\n");
-        fprintf(fout, "fs_use_xattr lustre user_u:base_r:base_t;\n");
        fprintf(fout, "fs_use_task eventpollfs user_u:base_r:base_t;\n");
        fprintf(fout, "fs_use_task pipefs user_u:base_r:base_t;\n");
diff --git a/scripts/spdxcheck.py b/scripts/spdxcheck.py
new file mode 100755
index 000000000000..839e190bbd7a
--- /dev/null
+++ b/scripts/spdxcheck.py
@@ -0,0 +1,285 @@
+#!/usr/bin/env python
+# SPDX-License-Identifier: GPL-2.0
+# Copyright Thomas Gleixner <tglx@linutronix.de>
+from argparse import ArgumentParser
+from ply import lex, yacc
+import locale
+import traceback
+import sys
+import git
+import re
+import os
+class ParserException(Exception):
+    def __init__(self, tok, txt):
+        self.tok = tok
+        self.txt = txt
+class SPDXException(Exception):
+    def __init__(self, el, txt):
+        self.el = el
+        self.txt = txt
+class SPDXdata(object):
+    def __init__(self):
+        self.license_files = 0
+        self.exception_files = 0
+        self.licenses = [ ]
+        self.exceptions = { }
+# Read the spdx data from the LICENSES directory
+def read_spdxdata(repo):
+    # The subdirectories of LICENSES in the kernel source
+    license_dirs = [ "preferred", "other", "exceptions" ]
+    lictree = repo.head.commit.tree['LICENSES']
+    spdx = SPDXdata()
+    for d in license_dirs:
+        for el in lictree[d].traverse():
+            if not os.path.isfile(el.path):
+                continue
+            exception = None
+            for l in open(el.path).readlines():
+                if l.startswith('Valid-License-Identifier:'):
+                    lid = l.split(':')[1].strip().upper()
+                    if lid in spdx.licenses:
+                        raise SPDXException(el, 'Duplicate License Identifier: %s' %lid)
+                    else:
+                        spdx.licenses.append(lid)
+                elif l.startswith('SPDX-Exception-Identifier:'):
+                    exception = l.split(':')[1].strip().upper()
+                    spdx.exceptions[exception] = []
+                elif l.startswith('SPDX-Licenses:'):
+                    for lic in l.split(':')[1].upper().strip().replace(' ', '').replace('\t', '').split(','):
+                        if not lic in spdx.licenses:
+                            raise SPDXException(None, 'Exception %s missing license %s' %(ex, lic))
+                        spdx.exceptions[exception].append(lic)
+                elif l.startswith("License-Text:"):
+                    if exception:
+                        if not len(spdx.exceptions[exception]):
+                            raise SPDXException(el, 'Exception %s is missing SPDX-Licenses' %excid)
+                        spdx.exception_files += 1
+                    else:
+                        spdx.license_files += 1
+                    break
+    return spdx
+class id_parser(object):
+    reserved = [ 'AND', 'OR', 'WITH' ]
+    tokens = [ 'LPAR', 'RPAR', 'ID', 'EXC' ] + reserved
+    precedence = ( ('nonassoc', 'AND', 'OR'), )
+    t_ignore = ' \t'
+    def __init__(self, spdx):
+        self.spdx = spdx
+        self.lasttok = None
+        self.lastid = None
+        self.lexer = lex.lex(module = self, reflags = re.UNICODE)
+        # Initialize the parser. No debug file and no parser rules stored on disk
+        # The rules are small enough to be generated on the fly
+        self.parser = yacc.yacc(module = self, write_tables = False, debug = False)
+        self.lines_checked = 0
+        self.checked = 0
+        self.spdx_valid = 0
+        self.spdx_errors = 0
+        self.curline = 0
+        self.deepest = 0
+    # Validate License and Exception IDs
+    def validate(self, tok):
+        id = tok.value.upper()
+        if tok.type == 'ID':
+            if not id in self.spdx.licenses:
+                raise ParserException(tok, 'Invalid License ID')
+            self.lastid = id
+        elif tok.type == 'EXC':
+            if id not in self.spdx.exceptions:
+                raise ParserException(tok, 'Invalid Exception ID')
+            if self.lastid not in self.spdx.exceptions[id]:
+                raise ParserException(tok, 'Exception not valid for license %s' %self.lastid)
+            self.lastid = None
+        elif tok.type != 'WITH':
+            self.lastid = None
+    # Lexer functions
+    def t_RPAR(self, tok):
+        r'\)'
+        self.lasttok = tok.type
+        return tok
+    def t_LPAR(self, tok):
+        r'\('
+        self.lasttok = tok.type
+        return tok
+    def t_ID(self, tok):
+        r'[A-Za-z.0-9\-+]+'
+        if self.lasttok == 'EXC':
+            print(tok)
+            raise ParserException(tok, 'Missing parentheses')
+        tok.value = tok.value.strip()
+        val = tok.value.upper()
+        if val in self.reserved:
+            tok.type = val
+        elif self.lasttok == 'WITH':
+            tok.type = 'EXC'
+        self.lasttok = tok.type
+        self.validate(tok)
+        return tok
+    def t_error(self, tok):
+        raise ParserException(tok, 'Invalid token')
+    def p_expr(self, p):
+        '''expr : ID
+                | ID WITH EXC
+                | expr AND expr
+                | expr OR expr
+                | LPAR expr RPAR'''
+        pass
+    def p_error(self, p):
+        if not p:
+            raise ParserException(None, 'Unfinished license expression')
+        else:
+            raise ParserException(p, 'Syntax error')
+    def parse(self, expr):
+        self.lasttok = None
+        self.lastid = None
+        self.parser.parse(expr, lexer = self.lexer)
+    def parse_lines(self, fd, maxlines, fname):
+        self.checked += 1
+        self.curline = 0
+        try:
+            for line in fd:
+                line = line.decode(locale.getpreferredencoding(False), errors='ignore')
+                self.curline += 1
+                if self.curline > maxlines:
+                    break
+                self.lines_checked += 1
+                if line.find("SPDX-License-Identifier:") < 0:
+                    continue
+                expr = line.split(':')[1].replace('*/', '').strip()
+                self.parse(expr)
+                self.spdx_valid += 1
+                #
+                # Should we check for more SPDX ids in the same file and
+                # complain if there are any?
+                #
+                break
+        except ParserException as pe:
+            if pe.tok:
+                col = line.find(expr) + pe.tok.lexpos
+                tok = pe.tok.value
+                sys.stdout.write('%s: %d:%d %s: %s\n' %(fname, self.curline, col, pe.txt, tok))
+            else:
+                sys.stdout.write('%s: %d:0 %s\n' %(fname, self.curline, col, pe.txt))
+            self.spdx_errors += 1
+def scan_git_tree(tree):
+    for el in tree.traverse():
+        # Exclude stuff which would make pointless noise
+        # FIXME: Put this somewhere more sensible
+        if el.path.startswith("LICENSES"):
+            continue
+        if el.path.find("license-rules.rst") >= 0:
+            continue
+        if not os.path.isfile(el.path):
+            continue
+        with open(el.path, 'rb') as fd:
+            parser.parse_lines(fd, args.maxlines, el.path)
+def scan_git_subtree(tree, path):
+    for p in path.strip('/').split('/'):
+        tree = tree[p]
+    scan_git_tree(tree)
+if __name__ == '__main__':
+    ap = ArgumentParser(description='SPDX expression checker')
+    ap.add_argument('path', nargs='*', help='Check path or file. If not given full git tree scan. For stdin use "-"')
+    ap.add_argument('-m', '--maxlines', type=int, default=15,
+                    help='Maximum number of lines to scan in a file. Default 15')
+    ap.add_argument('-v', '--verbose', action='store_true', help='Verbose statistics output')
+    args = ap.parse_args()
+    # Sanity check path arguments
+    if '-' in args.path and len(args.path) > 1:
+        sys.stderr.write('stdin input "-" must be the only path argument\n')
+        sys.exit(1)
+    try:
+        # Use git to get the valid license expressions
+        repo = git.Repo(os.getcwd())
+        assert not repo.bare
+        # Initialize SPDX data
+        spdx = read_spdxdata(repo)
+        # Initilize the parser
+        parser = id_parser(spdx)
+    except SPDXException as se:
+        if se.el:
+            sys.stderr.write('%s: %s\n' %(se.el.path, se.txt))
+        else:
+            sys.stderr.write('%s\n' %se.txt)
+        sys.exit(1)
+    except Exception as ex:
+        sys.stderr.write('FAIL: %s\n' %ex)
+        sys.stderr.write('%s\n' %traceback.format_exc())
+        sys.exit(1)
+    try:
+        if len(args.path) and args.path[0] == '-':
+            parser.parse_lines(sys.stdin, args.maxlines, '-')
+        else:
+            if args.path:
+                for p in args.path:
+                    if os.path.isfile(p):
+                        parser.parse_lines(open(p), args.maxlines, p)
+                    elif os.path.isdir(p):
+                        scan_git_subtree(repo.head.reference.commit.tree, p)
+                    else:
+                        sys.stderr.write('path %s does not exist\n' %p)
+                        sys.exit(1)
+            else:
+                # Full git tree scan
+                scan_git_tree(repo.head.commit.tree)
+            if args.verbose:
+                sys.stderr.write('\n')
+                sys.stderr.write('License files:     %12d\n' %spdx.license_files)
+                sys.stderr.write('Exception files:   %12d\n' %spdx.exception_files)
+                sys.stderr.write('License IDs        %12d\n' %len(spdx.licenses))
+                sys.stderr.write('Exception IDs      %12d\n' %len(spdx.exceptions))
+                sys.stderr.write('\n')
+                sys.stderr.write('Files checked:     %12d\n' %parser.checked)
+                sys.stderr.write('Lines checked:     %12d\n' %parser.lines_checked)
+                sys.stderr.write('Files with SPDX:   %12d\n' %parser.spdx_valid)
+                sys.stderr.write('Files with errors: %12d\n' %parser.spdx_errors)
+            sys.exit(0)
+    except Exception as ex:
+        sys.stderr.write('FAIL: %s\n' %ex)
+        sys.stderr.write('%s\n' %traceback.format_exc())
+        sys.exit(1)
diff --git a/scripts/spelling.txt b/scripts/spelling.txt
index 9a058cff49d4..517d0c3f83df 100644
--- a/scripts/spelling.txt
+++ b/scripts/spelling.txt
@@ -10,6 +10,8 @@
 abandonning||abandoning
 abigious||ambiguous
 abitrate||arbitrate
+abord||abort
+aboslute||absolute
 abov||above
 abreviated||abbreviated
 absense||absence
@@ -25,6 +27,7 @@ accessable||accessible
 accesss||access
 accidentaly||accidentally
 accidentually||accidentally
+acclerated||accelerated
 accoding||according
 accomodate||accommodate
 accomodates||accommodates
@@ -58,12 +61,15 @@ addres||address
 adddress||address
 addreses||addresses
 addresss||address
+addrress||address
 aditional||additional
 aditionally||additionally
 aditionaly||additionally
 adminstrative||administrative
 adress||address
 adresses||addresses
+adrresses||addresses
+advertisment||advertisement
 adviced||advised
 afecting||affecting
 againt||against
@@ -100,6 +106,7 @@ alue||value
 ambigious||ambiguous
 amoung||among
 amout||amount
+amplifer||amplifier
 an union||a union
 an user||a user
 an userspace||a userspace
@@ -145,11 +152,15 @@ assistent||assistant
 assocation||association
 associcated||associated
 assotiated||associated
+asssert||assert
 assum||assume
 assumtpion||assumption
 asuming||assuming
 asycronous||asynchronous
 asynchnous||asynchronous
+asynchromous||asynchronous
+asymetric||asymmetric
+asymmeric||asymmetric
 atomatically||automatically
 atomicly||atomically
 atempt||attempt
@@ -172,6 +183,7 @@ avaible||available
 availabe||available
 availabled||available
 availablity||availability
+availaible||available
 availale||available
 availavility||availability
 availble||available
@@ -206,8 +218,11 @@ borad||board
 boundry||boundary
 brievely||briefly
 broadcat||broadcast
+bufufer||buffer
 cacluated||calculated
+caculate||calculate
 caculation||calculation
+cadidate||candidate
 calender||calendar
 calescing||coalescing
 calle||called
@@ -221,12 +236,14 @@ capabilty||capability
 capabitilies||capabilities
 capatibilities||capabilities
 capapbilities||capabilities
+caputure||capture
 carefuly||carefully
 cariage||carriage
 catagory||category
 cehck||check
 challange||challenge
 challanges||challenges
+chache||cache
 chanell||channel
 changable||changeable
 chanined||chained
@@ -240,6 +257,7 @@ charaters||characters
 charcter||character
 chcek||check
 chck||check
+checksumed||checksummed
 checksuming||checksumming
 childern||children
 childs||children
@@ -292,8 +310,10 @@ comunication||communication
 conbination||combination
 conditionaly||conditionally
 conected||connected
+conector||connector
 connecetd||connected
 configuartion||configuration
+configuation||configuration
 configuratoin||configuration
 configuraton||configuration
 configuretion||configuration
@@ -315,6 +335,7 @@ continous||continuous
 continously||continuously
 continueing||continuing
 contraints||constraints
+contruct||construct
 contol||control
 contoller||controller
 controled||controlled
@@ -343,6 +364,7 @@ dafault||default
 deafult||default
 deamon||daemon
 decompres||decompress
+decsribed||described
 decription||description
 dectected||detected
 defailt||default
@@ -379,6 +401,7 @@ desctiptor||descriptor
 desriptor||descriptor
 desriptors||descriptors
 destionation||destination
+destoried||destroyed
 destory||destroy
 destoryed||destroyed
 destorys||destroys
@@ -400,22 +423,30 @@ didnt||didn't
 diferent||different
 differrence||difference
 diffrent||different
+differenciate||differentiate
 diffrentiate||differentiate
 difinition||definition
 dimesions||dimensions
 diplay||display
+directon||direction
 direectly||directly
+diregard||disregard
 disassocation||disassociation
 disapear||disappear
 disapeared||disappeared
 disappared||disappeared
+disbale||disable
+disbaled||disabled
 disble||disable
 disbled||disabled
 disconnet||disconnect
 discontinous||discontinuous
+disharge||discharge
 dispertion||dispersion
 dissapears||disappears
 distiction||distinction
+divisable||divisible
+divsiors||divisors
 docuentation||documentation
 documantation||documentation
 documentaion||documentation
@@ -427,6 +458,7 @@ downlad||download
 downlads||downloads
 druing||during
 dynmaic||dynamic
+eanable||enable
 easilly||easily
 ecspecially||especially
 edditable||editable
@@ -484,9 +516,12 @@ exprimental||experimental
 extened||extended
 extensability||extensibility
 extention||extension
+extenstion||extension
 extracter||extractor
+faield||failed
 falied||failed
 faild||failed
+failer||failure
 faill||fail
 failied||failed
 faillure||failure
@@ -520,6 +555,7 @@ forseeable||foreseeable
 forse||force
 fortan||fortran
 forwardig||forwarding
+frambuffer||framebuffer
 framming||framing
 framwork||framework
 frequncy||frequency
@@ -527,6 +563,7 @@ frome||from
 fucntion||function
 fuction||function
 fuctions||functions
+funcation||function
 funcion||function
 functionallity||functionality
 functionaly||functionally
@@ -540,6 +577,7 @@ futrue||future
 gaurenteed||guaranteed
 generiously||generously
 genereate||generate
+genereted||generated
 genric||generic
 globel||global
 grabing||grabbing
@@ -553,6 +591,7 @@ guarentee||guarantee
 halfs||halves
 hander||handler
 handfull||handful
+hanlde||handle
 hanled||handled
 happend||happened
 harware||hardware
@@ -561,6 +600,7 @@ helpfull||helpful
 hybernate||hibernate
 hierachy||hierarchy
 hierarchie||hierarchy
+homogenous||homogeneous
 howver||however
 hsould||should
 hypervior||hypervisor
@@ -568,6 +608,8 @@ hypter||hyper
 identidier||identifier
 iligal||illegal
 illigal||illegal
+illgal||illegal
+iomaped||iomapped
 imblance||imbalance
 immeadiately||immediately
 immedaite||immediate
@@ -618,12 +660,15 @@ initation||initiation
 initators||initiators
 initialiazation||initialization
 initializiation||initialization
+initialze||initialize
 initialzed||initialized
 initilization||initialization
 initilize||initialize
 inofficial||unofficial
+inrerface||interface
 insititute||institute
 instal||install
+instanciate||instantiate
 instanciated||instantiated
 inteface||interface
 integreated||integrated
@@ -657,6 +702,7 @@ intregral||integral
 intrrupt||interrupt
 intterrupt||interrupt
 intuative||intuitive
+inavlid||invalid
 invaid||invalid
 invald||invalid
 invalde||invalid
@@ -683,6 +729,7 @@ langauge||language
 langugage||language
 lauch||launch
 layed||laid
+legnth||length
 leightweight||lightweight
 lengh||length
 lenght||length
@@ -696,6 +743,7 @@ licenceing||licencing
 loggging||logging
 loggin||login
 logile||logfile
+loobpack||loopback
 loosing||losing
 losted||lost
 machinary||machinery
@@ -703,6 +751,7 @@ maintainance||maintenance
 maintainence||maintenance
 maintan||maintain
 makeing||making
+mailformed||malformed
 malplaced||misplaced
 malplace||misplace
 managable||manageable
@@ -710,6 +759,7 @@ managment||management
 mangement||management
 manoeuvering||maneuvering
 mappping||mapping
+matchs||matches
 mathimatical||mathematical
 mathimatic||mathematic
 mathimatics||mathematics
@@ -725,6 +775,7 @@ messsage||message
 messsages||messages
 micropone||microphone
 microprocesspr||microprocessor
+migrateable||migratable
 milliseonds||milliseconds
 minium||minimum
 minimam||minimum
@@ -741,6 +792,7 @@ missmatch||mismatch
 miximum||maximum
 mmnemonic||mnemonic
 mnay||many
+modfiy||modify
 modulues||modules
 momery||memory
 memomry||memory
@@ -777,6 +829,7 @@ notifed||notified
 numebr||number
 numner||number
 obtaion||obtain
+obusing||abusing
 occassionally||occasionally
 occationally||occasionally
 occurance||occurrence
@@ -787,6 +840,7 @@ occure||occurred
 occured||occurred
 occuring||occurring
 offet||offset
+offloded||offloaded
 omited||omitted
 omiting||omitting
 omitt||omit
@@ -829,6 +883,7 @@ parametes||parameters
 parametised||parametrised
 paramter||parameter
 paramters||parameters
+parmaters||parameters
 particuarly||particularly
 particularily||particularly
 partiton||partition
@@ -837,6 +892,7 @@ passin||passing
 pathes||paths
 pecularities||peculiarities
 peformance||performance
+peforming||performing
 peice||piece
 pendantic||pedantic
 peprocessor||preprocessor
@@ -846,6 +902,7 @@ peroid||period
 persistance||persistence
 persistant||persistent
 plalform||platform
+platfoem||platform
 platfrom||platform
 plattform||platform
 pleaes||please
@@ -858,6 +915,7 @@ posible||possible
 positon||position
 possibilites||possibilities
 powerfull||powerful
+preamle||preamble
 preample||preamble
 preapre||prepare
 preceeded||preceded
@@ -870,6 +928,7 @@ prefered||preferred
 prefferably||preferably
 premption||preemption
 prepaired||prepared
+preperation||preparation
 pressre||pressure
 primative||primitive
 princliple||principle
@@ -935,6 +994,7 @@ recommanded||recommended
 recyle||recycle
 redircet||redirect
 redirectrion||redirection
+redundacy||redundancy
 reename||rename
 refcounf||refcount
 refence||reference
@@ -945,6 +1005,7 @@ refernces||references
 refernnce||reference
 refrence||reference
 registerd||registered
+registeration||registration
 registeresd||registered
 registerred||registered
 registes||registers
@@ -973,7 +1034,9 @@ requirment||requirement
 requred||required
 requried||required
 requst||request
+reregisteration||reregistration
 reseting||resetting
+reseverd||reserved
 resizeable||resizable
 resouce||resource
 resouces||resources
@@ -982,6 +1045,7 @@ responce||response
 ressizes||resizes
 ressource||resource
 ressources||resources
+restesting||retesting
 retransmited||retransmitted
 retreived||retrieved
 retreive||retrieve
@@ -1006,6 +1070,7 @@ sacrifying||sacrificing
 safly||safely
 safty||safety
 savable||saveable
+scaleing||scaling
 scaned||scanned
 scaning||scanning
 scarch||search
@@ -1014,6 +1079,8 @@ searchs||searches
 secquence||sequence
 secund||second
 segement||segment
+semaphone||semaphore
+senario||scenario
 senarios||scenarios
 sentivite||sensitive
 separatly||separately
@@ -1025,9 +1092,13 @@ seperate||separate
 seperatly||separately
 seperator||separator
 sepperate||separate
+seqeunce||sequence
+seqeuncer||sequencer
+seqeuencer||sequencer
 sequece||sequence
 sequencial||sequential
 serveral||several
+servive||service
 setts||sets
 settting||setting
 shotdown||shutdown
@@ -1073,6 +1144,7 @@ standartization||standardization
 standart||standard
 staticly||statically
 stoped||stopped
+stoping||stopping
 stoppped||stopped
 straming||streaming
 struc||struct
@@ -1085,6 +1157,7 @@ subdirectoires||subdirectories
 suble||subtle
 substract||subtract
 submition||submission
+suceed||succeed
 succesfully||successfully
 succesful||successful
 successed||succeeded
@@ -1108,6 +1181,7 @@ surpressed||suppressed
 surpresses||suppresses
 susbsystem||subsystem
 suspeneded||suspended
+suspsend||suspend
 suspicously||suspiciously
 swaping||swapping
 switchs||switches
@@ -1122,6 +1196,7 @@ swtich||switch
 symetric||symmetric
 synax||syntax
 synchonized||synchronized
+synchronuously||synchronously
 syncronize||synchronize
 syncronized||synchronized
 syncronizing||synchronizing
@@ -1130,11 +1205,14 @@ syste||system
 sytem||system
 sythesis||synthesis
 taht||that
+tansmit||transmit
 targetted||targeted
 targetting||targeting
+taskelt||tasklet
 teh||the
 temorary||temporary
 temproarily||temporarily
+thead||thread
 therfore||therefore
 thier||their
 threds||threads
@@ -1143,11 +1221,14 @@ thresold||threshold
 throught||through
 troughput||throughput
 thses||these
+tiggers||triggers
 tiggered||triggered
 tipically||typically
+timeing||timing
 timout||timeout
 tmis||this
 torerable||tolerable
+traking||tracking
 tramsmitted||transmitted
 tramsmit||transmit
 tranasction||transaction
@@ -1162,6 +1243,7 @@ transormed||transformed
 trasfer||transfer
 trasmission||transmission
 treshold||threshold
+trigerred||triggered
 trigerring||triggering
 trun||turn
 tunning||tuning
@@ -1169,6 +1251,8 @@ ture||true
 tyep||type
 udpate||update
 uesd||used
+uknown||unknown
+usupported||unsupported
 uncommited||uncommitted
 unconditionaly||unconditionally
 underun||underrun
@@ -1181,11 +1265,14 @@ unexpeted||unexpected
 unexpexted||unexpected
 unfortunatelly||unfortunately
 unifiy||unify
+uniterrupted||uninterrupted
 unintialized||uninitialized
 unkmown||unknown
 unknonw||unknown
 unknow||unknown
 unkown||unknown
+unamed||unnamed
+uneeded||unneeded
 unneded||unneeded
 unneccecary||unnecessary
 unneccesary||unnecessary
@@ -1210,6 +1297,7 @@ usefull||useful
 usege||usage
 usera||users
 usualy||usually
+usupported||unsupported
 utilites||utilities
 utillities||utilities
 utilties||utilities
@@ -1233,7 +1321,9 @@ virtaul||virtual
 virtiual||virtual
 visiters||visitors
 vitual||virtual
+vunerable||vulnerable
 wakeus||wakeups
+wathdog||watchdog
 wating||waiting
 wiat||wait
 wether||whether
diff --git a/scripts/split-man.pl b/scripts/split-man.pl
new file mode 100755
index 000000000000..c3db607ee9ec
--- /dev/null
+++ b/scripts/split-man.pl
@@ -0,0 +1,28 @@
+#!/usr/bin/perl
+# SPDX-License-Identifier: GPL-2.0
+#
+# Author: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
+#
+# Produce manpages from kernel-doc.
+# See Documentation/doc-guide/kernel-doc.rst for instructions
+if ($#ARGV < 0) {
+   die "where do I put the results?\n";
+}
+mkdir $ARGV[0],0777;
+$state = 0;
+while (<STDIN>) {
+    if (/^\.TH \"[^\"]*\" 9 \"([^\"]*)\"/) {
+        if ($state == 1) { close OUT }
+        $state = 1;
+        $fn = "$ARGV[0]/$1.9";
+        print STDERR "Creating $fn\n";
+        open OUT, ">$fn" or die "can't open $fn: $!\n";
+        print OUT $_;
+    } elsif ($state != 0) {
+        print OUT $_;
+    }
+}
+close OUT;
diff --git a/scripts/subarch.include b/scripts/subarch.include
new file mode 100644
index 000000000000..650682821126
--- /dev/null
+++ b/scripts/subarch.include
@@ -0,0 +1,13 @@
+# SUBARCH tells the usermode build what the underlying arch is.  That is set
+# first, and if a usermode build is happening, the "ARCH=um" on the command
+# line overrides the setting of ARCH below.  If a native build is happening,
+# then ARCH is assigned, getting whatever value it gets normally, and
+# SUBARCH is subsequently ignored.
+SUBARCH := $(shell uname -m | sed -e s/i.86/x86/ -e s/x86_64/x86/ \
+                                  -e s/sun4u/sparc64/ \
+                                  -e s/arm.*/arm/ -e s/sa110/arm/ \
+                                  -e s/s390x/s390/ -e s/parisc64/parisc/ \
+                                  -e s/ppc.*/powerpc/ -e s/mips.*/mips/ \
+                                  -e s/sh[234].*/sh/ -e s/aarch64.*/arm64/ \
+                                  -e s/riscv.*/riscv/)
diff --git a/scripts/tags.sh b/scripts/tags.sh
index 78e546ff689c..4fa070f9231a 100755
--- a/scripts/tags.sh
+++ b/scripts/tags.sh
@@ -28,20 +28,11 @@ fi
 # ignore userspace tools
 ignore="$ignore ( -path ${tree}tools ) -prune -o"
-# Find all available archs
-find_all_archs()
-{
-        ALLSOURCE_ARCHS=""
-        for arch in `ls ${tree}arch`; do
-                ALLSOURCE_ARCHS="${ALLSOURCE_ARCHS} "${arch##\/}
-        done
-}
 # Detect if ALLSOURCE_ARCHS is set. If not, we assume SRCARCH
 if [ "${ALLSOURCE_ARCHS}" = "" ]; then
        ALLSOURCE_ARCHS=${SRCARCH}
 elif [ "${ALLSOURCE_ARCHS}" = "all" ]; then
-        find_all_archs
+        ALLSOURCE_ARCHS=$(find ${tree}arch/ -mindepth 1 -maxdepth 1 -type d -printf '%f ')
 fi
 # find sources in arch/$ARCH
@@ -161,6 +152,7 @@ regex_asm=(
 )
 regex_c=(
        '/^SYSCALL_DEFINE[0-9](\([[:alnum:]_]*\).*/sys_\1/'
+        '/^BPF_CALL_[0-9](\([[:alnum:]_]*\).*/\1/'
        '/^COMPAT_SYSCALL_DEFINE[0-9](\([[:alnum:]_]*\).*/compat_sys_\1/'
        '/^TRACE_EVENT(\([[:alnum:]_]*\).*/trace_\1/'
        '/^TRACE_EVENT(\([[:alnum:]_]*\).*/trace_\1_rcuidle/'
@@ -188,9 +180,9 @@ regex_c=(
        '/\<CLEARPAGEFLAG_NOOP(\([[:alnum:]_]*\).*/ClearPage\1/'
        '/\<__CLEARPAGEFLAG_NOOP(\([[:alnum:]_]*\).*/__ClearPage\1/'
        '/\<TESTCLEARFLAG_FALSE(\([[:alnum:]_]*\).*/TestClearPage\1/'
-        '/^PAGE_MAPCOUNT_OPS(\([[:alnum:]_]*\).*/Page\1/'
+        '/^PAGE_TYPE_OPS(\([[:alnum:]_]*\).*/Page\1/'
-        '/^PAGE_MAPCOUNT_OPS(\([[:alnum:]_]*\).*/__SetPage\1/'
+        '/^PAGE_TYPE_OPS(\([[:alnum:]_]*\).*/__SetPage\1/'
-        '/^PAGE_MAPCOUNT_OPS(\([[:alnum:]_]*\).*/__ClearPage\1/'
+        '/^PAGE_TYPE_OPS(\([[:alnum:]_]*\).*/__ClearPage\1/'
        '/^TASK_PFA_TEST([^,]*, *\([[:alnum:]_]*\))/task_\1/'
        '/^TASK_PFA_SET([^,]*, *\([[:alnum:]_]*\))/task_set_\1/'
        '/^TASK_PFA_CLEAR([^,]*, *\([[:alnum:]_]*\))/task_clear_\1/'
@@ -211,7 +203,7 @@ regex_c=(
        '/\<DECLARE_\(TASKLET\|WORK\|DELAYED_WORK\)(\([[:alnum:]_]*\)/\2/v/'
        '/\(^\s\)OFFSET(\([[:alnum:]_]*\)/\2/v/'
        '/\(^\s\)DEFINE(\([[:alnum:]_]*\)/\2/v/'
-        '/\<DEFINE_HASHTABLE(\([[:alnum:]_]*\)/\1/v/'
+        '/\<\(DEFINE\|DECLARE\)_HASHTABLE(\([[:alnum:]_]*\)/\2/v/'
 )
 regex_kconfig=(
        '/^[[:blank:]]*\(menu\|\)config[[:blank:]]\+\([[:alnum:]_]\+\)/\2/'
@@ -254,7 +246,7 @@ exuberant()
 {
        setup_regex exuberant asm c
        all_target_sources | xargs $1 -a                        \
-        -I __initdata,__exitdata,__initconst,                   \
+        -I __initdata,__exitdata,__initconst,__ro_after_init    \
        -I __initdata_memblock                                  \
        -I __refdata,__attribute,__maybe_unused,__always_unused \
        -I __acquires,__releases,__deprecated                   \
diff --git a/scripts/tracing/draw_functrace.py b/scripts/tracing/draw_functrace.py
index db40fa04cd51..9b6dd4f36335 100755
--- a/scripts/tracing/draw_functrace.py
+++ b/scripts/tracing/draw_functrace.py
@@ -123,7 +123,7 @@ def main():
                tree = tree.getParent(caller)
                tree = tree.calls(callee, calltime)
-        print CallTree.ROOT
+        print(CallTree.ROOT)
 if __name__ == "__main__":
        main()
diff --git a/scripts/ver_linux b/scripts/ver_linux
index 545ec7388eb7..a6c728db05ce 100755
--- a/scripts/ver_linux
+++ b/scripts/ver_linux
@@ -13,28 +13,28 @@ BEGIN {
        system("uname -a")
        printf("\n")
-        printversion("GNU C", version("gcc -dumpversion 2>&1"))
+        printversion("GNU C", version("gcc -dumpversion"))
-        printversion("GNU Make", version("make --version 2>&1"))
+        printversion("GNU Make", version("make --version"))
-        printversion("Binutils", version("ld -v 2>&1"))
+        printversion("Binutils", version("ld -v"))
-        printversion("Util-linux", version("mount --version 2>&1"))
+        printversion("Util-linux", version("mount --version"))
-        printversion("Mount", version("mount --version 2>&1"))
+        printversion("Mount", version("mount --version"))
-        printversion("Module-init-tools", version("depmod -V  2>&1"))
+        printversion("Module-init-tools", version("depmod -V"))
-        printversion("E2fsprogs", version("tune2fs 2>&1"))
+        printversion("E2fsprogs", version("tune2fs"))
-        printversion("Jfsutils", version("fsck.jfs -V 2>&1"))
+        printversion("Jfsutils", version("fsck.jfs -V"))
-        printversion("Reiserfsprogs", version("reiserfsck -V 2>&1"))
+        printversion("Reiserfsprogs", version("reiserfsck -V"))
-        printversion("Reiser4fsprogs", version("fsck.reiser4 -V 2>&1"))
+        printversion("Reiser4fsprogs", version("fsck.reiser4 -V"))
-        printversion("Xfsprogs", version("xfs_db -V 2>&1"))
+        printversion("Xfsprogs", version("xfs_db -V"))
-        printversion("Pcmciautils", version("pccardctl -V 2>&1"))
+        printversion("Pcmciautils", version("pccardctl -V"))
-        printversion("Pcmcia-cs", version("cardmgr -V 2>&1"))
+        printversion("Pcmcia-cs", version("cardmgr -V"))
-        printversion("Quota-tools", version("quota -V 2>&1"))
+        printversion("Quota-tools", version("quota -V"))
-        printversion("PPP", version("pppd --version 2>&1"))
+        printversion("PPP", version("pppd --version"))
-        printversion("Isdn4k-utils", version("isdnctrl 2>&1"))
+        printversion("Isdn4k-utils", version("isdnctrl"))
-        printversion("Nfs-utils", version("showmount --version 2>&1"))
+        printversion("Nfs-utils", version("showmount --version"))
-        if (system("test -r /proc/self/maps") == 0) {
+        while (getline <"/proc/self/maps" > 0) {
-                while (getline <"/proc/self/maps" > 0) {
+                if (/libc.*\.so$/) {
                        n = split($0, procmaps, "/")
-                        if (/libc.*so$/ && match(procmaps[n], /[0-9]+([.]?[0-9]+)+/)) {
+                        if (match(procmaps[n], /[0-9]+([.]?[0-9]+)+/)) {
                                ver = substr(procmaps[n], RSTART, RLENGTH)
                                printversion("Linux C Library", ver)
                                break
@@ -42,7 +42,7 @@ BEGIN {
                }
        }
-        printversion("Dynamic linker (ldd)", version("ldd --version 2>&1"))
+        printversion("Dynamic linker (ldd)", version("ldd --version"))
        while ("ldconfig -p 2>/dev/null" | getline > 0) {
                if (/(libg|stdc)[+]+\.so/) {
@@ -50,30 +50,27 @@ BEGIN {
                        break
                }
        }
-        if (system("test -r " libcpp) == 0)
+        printversion("Linux C++ Library", version("readlink " libcpp))
-                printversion("Linux C++ Library", version("readlink " libcpp))
+        printversion("Procps", version("ps --version"))
+        printversion("Net-tools", version("ifconfig --version"))
+        printversion("Kbd", version("loadkeys -V"))
+        printversion("Console-tools", version("loadkeys -V"))
+        printversion("Oprofile", version("oprofiled --version"))
+        printversion("Sh-utils", version("expr --v"))
+        printversion("Udev", version("udevadm --version"))
+        printversion("Wireless-tools", version("iwconfig --version"))
-        printversion("Procps", version("ps --version 2>&1"))
+        while ("sort /proc/modules" | getline > 0) {
-        printversion("Net-tools", version("ifconfig --version 2>&1"))
+                mods = mods sep $1
-        printversion("Kbd", version("loadkeys -V 2>&1"))
+                sep = " "
-        printversion("Console-tools", version("loadkeys -V 2>&1"))
-        printversion("Oprofile", version("oprofiled --version 2>&1"))
-        printversion("Sh-utils", version("expr --v 2>&1"))
-        printversion("Udev", version("udevadm --version 2>&1"))
-        printversion("Wireless-tools", version("iwconfig --version 2>&1"))
-        if (system("test -r /proc/modules") == 0) {
-                while ("sort /proc/modules" | getline > 0) {
-                        mods = mods sep $1
-                        sep = " "
-                }
-                printversion("Modules Loaded", mods)
        }
+        printversion("Modules Loaded", mods)
 }
 function version(cmd,    ver) {
+        cmd = cmd " 2>&1"
        while (cmd | getline > 0) {
-                if (!/ver_linux/ && match($0, /[0-9]+([.]?[0-9]+)+/)) {
+                if (match($0, /[0-9]+([.]?[0-9]+)+/)) {
                        ver = substr($0, RSTART, RLENGTH)
                        break
                }