From eb0eeb21be9886f509d51340ca886b450e2ce95b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ky=C3=B6sti=20M=C3=A4lkki?= Date: Sun, 18 Aug 2019 08:14:11 +0300 Subject: [PATCH] emulation/qemu-x86: Rename memory.c to memmap.c MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I311423cb565485236f89bd6043155aaf6296a031 Signed-off-by: Kyösti Mälkki Reviewed-on: https://review.coreboot.org/c/coreboot/+/34974 Reviewed-by: Patrick Rudolph Tested-by: build bot (Jenkins) --- .../emulation/qemu-i440fx/Makefile.inc | 12 ++++++----- .../qemu-i440fx/{memory.c => memmap.c} | 0 src/mainboard/emulation/qemu-q35/Makefile.inc | 21 ++++++++++--------- 3 files changed, 18 insertions(+), 15 deletions(-) rename src/mainboard/emulation/qemu-i440fx/{memory.c => memmap.c} (100%) 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 similarity index 100% rename from src/mainboard/emulation/qemu-i440fx/memory.c rename to 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 -romstage-y += ../qemu-i440fx/fw_cfg.c - -postcar-y += ../qemu-i440fx/memory.c -postcar-y += ../qemu-i440fx/exit_car.S -postcar-y += ../qemu-i440fx/fw_cfg.c - bootblock-y += bootblock.c + +romstage-y += ../qemu-i440fx/fw_cfg.c +romstage-y += ../qemu-i440fx/memmap.c + +postcar-y += ../qemu-i440fx/fw_cfg.c +postcar-y += ../qemu-i440fx/memmap.c +postcar-y += ../qemu-i440fx/exit_car.S + +ramstage-y += ../qemu-i440fx/fw_cfg.c +ramstage-y += ../qemu-i440fx/memmap.c +ramstage-y += ../qemu-i440fx/northbridge.c