summaryrefslogtreecommitdiffstats
path: root/arch/x86/Kconfig
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2012-12-08 12:22:21 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2012-12-08 12:22:21 +0100
commit8030ab24fa042a356b958dd1ccf0338b0d2c8418 (patch)
treea6882bc2b56ca6120ed450aa2d860361a88b8025 /arch/x86/Kconfig
parent6d7dcfbccfa2a42b16eb7529a3785fdac25c8705 (diff)
parentc209c186e0e4f3bb5731ae4593350e0bc8554bcd (diff)
downloadbarebox-8030ab24fa042a356b958dd1ccf0338b0d2c8418.tar.gz
barebox-8030ab24fa042a356b958dd1ccf0338b0d2c8418.tar.xz
Merge branch 'kconfig'
Diffstat (limited to 'arch/x86/Kconfig')
-rw-r--r--arch/x86/Kconfig15
1 files changed, 7 insertions, 8 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 711bbfe0e5..777604fafe 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -40,19 +40,18 @@ choice
prompt "Bring up type"
config X86_BIOS_BRINGUP
- prompt "16 bit BIOS"
- bool
+ bool "16 bit BIOS"
help
- Barebox will act as a BIOS based bootloader. This includes
- some 16 bit real mode code and some restrictions everyone knows
- from BIOS based systems.
+ Barebox will act as a BIOS based bootloader. This includes
+ some 16 bit real mode code and some restrictions everyone knows
+ from BIOS based systems.
config X86_NATIVE_BRINGUP
bool "native"
help
- Barebox will act as a native bootloader. This includes all the
- required initialization needed to bring up a piece of hardware.
- Note: Not implemented yet
+ Barebox will act as a native bootloader. This includes all the
+ required initialization needed to bring up a piece of hardware.
+ Note: Not implemented yet
endchoice