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

1 files changed, 27 insertions, 22 deletions

diff --git a/fpga/ebaz4205/Makefile b/fpga/ebaz4205/Makefile
index 73a6d0c..5af6da4 100644
--- a/fpga/ebaz4205/Makefile
+++ b/fpga/ebaz4205/Makefile
@@ -2,14 +2,15 @@ CCC=CROSS_COMPILE=arm-none-eabi-
 
 UB=u-boot
 UBO=${UB}/spl/boot.bin ${UB}/u-boot.img
-LO=build/uImage
-#LD=linux-4.19
-#LD=linux-6.16.4
+LO=build/vmlinuz-fallback
 LV=6.18.5
+LP=${LV}-scope
 LD=linux-${LV}
 MD=${PWD}/modules
 FD=../hp_lcd_driver
 
+SD=${PWD}/staged
+
 DP=${DIP}:/boot/uboot/
 DIP=10.16.66.71
 
@@ -20,30 +21,29 @@ DTB=build/ebaz4205-zynq7.dtb
 BS=build/bootscript
 
 
-OUTS=${UBO} ${LO} ${RDO} src/uEnv.txt ${DTB}  ${BS} #${VIVO}
+UBOUTS=${UBO} ${RDO} src/uEnv.txt ${DTB}  ${BS} ${VIVO} ${L}
 
-default:staged/stamp
+default:${SD}/stamp ${BS}
 
-staged/stamp:${OUTS}
-	mkdir -p staged
-	for i in ${OUTS}; do install -m 644 $$i staged; done
+${SD}/stamp:${UBOUTS} ${SD}/lib/modules/stamp ${LD}/arch/arm/boot/zImage  
+	mkdir -p ${SD}/boot/uboot
+	install -m 644 ${LD}/arch/arm/boot/zImage ${SD}/boot/vmlinuz-${LP}
+	install -m 644 ${LD}/.config ${SD}/boot/config-${LP}
+	tar cfC - src/fs . | tar xvfpBC - ${SD}
+	ln -sf boot/vmlinuz-${LP} ${SD}/vmlinuz
+	ln -sf boot/initrd.img-${LP} ${SD}/initrd.img
+	for i in ${UBOUTS}; do install -m 644 $$i ${SD}/boot/uboot; done
 	touch $@
 
 
-sync: staged/stamp ${LD}/arch/arm/boot/zImage
-	#rsync -varP staged/ ${DP}
-	scp ${LD}/arch/arm/boot/zImage ${DIP}:/boot/vmlinuz-${LV}-scope
-	rsync -varP modules/lib/modules/ ${DIP}:/lib/modules/
-	#ssh -n ${DIP} "update-initramfs -k ${LV}-scope -u"
-	ssh -n ${DIP} "dracut --kver ${LV}-scope --force"
+sync: staged/stamp 
+	tar cfC - staged boot etc initrd.img  lib/modules usr/local/bin vmlinuz | ssh ${DIP} "tar xfpBCv - /live/image"
+	#ssh -n ${DIP} "chroot /live/image dracut --kver ${LV}-scope --force"
 	#ssh -n ${DIP} "reboot" &
 
 ${BS}:src/bootscript
 	mkimage -A arm -O linux -T script -C none -a 0 -e 0 -d $< $@
 
-
-
-
 ${RDO}:build/nowt.cpio
 	mkimage  -A ARM -O Linux -T RAMDisk -C none -d $< $@
 
@@ -51,9 +51,6 @@ build/nowt.cpio:
 	mkdir -p nowt
 	cpio -Hnewc -o < /dev/null > $@ || /bin/rm -f $@
 
-	
-
-
 ${VIVO}: 
 	(cd ${FD} && ${MAKE})
 
@@ -67,7 +64,11 @@ ${LO}:${LD}/arch/arm/boot/zImage
 ${LD}/arch/arm/boot/zImage:${LD}/Makefile ${LD}/.config
 	LOCALVERSION="" ${MAKE} -C ${LD} ${CCC} ARCH=arm -j 32
 	mkdir -p ${MD}
-	LOCALVERSION="" ${MAKE} -C ${LD} ${CCC} ARCH=arm INSTALL_MOD_PATH=${MD} modules_install
+
+${SD}/lib/modules/stamp: ${LD}/Makefile ${LD}/.config
+	mkdir -p ${SD}
+	LOCALVERSION="" ${MAKE} -C ${LD} ${CCC} ARCH=arm INSTALL_MOD_PATH=${SD} modules_install
+	touch $@
 
 
 #${LD}/.config:src/linux-config ${LD}/Makefile
@@ -88,7 +89,7 @@ build/${LD}.tar.xz:
 	wget -O $@ https://www.kernel.org/pub/linux/kernel/v6.x/${LD}.tar.xz
 
 
-${UBO}:${UB}/.config #dummy
+${UBO}:${UB}/.config  dummy
 	${MAKE} ${CCC} -C ${UB} HOSTCFLAGS+=-fcommon
 
 ${UB}/.config:${UB}/config.mk
@@ -96,6 +97,10 @@ ${UB}/.config:${UB}/config.mk
 
 ${UB}/config.mk:
 	git clone --depth 1 -b v2019.07-ebaz4205 https://github.com/embed-me/u-boot.git ${UB}
+	ln -s ../../${UB}-pq ${UB}/.git/patches
+	echo -n > ${UB}-pq/v2019.07-ebaz4205/status
+	(cd ${UB} && guilt push -a)
+	touch $@
 
 
 dummy: