gizmosphere/gizmo: Move support of SPD data in CBFS

This code is not specific to any board or AGESA family.

Change-Id: I26c32fbe8e45018e239762b072dfe3da05271697
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: http://review.coreboot.org/5690
Tested-by: build bot (Jenkins)
Reviewed-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>

3 files changed, 2 insertions, 60 deletions

diff --git a/src/mainboard/gizmosphere/gizmo/BiosCallOuts.c b/src/mainboard/gizmosphere/gizmo/BiosCallOuts.c
index 2efc45964c..da21f57528 100755
--- a/src/mainboard/gizmosphere/gizmo/BiosCallOuts.c
+++ b/src/mainboard/gizmosphere/gizmo/BiosCallOuts.c
@@ -2,7 +2,6 @@
  * This file is part of the coreboot project.
  *
  * Copyright (C) 2011 Advanced Micro Devices, Inc.
- * Copyright (C) 2013 Sage Electronic Engineering, LLC
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -24,13 +23,6 @@
 #include "heapManager.h"
 #include "SB800.h"
 #include <stdlib.h>
-#include <cbfs.h>
-#include <string.h>
-#include <device/dram/ddr3.h>
-
-#define SPD_SIZE    128
-#define SPD_CRC_HI  127
-#define SPD_CRC_LO  126
 
 static AGESA_STATUS board_BeforeDramInit (UINT32 Func, UINT32 Data, VOID *ConfigPtr);
 
@@ -40,7 +32,7 @@ const BIOS_CALLOUT_STRUCT BiosCallouts[] =
 	{AGESA_DEALLOCATE_BUFFER,		agesa_DeallocateBuffer },
 	{AGESA_LOCATE_BUFFER,			agesa_LocateBuffer },
 	{AGESA_DO_RESET,			agesa_Reset },
-	{AGESA_READ_SPD,			BiosReadSpd_from_cbfs },
+	{AGESA_READ_SPD,			agesa_ReadSpd_from_cbfs },
 	{AGESA_READ_SPD_RECOVERY,		agesa_NoopUnsupported },
 	{AGESA_RUNFUNC_ONAP,			agesa_RunFuncOnAp },
 	{AGESA_GNB_PCIE_SLOT_RESET,		agesa_NoopSuccess },
@@ -51,56 +43,6 @@ const BIOS_CALLOUT_STRUCT BiosCallouts[] =
 };
 const int BiosCalloutsLen = ARRAY_SIZE(BiosCallouts);
 
-AGESA_STATUS BiosReadSpd_from_cbfs(UINT32 Func, UINT32 Data, VOID *ConfigPtr)
-{
-	AGESA_STATUS Status;
-#ifdef __PRE_RAM__
-	AGESA_READ_SPD_PARAMS *info = ConfigPtr;
-	if (info->MemChannelId > 0)
-		return AGESA_UNSUPPORTED;
-	if (info->SocketId != 0)
-		return AGESA_UNSUPPORTED;
-	if (info->DimmId != 0)
-		return AGESA_UNSUPPORTED;
-
-	char *spd_file;
-	size_t spd_file_len;
-
-	printk(BIOS_DEBUG, "read SPD\n");
-	spd_file = cbfs_get_file_content(CBFS_DEFAULT_MEDIA, "spd.bin", 0xab,
-					 &spd_file_len);
-	if (!spd_file)
-		die("file [spd.bin] not found in CBFS");
-	if (spd_file_len < SPD_SIZE)
-		die("Missing SPD data.");
-
-	memcpy((char*)info->Buffer, spd_file, SPD_SIZE);
-
-	u16 crc = spd_ddr3_calc_crc(info->Buffer, SPD_SIZE);
-
-	if (((info->Buffer[SPD_CRC_LO] == 0) && (info->Buffer[SPD_CRC_HI] == 0))
-	 || (info->Buffer[SPD_CRC_LO] != (crc & 0xff))
-	 || (info->Buffer[SPD_CRC_HI] != (crc >> 8))) {
-		printk(BIOS_WARNING, "SPD has a invalid or zero-valued CRC\n");
-		info->Buffer[SPD_CRC_LO] = crc & 0xff;
-		info->Buffer[SPD_CRC_HI] = crc >> 8;
-		u16 i;
-		printk(BIOS_WARNING, "\nDisplay the SPD");
-		for (i = 0; i < SPD_SIZE; i++) {
-			if((i % 16) == 0x00)
-				printk(BIOS_WARNING, "\n%02x:  ",i);
-			printk(BIOS_WARNING, "%02x ", info->Buffer[i]);
-		}
-		printk(BIOS_WARNING, "\n");
-	 }
-	Status = AGESA_SUCCESS;
-#else
-	Status = AGESA_UNSUPPORTED;
-#endif
-
-	return Status;
-}
-
 /*	Call the host environment interface to provide a user hook opportunity. */
 static AGESA_STATUS board_BeforeDramInit (UINT32 Func, UINT32 Data, VOID *ConfigPtr)
 {
diff --git a/src/mainboard/gizmosphere/gizmo/Kconfig b/src/mainboard/gizmosphere/gizmo/Kconfig
index 6f57f4b9b4..fc34f12ee2 100755
--- a/src/mainboard/gizmosphere/gizmo/Kconfig
+++ b/src/mainboard/gizmosphere/gizmo/Kconfig
@@ -32,6 +32,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select HAVE_ACPI_TABLES
 	select BOARD_ROMSIZE_KB_2048
 	select GFXUMA
+	select SPD_CACHE
 
 config MAINBOARD_DIR
 	string
diff --git a/src/mainboard/gizmosphere/gizmo/Makefile.inc b/src/mainboard/gizmosphere/gizmo/Makefile.inc
index 3f4224b6d8..d18c37233e 100755
--- a/src/mainboard/gizmosphere/gizmo/Makefile.inc
+++ b/src/mainboard/gizmosphere/gizmo/Makefile.inc
@@ -29,7 +29,6 @@ romstage-y += buildOpts.c
 romstage-y += agesawrapper.c
 romstage-y += BiosCallOuts.c
 romstage-y += PlatformGnbPcie.c
-romstage-y += ../../../device/dram/ddr3.c
 
 ramstage-y += buildOpts.c
 ramstage-y += agesawrapper.c