Project import generated by Copybara.
GitOrigin-RevId: f03aaa1ca84128bde03890d951a723180001d576
diff --git a/board/qca/arm/common/board_init.c b/board/qca/arm/common/board_init.c
index b37ac56..5fdb067 100644
--- a/board/qca/arm/common/board_init.c
+++ b/board/qca/arm/common/board_init.c
@@ -93,8 +93,10 @@
int board_init(void)
{
int ret;
+#ifndef CONFIG_ENV_IS_NOWHERE
uint32_t start_blocks;
uint32_t size_blocks;
+#endif
#ifdef CONFIG_IPQ_REPORT_L2ERR
u32 l2esr;
diff --git a/board/qca/arm/ipq5018/ipq5018.c b/board/qca/arm/ipq5018/ipq5018.c
index 2b4dcc1..6d878e3 100644
--- a/board/qca/arm/ipq5018/ipq5018.c
+++ b/board/qca/arm/ipq5018/ipq5018.c
@@ -381,7 +381,9 @@
}
if (!ret && sfi->flash_type == SMEM_BOOT_MMC_FLASH) {
+#ifndef CONFIG_ENV_IS_NOWHERE
ret = board_mmc_env_init(mmc_host);
+#endif
}
return ret;
diff --git a/include/configs/ipq5018.h b/include/configs/ipq5018.h
index 53d6bdc..a22cefa 100644
--- a/include/configs/ipq5018.h
+++ b/include/configs/ipq5018.h
@@ -138,7 +138,7 @@
#define CONFIG_IPQ5018_ENV 1
#define CONFIG_ENV_OFFSET board_env_offset
#define CONFIG_ENV_SIZE CONFIG_ENV_SIZE_MAX
-#define CONFIG_ENV_RANGE board_env_range
+#define CONFIG_ENV_RANGE CONFIG_ENV_SIZE_MAX
#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE_MAX + (500 << 10))
/*
@@ -480,5 +480,5 @@
/* maximum boot image size */
#define CONFIG_BOOGIMG_SIZE_MAX (64 << 20) /* 64MB */
-
+#define CONFIG_ENV_IS_NOWHERE
#endif /* _IPQ5018_H */
