summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2016-10-10 08:31:06 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2016-10-10 08:31:06 +0200
commitdb9c78d57949cdd4c2c019eba9bd193c3171eb4d (patch)
tree79234eed17e54e07d38214b0186e05f775f220d9 /arch/arm/mach-omap
parentc80ba33cbe1eb2331a0544d0f553d73e091bb322 (diff)
parent790980bf18af13f5d72a31b49febd7086cf307af (diff)
downloadbarebox-db9c78d57949cdd4c2c019eba9bd193c3171eb4d.tar.gz
barebox-db9c78d57949cdd4c2c019eba9bd193c3171eb4d.tar.xz
Merge branch 'for-next/defenv'
Diffstat (limited to 'arch/arm/mach-omap')
-rw-r--r--arch/arm/mach-omap/Kconfig3
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/arm/mach-omap/Kconfig b/arch/arm/mach-omap/Kconfig
index a1bb8f064b..93fa35a208 100644
--- a/arch/arm/mach-omap/Kconfig
+++ b/arch/arm/mach-omap/Kconfig
@@ -155,7 +155,6 @@ config OMAP_SERIALBOOT
config OMAP_MULTI_BOARDS
bool "Allow multiple boards to be selected"
- select HAVE_DEFAULT_ENVIRONMENT_NEW
select HAVE_PBL_MULTI_IMAGES
if OMAP_MULTI_BOARDS
@@ -168,7 +167,6 @@ config MACH_AFI_GF
config MACH_BEAGLE
bool "Texas Instrument's Beagle Board"
- select HAVE_DEFAULT_ENVIRONMENT_NEW
select ARCH_OMAP3
help
Say Y here if you are using Beagle Board
@@ -211,7 +209,6 @@ config MACH_OMAP3EVM
config MACH_PANDA
bool "Texas Instrument's Panda Board"
- select HAVE_DEFAULT_ENVIRONMENT_NEW
select ARCH_OMAP4
help
Say Y here if you are using OMAP4 Panda board