Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 51f6c4280f95a8066e965cfa3268de5ad737d385

Authored by Markus Niebel
Committed by Stefano Babic
1 parent 66cacc9d5d
Exists in v2017.01-smarct4x and in 35 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, emb_lf_v2023.04, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_2.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0, smarc_8mq_lf_v2020.04, ti-u-boot-2015.07, v2015.07-smarct33, v2015.07-smarct33-emmc, v2015.07-smarct4x, v2016.05-dlt, v2016.05-smarct3x, v2016.05-smarct3x-emmc, v2016.05-smarct4x, v2017.01-smarct3x, v2017.01-smarct3x-emmc

arm: mx6: tqma6: CPU type selection via Kconfig 

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>

Showing 7 changed files with 36 additions and 9 deletions Side-by-side Diff

... ... @@ -576,10 +576,6 @@
576 576 bool "Support tbs2910"
577 577 select CPU_V7
578 578  
579   -config TARGET_TQMA6
580   - bool "TQ Systems TQMa6 board"
581   - select CPU_V7
582   -
583 579 config TARGET_OT1200
584 580 bool "Bachmann OT1200"
585 581 select CPU_V7
... ... @@ -959,7 +955,6 @@
959 955 source "board/timll/devkit3250/Kconfig"
960 956 source "board/toradex/colibri_pxa270/Kconfig"
961 957 source "board/toradex/colibri_vf/Kconfig"
962   -source "board/tqc/tqma6/Kconfig"
963 958 source "board/trizepsiv/Kconfig"
964 959 source "board/ttcontrol/vision2/Kconfig"
965 960 source "board/udoo/Kconfig"
arch/arm/cpu/armv7/mx6/Kconfig
Diff comments   View file @ 51f6c42
... ... @@ -33,12 +33,17 @@
33 33 bool "Support secomx6 boards"
34 34 select CPU_V7
35 35  
  36 +config TARGET_TQMA6
  37 + bool "TQ Systems TQMa6 board"
  38 + select CPU_V7
  39 +
36 40 endchoice
37 41  
38 42 config SYS_SOC
39 43 default "mx6"
40 44  
41 45 source "board/seco/Kconfig"
  46 +source "board/tqc/tqma6/Kconfig"
42 47  
43 48 endif
board/tqc/tqma6/Kconfig
Diff comments   View file @ 51f6c42
... ... @@ -12,5 +12,26 @@
12 12 config SYS_CONFIG_NAME
13 13 default "tqma6"
14 14  
  15 +choice
  16 + prompt "TQMa6 SoC variant"
  17 + default TQMA6Q
  18 + help
  19 + select the TQMa6 module variant. The variants differing in the used
  20 + i.MX6 CPU type and DRAM
  21 +
  22 +config TQMA6Q
  23 + bool "TQMa6Q / TQMa6D"
  24 + select MX6Q
  25 + help
  26 + select TQMa6Q / TQMa6D with i.MX6Q/D and 1GiB DRAM
  27 +
  28 +config TQMA6S
  29 + bool "TQMa6S"
  30 + select MX6S
  31 + help
  32 + select TQMa6S with i.MX6S and 512 MiB DRAM
  33 +
  34 +endchoice
  35 +
15 36 endif
configs/tqma6q_mba6_mmc_defconfig
Diff comments   View file @ 51f6c42
1 1 CONFIG_ARM=y
  2 +CONFIG_ARCH_MX6=y
2 3 CONFIG_TARGET_TQMA6=y
3   -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/tqc/tqma6/tqma6q.cfg,MX6Q,MBA6,TQMA6X_MMC_BOOT"
  4 +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/tqc/tqma6/tqma6q.cfg,MBA6,TQMA6X_MMC_BOOT"
4 5 CONFIG_CMD_SETEXPR=y
5 6 CONFIG_CMD_NET=y
configs/tqma6q_mba6_spi_defconfig
Diff comments   View file @ 51f6c42
1 1 CONFIG_ARM=y
  2 +CONFIG_ARCH_MX6=y
2 3 CONFIG_TARGET_TQMA6=y
3   -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/tqc/tqma6/tqma6q.cfg,MX6Q,MBA6,TQMA6X_SPI_BOOT"
  4 +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/tqc/tqma6/tqma6q.cfg,MBA6,TQMA6X_SPI_BOOT"
4 5 CONFIG_CMD_SETEXPR=y
5 6 CONFIG_CMD_NET=y
configs/tqma6s_mba6_mmc_defconfig
Diff comments   View file @ 51f6c42
1 1 CONFIG_ARM=y
  2 +CONFIG_ARCH_MX6=y
2 3 CONFIG_TARGET_TQMA6=y
3   -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/tqc/tqma6/tqma6s.cfg,MX6S,MBA6,TQMA6X_MMC_BOOT"
  4 +CONFIG_TQMA6S=y
  5 +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/tqc/tqma6/tqma6s.cfg,MBA6,TQMA6X_MMC_BOOT"
4 6 CONFIG_CMD_SETEXPR=y
5 7 CONFIG_CMD_NET=y
configs/tqma6s_mba6_spi_defconfig
Diff comments   View file @ 51f6c42
1 1 CONFIG_ARM=y
  2 +CONFIG_ARCH_MX6=y
2 3 CONFIG_TARGET_TQMA6=y
3   -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/tqc/tqma6/tqma6s.cfg,MX6S,MBA6,TQMA6X_SPI_BOOT"
  4 +CONFIG_TQMA6S=y
  5 +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/tqc/tqma6/tqma6s.cfg,MBA6,TQMA6X_SPI_BOOT"
4 6 CONFIG_CMD_SETEXPR=y
5 7 CONFIG_CMD_NET=y