Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit d08215a5f13a11745d4adae3dab76c5e8fadbe0a

Authored by Masahiro Yamada
Committed by Tom Rini
1 parent 3cfbcb58d3
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

omap4: kconfig: move board select menu and common settings 

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

Move also common settings (CONFIG_SYS_CPU="armv7" and
CONFIG_SYS_SOC="omap4").

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Reviewed-by: Tom Rini <trini@ti.com>
Cc: Lokesh Vutla <lokeshvutla@ti.com>

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

... ... @@ -415,15 +415,9 @@
415 415 config OMAP34XX
416 416 bool "OMAP34XX SoC"
417 417  
418   -config TARGET_DUOVERO
419   - bool "Support duovero"
  418 +config OMAP44XX
  419 + bool "OMAP44XX SoC"
420 420  
421   -config TARGET_OMAP4_PANDA
422   - bool "Support omap4_panda"
423   -
424   -config TARGET_OMAP4_SDP4430
425   - bool "Support omap4_sdp4430"
426   -
427 421 config TARGET_CM_T54
428 422 bool "Support cm_t54"
429 423  
... ... @@ -531,6 +525,8 @@
531 525  
532 526 source "arch/arm/cpu/armv7/omap3/Kconfig"
533 527  
  528 +source "arch/arm/cpu/armv7/omap4/Kconfig"
  529 +
534 530 source "arch/arm/cpu/armv7/rmobile/Kconfig"
535 531  
536 532 source "arch/arm/cpu/armv7/tegra-common/Kconfig"
... ... @@ -615,7 +611,6 @@
615 611 source "board/freescale/vf610twr/Kconfig"
616 612 source "board/gateworks/gw_ventana/Kconfig"
617 613 source "board/genesi/mx51_efikamx/Kconfig"
618   -source "board/gumstix/duovero/Kconfig"
619 614 source "board/gumstix/pepper/Kconfig"
620 615 source "board/h2200/Kconfig"
621 616 source "board/hale/tt01/Kconfig"
... ... @@ -669,8 +664,6 @@
669 664 source "board/ti/dra7xx/Kconfig"
670 665 source "board/ti/ks2_evm/Kconfig"
671 666 source "board/ti/omap5_uevm/Kconfig"
672   -source "board/ti/panda/Kconfig"
673   -source "board/ti/sdp4430/Kconfig"
674 667 source "board/ti/ti814x/Kconfig"
675 668 source "board/ti/ti816x/Kconfig"
676 669 source "board/ti/tnetv107xevm/Kconfig"
arch/arm/cpu/armv7/omap4/Kconfig
Diff comments   View file @ d08215a
  1 +if OMAP44XX
  2 +
  3 +choice
  4 + prompt "OMAP4 board select"
  5 +
  6 +config TARGET_DUOVERO
  7 + bool "OMAP4430 Gumstix Duovero"
  8 +
  9 +config TARGET_OMAP4_PANDA
  10 + bool "TI OMAP4 PandaBoard"
  11 +
  12 +config TARGET_OMAP4_SDP4430
  13 + bool "TI OMAP4 SDP4430"
  14 +
  15 +endchoice
  16 +
  17 +config SYS_CPU
  18 + string
  19 + default "armv7"
  20 +
  21 +config SYS_SOC
  22 + string
  23 + default "omap4"
  24 +
  25 +source "board/gumstix/duovero/Kconfig"
  26 +source "board/ti/panda/Kconfig"
  27 +source "board/ti/sdp4430/Kconfig"
  28 +
  29 +endif
board/gumstix/duovero/Kconfig
Diff comments   View file @ d08215a
1 1 if TARGET_DUOVERO
2 2  
3   -config SYS_CPU
4   - string
5   - default "armv7"
6   -
7 3 config SYS_BOARD
8 4 string
9 5 default "duovero"
... ... @@ -11,10 +7,6 @@
11 7 config SYS_VENDOR
12 8 string
13 9 default "gumstix"
14   -
15   -config SYS_SOC
16   - string
17   - default "omap4"
18 10  
19 11 config SYS_CONFIG_NAME
20 12 string
board/ti/panda/Kconfig
Diff comments   View file @ d08215a
1 1 if TARGET_OMAP4_PANDA
2 2  
3   -config SYS_CPU
4   - string
5   - default "armv7"
6   -
7 3 config SYS_BOARD
8 4 string
9 5 default "panda"
... ... @@ -11,10 +7,6 @@
11 7 config SYS_VENDOR
12 8 string
13 9 default "ti"
14   -
15   -config SYS_SOC
16   - string
17   - default "omap4"
18 10  
19 11 config SYS_CONFIG_NAME
20 12 string
board/ti/sdp4430/Kconfig
Diff comments   View file @ d08215a
1 1 if TARGET_OMAP4_SDP4430
2 2  
3   -config SYS_CPU
4   - string
5   - default "armv7"
6   -
7 3 config SYS_BOARD
8 4 string
9 5 default "sdp4430"
... ... @@ -11,10 +7,6 @@
11 7 config SYS_VENDOR
12 8 string
13 9 default "ti"
14   -
15   -config SYS_SOC
16   - string
17   - default "omap4"
18 10  
19 11 config SYS_CONFIG_NAME
20 12 string
configs/duovero_defconfig
Diff comments   View file @ d08215a
1 1 CONFIG_SPL=y
2 2 +S:CONFIG_ARM=y
  3 ++S:CONFIG_OMAP44XX=y
3 4 +S:CONFIG_TARGET_DUOVERO=y
configs/omap4_panda_defconfig
Diff comments   View file @ d08215a
1 1 CONFIG_SPL=y
2 2 +S:CONFIG_ARM=y
  3 ++S:CONFIG_OMAP44XX=y
3 4 +S:CONFIG_TARGET_OMAP4_PANDA=y
configs/omap4_sdp4430_defconfig
Diff comments   View file @ d08215a
1 1 CONFIG_SPL=y
2 2 +S:CONFIG_ARM=y
  3 ++S:CONFIG_OMAP44XX=y
3 4 +S:CONFIG_TARGET_OMAP4_SDP4430=y
include/configs/ti_omap4_common.h
Diff comments   View file @ d08215a
... ... @@ -15,7 +15,6 @@
15 15 /*
16 16 * High Level Configuration Options
17 17 */
18   -#define CONFIG_OMAP44XX 1 /* which is a 44XX */
19 18 #define CONFIG_OMAP4430 1 /* which is in a 4430 */
20 19 #define CONFIG_MISC_INIT_R
21 20 #define CONFIG_ARCH_CPU_INIT