From 3d3152eec7efe9bf02499c42b92b4ad22bd7fd4e Mon Sep 17 00:00:00 2001
From: Kyösti Mälkki <kyosti.malkki@gmail.com>
Date: Thu, 10 Jan 2019 09:05:30 +0200
Subject: AGESA: Drop CONFIG_CBB and CONFIG_CDB
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Static values, copy paste from multi-node fam15 code.

Add header that shall have declarations of functions
common to different families factored out.

Change-Id: I07bc046c74280f49e46793c119d36b87b8789949
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/30732
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reviewed-by: Nico Huber <nico.h@gmx.de>
---
 src/northbridge/amd/agesa/family14/northbridge.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/northbridge/amd/agesa/family14/northbridge.c')

diff --git a/src/northbridge/amd/agesa/family14/northbridge.c b/src/northbridge/amd/agesa/family14/northbridge.c
index adf7878859..296f40a412 100644
--- a/src/northbridge/amd/agesa/family14/northbridge.c
+++ b/src/northbridge/amd/agesa/family14/northbridge.c
@@ -29,6 +29,7 @@
 #include <cpu/x86/lapic.h>
 #include <cpu/amd/msr.h>
 #include <cpu/amd/mtrr.h>
+#include <northbridge/amd/agesa/nb_common.h>
 #include <northbridge/amd/agesa/state_machine.h>
 #include <northbridge/amd/agesa/agesa_helper.h>
 #include <sb_cimx.h>
@@ -43,7 +44,7 @@ static unsigned fx_devs = 0;
 
 static struct device *get_node_pci(u32 nodeid, u32 fn)
 {
-	return pcidev_on_root(CONFIG_CDB + nodeid, fn);
+	return pcidev_on_root(DEV_CDB + nodeid, fn);
 }
 
 static void get_fx_devs(void)
@@ -85,7 +86,7 @@ static void f1_write_config32(unsigned reg, u32 value)
 
 static u32 amdfam14_nodeid(struct device *dev)
 {
-	return (dev->path.pci.devfn >> 3) - CONFIG_CDB;
+	return (dev->path.pci.devfn >> 3) - DEV_CDB;
 }
 
 #include "amdfam14_conf.c"
-- 
cgit v1.2.3