summaryrefslogtreecommitdiff
path: root/src/mainboard/amd
diff options
context:
space:
mode:
Diffstat (limited to 'src/mainboard/amd')
-rw-r--r--src/mainboard/amd/dinar/BiosCallOuts.c12
-rw-r--r--src/mainboard/amd/dinar/BiosCallOuts.h8
-rw-r--r--src/mainboard/amd/inagua/BiosCallOuts.c1
-rw-r--r--src/mainboard/amd/inagua/BiosCallOuts.h8
-rw-r--r--src/mainboard/amd/inagua/PlatformGnbPcie.c1
-rw-r--r--src/mainboard/amd/persimmon/PlatformGnbPcie.c1
-rw-r--r--src/mainboard/amd/south_station/BiosCallOuts.c1
-rw-r--r--src/mainboard/amd/south_station/BiosCallOuts.h9
-rw-r--r--src/mainboard/amd/south_station/PlatformGnbPcie.c1
-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
-rw-r--r--src/mainboard/amd/union_station/BiosCallOuts.c1
-rw-r--r--src/mainboard/amd/union_station/BiosCallOuts.h8
14 files changed, 4 insertions, 66 deletions
diff --git a/src/mainboard/amd/dinar/BiosCallOuts.c b/src/mainboard/amd/dinar/BiosCallOuts.c
index 72424f8849..60aa671c04 100644
--- a/src/mainboard/amd/dinar/BiosCallOuts.c
+++ b/src/mainboard/amd/dinar/BiosCallOuts.c
@@ -29,18 +29,6 @@
#include <southbridge/amd/cimx/sb700/smbus_spd.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
-
#ifdef __PRE_RAM__
/* This define is used when selecting the appropriate socket for the SPD read
* because this is a multi-socket design.
diff --git a/src/mainboard/amd/dinar/BiosCallOuts.h b/src/mainboard/amd/dinar/BiosCallOuts.h
index 2c86e2f648..0a890a3a04 100644
--- a/src/mainboard/amd/dinar/BiosCallOuts.h
+++ b/src/mainboard/amd/dinar/BiosCallOuts.h
@@ -24,13 +24,5 @@
#include <northbridge/amd/agesa/family15/fam15_callouts.h>
-#define SB_GPIO_REG02 2
-#define SB_GPIO_REG09 9
-#define SB_GPIO_REG10 10
-#define SB_GPIO_REG15 15
-#define SB_GPIO_REG17 17
-#define SB_GPIO_REG21 21
-#define SB_GPIO_REG25 25
-#define SB_GPIO_REG28 28
#endif //_BIOS_CALLOUT_H_
diff --git a/src/mainboard/amd/inagua/BiosCallOuts.c b/src/mainboard/amd/inagua/BiosCallOuts.c
index 56130125ed..4503c30f1c 100644
--- a/src/mainboard/amd/inagua/BiosCallOuts.c
+++ b/src/mainboard/amd/inagua/BiosCallOuts.c
@@ -22,6 +22,7 @@
#include "BiosCallOuts.h"
#include "heapManager.h"
#include "SB800.h"
+#include <southbridge/amd/cimx/sb800/gpio_oem.h>
#include <stdlib.h>
static AGESA_STATUS board_BeforeDramInit (UINT32 Func, UINT32 Data, VOID *ConfigPtr);
diff --git a/src/mainboard/amd/inagua/BiosCallOuts.h b/src/mainboard/amd/inagua/BiosCallOuts.h
index 0c0d4aa4ad..9c4bef2de7 100644
--- a/src/mainboard/amd/inagua/BiosCallOuts.h
+++ b/src/mainboard/amd/inagua/BiosCallOuts.h
@@ -24,13 +24,5 @@
#include <northbridge/amd/agesa/family14/fam14_callouts.h>
-#define SB_GPIO_REG02 2
-#define SB_GPIO_REG09 9
-#define SB_GPIO_REG10 10
-#define SB_GPIO_REG15 15
-#define SB_GPIO_REG17 17
-#define SB_GPIO_REG21 21
-#define SB_GPIO_REG25 25
-#define SB_GPIO_REG28 28
#endif //_BIOS_CALLOUT_H_
diff --git a/src/mainboard/amd/inagua/PlatformGnbPcie.c b/src/mainboard/amd/inagua/PlatformGnbPcie.c
index 2b0122d055..08cd998c11 100644
--- a/src/mainboard/amd/inagua/PlatformGnbPcie.c
+++ b/src/mainboard/amd/inagua/PlatformGnbPcie.c
@@ -18,7 +18,6 @@
*/
#include "PlatformGnbPcieComplex.h"
-#include "BiosCallOuts.h"
#include <string.h>
#include <vendorcode/amd/agesa/f14/Proc/CPU/heapManager.h>
diff --git a/src/mainboard/amd/persimmon/PlatformGnbPcie.c b/src/mainboard/amd/persimmon/PlatformGnbPcie.c
index 078f3cb022..de797c0c61 100644
--- a/src/mainboard/amd/persimmon/PlatformGnbPcie.c
+++ b/src/mainboard/amd/persimmon/PlatformGnbPcie.c
@@ -18,7 +18,6 @@
*/
#include "PlatformGnbPcieComplex.h"
-#include "BiosCallOuts.h"
#include <string.h>
#include <vendorcode/amd/agesa/f14/Proc/CPU/heapManager.h>
diff --git a/src/mainboard/amd/south_station/BiosCallOuts.c b/src/mainboard/amd/south_station/BiosCallOuts.c
index 272a3949a5..cd265ab192 100644
--- a/src/mainboard/amd/south_station/BiosCallOuts.c
+++ b/src/mainboard/amd/south_station/BiosCallOuts.c
@@ -22,6 +22,7 @@
#include "BiosCallOuts.h"
#include "heapManager.h"
#include "SB800.h"
+#include <southbridge/amd/cimx/sb800/gpio_oem.h>
#include <stdlib.h>
static AGESA_STATUS board_BeforeDramInit (UINT32 Func, UINT32 Data, VOID *ConfigPtr);
diff --git a/src/mainboard/amd/south_station/BiosCallOuts.h b/src/mainboard/amd/south_station/BiosCallOuts.h
index 0c0d4aa4ad..1cb500635d 100644
--- a/src/mainboard/amd/south_station/BiosCallOuts.h
+++ b/src/mainboard/amd/south_station/BiosCallOuts.h
@@ -24,13 +24,4 @@
#include <northbridge/amd/agesa/family14/fam14_callouts.h>
-#define SB_GPIO_REG02 2
-#define SB_GPIO_REG09 9
-#define SB_GPIO_REG10 10
-#define SB_GPIO_REG15 15
-#define SB_GPIO_REG17 17
-#define SB_GPIO_REG21 21
-#define SB_GPIO_REG25 25
-#define SB_GPIO_REG28 28
-
#endif //_BIOS_CALLOUT_H_
diff --git a/src/mainboard/amd/south_station/PlatformGnbPcie.c b/src/mainboard/amd/south_station/PlatformGnbPcie.c
index a0b8d3df13..3798251e1f 100644
--- a/src/mainboard/amd/south_station/PlatformGnbPcie.c
+++ b/src/mainboard/amd/south_station/PlatformGnbPcie.c
@@ -18,7 +18,6 @@
*/
#include "PlatformGnbPcieComplex.h"
-#include "BiosCallOuts.h"
#include <string.h>
#include <vendorcode/amd/agesa/f14/Proc/CPU/heapManager.h>
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>
diff --git a/src/mainboard/amd/union_station/BiosCallOuts.c b/src/mainboard/amd/union_station/BiosCallOuts.c
index 272a3949a5..cd265ab192 100644
--- a/src/mainboard/amd/union_station/BiosCallOuts.c
+++ b/src/mainboard/amd/union_station/BiosCallOuts.c
@@ -22,6 +22,7 @@
#include "BiosCallOuts.h"
#include "heapManager.h"
#include "SB800.h"
+#include <southbridge/amd/cimx/sb800/gpio_oem.h>
#include <stdlib.h>
static AGESA_STATUS board_BeforeDramInit (UINT32 Func, UINT32 Data, VOID *ConfigPtr);
diff --git a/src/mainboard/amd/union_station/BiosCallOuts.h b/src/mainboard/amd/union_station/BiosCallOuts.h
index 0c0d4aa4ad..9c4bef2de7 100644
--- a/src/mainboard/amd/union_station/BiosCallOuts.h
+++ b/src/mainboard/amd/union_station/BiosCallOuts.h
@@ -24,13 +24,5 @@
#include <northbridge/amd/agesa/family14/fam14_callouts.h>
-#define SB_GPIO_REG02 2
-#define SB_GPIO_REG09 9
-#define SB_GPIO_REG10 10
-#define SB_GPIO_REG15 15
-#define SB_GPIO_REG17 17
-#define SB_GPIO_REG21 21
-#define SB_GPIO_REG25 25
-#define SB_GPIO_REG28 28
#endif //_BIOS_CALLOUT_H_
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-11 12:05:53 +0000