From a1263632bb05f0a21620bad0661235fcbbe79dca Mon Sep 17 00:00:00 2001
From: Masahiro Yamada <yamada.m@jp.panasonic.com>
Date: Mon, 1 Sep 2014 00:47:55 +0900
Subject: [PATCH] mx6: tqma6: get board support back to Kconfig build system

The QS Systems TQMa6 board support was added by commit cb07d74e
and lost by commit e82abaeb.

Commit e82abaeb merged the IMX branch based on pre-Kconfig
and the mainline based on post-Kconfig, simply deleting
the boards.cfg file.  As a result, some boards added just before
the merge were lost.

This commit adds Kconfig, defconfig, MAINTAINERS for TQMa6 board
to work on the Kconfig infrastructure.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Cc: Markus Niebel <Markus.Niebel@tq-group.com>
Cc: Stefano Babic <sbabic@denx.de>
---
 arch/arm/Kconfig                  |  4 ++++
 board/tqc/tqma6/Kconfig           | 23 +++++++++++++++++++++++
 board/tqc/tqma6/MAINTAINERS       |  6 ++++++
 configs/tqma6q_mba6_mmc_defconfig |  3 +++
 configs/tqma6q_mba6_spi_defconfig |  3 +++
 configs/tqma6s_mba6_mmc_defconfig |  3 +++
 configs/tqma6s_mba6_spi_defconfig |  3 +++
 7 files changed, 45 insertions(+)
 create mode 100644 board/tqc/tqma6/Kconfig
 create mode 100644 board/tqc/tqma6/MAINTAINERS
 create mode 100644 configs/tqma6q_mba6_mmc_defconfig
 create mode 100644 configs/tqma6q_mba6_spi_defconfig
 create mode 100644 configs/tqma6s_mba6_mmc_defconfig
 create mode 100644 configs/tqma6s_mba6_spi_defconfig

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 3094ed6708..22f0f09af6 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -409,6 +409,9 @@ config TARGET_GW_VENTANA
 config TARGET_HUMMINGBOARD
 	bool "Support hummingboard"
 
+config TARGET_TQMA6
+	bool "TQ Systems TQMa6 board"
+
 config OMAP34XX
 	bool "OMAP34XX SoC"
 
@@ -663,6 +666,7 @@ source "board/ti/ti816x/Kconfig"
 source "board/ti/tnetv107xevm/Kconfig"
 source "board/timll/devkit3250/Kconfig"
 source "board/toradex/colibri_pxa270/Kconfig"
+source "board/tqc/tqma6/Kconfig"
 source "board/trizepsiv/Kconfig"
 source "board/ttcontrol/vision2/Kconfig"
 source "board/udoo/Kconfig"
diff --git a/board/tqc/tqma6/Kconfig b/board/tqc/tqma6/Kconfig
new file mode 100644
index 0000000000..44b4142924
--- /dev/null
+++ b/board/tqc/tqma6/Kconfig
@@ -0,0 +1,23 @@
+if TARGET_TQMA6
+
+config SYS_CPU
+	string
+	default "armv7"
+
+config SYS_BOARD
+	string
+	default "tqma6"
+
+config SYS_VENDOR
+	string
+	default "tqc"
+
+config SYS_SOC
+	string
+	default "mx6"
+
+config SYS_CONFIG_NAME
+	string
+	default "tqma6"
+
+endif
diff --git a/board/tqc/tqma6/MAINTAINERS b/board/tqc/tqma6/MAINTAINERS
new file mode 100644
index 0000000000..91cd244499
--- /dev/null
+++ b/board/tqc/tqma6/MAINTAINERS
@@ -0,0 +1,6 @@
+TQ SYSTEMS TQMA6 BOARD
+M:	Markus Niebel <Markus.Niebel@tq-group.com>
+S:	Maintained
+F:	board/tqc/tqma6/
+F:	include/configs/tqma6.h
+F:	configs/tqma6*_defconfig
diff --git a/configs/tqma6q_mba6_mmc_defconfig b/configs/tqma6q_mba6_mmc_defconfig
new file mode 100644
index 0000000000..4ee9238969
--- /dev/null
+++ b/configs/tqma6q_mba6_mmc_defconfig
@@ -0,0 +1,3 @@
+CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/tqc/tqma6/tqma6q.cfg,MX6Q,MBA6,TQMA6X_MMC_BOOT"
+CONFIG_ARM=y
+CONFIG_TARGET_TQMA6=y
diff --git a/configs/tqma6q_mba6_spi_defconfig b/configs/tqma6q_mba6_spi_defconfig
new file mode 100644
index 0000000000..86d4ca33ff
--- /dev/null
+++ b/configs/tqma6q_mba6_spi_defconfig
@@ -0,0 +1,3 @@
+CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/tqc/tqma6/tqma6q.cfg,MX6Q,MBA6,TQMA6X_SPI_BOOT"
+CONFIG_ARM=y
+CONFIG_TARGET_TQMA6=y
diff --git a/configs/tqma6s_mba6_mmc_defconfig b/configs/tqma6s_mba6_mmc_defconfig
new file mode 100644
index 0000000000..5efce6ab4d
--- /dev/null
+++ b/configs/tqma6s_mba6_mmc_defconfig
@@ -0,0 +1,3 @@
+CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/tqc/tqma6/tqma6s.cfg,MX6S,MBA6,TQMA6X_MMC_BOOT"
+CONFIG_ARM=y
+CONFIG_TARGET_TQMA6=y
diff --git a/configs/tqma6s_mba6_spi_defconfig b/configs/tqma6s_mba6_spi_defconfig
new file mode 100644
index 0000000000..e8b3afdbbc
--- /dev/null
+++ b/configs/tqma6s_mba6_spi_defconfig
@@ -0,0 +1,3 @@
+CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/tqc/tqma6/tqma6s.cfg,MX6S,MBA6,TQMA6X_SPI_BOOT"
+CONFIG_ARM=y
+CONFIG_TARGET_TQMA6=y
-- 
2.39.5