diff --git a/lib.sh.in b/lib.sh.in index 3375e6c6f1..d7232c0114 100644 --- a/lib.sh.in +++ b/lib.sh.in @@ -298,6 +298,7 @@ set_target_arch_from_platform() { pinebookpro*) XBPS_TARGET_ARCH="aarch64";; pinephone*) XBPS_TARGET_ARCH="aarch64";; rock64*) XBPS_TARGET_ARCH="aarch64";; + rockpro64*) XBPS_TARGET_ARCH="aarch64";; *) die "$PROGNAME: Unable to compute target architecture from platform";; esac diff --git a/mkimage.sh.in b/mkimage.sh.in index 3ed2e92f96..98fe755e7a 100644 --- a/mkimage.sh.in +++ b/mkimage.sh.in @@ -117,14 +117,14 @@ PLATFORM="${PLATFORM%-PLATFORMFS*}" # Be absolutely certain the platform is supported before continuing case "$PLATFORM" in - bananapi|beaglebone|cubieboard2|cubietruck|odroid-c2|odroid-u2|rpi|rpi2|rpi3|rpi4|GCP|pinebookpro|pinephone|rock64|*-musl);; + bananapi|beaglebone|cubieboard2|cubietruck|odroid-c2|odroid-u2|rpi|rpi2|rpi3|rpi4|GCP|pinebookpro|pinephone|rock64|rockpro64|*-musl);; *) die "The $PLATFORM is not supported, exiting..." esac # Default for bigger boot partion on rk33xx devices since it needs to # fit at least 2 Kernels + initramfs case "$PLATFORM" in - pinebookpro*|rock64*) + pinebookpro*|rock64*|rockpro64*) : "${BOOT_FSSIZE:=256MiB}" ;; esac @@ -190,7 +190,7 @@ _EOF # root filesystem. This is the generally preferred disk # layout for new platforms. case "$PLATFORM" in - pinebookpro*|rock64*) + pinebookpro*|rock64*|rockpro64*) # rk33xx devices use GPT and need more space reserved sfdisk "$FILENAME" <<_EOF label: gpt @@ -318,6 +318,12 @@ _EOF run_cmd_chroot "${ROOTFS}" "/etc/kernel.d/post-install/60-extlinux" cleanup_chroot ;; +rockpro64*) + rk33xx_flash_uboot "${ROOTFS}/usr/lib/rockpro64-uboot" "$LOOPDEV" + # populate the extlinux.conf file + cat >"${ROOTFS}/etc/default/extlinux" <<_EOF + cleanup_chroot + ;; pinebookpro*) rk33xx_flash_uboot "${ROOTFS}/usr/lib/pinebookpro-uboot" "$LOOPDEV" run_cmd_chroot "${ROOTFS}" "xbps-reconfigure -f pinebookpro-kernel" diff --git a/mkplatformfs.sh.in b/mkplatformfs.sh.in index 78a9dee862..3b6eba1bf2 100644 --- a/mkplatformfs.sh.in +++ b/mkplatformfs.sh.in @@ -51,7 +51,7 @@ Usage: $PROGNAME [options] Supported platforms: i686, x86_64, GCP, bananapi, beaglebone, cubieboard2, cubietruck, odroid-c2, odroid-u2, rpi, rpi2 (armv7), rpi3 (aarch64), rpi4 (aarch64), ci20, - pinebookpro, pinephone, rock64 + pinebookpro, pinephone, rock64, rockpro64 Options -b Set an alternative base-system package (defaults to base-system) @@ -128,6 +128,7 @@ case "$PLATFORM" in pinebookpro*) PKGS="$BASEPKG ${PLATFORM%-*}-base" ;; pinephone*) PKGS="$BASEPKG ${PLATFORM%-*}-base" ;; rock64*) PKGS="$BASEPKG ${PLATFORM%-*}-base" ;; + rockpro64*) PKGS="$BASEPKG ${PLATFORM%-*}-base" ;; *) die "$PROGNAME: invalid platform!";; esac