From 8bd6c538741a75d89a8f5e6d08d8b1ae9b2dba07 Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak@v3.sk>
Date: Mon, 3 Apr 2017 15:50:39 +0200
Subject: [PATCH] northbridge/via/cn700: Get rid of #include raminit.c

Using linker instead of '#include *.c'.

Change-Id: Ie1bc538aa29c4f18dd6f31a83d3da58f196f2078
Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
Reviewed-on: https://review.coreboot.org/19081
Tested-by: build bot (Jenkins)
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
---
 src/mainboard/bcom/winnetp680/romstage.c | 4 +---
 src/mainboard/jetway/j7f2/romstage.c     | 4 +---
 src/mainboard/via/epia-cn/romstage.c     | 4 +---
 src/mainboard/via/pc2500e/romstage.c     | 4 +---
 src/northbridge/via/cn700/Makefile.inc   | 1 +
 src/northbridge/via/cn700/raminit.c      | 6 +++++-
 src/northbridge/via/cn700/raminit.h      | 5 +++++
 7 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/mainboard/bcom/winnetp680/romstage.c b/src/mainboard/bcom/winnetp680/romstage.c
index 5f6f29a33a..0c56074398 100644
--- a/src/mainboard/bcom/winnetp680/romstage.c
+++ b/src/mainboard/bcom/winnetp680/romstage.c
@@ -33,13 +33,11 @@
 
 #define SERIAL_DEV PNP_DEV(0x2e, W83697HF_SP1)
 
-static inline int spd_read_byte(unsigned device, unsigned address)
+int spd_read_byte(unsigned device, unsigned address)
 {
 	return smbus_read_byte(device, address);
 }
 
-#include "northbridge/via/cn700/raminit.c"
-
 static void enable_mainboard_devices(void)
 {
 	pci_devfn_t dev;
diff --git a/src/mainboard/jetway/j7f2/romstage.c b/src/mainboard/jetway/j7f2/romstage.c
index d479072223..393f5e6764 100644
--- a/src/mainboard/jetway/j7f2/romstage.c
+++ b/src/mainboard/jetway/j7f2/romstage.c
@@ -37,13 +37,11 @@
 #define SERIAL_DEV PNP_DEV(0x2e, F71805F_SP1)
 #endif
 
-static inline int spd_read_byte(unsigned device, unsigned address)
+int spd_read_byte(unsigned device, unsigned address)
 {
 	return smbus_read_byte(device, address);
 }
 
-#include "northbridge/via/cn700/raminit.c"
-
 static void enable_mainboard_devices(void)
 {
 	pci_devfn_t dev;
diff --git a/src/mainboard/via/epia-cn/romstage.c b/src/mainboard/via/epia-cn/romstage.c
index 3ecb97bc21..5293aa6387 100644
--- a/src/mainboard/via/epia-cn/romstage.c
+++ b/src/mainboard/via/epia-cn/romstage.c
@@ -30,13 +30,11 @@
 #include "southbridge/via/vt8237r/early_serial.c"
 #include <spd.h>
 
-static inline int spd_read_byte(unsigned device, unsigned address)
+int spd_read_byte(unsigned device, unsigned address)
 {
 	return smbus_read_byte(device, address);
 }
 
-#include "northbridge/via/cn700/raminit.c"
-
 static void enable_mainboard_devices(void)
 {
 	pci_devfn_t dev;
diff --git a/src/mainboard/via/pc2500e/romstage.c b/src/mainboard/via/pc2500e/romstage.c
index 7d12e872d2..2f002be40e 100644
--- a/src/mainboard/via/pc2500e/romstage.c
+++ b/src/mainboard/via/pc2500e/romstage.c
@@ -33,13 +33,11 @@
 
 #define SERIAL_DEV PNP_DEV(0x2e, IT8716F_SP1)
 
-static int spd_read_byte(u16 device, u16 address)
+int spd_read_byte(unsigned device, unsigned address)
 {
 	return smbus_read_byte(device, address);
 }
 
-#include "northbridge/via/cn700/raminit.c"
-
 static const struct mem_controller ctrl = {
 	.d0f0 = 0x0000,
 	.d0f2 = 0x2000,
diff --git a/src/northbridge/via/cn700/Makefile.inc b/src/northbridge/via/cn700/Makefile.inc
index b6e7875099..f7f288f732 100644
--- a/src/northbridge/via/cn700/Makefile.inc
+++ b/src/northbridge/via/cn700/Makefile.inc
@@ -19,5 +19,6 @@ ifeq ($(CONFIG_NORTHBRIDGE_VIA_CN700),y)
 ramstage-y += northbridge.c
 ramstage-y += agp.c
 ramstage-y += vga.c
+romstage-y += raminit.c
 
 endif
diff --git a/src/northbridge/via/cn700/raminit.c b/src/northbridge/via/cn700/raminit.c
index 9cfd952f1e..8689ec97e3 100644
--- a/src/northbridge/via/cn700/raminit.c
+++ b/src/northbridge/via/cn700/raminit.c
@@ -16,6 +16,10 @@
  * GNU General Public License for more details.
  */
 
+#include <stdint.h>
+#include <arch/io.h>
+#include <northbridge/via/cn700/raminit.h>
+#include <console/console.h>
 #include <spd.h>
 #include <delay.h>
 #include "cn700.h"
@@ -446,7 +450,7 @@ static void sdram_enable(pci_devfn_t dev, u8 *rank_address)
 /*
  * Support one DIMM with up to 2 ranks.
  */
-static void ddr_ram_setup(const struct mem_controller *ctrl)
+void ddr_ram_setup(const struct mem_controller *ctrl)
 {
 	u8 reg;
 
diff --git a/src/northbridge/via/cn700/raminit.h b/src/northbridge/via/cn700/raminit.h
index 80e085fc6f..073b2531ba 100644
--- a/src/northbridge/via/cn700/raminit.h
+++ b/src/northbridge/via/cn700/raminit.h
@@ -24,4 +24,9 @@ struct mem_controller {
 	u8 channel0[DIMM_SOCKETS];
 };
 
+void ddr_ram_setup(const struct mem_controller *ctrl);
+
+/* mainboard specific */
+int spd_read_byte(unsigned device, unsigned address);
+
 #endif