LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Masahiro Yamada 2015-04-21 20:38:20 +09:00 committed by Marek Vasut
parent a02a669c11
commit 7865f4b0b6
6 changed files with 34 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
arch/arm/Kconfig
View File

@ -619,16 +619,8 @@ config TARGET_CM_FX6
select DM_SERIAL select DM_SERIAL
select DM_GPIO select DM_GPIO
config TARGET_SOCFPGA_ARRIA5 config ARCH_SOCFPGA
bool "Support socfpga_arria5" bool "Altera SOCFPGA family"
select CPU_V7
select SUPPORT_SPL
select DM
select DM_SPI_FLASH
select DM_SPI
config TARGET_SOCFPGA_CYCLONE5
bool "Support socfpga_cyclone5"
select CPU_V7 select CPU_V7
select SUPPORT_SPL select SUPPORT_SPL
select DM select DM
@ -841,6 +833,8 @@ source "arch/arm/cpu/armv7/rmobile/Kconfig"
source "arch/arm/cpu/armv7/s5pc1xx/Kconfig" source "arch/arm/cpu/armv7/s5pc1xx/Kconfig"
source "arch/arm/mach-socfpga/Kconfig"
source "arch/arm/mach-tegra/Kconfig" source "arch/arm/mach-tegra/Kconfig"
source "arch/arm/mach-uniphier/Kconfig" source "arch/arm/mach-uniphier/Kconfig"
@ -863,7 +857,6 @@ source "board/Marvell/aspenite/Kconfig"
source "board/Marvell/db-88f6820-gp/Kconfig" source "board/Marvell/db-88f6820-gp/Kconfig"
source "board/Marvell/db-mv784mp-gp/Kconfig" source "board/Marvell/db-mv784mp-gp/Kconfig"
source "board/Marvell/gplugd/Kconfig" source "board/Marvell/gplugd/Kconfig"
source "board/altera/socfpga/Kconfig"
source "board/armadeus/apf27/Kconfig" source "board/armadeus/apf27/Kconfig"
source "board/armltd/vexpress/Kconfig" source "board/armltd/vexpress/Kconfig"
source "board/armltd/vexpress64/Kconfig" source "board/armltd/vexpress64/Kconfig"

27
arch/arm/mach-socfpga/Kconfig Normal file
View File

@ -0,0 +1,27 @@
if ARCH_SOCFPGA
choice
prompt "Altera SOCFPGA board select"
config TARGET_SOCFPGA_ARRIA5
bool "Altera SOCFPGA Arria V"
config TARGET_SOCFPGA_CYCLONE5
bool "Altera SOCFPGA Cyclone V"
endchoice
config SYS_BOARD
default "socfpga"
config SYS_VENDOR
default "altera"
config SYS_SOC
default "socfpga"
config SYS_CONFIG_NAME
default "socfpga_arria5" if TARGET_SOCFPGA_ARRIA5
default "socfpga_cyclone5" if TARGET_SOCFPGA_CYCLONE5
endif

31
board/altera/socfpga/Kconfig
View File

@ -1,31 +0,0 @@
if TARGET_SOCFPGA_CYCLONE5
config SYS_BOARD
default "socfpga"
config SYS_VENDOR
default "altera"
config SYS_SOC
default "socfpga"
config SYS_CONFIG_NAME
default "socfpga_cyclone5"
endif
if TARGET_SOCFPGA_ARRIA5
config SYS_BOARD
default "socfpga"
config SYS_VENDOR
default "altera"
config SYS_SOC
default "socfpga"
config SYS_CONFIG_NAME
default "socfpga_arria5"
endif

1
configs/socfpga_arria5_defconfig
View File

@ -1,5 +1,6 @@
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_ARCH_SOCFPGA=y
CONFIG_TARGET_SOCFPGA_ARRIA5=y CONFIG_TARGET_SOCFPGA_ARRIA5=y
CONFIG_OF_CONTROL=y CONFIG_OF_CONTROL=y
CONFIG_DEFAULT_DEVICE_TREE="socfpga_arria5_socdk" CONFIG_DEFAULT_DEVICE_TREE="socfpga_arria5_socdk"

1
configs/socfpga_cyclone5_defconfig
View File

@ -1,5 +1,6 @@
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_ARCH_SOCFPGA=y
CONFIG_TARGET_SOCFPGA_CYCLONE5=y CONFIG_TARGET_SOCFPGA_CYCLONE5=y
CONFIG_OF_CONTROL=y CONFIG_OF_CONTROL=y
CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_socdk" CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_socdk"

1
configs/socfpga_socrates_defconfig
View File

@ -1,5 +1,6 @@
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_ARCH_SOCFPGA=y
CONFIG_TARGET_SOCFPGA_CYCLONE5=y CONFIG_TARGET_SOCFPGA_CYCLONE5=y
CONFIG_OF_CONTROL=y CONFIG_OF_CONTROL=y
CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_socrates" CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_socrates"