From 5c96525b6a0161864fffc50f5d9e9ebc6a6dfa07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ky=C3=B6sti=20M=C3=A4lkki?= <kyosti.malkki@gmail.com>
Date: Fri, 2 May 2014 13:18:57 +0300
Subject: [PATCH] AGESA fam12: Move dimmSpd
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Implemented under northbridge/ on other families.

Change-Id: I4d21af9d6c0f61eb1597e8e7095c08dd87ae2a84
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: http://review.coreboot.org/5649
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <patrick@georgi-clan.de>
---
 src/mainboard/amd/torpedo/BiosCallOuts.c                 | 9 ---------
 src/mainboard/amd/torpedo/Makefile.inc                   | 2 --
 src/northbridge/amd/agesa/family12/Makefile.inc          | 2 ++
 .../torpedo => northbridge/amd/agesa/family12}/dimmSpd.c | 0
 .../torpedo => northbridge/amd/agesa/family12}/dimmSpd.h | 0
 src/northbridge/amd/agesa/family12/fam12_callouts.c      | 9 +++++++++
 6 files changed, 11 insertions(+), 11 deletions(-)
 rename src/{mainboard/amd/torpedo => northbridge/amd/agesa/family12}/dimmSpd.c (100%)
 rename src/{mainboard/amd/torpedo => northbridge/amd/agesa/family12}/dimmSpd.h (100%)

diff --git a/src/mainboard/amd/torpedo/BiosCallOuts.c b/src/mainboard/amd/torpedo/BiosCallOuts.c
index bd47cfd19d..a52b8bca19 100644
--- a/src/mainboard/amd/torpedo/BiosCallOuts.c
+++ b/src/mainboard/amd/torpedo/BiosCallOuts.c
@@ -19,7 +19,6 @@
 
 #include "agesawrapper.h"
 #include "amdlib.h"
-#include "dimmSpd.h"
 #include "BiosCallOuts.h"
 #include "Ids.h"
 #include "OptionsIds.h"
@@ -171,14 +170,6 @@ AGESA_STATUS BiosGetIdsInitData (UINT32 Func, UINT32 Data, VOID *ConfigPtr)
   return AGESA_SUCCESS;
 }
 
-AGESA_STATUS BiosReadSpd (UINT32 Func, UINT32 Data, VOID *ConfigPtr)
-{
-  AGESA_STATUS Status;
-  Status = AmdMemoryReadSPD (Func, Data, (AGESA_READ_SPD_PARAMS *)ConfigPtr);
-
-  return Status;
-}
-
 /*  Call the host environment interface to provide a user hook opportunity. */
 AGESA_STATUS BiosHookBeforeDQSTraining (UINT32 Func, UINT32 Data, VOID *ConfigPtr)
 {
diff --git a/src/mainboard/amd/torpedo/Makefile.inc b/src/mainboard/amd/torpedo/Makefile.inc
index 1102ea2619..86b025bd3b 100644
--- a/src/mainboard/amd/torpedo/Makefile.inc
+++ b/src/mainboard/amd/torpedo/Makefile.inc
@@ -33,14 +33,12 @@ endif
 
 romstage-y += buildOpts.c
 romstage-y += agesawrapper.c
-romstage-y += dimmSpd.c
 romstage-y += BiosCallOuts.c
 romstage-y += PlatformGnbPcie.c
 romstage-y += gpio.c
 
 ramstage-y += buildOpts.c
 ramstage-y += agesawrapper.c
-ramstage-y += dimmSpd.c
 ramstage-y += BiosCallOuts.c
 ramstage-y += PlatformGnbPcie.c
 
diff --git a/src/northbridge/amd/agesa/family12/Makefile.inc b/src/northbridge/amd/agesa/family12/Makefile.inc
index ff7f84550f..62c851903f 100644
--- a/src/northbridge/amd/agesa/family12/Makefile.inc
+++ b/src/northbridge/amd/agesa/family12/Makefile.inc
@@ -18,8 +18,10 @@
 #
 
 romstage-y += fam12_callouts.c
+romstage-y += dimmSpd.c
 
 ramstage-y += northbridge.c
 ramstage-y += fam12_callouts.c
+ramstage-y += dimmSpd.c
 
 ramstage-$(CONFIG_GENERATE_ACPI_TABLES) += ssdt.asl
diff --git a/src/mainboard/amd/torpedo/dimmSpd.c b/src/northbridge/amd/agesa/family12/dimmSpd.c
similarity index 100%
rename from src/mainboard/amd/torpedo/dimmSpd.c
rename to src/northbridge/amd/agesa/family12/dimmSpd.c
diff --git a/src/mainboard/amd/torpedo/dimmSpd.h b/src/northbridge/amd/agesa/family12/dimmSpd.h
similarity index 100%
rename from src/mainboard/amd/torpedo/dimmSpd.h
rename to src/northbridge/amd/agesa/family12/dimmSpd.h
diff --git a/src/northbridge/amd/agesa/family12/fam12_callouts.c b/src/northbridge/amd/agesa/family12/fam12_callouts.c
index add03110e0..192c5ddaff 100644
--- a/src/northbridge/amd/agesa/family12/fam12_callouts.c
+++ b/src/northbridge/amd/agesa/family12/fam12_callouts.c
@@ -19,6 +19,7 @@
 
 #include "agesawrapper.h"
 #include "amdlib.h"
+#include "dimmSpd.h"
 #include "BiosCallOuts.h"
 #include "Ids.h"
 #include "OptionsIds.h"
@@ -352,6 +353,14 @@ AGESA_STATUS BiosReset (UINT32 Func, UINT32 Data, VOID *ConfigPtr)
 	return Status;
 }
 
+AGESA_STATUS BiosReadSpd (UINT32 Func, UINT32 Data, VOID *ConfigPtr)
+{
+	AGESA_STATUS Status;
+	Status = AmdMemoryReadSPD (Func, Data, (AGESA_READ_SPD_PARAMS *)ConfigPtr);
+
+	return Status;
+}
+
 AGESA_STATUS BiosDefaultRet (UINT32 Func, UINT32 Data, VOID *ConfigPtr)
 {
 	return AGESA_UNSUPPORTED;