diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-01-09 10:29:08 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-01-09 10:29:08 +0100 |
| commit | b0ab3c220fad2b60272209649e738ed72a487b5f (patch) | |
| tree | e92cd1b77dcd42ad70c93b5f97c4dc5a41ee5b82 /arch | |
| parent | 249743351674de358783f0d0ca59cf257e6414f5 (diff) | |
| parent | 20592f277c8248fb5a739c393215c2d4215584e9 (diff) | |
| download | barebox-b0ab3c220fad2b60272209649e738ed72a487b5f.tar.gz barebox-b0ab3c220fad2b60272209649e738ed72a487b5f.tar.xz | |
Merge branch 'for-next/misc'
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-omap/Kconfig | 1 | ||||
| -rw-r--r-- | arch/x86/Kconfig | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-omap/Kconfig b/arch/arm/mach-omap/Kconfig index 27626a2cbd..fa33da1838 100644 --- a/arch/arm/mach-omap/Kconfig +++ b/arch/arm/mach-omap/Kconfig @@ -59,7 +59,6 @@ config OMAP3_CLOCK_CONFIG config OMAP_GPMC prompt "Support for GPMC configuration" bool - depends on (ARCH_OMAP2 || ARCH_OMAP3 || ARCH_OMAP4) default y help Enable this if you use Texas Instrument's General purpose Memory diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 777604fafe..6589ae7a64 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -25,6 +25,9 @@ config X86 select HAVE_CONFIGURABLE_TEXT_BASE default y +config X86_BOOTLOADER + bool + choice prompt "Select your board" |