[PATCH u-boot-marvell 02/12] arm: mvebu: turris_mox: Move options to defconfig

[Marek Behún]

From: Marek Behún <marek.behun at nic.cz>

Move config options CONFIG_LAST_STAGE_INIT and
CONFIG_DISPLAY_BOARDINFO_LATE to turris_mox_defconfig.

Signed-off-by: Marek Behún <marek.behun at nic.cz>
---
 configs/turris_mox_defconfig | 2 ++
 include/configs/turris_mox.h | 7 -------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/configs/turris_mox_defconfig b/configs/turris_mox_defconfig
index 6ff551e477..e494aebecc 100644
--- a/configs/turris_mox_defconfig
+++ b/configs/turris_mox_defconfig
@@ -24,7 +24,9 @@ CONFIG_USE_PREBOOT=y
 CONFIG_SYS_CONSOLE_INFO_QUIET=y
 # CONFIG_DISPLAY_CPUINFO is not set
 # CONFIG_DISPLAY_BOARDINFO is not set
+CONFIG_DISPLAY_BOARDINFO_LATE=y
 CONFIG_ARCH_EARLY_INIT_R=y
+CONFIG_LAST_STAGE_INIT=y
 CONFIG_MISC_INIT_R=y
 CONFIG_CMD_SHA1SUM=y
 CONFIG_CMD_CLK=y
diff --git a/include/configs/turris_mox.h b/include/configs/turris_mox.h
index 0bbc984753..0fcf216eb1 100644
--- a/include/configs/turris_mox.h
+++ b/include/configs/turris_mox.h
@@ -10,13 +10,6 @@
 
 #define CONFIG_SYS_BOOTM_LEN (64 << 20)
 
-#define CONFIG_LAST_STAGE_INIT
-
-/*
- * High Level Configuration Options (easy to change)
- */
-#define CONFIG_DISPLAY_BOARDINFO_LATE
-
 /* additions for new ARM relocation support */
 #define CONFIG_SYS_SDRAM_BASE	0x00000000
 
-- 
2.32.0