[3/7] configs: k2g_evm: make sure config fallbacks take effect

Message ID 20170602122405.18983-4-nsekhar@ti.com
State Accepted
Commit 391b037ee6f50d29a8eb5a2953dcf3021cae9155
Headers show
Series
  • fs: fat: convert to kconfig + switch some TI platforms
Related show

Commit Message

Sekhar Nori June 2, 2017, 12:24 p.m.
Since config fallbacks contained in include/config_fallbacks.h
come into k2g_evm.h file through ti_armv7_keystone2.h, it should
be the last file included.

Without this, #define of FAT_WRITE when environment is in FAT
does not happen as the environment location is decided later
in the file.

Similar issues can come with other config fallbacks implemented.

Signed-off-by: Sekhar Nori <nsekhar@ti.com>
---
 include/configs/k2g_evm.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Comments

Tom Rini June 2, 2017, 2:03 p.m. | #1
On Fri, Jun 02, 2017 at 05:54:01PM +0530, Sekhar Nori wrote:

> Since config fallbacks contained in include/config_fallbacks.h

> come into k2g_evm.h file through ti_armv7_keystone2.h, it should

> be the last file included.

> 

> Without this, #define of FAT_WRITE when environment is in FAT

> does not happen as the environment location is decided later

> in the file.

> 

> Similar issues can come with other config fallbacks implemented.

> 

> Signed-off-by: Sekhar Nori <nsekhar@ti.com>


Reviewed-by: Tom Rini <trini@konsulko.com>


-- 
Tom
Tom Rini June 4, 2017, 5:10 p.m. | #2
On Fri, Jun 02, 2017 at 05:54:01PM +0530, Sekhar Nori wrote:

> Since config fallbacks contained in include/config_fallbacks.h

> come into k2g_evm.h file through ti_armv7_keystone2.h, it should

> be the last file included.

> 

> Without this, #define of FAT_WRITE when environment is in FAT

> does not happen as the environment location is decided later

> in the file.

> 

> Similar issues can come with other config fallbacks implemented.

> 

> Signed-off-by: Sekhar Nori <nsekhar@ti.com>


Applied to u-boot/master, thanks!

-- 
Tom

Patch

diff --git a/include/configs/k2g_evm.h b/include/configs/k2g_evm.h
index 9a07eacb8e7a..1cc35769840f 100644
--- a/include/configs/k2g_evm.h
+++ b/include/configs/k2g_evm.h
@@ -48,8 +48,6 @@ 
 	"get_pmmc_${boot} run_pmmc get_mon_${boot} run_mon "		\
 	"get_fdt_${boot} get_kern_${boot} run_kern"
 
-#include <configs/ti_armv7_keystone2.h>
-
 /* SPL SPI Loader Configuration */
 #define CONFIG_SPL_TEXT_BASE		0x0c080000
 
@@ -80,4 +78,7 @@ 
 #endif
 
 #define SPI_MTD_PARTS	KEYSTONE_SPI1_MTD_PARTS
+
+#include <configs/ti_armv7_keystone2.h>
+
 #endif /* __CONFIG_K2G_EVM_H */