From 39b2134770647172c460a0f379299a2e0eb14e68 Mon Sep 17 00:00:00 2001 From: SeokYeon Hwang Date: Tue, 29 Apr 2014 13:08:30 +0900 Subject: [PATCH] maru_board: support ACPI PCI Hotplug Change-Id: I9d3ba199e17f40ee0aa702616f9d5db79f5bef46 Signed-off-by: SeokYeon Hwang --- tizen/src/Makefile | 4 ++-- tizen/src/hw/maru_board.c | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tizen/src/Makefile b/tizen/src/Makefile index 5d5824f..0c5505b 100644 --- a/tizen/src/Makefile +++ b/tizen/src/Makefile @@ -86,7 +86,7 @@ install: all echo "Copying i386-softmmu/qemu-system-i386$(EXECUTABLE_EXTENSION) to $(EMUL_DIR)/bin/emulator-x86$(EXECUTABLE_EXTENSION)" ;\ cp -pP ../../i386-softmmu/qemu-system-i386$(EXECUTABLE_EXTENSION) $(EMUL_DIR)/bin/emulator-x86$(EXECUTABLE_EXTENSION) ;\ echo "Copying bioses to $(EMUL_DIR)/data/bios" ;\ - cp -pP ../../pc-bios/bios.bin $(EMUL_DIR)/data/bios ;\ + cp -pP ../../pc-bios/bios-256k.bin $(EMUL_DIR)/data/bios ;\ cp -pP ../../pc-bios/linuxboot.bin $(EMUL_DIR)/data/bios ;\ cp -pP ../../pc-bios/efi-virtio.rom $(EMUL_DIR)/data/bios ;\ cp -pP ../../pc-bios/acpi-dsdt.aml $(EMUL_DIR)/data/bios ;\ @@ -191,7 +191,7 @@ install_dibs: all_dibs echo "Copying i386-softmmu/qemu-system-i386$(EXECUTABLE_EXTENSION) to $(DIBS_X86__DIR)/bin/emulator-x86$(EXECUTABLE_EXTENSION)" ;\ cp ../../i386-softmmu/qemu-system-i386$(EXECUTABLE_EXTENSION) $(DIBS_X86_DIR)/bin/emulator-x86$(EXECUTABLE_EXTENSION) ;\ echo "Copying bioses to $(DIBS_X86_DIR)/data/bios" ;\ - cp -pP ../../pc-bios/bios.bin $(DIBS_X86_DIR)/data/bios ;\ + cp -pP ../../pc-bios/bios-256k.bin $(DIBS_X86_DIR)/data/bios ;\ cp -pP ../../pc-bios/linuxboot.bin $(DIBS_X86_DIR)/data/bios ;\ cp -pP ../../pc-bios/efi-virtio.rom $(DIBS_X86_DIR)/data/bios ;\ cp -pP ../../pc-bios/acpi-dsdt.aml $(DIBS_X86_DIR)/data/bios ;\ diff --git a/tizen/src/hw/maru_board.c b/tizen/src/hw/maru_board.c index 884176b..9dbc7e6 100644 --- a/tizen/src/hw/maru_board.c +++ b/tizen/src/hw/maru_board.c @@ -154,6 +154,7 @@ static QEMUMachine maru_x86_machine = { .desc = "Maru Board (x86)", .init = maru_x86_board_init, .hot_add_cpu = pc_hot_add_cpu, + .default_machine_opts = "firmware=bios-256k.bin" }; static void maru_machine_init(void) -- 2.7.4