diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-12-08 12:22:21 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-12-08 12:22:21 +0100 |
| commit | 8030ab24fa042a356b958dd1ccf0338b0d2c8418 (patch) | |
| tree | a6882bc2b56ca6120ed450aa2d860361a88b8025 /common | |
| parent | 6d7dcfbccfa2a42b16eb7529a3785fdac25c8705 (diff) | |
| parent | c209c186e0e4f3bb5731ae4593350e0bc8554bcd (diff) | |
| download | barebox-8030ab24fa042a356b958dd1ccf0338b0d2c8418.tar.gz barebox-8030ab24fa042a356b958dd1ccf0338b0d2c8418.tar.xz | |
Merge branch 'kconfig'
Diffstat (limited to 'common')
| -rw-r--r-- | common/Kconfig | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/common/Kconfig b/common/Kconfig index 57119dcbd4..b60b78bb89 100644 --- a/common/Kconfig +++ b/common/Kconfig @@ -61,7 +61,7 @@ config STDDEV config BAREBOX_UPDATE bool -menu "General Settings " +menu "General Settings" config LOCALVERSION string "Local version - append to the version string" @@ -69,7 +69,7 @@ config LOCALVERSION Append an extra string to the end of your version string. The string you set here will be appended after the contents of any files with a filename matching localversion* in your - object and source tree, in that order. Your total string can + object and source tree, in that order. Your total string can be a maximum of 64 characters. config LOCALVERSION_AUTO @@ -81,7 +81,7 @@ config LOCALVERSION_AUTO top of tree revision. A string of the format -gxxxxxxxx will be added to the localversion - if a git-based tree is found. The string generated by this will be + if a git-based tree is found. The string generated by this will be appended after any matching localversion* files, and after the value set in CONFIG_LOCALVERSION. @@ -106,7 +106,7 @@ config MEMINFO config ENVIRONMENT_VARIABLES bool "environment variables support" -menu "memory layout " +menu "memory layout" config HAVE_PBL_IMAGE bool @@ -196,7 +196,7 @@ config MEMORY_LAYOUT_DEFAULT bool "use default memory layout" help select this option to use bareboxs standard memory layout: - + stack ----- malloc heap @@ -409,8 +409,8 @@ config MENU prompt "Menu Framework" depends on PROCESS_ESCAPE_SEQUENCE help - a menu framework that allow us to create list menu to simplify - barebox and make it more user-frendly + a menu framework that allow us to create list menu to simplify + barebox and make it more user-frendly config PASSWORD bool @@ -635,7 +635,7 @@ config RESET_SOURCE endmenu -menu "Debugging " +menu "Debugging" config DEBUG_INFO bool |