aboutsummaryrefslogtreecommitdiff
path: root/src/mainboard/amd/torpedo
diff options
context:
space:
mode:
authorKyösti Mälkki <kyosti.malkki@gmail.com>2014-10-18 07:51:03 +0300
committerKyösti Mälkki <kyosti.malkki@gmail.com>2014-10-19 06:20:14 +0200
commit50c9637e15ddd78f896419f2335457de4fe22d77 (patch)
tree2a8b281211cce06473d47a5db76495a435064d72 /src/mainboard/amd/torpedo
parenta1ebbc42ad791369c2e4f626e46917bdb1459d72 (diff)
AGESA fam12 fam14 fam15: Sanitize BiosCallOuts headers
Change-Id: Ic08f1f2fdbcf6164eb1a0330f9134da3fdb978d7 Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-on: http://review.coreboot.org/7114 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi <pgeorgi@google.com> Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Diffstat (limited to 'src/mainboard/amd/torpedo')
-rw-r--r--src/mainboard/amd/torpedo/BiosCallOuts.c13
-rw-r--r--src/mainboard/amd/torpedo/BiosCallOuts.h5
-rw-r--r--src/mainboard/amd/torpedo/PlatformGnbPcie.c1
3 files changed, 1 insertions, 18 deletions
diff --git a/src/mainboard/amd/torpedo/BiosCallOuts.c b/src/mainboard/amd/torpedo/BiosCallOuts.c
index 38d4003afb..190cbadfce 100644
--- a/src/mainboard/amd/torpedo/BiosCallOuts.c
+++ b/src/mainboard/amd/torpedo/BiosCallOuts.c
@@ -25,18 +25,7 @@
#include "heapManager.h"
#include "Hudson-2.h"
#include <stdlib.h>
-
-#ifndef SB_GPIO_REG01
-#define SB_GPIO_REG01 1
-#endif
-
-#ifndef SB_GPIO_REG24
-#define SB_GPIO_REG24 24
-#endif
-
-#ifndef SB_GPIO_REG27
-#define SB_GPIO_REG27 27
-#endif
+#include <southbridge/amd/cimx/sb700/gpio_oem.h>
static AGESA_STATUS board_BeforeDramInit (UINT32 Func, UINT32 Data, VOID *ConfigPtr);
static AGESA_STATUS board_GnbPcieSlotReset (UINT32 Func, UINT32 Data, VOID *ConfigPtr);
diff --git a/src/mainboard/amd/torpedo/BiosCallOuts.h b/src/mainboard/amd/torpedo/BiosCallOuts.h
index 71d7655cfc..24bf5faff3 100644
--- a/src/mainboard/amd/torpedo/BiosCallOuts.h
+++ b/src/mainboard/amd/torpedo/BiosCallOuts.h
@@ -24,9 +24,4 @@
#include <northbridge/amd/agesa/family12/fam12_callouts.h>
-// These registers are not defined in cimx/SB900/Hudson-2.h
-#define SB_GPIO_REG02 2
-#define SB_GPIO_REG15 15
-#define SB_GPIO_REG25 25
-
#endif //_BIOS_CALLOUT_H_
diff --git a/src/mainboard/amd/torpedo/PlatformGnbPcie.c b/src/mainboard/amd/torpedo/PlatformGnbPcie.c
index 922aa8b1bf..b0b5dd64ba 100644
--- a/src/mainboard/amd/torpedo/PlatformGnbPcie.c
+++ b/src/mainboard/amd/torpedo/PlatformGnbPcie.c
@@ -18,7 +18,6 @@
*/
#include "PlatformGnbPcieComplex.h"
-#include "BiosCallOuts.h"
#include <string.h>
#include <vendorcode/amd/agesa/f12/Proc/CPU/heapManager.h>