arm: imx6: tqma6: Kconfig rework

PATCH RESEND Superseded Markus Niebel 2 participants 7 messages May 12, 2015 – May 18, 2015 Arm (32-bit)

lore

Share & tools

lore

Markus Niebel

author

2015-05-12 12:18 UTC #0 lore raw

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 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(-)

Signature · 1 line

2.3.0

Markus Niebel

author

2015-05-12 12:18 UTC #1 lore raw

PATCH RESEND 1/4 arm: mx6: tqma6: CPU type selection via Kconfig

From: Markus Niebel <[email protected]>

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 <[email protected]>

---
 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(-)

arch/arm/Kconfig +0 -5

index cee3126..33d3341 100644
@@ -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"

arch/arm/cpu/armv7/mx6/Kconfig +5 -0

index 076ba52..662596f 100644
@@ -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

board/tqc/tqma6/Kconfig +21 -0

index f8b3d1f..3e4d9f5 100644
@@ -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 +3 -1

index 4ee9238..42d8928 100644
@@ -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"

configs/tqma6q_mba6_spi_defconfig +3 -1

index 86d4ca3..7371b3d 100644
@@ -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"

configs/tqma6s_mba6_mmc_defconfig +3 -1

index 5efce6a..b7feb18 100644
@@ -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"

configs/tqma6s_mba6_spi_defconfig +3 -1

index e8b3afd..24d07cd 100644
@@ -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"

include/configs/tqma6.h +0 -2

index 012fa1c..fc94670 100644
@@ -9,8 +9,6 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#define CONFIG_MX6
-
 /* SPL */
 /* #if defined(CONFIG_SPL_BUILD) */

Signature · 1 line

2.3.0

Markus Niebel

author

2015-05-12 12:18 UTC #2 lore raw

PATCH RESEND 2/4 arm: imx6: tqma6: implement IMX_CONFIG with Kconfig

In reply to Markus Niebel

From: Markus Niebel <[email protected]>

Now that we have the Kconfig based CPU type selection, use this to fill the IMX_CONFIG automatically

Signed-off-by Markus Niebel <[email protected]>

---
 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

index 3e4d9f5..ce47ba4 100644
@@ -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

index 42d8928..59e7859 100644
@@ -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"

configs/tqma6q_mba6_spi_defconfig +1 -1

index 7371b3d..db65778 100644
@@ -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"

configs/tqma6s_mba6_mmc_defconfig +1 -1

index b7feb18..6c0763d 100644
@@ -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

index 24d07cd..4873ffb 100644
@@ -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

Stefano Babic

2015-05-15 12:38 UTC #3 lore raw

PATCH RESEND 2/4 arm: imx6: tqma6: implement IMX_CONFIG with Kconfig

Hi Markus,

Quoted 63 lines · Markus Niebel

From: Markus Niebel <[email protected]>

Now that we have the Kconfig based CPU type selection, use this to fill the IMX_CONFIG automatically

Signed-off-by Markus Niebel <[email protected]>

---
 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

index 3e4d9f5..ce47ba4 100644
@@ -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

index 42d8928..59e7859 100644
@@ -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"

configs/tqma6q_mba6_spi_defconfig +1 -1

index 7371b3d..db65778 100644
@@ -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"

configs/tqma6s_mba6_mmc_defconfig +1 -1

index b7feb18..6c0763d 100644
@@ -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 +0 -0

index 24d07cd..4873ffb 100644

configs/tqma6s_mba6_spi_defconfig CONFIG_ARM=y · line 5

Quoted 5 lines

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"

Rather it does not work. By compiling envcrc (host), the options are not set and it fails:

cc -Wp,-MD,tools/.envcrc.o.d -Wall -Wstrict-prototypes -O2
-fomit-frame-pointer -include ./include/libfdt_env.h -idirafterinclude
-idirafter./arch/arm/include -I./lib/libfdt -I./tools -DCONFIG_SYS_TEXT_BASE=0x4fc00000 -DUSE_HOSTCC -D__KERNEL_STRICT_NAMES -D_GNU_SOURCE -c -o tools/envcrc.o tools/envcrc.c
In file included from include/config.h:5:0,

                 from tools/envcrc.c:19:

include/configs/tqma6.h:342:2: error: #error "need to define boot source"

This happens for the SPI boards, not for MMC - I have not checked why.

Can you investigate this issue ?

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
=====================================================================

Markus Niebel

author

2015-05-18 06:39 UTC #4 lore raw

PATCH RESEND 2/4 arm: imx6: tqma6: implement IMX_CONFIG with Kconfig

Hello Stefano,

Am 15.05.2015 um 14:38 schrieb Stefano Babic:

Quoted 82 lines

Hi Markus,

Quoted 63 lines · Markus Niebel

From: Markus Niebel <[email protected]>

Now that we have the Kconfig based CPU type selection, use this to fill the IMX_CONFIG automatically

Signed-off-by Markus Niebel <[email protected]>

---
 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

index 3e4d9f5..ce47ba4 100644
@@ -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

index 42d8928..59e7859 100644
@@ -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"

configs/tqma6q_mba6_spi_defconfig +1 -1

index 7371b3d..db65778 100644
@@ -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"

configs/tqma6s_mba6_mmc_defconfig +1 -1

index b7feb18..6c0763d 100644
@@ -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 +0 -0

index 24d07cd..4873ffb 100644

configs/tqma6s_mba6_spi_defconfig CONFIG_ARM=y · line 5

Quoted 5 lines

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"

Rather it does not work. By compiling envcrc (host), the options are not set and it fails:

cc -Wp,-MD,tools/.envcrc.o.d -Wall -Wstrict-prototypes -O2

(quoted diff) +0 -4

-fomit-frame-pointer   -include ./include/libfdt_env.h -idirafterinclude
-idirafter./arch/arm/include -I./lib/libfdt -I./tools
-DCONFIG_SYS_TEXT_BASE=0x4fc00000 -DUSE_HOSTCC -D__KERNEL_STRICT_NAMES
-D_GNU_SOURCE  -c -o tools/envcrc.o tools/envcrc.c

In file included from include/config.h:5:0,

Quoted 6 lines

                 from tools/envcrc.c:19:
include/configs/tqma6.h:342:2: error: #error "need to define boot source"
This happens for the SPI boards, not for MMC - I have not checked why.
Can you investigate this issue ?

First: sorry for inconvinience!

Seems to be an issue with the new build system - env tools do not see the kconfig defines when tqma6.h is preprocessed. I'm not sure what's the best
solution: if I include linux/kconfig.h at top of tqma6.h this build break is fixed. The canyonlands board makes this, too. But I have the feeling that this should be better done at a central place, shouldn't it?

Quoted 3 lines

Best regards,
Stefano Babic

Best Regards,
Markus Niebel

Markus Niebel

author

2015-05-12 12:18 UTC #5 lore raw

PATCH RESEND 3/4 arm: imx6: tqma6: boot device selection via Kconfig

In reply to Markus Niebel

From: Markus Niebel <[email protected]>

Signed-off-by Markus Niebel <[email protected]>

---
 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(-)

board/tqc/tqma6/Kconfig +19 -0

index ce47ba4..132e82f 100644
@@ -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 +2 -1

index 59e7859..c57ee5a 100644
@@ -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

configs/tqma6q_mba6_spi_defconfig +2 -1

index db65778..dbc366b 100644
@@ -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"

configs/tqma6s_mba6_mmc_defconfig +2 -1

index 6c0763d..4e7317e 100644
@@ -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"

configs/tqma6s_mba6_spi_defconfig +2 -1

index 4873ffb..d874dc2 100644
@@ -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

Markus Niebel

author

2015-05-12 12:18 UTC #6 lore raw

PATCH RESEND 4/4 arm: imx6: tqma6: implement KConfig baseboard selection

In reply to Markus Niebel

From: Markus Niebel <[email protected]>

this finally removes the need for extra settings in defconfig

Signed-off-by Markus Niebel <[email protected]>

---
 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(-)

board/tqc/tqma6/Kconfig +11 -0

index 132e82f..5612f27 100644
@@ -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

configs/tqma6q_mba6_mmc_defconfig +1 -1

index c57ee5a..9a78a7e 100644
@@ -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

configs/tqma6q_mba6_spi_defconfig +1 -1

index dbc366b..1808d35 100644
@@ -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

configs/tqma6s_mba6_mmc_defconfig +1 -1

index 4e7317e..5dcf0a1 100644
@@ -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

configs/tqma6s_mba6_spi_defconfig +1 -1

index d874dc2..0946f39 100644
@@ -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

Signature · 1 line

2.3.0