diff --git a/.github/workflows/quartz64.yml b/.github/workflows/quartz64.yml index 49aa85a11b..7125c52a9c 100644 --- a/.github/workflows/quartz64.yml +++ b/.github/workflows/quartz64.yml @@ -13,7 +13,7 @@ jobs: # https://github.com/actions/runner-images runs-on: ubuntu-22.04 env: - uboot_branch: 'v2022.07-dietpi' + uboot_version: '2023.10' CROSS_COMPILE: 'aarch64-linux-gnu-' ARCH: 'arm64' steps: @@ -26,11 +26,11 @@ jobs: run: | { python3 -m pip install --no-cache-dir -U pip setuptools wheel; python3 -m pip install --no-cache-dir -U pyelftools; } & { sudo apt-get -q update; sudo DEBIAN_FRONTEND=noninteractive apt-get --no-install-recommends -qq install make gcc libc6-dev flex bison gcc-aarch64-linux-gnu bc libssl-dev swig; } & - { curl -fO "https://gitlab.com/MichaIng/u-boot/-/archive/$uboot_branch/u-boot-$uboot_branch.tar.bz2"; tar xf "u-boot-$uboot_branch.tar.bz2"; rm "u-boot-$uboot_branch.tar.bz2"; } & + { curl -fLO "https://github.com/u-boot/u-boot/archive/v$uboot_version.tar.gz"; tar xf "v$uboot_version.tar.gz"; rm "v$uboot_version.tar.gz"; } & { curl -fO 'https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/snapshot/linux-rolling-stable.tar.gz'; tar xf linux-rolling-stable.tar.gz; rm linux-rolling-stable.tar.gz; } & wait - curl -sSfo "u-boot-$uboot_branch/u-boot-spl-ddr.bin" 'https://raw.githubusercontent.com/JeffyCN/mirrors/ddf03c1/bin/rk35/rk3568_ddr_1560MHz_v1.13.bin' & - curl -sSfo "u-boot-$uboot_branch/bl31.elf" 'https://raw.githubusercontent.com/JeffyCN/mirrors/6186deb/bin/rk35/rk3568_bl31_v1.28.elf' & + curl -sSfo "u-boot-$uboot_version/ddr.bin" 'https://raw.githubusercontent.com/JeffyCN/mirrors/ddf03c1/bin/rk35/rk3568_ddr_1560MHz_v1.13.bin' & + curl -sSfo "u-boot-$uboot_version/bl31.elf" 'https://raw.githubusercontent.com/JeffyCN/mirrors/6186deb/bin/rk35/rk3568_bl31_v1.28.elf' & curl -sSfo linux-rolling-stable/arch/arm64/configs/quartz64_defconfig "https://raw.githubusercontent.com/$GITHUB_REPOSITORY_OWNER/DietPi/$GITHUB_REF_NAME/.build/images/Quartz64/quartz64_defconfig" & rm -Rf firmware-quartz64a/DEBIAN firmware-quartz64a/boot/extlinux firmware-quartz64a/lib/firmware/brcm mkdir -p firmware-quartz64a/DEBIAN firmware-quartz64a/boot/extlinux firmware-quartz64a/lib/firmware/brcm @@ -41,19 +41,20 @@ jobs: wait - name: Build U-Boot run: | + export ROCKCHIP_TPL='ddr.bin' export BL31='bl31.elf' - cd "u-boot-$uboot_branch" + cd "u-boot-$uboot_version" make quartz64-a-rk3566_defconfig make -j$(nproc) mv u-boot-rockchip.bin ../firmware-quartz64a/boot/u-boot.bin make quartz64-b-rk3566_defconfig make -j$(nproc) mv u-boot-rockchip.bin ../firmware-quartz64b/boot/u-boot.bin - make soquartz-rk3566_defconfig + make soquartz-cm4-rk3566_defconfig make -j$(nproc) mv u-boot-rockchip.bin ../firmware-soquartz/boot/u-boot.bin cd .. - rm -R "u-boot-$uboot_branch" + rm -R "u-boot-$uboot_version" - name: Build Linux run: | cd linux-rolling-stable