summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--board/tqc/tqma6/Kconfig19
-rw-r--r--configs/tqma6q_mba6_mmc_defconfig2
-rw-r--r--configs/tqma6q_mba6_spi_defconfig3
-rw-r--r--configs/tqma6s_mba6_mmc_defconfig2
-rw-r--r--configs/tqma6s_mba6_spi_defconfig3
5 files changed, 25 insertions, 4 deletions
diff --git a/board/tqc/tqma6/Kconfig b/board/tqc/tqma6/Kconfig
index ce47ba49c6..132e82f68d 100644
--- a/board/tqc/tqma6/Kconfig
+++ b/board/tqc/tqma6/Kconfig
@@ -33,6 +33,25 @@ config TQMA6S
endchoice
+choice
+ prompt "TQMa6 boot configuration"
+ default TQMA6X_MMC_BOOT
+ help
+ Configure boot device. This is also used to implement environment
+ location.
+
+config TQMA6X_MMC_BOOT
+ bool "MMC / SD Boot"
+ help
+ Boot from eMMC / SD Card
+
+config TQMA6X_SPI_BOOT
+ bool "SPI NOR Boot"
+ help
+ Boot from on board SPI NOR flash
+
+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 7ca343f3ab..41a7ebf51d 100644
--- a/configs/tqma6q_mba6_mmc_defconfig
+++ b/configs/tqma6q_mba6_mmc_defconfig
@@ -1,6 +1,6 @@
CONFIG_ARM=y
CONFIG_ARCH_MX6=y
CONFIG_TARGET_TQMA6=y
-CONFIG_SYS_EXTRA_OPTIONS="MBA6,TQMA6X_MMC_BOOT"
+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 bba751c0dd..f8a44bff30 100644
--- a/configs/tqma6q_mba6_spi_defconfig
+++ b/configs/tqma6q_mba6_spi_defconfig
@@ -1,6 +1,7 @@
CONFIG_ARM=y
CONFIG_ARCH_MX6=y
CONFIG_TARGET_TQMA6=y
-CONFIG_SYS_EXTRA_OPTIONS="MBA6,TQMA6X_SPI_BOOT"
+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 262ce2e83e..b5413f643e 100644
--- a/configs/tqma6s_mba6_mmc_defconfig
+++ b/configs/tqma6s_mba6_mmc_defconfig
@@ -2,6 +2,6 @@ CONFIG_ARM=y
CONFIG_ARCH_MX6=y
CONFIG_TARGET_TQMA6=y
CONFIG_TQMA6S=y
-CONFIG_SYS_EXTRA_OPTIONS="MBA6,TQMA6X_MMC_BOOT"
+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 8c62a03178..edbe4b3d9d 100644
--- a/configs/tqma6s_mba6_spi_defconfig
+++ b/configs/tqma6s_mba6_spi_defconfig
@@ -2,6 +2,7 @@ CONFIG_ARM=y
CONFIG_ARCH_MX6=y
CONFIG_TARGET_TQMA6=y
CONFIG_TQMA6S=y
-CONFIG_SYS_EXTRA_OPTIONS="MBA6,TQMA6X_SPI_BOOT"
+CONFIG_TQMA6X_SPI_BOOT=y
+CONFIG_SYS_EXTRA_OPTIONS="MBA6"
CONFIG_CMD_SETEXPR=y
CONFIG_CMD_NET=y
OpenPOWER on IntegriCloud