From d1ec6fb0c9bb66939e85964c2f5214b117c78ecf Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Mon, 7 Jul 2014 14:13:14 +0200 Subject: [PATCH] ARM: OMAP: Do not show MLO/SPI image options with OMAP_MULTI_BOARDS The MLO/SPI image options have no effect with OMAP_MULTI_BOARDS enabled, so do not show them. Signed-off-by: Sascha Hauer --- arch/arm/configs/am335x_mlo_defconfig | 1 - arch/arm/mach-omap/Kconfig | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm/configs/am335x_mlo_defconfig b/arch/arm/configs/am335x_mlo_defconfig index 19f78d0ae..b8dc4e04e 100644 --- a/arch/arm/configs/am335x_mlo_defconfig +++ b/arch/arm/configs/am335x_mlo_defconfig @@ -1,5 +1,4 @@ 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 732de15fe..44585724f 100644 --- a/arch/arm/mach-omap/Kconfig +++ b/arch/arm/mach-omap/Kconfig @@ -72,6 +72,7 @@ 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 @@ -80,6 +81,7 @@ 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