summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Niebel <Markus.Niebel@tq-group.com>2015-06-04 17:25:34 +0200
committerStefano Babic <sbabic@denx.de>2015-06-27 18:01:41 +0200
commitfc6e442568b645fc8132f7bc41623370953d4661 (patch)
treec9655702f68c6dddd5eb2d114863a8e7f3c55969
parent55c0e49ab31dbd7d45ee978ae08194a8f28ae188 (diff)
downloadtalos-obmc-uboot-fc6e442568b645fc8132f7bc41623370953d4661.tar.gz
talos-obmc-uboot-fc6e442568b645fc8132f7bc41623370953d4661.zip
arm: imx6: tqma6: implement KConfig baseboard selection
this finally removes the need for extra settings in defconfig Signed-off-by: Markus Niebel <Markus.Niebel@tq-group.com>
-rw-r--r--board/tqc/tqma6/Kconfig14
-rw-r--r--configs/tqma6q_mba6_mmc_defconfig1
-rw-r--r--configs/tqma6q_mba6_spi_defconfig1
-rw-r--r--configs/tqma6s_mba6_mmc_defconfig1
-rw-r--r--configs/tqma6s_mba6_spi_defconfig1
5 files changed, 14 insertions, 4 deletions
diff --git a/board/tqc/tqma6/Kconfig b/board/tqc/tqma6/Kconfig
index 132e82f68d..b56237d187 100644
--- a/board/tqc/tqma6/Kconfig
+++ b/board/tqc/tqma6/Kconfig
@@ -52,6 +52,20 @@ config TQMA6X_SPI_BOOT
endchoice
+choice
+ prompt "TQMa6 base board variant"
+ default MBA6
+ help
+ Select base board for TQMa6
+
+config MBA6
+ bool "TQMa6 on MBa6 Starterkit"
+ help
+ Select the MBa6 starterkit. This features a GigE Phy, USB, SD-Card
+ etc.
+
+endchoice
+
config IMX_CONFIG
default "board/tqc/tqma6/tqma6q.cfg" if TQMA6Q
default "board/tqc/tqma6/tqma6s.cfg" if TQMA6S
diff --git a/configs/tqma6q_mba6_mmc_defconfig b/configs/tqma6q_mba6_mmc_defconfig
index 41a7ebf51d..3fe50dab73 100644
--- a/configs/tqma6q_mba6_mmc_defconfig
+++ b/configs/tqma6q_mba6_mmc_defconfig
@@ -1,6 +1,5 @@
CONFIG_ARM=y
CONFIG_ARCH_MX6=y
CONFIG_TARGET_TQMA6=y
-CONFIG_SYS_EXTRA_OPTIONS="MBA6"
CONFIG_CMD_SETEXPR=y
CONFIG_CMD_NET=y
diff --git a/configs/tqma6q_mba6_spi_defconfig b/configs/tqma6q_mba6_spi_defconfig
index f8a44bff30..74981bb0b8 100644
--- a/configs/tqma6q_mba6_spi_defconfig
+++ b/configs/tqma6q_mba6_spi_defconfig
@@ -2,6 +2,5 @@ CONFIG_ARM=y
CONFIG_ARCH_MX6=y
CONFIG_TARGET_TQMA6=y
CONFIG_TQMA6X_SPI_BOOT=y
-CONFIG_SYS_EXTRA_OPTIONS="MBA6"
CONFIG_CMD_SETEXPR=y
CONFIG_CMD_NET=y
diff --git a/configs/tqma6s_mba6_mmc_defconfig b/configs/tqma6s_mba6_mmc_defconfig
index b5413f643e..5cc2234a06 100644
--- a/configs/tqma6s_mba6_mmc_defconfig
+++ b/configs/tqma6s_mba6_mmc_defconfig
@@ -2,6 +2,5 @@ CONFIG_ARM=y
CONFIG_ARCH_MX6=y
CONFIG_TARGET_TQMA6=y
CONFIG_TQMA6S=y
-CONFIG_SYS_EXTRA_OPTIONS="MBA6"
CONFIG_CMD_SETEXPR=y
CONFIG_CMD_NET=y
diff --git a/configs/tqma6s_mba6_spi_defconfig b/configs/tqma6s_mba6_spi_defconfig
index edbe4b3d9d..a97671c486 100644
--- a/configs/tqma6s_mba6_spi_defconfig
+++ b/configs/tqma6s_mba6_spi_defconfig
@@ -3,6 +3,5 @@ CONFIG_ARCH_MX6=y
CONFIG_TARGET_TQMA6=y
CONFIG_TQMA6S=y
CONFIG_TQMA6X_SPI_BOOT=y
-CONFIG_SYS_EXTRA_OPTIONS="MBA6"
CONFIG_CMD_SETEXPR=y
CONFIG_CMD_NET=y
OpenPOWER on IntegriCloud