[U-Boot,2/3] pfla02: Migrate CONFIG_ENV_IS_IN_SPI_FLASH to defconfig
diff mbox series

Message ID 20191111021910.19906-2-trini@konsulko.com
State Accepted
Commit 38d5fa48f42f9ad82f77038a501cb8d0e900ea2c
Delegated to: Tom Rini
Headers show
Series
  • [U-Boot,1/3] evb-rk3128: Migrate CONFIG_ENV_IS_IN_MMC to defconfig
Related show

Commit Message

Tom Rini Nov. 11, 2019, 2:19 a.m. UTC
This board is setting CONFIG_ENV_IS_IN_SPI_FLASH in the header rather
than defconfig, fix.

Cc: Stefano Babic <sbabic@denx.de>
Signed-off-by: Tom Rini <trini@konsulko.com>
---
 configs/pfla02_defconfig | 1 +
 include/configs/pfla02.h | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

Comments

Tom Rini Nov. 12, 2019, 6:42 p.m. UTC | #1
On Sun, Nov 10, 2019 at 09:19:09PM -0500, Tom Rini wrote:

> This board is setting CONFIG_ENV_IS_IN_SPI_FLASH in the header rather
> than defconfig, fix.
> 
> Cc: Stefano Babic <sbabic@denx.de>
> Signed-off-by: Tom Rini <trini@konsulko.com>

Applied to u-boot/master, thanks!

Patch
diff mbox series

diff --git a/configs/pfla02_defconfig b/configs/pfla02_defconfig
index 7bd146d1ba77..d8ecf8e3dc24 100644
--- a/configs/pfla02_defconfig
+++ b/configs/pfla02_defconfig
@@ -42,6 +42,7 @@  CONFIG_MTDIDS_DEFAULT="nand0=gpmi-nand"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=gpmi-nand:-(nand);spi2.0:1024k(bootloader),64k(env1),64k(env2),-(rescue)"
 CONFIG_CMD_UBI=y
 # CONFIG_SPL_PARTITION_UUIDS is not set
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_DM=y
 CONFIG_FSL_USDHC=y
 CONFIG_MTD=y
diff --git a/include/configs/pfla02.h b/include/configs/pfla02.h
index 8731d89af2cb..c21b993a62bb 100644
--- a/include/configs/pfla02.h
+++ b/include/configs/pfla02.h
@@ -74,7 +74,6 @@ 
 #define CONFIG_SYS_FSL_USDHC_NUM	2
 
 /* Environment organization */
-#define CONFIG_ENV_IS_IN_SPI_FLASH
 #define CONFIG_ENV_SIZE                (16 * 1024)
 #define CONFIG_ENV_OFFSET		(1024 * SZ_1K)
 #define CONFIG_ENV_SECT_SIZE		(64 * SZ_1K)