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/asus | |
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/asus')
-rw-r--r-- | src/mainboard/asus/m4a78-em/mainboard.c | 4 | ||||
-rw-r--r-- | src/mainboard/asus/m4a785-m/mainboard.c | 4 | ||||
-rw-r--r-- | src/mainboard/asus/m5a88-v/mainboard.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/mainboard/asus/m4a78-em/mainboard.c b/src/mainboard/asus/m4a78-em/mainboard.c index 99a1cf6e3b..e80d39b0e8 100644 --- a/src/mainboard/asus/m4a78-em/mainboard.c +++ b/src/mainboard/asus/m4a78-em/mainboard.c @@ -22,11 +22,11 @@ #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); void set_pcie_dereset() { @@ -84,7 +84,7 @@ void set_pcie_reset() * NOTE: This just copied from AMD Tilapia code. * It is completly unknown if it will work at all for this board. */ -u8 is_dev3_present(void) +int is_dev3_present(void) { u16 word; struct device *sm_dev; diff --git a/src/mainboard/asus/m4a785-m/mainboard.c b/src/mainboard/asus/m4a785-m/mainboard.c index 4f4bb9dc78..42a9f644e3 100644 --- a/src/mainboard/asus/m4a785-m/mainboard.c +++ b/src/mainboard/asus/m4a785-m/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() { @@ -93,7 +93,7 @@ void set_pcie_reset() * NOTE: This just copied from AMD Tilapia code. * It is completly unknown it it will work at all for ASUS M4A785-M. */ -u8 is_dev3_present(void) +int is_dev3_present(void) { u16 word; struct device *sm_dev; diff --git a/src/mainboard/asus/m5a88-v/mainboard.c b/src/mainboard/asus/m5a88-v/mainboard.c index 8af6037e7d..4ec716e96a 100644 --- a/src/mainboard/asus/m5a88-v/mainboard.c +++ b/src/mainboard/asus/m5a88-v/mainboard.c @@ -21,8 +21,8 @@ #include <cpu/amd/mtrr.h> #include <southbridge/amd/common/amd_defs.h> #include <device/pci_def.h> +#include "southbridge/amd/rs780/rs780.h" -u8 is_dev3_present(void); void set_pcie_dereset(void); void set_pcie_reset(void); @@ -53,7 +53,7 @@ void set_pcie_reset(void) { } -u8 is_dev3_present(void) +int is_dev3_present(void) { return 0; } |