arm64: imx8mp: Gracefully handle disabled ENV_IS_IN_SPI_FLASH
authorMarek Vasut <marex@denx.de>
Wed, 19 Mar 2025 03:28:27 +0000 (04:28 +0100)
committerFabio Estevam <festevam@gmail.com>
Mon, 24 Mar 2025 11:55:48 +0000 (08:55 -0300)
In case ENV_IS_IN_SPI_FLASH is disabled, returning ENVL_SPI_FLASH
leads to failure to find environment driver on start up. Fix this
by testing whether ENV_IS_IN_SPI_FLASH is enabled and if not, then
return ENVL_NOWHERE instead.

Signed-off-by: Marek Vasut <marex@denx.de>
board/dhelectronics/dh_imx8mp/imx8mp_dhcom_pdk2.c

index 4af3cbe..4275436 100644 (file)
@@ -186,5 +186,7 @@ int board_late_init(void)
 
 enum env_location env_get_location(enum env_operation op, int prio)
 {
-       return prio ? ENVL_UNKNOWN : ENVL_SPI_FLASH;
+       return prio ? ENVL_UNKNOWN : CONFIG_IS_ENABLED(ENV_IS_IN_SPI_FLASH,
+                                                      (ENVL_SPI_FLASH),
+                                                      (ENVL_NOWHERE));
 }