Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 7865f4b0b67ea7108117e68166294b7e95a5ede1

Authored by Masahiro Yamada
Committed by Marek Vasut
1 parent a02a669c11
Exists in v2017.01-smarct4x and in 34 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-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: socfpga: move board select into mach-socfpga/Kconfig 

Switch to a more standard way of board select; put the SoC select
into arch/arm/Kconfig and move the board select menu under
arch/arm/mach-socfpga/Kconfig.

Also, consolidate SYS_BOARD, SYS_VENDOR, SYS_SOC, SYS_CONFIG_NAME.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>

Showing 6 changed files with 34 additions and 42 deletions Side-by-side Diff

... ... @@ -619,22 +619,14 @@
619 619 select DM_SERIAL
620 620 select DM_GPIO
621 621  
622   -config TARGET_SOCFPGA_ARRIA5
623   - bool "Support socfpga_arria5"
  622 +config ARCH_SOCFPGA
  623 + bool "Altera SOCFPGA family"
624 624 select CPU_V7
625 625 select SUPPORT_SPL
626 626 select DM
627 627 select DM_SPI_FLASH
628 628 select DM_SPI
629 629  
630   -config TARGET_SOCFPGA_CYCLONE5
631   - bool "Support socfpga_cyclone5"
632   - select CPU_V7
633   - select SUPPORT_SPL
634   - select DM
635   - select DM_SPI_FLASH
636   - select DM_SPI
637   -
638 630 config ARCH_SUNXI
639 631 bool "Support sunxi (Allwinner) SoCs"
640 632 select DM
... ... @@ -841,6 +833,8 @@
841 833  
842 834 source "arch/arm/cpu/armv7/s5pc1xx/Kconfig"
843 835  
  836 +source "arch/arm/mach-socfpga/Kconfig"
  837 +
844 838 source "arch/arm/mach-tegra/Kconfig"
845 839  
846 840 source "arch/arm/mach-uniphier/Kconfig"
... ... @@ -863,7 +857,6 @@
863 857 source "board/Marvell/db-88f6820-gp/Kconfig"
864 858 source "board/Marvell/db-mv784mp-gp/Kconfig"
865 859 source "board/Marvell/gplugd/Kconfig"
866   -source "board/altera/socfpga/Kconfig"
867 860 source "board/armadeus/apf27/Kconfig"
868 861 source "board/armltd/vexpress/Kconfig"
869 862 source "board/armltd/vexpress64/Kconfig"
arch/arm/mach-socfpga/Kconfig
Diff comments   View file @ 7865f4b
  1 +if ARCH_SOCFPGA
  2 +
  3 +choice
  4 + prompt "Altera SOCFPGA board select"
  5 +
  6 +config TARGET_SOCFPGA_ARRIA5
  7 + bool "Altera SOCFPGA Arria V"
  8 +
  9 +config TARGET_SOCFPGA_CYCLONE5
  10 + bool "Altera SOCFPGA Cyclone V"
  11 +
  12 +endchoice
  13 +
  14 +config SYS_BOARD
  15 + default "socfpga"
  16 +
  17 +config SYS_VENDOR
  18 + default "altera"
  19 +
  20 +config SYS_SOC
  21 + default "socfpga"
  22 +
  23 +config SYS_CONFIG_NAME
  24 + default "socfpga_arria5" if TARGET_SOCFPGA_ARRIA5
  25 + default "socfpga_cyclone5" if TARGET_SOCFPGA_CYCLONE5
  26 +
  27 +endif
board/altera/socfpga/Kconfig
View file @ 7865f4b
1   -if TARGET_SOCFPGA_CYCLONE5
2   -
3   -config SYS_BOARD
4   - default "socfpga"
5   -
6   -config SYS_VENDOR
7   - default "altera"
8   -
9   -config SYS_SOC
10   - default "socfpga"
11   -
12   -config SYS_CONFIG_NAME
13   - default "socfpga_cyclone5"
14   -
15   -endif
16   -
17   -if TARGET_SOCFPGA_ARRIA5
18   -
19   -config SYS_BOARD
20   - default "socfpga"
21   -
22   -config SYS_VENDOR
23   - default "altera"
24   -
25   -config SYS_SOC
26   - default "socfpga"
27   -
28   -config SYS_CONFIG_NAME
29   - default "socfpga_arria5"
30   -
31   -endif
configs/socfpga_arria5_defconfig
Diff comments   View file @ 7865f4b
1 1 CONFIG_SPL=y
2 2 CONFIG_ARM=y
  3 +CONFIG_ARCH_SOCFPGA=y
3 4 CONFIG_TARGET_SOCFPGA_ARRIA5=y
4 5 CONFIG_OF_CONTROL=y
5 6 CONFIG_DEFAULT_DEVICE_TREE="socfpga_arria5_socdk"
configs/socfpga_cyclone5_defconfig
Diff comments   View file @ 7865f4b
1 1 CONFIG_SPL=y
2 2 CONFIG_ARM=y
  3 +CONFIG_ARCH_SOCFPGA=y
3 4 CONFIG_TARGET_SOCFPGA_CYCLONE5=y
4 5 CONFIG_OF_CONTROL=y
5 6 CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_socdk"
configs/socfpga_socrates_defconfig
Diff comments   View file @ 7865f4b
1 1 CONFIG_SPL=y
2 2 CONFIG_ARM=y
  3 +CONFIG_ARCH_SOCFPGA=y
3 4 CONFIG_TARGET_SOCFPGA_CYCLONE5=y
4 5 CONFIG_OF_CONTROL=y
5 6 CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_socrates"