diff --git a/images/boot.scr b/images/boot.scr index 7bca81b..7d581c4 100644 Binary files a/images/boot.scr and b/images/boot.scr differ diff --git a/images/idbloader.img b/images/idbloader.img index 3a1db96..aa11cfe 100644 Binary files a/images/idbloader.img and b/images/idbloader.img differ diff --git a/images/u-boot-dtb.img b/images/u-boot-dtb.img new file mode 100644 index 0000000..e20a890 Binary files /dev/null and b/images/u-boot-dtb.img differ diff --git a/images/u-boot.img b/images/u-boot.img index b4bf933..e20a890 100644 Binary files a/images/u-boot.img and b/images/u-boot.img differ diff --git a/packages/uboot-rock64-2020.01-1-aarch64.pkg.tar.xz b/packages/uboot-rock64-2020.01-1-aarch64.pkg.tar.xz index 919628c..03ce2b8 100644 Binary files a/packages/uboot-rock64-2020.01-1-aarch64.pkg.tar.xz and b/packages/uboot-rock64-2020.01-1-aarch64.pkg.tar.xz differ diff --git a/uboot-rock64/PKGBUILD b/uboot-rock64/PKGBUILD index b949f0e..7340b8e 100644 --- a/uboot-rock64/PKGBUILD +++ b/uboot-rock64/PKGBUILD @@ -22,7 +22,7 @@ source=("ftp://ftp.denx.de/pub/u-boot/u-boot-${pkgver/rc/-rc}.tar.bz2" md5sums=('b6b2e0787b6874e6b57da0a065a84f5a' 'SKIP' '48946b910716b90d81f47caafb752fef' - 'c926f318d8fa7a5c89108331cbd3f8e2' + '3f31f9e58b2f6037fa92998b3323304e' '021623a04afd29ac3f368977140cfbfd') build() { @@ -31,7 +31,7 @@ build() { unset CLFAGS CXXFLAGS CPPFLAGS LDFLAGS make distclean - make evb-rk3328_defconfig + make rock64-rk3328_defconfig echo 'CONFIG_CMD_BTRFS=y' >> .config echo 'CONFIG_FS_BTRFS=y' >> .config echo 'CONFIG_NETCONSOLE=y' >> .config diff --git a/uboot-rock64/boot.txt b/uboot-rock64/boot.txt index f50f6c5..4630eca 100644 --- a/uboot-rock64/boot.txt +++ b/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=PARTUUID=${uuid} rw rootwait earlycon=uart8250,mmio32,0xff130000 +#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 setenv fdtfile rockchip/rk3328-rock64.dtb if load ${devtype} ${devnum}:${bootpart} ${kernel_addr_r} /boot/Image; then