diff options
| author | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2014-10-18 07:51:03 +0300 |
|---|---|---|
| committer | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2014-10-19 06:20:14 +0200 |
| commit | 50c9637e15ddd78f896419f2335457de4fe22d77 (patch) | |
| tree | 2a8b281211cce06473d47a5db76495a435064d72 /src/mainboard/lippert/toucan-af | |
| parent | a1ebbc42ad791369c2e4f626e46917bdb1459d72 (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/lippert/toucan-af')
| -rw-r--r-- | src/mainboard/lippert/toucan-af/BiosCallOuts.c | 2 | ||||
| -rw-r--r-- | src/mainboard/lippert/toucan-af/BiosCallOuts.h | 11 | ||||
| -rw-r--r-- | src/mainboard/lippert/toucan-af/PlatformGnbPcie.c | 1 | ||||
| -rw-r--r-- | src/mainboard/lippert/toucan-af/mainboard.c | 1 |
4 files changed, 3 insertions, 12 deletions
diff --git a/src/mainboard/lippert/toucan-af/BiosCallOuts.c b/src/mainboard/lippert/toucan-af/BiosCallOuts.c index da9ab1a8fc..87a2ae02d2 100644 --- a/src/mainboard/lippert/toucan-af/BiosCallOuts.c +++ b/src/mainboard/lippert/toucan-af/BiosCallOuts.c @@ -20,6 +20,8 @@ #include "AGESA.h" #include "amdlib.h" #include "BiosCallOuts.h" +#include "SB800.h" +#include <southbridge/amd/cimx/sb800/gpio_oem.h> #include "heapManager.h" #include <stdlib.h> diff --git a/src/mainboard/lippert/toucan-af/BiosCallOuts.h b/src/mainboard/lippert/toucan-af/BiosCallOuts.h index c0463a8521..0ba428f29d 100644 --- a/src/mainboard/lippert/toucan-af/BiosCallOuts.h +++ b/src/mainboard/lippert/toucan-af/BiosCallOuts.h @@ -22,16 +22,5 @@ #include <northbridge/amd/agesa/def_callouts.h> #include <northbridge/amd/agesa/family14/fam14_callouts.h> -#include "SB800.h" - - -/* FCH GPIO access helpers */ -#define FCH_IOMUX(gpio_nr) (*(u8*)(ACPI_MMIO_BASE+IOMUX_BASE+(gpio_nr))) -#define FCH_PMIO(reg_nr) (*(u8*)(ACPI_MMIO_BASE+PMIO_BASE+(reg_nr))) -#define FCH_GPIO(gpio_nr) (*(volatile u8*)(ACPI_MMIO_BASE+GPIO_BASE+(gpio_nr))) -static inline u8 fch_gpio_state(unsigned int gpio_nr) -{ - return FCH_GPIO(gpio_nr) >> 7; -} #endif //_BIOS_CALLOUT_H_ diff --git a/src/mainboard/lippert/toucan-af/PlatformGnbPcie.c b/src/mainboard/lippert/toucan-af/PlatformGnbPcie.c index 0cdfcda7e8..f8ba912198 100644 --- a/src/mainboard/lippert/toucan-af/PlatformGnbPcie.c +++ b/src/mainboard/lippert/toucan-af/PlatformGnbPcie.c @@ -23,7 +23,6 @@ #include "heapManager.h" #include "PlatformGnbPcieComplex.h" #include "Filecode.h" -#include "BiosCallOuts.h" #include <string.h> diff --git a/src/mainboard/lippert/toucan-af/mainboard.c b/src/mainboard/lippert/toucan-af/mainboard.c index 660893079a..50b981bf5b 100644 --- a/src/mainboard/lippert/toucan-af/mainboard.c +++ b/src/mainboard/lippert/toucan-af/mainboard.c @@ -31,6 +31,7 @@ #include <cpu/amd/mtrr.h> #include "SBPLATFORM.h" #include "OEM.h" /* SMBUS0_BASE_ADDRESS */ +#include <southbridge/amd/cimx/sb800/gpio_oem.h> /* Write data block to slave on SMBUS0. */ #define SMB0_STATUS ((SMBUS0_BASE_ADDRESS) + 0) |