summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2019-11-10 01:49:20 +0300
committerTom Rini <trini@konsulko.com>2019-11-12 19:08:00 +0300
commit38d5fa48f42f9ad82f77038a501cb8d0e900ea2c (patch)
tree79774f410f510d0e083bed876373403397156f7b
parentba0afaee85ae1e060673b200e53629f9a5f9b074 (diff)
downloadu-boot-38d5fa48f42f9ad82f77038a501cb8d0e900ea2c.tar.xz
pfla02: Migrate CONFIG_ENV_IS_IN_SPI_FLASH to defconfig
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>
-rw-r--r--configs/pfla02_defconfig1
-rw-r--r--include/configs/pfla02.h1
2 files changed, 1 insertions, 1 deletions
diff --git a/configs/pfla02_defconfig b/configs/pfla02_defconfig
index 7bd146d1ba..d8ecf8e3dc 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 8731d89af2..c21b993a62 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)