cmake: jailhouse: fix check for JAILHOUSE_QEMU_IMG_FILE
Also remove old, now unused, makefile with previous logic on that. Signed-off-by: Gustavo Lima Chaves <gustavo.lima.chaves@intel.com>
This commit is contained in:
parent
6a2a94b124
commit
4be1db0aac
2 changed files with 4 additions and 19 deletions
|
@ -11,6 +11,10 @@ if(NOT CONFIG_REBOOT)
|
|||
set(REBOOT_FLAG -no-reboot)
|
||||
endif()
|
||||
|
||||
if (NOT DEFINED JAILHOUSE_QEMU_IMG_FILE)
|
||||
message(FATAL_ERROR "You have to provide a valid qcow2 QEMU image to be a Jailhouse root cell (variable JAILHOUSE_QEMU_IMG_FILE)!")
|
||||
endif()
|
||||
|
||||
set(QEMU_CPU_TYPE_${ARCH} kvm64,-kvm_pv_eoi,-kvm_steal_time,-kvm_asyncpf,-kvmclock,+vmx,+x2apic,+arat)
|
||||
set(QEMU_FLAGS_${ARCH}
|
||||
-machine q35,kernel_irqchip=split
|
||||
|
|
|
@ -1,19 +0,0 @@
|
|||
#
|
||||
# Copyright (c) 2017 Intel Corporation
|
||||
#
|
||||
# SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
|
||||
# Abstraction of 'run' goal with Qemu
|
||||
|
||||
# QEMU_INSTANCE is a command line argument to make.
|
||||
QEMU_FLAGS = $(QEMU_FLAGS_$(ARCH))
|
||||
|
||||
ifeq ($(JAILHOUSE_QEMU_IMG_FILE),)
|
||||
run: zephyr
|
||||
$(error You have to provide a valid qcow2 QEMU image to be a Jailhouse root cell (variable JAILHOUSE_QEMU_IMG_FILE)!)
|
||||
else
|
||||
run: zephyr
|
||||
@echo '[QEMU] CPU: $(QEMU_CPU_TYPE_$(ARCH))'
|
||||
$(Q)$(QEMU_x86) $(QEMU_FLAGS) $(QEMU_EXTRA_FLAGS)
|
||||
endif
|
Loading…
Add table
Add a link
Reference in a new issue