diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-07-11 07:38:12 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-07-11 07:38:12 +0200 |
| commit | 9d7b0ba957a665d6013c4fa53df04ac324618a40 (patch) | |
| tree | 42f5f7780f3fa9bd7a8db8b582952036e3f7569a | |
| parent | 9794ccaa8e8fe92cb961d90825249391f428c117 (diff) | |
| download | barebox-9d7b0ba957a665d6013c4fa53df04ac324618a40.tar.gz barebox-9d7b0ba957a665d6013c4fa53df04ac324618a40.tar.xz | |
Revert "ARM: OMAP: Do not show MLO/SPI image options with OMAP_MULTI_BOARDS"
The assumption that OMAP_BUILD_IFT is unused for multi board support
is wrong. It is indeed used, so revert the patch.
This reverts commit d1ec6fb0c9bb66939e85964c2f5214b117c78ecf.
| -rw-r--r-- | arch/arm/configs/am335x_mlo_defconfig | 1 | ||||
| -rw-r--r-- | arch/arm/mach-omap/Kconfig | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/configs/am335x_mlo_defconfig b/arch/arm/configs/am335x_mlo_defconfig index b8dc4e04ec..19f78d0ae8 100644 --- a/arch/arm/configs/am335x_mlo_defconfig +++ b/arch/arm/configs/am335x_mlo_defconfig @@ -1,4 +1,5 @@ CONFIG_ARCH_OMAP=y +CONFIG_OMAP_BUILD_IFT=y CONFIG_OMAP_MULTI_BOARDS=y CONFIG_MACH_BEAGLEBONE=y CONFIG_MACH_PCM051=y diff --git a/arch/arm/mach-omap/Kconfig b/arch/arm/mach-omap/Kconfig index 44585724fe..732de15fec 100644 --- a/arch/arm/mach-omap/Kconfig +++ b/arch/arm/mach-omap/Kconfig @@ -72,7 +72,6 @@ config OMAP_GPMC config OMAP_BUILD_IFT prompt "build ift binary (MLO)" - depends on !OMAP_MULTI_BOARDS bool help Say Y here if you want to build an MLO binary. On TI SoCs, this @@ -81,7 +80,6 @@ config OMAP_BUILD_IFT config OMAP_BUILD_SPI prompt "build SPI binary" - depends on !OMAP_MULTI_BOARDS bool help Say Y here if you want to build an barebox.spi image as used |