soc/amd/common: remove SOC_AMD_COMMON_BLOCK Kconfig symbol
SOC_AMD_COMMON needs to be selected to be able to select SOC_AMD_COMMON_BLOCK which only includes the Kconfig files from the function block sub-folder. Removing SOC_AMD_COMMON_BLOCK and the corresponding Kconfig file and make SOC_AMD_COMMON include all Kconfig files from the sub-folders simplifies this a bit. Change-Id: I9068d57a80bdc144e73d2b8c00e7b2cae730d4b6 Signed-off-by: Felix Held <felix-coreboot@felixheld.de> Reviewed-on: https://review.coreboot.org/c/coreboot/+/47672 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net> Reviewed-by: Jason Glenesk <jason.glenesk@gmail.com> Reviewed-by: Marshall Dawson <marshalldawson3rd@gmail.com>
This commit is contained in:
parent
561b5cfe42
commit
5a82e1dc20
|
@ -1,7 +1,7 @@
|
|||
config SOC_AMD_COMMON
|
||||
bool
|
||||
help
|
||||
common code for AMD SOCs
|
||||
common code blocks for AMD SOCs
|
||||
|
||||
if SOC_AMD_COMMON
|
||||
|
||||
|
@ -9,6 +9,6 @@ config SOC_AMD_PI
|
|||
bool
|
||||
default n
|
||||
|
||||
source "src/soc/amd/common/block/Kconfig"
|
||||
source "src/soc/amd/common/block/*/Kconfig"
|
||||
|
||||
endif # SOC_AMD_COMMON
|
||||
|
|
|
@ -1,5 +1 @@
|
|||
ifeq ($(CONFIG_SOC_AMD_COMMON),y)
|
||||
|
||||
subdirs-$(CONFIG_SOC_AMD_COMMON_BLOCK) += block
|
||||
|
||||
endif
|
||||
subdirs-$(CONFIG_SOC_AMD_COMMON) += block
|
||||
|
|
|
@ -1,11 +0,0 @@
|
|||
config SOC_AMD_COMMON_BLOCK
|
||||
bool
|
||||
help
|
||||
SoC driver for AMD common IP code
|
||||
|
||||
if SOC_AMD_COMMON_BLOCK
|
||||
|
||||
comment "AMD SoC Common IP Code"
|
||||
source "src/soc/amd/common/block/*/Kconfig"
|
||||
|
||||
endif
|
|
@ -1,4 +1,4 @@
|
|||
ifeq ($(CONFIG_SOC_AMD_COMMON_BLOCK),y)
|
||||
ifeq ($(CONFIG_SOC_AMD_COMMON),y)
|
||||
|
||||
subdirs-y += ./*
|
||||
|
||||
|
|
|
@ -29,7 +29,6 @@ config CPU_SPECIFIC_OPTIONS
|
|||
select TSC_SYNC_LFENCE
|
||||
select UDELAY_TSC
|
||||
select SOC_AMD_COMMON
|
||||
select SOC_AMD_COMMON_BLOCK
|
||||
select SOC_AMD_COMMON_BLOCK_HAS_ESPI
|
||||
select SOC_AMD_COMMON_BLOCK_IOMMU
|
||||
select SOC_AMD_COMMON_BLOCK_ACPIMMIO
|
||||
|
|
|
@ -23,7 +23,6 @@ config CPU_SPECIFIC_OPTIONS
|
|||
select TSC_SYNC_LFENCE
|
||||
select SOC_AMD_PI
|
||||
select SOC_AMD_COMMON
|
||||
select SOC_AMD_COMMON_BLOCK
|
||||
select SOC_AMD_COMMON_BLOCK_IOMMU
|
||||
select SOC_AMD_COMMON_BLOCK_ACPIMMIO
|
||||
select SOC_AMD_COMMON_BLOCK_BANKED_GPIOS
|
||||
|
|
|
@ -15,7 +15,6 @@ config SOUTHBRIDGE_SPECIFIC_OPTIONS # dummy
|
|||
select HAVE_CF9_RESET
|
||||
select HAVE_CF9_RESET_PREPARE
|
||||
select SOC_AMD_COMMON
|
||||
select SOC_AMD_COMMON_BLOCK
|
||||
select SOC_AMD_COMMON_BLOCK_ACPIMMIO
|
||||
|
||||
config EHCI_BAR
|
||||
|
|
|
@ -9,7 +9,6 @@ config SOUTHBRIDGE_AMD_CIMX_SB800
|
|||
select HAVE_CF9_RESET
|
||||
select HAVE_CF9_RESET_PREPARE
|
||||
select SOC_AMD_COMMON
|
||||
select SOC_AMD_COMMON_BLOCK
|
||||
select SOC_AMD_COMMON_BLOCK_ACPIMMIO
|
||||
|
||||
if SOUTHBRIDGE_AMD_CIMX_SB800
|
||||
|
|
|
@ -18,7 +18,6 @@ config SOUTHBRIDGE_SPECIFIC_OPTIONS # dummy
|
|||
select HAVE_CF9_RESET
|
||||
select HAVE_CF9_RESET_PREPARE
|
||||
select SOC_AMD_COMMON
|
||||
select SOC_AMD_COMMON_BLOCK
|
||||
select SOC_AMD_COMMON_BLOCK_ACPIMMIO
|
||||
|
||||
config EHCI_BAR
|
||||
|
|
Loading…
Reference in New Issue