arm: imx6: tqma6: boot device selection via Kconfig

Signed-off-by: Markus Niebel <Markus.Niebel@tq-group.com>

diff --git a/board/tqc/tqma6/Kconfig b/board/tqc/tqma6/Kconfig
index ce47ba49c6ac0aa6bf7330938dc037cbd7aa1114..132e82f68dcb31dd85b8d4fa4d681d81b780a9c5 100644 (file)
--- 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 7ca343f3ab475012fe87d58a39b59af0b6cdaf53..41a7ebf51df18aecb3523017f69e54c693eec5b2 100644 (file)
--- 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 bba751c0ddf6eabaa22319c5e0e66d0023448c81..f8a44bff3015885a57b12d10c7434a3b453aff1d 100644 (file)
--- 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 262ce2e83ea6c38fd622887162738e7ce2bb0244..b5413f643e57c0e00b6d5a96e9ddb0ec8a68d60b 100644 (file)
--- 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 8c62a031786a488625bbd8586ff4e3ceb063790f..edbe4b3d9dfda8a5749a8cfa23306fc7e880beb4 100644 (file)
--- 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