aboutsummaryrefslogtreecommitdiff
path: root/board/xilinx/zynqmp
diff options
context:
space:
mode:
authorMike Looijmans <mike.looijmans@topic.nl>2021-07-02 10:28:36 +0200
committerMichal Simek <michal.simek@xilinx.com>2021-07-26 09:18:45 +0200
commit50918d0df5cb23a1751d8443f352726a582c9c76 (patch)
treeeb833f5981d4cadc5b936ca725425d28ff2adc63 /board/xilinx/zynqmp
parent419b4a86f784c819c520d88658799cb71063f87e (diff)
downloadu-boot-50918d0df5cb23a1751d8443f352726a582c9c76.zip
u-boot-50918d0df5cb23a1751d8443f352726a582c9c76.tar.gz
u-boot-50918d0df5cb23a1751d8443f352726a582c9c76.tar.bz2
xilinx: Return ENVL_NOWHERE instead of ENVL_UNKNOWN
The system refuses to boot without any environment, so return ENVL_NOWHERE when there's nowhere to store the environment instead of ENVL_UNKNOWN. This fixes that the board won't boot from eMMC when CONFIG_ENV_IS_IN_FAT is not defined, for example. Similar for other combinations. Fixes: 1025bd098aa8 "xilinx: zynqmp: Add support for saving variables" Signed-off-by: Mike Looijmans <mike.looijmans@topic.nl> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Diffstat (limited to 'board/xilinx/zynqmp')
-rw-r--r--board/xilinx/zynqmp/zynqmp.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/board/xilinx/zynqmp/zynqmp.c b/board/xilinx/zynqmp/zynqmp.c
index 1748fec..18d5c51 100644
--- a/board/xilinx/zynqmp/zynqmp.c
+++ b/board/xilinx/zynqmp/zynqmp.c
@@ -797,18 +797,18 @@ enum env_location env_get_location(enum env_operation op, int prio)
return ENVL_FAT;
if (IS_ENABLED(CONFIG_ENV_IS_IN_EXT4))
return ENVL_EXT4;
- return ENVL_UNKNOWN;
+ return ENVL_NOWHERE;
case NAND_MODE:
if (IS_ENABLED(CONFIG_ENV_IS_IN_NAND))
return ENVL_NAND;
if (IS_ENABLED(CONFIG_ENV_IS_IN_UBI))
return ENVL_UBI;
- return ENVL_UNKNOWN;
+ return ENVL_NOWHERE;
case QSPI_MODE_24BIT:
case QSPI_MODE_32BIT:
if (IS_ENABLED(CONFIG_ENV_IS_IN_SPI_FLASH))
return ENVL_SPI_FLASH;
- return ENVL_UNKNOWN;
+ return ENVL_NOWHERE;
case JTAG_MODE:
default:
return ENVL_NOWHERE;