diff options
author | Krystian Hebel <krystian.hebel@3mdeb.com> | 2020-10-09 19:11:05 +0200 |
---|---|---|
committer | Felix Held <felix-coreboot@felixheld.de> | 2023-04-03 13:22:53 +0000 |
commit | 8605cf5fe944193231349dc73199935e25915694 (patch) | |
tree | e2f648d5549c684abed3502b485c2b1209fb7528 | |
parent | 3a5507fd3166e18f5ca510f1475afbedccf69b6a (diff) |
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 <krystian.hebel@3mdeb.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/67061
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Michał Kopeć <michal.kopec@3mdeb.com>
-rw-r--r-- | src/arch/ppc64/Makefile.inc | 3 | ||||
-rw-r--r-- | src/mainboard/emulation/qemu-power8/Makefile.inc | 3 | ||||
-rw-r--r-- | src/mainboard/emulation/qemu-power8/rom_media.c (renamed from src/arch/ppc64/rom_media.c) | 0 | ||||
-rw-r--r-- | src/mainboard/emulation/qemu-power9/Makefile.inc | 4 | ||||
-rw-r--r-- | src/mainboard/emulation/qemu-power9/rom_media.c | 12 |
5 files changed, 19 insertions, 3 deletions
diff --git a/src/arch/ppc64/Makefile.inc b/src/arch/ppc64/Makefile.inc index 8ccd62bfab..92b1e399d6 100644 --- a/src/arch/ppc64/Makefile.inc +++ b/src/arch/ppc64/Makefile.inc @@ -12,7 +12,6 @@ ifeq ($(CONFIG_ARCH_BOOTBLOCK_PPC64),y) 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 @@ ifeq ($(CONFIG_ARCH_ROMSTAGE_PPC64),y) 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 @@ endif ################################################################################ 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 4011983923..c1484b96bc 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 index 2fd47669a8..2fd47669a8 100644 --- a/src/arch/ppc64/rom_media.c +++ b/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 ace00a75b7..a71c20fe1a 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/mainboard/emulation/qemu-power9/rom_media.c b/src/mainboard/emulation/qemu-power9/rom_media.c new file mode 100644 index 0000000000..2fd47669a8 --- /dev/null +++ b/src/mainboard/emulation/qemu-power9/rom_media.c @@ -0,0 +1,12 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#include <arch/io.h> +#include <boot_device.h> + +static const struct mem_region_device boot_dev = + MEM_REGION_DEV_RO_INIT(FLASH_BASE_ADDR, CONFIG_ROM_SIZE); + +const struct region_device *boot_device_ro(void) +{ + return &boot_dev.rdev; +} |