From 5cf6a06ae8835738121e39c0f6c581d4a669f651 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Mon, 13 Jun 2022 22:57:30 -0400 Subject: [PATCH] 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 Cc: Wolfgang Denk Cc: Simon Glass Signed-off-by: Tom Rini --- include/env_default.h | 3 --- 1 file changed, 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 -- 2.39.5