X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=Makefile;h=1e3ea6e015bde8dc2e5ae927279b823cb044c2ca;hb=7ee76e418a956a793e2ad183b176dff0c181d6a9;hp=483ffd3125c9eb4b336542ad68abb7422e8f757b;hpb=0d0aa924c6bd0cf4a8b77b439052541591686e15;p=rhbz1184405.git

diff --git a/Makefile b/Makefile
index 483ffd3..1e3ea6e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,23 @@
-kver    = 3.19.0-0.rc5.git2.1.fc22.aarch64
+kver    = 3.19.0-0.rc4.57.sa2.aarch64
+use_efi = 1
+kernel  = /boot/vmlinuz-$(kver)
+moddir  = /lib/modules/$(kver)
+qemu    = /usr/libexec/qemu-kvm
 modules = virtio.ko virtio_ring.ko virtio_mmio.ko virtio_scsi.ko
 disks   = sda.img sdb.img sdc.img sdd.img sde.img sdf.img
 
-all:	initrd $(disks)
+all:	initrd $(disks) AAVMF_VARS.fd
+
+ifeq ($(use_efi),1)
+AAVMF_VARS.fd: /usr/share/AAVMF/AAVMF_VARS.fd
+	cp $< $@
+efi_params = \
+	-drive if=pflash,format=raw,file=/usr/share/AAVMF/AAVMF_CODE.fd,readonly \
+	-drive if=pflash,format=raw,file=AAVMF_VARS.fd
+else
+AAVMF_VARS.fd:
+	touch $@
+endif
 
 initrd:	dev init $(modules)
 	ls -1d $^ | cpio -o -H newc | gzip -9 > $@
@@ -12,7 +27,7 @@ dev:
 	mkdir $@
 
 %.ko:
-	find /lib/modules/$(kver) -name $@ -exec cp {} . \;
+	find $(moddir) -name $@ -exec cp {} . \;
 
 init:	init.c
 	gcc -Wall -Werror -static $< -o $@
@@ -23,18 +38,16 @@ init:	init.c
 	echo '2048,,L' | sfdisk --force $@
 
 clean:
-	rm -f $(disks) $(modules) init initrd
-
-kernel  = /boot/vmlinuz-$(kver)
-qemu    = qemu-system-aarch64
+	rm -f *~ $(disks) $(modules) init initrd AAVMF_VARS.fd
 
-run:	initrd $(disks)
+run:	initrd $(disks) AAVMF_VARS.fd
 	$(qemu) \
 	  -nodefconfig -nodefaults -display none \
 	  -machine virt,accel=kvm \
 	  -no-reboot \
 	  -cpu host \
 	  -m 1024 \
+	  $(efi_params) \
 	  -kernel $(kernel) -initrd initrd \
 	  -append 'panic=1 earlyprintk=pl011,0x9000000 ignore_loglevel console=ttyAMA0 no_timer_check printk.time=1' \
 	  -serial stdio \