From: Tom Rini <trini@konsulko.com>
Date: Sat, 9 Nov 2019 22:33:49 +0000 (-0500)
Subject: evb-rk3128: Migrate CONFIG_ENV_IS_IN_MMC to defconfig
X-Git-Tag: v2020.01-rc3~6^2~2
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=ba0afaee85ae1e060673b200e53629f9a5f9b074;p=oweals%2Fu-boot.git

evb-rk3128: Migrate CONFIG_ENV_IS_IN_MMC to defconfig

This board is setting CONFIG_ENV_IS_IN_MMC in the header rather than
defconfig, fix.

Cc: Kever Yang <kever.yang@rock-chips.com>
Signed-off-by: Tom Rini <trini@konsulko.com>
---

diff --git a/configs/evb-rk3128_defconfig b/configs/evb-rk3128_defconfig
index ec2f143dde..cb3c5372aa 100644
--- a/configs/evb-rk3128_defconfig
+++ b/configs/evb-rk3128_defconfig
@@ -17,6 +17,7 @@ CONFIG_CMD_USB_MASS_STORAGE=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_TIME=y
 CONFIG_DEFAULT_DEVICE_TREE="rk3128-evb"
+CONFIG_ENV_IS_IN_MMC=y
 CONFIG_REGMAP=y
 CONFIG_SYSCON=y
 CONFIG_CLK=y
diff --git a/include/configs/evb_rk3128.h b/include/configs/evb_rk3128.h
index 73ceab0373..bf6c7eaf4c 100644
--- a/include/configs/evb_rk3128.h
+++ b/include/configs/evb_rk3128.h
@@ -8,7 +8,6 @@
 
 #include <configs/rk3128_common.h>
 
-#define CONFIG_ENV_IS_IN_MMC
 #define CONFIG_SYS_MMC_ENV_DEV 0
 
 #endif