Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 72df68cc6b73febcaacbb9e2e232b6580672c8bd

Authored by Masahiro Yamada
Committed by Tom Rini
1 parent 47539e2317
Exists in v2017.01-smarct4x and in 37 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, imx_v2015.04_4.1.15_1.0.0_ga, 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_v2015.04_4.1.15_1.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-m6.0.1_2.1.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

exynos: kconfig: move board select menu and common settings 

Becuase the board select menu in arch/arm/Kconfig is too big,
move the Exynos board select menu to exynos/Kconfig.

Consolidate also common settings (CONFIG_SYS_CPU="armv7" and
CONFIG_SYS_SOC="exynos").

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Acked-by: Minkyu Kang <mk7.kang@samsung.com>

Showing 20 changed files with 69 additions and 117 deletions Side-by-side Diff

... ... @@ -374,36 +374,9 @@
374 374 config TARGET_BCM958622HR
375 375 bool "Support bcm958622hr"
376 376  
377   -config TARGET_ARNDALE
378   - bool "Support arndale"
  377 +config ARCH_EXYNOS
  378 + bool "Samsung EXYNOS"
379 379  
380   -config TARGET_ORIGEN
381   - bool "Support origen"
382   -
383   -config TARGET_SMDK5250
384   - bool "Support smdk5250"
385   -
386   -config TARGET_SNOW
387   - bool "Support snow"
388   -
389   -config TARGET_PEACH_PIT
390   - bool "Support peach-pit"
391   -
392   -config TARGET_SMDK5420
393   - bool "Support smdk5420"
394   -
395   -config TARGET_SMDKV310
396   - bool "Support smdkv310"
397   -
398   -config TARGET_TRATS
399   - bool "Support trats"
400   -
401   -config TARGET_TRATS2
402   - bool "Support trats2"
403   -
404   -config TARGET_S5PC210_UNIVERSAL
405   - bool "Support s5pc210_universal"
406   -
407 380 config TARGET_HIGHBANK
408 381 bool "Support highbank"
409 382  
... ... @@ -659,6 +632,8 @@
659 632  
660 633 endchoice
661 634  
  635 +source "arch/arm/cpu/armv7/exynos/Kconfig"
  636 +
662 637 source "arch/arm/cpu/arm926ejs/kirkwood/Kconfig"
663 638  
664 639 source "arch/arm/cpu/armv7/rmobile/Kconfig"
665 640  
666 641  
667 642  
... ... @@ -796,17 +771,9 @@
796 771 source "board/ronetix/pm9261/Kconfig"
797 772 source "board/ronetix/pm9263/Kconfig"
798 773 source "board/ronetix/pm9g45/Kconfig"
799   -source "board/samsung/arndale/Kconfig"
800 774 source "board/samsung/goni/Kconfig"
801   -source "board/samsung/origen/Kconfig"
802 775 source "board/samsung/smdk2410/Kconfig"
803   -source "board/samsung/smdk5250/Kconfig"
804   -source "board/samsung/smdk5420/Kconfig"
805 776 source "board/samsung/smdkc100/Kconfig"
806   -source "board/samsung/smdkv310/Kconfig"
807   -source "board/samsung/trats/Kconfig"
808   -source "board/samsung/trats2/Kconfig"
809   -source "board/samsung/universal_c210/Kconfig"
810 777 source "board/sandisk/sansa_fuze_plus/Kconfig"
811 778 source "board/scb9328/Kconfig"
812 779 source "board/schulercontrol/sc_sps_1/Kconfig"
arch/arm/cpu/armv7/exynos/Kconfig
Diff comments   View file @ 72df68c
  1 +if ARCH_EXYNOS
  2 +
  3 +choice
  4 + prompt "EXYNOS board select"
  5 +
  6 +config TARGET_SMDKV310
  7 + bool "Exynos4210 SMDKV310 board"
  8 +
  9 +config TARGET_TRATS
  10 + bool "Exynos4210 Trats board"
  11 +
  12 +config TARGET_S5PC210_UNIVERSAL
  13 + bool "EXYNOS4210 Universal C210 board"
  14 +
  15 +config TARGET_ORIGEN
  16 + bool "Exynos4412 Origen board"
  17 +
  18 +config TARGET_TRATS2
  19 + bool "Exynos4412 Trat2 board"
  20 +
  21 +config TARGET_ARNDALE
  22 + bool "Exynos5250 Arndale board"
  23 +
  24 +config TARGET_SMDK5250
  25 + bool "SMDK5250 board"
  26 +
  27 +config TARGET_SNOW
  28 + bool "Snow board"
  29 +
  30 +config TARGET_SMDK5420
  31 + bool "SMDK5420 board"
  32 +
  33 +config TARGET_PEACH_PIT
  34 + bool "Peach Pi board"
  35 +
  36 +endchoice
  37 +
  38 +config SYS_CPU
  39 + string
  40 + default "armv7"
  41 +
  42 +config SYS_SOC
  43 + string
  44 + default "exynos"
  45 +
  46 +source "board/samsung/smdkv310/Kconfig"
  47 +source "board/samsung/trats/Kconfig"
  48 +source "board/samsung/universal_c210/Kconfig"
  49 +source "board/samsung/origen/Kconfig"
  50 +source "board/samsung/trats2/Kconfig"
  51 +source "board/samsung/arndale/Kconfig"
  52 +source "board/samsung/smdk5250/Kconfig"
  53 +source "board/samsung/smdk5420/Kconfig"
  54 +
  55 +endif
board/samsung/arndale/Kconfig
Diff comments   View file @ 72df68c
1 1 if TARGET_ARNDALE
2 2  
3   -config SYS_CPU
4   - string
5   - default "armv7"
6   -
7 3 config SYS_BOARD
8 4 string
9 5 default "arndale"
... ... @@ -11,10 +7,6 @@
11 7 config SYS_VENDOR
12 8 string
13 9 default "samsung"
14   -
15   -config SYS_SOC
16   - string
17   - default "exynos"
18 10  
19 11 config SYS_CONFIG_NAME
20 12 string
board/samsung/origen/Kconfig
Diff comments   View file @ 72df68c
1 1 if TARGET_ORIGEN
2 2  
3   -config SYS_CPU
4   - string
5   - default "armv7"
6   -
7 3 config SYS_BOARD
8 4 string
9 5 default "origen"
... ... @@ -11,10 +7,6 @@
11 7 config SYS_VENDOR
12 8 string
13 9 default "samsung"
14   -
15   -config SYS_SOC
16   - string
17   - default "exynos"
18 10  
19 11 config SYS_CONFIG_NAME
20 12 string
board/samsung/smdk5250/Kconfig
Diff comments   View file @ 72df68c
1 1 if TARGET_SMDK5250
2 2  
3   -config SYS_CPU
4   - string
5   - default "armv7"
6   -
7 3 config SYS_BOARD
8 4 string
9 5 default "smdk5250"
... ... @@ -12,10 +8,6 @@
12 8 string
13 9 default "samsung"
14 10  
15   -config SYS_SOC
16   - string
17   - default "exynos"
18   -
19 11 config SYS_CONFIG_NAME
20 12 string
21 13 default "smdk5250"
... ... @@ -24,10 +16,6 @@
24 16  
25 17 if TARGET_SNOW
26 18  
27   -config SYS_CPU
28   - string
29   - default "armv7"
30   -
31 19 config SYS_BOARD
32 20 string
33 21 default "smdk5250"
... ... @@ -35,10 +23,6 @@
35 23 config SYS_VENDOR
36 24 string
37 25 default "samsung"
38   -
39   -config SYS_SOC
40   - string
41   - default "exynos"
42 26  
43 27 config SYS_CONFIG_NAME
44 28 string
board/samsung/smdk5420/Kconfig
Diff comments   View file @ 72df68c
1 1 if TARGET_PEACH_PIT
2 2  
3   -config SYS_CPU
4   - string
5   - default "armv7"
6   -
7 3 config SYS_BOARD
8 4 string
9 5 default "smdk5420"
... ... @@ -12,10 +8,6 @@
12 8 string
13 9 default "samsung"
14 10  
15   -config SYS_SOC
16   - string
17   - default "exynos"
18   -
19 11 config SYS_CONFIG_NAME
20 12 string
21 13 default "peach-pit"
... ... @@ -24,10 +16,6 @@
24 16  
25 17 if TARGET_SMDK5420
26 18  
27   -config SYS_CPU
28   - string
29   - default "armv7"
30   -
31 19 config SYS_BOARD
32 20 string
33 21 default "smdk5420"
... ... @@ -35,10 +23,6 @@
35 23 config SYS_VENDOR
36 24 string
37 25 default "samsung"
38   -
39   -config SYS_SOC
40   - string
41   - default "exynos"
42 26  
43 27 config SYS_CONFIG_NAME
44 28 string
board/samsung/smdkv310/Kconfig
Diff comments   View file @ 72df68c
1 1 if TARGET_SMDKV310
2 2  
3   -config SYS_CPU
4   - string
5   - default "armv7"
6   -
7 3 config SYS_BOARD
8 4 string
9 5 default "smdkv310"
... ... @@ -11,10 +7,6 @@
11 7 config SYS_VENDOR
12 8 string
13 9 default "samsung"
14   -
15   -config SYS_SOC
16   - string
17   - default "exynos"
18 10  
19 11 config SYS_CONFIG_NAME
20 12 string
board/samsung/trats/Kconfig
Diff comments   View file @ 72df68c
1 1 if TARGET_TRATS
2 2  
3   -config SYS_CPU
4   - string
5   - default "armv7"
6   -
7 3 config SYS_BOARD
8 4 string
9 5 default "trats"
... ... @@ -11,10 +7,6 @@
11 7 config SYS_VENDOR
12 8 string
13 9 default "samsung"
14   -
15   -config SYS_SOC
16   - string
17   - default "exynos"
18 10  
19 11 config SYS_CONFIG_NAME
20 12 string
board/samsung/trats2/Kconfig
Diff comments   View file @ 72df68c
1 1 if TARGET_TRATS2
2 2  
3   -config SYS_CPU
4   - string
5   - default "armv7"
6   -
7 3 config SYS_BOARD
8 4 string
9 5 default "trats2"
... ... @@ -11,10 +7,6 @@
11 7 config SYS_VENDOR
12 8 string
13 9 default "samsung"
14   -
15   -config SYS_SOC
16   - string
17   - default "exynos"
18 10  
19 11 config SYS_CONFIG_NAME
20 12 string
board/samsung/universal_c210/Kconfig
Diff comments   View file @ 72df68c
1 1 if TARGET_S5PC210_UNIVERSAL
2 2  
3   -config SYS_CPU
4   - string
5   - default "armv7"
6   -
7 3 config SYS_BOARD
8 4 string
9 5 default "universal_c210"
... ... @@ -11,10 +7,6 @@
11 7 config SYS_VENDOR
12 8 string
13 9 default "samsung"
14   -
15   -config SYS_SOC
16   - string
17   - default "exynos"
18 10  
19 11 config SYS_CONFIG_NAME
20 12 string
configs/arndale_defconfig
Diff comments   View file @ 72df68c
1 1 CONFIG_SPL=y
2 2 +S:CONFIG_ARM=y
  3 ++S:CONFIG_ARCH_EXYNOS=y
3 4 +S:CONFIG_TARGET_ARNDALE=y
configs/origen_defconfig
Diff comments   View file @ 72df68c
1 1 CONFIG_SPL=y
2 2 +S:CONFIG_ARM=y
  3 ++S:CONFIG_ARCH_EXYNOS=y
3 4 +S:CONFIG_TARGET_ORIGEN=y
configs/peach-pit_defconfig
Diff comments   View file @ 72df68c
1 1 CONFIG_SPL=y
2 2 +S:CONFIG_ARM=y
  3 ++S:CONFIG_ARCH_EXYNOS=y
3 4 +S:CONFIG_TARGET_PEACH_PIT=y
configs/s5pc210_universal_defconfig
Diff comments   View file @ 72df68c
1 1 CONFIG_ARM=y
  2 +CONFIG_ARCH_EXYNOS=y
2 3 CONFIG_TARGET_S5PC210_UNIVERSAL=y
configs/smdk5250_defconfig
Diff comments   View file @ 72df68c
1 1 CONFIG_SPL=y
2 2 +S:CONFIG_ARM=y
  3 ++S:CONFIG_ARCH_EXYNOS=y
3 4 +S:CONFIG_TARGET_SMDK5250=y
configs/smdk5420_defconfig
Diff comments   View file @ 72df68c
1 1 CONFIG_SPL=y
2 2 +S:CONFIG_ARM=y
  3 ++S:CONFIG_ARCH_EXYNOS=y
3 4 +S:CONFIG_TARGET_SMDK5420=y
configs/smdkv310_defconfig
Diff comments   View file @ 72df68c
1 1 CONFIG_SPL=y
2 2 +S:CONFIG_ARM=y
  3 ++S:CONFIG_ARCH_EXYNOS=y
3 4 +S:CONFIG_TARGET_SMDKV310=y
configs/snow_defconfig
Diff comments   View file @ 72df68c
1 1 CONFIG_SPL=y
2 2 +S:CONFIG_ARM=y
  3 ++S:CONFIG_ARCH_EXYNOS=y
3 4 +S:CONFIG_TARGET_SNOW=y
configs/trats2_defconfig
Diff comments   View file @ 72df68c
1 1 CONFIG_ARM=y
  2 +CONFIG_ARCH_EXYNOS=y
2 3 CONFIG_TARGET_TRATS2=y
configs/trats_defconfig
Diff comments   View file @ 72df68c
1 1 CONFIG_ARM=y
  2 +CONFIG_ARCH_EXYNOS=y
2 3 CONFIG_TARGET_TRATS=y