diff options
| author | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2018-06-02 14:52:25 +0300 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2018-06-04 08:45:38 +0000 |
| commit | 2d7825b0fce070f41ef35b7fdcf599550663dbe9 (patch) | |
| tree | ff063eb4778b7640bb0669cd31758c16dc8ada04 /src/mainboard/amd | |
| parent | 975da840d094489da35c2770eab7afe4ef769be8 (diff) | |
| download | coreboot-2d7825b0fce070f41ef35b7fdcf599550663dbe9.tar.xz | |
amdfam10: Fix mismatch of function declarations
Callsite declared returning int, which makes more sense
than u8 the motherboard side code defined the functions
with.
Change-Id: I8ee83aa2833408ad163c9011a076e08578f3ca6f
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/26774
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Diffstat (limited to 'src/mainboard/amd')
| -rw-r--r-- | src/mainboard/amd/bimini_fam10/mainboard.c | 5 | ||||
| -rw-r--r-- | src/mainboard/amd/mahogany_fam10/mainboard.c | 4 | ||||
| -rw-r--r-- | src/mainboard/amd/tilapia_fam10/mainboard.c | 4 |
3 files changed, 6 insertions, 7 deletions
diff --git a/src/mainboard/amd/bimini_fam10/mainboard.c b/src/mainboard/amd/bimini_fam10/mainboard.c index 78529be48d..b6347ebc37 100644 --- a/src/mainboard/amd/bimini_fam10/mainboard.c +++ b/src/mainboard/amd/bimini_fam10/mainboard.c @@ -22,9 +22,8 @@ #include <device/pci_def.h> #include <southbridge/amd/common/amd_defs.h> #include <southbridge/amd/sb800/sb800.h> +#include "southbridge/amd/rs780/rs780.h" - -u8 is_dev3_present(void); void set_pcie_dereset(void); void set_pcie_reset(void); @@ -70,7 +69,7 @@ void set_pcie_reset(void) /* GPIO 50h reset PCIe slot */ } -u8 is_dev3_present(void) +int is_dev3_present(void) { return 0; } diff --git a/src/mainboard/amd/mahogany_fam10/mainboard.c b/src/mainboard/amd/mahogany_fam10/mainboard.c index a327284566..53a8290685 100644 --- a/src/mainboard/amd/mahogany_fam10/mainboard.c +++ b/src/mainboard/amd/mahogany_fam10/mainboard.c @@ -22,10 +22,10 @@ #include <device/pci_def.h> #include "southbridge/amd/sb700/sb700.h" #include "southbridge/amd/sb700/smbus.h" +#include "southbridge/amd/rs780/rs780.h" void set_pcie_dereset(void); void set_pcie_reset(void); -u8 is_dev3_present(void); /* * Mahogany uses GPIO 6 as PCIe slot reset, GPIO4 as GFX slot reset. We need to * pull it up before training the slot. @@ -85,7 +85,7 @@ static void get_ide_dma66(void) } #endif /* get_ide_dma66() */ -u8 is_dev3_present(void) +int is_dev3_present(void) { return 0; } diff --git a/src/mainboard/amd/tilapia_fam10/mainboard.c b/src/mainboard/amd/tilapia_fam10/mainboard.c index 28522a7fbd..e8a08a53c1 100644 --- a/src/mainboard/amd/tilapia_fam10/mainboard.c +++ b/src/mainboard/amd/tilapia_fam10/mainboard.c @@ -22,6 +22,7 @@ #include <device/pci_def.h> #include <southbridge/amd/sb700/sb700.h> #include "southbridge/amd/sb700/smbus.h" +#include "southbridge/amd/rs780/rs780.h" #define ADT7461_ADDRESS 0x4C #define ARA_ADDRESS 0x0C /* Alert Response Address */ @@ -35,7 +36,6 @@ void set_pcie_dereset(void); void set_pcie_reset(void); -u8 is_dev3_present(void); void set_pcie_dereset() { @@ -91,7 +91,7 @@ void set_pcie_reset() /* * justify the dev3 is exist or not */ -u8 is_dev3_present(void) +int is_dev3_present(void) { u16 word; struct device *sm_dev; |