[PATCH 1/8] env: Do not make CONFIG_EXTRA_ENV_TEXT and CONFIG_EXTRA_ENV_SETTINGS conflict

[Tom Rini]

Largely, the use of CONFIG_EXTRA_ENV_SETTINGS can be migrated directly
to come from CONFIG_EXTRA_ENV_TEXT.  The biggest case that cannot easily
be migrated is distro_bootcmd support.  Rather than block migration on
this, remove the #error here so that we can being moving forward.

Cc: Joe Hershberger <joe.hershberger at ni.com>
Cc: Wolfgang Denk <wd at denx.de>
Cc: Simon Glass <sjg at chromium.org>
Signed-off-by: Tom Rini <trini at konsulko.com>
---
I spent about a day working at getting config_distro_bootcmd to work via
CONFIG_EXTRA_ENV_TEXT and _maybe_ there's a path forward if we rely on
less nesting of macros, I'm not convinced.  But I can clearly see how
moving everything else forward to text based environment files will
encourage sharing of environment and both remove otherwise unmigrated
CONFIG symbols and generally move forward with being able to remove
include/config/board.h files.
---
 include/env_default.h | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/include/env_default.h b/include/env_default.h
index 7004a6fef29b..7113e08e6b0f 100644
--- a/include/env_default.h
+++ b/include/env_default.h
@@ -109,9 +109,6 @@ const char default_environment[] = {
 	"bootlimit="	__stringify(CONFIG_BOOTCOUNT_BOOTLIMIT)"\0"
 #endif
 #ifdef CONFIG_EXTRA_ENV_TEXT
-# ifdef CONFIG_EXTRA_ENV_SETTINGS
-# error "Your board uses a text-file environment, so must not define CONFIG_EXTRA_ENV_SETTINGS"
-# endif
 	/* This is created in the Makefile */
 	CONFIG_EXTRA_ENV_TEXT
 #endif
-- 
2.25.1