Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit fb2bf8c2c6c5e80a941987d7c8abcf47c825f942

Authored by York Sun
1 parent 4a4441765d
Exists in v2017.01-smarct4x and in 25 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.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_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, v2017.01-smarct3x, v2017.01-smarct3x-emmc

arm: Move FSL_LSCH2 FSL_LSCH3 to Kconfig 

Move these options to Kconfig and create a sub-menu to avoid name
conflict with other architectures.

Signed-off-by: York Sun <york.sun@nxp.com>
Reviewed-by: Simon Glass <sjg@chromium.org>

Showing 8 changed files with 27 additions and 6 deletions Side-by-side Diff

... ... @@ -652,6 +652,7 @@
652 652  
653 653 config TARGET_LS2080A_EMU
654 654 bool "Support ls2080a_emu"
  655 + select ARCH_LS2080A
655 656 select ARM64
656 657 select ARMV8_MULTIENTRY
657 658 help
... ... @@ -662,6 +663,7 @@
662 663  
663 664 config TARGET_LS2080A_SIMU
664 665 bool "Support ls2080a_simu"
  666 + select ARCH_LS2080A
665 667 select ARM64
666 668 select ARMV8_MULTIENTRY
667 669 help
... ... @@ -672,6 +674,7 @@
672 674  
673 675 config TARGET_LS2080AQDS
674 676 bool "Support ls2080aqds"
  677 + select ARCH_LS2080A
675 678 select ARM64
676 679 select ARMV8_MULTIENTRY
677 680 select SUPPORT_SPL
... ... @@ -683,6 +686,7 @@
683 686  
684 687 config TARGET_LS2080ARDB
685 688 bool "Support ls2080ardb"
  689 + select ARCH_LS2080A
686 690 select ARM64
687 691 select ARMV8_MULTIENTRY
688 692 select SUPPORT_SPL
arch/arm/cpu/armv7/ls102xa/Kconfig
Diff comments   View file @ fb2bf8c
... ... @@ -2,7 +2,15 @@
2 2 bool
3 3 select SYS_FSL_ERRATUM_A010315
4 4  
  5 +menu "LS102xA architecture"
  6 + depends on ARCH_LS1021A
  7 +
5 8 config LS1_DEEP_SLEEP
6 9 bool "Deep sleep"
7 10 depends on ARCH_LS1021A
  11 +
  12 +config SYS_FSL_ERRATUM_A010315
  13 + bool "Workaround for PCIe erratum A010315"
  14 +
  15 +endmenu
arch/arm/cpu/armv8/fsl-layerscape/Kconfig
Diff comments   View file @ fb2bf8c
1 1 config ARCH_LS1012A
2 2 bool
  3 + select FSL_LSCH2
3 4 select SYS_FSL_MMDC
4 5 select SYS_FSL_ERRATUM_A010315
5 6  
6 7 config ARCH_LS1043A
7 8 bool
  9 + select FSL_LSCH2
8 10 select SYS_FSL_ERRATUM_A010315
9 11 select SYS_FSL_ERRATUM_A010539
10 12  
11 13 config ARCH_LS1046A
12 14 bool
  15 + select FSL_LSCH2
13 16 select SYS_FSL_ERRATUM_A010539
14 17  
15 18 config ARCH_LS2080A
16 19 bool
  20 + select FSL_LSCH3
17 21  
  22 +config FSL_LSCH2
  23 + bool
  24 +
  25 +config FSL_LSCH3
  26 + bool
  27 +
  28 +menu "Layerscape architecture"
  29 + depends on FSL_LSCH2 || FSL_LSCH3
  30 +
18 31 config SYS_FSL_MMDC
19 32 bool
20 33  
... ... @@ -23,4 +36,6 @@
23 36  
24 37 config SYS_FSL_ERRATUM_A010539
25 38 bool "Workaround for PIN MUX erratum A010539"
  39 +
  40 +endmenu
include/configs/ls1012a_common.h
Diff comments   View file @ fb2bf8c
... ... @@ -8,7 +8,6 @@
8 8 #define __LS1012A_COMMON_H
9 9  
10 10 #define CONFIG_FSL_LAYERSCAPE
11   -#define CONFIG_FSL_LSCH2
12 11 #define CONFIG_GICV2
13 12  
14 13 #define CONFIG_SYS_HAS_SERDES
include/configs/ls1043a_common.h
Diff comments   View file @ fb2bf8c
... ... @@ -9,7 +9,6 @@
9 9  
10 10 #define CONFIG_REMAKE_ELF
11 11 #define CONFIG_FSL_LAYERSCAPE
12   -#define CONFIG_FSL_LSCH2
13 12 #define CONFIG_LS1043A
14 13 #define CONFIG_MP
15 14 #define CONFIG_SYS_FSL_CLK
include/configs/ls1046a_common.h
Diff comments   View file @ fb2bf8c
... ... @@ -9,7 +9,6 @@
9 9  
10 10 #define CONFIG_REMAKE_ELF
11 11 #define CONFIG_FSL_LAYERSCAPE
12   -#define CONFIG_FSL_LSCH2
13 12 #define CONFIG_MP
14 13 #define CONFIG_SYS_FSL_CLK
15 14 #define CONFIG_GICV2
include/configs/ls2080a_common.h
Diff comments   View file @ fb2bf8c
... ... @@ -9,7 +9,6 @@
9 9  
10 10 #define CONFIG_REMAKE_ELF
11 11 #define CONFIG_FSL_LAYERSCAPE
12   -#define CONFIG_FSL_LSCH3
13 12 #define CONFIG_MP
14 13 #define CONFIG_GICV3
15 14 #define CONFIG_FSL_TZPC_BP147
scripts/config_whitelist.txt
Diff comments   View file @ fb2bf8c
... ... @@ -1299,8 +1299,6 @@
1299 1299 CONFIG_FSL_LAYERSCAPE
1300 1300 CONFIG_FSL_LBC
1301 1301 CONFIG_FSL_LINFLEXUART
1302   -CONFIG_FSL_LSCH2
1303   -CONFIG_FSL_LSCH3
1304 1302 CONFIG_FSL_LS_PPA
1305 1303 CONFIG_FSL_MC9SDZ60
1306 1304 CONFIG_FSL_MC_ENET