Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0455029b authored by Michal Marek's avatar Michal Marek
Browse files

Merge branch 'kbuild/kconfig/kbuild-generic-v7' of... 

Merge branch 'kbuild/kconfig/kbuild-generic-v7' of http://github.com/lacombar/linux-2.6 into kbuild/kconfig

* 'kbuild/kconfig/kbuild-generic-v7' of http://github.com/lacombar/linux-2.6:
  kbuild: migrate all arch to the kconfig mainmenu upgrade
  kconfig: expand file names
  kconfig: use the file's name of sourced file
  kconfig: constify file name
  kconfig: don't emit warning upon rootmenu's prompt redefinition
  kconfig: replace KERNELVERSION usage by the mainmenu's prompt
  kconfig: delay gconf window initialization
  kconfig: expand by default the rootmenu's prompt
  kconfig: add a symbol string expansion helper
  kconfig: regen parser
  kconfig: implement the `mainmenu' directive
  kconfig: allow PACKAGE to be defined on the compiler's command-line
  kconfig: rephrase help texts/comments not to include the package name
  kconfig: allow build-time definition of the internal config prefix
  kconfig: rephrase help text not to mention the internal prefix
  kconfig: replace a `switch()' statement by a more flexible `if()' statement
parents 8c41e5e3 838a2e55

Documentation/kbuild/kconfig-language.txt

+2 −1
Original line number Original line Diff line number Diff line
@@ -322,7 +322,8 @@ mainmenu: 
	"mainmenu" <prompt>

	"mainmenu" <prompt>





This sets the config program's title bar if the config program chooses

This sets the config program's title bar if the config program chooses

to use it.

to use it. It should be placed at the top of the configuration, before any

other statement.









Kconfig hints

Kconfig hints

Kconfig

0 → 100644
+11 −0
Original line number Original line Diff line number Diff line 
#

# For a description of the syntax of this configuration file,

# see Documentation/kbuild/kconfig-language.txt.

#

mainmenu "Linux/$ARCH $KERNELVERSION Kernel Configuration"



config SRCARCH

	string

	option env="SRCARCH"



source "arch/$SRCARCH/Kconfig"

arch/alpha/Kconfig

+0 −4
Original line number Original line Diff line number Diff line 
#

# For a description of the syntax of this configuration file,

# see Documentation/kbuild/kconfig-language.txt.

#

config ALPHA

config ALPHA

	bool

	bool

	default y

	default y

arch/arm/Kconfig

+0 −7
Original line number Original line Diff line number Diff line 
#

# For a description of the syntax of this configuration file,

# see Documentation/kbuild/kconfig-language.txt.

#



mainmenu "Linux Kernel Configuration"



config ARM

config ARM

	bool

	bool

	default y

	default y

arch/avr32/Kconfig

+0 −7
Original line number Original line Diff line number Diff line 
#

# For a description of the syntax of this configuration file,

# see Documentation/kbuild/kconfig-language.txt.

#



mainmenu "Linux Kernel Configuration"



config AVR32

config AVR32

	def_bool y

	def_bool y

	# With EMBEDDED=n, we get lots of stuff automatically selected

	# With EMBEDDED=n, we get lots of stuff automatically selected