update to 2025.10 with 2.14 ATF

This commit is contained in:
Kabbone 2025-11-30 08:55:03 +01:00
parent b171f1e707
commit 096422fc70
6 changed files with 18 additions and 44 deletions

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -2,37 +2,42 @@
# Maintainer: Kevin Mihelich <kevin@archlinuxarm.org> # Maintainer: Kevin Mihelich <kevin@archlinuxarm.org>
pkgname=uboot-rock64 pkgname=uboot-rock64
pkgver=2020.07 pkgver=2025.10
pkgrel=1 pkgrel=1
pkgdesc="U-Boot for Rock64" pkgdesc="U-Boot for Rock64"
arch=('aarch64') arch=('aarch64')
url='http://www.denx.de/wiki/U-Boot/WebHome' url='http://www.denx.de/wiki/U-Boot/WebHome'
license=('GPL') license=('GPL')
backup=('boot/boot.txt' 'boot/boot.scr') backup=('boot/boot.txt' 'boot/boot.scr')
makedepends=('bc' 'git' 'python' 'swig' 'dtc' 'uboot-tools') makedepends=('bc' 'git' 'python' 'python-setuptools' 'python-pyelftools' 'swig' 'dtc' 'uboot-tools')
install=${pkgname}.install install=${pkgname}.install
source=("ftp://ftp.denx.de/pub/u-boot/u-boot-${pkgver}.tar.bz2" source=("ftp://ftp.denx.de/pub/u-boot/u-boot-${pkgver}.tar.bz2"
"https://github.com/ARM-software/arm-trusted-firmware/archive/v2.3.tar.gz" "https://github.com/ARM-software/arm-trusted-firmware/archive/v2.14.0.tar.gz"
'boot.txt' 'boot.txt'
'mkscr') 'mkscr')
md5sums=('86e51eeccd15e658ad1df943a0edf622' sha256sums=('b4f032848e56cc8f213ad59f9132c084dbbb632bc29176d024e58220e0efdf4a'
'06ad72bdf63b922a3f3865d81f5d9ad2' 'd44936677a63c5216ffc151ae7711d458c992ef159a9df271fd9429f0a1cb5e5'
'a4f9a9f05a4e41f54b60a51318ffca36' 'd0de25353f38dd633b63d7f547f0eaffe967bcd5d8c43b17897fb1c3d1f918fa'
'021623a04afd29ac3f368977140cfbfd') 'a4fc8b6b92bc364d6542670d294aa618a8501fb8729f415cc0a3eed776ef0c8e')
#'a0798acdac86101019f2e53c80846950c7a658314381c48c39a86f6b9fc70173'
prepare() { prepare() {
cd ${srcdir}/arm-trusted-firmware-2.3 export CC=cc
make PLAT=rk3328 all export LD=cc
export AS=cc
export OC=objcopy
export OD=objdump
cd ${srcdir}/arm-trusted-firmware-2.14.0
make PLAT=rk3328 bl31
cd ${srcdir}/u-boot-${pkgver} cd ${srcdir}/u-boot-${pkgver}
cp ../arm-trusted-firmware-2.3/build/rk3328/release/bl31/bl31.elf ./bl31.elf cp ../arm-trusted-firmware-2.14.0/build/rk3328/release/bl31/bl31.elf ./bl31.elf
export BL31=./bl31.elf
sed -i 's/800/600/g' arch/arm/dts/rk3328-sdram-lpddr3-1600.dtsi sed -i 's/800/600/g' arch/arm/dts/rk3328-sdram-lpddr3-1600.dtsi
cd ${srcdir}/u-boot-${pkgver}/configs cd ${srcdir}/u-boot-${pkgver}/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 echo 'CONFIG_IDENT_STRING=" Arch Linux ARM"' >> rock64-rk3328_defconfig
} }

View File

@ -1,22 +0,0 @@
# After modifying, run ./mkscr
# 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=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
if load ${devtype} ${devnum}:${bootpart} ${fdt_addr_r} /boot/dtbs/${fdtfile}; then
fdt addr ${fdt_addr_r}
fdt resize
fdt set /ethernet@ff540000 local-mac-address "[${macaddr}]"
if load ${devtype} ${devnum}:${bootpart} ${ramdisk_addr_r} /boot/initramfs-linux.img; then
booti ${kernel_addr_r} ${ramdisk_addr_r}:${filesize} ${fdt_addr_r};
else
booti ${kernel_addr_r} - ${fdt_addr_r};
fi;
fi;
fi

View File

@ -1,9 +0,0 @@
#!/bin/bash
if [[ ! -x /usr/bin/mkimage ]]; then
echo "mkimage not found. Please install uboot-tools:"
echo " pacman -S uboot-tools"
exit 1
fi
mkimage -A arm -O linux -T script -C none -n "U-Boot boot script" -d boot.txt boot.scr