Kyösti Mälkki has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/58948 )
Change subject: emulation/qemu-i440fx: Add MAINBOARD_HAS_CHROMEOS ......................................................................
emulation/qemu-i440fx: Add MAINBOARD_HAS_CHROMEOS
Change-Id: I7d5afbce2ae44bd520eda49c9c87ab2249c9e714 Signed-off-by: Kyösti Mälkki kyosti.malkki@gmail.com --- M src/mainboard/emulation/qemu-i440fx/Kconfig M src/mainboard/emulation/qemu-i440fx/Makefile.inc R src/mainboard/emulation/qemu-i440fx/chromeos.c M src/mainboard/emulation/qemu-q35/Makefile.inc 4 files changed, 4 insertions(+), 1 deletion(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/48/58948/1
diff --git a/src/mainboard/emulation/qemu-i440fx/Kconfig b/src/mainboard/emulation/qemu-i440fx/Kconfig index 8728e4e..2ba09d4 100644 --- a/src/mainboard/emulation/qemu-i440fx/Kconfig +++ b/src/mainboard/emulation/qemu-i440fx/Kconfig @@ -13,6 +13,7 @@ select BOARD_ROMSIZE_KB_16384 if VBOOT select MAINBOARD_HAS_NATIVE_VGA_INIT select MAINBOARD_FORCE_NATIVE_VGA_INIT + select MAINBOARD_HAS_CHROMEOS select HAVE_ASAN_IN_ROMSTAGE select NO_SMM select BOOT_DEVICE_NOT_SPI_FLASH diff --git a/src/mainboard/emulation/qemu-i440fx/Makefile.inc b/src/mainboard/emulation/qemu-i440fx/Makefile.inc index 7bd1c02..9808170 100644 --- a/src/mainboard/emulation/qemu-i440fx/Makefile.inc +++ b/src/mainboard/emulation/qemu-i440fx/Makefile.inc @@ -8,3 +8,5 @@
all-y += fw_cfg.c all-y += bootmode.c + +ramstage-$(CONFIG_CHROMEOS) += chromeos.c diff --git a/src/mainboard/emulation/qemu-q35/chromeos.c b/src/mainboard/emulation/qemu-i440fx/chromeos.c similarity index 100% rename from src/mainboard/emulation/qemu-q35/chromeos.c rename to src/mainboard/emulation/qemu-i440fx/chromeos.c diff --git a/src/mainboard/emulation/qemu-q35/Makefile.inc b/src/mainboard/emulation/qemu-q35/Makefile.inc index dc4e794..bfd499c 100644 --- a/src/mainboard/emulation/qemu-q35/Makefile.inc +++ b/src/mainboard/emulation/qemu-q35/Makefile.inc @@ -16,7 +16,7 @@ all-y += ../qemu-i440fx/fw_cfg.c all-y += ../qemu-i440fx/bootmode.c
-ramstage-$(CONFIG_CHROMEOS) += chromeos.c +ramstage-$(CONFIG_CHROMEOS) += ../qemu-i440fx/chromeos.c
smm-y += smi.c smm-y += memmap.c