]> git.baikalelectronics.ru Git - uboot.git/commit
env: Do not make CONFIG_EXTRA_ENV_TEXT and CONFIG_EXTRA_ENV_SETTINGS conflict
authorTom Rini <trini@konsulko.com>
Tue, 14 Jun 2022 02:57:30 +0000 (22:57 -0400)
committerTom Rini <trini@konsulko.com>
Tue, 28 Jun 2022 21:11:48 +0000 (17:11 -0400)
commit91c934a98bec5c8dccdbdbe95fcd02e97e9558d2
tree6e131a3e6df987316b5d8e58f08a58f8f07496ac
parentbe1d92e04eeef3225a6345c02f5d9fa393a72664
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>
include/env_default.h