[PATCH v5 34/44] rockchip: Avoid checking environment without ENV_SUPPORT

Simon Glass
2023-02-22T16:45:40Z

With split config, this causes a build error in SPL where the environment
may not be enabled. It affects two rk3399 boards. Add a condition.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

(no changes since v1)

board/theobroma-systems/puma_rk3399/puma-rk3399.c | 2 +-
board/theobroma-systems/ringneck_px30/ringneck-px30.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/board/theobroma-systems/puma_rk3399/puma-rk3399.c b/board/theobroma-systems/puma_rk3399/puma-rk3399.c
index 97f398bd754..34839dcb9f1 100644
--- a/board/theobroma-systems/puma_rk3399/puma-rk3399.c
+++ b/board/theobroma-systems/puma_rk3399/puma-rk3399.c
@@ -136,7 +136,7 @@ int mmc_get_env_dev(void)
return CONFIG_SYS_MMC_ENV_DEV;
}

-#if !IS_ENABLED(CONFIG_ENV_IS_NOWHERE)
+#if IS_ENABLED(CONFIG_ENV_SUPPORT) && !IS_ENABLED(CONFIG_ENV_IS_NOWHERE)
#error Please enable CONFIG_ENV_IS_NOWHERE
#endif

diff --git a/board/theobroma-systems/ringneck_px30/ringneck-px30.c b/board/theobroma-systems/ringneck_px30/ringneck-px30.c
index 47d1a40ef7c..9eb2fcfc48f 100644
--- a/board/theobroma-systems/ringneck_px30/ringneck-px30.c
+++ b/board/theobroma-systems/ringneck_px30/ringneck-px30.c
@@ -118,7 +118,7 @@ int mmc_get_env_dev(void)
return CONFIG_SYS_MMC_ENV_DEV;
}

-#if !IS_ENABLED(CONFIG_ENV_IS_NOWHERE)
+#if IS_ENABLED(CONFIG_ENV_SUPPORT) && !IS_ENABLED(CONFIG_ENV_IS_NOWHERE)
#error Please enable CONFIG_ENV_IS_NOWHERE
#endif

--
2.39.2.637.g21b0678d19-goog