put compiled files in place, change boot.txt to default

firmwares/README.md

@@ -1,7 +0,0 @@
-# H1 How to build your own idbloader.img file
-
-```
-$ mkimage -n rk3328 -T rksd -d rk3328_ddr_333MHz_v1.13.bin idbloader.img
-$ cat rk3328_miniloader_v2.46.bin >> idbloader.img
-# dd if=idbloader.img of=/dev/sdx seek=64 conv=notrunc
-```

images/boot.txt

@@ -3,8 +3,9 @@
 # MAC address (use spaces instead of colons)
 setenv macaddr da 19 c8 7a 6d f4
 
-#part uuid ${devtype} ${devnum}:${bootpart} uuid
-setenv bootargs console=ttyS2,1500000 root=LABEL=ROOTFS rootfstype=btrfs rootflags=subvol=@ rw rootwait earlycon=uart8250,mmio32,0xff130000 audit=0
+part uuid ${devtype} ${devnum}:${bootpart} uuid
+setenv bootargs console=ttyS2,1500000 root=UUID=${uuid} rw rootwait earlycon=uart8250,mmio32,0xff130000 audit=0
+#setenv bootargs console=ttyS2,1500000 root=LABEL=ROOTFS rootfstype=btrfs rootflags=subvol=@ rw rootwait earlycon=uart8250,mmio32,0xff130000 audit=0
 setenv fdtfile rockchip/rk3328-rock64.dtb
 
 if load ${devtype} ${devnum}:${bootpart} ${kernel_addr_r} /boot/Image; then

uboot-rock64/PKGBUILD

@@ -3,7 +3,7 @@
 
 pkgname=uboot-rock64
 pkgver=2020.04
-pkgrel=1
+pkgrel=2
 pkgdesc="U-Boot for Rock64"
 arch=('aarch64')
 url='http://www.denx.de/wiki/U-Boot/WebHome'
@@ -18,7 +18,7 @@ source=("ftp://ftp.denx.de/pub/u-boot/u-boot-${pkgver/rc/-rc}-rc5.tar.bz2"
         'mkscr')
 md5sums=('86f167cfe3a840ac47ddba868d6f1576'
          'SKIP'
-         '5f1089c471f39b303bccbb9e1fc196f7'
+         'a4f9a9f05a4e41f54b60a51318ffca36'
          '021623a04afd29ac3f368977140cfbfd')
 
 prepare() {
@@ -27,7 +27,8 @@ prepare() {
   cp ../rkbin/bin/rk33/rk322xh_bl31_v1.43.elf ./bl31.elf
   cp ../rkbin/bin/rk33/rk322xh_bl32_v1.54.bin ./bl32.bin
 
-  sed -i 's/lpddr3-1600/lpddr3-666/g' arch/arm/dts/rk3328-rock64-u-boot.dtsi
+#  sed -i 's/lpddr3-1600/lpddr3-666/g' arch/arm/dts/rk3328-rock64-u-boot.dtsi
+  sed -i 's/800/600/g' arch/arm/dts/rk3328-sdram-lpddr3-1600.dtsi
 
   cd ${srcdir}/u-boot-${pkgver/rc/-rc}/configs
   echo 'CONFIG_CMD_BTRFS=y' >> rock64-rk3328_defconfig
@@ -45,9 +46,9 @@ build() {
   unset CLFAGS CXXFLAGS CPPFLAGS LDFLAGS
 
 #  make distclean
-  make rock64-rk3328_defconfig
-  make -j4 EXTRAVERSION=-${pkgrel}
-  make -j4 EXTRAVERSION=-${pkgrel} u-boot.itb
+  make BL31=bl31.elf BL32=bl32.bin rock64-rk3328_defconfig
+  make BL31=bl31.elf BL32=bl32.bin -j4 EXTRAVERSION=-${pkgrel}
+  make BL31=bl31.elf BL32=bl32.bin -j4 EXTRAVERSION=-${pkgrel} u-boot.itb
 }
 
 package() {

uboot-rock64/boot.txt

@@ -3,8 +3,9 @@
 # MAC address (use spaces instead of colons)
 setenv macaddr da 19 c8 7a 6d f4
 
-#part uuid ${devtype} ${devnum}:${bootpart} uuid
-setenv bootargs console=ttyS2,1500000 root=LABEL=ROOTFS rootfstype=btrfs rootflags=subvol=@ rw rootwait earlycon=uart8250,mmio32,0xff130000 audit=0
+part uuid ${devtype} ${devnum}:${bootpart} uuid
+setenv bootargs console=ttyS2,1500000 root=UUID=${uuid} rw rootwait earlycon=uart8250,mmio32,0xff130000 audit=0
+#setenv bootargs console=ttyS2,1500000 root=LABEL=ROOTFS rootfstype=btrfs rootflags=subvol=@ rw rootwait earlycon=uart8250,mmio32,0xff130000 audit=0
 setenv fdtfile rockchip/rk3328-rock64.dtb
 
 if load ${devtype} ${devnum}:${bootpart} ${kernel_addr_r} /boot/Image; then

uboot-rock64/uboot-rock64.install

@@ -1,14 +1,14 @@
 flash_uboot() {
-  echo "A new U-Boot version needs to be flashed onto /dev/mmcblk0."
+  echo "A new U-Boot version needs to be flashed onto /dev/mmcblk1."
   echo "Do you want to do this now? [y|N]"
   read -r shouldwe
   if [[ $shouldwe =~ ^([yY][eE][sS]|[yY])$ ]]; then
-    dd if=/boot/rksd_loader.img of=/dev/mmcblk0 seek=64 conv=notrunc
-    dd if=/boot/u-boot.itb of=/dev/mmcblk0 seek=16384 conv=notrunc
+    dd if=/boot/rksd_loader.img of=/dev/mmcblk1 seek=64 conv=notrunc
+    dd if=/boot/u-boot.itb of=/dev/mmcblk1 seek=16384 conv=notrunc
   else
     echo "You can do this later by running:"
-    echo "# dd if=/boot/rksd_loader.img of=/dev/mmcblk0 seek=64 conv=notrunc"
-    echo "# dd if=/boot/u-boot.itb of=/dev/mmcblk0 seek=16384 conv=notrunc"
+    echo "# dd if=/boot/rksd_loader.img of=/dev/mmcblk1 seek=64 conv=notrunc"
+    echo "# dd if=/boot/u-boot.itb of=/dev/mmcblk1 seek=16384 conv=notrunc"
   fi
 }
 
@@ -22,3 +22,5 @@ post_install() {
 post_upgrade() {
   flash_uboot
 }
+
+##lsblk -dnpo name /dev/disk/by-partuuid/785dd377-de81-44f8-8cc9-0dcdc9a5c713