From 2bbc3dc28d94fc437e3d3c1d613f47143b0d1280 Mon Sep 17 00:00:00 2001 From: Richard Spiegel Date: Wed, 6 Dec 2017 16:14:58 -0700 Subject: [PATCH] soc/amd/common: Move files to common/block The following files need to be moved: amd_pci_util.c, amd_pci_util.h and spi.c. The remaining files are AGESA related and will be part of a separate issue/commit. BUG=b:62240201 TEST=Build with no error gardenia and kahlee (no code change, just folder reorg). Change-Id: I3f965afa21124d4874d3b7bfe0f404a58b070e23 Signed-off-by: Richard Spiegel Reviewed-on: https://review.coreboot.org/22765 Tested-by: build bot (Jenkins) Reviewed-by: Martin Roth --- src/mainboard/amd/gardenia/mainboard.c | 2 +- src/mainboard/amd/gardenia/mptable.c | 2 +- src/mainboard/google/kahlee/mainboard.c | 2 +- src/mainboard/google/kahlee/mptable.c | 2 +- src/soc/amd/common/Makefile.inc | 3 +-- .../amd/common/{ => block/include/amdblocks}/amd_pci_util.h | 0 src/soc/amd/common/block/pci/Kconfig | 6 ++++++ src/soc/amd/common/block/pci/Makefile.inc | 5 +++++ src/soc/amd/common/{ => block/pci}/amd_pci_util.c | 2 +- src/soc/amd/common/block/s3/Kconfig | 5 +++++ src/soc/amd/common/block/s3/Makefile.inc | 5 +++++ src/soc/amd/common/{ => block/s3}/spi.c | 0 src/soc/amd/stoneyridge/Kconfig | 2 ++ src/soc/amd/stoneyridge/southbridge.c | 2 +- 14 files changed, 30 insertions(+), 8 deletions(-) rename src/soc/amd/common/{ => block/include/amdblocks}/amd_pci_util.h (100%) create mode 100644 src/soc/amd/common/block/pci/Kconfig create mode 100644 src/soc/amd/common/block/pci/Makefile.inc rename src/soc/amd/common/{ => block/pci}/amd_pci_util.c (99%) create mode 100644 src/soc/amd/common/block/s3/Kconfig create mode 100644 src/soc/amd/common/block/s3/Makefile.inc rename src/soc/amd/common/{ => block/s3}/spi.c (100%) diff --git a/src/mainboard/amd/gardenia/mainboard.c b/src/mainboard/amd/gardenia/mainboard.c index bd9f06cdec..25cf5b37c2 100644 --- a/src/mainboard/amd/gardenia/mainboard.c +++ b/src/mainboard/amd/gardenia/mainboard.c @@ -17,7 +17,7 @@ #include #include #include -#include +#include /*********************************************************** * These arrays set up the FCH PCI_INTR registers 0xC00/0xC01. diff --git a/src/mainboard/amd/gardenia/mptable.c b/src/mainboard/amd/gardenia/mptable.c index 5c07186327..e29b3e3703 100644 --- a/src/mainboard/amd/gardenia/mptable.c +++ b/src/mainboard/amd/gardenia/mptable.c @@ -23,7 +23,7 @@ #include #include #include -#include +#include static void smp_add_mpc_entry(struct mp_config_table *mc, unsigned int length) { diff --git a/src/mainboard/google/kahlee/mainboard.c b/src/mainboard/google/kahlee/mainboard.c index 8e0358a997..fc13567aae 100644 --- a/src/mainboard/google/kahlee/mainboard.c +++ b/src/mainboard/google/kahlee/mainboard.c @@ -17,7 +17,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/mainboard/google/kahlee/mptable.c b/src/mainboard/google/kahlee/mptable.c index 5c07186327..e29b3e3703 100644 --- a/src/mainboard/google/kahlee/mptable.c +++ b/src/mainboard/google/kahlee/mptable.c @@ -23,7 +23,7 @@ #include #include #include -#include +#include static void smp_add_mpc_entry(struct mp_config_table *mc, unsigned int length) { diff --git a/src/soc/amd/common/Makefile.inc b/src/soc/amd/common/Makefile.inc index 22eb0d6f74..b485bb3479 100644 --- a/src/soc/amd/common/Makefile.inc +++ b/src/soc/amd/common/Makefile.inc @@ -12,10 +12,9 @@ romstage-y += heapmanager.c ramstage-y += agesawrapper.c ramstage-y += amd_late_init.c -ramstage-y += amd_pci_util.c ramstage-y += def_callouts.c ramstage-y += heapmanager.c -ramstage-$(CONFIG_SPI_FLASH) += spi.c + subdirs-$(CONFIG_SOC_AMD_COMMON_BLOCK) += block endif diff --git a/src/soc/amd/common/amd_pci_util.h b/src/soc/amd/common/block/include/amdblocks/amd_pci_util.h similarity index 100% rename from src/soc/amd/common/amd_pci_util.h rename to src/soc/amd/common/block/include/amdblocks/amd_pci_util.h diff --git a/src/soc/amd/common/block/pci/Kconfig b/src/soc/amd/common/block/pci/Kconfig new file mode 100644 index 0000000000..74ea69784d --- /dev/null +++ b/src/soc/amd/common/block/pci/Kconfig @@ -0,0 +1,6 @@ +config SOC_AMD_COMMON_BLOCK_PCI + bool + default n + help + This option builds functions used to program PCI interrupt + routing, both PIC and APIC modes. diff --git a/src/soc/amd/common/block/pci/Makefile.inc b/src/soc/amd/common/block/pci/Makefile.inc new file mode 100644 index 0000000000..fc40c9d478 --- /dev/null +++ b/src/soc/amd/common/block/pci/Makefile.inc @@ -0,0 +1,5 @@ +ifeq ($(CONFIG_SOC_AMD_COMMON_BLOCK_PCI),y) + +ramstage-y += amd_pci_util.c + +endif diff --git a/src/soc/amd/common/amd_pci_util.c b/src/soc/amd/common/block/pci/amd_pci_util.c similarity index 99% rename from src/soc/amd/common/amd_pci_util.c rename to src/soc/amd/common/block/pci/amd_pci_util.c index ca022fbdbb..d30adf4134 100644 --- a/src/soc/amd/common/amd_pci_util.c +++ b/src/soc/amd/common/block/pci/amd_pci_util.c @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/soc/amd/common/block/s3/Kconfig b/src/soc/amd/common/block/s3/Kconfig new file mode 100644 index 0000000000..85863ca42f --- /dev/null +++ b/src/soc/amd/common/block/s3/Kconfig @@ -0,0 +1,5 @@ +config SOC_AMD_COMMON_BLOCK_S3 + bool + default n + help + Select this option to add S3 related functions to the build. diff --git a/src/soc/amd/common/block/s3/Makefile.inc b/src/soc/amd/common/block/s3/Makefile.inc new file mode 100644 index 0000000000..f19cb2e3b4 --- /dev/null +++ b/src/soc/amd/common/block/s3/Makefile.inc @@ -0,0 +1,5 @@ +ifeq ($(CONFIG_SOC_AMD_COMMON_BLOCK_S3),y) + +ramstage-$(CONFIG_HAVE_ACPI_RESUME) += spi.c + +endif diff --git a/src/soc/amd/common/spi.c b/src/soc/amd/common/block/s3/spi.c similarity index 100% rename from src/soc/amd/common/spi.c rename to src/soc/amd/common/block/s3/spi.c diff --git a/src/soc/amd/stoneyridge/Kconfig b/src/soc/amd/stoneyridge/Kconfig index dd95b85677..8b9111e81e 100644 --- a/src/soc/amd/stoneyridge/Kconfig +++ b/src/soc/amd/stoneyridge/Kconfig @@ -46,8 +46,10 @@ config CPU_SPECIFIC_OPTIONS select SOC_AMD_PI select SOC_AMD_COMMON select SOC_AMD_COMMON_BLOCK + select SOC_AMD_COMMON_BLOCK_PCI select SOC_AMD_COMMON_BLOCK_PSP select SOC_AMD_COMMON_BLOCK_CAR + select SOC_AMD_COMMON_BLOCK_S3 select C_ENVIRONMENT_BOOTBLOCK select BOOTBLOCK_CONSOLE select BOOT_DEVICE_SUPPORTS_WRITES if BOOT_DEVICE_SPI_FLASH diff --git a/src/soc/amd/stoneyridge/southbridge.c b/src/soc/amd/stoneyridge/southbridge.c index f8e06b3c5e..ed1d10a591 100644 --- a/src/soc/amd/stoneyridge/southbridge.c +++ b/src/soc/amd/stoneyridge/southbridge.c @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include #include