env: Do not make CONFIG_EXTRA_ENV_TEXT and CONFIG_EXTRA_ENV_SETTINGS conflict

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 <[email protected]>
Cc: Wolfgang Denk <[email protected]>
Cc: Simon Glass <[email protected]>
Signed-off-by: Tom Rini <[email protected]>

diff --git a/include/env_default.h b/include/env_default.h
index 7004a6fef29ba3db99909efe719b3aa567351818..7113e08e6b0fd8c90a34b21ce073db6b53b30bba 100644 (file)
--- 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