From 48dce3bfd93f1cd9766bc6afe3c403bef0254bbc Mon Sep 17 00:00:00 2001
From: Tom Rini <trini@konsulko.com>
Date: Fri, 3 Mar 2017 15:33:30 -0500
Subject: [PATCH] am335x_evm: Switch to using imply keyword

These particular SPL options are part of what the ROM provides, but for
compatibility with how we have previously used them, move them to being
implied by the board being selected.

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 arch/arm/mach-omap2/am33xx/Kconfig | 3 +++
 board/ti/am335x/Kconfig            | 9 ---------
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/arch/arm/mach-omap2/am33xx/Kconfig b/arch/arm/mach-omap2/am33xx/Kconfig
index 5b5d3f8cec..5adcead185 100644
--- a/arch/arm/mach-omap2/am33xx/Kconfig
+++ b/arch/arm/mach-omap2/am33xx/Kconfig
@@ -15,6 +15,9 @@ config TARGET_AM335X_EVM
 	select DM_SERIAL
 	select DM_GPIO
 	select TI_I2C_BOARD_DETECT
+	imply SPL_YMODEM_SUPPORT
+	imply SPL_ENV_SUPPORT
+	imply SPL_WATCHDOG_SUPPORT
 	help
 	  This option specifies support for the AM335x
 	  GP and HS EVM development platforms. The AM335x
diff --git a/board/ti/am335x/Kconfig b/board/ti/am335x/Kconfig
index a84e91b3dc..97374bdc12 100644
--- a/board/ti/am335x/Kconfig
+++ b/board/ti/am335x/Kconfig
@@ -1,14 +1,5 @@
 if TARGET_AM335X_EVM
 
-config SPL_ENV_SUPPORT
-	default y
-
-config SPL_WATCHDOG_SUPPORT
-	default y
-
-config SPL_YMODEM_SUPPORT
-	default y
-
 config SYS_BOARD
 	default "am335x"
 
-- 
2.39.5