[S] Change in coreboot[master]: arch/ppc64/rom_media.c: move to mainboard/emulation/qemu-power*

[Felix Held (Code Review)]

Felix Held has submitted this change. ( https://review.coreboot.org/c/coreboot/+/67061 )

Change subject: arch/ppc64/rom_media.c: move to mainboard/emulation/qemu-power*
......................................................................

arch/ppc64/rom_media.c: move to mainboard/emulation/qemu-power*

CBFS location in memory is different than on the real hardware.

Change-Id: Icd806a57f449042c883b624056c05c1ff7e4c17e
Signed-off-by: Krystian Hebel 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/67061
Tested-by: build bot (Jenkins) 
Reviewed-by: Michał Kopeć 
---
M src/arch/ppc64/Makefile.inc
M src/mainboard/emulation/qemu-power8/Makefile.inc
R src/mainboard/emulation/qemu-power8/rom_media.c
M src/mainboard/emulation/qemu-power9/Makefile.inc
C src/mainboard/emulation/qemu-power9/rom_media.c
5 files changed, 22 insertions(+), 3 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Michał Kopeć: Looks good to me, approved

diff --git a/src/arch/ppc64/Makefile.inc b/src/arch/ppc64/Makefile.inc
index 8ccd62b..92b1e39 100644
--- a/src/arch/ppc64/Makefile.inc
+++ b/src/arch/ppc64/Makefile.inc
@@ -12,7 +12,6 @@
 bootblock-y = bootblock_crt0.S
 bootblock-y += arch_timer.c
 bootblock-y += boot.c
-bootblock-y += rom_media.c
 bootblock-y += \
    $(top)/src/lib/memchr.c \
    $(top)/src/lib/memcmp.c \
@@ -38,7 +37,6 @@
 romstage-y += arch_timer.c
 romstage-y += boot.c
 romstage-y += stages.c
-romstage-y += rom_media.c
 romstage-y += \
    $(top)/src/lib/memchr.c \
    $(top)/src/lib/memcmp.c \
@@ -64,7 +62,6 @@
 ################################################################################
 ifeq ($(CONFIG_ARCH_RAMSTAGE_PPC64),y)

-ramstage-y += rom_media.c
 ramstage-y += stages.c
 ramstage-y += arch_timer.c
 ramstage-y += boot.c
diff --git a/src/mainboard/emulation/qemu-power8/Makefile.inc b/src/mainboard/emulation/qemu-power8/Makefile.inc
index 4011983..c1484b9 100644
--- a/src/mainboard/emulation/qemu-power8/Makefile.inc
+++ b/src/mainboard/emulation/qemu-power8/Makefile.inc
@@ -2,8 +2,11 @@

bootblock-y += bootblock.c
 bootblock-y += uart.c
+bootblock-y += rom_media.c
 romstage-y += cbmem.c
 romstage-y += romstage.c
 ramstage-y += timer.c
 romstage-y += uart.c
+romstage-y += rom_media.c
 ramstage-y += uart.c
+ramstage-y += rom_media.c
diff --git a/src/arch/ppc64/rom_media.c b/src/mainboard/emulation/qemu-power8/rom_media.c
similarity index 100%
rename from src/arch/ppc64/rom_media.c
rename to src/mainboard/emulation/qemu-power8/rom_media.c
diff --git a/src/mainboard/emulation/qemu-power9/Makefile.inc b/src/mainboard/emulation/qemu-power9/Makefile.inc
index ace00a7..a71c20f 100644
--- a/src/mainboard/emulation/qemu-power9/Makefile.inc
+++ b/src/mainboard/emulation/qemu-power9/Makefile.inc
@@ -1,6 +1,10 @@
 ## SPDX-License-Identifier: GPL-2.0-only

+bootblock-y += rom_media.c
+
 romstage-y += cbmem.c
 romstage-y += romstage.c
+romstage-y += rom_media.c

ramstage-y += ramstage.c
+ramstage-y += rom_media.c
diff --git a/src/arch/ppc64/rom_media.c b/src/mainboard/emulation/qemu-power9/rom_media.c
similarity index 100%
copy from src/arch/ppc64/rom_media.c
copy to src/mainboard/emulation/qemu-power9/rom_media.c