diff options
| author | Felix Held <felix-coreboot@felixheld.de> | 2020-11-17 16:37:29 +0100 |
|---|---|---|
| committer | Felix Held <felix-coreboot@felixheld.de> | 2020-11-18 16:08:17 +0000 |
| commit | 5a82e1dc200153b51a2df40543eea8ee293d58ce (patch) | |
| tree | 6fe3adcf5bef069841c56c54b5cf07b2932cf31e | |
| parent | 561b5cfe422917dae709f6406ab78e97b2b1a2f1 (diff) | |
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>
| -rw-r--r-- | src/soc/amd/common/Kconfig | 4 | ||||
| -rw-r--r-- | src/soc/amd/common/Makefile.inc | 6 | ||||
| -rw-r--r-- | src/soc/amd/common/block/Kconfig | 11 | ||||
| -rw-r--r-- | src/soc/amd/common/block/Makefile.inc | 2 | ||||
| -rw-r--r-- | src/soc/amd/picasso/Kconfig | 1 | ||||
| -rw-r--r-- | src/soc/amd/stoneyridge/Kconfig | 1 | ||||
| -rw-r--r-- | src/southbridge/amd/agesa/hudson/Kconfig | 1 | ||||
| -rw-r--r-- | src/southbridge/amd/cimx/sb800/Kconfig | 1 | ||||
| -rw-r--r-- | src/southbridge/amd/pi/hudson/Kconfig | 1 |
9 files changed, 4 insertions, 24 deletions
diff --git a/src/soc/amd/common/Kconfig b/src/soc/amd/common/Kconfig index debedac37d..a0836a3372 100644 --- a/src/soc/amd/common/Kconfig +++ b/src/soc/amd/common/Kconfig @@ -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 diff --git a/src/soc/amd/common/Makefile.inc b/src/soc/amd/common/Makefile.inc index 2a5b42a5ea..c0757c5968 100644 --- a/src/soc/amd/common/Makefile.inc +++ b/src/soc/amd/common/Makefile.inc @@ -1,5 +1 @@ -ifeq ($(CONFIG_SOC_AMD_COMMON),y) - -subdirs-$(CONFIG_SOC_AMD_COMMON_BLOCK) += block - -endif +subdirs-$(CONFIG_SOC_AMD_COMMON) += block diff --git a/src/soc/amd/common/block/Kconfig b/src/soc/amd/common/block/Kconfig deleted file mode 100644 index 86150ed870..0000000000 --- a/src/soc/amd/common/block/Kconfig +++ /dev/null @@ -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 diff --git a/src/soc/amd/common/block/Makefile.inc b/src/soc/amd/common/block/Makefile.inc index 33c8822fd6..ad75b92866 100644 --- a/src/soc/amd/common/block/Makefile.inc +++ b/src/soc/amd/common/block/Makefile.inc @@ -1,4 +1,4 @@ -ifeq ($(CONFIG_SOC_AMD_COMMON_BLOCK),y) +ifeq ($(CONFIG_SOC_AMD_COMMON),y) subdirs-y += ./* diff --git a/src/soc/amd/picasso/Kconfig b/src/soc/amd/picasso/Kconfig index 9ebc65168f..4d7d2a6c1a 100644 --- a/src/soc/amd/picasso/Kconfig +++ b/src/soc/amd/picasso/Kconfig @@ -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 diff --git a/src/soc/amd/stoneyridge/Kconfig b/src/soc/amd/stoneyridge/Kconfig index 0e32005fb0..86df3610e8 100644 --- a/src/soc/amd/stoneyridge/Kconfig +++ b/src/soc/amd/stoneyridge/Kconfig @@ -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 diff --git a/src/southbridge/amd/agesa/hudson/Kconfig b/src/southbridge/amd/agesa/hudson/Kconfig index e61bc85829..b755fe1811 100644 --- a/src/southbridge/amd/agesa/hudson/Kconfig +++ b/src/southbridge/amd/agesa/hudson/Kconfig @@ -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 diff --git a/src/southbridge/amd/cimx/sb800/Kconfig b/src/southbridge/amd/cimx/sb800/Kconfig index 8379d233f5..96737cfbb6 100644 --- a/src/southbridge/amd/cimx/sb800/Kconfig +++ b/src/southbridge/amd/cimx/sb800/Kconfig @@ -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 diff --git a/src/southbridge/amd/pi/hudson/Kconfig b/src/southbridge/amd/pi/hudson/Kconfig index cfe85a1952..6a1a9c848b 100644 --- a/src/southbridge/amd/pi/hudson/Kconfig +++ b/src/southbridge/amd/pi/hudson/Kconfig @@ -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 |