ayufan: dev: fix SPI flash for rk3399

ayufan-rock64 · Nov 19, 2023 · e1ff9e1 · e1ff9e1
1 parent 2436198
commit e1ff9e1
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/dev-ayufan/root/usr/local/lib/u-boot-rockchip/loader-common b/dev-ayufan/root/usr/local/lib/u-boot-rockchip/loader-common
@@ -44,21 +44,21 @@ case "$PACKAGE_NAME" in
     *-rockpro64-*)
         SD_LOADER=/usr/lib/u-boot-rockpro64/rksd_loader.img
         SPI_LOADER=/usr/lib/u-boot-rockpro64/rkspi_loader.img
-        SPI_OFFSET=$((64*512))
+        SPI_OFFSET=0
         BOARD=pine64,rockpro64
         ;;
 
     *-pinebookpro-*)
         SD_LOADER=/usr/lib/u-boot-pinebookpro/rksd_loader.img
         SPI_LOADER=/usr/lib/u-boot-pinebookpro/rkspi_loader.img
-        SPI_OFFSET=$((64*512))
+        SPI_OFFSET=0
         BOARD=pine64,pinebookpro
         ;;
 
     *-rockpi4b-*)
         SD_LOADER=/usr/lib/u-boot-rockpi4b/rksd_loader.img
         SPI_LOADER=/usr/lib/u-boot-rockpi4b/rkspi_loader.img
-        SPI_OFFSET=$((64*512))
+        SPI_OFFSET=0
         BOARD=radxa,rockpi4b
         ;;
 

diff --git a/dev-ayufan/root/usr/local/sbin/upgrade_bootloader.sh b/dev-ayufan/root/usr/local/sbin/upgrade_bootloader.sh
@@ -18,7 +18,7 @@ prompt() {
         methods[$cnt]="dd if=\"$SD_LOADER\" of=\"$MNT_DEV\" iflag=fullblock oflag=direct"
         cnt=$((cnt+1))
         echo "$cnt) Remove bootloader on $MNT_DEV"
-        methods[$cnt]="dd if=/dev/zero of=\"$MNT_DEV\" iflag=fullblock oflag=direct"
+        methods[$cnt]="dd if=/dev/zero of=\"$MNT_DEV\" bs=32768 iflag=fullblock oflag=direct || true"
         cnt=$((cnt+1))
         echo
     done < <(blkid /dev/disk/by-id/{ata,usb,mmc}-* -o device -t PARTLABEL="loader1")

diff --git a/dev.mk b/dev.mk
@@ -32,7 +32,7 @@ version: .scmversion
 
 deploy: u-boot-package
 	scp u-boot-$(BOARD_TARGET)-$(RELEASE_NAME).deb root@$(TARGET_HOST):
-	ssh root@$(TARGET_HOST) dpkg -i ./u-boot-$(BOARD_TARGET)-$(RELEASE_NAME).deb
-	#ssh root@$(TARGET_HOST) rock64_upgrade_bootloader.sh
+	ssh root@$(TARGET_HOST) apt install --reinstall ./u-boot-$(BOARD_TARGET)-$(RELEASE_NAME).deb
+	ssh root@$(TARGET_HOST) rock64_upgrade_bootloader.sh
 
 endif