From: Michal Sojka <michal.sojka@cvut.cz>
Date: Fri, 1 Jun 2018 13:53:14 +0000 (+0200)
Subject: Make it boot for me
X-Git-Url: https://rtime.felk.cvut.cz/gitweb/zynq/linux-build.git/commitdiff_plain/52a0465852c438c47c910affd8e2ac5045ab9b29

Make it boot for me

Not finished - it still crashes
---

diff --git a/.novaboot b/.novaboot
index 2a32e17..dd16e7d 100644
--- a/.novaboot
+++ b/.novaboot
@@ -8,7 +8,7 @@ $targets{microzed} = '
 $targets{microzed_local} = '
   --target=microzed
   --tftp
-  --uboot-init="set serverip $NB_MYIP"
+  --uboot-init="dhcp; set serverip $NB_MYIP"
   --netif=eth0
   --remote-cmd="sterm -s115200 -v /dev/ttyUSB0"
 ';
diff --git a/build/xlnx_4.9/boot-ram b/build/xlnx_4.9/boot-ram
index 0ad680e..78764e0 100755
--- a/build/xlnx_4.9/boot-ram
+++ b/build/xlnx_4.9/boot-ram
@@ -1,7 +1,5 @@
 #!/usr/bin/env novaboot
 
-uboot dhcp
-
 run make
-load image.ub console=ttyPS1,115200 earlyprintk root=/dev/mmcblk0p2 rootwait
+load image.ub console=ttyPS1,115200 earlyprintk
 UBOOT_CMD=bootm ${loadaddr}
diff --git a/build/xlnx_4.9/uboot-image.its b/build/xlnx_4.9/uboot-image.its
index 330e536..affe20c 100644
--- a/build/xlnx_4.9/uboot-image.its
+++ b/build/xlnx_4.9/uboot-image.its
@@ -39,19 +39,6 @@
 				algo = "sha1";
 			};
 		};
-		fpga@1 {
-			description = "FPGA bitstream";
-			data = /incbin/("../../fs-overlay/fpga.bit");
-			type = "fpga";
-			arch = "arm";
-			compression = "none";
-			hash@1 {
-				algo = "crc32";
-			};
-			hash@2 {
-				algo = "sha1";
-			};
-		};
 		fdt@1 {
 			description = "Flattened Device Tree blob";
 			data = /incbin/("./microzed.dtb");
@@ -73,7 +60,6 @@
 			description = "Boot Linux kernel with FDT blob";
 			kernel = "kernel@1";
 			ramdisk = "ramdisk@1";
-			fpga = "fpga@1";
 			fdt = "fdt@1";
 		};
 	};