Message ID | 20210702082836.18319-1-mike.looijmans@topic.nl |
---|---|
State | Accepted |
Commit | 50918d0df5cb23a1751d8443f352726a582c9c76 |
Delegated to: | Michal Simek |
Headers | show |
Series | xilinx: zynq, zynqmp: Return ENVL_NOWHERE instead of ENVL_UNKNOWN | expand |
pá 2. 7. 2021 v 10:28 odesílatel Mike Looijmans <mike.looijmans@topic.nl> napsal: > > 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> > --- > board/xilinx/zynq/board.c | 6 +++--- > board/xilinx/zynqmp/zynqmp.c | 6 +++--- > 2 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/board/xilinx/zynq/board.c b/board/xilinx/zynq/board.c > index e2e9b3f0f7..61e0a90c11 100644 > --- a/board/xilinx/zynq/board.c > +++ b/board/xilinx/zynq/board.c > @@ -134,18 +134,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 ZYNQ_BM_NAND: > 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 ZYNQ_BM_NOR: > case ZYNQ_BM_QSPI: > if (IS_ENABLED(CONFIG_ENV_IS_IN_SPI_FLASH)) > return ENVL_SPI_FLASH; > - return ENVL_UNKNOWN; > + return ENVL_NOWHERE; > case ZYNQ_BM_JTAG: > default: > return ENVL_NOWHERE; > diff --git a/board/xilinx/zynqmp/zynqmp.c b/board/xilinx/zynqmp/zynqmp.c > index ee4d0c85e6..a5210035a2 100644 > --- a/board/xilinx/zynqmp/zynqmp.c > +++ b/board/xilinx/zynqmp/zynqmp.c > @@ -710,18 +710,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; > -- > 2.17.1 > Applied with subject "xilinx: Return ENVL_NOWHERE instead of ENVL_UNKNOWN" Thanks, Michal
diff --git a/board/xilinx/zynq/board.c b/board/xilinx/zynq/board.c index e2e9b3f0f7..61e0a90c11 100644 --- a/board/xilinx/zynq/board.c +++ b/board/xilinx/zynq/board.c @@ -134,18 +134,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 ZYNQ_BM_NAND: 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 ZYNQ_BM_NOR: case ZYNQ_BM_QSPI: if (IS_ENABLED(CONFIG_ENV_IS_IN_SPI_FLASH)) return ENVL_SPI_FLASH; - return ENVL_UNKNOWN; + return ENVL_NOWHERE; case ZYNQ_BM_JTAG: default: return ENVL_NOWHERE; diff --git a/board/xilinx/zynqmp/zynqmp.c b/board/xilinx/zynqmp/zynqmp.c index ee4d0c85e6..a5210035a2 100644 --- a/board/xilinx/zynqmp/zynqmp.c +++ b/board/xilinx/zynqmp/zynqmp.c @@ -710,18 +710,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;
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> --- board/xilinx/zynq/board.c | 6 +++--- board/xilinx/zynqmp/zynqmp.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-)