diff options
| author | Tom Rini <trini@konsulko.com> | 2022-06-13 22:57:30 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-06-28 17:11:48 -0400 |
| commit | 5cf6a06ae8835738121e39c0f6c581d4a669f651 (patch) | |
| tree | 6e131a3e6df987316b5d8e58f08a58f8f07496ac /include/env_default.h | |
| parent | 5dbf320bef92770ffba24cd4b04c06fc06692892 (diff) | |
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 <joe.hershberger@ni.com>
Cc: Wolfgang Denk <wd@denx.de>
Cc: Simon Glass <sjg@chromium.org>
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'include/env_default.h')
| -rw-r--r-- | include/env_default.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/env_default.h b/include/env_default.h index 7004a6fef2..7113e08e6b 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 |