From 69d5ef9d143afbd9904507dd02d32148c40c6474 Mon Sep 17 00:00:00 2001
From: Patrick Rudolph <siro@das-labor.org>
Date: Sun, 11 Nov 2018 12:43:48 +0100
Subject: mb/emulation/qemu-i440fx|q35: Link memory.c

Link memory.c instead of including it.

Change-Id: I2bc461b13332ec5885c33c87828a5fd023f8e730
Signed-off-by: Patrick Rudolph <siro@das-labor.org>
Reviewed-on: https://review.coreboot.org/29574
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Felix Held <felix-coreboot@felixheld.de>
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
---
 src/mainboard/emulation/qemu-q35/Makefile.inc | 2 ++
 src/mainboard/emulation/qemu-q35/romstage.c   | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/mainboard/emulation/qemu-q35')

diff --git a/src/mainboard/emulation/qemu-q35/Makefile.inc b/src/mainboard/emulation/qemu-q35/Makefile.inc
index fc4374ca83..923a28ed34 100644
--- a/src/mainboard/emulation/qemu-q35/Makefile.inc
+++ b/src/mainboard/emulation/qemu-q35/Makefile.inc
@@ -1,3 +1,5 @@
 cpu_incs-y += $(src)/mainboard/emulation/qemu-i440fx/cache_as_ram.inc
 ramstage-y += ../qemu-i440fx/northbridge.c
+ramstage-y += ../qemu-i440fx/memory.c
 ramstage-y += ../qemu-i440fx/fw_cfg.c
+romstage-y += ../qemu-i440fx/memory.c
diff --git a/src/mainboard/emulation/qemu-q35/romstage.c b/src/mainboard/emulation/qemu-q35/romstage.c
index 870dd07762..846fcf312a 100644
--- a/src/mainboard/emulation/qemu-q35/romstage.c
+++ b/src/mainboard/emulation/qemu-q35/romstage.c
@@ -19,6 +19,7 @@
 #include <arch/io.h>
 #include <device/pnp_def.h>
 #include <pc80/mc146818rtc.h>
+#include <cbmem.h>
 #include <console/console.h>
 #include <southbridge/intel/i82801ix/i82801ix.h>
 #include <cpu/x86/bist.h>
@@ -27,7 +28,6 @@
 #include <delay.h>
 #include <cpu/x86/lapic.h>
 
-#include "../qemu-i440fx/memory.c"
 
 void * asmlinkage romstage_main(unsigned long bist)
 {
-- 
cgit v1.2.3