From f3de96f1c85911c654b2dfca744dab5a6872263e Mon Sep 17 00:00:00 2001
From: Michal Sojka <michal.sojka@cvut.cz>
Date: Tue, 15 May 2018 01:10:37 +0200
Subject: [PATCH] Update Makefile to build everything

---
 .novaboot               |  2 +-
 build/.gitignore        | 12 +++++++++++-
 build/Makefile          | 31 ++++++++++++++++++++-----------
 build/buildroot/.config |  2 +-
 4 files changed, 33 insertions(+), 14 deletions(-)

diff --git a/.novaboot b/.novaboot
index b5b00da..75d1f28 100644
--- a/.novaboot
+++ b/.novaboot
@@ -1,4 +1,4 @@
 $targets{tx1} = '--ssh=tx1@rtime.felk.cvut.cz';
-$default_target = 'tx1';
+$targets{tx2} = '--ssh=tx2ms@rtime.felk.cvut.cz';
 
 1;
diff --git a/build/.gitignore b/build/.gitignore
index caf1209..fbc7fe7 100644
--- a/build/.gitignore
+++ b/build/.gitignore
@@ -1 +1,11 @@
-/jailhouse
+/display/
+/kernel-4.4/
+/nvgpu/
+/nvhost/
+/nvmap-t18x/
+/nvmap/
+/t18x/
+/rootfs-overlay/jailhouse/
+/rootfs-overlay/lib/firmware/jailhouse*.bin
+/rootfs-overlay/lib/modules/
+/rootfs-overlay/usr/
diff --git a/build/Makefile b/build/Makefile
index 67397d1..a6b0e52 100644
--- a/build/Makefile
+++ b/build/Makefile
@@ -1,20 +1,29 @@
-all: buildroot/images/rootfs.cpio.uboot
+all: buildroot/images/rootfs.cpio.uboot linux-4.4/vmlinux
 
-buildroot/images/rootfs.cpio.uboot: rootfs-overlay/lib/firmware/jailhouse.bin rootfs-overlay/lib/modules/3.10.96/kernel
+buildroot/images/rootfs.cpio.uboot: rootfs-overlay/lib/firmware/jailhouse.bin rootfs-overlay/lib/modules/4.4.38+/kernel
 	$(MAKE) -C buildroot
 
-rootfs-overlay/lib/firmware/jailhouse.bin: linux-3.10/vmlinux
+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))
-	$(MAKE) -C ../jailhouse install KDIR=$(CURDIR)/linux-3.10 ARCH=arm64 DESTDIR=$(CURDIR)/rootfs-overlay
-	cp ../jailhouse/inmates/demos/arm64/my-demo.bin $(CURDIR)/rootfs-overlay/jail/demos/
-	cp ../jailhouse/configs/jetson-tx1.cell $(CURDIR)/rootfs-overlay/jail/configs/
-	cp ../jailhouse/configs/jetson-tx1-demo.cell $(CURDIR)/rootfs-overlay/jail/configs/
+	$(MAKE) -C ../jailhouse install KDIR=$(CURDIR)/linux-4.4 ARCH=arm64 DESTDIR=$(CURDIR)/rootfs-overlay
+	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/
 
-rootfs-overlay/lib/modules/3.10.96/kernel:
-	$(MAKE) -C linux-3.10 modules_install INSTALL_MOD_PATH=$(CURDIR)/rootfs-overlay
+../jailhouse/include/jailhouse/config.h: Makefile
+	rm -f $@.tmp
+	echo '#define CONFIG_TRACE_ERROR             1' >> $@.tmp
+	echo '#define CONFIG_ARM_GIC_V2		     1'	>> $@.tmp
+	echo '#define CONFIG_MACH_JETSON_TX2	     1'	>> $@.tmp
+	mv $@.tmp $@
 
-linux-3.10/vmlinux:
+rootfs-overlay/lib/modules/4.4.38+/kernel: linux-4.4/vmlinux
+	$(MAKE) -C linux-4.4 modules_install INSTALL_MOD_PATH=$(CURDIR)/rootfs-overlay
+
+linux-4.4/vmlinux:
 	$(MAKE) -C $(@D)
 
 clean:
-	rm buildroot/images/rootfs.cpio.uboot
+	rm buildroot/images/rootfs.cpio.uboot linux-4.4/vmlinux
diff --git a/build/buildroot/.config b/build/buildroot/.config
index 0febd40..3e904bc 100644
--- a/build/buildroot/.config
+++ b/build/buildroot/.config
@@ -289,7 +289,7 @@ BR2_TARGET_GENERIC_GETTY_BAUDRATE="0"
 BR2_TARGET_GENERIC_GETTY_TERM="vt100"
 BR2_TARGET_GENERIC_GETTY_OPTIONS=""
 BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW=y
-BR2_SYSTEM_DHCP=""
+BR2_SYSTEM_DHCP="eth0"
 BR2_ENABLE_LOCALE_PURGE=y
 BR2_ENABLE_LOCALE_WHITELIST="C en_US"
 BR2_GENERATE_LOCALE=""
-- 
2.39.2