Make it boot for me

Not finished - it still crashes

diff --git a/.novaboot b/.novaboot
index 2a32e17ef638e5014613da9b3e9145b3e7cc3028..dd16e7d421555dbe61de3962b2cfff47e2bdd3e7 100644 (file)
--- 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 0ad680e9a6e66f8c3e838de76c5932554204b25a..78764e0cf052c99522cda721f4e1aad117fedce8 100755 (executable)
--- 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 330e536136d8a806fd626c61dcabf2755fd89bc2..affe20c35e481a019013da53a1db273ad3ddbf9f 100644 (file)
--- 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";
                };
        };