arm: imx6: tqma6: Kconfig rework
v2 cover arm: imx6: tqma6: Kconfig rework
From: Markus Niebel <[email protected]>
This series extends the Kconfig options for TQMa6 to enable removal of CONFIG_SYS_EXTRA_OPTIONS for this boards.
To enable env device / boot device configuration the first patch includes the Kconfig generated header in the board configuration header.
To enable CPU selection the second patch moves the board selection to the i.MX6 CPU menu as implemented by the Seco mx6 boards
Changed for v2:
- rebase to current u-boot-imx
- add new patch to fix envcrc build for non default boot / env devices
- regenerate defconfigs to exclude defaults
Markus Niebel (5):
arm: imx6: tqma6: add kconfig to board header
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 | 58 +++++++++++++++++++++++++++++++++++++++ configs/tqma6q_mba6_mmc_defconfig | 2 +- configs/tqma6q_mba6_spi_defconfig | 3 +- configs/tqma6s_mba6_mmc_defconfig | 3 +- configs/tqma6s_mba6_spi_defconfig | 4 ++- include/configs/tqma6.h | 1 + 8 files changed, 72 insertions(+), 9 deletions(-)
Signature · 1 line
2.3.0
PATCH v2 1/5 arm: imx6: tqma6: add kconfig to board header
From: Markus Niebel <[email protected]>
this is needed later to have Kconfig generated
stuff as define.
--- include/configs/tqma6.h | 1 + 1 file changed, 1 insertion(+)
include/configs/tqma6.h +1 -0
@@ -9,6 +9,7 @@#ifndef __CONFIG_H#define __CONFIG_H +#include <linux/kconfig.h> /* SPL */ /* #if defined(CONFIG_SPL_BUILD) */
Signature · 1 line
2.3.0
PATCH v2 2/5 arm: mx6: tqma6: CPU type selection via Kconfig
In reply to Markus NiebelFrom: Markus Niebel <[email protected]>
This is the first patch to remove theCONFIG_SYS_EXTRA_OPTIONS.
This patch implements CPU type selection from Kconfig. Further Kconfig stuff is added later.
---
Changes in v2:
- regenerate defconfigs
arch/arm/Kconfig | 5 ----- arch/arm/cpu/armv7/mx6/Kconfig | 5 +++++ board/tqc/tqma6/Kconfig | 21 +++++++++++++++++++++ configs/tqma6q_mba6_mmc_defconfig | 3 ++- configs/tqma6q_mba6_spi_defconfig | 3 ++- configs/tqma6s_mba6_mmc_defconfig | 4 +++- configs/tqma6s_mba6_spi_defconfig | 4 +++- 7 files changed, 36 insertions(+), 9 deletions(-)
arch/arm/Kconfig +0 -5
@@ -576,10 +576,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
@@ -954,7 +950,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"
arch/arm/cpu/armv7/mx6/Kconfig +5 -0
@@ -33,11 +33,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
board/tqc/tqma6/Kconfig +21 -0
@@ -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
configs/tqma6q_mba6_mmc_defconfig +2 -1
@@ -1,3 +1,4 @@ CONFIG_ARM=y +CONFIG_ARCH_MX6=y CONFIG_TARGET_TQMA6=y -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/tqc/tqma6/tqma6q.cfg,MX6Q,MBA6,TQMA6X_MMC_BOOT" +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/tqc/tqma6/tqma6q.cfg,MBA6,TQMA6X_MMC_BOOT"
configs/tqma6q_mba6_spi_defconfig +2 -1
@@ -1,3 +1,4 @@ CONFIG_ARM=y +CONFIG_ARCH_MX6=y CONFIG_TARGET_TQMA6=y -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/tqc/tqma6/tqma6q.cfg,MX6Q,MBA6,TQMA6X_SPI_BOOT" +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/tqc/tqma6/tqma6q.cfg,MBA6,TQMA6X_SPI_BOOT"
configs/tqma6s_mba6_mmc_defconfig +3 -1
@@ -1,3 +1,5 @@ CONFIG_ARM=y +CONFIG_ARCH_MX6=y CONFIG_TARGET_TQMA6=y -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/tqc/tqma6/tqma6s.cfg,MX6S,MBA6,TQMA6X_MMC_BOOT" +CONFIG_TQMA6S=y +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/tqc/tqma6/tqma6s.cfg,MBA6,TQMA6X_MMC_BOOT"
configs/tqma6s_mba6_spi_defconfig +3 -1
@@ -1,3 +1,5 @@ CONFIG_ARM=y +CONFIG_ARCH_MX6=y CONFIG_TARGET_TQMA6=y -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/tqc/tqma6/tqma6s.cfg,MX6S,MBA6,TQMA6X_SPI_BOOT" +CONFIG_TQMA6S=y +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/tqc/tqma6/tqma6s.cfg,MBA6,TQMA6X_SPI_BOOT"
Signature · 1 line
2.3.0
PATCH v2 3/5 arm: imx6: tqma6: implement IMX_CONFIG with Kconfig
In reply to Markus NiebelFrom: Markus Niebel <[email protected]>
Now that we have the Kconfig based CPU type selection, use this to fill the IMX_CONFIG automatically
---
Changes for v2:
- regenerate defconfigs
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(-)
board/tqc/tqma6/Kconfig +4 -0
@@ -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
configs/tqma6q_mba6_mmc_defconfig +1 -1
@@ -1,4 +1,4 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y CONFIG_TARGET_TQMA6=y -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/tqc/tqma6/tqma6q.cfg,MBA6,TQMA6X_MMC_BOOT" +CONFIG_SYS_EXTRA_OPTIONS="MBA6,TQMA6X_MMC_BOOT"
configs/tqma6q_mba6_spi_defconfig +1 -1
@@ -1,4 +1,4 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y CONFIG_TARGET_TQMA6=y -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/tqc/tqma6/tqma6q.cfg,MBA6,TQMA6X_SPI_BOOT" +CONFIG_SYS_EXTRA_OPTIONS="MBA6,TQMA6X_SPI_BOOT"
configs/tqma6s_mba6_mmc_defconfig +1 -1
@@ -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"
configs/tqma6s_mba6_spi_defconfig +1 -1
@@ -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"
Signature · 1 line
2.3.0
PATCH v2 4/5 arm: imx6: tqma6: boot device selection via Kconfig
In reply to Markus NiebelFrom: Markus Niebel <[email protected]>
---
Changes for v2:
- regenerate defconfigs
board/tqc/tqma6/Kconfig | 19 +++++++++++++++++++ configs/tqma6q_mba6_mmc_defconfig | 2 +- configs/tqma6q_mba6_spi_defconfig | 3 ++- configs/tqma6s_mba6_mmc_defconfig | 2 +- configs/tqma6s_mba6_spi_defconfig | 3 ++- 5 files changed, 25 insertions(+), 4 deletions(-)
board/tqc/tqma6/Kconfig +19 -0
@@ -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
configs/tqma6q_mba6_mmc_defconfig +1 -1
@@ -1,4 +1,4 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y CONFIG_TARGET_TQMA6=y -CONFIG_SYS_EXTRA_OPTIONS="MBA6,TQMA6X_MMC_BOOT" +CONFIG_SYS_EXTRA_OPTIONS="MBA6"
configs/tqma6q_mba6_spi_defconfig +2 -1
@@ -1,4 +1,5 @@ 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"
configs/tqma6s_mba6_mmc_defconfig +1 -1
@@ -2,4 +2,4 @@ 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"
configs/tqma6s_mba6_spi_defconfig +2 -1
@@ -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"
Signature · 1 line
2.3.0
PATCH v2 5/5 arm: imx6: tqma6: implement KConfig baseboard selection
In reply to Markus NiebelFrom: Markus Niebel <[email protected]>
this finally removes the need for extra settings in defconfig
---
Changes for v2:
- add default for new choice
- regenerate defconfigs
board/tqc/tqma6/Kconfig | 14 ++++++++++++++ configs/tqma6q_mba6_mmc_defconfig | 1 - configs/tqma6q_mba6_spi_defconfig | 1 - configs/tqma6s_mba6_mmc_defconfig | 1 - configs/tqma6s_mba6_spi_defconfig | 1 - 5 files changed, 14 insertions(+), 4 deletions(-)
board/tqc/tqma6/Kconfig +14 -0
@@ -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
configs/tqma6q_mba6_mmc_defconfig +0 -1
@@ -1,4 +1,3 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y CONFIG_TARGET_TQMA6=y -CONFIG_SYS_EXTRA_OPTIONS="MBA6"
configs/tqma6q_mba6_spi_defconfig +0 -1
@@ -2,4 +2,3 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y CONFIG_TARGET_TQMA6=y CONFIG_TQMA6X_SPI_BOOT=y -CONFIG_SYS_EXTRA_OPTIONS="MBA6"
configs/tqma6s_mba6_mmc_defconfig +0 -1
@@ -2,4 +2,3 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y CONFIG_TARGET_TQMA6=y CONFIG_TQMA6S=y -CONFIG_SYS_EXTRA_OPTIONS="MBA6"
configs/tqma6s_mba6_spi_defconfig +0 -1
@@ -3,4 +3,3 @@ CONFIG_ARCH_MX6=y CONFIG_TARGET_TQMA6=y CONFIG_TQMA6S=y CONFIG_TQMA6X_SPI_BOOT=y -CONFIG_SYS_EXTRA_OPTIONS="MBA6"
Signature · 1 line
2.3.0
v2 cover arm: imx6: tqma6: Kconfig rework
In reply to Markus NiebelHello,
Am 04.06.2015 um 17:25 schrieb Markus Niebel:
Quoted 9 lines
From: Markus Niebel <[email protected]>
This series extends the
Kconfigoptions for TQMa6 to enable removal ofCONFIG_SYS_EXTRA_OPTIONSfor this boards.To enable env device / boot device configuration the first patch includes the
Kconfiggenerated header in the board configuration header.
Quoted 9 lines
To enable CPU selection the second patch moves the board selection to the i.MX6 CPU menu as implemented by the Seco mx6 boards
Changed for v2:
- rebase to current u-boot-imx
- add new patch to fix envcrc build for non default boot / env devices
- regenerate defconfigs to exclude defaults
Did just notice, that I forgot Stefano in CC.
Shall I resend or spin v3 - maybe I should change the Kconfig choices to be "optional" instead of having a "default". Also would it be better t squash the last 4 patches?
Quoted 17 lines
Markus Niebel (5):
arm: imx6: tqma6: add kconfig to board header
arm: mx6: tqma6: CPU type selection viaKconfig
arm: imx6: tqma6: implementIMX_CONFIGwithKconfig
arm: imx6: tqma6: boot device selection viaKconfig
arm: imx6: tqma6: implement KConfig baseboard selectionarch/arm/Kconfig | 5 ---- arch/arm/cpu/armv7/mx6/Kconfig | 5 ++++ board/tqc/tqma6/Kconfig | 58 +++++++++++++++++++++++++++++++++++++++ configs/tqma6q_mba6_mmc_defconfig | 2 +- configs/tqma6q_mba6_spi_defconfig | 3 +- configs/tqma6s_mba6_mmc_defconfig | 3 +- configs/tqma6s_mba6_spi_defconfig | 4 ++- include/configs/tqma6.h | 1 + 8 files changed, 72 insertions(+), 9 deletions(-)
v2 cover arm: imx6: tqma6: Kconfig rework
Hi Markus,
Quoted 5 lines · Markus Niebel
Did just notice, that I forgot Stefano in CC.
Shall I resend or spin v3 - maybe I should change theKconfigchoices to be "optional" instead of having a "default". Also would it be better t squash the last 4 patches?
It is ok so - you could change th "optional" in a follow up patch.
Applied to u-boot-imx, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================
v2 cover arm: imx6: tqma6: Kconfig rework
In reply to Markus NiebelQuoted 25 lines · Markus Niebel
From: Markus Niebel <[email protected]>
This series extends the
Kconfigoptions for TQMa6 to enable removal ofCONFIG_SYS_EXTRA_OPTIONSfor this boards.To enable env device / boot device configuration the first patch includes the
Kconfiggenerated header in the board configuration header.To enable CPU selection the second patch moves the board selection to the i.MX6 CPU menu as implemented by the Seco mx6 boards
Changed for v2:
- rebase to current u-boot-imx
- add new patch to fix envcrc build for non default boot / env devices
- regenerate defconfigs to exclude defaultsMarkus Niebel (5):
arm: imx6: tqma6: add kconfig to board header
arm: mx6: tqma6: CPU type selection viaKconfig
arm: imx6: tqma6: implementIMX_CONFIGwithKconfig
arm: imx6: tqma6: boot device selection viaKconfig
arm: imx6: tqma6: implement KConfig baseboard selection
Quoted 10 lines
arch/arm/Kconfig | 5 ---- arch/arm/cpu/armv7/mx6/Kconfig | 5 ++++ board/tqc/tqma6/Kconfig | 58 +++++++++++++++++++++++++++++++++++++++ configs/tqma6q_mba6_mmc_defconfig | 2 +- configs/tqma6q_mba6_spi_defconfig | 3 +- configs/tqma6s_mba6_mmc_defconfig | 3 +- configs/tqma6s_mba6_spi_defconfig | 4 ++- include/configs/tqma6.h | 1 + 8 files changed, 72 insertions(+), 9 deletions(-)
Applied to u-boot-imx, thanks !
Best regards,
Stefano Babic
Signature · 8 lines
Meet DENX at the Embedded World Trade Show 14 Mar - 16 Mar 2017, Nuremberg Trade Fair Centre, Hall 4, Booth 581 -- ===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================
v2 cover arm: imx6: tqma6: Kconfig rework
Quoted 38 lines · Stefano Babic
Quoted 25 lines · Markus Niebel
From: Markus Niebel <[email protected]>
This series extends the
Kconfigoptions for TQMa6 to enable removal ofCONFIG_SYS_EXTRA_OPTIONSfor this boards.To enable env device / boot device configuration the first patch includes the
Kconfiggenerated header in the board configuration header.To enable CPU selection the second patch moves the board selection to the i.MX6 CPU menu as implemented by the Seco mx6 boards
Changed for v2:
- rebase to current u-boot-imx
- add new patch to fix envcrc build for non default boot / env devices
- regenerate defconfigs to exclude defaultsMarkus Niebel (5):
arm: imx6: tqma6: add kconfig to board header
arm: mx6: tqma6: CPU type selection viaKconfig
arm: imx6: tqma6: implementIMX_CONFIGwithKconfig
arm: imx6: tqma6: boot device selection viaKconfig
arm: imx6: tqma6: implement KConfig baseboard selectionQuoted 10 lines
arch/arm/Kconfig | 5 ---- arch/arm/cpu/armv7/mx6/Kconfig | 5 ++++ board/tqc/tqma6/Kconfig | 58 +++++++++++++++++++++++++++++++++++++++ configs/tqma6q_mba6_mmc_defconfig | 2 +- configs/tqma6q_mba6_spi_defconfig | 3 +- configs/tqma6s_mba6_mmc_defconfig | 3 +- configs/tqma6s_mba6_spi_defconfig | 4 ++- include/configs/tqma6.h | 1 + 8 files changed, 72 insertions(+), 9 deletions(-)
Quoted 5 lines
Applied to u-boot-imx, thanks !
Best regards,
Stefano Babic
Sorry, I took the wrong e-mail - but you know what I did.
I applied patches 1-6 (Fix in the environment an cleanup for tqma6)
Best regards,
Stefano
Signature · 8 lines
Meet DENX at the Embedded World Trade Show 14 Mar - 16 Mar 2017, Nuremberg Trade Fair Centre, Hall 4, Booth 581 -- ===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================