summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorKyösti Mälkki <kyosti.malkki@gmail.com>2019-08-18 08:14:11 +0300
committerKyösti Mälkki <kyosti.malkki@gmail.com>2019-08-26 21:13:28 +0000
commiteb0eeb21be9886f509d51340ca886b450e2ce95b (patch)
tree061c3af2958182ae8dceff6d160856d12b80f087 /src
parentf0a3d444580a8dd80c6f8260be2fbd1448118faf (diff)
emulation/qemu-x86: Rename memory.c to memmap.c
Change-Id: I311423cb565485236f89bd6043155aaf6296a031 Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/34974 Reviewed-by: Patrick Rudolph <siro@das-labor.org> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src')
-rw-r--r--src/mainboard/emulation/qemu-i440fx/Makefile.inc12
-rw-r--r--src/mainboard/emulation/qemu-i440fx/memmap.c (renamed from src/mainboard/emulation/qemu-i440fx/memory.c)0
-rw-r--r--src/mainboard/emulation/qemu-q35/Makefile.inc15
3 files changed, 15 insertions, 12 deletions
diff --git a/src/mainboard/emulation/qemu-i440fx/Makefile.inc b/src/mainboard/emulation/qemu-i440fx/Makefile.inc
index e3ca3002ff..cac74ee435 100644
--- a/src/mainboard/emulation/qemu-i440fx/Makefile.inc
+++ b/src/mainboard/emulation/qemu-i440fx/Makefile.inc
@@ -1,8 +1,10 @@
-ramstage-y += northbridge.c
-ramstage-y += fw_cfg.c
romstage-y += fw_cfg.c
-romstage-y += memory.c
-ramstage-y += memory.c
-postcar-y += memory.c
+romstage-y += memmap.c
+
postcar-y += fw_cfg.c
+postcar-y += memmap.c
postcar-y += exit_car.S
+
+ramstage-y += fw_cfg.c
+ramstage-y += memmap.c
+ramstage-y += northbridge.c
diff --git a/src/mainboard/emulation/qemu-i440fx/memory.c b/src/mainboard/emulation/qemu-i440fx/memmap.c
index 8209379bef..8209379bef 100644
--- a/src/mainboard/emulation/qemu-i440fx/memory.c
+++ b/src/mainboard/emulation/qemu-i440fx/memmap.c
diff --git a/src/mainboard/emulation/qemu-q35/Makefile.inc b/src/mainboard/emulation/qemu-q35/Makefile.inc
index b18d2e4f97..133a213cc6 100644
--- a/src/mainboard/emulation/qemu-q35/Makefile.inc
+++ b/src/mainboard/emulation/qemu-q35/Makefile.inc
@@ -1,11 +1,12 @@
-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
+bootblock-y += bootblock.c
+
romstage-y += ../qemu-i440fx/fw_cfg.c
+romstage-y += ../qemu-i440fx/memmap.c
-postcar-y += ../qemu-i440fx/memory.c
-postcar-y += ../qemu-i440fx/exit_car.S
postcar-y += ../qemu-i440fx/fw_cfg.c
+postcar-y += ../qemu-i440fx/memmap.c
+postcar-y += ../qemu-i440fx/exit_car.S
-bootblock-y += bootblock.c
+ramstage-y += ../qemu-i440fx/fw_cfg.c
+ramstage-y += ../qemu-i440fx/memmap.c
+ramstage-y += ../qemu-i440fx/northbridge.c