From ec5cf1504e3bc31f308b18763eb256eeeb74dc7d Mon Sep 17 00:00:00 2001
From: Angel Pons <th3fanbus@gmail.com>
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 <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>
---
 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 -----------
 4 files changed, 3 insertions(+), 14 deletions(-)
 delete mode 100644 src/northbridge/amd/agesa/nb_common.h

(limited to 'src/northbridge/amd/agesa')

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
-- 
cgit v1.2.3