Commit 45e3e193 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-next 

* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-next: (53 commits)
  .gitignore: ignore *.lzma files
  kbuild: add generic --set-str option to scripts/config
  kbuild: simplify argument loop in scripts/config
  kbuild: handle non-existing options in scripts/config
  kallsyms: generalize text region handling
  kallsyms: support kernel symbols in Blackfin on-chip memory
  documentation: make version fix
  kbuild: fix a compile warning
  gitignore: Add GNU GLOBAL files to top .gitignore
  kbuild: fix delay in setlocalversion on readonly source
  README: fix misleading pointer to the defconf directory
  vmlinux.lds.h update
  kernel-doc: cleanup perl script
  Improve vmlinux.lds.h support for arch specific linker scripts
  kbuild: fix headers_exports with boolean expression
  kbuild/headers_check: refine extern check
  kbuild: fix "Argument list too long" error for "make headers_check",
  ignore *.patch files
  Remove bashisms from scripts
  menu: fix embedded menu presentation
  ...
parents cf504632 3f8d9ced

.gitignore

+8 −0
Original line number Diff line number Diff line
@@ -25,6 +25,8 @@ 
*.elf

*.bin

*.gz

*.lzma

*.patch



#

# Top-level generic files
@@ -62,6 +64,12 @@ series 
cscope.*

ncscope.*



# gnu global files

GPATH

GRTAGS

GSYMS

GTAGS



*.orig

*~

\#*#

Documentation/Changes

+2 −2
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ hardware, for example, you probably needn't concern yourself with 
isdn4k-utils.



o  Gnu C                  3.2                     # gcc --version

o  Gnu make               3.79.1                  # make --version

o  Gnu make               3.80                    # make --version

o  binutils               2.12                    # ld -v

o  util-linux             2.10o                   # fdformat --version

o  module-init-tools      0.9.10                  # depmod -V
@@ -62,7 +62,7 @@ computer. 
Make

----



You will need Gnu make 3.79.1 or later to build the kernel.

You will need Gnu make 3.80 or later to build the kernel.



Binutils

--------

Documentation/kbuild/kconfig.txt

+60 −56
Original line number Diff line number Diff line
@@ -35,48 +35,26 @@ new .config files to see the differences: 


(Yes, we need something better here.)





======================================================================

menuconfig

--------------------------------------------------



SEARCHING for CONFIG symbols



Searching in menuconfig:



	The Search function searches for kernel configuration symbol

	names, so you have to know something close to what you are

	looking for.



	Example:

		/hotplug

		This lists all config symbols that contain "hotplug",

		e.g., HOTPLUG, HOTPLUG_CPU, MEMORY_HOTPLUG.



	For search help, enter / followed TAB-TAB-TAB (to highlight

	<Help>) and Enter.  This will tell you that you can also use

	regular expressions (regexes) in the search string, so if you

	are not interested in MEMORY_HOTPLUG, you could try



		/^hotplug





______________________________________________________________________

Color Themes for 'menuconfig'

Environment variables for '*config'



It is possible to select different color themes using the variable

MENUCONFIG_COLOR.  To select a theme use:

KCONFIG_CONFIG

--------------------------------------------------

This environment variable can be used to specify a default kernel config

file name to override the default name of ".config".



	make MENUCONFIG_COLOR=<theme> menuconfig

KCONFIG_OVERWRITECONFIG

--------------------------------------------------

If you set KCONFIG_OVERWRITECONFIG in the environment, Kconfig will not

break symlinks when .config is a symlink to somewhere else.



Available themes are:

  mono       => selects colors suitable for monochrome displays

  blackbg    => selects a color scheme with black background

  classic    => theme with blue background. The classic look

  bluetitle  => a LCD friendly version of classic. (default)

KCONFIG_NOTIMESTAMP

--------------------------------------------------

If this environment variable exists and is non-null, the timestamp line

in generated .config files is omitted.



______________________________________________________________________

Environment variables in 'menuconfig'

Environment variables for '{allyes/allmod/allno/rand}config'



KCONFIG_ALLCONFIG

--------------------------------------------------
@@ -95,8 +73,7 @@ values. 
This enables you to create "miniature" config (miniconfig) or custom

config files containing just the config symbols that you are interested

in.  Then the kernel config system generates the full .config file,

including dependencies of your miniconfig file, based on the miniconfig

file.

including symbols of your miniconfig file.



This 'KCONFIG_ALLCONFIG' file is a config file which contains

(usually a subset of all) preset config symbols.  These variable
@@ -113,26 +90,14 @@ These examples will disable most options (allnoconfig) but enable or 
disable the options that are explicitly listed in the specified

mini-config files.



______________________________________________________________________

Environment variables for 'silentoldconfig'



KCONFIG_NOSILENTUPDATE

--------------------------------------------------

If this variable has a non-blank value, it prevents silent kernel

config udpates (requires explicit updates).



KCONFIG_CONFIG

--------------------------------------------------

This environment variable can be used to specify a default kernel config

file name to override the default name of ".config".



KCONFIG_OVERWRITECONFIG

--------------------------------------------------

If you set KCONFIG_OVERWRITECONFIG in the environment, Kconfig will not

break symlinks when .config is a symlink to somewhere else.



KCONFIG_NOTIMESTAMP

--------------------------------------------------

If this environment variable exists and is non-null, the timestamp line

in generated .config files is omitted.



KCONFIG_AUTOCONFIG

--------------------------------------------------

This environment variable can be set to specify the path & name of the
@@ -143,15 +108,54 @@ KCONFIG_AUTOHEADER 
This environment variable can be set to specify the path & name of the

"autoconf.h" (header) file.  Its default value is "include/linux/autoconf.h".





======================================================================

menuconfig

--------------------------------------------------



SEARCHING for CONFIG symbols



Searching in menuconfig:



	The Search function searches for kernel configuration symbol

	names, so you have to know something close to what you are

	looking for.



	Example:

		/hotplug

		This lists all config symbols that contain "hotplug",

		e.g., HOTPLUG, HOTPLUG_CPU, MEMORY_HOTPLUG.



	For search help, enter / followed TAB-TAB-TAB (to highlight

	<Help>) and Enter.  This will tell you that you can also use

	regular expressions (regexes) in the search string, so if you

	are not interested in MEMORY_HOTPLUG, you could try



		/^hotplug



______________________________________________________________________

menuconfig User Interface Options

----------------------------------------------------------------------

User interface options for 'menuconfig'



MENUCONFIG_COLOR

--------------------------------------------------

It is possible to select different color themes using the variable

MENUCONFIG_COLOR.  To select a theme use:



	make MENUCONFIG_COLOR=<theme> menuconfig



Available themes are:

  mono       => selects colors suitable for monochrome displays

  blackbg    => selects a color scheme with black background

  classic    => theme with blue background. The classic look

  bluetitle  => a LCD friendly version of classic. (default)



MENUCONFIG_MODE

--------------------------------------------------

This mode shows all sub-menus in one large tree.



Example:

	MENUCONFIG_MODE=single_menu make menuconfig

	make MENUCONFIG_MODE=single_menu menuconfig





======================================================================

xconfig

Documentation/kbuild/modules.txt

+1 −1
Original line number Diff line number Diff line
@@ -275,7 +275,7 @@ following files: 


		KERNELDIR := /lib/modules/`uname -r`/build

		all::

			$(MAKE) -C $KERNELDIR M=`pwd` $@

			$(MAKE) -C $(KERNELDIR) M=`pwd` $@



		# Module specific targets

		genbin:

Makefile

+9 −17
Original line number Diff line number Diff line
@@ -35,11 +35,9 @@ MAKEFLAGS += -rR --no-print-directory 
# To put more focus on warnings, be less verbose as default

# Use 'make V=1' to see the full commands



ifdef V

ifeq ("$(origin V)", "command line")

  KBUILD_VERBOSE = $(V)

endif

endif

ifndef KBUILD_VERBOSE

  KBUILD_VERBOSE = 0

endif
@@ -54,11 +52,9 @@ endif 
# See the file "Documentation/sparse.txt" for more details, including

# where to get the "sparse" utility.



ifdef C

ifeq ("$(origin C)", "command line")

  KBUILD_CHECKSRC = $(C)

endif

endif

ifndef KBUILD_CHECKSRC

  KBUILD_CHECKSRC = 0

endif
@@ -69,12 +65,10 @@ endif 
ifdef SUBDIRS

  KBUILD_EXTMOD ?= $(SUBDIRS)

endif

ifdef M



ifeq ("$(origin M)", "command line")

  KBUILD_EXTMOD := $(M)

endif

endif





# kbuild supports saving output files in a separate directory.

# To locate output files in a separate directory two syntaxes are supported.
@@ -98,11 +92,9 @@ ifeq ($(KBUILD_SRC),) 


# OK, Make called in directory where kernel src resides

# Do we want to locate output files in a separate directory?

ifdef O

ifeq ("$(origin O)", "command line")

  KBUILD_OUTPUT := $(O)

endif

endif



# That's our default target when none is given on the command line

PHONY := _all

CRA Git | Maintained and supported by SUSTech CRA and CCSE