GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

arch/arm: Make ARM stages select ARCH_ARM 

This removes the need to select ARCH_ARM in SOC Kconfig

Also don't define the default as this result in spurious lines in the
.config.

Change-Id: I1ed4a71599641db606510e5304b9f0acf9b7eb88
Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/31313
Reviewed-by: HAOUAS Elyes <ehaouas@noos.fr>
Reviewed-by: Julius Werner <jwerner@chromium.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Arthur Heymans 2019-02-10 16:33:39 +01:00 committed by Julius Werner
parent a1af2757b5
commit bd0a93fa28
4 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/arch/arm/Kconfig
View File

@ -1,24 +1,22 @@
config ARCH_ARM config ARCH_ARM
bool bool
default n
config ARCH_BOOTBLOCK_ARM config ARCH_BOOTBLOCK_ARM
bool bool
default n
select ARCH_ARM select ARCH_ARM
select C_ENVIRONMENT_BOOTBLOCK select C_ENVIRONMENT_BOOTBLOCK
config ARCH_VERSTAGE_ARM config ARCH_VERSTAGE_ARM
bool bool
default n select ARCH_ARM
config ARCH_ROMSTAGE_ARM config ARCH_ROMSTAGE_ARM
bool bool
default n select ARCH_ARM
config ARCH_RAMSTAGE_ARM config ARCH_RAMSTAGE_ARM
bool bool
default n select ARCH_ARM
source src/arch/arm/armv4/Kconfig source src/arch/arm/armv4/Kconfig
source src/arch/arm/armv7/Kconfig source src/arch/arm/armv7/Kconfig

8
src/arch/arm/armv4/Kconfig
View File

@ -1,15 +1,15 @@
config ARCH_BOOTBLOCK_ARMV4 config ARCH_BOOTBLOCK_ARMV4
def_bool n bool
select ARCH_BOOTBLOCK_ARM select ARCH_BOOTBLOCK_ARM
config ARCH_VERSTAGE_ARMV4 config ARCH_VERSTAGE_ARMV4
def_bool n bool
select ARCH_VERSTAGE_ARM select ARCH_VERSTAGE_ARM
config ARCH_ROMSTAGE_ARMV4 config ARCH_ROMSTAGE_ARMV4
def_bool n bool
select ARCH_ROMSTAGE_ARM select ARCH_ROMSTAGE_ARM
config ARCH_RAMSTAGE_ARMV4 config ARCH_RAMSTAGE_ARMV4
def_bool n bool
select ARCH_RAMSTAGE_ARM select ARCH_RAMSTAGE_ARM

22
src/arch/arm/armv7/Kconfig
View File

@ -1,37 +1,39 @@
config ARCH_BOOTBLOCK_ARMV7 config ARCH_BOOTBLOCK_ARMV7
def_bool n bool
select ARCH_BOOTBLOCK_ARM select ARCH_BOOTBLOCK_ARM
config ARCH_VERSTAGE_ARMV7 config ARCH_VERSTAGE_ARMV7
def_bool n bool
select ARCH_VERSTAGE_ARM select ARCH_VERSTAGE_ARM
config ARCH_ROMSTAGE_ARMV7 config ARCH_ROMSTAGE_ARMV7
def_bool n bool
select ARCH_ROMSTAGE_ARM select ARCH_ROMSTAGE_ARM
config ARCH_RAMSTAGE_ARMV7 config ARCH_RAMSTAGE_ARMV7
def_bool n bool
select ARCH_RAMSTAGE_ARM select ARCH_RAMSTAGE_ARM
config ARCH_BOOTBLOCK_ARMV7_M config ARCH_BOOTBLOCK_ARMV7_M
def_bool n bool
select ARCH_BOOTBLOCK_ARM select ARCH_BOOTBLOCK_ARM
config ARCH_VERSTAGE_ARMV7_M config ARCH_VERSTAGE_ARMV7_M
def_bool n bool
select ARCH_VERSTAGE_ARM select ARCH_VERSTAGE_ARM
config ARCH_BOOTBLOCK_ARMV7_R config ARCH_BOOTBLOCK_ARMV7_R
def_bool n bool
select ARCH_BOOTBLOCK_ARM select ARCH_BOOTBLOCK_ARM
config ARCH_VERSTAGE_ARMV7_R config ARCH_VERSTAGE_ARMV7_R
def_bool n bool
select ARCH_VERSTAGE_ARM select ARCH_VERSTAGE_ARM
config ARCH_ROMSTAGE_ARMV7_R config ARCH_ROMSTAGE_ARMV7_R
def_bool n bool
select ARCH_ROMSTAGE_ARM select ARCH_ROMSTAGE_ARM
config ARCH_RAMSTAGE_ARMV7_R config ARCH_RAMSTAGE_ARMV7_R
def_bool n bool
select ARCH_RAMSTAGE_ARM select ARCH_RAMSTAGE_ARM

1
src/mainboard/google/nyan_blaze/Kconfig
View File

@ -17,7 +17,6 @@ if BOARD_GOOGLE_NYAN_BLAZE
config BOARD_SPECIFIC_OPTIONS config BOARD_SPECIFIC_OPTIONS
def_bool y def_bool y
select ARCH_ARM
select COMMON_CBFS_SPI_WRAPPER select COMMON_CBFS_SPI_WRAPPER
select EC_GOOGLE_CHROMEEC select EC_GOOGLE_CHROMEEC
select EC_GOOGLE_CHROMEEC_SPI select EC_GOOGLE_CHROMEEC_SPI