LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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: 1025bd098a "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>
This commit is contained in:
Mike Looijmans 2021-07-02 10:28:36 +02:00 committed by Michal Simek
parent 419b4a86f7
commit 50918d0df5
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
board/xilinx/zynq/board.c
View File

@ -134,18 +134,18 @@ enum env_location env_get_location(enum env_operation op, int prio)
return ENVL_FAT; return ENVL_FAT;
if (IS_ENABLED(CONFIG_ENV_IS_IN_EXT4)) if (IS_ENABLED(CONFIG_ENV_IS_IN_EXT4))
return ENVL_EXT4; return ENVL_EXT4;
return ENVL_UNKNOWN; return ENVL_NOWHERE;
case ZYNQ_BM_NAND: case ZYNQ_BM_NAND:
if (IS_ENABLED(CONFIG_ENV_IS_IN_NAND)) if (IS_ENABLED(CONFIG_ENV_IS_IN_NAND))
return ENVL_NAND; return ENVL_NAND;
if (IS_ENABLED(CONFIG_ENV_IS_IN_UBI)) if (IS_ENABLED(CONFIG_ENV_IS_IN_UBI))
return ENVL_UBI; return ENVL_UBI;
return ENVL_UNKNOWN; return ENVL_NOWHERE;
case ZYNQ_BM_NOR: case ZYNQ_BM_NOR:
case ZYNQ_BM_QSPI: case ZYNQ_BM_QSPI:
if (IS_ENABLED(CONFIG_ENV_IS_IN_SPI_FLASH)) if (IS_ENABLED(CONFIG_ENV_IS_IN_SPI_FLASH))
return ENVL_SPI_FLASH; return ENVL_SPI_FLASH;
return ENVL_UNKNOWN; return ENVL_NOWHERE;
case ZYNQ_BM_JTAG: case ZYNQ_BM_JTAG:
default: default:
return ENVL_NOWHERE; return ENVL_NOWHERE;

6
board/xilinx/zynqmp/zynqmp.c
View File

@ -797,18 +797,18 @@ enum env_location env_get_location(enum env_operation op, int prio)
return ENVL_FAT; return ENVL_FAT;
if (IS_ENABLED(CONFIG_ENV_IS_IN_EXT4)) if (IS_ENABLED(CONFIG_ENV_IS_IN_EXT4))
return ENVL_EXT4; return ENVL_EXT4;
return ENVL_UNKNOWN; return ENVL_NOWHERE;
case NAND_MODE: case NAND_MODE:
if (IS_ENABLED(CONFIG_ENV_IS_IN_NAND)) if (IS_ENABLED(CONFIG_ENV_IS_IN_NAND))
return ENVL_NAND; return ENVL_NAND;
if (IS_ENABLED(CONFIG_ENV_IS_IN_UBI)) if (IS_ENABLED(CONFIG_ENV_IS_IN_UBI))
return ENVL_UBI; return ENVL_UBI;
return ENVL_UNKNOWN; return ENVL_NOWHERE;
case QSPI_MODE_24BIT: case QSPI_MODE_24BIT:
case QSPI_MODE_32BIT: case QSPI_MODE_32BIT:
if (IS_ENABLED(CONFIG_ENV_IS_IN_SPI_FLASH)) if (IS_ENABLED(CONFIG_ENV_IS_IN_SPI_FLASH))
return ENVL_SPI_FLASH; return ENVL_SPI_FLASH;
return ENVL_UNKNOWN; return ENVL_NOWHERE;
case JTAG_MODE: case JTAG_MODE:
default: default:
return ENVL_NOWHERE; return ENVL_NOWHERE;