Unverified Commit ba4b2cf8 authored by Grant Likely's avatar Grant Likely Committed by GitHub
Browse files

Merge pull request #4 from jmarinho/to_master

Jose's QEMU changes
parents dd4dfc60 5b1591c1
......@@ -7,6 +7,8 @@ FLASH_IMAGE := nor_flash.bin
OPTEE_EXTRA += CFG_RPMB_FS_DEV_ID=1
QEMU_BIN ?= qemu-system-aarch64
ifneq ($(CONFIG_TFABOOT)$(CONFIG_POSITION_INDEPENDENT),yy)
tweakconfig:
echo "CONFIG_POSITION_INDEPENDENT=y" >> $(UBOOT_OUTPUT)/.config
......@@ -44,7 +46,10 @@ QEMU_BASE_CONFIG += -drive if=virtio,format=raw,file=$(VIRTDISK)
endif
qemu-fip:
qemu-system-aarch64 $(QEMU_BASE_CONFIG) -bios $(FLASH_IMAGE) $(QEMU_EXTRA)
$(QEMU_BIN) $(QEMU_BASE_CONFIG) -drive if=pflash,unit=0,file=$(FLASH_IMAGE) $(QEMU_EXTRA)
qemu-semihosting:
cd output && qemu-system-aarch64 $(QEMU_BASE_CONFIG) -bios bl1.bin -semihosting-config enable,target=native $(QEMU_EXTRA)
cd output && $(QEMU_BIN) $(QEMU_BASE_CONFIG) -bios bl1.bin -semihosting-config enable,target=native $(QEMU_EXTRA)
qemu-%-dbg: qemu-%;
qemu-%-dbg: QEMU_EXTRA += -s -S
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment