uboot-rock64/PKGBUILD

@@ -5,7 +5,7 @@ buildarch=8
 
 pkgname=uboot-rock64
 pkgver=2020.01
-pkgrel=3
+pkgrel=1
 pkgdesc="U-Boot for Rock64"
 arch=('aarch64')
 url='http://www.denx.de/wiki/U-Boot/WebHome'
@@ -18,32 +18,24 @@ source=("ftp://ftp.denx.de/pub/u-boot/u-boot-${pkgver/rc/-rc}.tar.bz2"
         "git+https://github.com/rockchip-linux/rkbin.git#commit=$_commit_rkbin"
         'rk3328trust.ini'
         'boot.txt'
-        'mkscr'
-        'btrfs_extentio.patch')
+        'mkscr')
 md5sums=('b6b2e0787b6874e6b57da0a065a84f5a'
          'SKIP'
          '48946b910716b90d81f47caafb752fef'
-         '5f1089c471f39b303bccbb9e1fc196f7'
-         '021623a04afd29ac3f368977140cfbfd'
-         '51ff4b7c8cf8833df2f208fac7fafde5')
-
-prepare() {
-  cd ${srcdir}/u-boot-${pkgver/rc/-rc}/configs
-  echo 'CONFIG_CMD_BTRFS=y' >> rock64-rk3328_defconfig
-  echo 'CONFIG_FS_BTRFS=y' >> rock64-rk3328_defconfig
-  echo 'CONFIG_NETCONSOLE=y' >> rock64-rk3328_defconfig
-  echo 'CONFIG_IDENT_STRING=" Arch Linux ARM"' >> rock64-rk3328_defconfig
-  cd ${srcdir}/u-boot-${pkgver/rc/-rc}/fs/btrfs
-  patch --forward --strip=3 --input="${srcdir}/btrfs_extentio.patch"
-}
+         'c926f318d8fa7a5c89108331cbd3f8e2'
+         '021623a04afd29ac3f368977140cfbfd')
 
 build() {
-  cd ${srcdir}/u-boot-${pkgver/rc/-rc}
+  cd u-boot-${pkgver/rc/-rc}
 
   unset CLFAGS CXXFLAGS CPPFLAGS LDFLAGS
 
   make distclean
-  make rock64-rk3328_defconfig
+  make evb-rk3328_defconfig
+  echo 'CONFIG_CMD_BTRFS=y' >> .config
+  echo 'CONFIG_FS_BTRFS=y' >> .config
+  echo 'CONFIG_NETCONSOLE=y' >> .config
+  echo 'CONFIG_IDENT_STRING=" Arch Linux ARM"' >> .config
   make -j4 EXTRAVERSION=-${pkgrel}
 }
 

uboot-rock64/boot.txt

@@ -3,8 +3,8 @@
 # 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=PARTUUID=${uuid} rw rootwait earlycon=uart8250,mmio32,0xff130000
 setenv fdtfile rockchip/rk3328-rock64.dtb
 
 if load ${devtype} ${devnum}:${bootpart} ${kernel_addr_r} /boot/Image; then