Message ID | e4ed36408f10159677ed8060bfd5289f3e0691fa.1637752614.git.michal.simek@xilinx.com |
---|---|
State | Accepted |
Commit | bf97c460a403fa884320643f065fff4758dcf54e |
Delegated to: | Michal Simek |
Headers | show |
Series | versal: Return ENVL_NOWHERE instead of ENVL_UNKNOWN | expand |
st 24. 11. 2021 v 12:16 odesÃlatel Michal Simek <michal.simek@xilinx.com> napsal: > > From: T Karthik Reddy <t.karthik.reddy@xilinx.com> > > The system fails to boot without any environment location, so return > ENVL_NOWHERE when there's nowhere to store the environment instead > of ENVL_UNKNOWN. > > The same change was also done by commit 50918d0df5cb ("xilinx: Return > ENVL_NOWHERE instead of ENVL_UNKNOWN") for zynq and zynqmp. > > Signed-off-by: T Karthik Reddy <t.karthik.reddy@xilinx.com> > Signed-off-by: Michal Simek <michal.simek@xilinx.com> > --- > > board/xilinx/versal/board.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/board/xilinx/versal/board.c b/board/xilinx/versal/board.c > index 03604d730a0b..299e128f7b9d 100644 > --- a/board/xilinx/versal/board.c > +++ b/board/xilinx/versal/board.c > @@ -269,13 +269,13 @@ 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 OSPI_MODE: > 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.33.1 > Applied. M
diff --git a/board/xilinx/versal/board.c b/board/xilinx/versal/board.c index 03604d730a0b..299e128f7b9d 100644 --- a/board/xilinx/versal/board.c +++ b/board/xilinx/versal/board.c @@ -269,13 +269,13 @@ 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 OSPI_MODE: 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;