Reset phy in u-boot, use initrd for target, and support ro mount of the sd cardHEADmaster

7 files changed, 40 insertions, 18 deletions

diff --git a/fpga/ebaz4205/src/bootscript b/fpga/ebaz4205/src/bootscript
index d6110d5..a528892 100644
--- a/fpga/ebaz4205/src/bootscript
+++ b/fpga/ebaz4205/src/bootscript
@@ -1,13 +1,9 @@
-#setenv bootargs earlyprintk console=ttyPS0,115200 ip=dhcp nfsroot=10.16.64.32:/export/roots/scope,nfsvers=3,tcp rw panic=30
-#tftpboot ${kernel_load_address} /pxe/scope/uImage
-#tftpboot ${ramdisk_load_address} /pxe/scope/nowt.cpio.uboot
-#tftpboot ${devicetree_load_address} /pxe/scope/ebaz4205-zynq7.dtb 
-setenv bootargs root=/dev/mmcblk0p3 ro rootwait  earlyprintk console=ttyPS0,115200 systemd.volatile=overlay panic=30 
-#setenv bootargs root=/dev/mmcblk0p3 ro rootwait 
-#setenv bootargs root=/dev/mmcblk0p3 ro rootwait systemd.volatile=state
-setenv kernel_image vmlinuz 
-setenv ramdisk_image initrd.img
-run mmc_loadkernel
-run mmc_loadramdisk
-run mmc_loaddtb
-bootm ${kernel_load_address} ${ramdisk_load_address} ${devicetree_load_address}
+if false; then
+	setenv bootargs earlyprintk console=ttyPS0,115200 ip=dhcp nfsroot=10.16.64.32:/export/roots/scope,nfsvers=3,tcp rw panic=30
+	tftpboot ${kernel_load_address} /pxe/scope/uImage
+	tftpboot ${ramdisk_load_address} /pxe/scope/nowt.cpio.uboot
+	tftpboot ${devicetree_load_address} /pxe/scope/ebaz4205-zynq7.dtb 
+	bootm ${kernel_load_address} ${ramdisk_load_address} ${devicetree_load_address}
+else
+	run defaultboot
+fi
diff --git a/fpga/ebaz4205/src/fs/boot/Makefile b/fpga/ebaz4205/src/fs/boot/Makefile
new file mode 100644
index 0000000..ce1b042
--- /dev/null
+++ b/fpga/ebaz4205/src/fs/boot/Makefile
@@ -0,0 +1,12 @@
+default: uboot/vmlinuz uboot/initrd.img
+
+uboot/vmlinuz: /vmlinuz
+	mkimage -A ARM -O Linux -T Kernel -C none -d $< $@
+
+uboot/initrd.img: /initrd.img
+	mkimage  -A ARM -O Linux -T RAMDisk -C none -d $< $@
+
+/initrd.img: /lib/modules/stamp
+	dracut --force
+
+
diff --git a/fpga/ebaz4205/src/fs/etc/dracut.conf.d/compress.conf b/fpga/ebaz4205/src/fs/etc/dracut.conf.d/compress.conf
new file mode 100644
index 0000000..45d77ab
--- /dev/null
+++ b/fpga/ebaz4205/src/fs/etc/dracut.conf.d/compress.conf
@@ -0,0 +1 @@
+compress="gzip"
diff --git a/fpga/ebaz4205/src/fs/etc/dracut.conf.d/omit.conf b/fpga/ebaz4205/src/fs/etc/dracut.conf.d/omit.conf
new file mode 100644
index 0000000..9f9e855
--- /dev/null
+++ b/fpga/ebaz4205/src/fs/etc/dracut.conf.d/omit.conf
@@ -0,0 +1 @@
+omit_dracutmodules+=" lvm kernel-modules dm crypt "
diff --git a/fpga/ebaz4205/src/fs/etc/dracut.conf.d/overlay.conf b/fpga/ebaz4205/src/fs/etc/dracut.conf.d/overlay.conf
new file mode 100644
index 0000000..fcc7c42
--- /dev/null
+++ b/fpga/ebaz4205/src/fs/etc/dracut.conf.d/overlay.conf
@@ -0,0 +1 @@
+add_dracutmodules+=" overlayfs "
diff --git a/fpga/ebaz4205/src/fs/usr/local/bin/mutable-chroot b/fpga/ebaz4205/src/fs/usr/local/bin/mutable-chroot
new file mode 100755
index 0000000..2e9fd65
--- /dev/null
+++ b/fpga/ebaz4205/src/fs/usr/local/bin/mutable-chroot
@@ -0,0 +1,9 @@
+#!/bin/bash
+mount -w -n -o remount /live/image
+mount -w -n -o remount /boot
+mount -w -n -o remount /boot/uboot
+for i in dev dev/pts proc sys boot boot/uboot; do
+mount --bind /$i /live/image/$i
+done
+chroot /live/image su -
+
diff --git a/fpga/ebaz4205/src/uEnv.txt b/fpga/ebaz4205/src/uEnv.txt
index 0319721..21c5554 100644
--- a/fpga/ebaz4205/src/uEnv.txt
+++ b/fpga/ebaz4205/src/uEnv.txt
@@ -1,15 +1,17 @@
 machine_name=ebaz4205-zynq7
-kernel_image=uImage
+kernel_image=vmlinuz
 setmac=load mmc 0 ${ramdisk_load_address} mac.txt && env import -t ${ramdisk_load_address} ${filesize}
 loadkernel=load mmc 0 ${kernel_load_address} ${kernel_image}
 devicetree_image=ebaz4205-zynq7.dtb
 loaddtb=load mmc 0 ${devicetree_load_address} ${devicetree_image}
-ramdisk_image=nowt.cpio.uboot
+ramdisk_image=initrd.img
 loadramdisk=load mmc 0 ${ramdisk_load_address} ${ramdisk_image}
 notbootargs=earlyprintk console=ttyPS0,115200 root=/dev/mmcblk0p3 ro rootwait
-bootargs=root=/dev/mmcblk0p3 ro rootwait
+#bootargs=root=/dev/mmcblk0p3 ro rootwait earlyprintk console=ttyPS0,115200 systemd.volatile=overlay panic=30 
+bootargs=root=/dev/mmcblk0p3 ro rootwait earlyprintk console=ttyPS0,115200 rootovl panic=30 
 bitstream_image=hp_lcd_driver.bin
 bitstream_type=load
 fpga_config=fpga ${bitstream_type} 0 ${bitstream_load_address} ${filesize}
-notsdboot=if mmcinfo; then run leds_bootstate_0;run uenvboot;echo Setting MAC address...; run setmac ; echo Copying Linux from SD to RAM...; run mmc_loadkernel && run mmc_loaddtb && run mmc_loadramdisk && run mmc_loadfpga && run leds_bootstate_1; echo Configure FPGA...; run fpga_config && run leds_bootstate_2; echo Handoff to Linux kernel...;bootm ${kernel_load_address} ${ramdisk_load_address} ${devicetree_load_address}; fi
-sdboot=if mmcinfo; then run leds_bootstate_0;run uenvboot;echo Setting MAC address...; run setmac ; echo Copying Linux from SD to RAM...; run mmc_loadfpga && run fpga_config && dhcp && tftpboot 0x4000000 /pxe/scope/bootscript && source 0x4000000; fi
+defaultboot=echo Copying Linux from SD to RAM...; run mmc_loadkernel && run mmc_loaddtb && run mmc_loadramdisk && run mmc_loadfpga && run leds_bootstate_2; echo Handoff to Linux kernel...;bootm ${kernel_load_address} ${ramdisk_load_address} ${devicetree_load_address}
+fallbackboot=if mmcinfo; then run leds_bootstate_0;run uenvboot;echo Setting MAC address...; run setmac ; echo Copying Linux from SD to RAM...; run mmc_loadfpga && run fpga_config; run defaultboot; fi
+sdboot=if mmcinfo; then run leds_bootstate_0;run uenvboot;echo Setting MAC address...; run setmac ; echo Copying Linux from SD to RAM...; run mmc_loadfpga && run fpga_config; dhcp; if dhcp; then tftpboot 0x4000000 /pxe/scope/bootscript && source 0x4000000; else run defaultboot; fi; fi