Makefile: Fix Jailhouse compilation

diff --git a/build/Makefile b/build/Makefile
index 80b982185b9c9ec82f1dc9828f54d0c65894ee4d..d4f92bb0c255c966d0ad30238a78161930d78798 100644 (file)
--- a/build/Makefile
+++ b/build/Makefile
@@ -10,15 +10,18 @@ buildroot/images/rootfs.cpio.uboot: rootfs-overlay/lib/firmware/jailhouse.bin ro
 buildroot/images/rootfs.cpio.uboot: $(shell find rootfs-overlay)
        $(MAKE) -j1 -C buildroot ROOTFS_CPIO_COMPRESS_CMD="gzip --fast -c"
 
-rootfs-overlay/lib/firmware/jailhouse.bin: linux-4.4/vmlinux
-rootfs-overlay/lib/firmware/jailhouse.bin: ../jailhouse/include/jailhouse/config.h
-rootfs-overlay/lib/firmware/jailhouse.bin: $(addprefix ../jailhouse/,$(shell cd ../jailhouse && git ls-files))
+rootfs-overlay/lib/firmware/jailhouse.bin: ../jailhouse/hypervisor/jailhouse.bin
        $(MAKE) -C ../jailhouse -j$(NPROC) install KDIR=$(CURDIR)/linux-4.4 ARCH=arm64 DESTDIR=$(CURDIR)/rootfs-overlay  prefix=/usr
        mkdir -p rootfs-overlay/jailhouse/configs/ rootfs-overlay/jailhouse/demos/
 #      cp ../jailhouse/inmates/demos/arm64/my-demo.bin rootfs-overlay/jailhouse/demos/
        cp ../jailhouse/configs/arm64/jetson-tx2.cell rootfs-overlay/jailhouse/configs/
        cp ../jailhouse/configs/arm64/jetson-tx2-demo.cell rootfs-overlay/jailhouse/configs/
 
+../jailhouse/hypervisor/jailhouse.bin: ../jailhouse/include/jailhouse/config.h
+../jailhouse/hypervisor/jailhouse.bin: linux-4.4/vmlinux
+../jailhouse/hypervisor/jailhouse.bin: $(addprefix ../jailhouse/,$(shell cd ../jailhouse && git ls-files))
+       $(MAKE) -C ../jailhouse -j$(NPROC) KDIR=$(CURDIR)/linux-4.4 ARCH=arm64 prefix=/usr
+
 ../jailhouse/include/jailhouse/config.h: Makefile
        rm -f $@.tmp
        echo '#define CONFIG_TRACE_ERROR             1' >> $@.tmp