summaryrefslogtreecommitdiff
path: root/src/southbridge/nvidia
diff options
context:
space:
mode:
authorArthur Heymans <arthur@aheymans.xyz>2017-02-24 14:37:57 +0100
committerMartin Roth <martinroth@google.com>2017-03-21 18:11:39 +0100
commit11cf68c710bcda2ae56de5d7c2e169293bb4c242 (patch)
treec347e38fc2ed6064204c6c9741d8013167804406 /src/southbridge/nvidia
parentad017c63d29fe24f8e3d3943e457f551962b6c3a (diff)
downloadcoreboot-11cf68c710bcda2ae56de5d7c2e169293bb4c242.tar.xz
southbridge/nvidia/mcp55: Get rid of #include early_smbus.c
Using linker instead of '#include *.c'. Change-Id: I74dfa99c8bb3f4ca7ef3d774be2197897022f52c Signed-off-by: Arthur Heymans <arthur@aheymans.xyz> Reviewed-on: https://review.coreboot.org/18484 Tested-by: build bot (Jenkins) Reviewed-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Diffstat (limited to 'src/southbridge/nvidia')
-rw-r--r--src/southbridge/nvidia/mcp55/Makefile.inc1
-rw-r--r--src/southbridge/nvidia/mcp55/early_smbus.c21
-rw-r--r--src/southbridge/nvidia/mcp55/mcp55.h10
3 files changed, 23 insertions, 9 deletions
diff --git a/src/southbridge/nvidia/mcp55/Makefile.inc b/src/southbridge/nvidia/mcp55/Makefile.inc
index db275cc848..9b1e133222 100644
--- a/src/southbridge/nvidia/mcp55/Makefile.inc
+++ b/src/southbridge/nvidia/mcp55/Makefile.inc
@@ -19,6 +19,7 @@ ramstage-y += reset.c
romstage-$(CONFIG_USBDEBUG_IN_ROMSTAGE) += enable_usbdebug.c
ramstage-$(CONFIG_USBDEBUG) += enable_usbdebug.c
+romstage-y += early_smbus.c
ifeq ($(CONFIG_MCP55_USE_AZA),y)
ramstage-srcs += src/mainboard/$(MAINBOARDDIR)/hda_verb.c
diff --git a/src/southbridge/nvidia/mcp55/early_smbus.c b/src/southbridge/nvidia/mcp55/early_smbus.c
index 595914af2d..a849ebab92 100644
--- a/src/southbridge/nvidia/mcp55/early_smbus.c
+++ b/src/southbridge/nvidia/mcp55/early_smbus.c
@@ -17,13 +17,16 @@
* GNU General Public License for more details.
*/
+#include <arch/io.h>
+#include <console/console.h>
#include "smbus.h"
+#include "mcp55.h"
#define SMBUS0_IO_BASE 0x1000
#define SMBUS1_IO_BASE (0x1000 + (1 << 8))
/* Size: 0x40 */
-static void enable_smbus(void)
+void enable_smbus(void)
{
pci_devfn_t dev;
dev = pci_locate_device(PCI_ID(0x10de, 0x0368), 0);
@@ -43,47 +46,47 @@ static void enable_smbus(void)
outb(inb(SMBUS1_IO_BASE + SMBHSTSTAT), SMBUS1_IO_BASE + SMBHSTSTAT);
}
-static inline int smbus_recv_byte(unsigned device)
+int smbus_recv_byte(unsigned device)
{
return do_smbus_recv_byte(SMBUS0_IO_BASE, device);
}
-static inline int smbus_send_byte(unsigned device, unsigned char val)
+int smbus_send_byte(unsigned device, unsigned char val)
{
return do_smbus_send_byte(SMBUS0_IO_BASE, device, val);
}
-static inline int smbus_read_byte(unsigned device, unsigned address)
+int smbus_read_byte(unsigned device, unsigned address)
{
return do_smbus_read_byte(SMBUS0_IO_BASE, device, address);
}
-static inline int smbus_write_byte(unsigned device, unsigned address,
+int smbus_write_byte(unsigned device, unsigned address,
unsigned char val)
{
return do_smbus_write_byte(SMBUS0_IO_BASE, device, address, val);
}
-static inline int smbusx_recv_byte(unsigned smb_index, unsigned device)
+int smbusx_recv_byte(unsigned smb_index, unsigned device)
{
return do_smbus_recv_byte(SMBUS0_IO_BASE + (smb_index << 8), device);
}
-static inline int smbusx_send_byte(unsigned smb_index, unsigned device,
+int smbusx_send_byte(unsigned smb_index, unsigned device,
unsigned char val)
{
return do_smbus_send_byte(SMBUS0_IO_BASE + (smb_index << 8),
device, val);
}
-static inline int smbusx_read_byte(unsigned smb_index, unsigned device,
+int smbusx_read_byte(unsigned smb_index, unsigned device,
unsigned address)
{
return do_smbus_read_byte(SMBUS0_IO_BASE + (smb_index << 8),
device, address);
}
-static inline int smbusx_write_byte(unsigned smb_index, unsigned device,
+int smbusx_write_byte(unsigned smb_index, unsigned device,
unsigned address, unsigned char val)
{
return do_smbus_write_byte(SMBUS0_IO_BASE + (smb_index << 8),
diff --git a/src/southbridge/nvidia/mcp55/mcp55.h b/src/southbridge/nvidia/mcp55/mcp55.h
index 3d2b9d6772..a244b82731 100644
--- a/src/southbridge/nvidia/mcp55/mcp55.h
+++ b/src/southbridge/nvidia/mcp55/mcp55.h
@@ -30,6 +30,16 @@ void mcp55_enable(device_t dev);
extern struct pci_operations mcp55_pci_ops;
#else
void enable_fid_change_on_sb(unsigned sbbusn, unsigned sbdn);
+void enable_smbus(void);
+int smbus_recv_byte(unsigned device);
+int smbus_send_byte(unsigned device, unsigned char val);
+int smbus_read_byte(unsigned device, unsigned address);
+int smbus_write_byte(unsigned device, unsigned address, unsigned char val);
+int smbusx_recv_byte(unsigned smb_index, unsigned device);
+int smbusx_send_byte(unsigned smb_index, unsigned device, unsigned char val);
+int smbusx_read_byte(unsigned smb_index, unsigned device, unsigned address);
+int smbusx_write_byte(unsigned smb_index, unsigned device, unsigned address,
+ unsigned char val);
#endif
#endif