Skip to contentSkip to conversation

xilinx: zynq, zynqmp: Return ENVL_NOWHERE instead of ENVL_UNKNOWN

PATCH In review Mike Looijmans 2 participants 2 messages Jul 2, 2021 – Jul 9, 2021 Arm/Zynq architecture

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 xilinx: zynq, zynqmp: 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"
---
 board/xilinx/zynq/board.c    | 6 +++---
 board/xilinx/zynqmp/zynqmp.c | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)
board/xilinx/zynq/board.c +3 -3
index e2e9b3f0f7..61e0a90c11 100644
@@ -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;
board/xilinx/zynqmp/zynqmp.c +3 -3
index ee4d0c85e6..a5210035a2 100644
@@ -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;
Signature · 1 line
2.17.1
#1 lore raw

pá 2. 7. 2021 v 10:28 odesílatel Mike Looijmans
<[email protected]> napsal:

Quoted 68 lines

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"
---
 board/xilinx/zynq/board.c    | 6 +++---
 board/xilinx/zynqmp/zynqmp.c | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)
board/xilinx/zynq/board.c +3 -3
index e2e9b3f0f7..61e0a90c11 100644
@@ -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;
board/xilinx/zynqmp/zynqmp.c +3 -4
index ee4d0c85e6..a5210035a2 100644
@@ -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;
--
Quoted 2 lines

2.17.1

Applied with subject "xilinx: Return ENVL_NOWHERE instead of ENVL_UNKNOWN"

Thanks,
Michal

Signature · 5 lines
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel - Xilinx Microblaze
Maintainer of Linux kernel - Xilinx Zynq ARM and ZynqMP ARM64 SoCs
U-Boot custodian - Xilinx Microblaze/Zynq/ZynqMP/Versal SoCs