[PATCH v2 05/10] configs: tqma6: change to include tqma6.h in baseboard headers

[Max Merchel]

The SoM (TQMa6) can be used on various baseboards. No modifications to
the SoM files should be required to use the SoM on different baseboards.
Therefore, include the SoM headers in the baseboard.

Signed-off-by: Max Merchel <Max.Merchel at ew.tq-group.com>
---
 board/tq/tqma6/Kconfig       |  3 ++-
 include/configs/tqma6.h      | 13 -------------
 include/configs/tqma6_mba6.h |  2 ++
 include/configs/tqma6_wru4.h |  2 ++
 4 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/board/tq/tqma6/Kconfig b/board/tq/tqma6/Kconfig
index e62228d73d0..9cb0c909aa9 100644
--- a/board/tq/tqma6/Kconfig
+++ b/board/tq/tqma6/Kconfig
@@ -7,7 +7,8 @@ config SYS_VENDOR
 	default "tq"
 
 config SYS_CONFIG_NAME
-	default "tqma6"
+	default "tqma6_mba6" if MBA6
+	default "tqma6_wru4" if WRU4
 
 choice
 	prompt "TQMa6 SoC variant"
diff --git a/include/configs/tqma6.h b/include/configs/tqma6.h
index 3c6678aa2b8..00610e76869 100644
--- a/include/configs/tqma6.h
+++ b/include/configs/tqma6.h
@@ -38,17 +38,4 @@
 #define TQMA6_SPI_UBOOT_START		0x400
 #define TQMA6_SPI_UBOOT_SIZE		0xc0000
 
-/*
- * All the defines above are for the TQMa6 SoM
- *
- * Now include the baseboard specific configuration
- */
-#ifdef CONFIG_MBA6
-#include "tqma6_mba6.h"
-#elif CONFIG_WRU4
-#include "tqma6_wru4.h"
-#else
-#error "No baseboard for the TQMa6 defined!"
-#endif
-
 #endif /* __TQMA6_CONFIG_H */
diff --git a/include/configs/tqma6_mba6.h b/include/configs/tqma6_mba6.h
index 81f96ac91e8..c30aeae4f29 100644
--- a/include/configs/tqma6_mba6.h
+++ b/include/configs/tqma6_mba6.h
@@ -11,6 +11,8 @@
 #ifndef __CONFIG_TQMA6_MBA6_H
 #define __CONFIG_TQMA6_MBA6_H
 
+#include "tqma6.h"
+
 #define CFG_MXC_UART_BASE		UART2_BASE
 
 #endif /* __CONFIG_TQMA6_MBA6_H */
diff --git a/include/configs/tqma6_wru4.h b/include/configs/tqma6_wru4.h
index 110bd895a8a..b35e471bd95 100644
--- a/include/configs/tqma6_wru4.h
+++ b/include/configs/tqma6_wru4.h
@@ -6,6 +6,8 @@
 #ifndef __CONFIG_TQMA6_WRU4_H
 #define __CONFIG_TQMA6_WRU4_H
 
+#include "tqma6.h"
+
 /* Ethernet */
 #define CFG_FEC_MXC_PHYADDR		0x01
 
-- 
2.43.0