diff options
| author | Angel Pons <th3fanbus@gmail.com> | 2020-11-10 20:42:07 +0100 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2020-11-25 09:11:58 +0000 |
| commit | ec5cf1504e3bc31f308b18763eb256eeeb74dc7d (patch) | |
| tree | 2666310451386de0ed416c75c969a153808f55be | |
| parent | c19cbeeb6b4ec1f083951156e6b67d02390369b5 (diff) | |
| download | coreboot-ec5cf1504e3bc31f308b18763eb256eeeb74dc7d.tar.xz | |
nb/amd: Deduplicate nb_common.h
Save for the IO_APIC2_ADDR definition, they are equivalent.
Change-Id: I14da3d9aeefcc725428957ce0c9ac164eabacec6
Signed-off-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/47408
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
| -rw-r--r-- | src/mainboard/pcengines/apu2/mptable.c | 2 | ||||
| -rw-r--r-- | src/northbridge/amd/agesa/family14/northbridge.c | 2 | ||||
| -rw-r--r-- | src/northbridge/amd/agesa/family15tn/northbridge.c | 2 | ||||
| -rw-r--r-- | src/northbridge/amd/agesa/family16kb/northbridge.c | 2 | ||||
| -rw-r--r-- | src/northbridge/amd/agesa/nb_common.h | 11 | ||||
| -rw-r--r-- | src/northbridge/amd/nb_common.h (renamed from src/northbridge/amd/pi/nb_common.h) | 0 | ||||
| -rw-r--r-- | src/northbridge/amd/pi/00630F01/northbridge.c | 2 | ||||
| -rw-r--r-- | src/northbridge/amd/pi/00730F01/northbridge.c | 2 | ||||
| -rw-r--r-- | src/northbridge/amd/pi/00730F01/state_machine.c | 2 |
9 files changed, 7 insertions, 18 deletions
diff --git a/src/mainboard/pcengines/apu2/mptable.c b/src/mainboard/pcengines/apu2/mptable.c index b52c8ccf49..a24863f5e3 100644 --- a/src/mainboard/pcengines/apu2/mptable.c +++ b/src/mainboard/pcengines/apu2/mptable.c @@ -3,7 +3,7 @@ #include <arch/smp/mpspec.h> #include <arch/ioapic.h> #include <stdint.h> -#include <northbridge/amd/pi/nb_common.h> +#include <northbridge/amd/nb_common.h> #include <southbridge/amd/common/amd_pci_util.h> static void *smp_write_config_table(void *v) diff --git a/src/northbridge/amd/agesa/family14/northbridge.c b/src/northbridge/amd/agesa/family14/northbridge.c index 7c37ff8d71..020c9c6491 100644 --- a/src/northbridge/amd/agesa/family14/northbridge.c +++ b/src/northbridge/amd/agesa/family14/northbridge.c @@ -13,7 +13,7 @@ #include <cpu/cpu.h> #include <cpu/amd/msr.h> #include <cpu/amd/mtrr.h> -#include <northbridge/amd/agesa/nb_common.h> +#include <northbridge/amd/nb_common.h> #include <northbridge/amd/agesa/state_machine.h> #include <northbridge/amd/agesa/agesa_helper.h> #include <sb_cimx.h> diff --git a/src/northbridge/amd/agesa/family15tn/northbridge.c b/src/northbridge/amd/agesa/family15tn/northbridge.c index 2d5234dde9..e345b50cf7 100644 --- a/src/northbridge/amd/agesa/family15tn/northbridge.c +++ b/src/northbridge/amd/agesa/family15tn/northbridge.c @@ -18,7 +18,7 @@ #include <Porting.h> #include <Options.h> #include <Topology.h> -#include <northbridge/amd/agesa/nb_common.h> +#include <northbridge/amd/nb_common.h> #include <northbridge/amd/agesa/state_machine.h> #include <northbridge/amd/agesa/agesa_helper.h> diff --git a/src/northbridge/amd/agesa/family16kb/northbridge.c b/src/northbridge/amd/agesa/family16kb/northbridge.c index addd40f3c6..b600bc921c 100644 --- a/src/northbridge/amd/agesa/family16kb/northbridge.c +++ b/src/northbridge/amd/agesa/family16kb/northbridge.c @@ -18,7 +18,7 @@ #include <AGESA.h> #include <Options.h> #include <Topology.h> -#include <northbridge/amd/agesa/nb_common.h> +#include <northbridge/amd/nb_common.h> #include <northbridge/amd/agesa/state_machine.h> #include <northbridge/amd/agesa/agesa_helper.h> diff --git a/src/northbridge/amd/agesa/nb_common.h b/src/northbridge/amd/agesa/nb_common.h deleted file mode 100644 index 66fbf92694..0000000000 --- a/src/northbridge/amd/agesa/nb_common.h +++ /dev/null @@ -1,11 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -#ifndef __AMD_NB_COMMON_H__ -#define __AMD_NB_COMMON_H__ - -#define HT_IO_HOST_ALIGN 4096 -#define HT_MEM_HOST_ALIGN (1024 * 1024) - -#define DEV_CDB 0x18 - -#endif diff --git a/src/northbridge/amd/pi/nb_common.h b/src/northbridge/amd/nb_common.h index bee75c7109..bee75c7109 100644 --- a/src/northbridge/amd/pi/nb_common.h +++ b/src/northbridge/amd/nb_common.h diff --git a/src/northbridge/amd/pi/00630F01/northbridge.c b/src/northbridge/amd/pi/00630F01/northbridge.c index 110dc84001..5242cd0deb 100644 --- a/src/northbridge/amd/pi/00630F01/northbridge.c +++ b/src/northbridge/amd/pi/00630F01/northbridge.c @@ -17,7 +17,7 @@ #include <cpu/amd/msr.h> #include <cpu/amd/mtrr.h> #include <acpi/acpigen.h> -#include <northbridge/amd/pi/nb_common.h> +#include <northbridge/amd/nb_common.h> #include <northbridge/amd/agesa/agesa_helper.h> #define MAX_NODE_NUMS MAX_NODES diff --git a/src/northbridge/amd/pi/00730F01/northbridge.c b/src/northbridge/amd/pi/00730F01/northbridge.c index 41554b84eb..2019fae4cd 100644 --- a/src/northbridge/amd/pi/00730F01/northbridge.c +++ b/src/northbridge/amd/pi/00730F01/northbridge.c @@ -21,7 +21,7 @@ #include <cpu/amd/msr.h> #include <cpu/amd/mtrr.h> #include <acpi/acpigen.h> -#include <northbridge/amd/pi/nb_common.h> +#include <northbridge/amd/nb_common.h> #include <northbridge/amd/agesa/agesa_helper.h> #include <southbridge/amd/pi/hudson/pci_devs.h> diff --git a/src/northbridge/amd/pi/00730F01/state_machine.c b/src/northbridge/amd/pi/00730F01/state_machine.c index af1198a001..ba34dabde9 100644 --- a/src/northbridge/amd/pi/00730F01/state_machine.c +++ b/src/northbridge/amd/pi/00730F01/state_machine.c @@ -8,7 +8,7 @@ #include <device/device.h> #include <northbridge/amd/agesa/state_machine.h> #include <northbridge/amd/agesa/agesa_helper.h> -#include <northbridge/amd/pi/nb_common.h> +#include <northbridge/amd/nb_common.h> void platform_BeforeInitReset(struct sysinfo *cb, AMD_RESET_PARAMS *Reset) { |