| Message ID | 20170602122405.18983-3-nsekhar@ti.com |
|---|---|
| State | Accepted |
| Commit | ae8733910b4f7388ebb965c8f31cfb47e5c19f21 |
| Headers | show |
| Series | fs: fat: convert to kconfig + switch some TI platforms | expand |
On Fri, Jun 02, 2017 at 05:54:00PM +0530, Sekhar Nori wrote: > Not all TI Keystone2 EVMs want environment in NAND flash. > K2G EVM which has an MMC/SD slot, keep environment in a > FAT partition on SD card. > > Since ti_armv7_keystone2.h defines environment is in NAND, > boards which do not follow that have to #undef'ine that > configuration. This leads to ugly ordering issues around > where exactly the include of ti_armv7_keystone2.h can come > in within the k2*_evm.h files. > > Move environment location to config file of each board. > This should make it easy to change it for any one board > without affecting all other boards. > > Signed-off-by: Sekhar Nori <nsekhar@ti.com> Reviewed-by: Tom Rini <trini@konsulko.com> -- Tom
On Fri, Jun 02, 2017 at 05:54:00PM +0530, Sekhar Nori wrote: > Not all TI Keystone2 EVMs want environment in NAND flash. > K2G EVM which has an MMC/SD slot, keep environment in a > FAT partition on SD card. > > Since ti_armv7_keystone2.h defines environment is in NAND, > boards which do not follow that have to #undef'ine that > configuration. This leads to ugly ordering issues around > where exactly the include of ti_armv7_keystone2.h can come > in within the k2*_evm.h files. > > Move environment location to config file of each board. > This should make it easy to change it for any one board > without affecting all other boards. > > Signed-off-by: Sekhar Nori <nsekhar@ti.com> Applied to u-boot/master, thanks! -- Tom
diff --git a/include/configs/k2e_evm.h b/include/configs/k2e_evm.h index 3a7993e8290c..b186bfc89151 100644 --- a/include/configs/k2e_evm.h +++ b/include/configs/k2e_evm.h @@ -27,6 +27,10 @@ "name_uboot=u-boot-spi-k2e-evm.gph\0" \ "name_fs=arago-console-image-k2e-evm.cpio.gz\0" +#define CONFIG_ENV_SIZE (256 << 10) /* 256 KiB */ +#define CONFIG_ENV_IS_IN_NAND +#define CONFIG_ENV_OFFSET 0x100000 + #include <configs/ti_armv7_keystone2.h> /* SPL SPI Loader Configuration */ diff --git a/include/configs/k2g_evm.h b/include/configs/k2g_evm.h index bee1be794baf..9a07eacb8e7a 100644 --- a/include/configs/k2g_evm.h +++ b/include/configs/k2g_evm.h @@ -63,8 +63,8 @@ #define CONFIG_PHY_MICREL #define PHY_ANEG_TIMEOUT 10000 /* PHY needs longer aneg time */ -#undef CONFIG_ENV_IS_IN_NAND #define CONFIG_ENV_IS_IN_FAT +#define CONFIG_ENV_SIZE (256 << 10) /* 256 KiB */ #define FAT_ENV_INTERFACE "mmc" #define FAT_ENV_DEVICE_AND_PART "0:1" #define FAT_ENV_FILE "uboot.env" diff --git a/include/configs/k2hk_evm.h b/include/configs/k2hk_evm.h index 202167bdef79..9598bc6976e9 100644 --- a/include/configs/k2hk_evm.h +++ b/include/configs/k2hk_evm.h @@ -27,6 +27,10 @@ "name_uboot=u-boot-spi-k2hk-evm.gph\0" \ "name_fs=arago-console-image-k2hk-evm.cpio.gz\0" +#define CONFIG_ENV_SIZE (256 << 10) /* 256 KiB */ +#define CONFIG_ENV_IS_IN_NAND +#define CONFIG_ENV_OFFSET 0x100000 + #include <configs/ti_armv7_keystone2.h> /* SPL SPI Loader Configuration */ diff --git a/include/configs/k2l_evm.h b/include/configs/k2l_evm.h index a7ccdd117cd2..d054276e61eb 100644 --- a/include/configs/k2l_evm.h +++ b/include/configs/k2l_evm.h @@ -27,6 +27,10 @@ "name_uboot=u-boot-spi-k2l-evm.gph\0" \ "name_fs=arago-console-image-k2l-evm.cpio.gz\0" +#define CONFIG_ENV_SIZE (256 << 10) /* 256 KiB */ +#define CONFIG_ENV_IS_IN_NAND +#define CONFIG_ENV_OFFSET 0x100000 + #include <configs/ti_armv7_keystone2.h> /* SPL SPI Loader Configuration */ diff --git a/include/configs/ti_armv7_keystone2.h b/include/configs/ti_armv7_keystone2.h index 3161c50abb14..512c28a5f075 100644 --- a/include/configs/ti_armv7_keystone2.h +++ b/include/configs/ti_armv7_keystone2.h @@ -185,9 +185,6 @@ #define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_NAND_MAX_CHIPS 1 #define CONFIG_SYS_NAND_NO_SUBPAGE_WRITE -#define CONFIG_ENV_SIZE (256 << 10) /* 256 KiB */ -#define CONFIG_ENV_IS_IN_NAND -#define CONFIG_ENV_OFFSET 0x100000 #define CONFIG_MTD_PARTITIONS #define CONFIG_RBTREE #define CONFIG_LZO
Not all TI Keystone2 EVMs want environment in NAND flash. K2G EVM which has an MMC/SD slot, keep environment in a FAT partition on SD card. Since ti_armv7_keystone2.h defines environment is in NAND, boards which do not follow that have to #undef'ine that configuration. This leads to ugly ordering issues around where exactly the include of ti_armv7_keystone2.h can come in within the k2*_evm.h files. Move environment location to config file of each board. This should make it easy to change it for any one board without affecting all other boards. Signed-off-by: Sekhar Nori <nsekhar@ti.com> --- include/configs/k2e_evm.h | 4 ++++ include/configs/k2g_evm.h | 2 +- include/configs/k2hk_evm.h | 4 ++++ include/configs/k2l_evm.h | 4 ++++ include/configs/ti_armv7_keystone2.h | 3 --- 5 files changed, 13 insertions(+), 4 deletions(-)