[U-Boot] [patch][U-Boot 0/4] arm: imx6: tqma6: Kconfig rework
From: Markus Niebel Markus.Niebel@tq-group.com
This series extends the Kconfig options for TQMa6 to enable removal of CONFIG_SYS_EXTRA_OPTIONS for this boards.
To enable CPU selection the first patch moves the board selection to the i.MX6 CPU menu as implemented by the Seco mx6 boards
Markus Niebel (4): arm: mx6: tqma6: CPU type selection via Kconfig arm: imx6: tqma6: implement IMX_CONFIG with Kconfig arm: imx6: tqma6: boot device selection via Kconfig arm: imx6: tqma6: implement KConfig baseboard selection
arch/arm/Kconfig | 5 ---- arch/arm/cpu/armv7/mx6/Kconfig | 5 ++++ board/tqc/tqma6/Kconfig | 55 +++++++++++++++++++++++++++++++++++++++ configs/tqma6q_mba6_mmc_defconfig | 5 +++- configs/tqma6q_mba6_spi_defconfig | 5 +++- configs/tqma6s_mba6_mmc_defconfig | 5 +++- configs/tqma6s_mba6_spi_defconfig | 5 +++- include/configs/tqma6.h | 2 -- 8 files changed, 76 insertions(+), 11 deletions(-)
From: Markus Niebel Markus.Niebel@tq-group.com
This is the first patch to remove the CONFIG_SYS_EXTRA_OPTIONS.
This patch implements CPU type selection from Kconfig. Further Kconfig stuff is added later.
Signed-off-by: Markus Niebel Markus.Niebel@tq-group.com --- arch/arm/Kconfig | 5 ----- arch/arm/cpu/armv7/mx6/Kconfig | 5 +++++ board/tqc/tqma6/Kconfig | 21 +++++++++++++++++++++ configs/tqma6q_mba6_mmc_defconfig | 4 +++- configs/tqma6q_mba6_spi_defconfig | 4 +++- configs/tqma6s_mba6_mmc_defconfig | 4 +++- configs/tqma6s_mba6_spi_defconfig | 4 +++- include/configs/tqma6.h | 2 -- 8 files changed, 38 insertions(+), 11 deletions(-)
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index cee3126..33d3341 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -574,10 +574,6 @@ config TARGET_TBS2910 bool "Support tbs2910" select CPU_V7
-config TARGET_TQMA6 - bool "TQ Systems TQMa6 board" - select CPU_V7 - config TARGET_OT1200 bool "Bachmann OT1200" select CPU_V7 @@ -953,7 +949,6 @@ source "board/ti/ti816x/Kconfig" source "board/timll/devkit3250/Kconfig" source "board/toradex/colibri_pxa270/Kconfig" source "board/toradex/colibri_vf/Kconfig" -source "board/tqc/tqma6/Kconfig" source "board/trizepsiv/Kconfig" source "board/ttcontrol/vision2/Kconfig" source "board/udoo/Kconfig" diff --git a/arch/arm/cpu/armv7/mx6/Kconfig b/arch/arm/cpu/armv7/mx6/Kconfig index 076ba52..662596f 100644 --- a/arch/arm/cpu/armv7/mx6/Kconfig +++ b/arch/arm/cpu/armv7/mx6/Kconfig @@ -32,11 +32,16 @@ config TARGET_SECOMX6 bool "Support secomx6 boards" select CPU_V7
+config TARGET_TQMA6 + bool "TQ Systems TQMa6 board" + select CPU_V7 + endchoice
config SYS_SOC default "mx6"
source "board/seco/Kconfig" +source "board/tqc/tqma6/Kconfig"
endif diff --git a/board/tqc/tqma6/Kconfig b/board/tqc/tqma6/Kconfig index f8b3d1f..3e4d9f5 100644 --- a/board/tqc/tqma6/Kconfig +++ b/board/tqc/tqma6/Kconfig @@ -12,4 +12,25 @@ config SYS_SOC config SYS_CONFIG_NAME default "tqma6"
+choice + prompt "TQMa6 SoC variant" + default TQMA6Q + help + select the TQMa6 module variant. The variants differing in the used + i.MX6 CPU type and DRAM + +config TQMA6Q + bool "TQMa6Q / TQMa6D" + select MX6Q + help + select TQMa6Q / TQMa6D with i.MX6Q/D and 1GiB DRAM + +config TQMA6S + bool "TQMa6S" + select MX6S + help + select TQMa6S with i.MX6S and 512 MiB DRAM + +endchoice + endif diff --git a/configs/tqma6q_mba6_mmc_defconfig b/configs/tqma6q_mba6_mmc_defconfig index 4ee9238..42d8928 100644 --- a/configs/tqma6q_mba6_mmc_defconfig +++ b/configs/tqma6q_mba6_mmc_defconfig @@ -1,3 +1,5 @@ -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/tqc/tqma6/tqma6q.cfg,MX6Q,MBA6,TQMA6X_MMC_BOOT" CONFIG_ARM=y +CONFIG_ARCH_MX6=y CONFIG_TARGET_TQMA6=y +CONFIG_TQMA6Q=y +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/tqc/tqma6/tqma6q.cfg,MBA6,TQMA6X_MMC_BOOT" diff --git a/configs/tqma6q_mba6_spi_defconfig b/configs/tqma6q_mba6_spi_defconfig index 86d4ca3..7371b3d 100644 --- a/configs/tqma6q_mba6_spi_defconfig +++ b/configs/tqma6q_mba6_spi_defconfig @@ -1,3 +1,5 @@ -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/tqc/tqma6/tqma6q.cfg,MX6Q,MBA6,TQMA6X_SPI_BOOT" CONFIG_ARM=y +CONFIG_ARCH_MX6=y CONFIG_TARGET_TQMA6=y +CONFIG_TQMA6Q=y +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/tqc/tqma6/tqma6q.cfg,MBA6,TQMA6X_SPI_BOOT" diff --git a/configs/tqma6s_mba6_mmc_defconfig b/configs/tqma6s_mba6_mmc_defconfig index 5efce6a..b7feb18 100644 --- a/configs/tqma6s_mba6_mmc_defconfig +++ b/configs/tqma6s_mba6_mmc_defconfig @@ -1,3 +1,5 @@ -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/tqc/tqma6/tqma6s.cfg,MX6S,MBA6,TQMA6X_MMC_BOOT" CONFIG_ARM=y +CONFIG_ARCH_MX6=y CONFIG_TARGET_TQMA6=y +CONFIG_TQMA6S=y +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/tqc/tqma6/tqma6s.cfg,MBA6,TQMA6X_MMC_BOOT" diff --git a/configs/tqma6s_mba6_spi_defconfig b/configs/tqma6s_mba6_spi_defconfig index e8b3afd..24d07cd 100644 --- a/configs/tqma6s_mba6_spi_defconfig +++ b/configs/tqma6s_mba6_spi_defconfig @@ -1,3 +1,5 @@ -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/tqc/tqma6/tqma6s.cfg,MX6S,MBA6,TQMA6X_SPI_BOOT" CONFIG_ARM=y +CONFIG_ARCH_MX6=y CONFIG_TARGET_TQMA6=y +CONFIG_TQMA6S=y +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/tqc/tqma6/tqma6s.cfg,MBA6,TQMA6X_SPI_BOOT" diff --git a/include/configs/tqma6.h b/include/configs/tqma6.h index 012fa1c..fc94670 100644 --- a/include/configs/tqma6.h +++ b/include/configs/tqma6.h @@ -9,8 +9,6 @@ #ifndef __CONFIG_H #define __CONFIG_H
-#define CONFIG_MX6 - /* SPL */ /* #if defined(CONFIG_SPL_BUILD) */
From: Markus Niebel Markus.Niebel@tq-group.com
This is the first patch to remove the CONFIG_SYS_EXTRA_OPTIONS.
This patch implements CPU type selection from Kconfig. Further Kconfig stuff is added later.
Signed-off-by: Markus Niebel Markus.Niebel@tq-group.com --- arch/arm/Kconfig | 5 ----- arch/arm/cpu/armv7/mx6/Kconfig | 5 +++++ board/tqc/tqma6/Kconfig | 21 +++++++++++++++++++++ configs/tqma6q_mba6_mmc_defconfig | 4 +++- configs/tqma6q_mba6_spi_defconfig | 4 +++- configs/tqma6s_mba6_mmc_defconfig | 4 +++- configs/tqma6s_mba6_spi_defconfig | 4 +++- include/configs/tqma6.h | 2 -- 8 files changed, 38 insertions(+), 11 deletions(-)
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index cee3126..33d3341 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -574,10 +574,6 @@ config TARGET_TBS2910 bool "Support tbs2910" select CPU_V7
-config TARGET_TQMA6 - bool "TQ Systems TQMa6 board" - select CPU_V7 - config TARGET_OT1200 bool "Bachmann OT1200" select CPU_V7 @@ -953,7 +949,6 @@ source "board/ti/ti816x/Kconfig" source "board/timll/devkit3250/Kconfig" source "board/toradex/colibri_pxa270/Kconfig" source "board/toradex/colibri_vf/Kconfig" -source "board/tqc/tqma6/Kconfig" source "board/trizepsiv/Kconfig" source "board/ttcontrol/vision2/Kconfig" source "board/udoo/Kconfig" diff --git a/arch/arm/cpu/armv7/mx6/Kconfig b/arch/arm/cpu/armv7/mx6/Kconfig index 076ba52..662596f 100644 --- a/arch/arm/cpu/armv7/mx6/Kconfig +++ b/arch/arm/cpu/armv7/mx6/Kconfig @@ -32,11 +32,16 @@ config TARGET_SECOMX6 bool "Support secomx6 boards" select CPU_V7
+config TARGET_TQMA6 + bool "TQ Systems TQMa6 board" + select CPU_V7 + endchoice
config SYS_SOC default "mx6"
source "board/seco/Kconfig" +source "board/tqc/tqma6/Kconfig"
endif diff --git a/board/tqc/tqma6/Kconfig b/board/tqc/tqma6/Kconfig index f8b3d1f..3e4d9f5 100644 --- a/board/tqc/tqma6/Kconfig +++ b/board/tqc/tqma6/Kconfig @@ -12,4 +12,25 @@ config SYS_SOC config SYS_CONFIG_NAME default "tqma6"
+choice + prompt "TQMa6 SoC variant" + default TQMA6Q + help + select the TQMa6 module variant. The variants differing in the used + i.MX6 CPU type and DRAM + +config TQMA6Q + bool "TQMa6Q / TQMa6D" + select MX6Q + help + select TQMa6Q / TQMa6D with i.MX6Q/D and 1GiB DRAM + +config TQMA6S + bool "TQMa6S" + select MX6S + help + select TQMa6S with i.MX6S and 512 MiB DRAM + +endchoice + endif diff --git a/configs/tqma6q_mba6_mmc_defconfig b/configs/tqma6q_mba6_mmc_defconfig index 4ee9238..42d8928 100644 --- a/configs/tqma6q_mba6_mmc_defconfig +++ b/configs/tqma6q_mba6_mmc_defconfig @@ -1,3 +1,5 @@ -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/tqc/tqma6/tqma6q.cfg,MX6Q,MBA6,TQMA6X_MMC_BOOT" CONFIG_ARM=y +CONFIG_ARCH_MX6=y CONFIG_TARGET_TQMA6=y +CONFIG_TQMA6Q=y +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/tqc/tqma6/tqma6q.cfg,MBA6,TQMA6X_MMC_BOOT" diff --git a/configs/tqma6q_mba6_spi_defconfig b/configs/tqma6q_mba6_spi_defconfig index 86d4ca3..7371b3d 100644 --- a/configs/tqma6q_mba6_spi_defconfig +++ b/configs/tqma6q_mba6_spi_defconfig @@ -1,3 +1,5 @@ -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/tqc/tqma6/tqma6q.cfg,MX6Q,MBA6,TQMA6X_SPI_BOOT" CONFIG_ARM=y +CONFIG_ARCH_MX6=y CONFIG_TARGET_TQMA6=y +CONFIG_TQMA6Q=y +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/tqc/tqma6/tqma6q.cfg,MBA6,TQMA6X_SPI_BOOT" diff --git a/configs/tqma6s_mba6_mmc_defconfig b/configs/tqma6s_mba6_mmc_defconfig index 5efce6a..b7feb18 100644 --- a/configs/tqma6s_mba6_mmc_defconfig +++ b/configs/tqma6s_mba6_mmc_defconfig @@ -1,3 +1,5 @@ -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/tqc/tqma6/tqma6s.cfg,MX6S,MBA6,TQMA6X_MMC_BOOT" CONFIG_ARM=y +CONFIG_ARCH_MX6=y CONFIG_TARGET_TQMA6=y +CONFIG_TQMA6S=y +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/tqc/tqma6/tqma6s.cfg,MBA6,TQMA6X_MMC_BOOT" diff --git a/configs/tqma6s_mba6_spi_defconfig b/configs/tqma6s_mba6_spi_defconfig index e8b3afd..24d07cd 100644 --- a/configs/tqma6s_mba6_spi_defconfig +++ b/configs/tqma6s_mba6_spi_defconfig @@ -1,3 +1,5 @@ -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/tqc/tqma6/tqma6s.cfg,MX6S,MBA6,TQMA6X_SPI_BOOT" CONFIG_ARM=y +CONFIG_ARCH_MX6=y CONFIG_TARGET_TQMA6=y +CONFIG_TQMA6S=y +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/tqc/tqma6/tqma6s.cfg,MBA6,TQMA6X_SPI_BOOT" diff --git a/include/configs/tqma6.h b/include/configs/tqma6.h index 012fa1c..fc94670 100644 --- a/include/configs/tqma6.h +++ b/include/configs/tqma6.h @@ -9,8 +9,6 @@ #ifndef __CONFIG_H #define __CONFIG_H
-#define CONFIG_MX6 - /* SPL */ /* #if defined(CONFIG_SPL_BUILD) */
From: Markus Niebel Markus.Niebel@tq-group.com
Now that we have the Kconfig based CPU type selection, use this to fill the IMX_CONFIG automatically
Signed-off-by: Markus Niebel Markus.Niebel@tq-group.com --- board/tqc/tqma6/Kconfig | 4 ++++ configs/tqma6q_mba6_mmc_defconfig | 2 +- configs/tqma6q_mba6_spi_defconfig | 2 +- configs/tqma6s_mba6_mmc_defconfig | 2 +- configs/tqma6s_mba6_spi_defconfig | 2 +- 5 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/board/tqc/tqma6/Kconfig b/board/tqc/tqma6/Kconfig index 3e4d9f5..ce47ba4 100644 --- a/board/tqc/tqma6/Kconfig +++ b/board/tqc/tqma6/Kconfig @@ -33,4 +33,8 @@ config TQMA6S
endchoice
+config IMX_CONFIG + default "board/tqc/tqma6/tqma6q.cfg" if TQMA6Q + default "board/tqc/tqma6/tqma6s.cfg" if TQMA6S + endif diff --git a/configs/tqma6q_mba6_mmc_defconfig b/configs/tqma6q_mba6_mmc_defconfig index 42d8928..59e7859 100644 --- a/configs/tqma6q_mba6_mmc_defconfig +++ b/configs/tqma6q_mba6_mmc_defconfig @@ -2,4 +2,4 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y CONFIG_TARGET_TQMA6=y CONFIG_TQMA6Q=y -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/tqc/tqma6/tqma6q.cfg,MBA6,TQMA6X_MMC_BOOT" +CONFIG_SYS_EXTRA_OPTIONS="MBA6,TQMA6X_MMC_BOOT" diff --git a/configs/tqma6q_mba6_spi_defconfig b/configs/tqma6q_mba6_spi_defconfig index 7371b3d..db65778 100644 --- a/configs/tqma6q_mba6_spi_defconfig +++ b/configs/tqma6q_mba6_spi_defconfig @@ -2,4 +2,4 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y CONFIG_TARGET_TQMA6=y CONFIG_TQMA6Q=y -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/tqc/tqma6/tqma6q.cfg,MBA6,TQMA6X_SPI_BOOT" +CONFIG_SYS_EXTRA_OPTIONS="MBA6,TQMA6X_SPI_BOOT" diff --git a/configs/tqma6s_mba6_mmc_defconfig b/configs/tqma6s_mba6_mmc_defconfig index b7feb18..6c0763d 100644 --- a/configs/tqma6s_mba6_mmc_defconfig +++ b/configs/tqma6s_mba6_mmc_defconfig @@ -2,4 +2,4 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y CONFIG_TARGET_TQMA6=y CONFIG_TQMA6S=y -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/tqc/tqma6/tqma6s.cfg,MBA6,TQMA6X_MMC_BOOT" +CONFIG_SYS_EXTRA_OPTIONS="MBA6,TQMA6X_MMC_BOOT" diff --git a/configs/tqma6s_mba6_spi_defconfig b/configs/tqma6s_mba6_spi_defconfig index 24d07cd..4873ffb 100644 --- a/configs/tqma6s_mba6_spi_defconfig +++ b/configs/tqma6s_mba6_spi_defconfig @@ -2,4 +2,4 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y CONFIG_TARGET_TQMA6=y CONFIG_TQMA6S=y -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/tqc/tqma6/tqma6s.cfg,MBA6,TQMA6X_SPI_BOOT" +CONFIG_SYS_EXTRA_OPTIONS="MBA6,TQMA6X_SPI_BOOT"
From: Markus Niebel Markus.Niebel@tq-group.com
Signed-off-by: Markus Niebel Markus.Niebel@tq-group.com --- board/tqc/tqma6/Kconfig | 19 +++++++++++++++++++ configs/tqma6q_mba6_mmc_defconfig | 3 ++- configs/tqma6q_mba6_spi_defconfig | 3 ++- configs/tqma6s_mba6_mmc_defconfig | 3 ++- configs/tqma6s_mba6_spi_defconfig | 3 ++- 5 files changed, 27 insertions(+), 4 deletions(-)
diff --git a/board/tqc/tqma6/Kconfig b/board/tqc/tqma6/Kconfig index ce47ba4..132e82f 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 59e7859..c57ee5a 100644 --- a/configs/tqma6q_mba6_mmc_defconfig +++ b/configs/tqma6q_mba6_mmc_defconfig @@ -2,4 +2,5 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y CONFIG_TARGET_TQMA6=y CONFIG_TQMA6Q=y -CONFIG_SYS_EXTRA_OPTIONS="MBA6,TQMA6X_MMC_BOOT" +CONFIG_TQMA6X_MMC_BOOT=y +CONFIG_SYS_EXTRA_OPTIONS="MBA6" \ No newline at end of file diff --git a/configs/tqma6q_mba6_spi_defconfig b/configs/tqma6q_mba6_spi_defconfig index db65778..dbc366b 100644 --- a/configs/tqma6q_mba6_spi_defconfig +++ b/configs/tqma6q_mba6_spi_defconfig @@ -2,4 +2,5 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y CONFIG_TARGET_TQMA6=y CONFIG_TQMA6Q=y -CONFIG_SYS_EXTRA_OPTIONS="MBA6,TQMA6X_SPI_BOOT" +CONFIG_TQMA6X_SPI_BOOT=y +CONFIG_SYS_EXTRA_OPTIONS="MBA6" diff --git a/configs/tqma6s_mba6_mmc_defconfig b/configs/tqma6s_mba6_mmc_defconfig index 6c0763d..4e7317e 100644 --- a/configs/tqma6s_mba6_mmc_defconfig +++ b/configs/tqma6s_mba6_mmc_defconfig @@ -2,4 +2,5 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y CONFIG_TARGET_TQMA6=y CONFIG_TQMA6S=y -CONFIG_SYS_EXTRA_OPTIONS="MBA6,TQMA6X_MMC_BOOT" +CONFIG_TQMA6X_MMC_BOOT=y +CONFIG_SYS_EXTRA_OPTIONS="MBA6" diff --git a/configs/tqma6s_mba6_spi_defconfig b/configs/tqma6s_mba6_spi_defconfig index 4873ffb..d874dc2 100644 --- a/configs/tqma6s_mba6_spi_defconfig +++ b/configs/tqma6s_mba6_spi_defconfig @@ -2,4 +2,5 @@ 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"
From: Markus Niebel Markus.Niebel@tq-group.com
Signed-off-by: Markus Niebel Markus.Niebel@tq-group.com --- board/tqc/tqma6/Kconfig | 19 +++++++++++++++++++ configs/tqma6q_mba6_mmc_defconfig | 3 ++- configs/tqma6q_mba6_spi_defconfig | 3 ++- configs/tqma6s_mba6_mmc_defconfig | 3 ++- configs/tqma6s_mba6_spi_defconfig | 3 ++- 5 files changed, 27 insertions(+), 4 deletions(-)
diff --git a/board/tqc/tqma6/Kconfig b/board/tqc/tqma6/Kconfig index ce47ba4..132e82f 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 59e7859..c57ee5a 100644 --- a/configs/tqma6q_mba6_mmc_defconfig +++ b/configs/tqma6q_mba6_mmc_defconfig @@ -2,4 +2,5 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y CONFIG_TARGET_TQMA6=y CONFIG_TQMA6Q=y -CONFIG_SYS_EXTRA_OPTIONS="MBA6,TQMA6X_MMC_BOOT" +CONFIG_TQMA6X_MMC_BOOT=y +CONFIG_SYS_EXTRA_OPTIONS="MBA6" \ No newline at end of file diff --git a/configs/tqma6q_mba6_spi_defconfig b/configs/tqma6q_mba6_spi_defconfig index db65778..dbc366b 100644 --- a/configs/tqma6q_mba6_spi_defconfig +++ b/configs/tqma6q_mba6_spi_defconfig @@ -2,4 +2,5 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y CONFIG_TARGET_TQMA6=y CONFIG_TQMA6Q=y -CONFIG_SYS_EXTRA_OPTIONS="MBA6,TQMA6X_SPI_BOOT" +CONFIG_TQMA6X_SPI_BOOT=y +CONFIG_SYS_EXTRA_OPTIONS="MBA6" diff --git a/configs/tqma6s_mba6_mmc_defconfig b/configs/tqma6s_mba6_mmc_defconfig index 6c0763d..4e7317e 100644 --- a/configs/tqma6s_mba6_mmc_defconfig +++ b/configs/tqma6s_mba6_mmc_defconfig @@ -2,4 +2,5 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y CONFIG_TARGET_TQMA6=y CONFIG_TQMA6S=y -CONFIG_SYS_EXTRA_OPTIONS="MBA6,TQMA6X_MMC_BOOT" +CONFIG_TQMA6X_MMC_BOOT=y +CONFIG_SYS_EXTRA_OPTIONS="MBA6" diff --git a/configs/tqma6s_mba6_spi_defconfig b/configs/tqma6s_mba6_spi_defconfig index 4873ffb..d874dc2 100644 --- a/configs/tqma6s_mba6_spi_defconfig +++ b/configs/tqma6s_mba6_spi_defconfig @@ -2,4 +2,5 @@ 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"
From: Markus Niebel Markus.Niebel@tq-group.com
this finally removes the need for extra settings in defconfig
Signed-off-by: Markus Niebel Markus.Niebel@tq-group.com --- board/tqc/tqma6/Kconfig | 11 +++++++++++ configs/tqma6q_mba6_mmc_defconfig | 2 +- configs/tqma6q_mba6_spi_defconfig | 2 +- configs/tqma6s_mba6_mmc_defconfig | 2 +- configs/tqma6s_mba6_spi_defconfig | 2 +- 5 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/board/tqc/tqma6/Kconfig b/board/tqc/tqma6/Kconfig index 132e82f..5612f27 100644 --- a/board/tqc/tqma6/Kconfig +++ b/board/tqc/tqma6/Kconfig @@ -52,6 +52,17 @@ config TQMA6X_SPI_BOOT
endchoice
+choice + prompt "TQMa6 base board variant" + +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 c57ee5a..9a78a7e 100644 --- a/configs/tqma6q_mba6_mmc_defconfig +++ b/configs/tqma6q_mba6_mmc_defconfig @@ -3,4 +3,4 @@ CONFIG_ARCH_MX6=y CONFIG_TARGET_TQMA6=y CONFIG_TQMA6Q=y CONFIG_TQMA6X_MMC_BOOT=y -CONFIG_SYS_EXTRA_OPTIONS="MBA6" \ No newline at end of file +CONFIG_MBA6=y diff --git a/configs/tqma6q_mba6_spi_defconfig b/configs/tqma6q_mba6_spi_defconfig index dbc366b..1808d35 100644 --- a/configs/tqma6q_mba6_spi_defconfig +++ b/configs/tqma6q_mba6_spi_defconfig @@ -3,4 +3,4 @@ CONFIG_ARCH_MX6=y CONFIG_TARGET_TQMA6=y CONFIG_TQMA6Q=y CONFIG_TQMA6X_SPI_BOOT=y -CONFIG_SYS_EXTRA_OPTIONS="MBA6" +CONFIG_MBA6=y diff --git a/configs/tqma6s_mba6_mmc_defconfig b/configs/tqma6s_mba6_mmc_defconfig index 4e7317e..5dcf0a1 100644 --- a/configs/tqma6s_mba6_mmc_defconfig +++ b/configs/tqma6s_mba6_mmc_defconfig @@ -3,4 +3,4 @@ CONFIG_ARCH_MX6=y CONFIG_TARGET_TQMA6=y CONFIG_TQMA6S=y CONFIG_TQMA6X_MMC_BOOT=y -CONFIG_SYS_EXTRA_OPTIONS="MBA6" +CONFIG_MBA6=y diff --git a/configs/tqma6s_mba6_spi_defconfig b/configs/tqma6s_mba6_spi_defconfig index d874dc2..0946f39 100644 --- a/configs/tqma6s_mba6_spi_defconfig +++ b/configs/tqma6s_mba6_spi_defconfig @@ -3,4 +3,4 @@ CONFIG_ARCH_MX6=y CONFIG_TARGET_TQMA6=y CONFIG_TQMA6S=y CONFIG_TQMA6X_SPI_BOOT=y -CONFIG_SYS_EXTRA_OPTIONS="MBA6" +CONFIG_MBA6=y
Am 12.05.2015 um 12:11 schrieb Markus Niebel: Sorry, forgot to remove old version of patches. Will resend them.
From: Markus Niebel Markus.Niebel@tq-group.com
This series extends the Kconfig options for TQMa6 to enable removal of CONFIG_SYS_EXTRA_OPTIONS for this boards.
To enable CPU selection the first patch moves the board selection to the i.MX6 CPU menu as implemented by the Seco mx6 boards
Markus Niebel (4): arm: mx6: tqma6: CPU type selection via Kconfig arm: imx6: tqma6: implement IMX_CONFIG with Kconfig arm: imx6: tqma6: boot device selection via Kconfig arm: imx6: tqma6: implement KConfig baseboard selection
arch/arm/Kconfig | 5 ---- arch/arm/cpu/armv7/mx6/Kconfig | 5 ++++ board/tqc/tqma6/Kconfig | 55 +++++++++++++++++++++++++++++++++++++++ configs/tqma6q_mba6_mmc_defconfig | 5 +++- configs/tqma6q_mba6_spi_defconfig | 5 +++- configs/tqma6s_mba6_mmc_defconfig | 5 +++- configs/tqma6s_mba6_spi_defconfig | 5 +++- include/configs/tqma6.h | 2 -- 8 files changed, 76 insertions(+), 11 deletions(-)
participants (2)
-
Markus Niebel -
Markus Niebel