Update PREM test and main Makefile

[hercules2020/jailhouse-build.git] / build / Makefile

diff --git a/build/Makefile b/build/Makefile
index 5922f4a1774b0cd0eabf7e8adb881201facc9784..192c86a1a2f04999ae0d5d55dfdf374c2057bd95 100644 (file)
--- a/build/Makefile
+++ b/build/Makefile
@@ -9,8 +9,12 @@ image.fit: buildroot/images/rootfs.cpio.uboot linux-4.4/vmlinux
 buildroot/images/rootfs.cpio.uboot: ./buildroot/.config
 buildroot/images/rootfs.cpio.uboot: rootfs-overlay/lib/firmware/jailhouse.bin rootfs-overlay/lib/modules/4.4.38+/modules.dep
 buildroot/images/rootfs.cpio.uboot: $(shell find rootfs-overlay)
+buildroot/images/rootfs.cpio.uboot: rootfs-overlay/bin/prem-test
        $(MAKE) -j1 -C buildroot ROOTFS_CPIO_COMPRESS_CMD="gzip --fast -c"
 
+rootfs-overlay/bin/prem-test: ../test/prem-test
+       cp $< $@
+
 rootfs-overlay/lib/firmware/jailhouse.bin: ../jailhouse/hypervisor/jailhouse.bin
 rootfs-overlay/lib/firmware/jailhouse.bin: $(wildcard ../jailhouse/configs/arm64/*.cell)
        $(MAKE) -C ../jailhouse -j$(NPROC) install KDIR=$(CURDIR)/linux-4.4 ARCH=arm64 DESTDIR=$(CURDIR)/rootfs-overlay  prefix=/usr
@@ -19,6 +23,8 @@ rootfs-overlay/lib/firmware/jailhouse.bin: $(wildcard ../jailhouse/configs/arm64
        cp ../jailhouse/configs/arm64/jetson-tx2.cell rootfs-overlay/jailhouse/configs/
        cp ../jailhouse/configs/arm64/jetson-tx2-demo.cell rootfs-overlay/jailhouse/configs/
 
+jailhouse: ../jailhouse/hypervisor/jailhouse.bin
+
 ../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))
@@ -37,5 +43,16 @@ rootfs-overlay/lib/modules/4.4.38+/modules.dep: linux-4.4/vmlinux
 linux-4.4/vmlinux:
        $(MAKE) -C $(@D) -j$(NPROC)
 
+.PHONY: FORCE
+
+../test/prem-test: FORCE
+       $(MAKE) -C ../test
+
 clean:
        rm buildroot/images/rootfs.cpio.uboot linux-4.4/vmlinux
+
+deploy: ../test/prem-test
+#deploy: ../jailhouse/hypervisor/jailhouse.bin
+       scp ../test/prem-test tx2:/bin
+#      scp ../jailhouse/hypervisor/jailhouse.bin tx2:/lib/firmware
+#      ssh tx2 'sh /etc/init.d/S20jailhouse.sh stop && sh /etc/init.d/S20jailhouse.sh start'