From 353eedb8a0d1412066fb68657d14d9248f1fb849 Mon Sep 17 00:00:00 2001
From: "Chia-Wei, Wang" <chiawei_wang@aspeedtech.com>
Date: Mon, 3 Aug 2020 17:36:09 +0800
Subject: [PATCH] configs: evb-ast2500: Move BOOTCOMMAND from header to
 defconfig

Move the BOOTCOMMAND definition from the board inclusion
header to the default configuration file.

Signed-off-by: Chia-Wei, Wang <chiawei_wang@aspeedtech.com>
---
 configs/evb-ast2500_defconfig   | 2 ++
 include/configs/aspeed-common.h | 2 --
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/configs/evb-ast2500_defconfig b/configs/evb-ast2500_defconfig
index 825fa4dae1..ce38b38183 100644
--- a/configs/evb-ast2500_defconfig
+++ b/configs/evb-ast2500_defconfig
@@ -11,6 +11,8 @@ CONFIG_PRE_CON_BUF_ADDR=0x1e720000
 CONFIG_DEFAULT_DEVICE_TREE="ast2500-evb"
 CONFIG_USE_BOOTARGS=y
 CONFIG_BOOTARGS="console=ttyS4,115200n8 root=/dev/ram rw"
+CONFIG_USE_BOOTCOMMAND=y
+CONFIG_BOOTCOMMAND="bootm 20080000 20300000"
 CONFIG_PRE_CONSOLE_BUFFER=y
 # CONFIG_DISPLAY_CPUINFO is not set
 CONFIG_HUSH_PARSER=y
diff --git a/include/configs/aspeed-common.h b/include/configs/aspeed-common.h
index 14dd5c795d..df0f5d2e76 100644
--- a/include/configs/aspeed-common.h
+++ b/include/configs/aspeed-common.h
@@ -47,8 +47,6 @@
  * Miscellaneous configurable options
  */
 
-#define CONFIG_BOOTCOMMAND		"bootm 20080000 20300000"
-
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	"verify=yes\0"	\
 	"spi_dma=yes\0" \
-- 
2.39.5