diff options
| author | Sascha Hauer <sha@octopus.labnet.pengutronix.de> | 2007-09-27 12:22:38 +0200 |
|---|---|---|
| committer | Sascha Hauer <sha@octopus.labnet.pengutronix.de> | 2007-09-27 12:22:38 +0200 |
| commit | 299434c85ef733727ba2d7fd1280a8e421a46f10 (patch) | |
| tree | aa0f404a56aaa044680ce679c177fd8af6870371 /common | |
| parent | 811acbb52d8012bedb56ce07a2942fb327d03c36 (diff) | |
| parent | 1f9506e7eea97aba22efea39ba93d1f2de1a9a73 (diff) | |
| download | barebox-299434c85ef733727ba2d7fd1280a8e421a46f10.tar.gz barebox-299434c85ef733727ba2d7fd1280a8e421a46f10.tar.xz | |
Merge /home/git/users/rsc/u-boot-v2
Diffstat (limited to 'common')
| -rw-r--r-- | common/Kconfig | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/common/Kconfig b/common/Kconfig index 18788368b7..f346d15ac5 100644 --- a/common/Kconfig +++ b/common/Kconfig @@ -10,6 +10,7 @@ config BOARDINFO config TEXT_BASE prompt "TEXT_BASE" hex + default ARCH_TEXT_BASE help The Address U-Boot gets linked at. @@ -68,12 +69,11 @@ config MAXARGS choice prompt "Select your shell" -config SHELL_HUSH - bool "hush parser" - default y + config SHELL_HUSH + bool "hush parser" -config SHELL_SIMPLE - bool "Simple parser" + config SHELL_SIMPLE + bool "Simple parser" endchoice |