From ec5cf1504e3bc31f308b18763eb256eeeb74dc7d Mon Sep 17 00:00:00 2001 From: Angel Pons Date: Tue, 10 Nov 2020 20:42:07 +0100 Subject: nb/amd: Deduplicate nb_common.h Save for the IO_APIC2_ADDR definition, they are equivalent. Change-Id: I14da3d9aeefcc725428957ce0c9ac164eabacec6 Signed-off-by: Angel Pons Reviewed-on: https://review.coreboot.org/c/coreboot/+/47408 Reviewed-by: Arthur Heymans Tested-by: build bot (Jenkins) --- src/northbridge/amd/agesa/family14/northbridge.c | 2 +- src/northbridge/amd/agesa/family15tn/northbridge.c | 2 +- src/northbridge/amd/agesa/family16kb/northbridge.c | 2 +- src/northbridge/amd/agesa/nb_common.h | 11 ----------- src/northbridge/amd/nb_common.h | 12 ++++++++++++ src/northbridge/amd/pi/00630F01/northbridge.c | 2 +- src/northbridge/amd/pi/00730F01/northbridge.c | 2 +- src/northbridge/amd/pi/00730F01/state_machine.c | 2 +- src/northbridge/amd/pi/nb_common.h | 12 ------------ 9 files changed, 18 insertions(+), 29 deletions(-) delete mode 100644 src/northbridge/amd/agesa/nb_common.h create mode 100644 src/northbridge/amd/nb_common.h delete mode 100644 src/northbridge/amd/pi/nb_common.h (limited to 'src/northbridge/amd') 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 #include #include -#include +#include #include #include #include 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 #include #include -#include +#include #include #include 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 #include #include -#include +#include #include #include 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/nb_common.h b/src/northbridge/amd/nb_common.h new file mode 100644 index 0000000000..bee75c7109 --- /dev/null +++ b/src/northbridge/amd/nb_common.h @@ -0,0 +1,12 @@ +/* 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 +#define IO_APIC2_ADDR 0xfec20000 + +#endif 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 #include #include -#include +#include #include #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 #include #include -#include +#include #include #include 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 #include #include -#include +#include void platform_BeforeInitReset(struct sysinfo *cb, AMD_RESET_PARAMS *Reset) { diff --git a/src/northbridge/amd/pi/nb_common.h b/src/northbridge/amd/pi/nb_common.h deleted file mode 100644 index bee75c7109..0000000000 --- a/src/northbridge/amd/pi/nb_common.h +++ /dev/null @@ -1,12 +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 -#define IO_APIC2_ADDR 0xfec20000 - -#endif -- cgit v1.2.3