Add rockpro64 to image builder
Based on @tiemenwerkman's work on https://github.com/void-linux/void-mklive/pull/221
This commit is contained in:
parent
f5bdce3736
commit
9027ab13cd
1
lib.sh
1
lib.sh
|
@ -297,6 +297,7 @@ set_target_arch_from_platform() {
|
||||||
pinebookpro*) XBPS_TARGET_ARCH="aarch64";;
|
pinebookpro*) XBPS_TARGET_ARCH="aarch64";;
|
||||||
pinephone*) XBPS_TARGET_ARCH="aarch64";;
|
pinephone*) XBPS_TARGET_ARCH="aarch64";;
|
||||||
rock64*) XBPS_TARGET_ARCH="aarch64";;
|
rock64*) XBPS_TARGET_ARCH="aarch64";;
|
||||||
|
rockpro64*) XBPS_TARGET_ARCH="aarch64";;
|
||||||
*) die "$PROGNAME: Unable to compute target architecture from platform";;
|
*) die "$PROGNAME: Unable to compute target architecture from platform";;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
|
|
22
mkimage.sh
22
mkimage.sh
|
@ -116,14 +116,14 @@ PLATFORM="${PLATFORM%-PLATFORMFS*}"
|
||||||
|
|
||||||
# Be absolutely certain the platform is supported before continuing
|
# Be absolutely certain the platform is supported before continuing
|
||||||
case "$PLATFORM" in
|
case "$PLATFORM" in
|
||||||
rpi-armv6l|rpi-armv7l|rpi-aarch64|GCP|pinebookpro|pinephone|rock64|*-musl);;
|
rpi-armv6l|rpi-armv7l|rpi-aarch64|GCP|pinebookpro|pinephone|rock64|rockpro64|*-musl);;
|
||||||
*) die "The $PLATFORM is not supported, exiting..."
|
*) die "The $PLATFORM is not supported, exiting..."
|
||||||
esac
|
esac
|
||||||
|
|
||||||
# Default for bigger boot partion on rk33xx devices since it needs to
|
# Default for bigger boot partion on rk33xx devices since it needs to
|
||||||
# fit at least 2 Kernels + initramfs
|
# fit at least 2 Kernels + initramfs
|
||||||
case "$PLATFORM" in
|
case "$PLATFORM" in
|
||||||
pinebookpro*|rock64*)
|
pinebookpro*|rock64*|rockpro64*)
|
||||||
: "${BOOT_FSSIZE:=256MiB}"
|
: "${BOOT_FSSIZE:=256MiB}"
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
@ -176,7 +176,7 @@ fi
|
||||||
# root filesystem. This is the generally preferred disk
|
# root filesystem. This is the generally preferred disk
|
||||||
# layout for new platforms.
|
# layout for new platforms.
|
||||||
case "$PLATFORM" in
|
case "$PLATFORM" in
|
||||||
pinebookpro*|rock64*)
|
pinebookpro*|rock64*|rockpro64*)
|
||||||
# rk33xx devices use GPT and need more space reserved
|
# rk33xx devices use GPT and need more space reserved
|
||||||
sfdisk "$FILENAME" <<_EOF
|
sfdisk "$FILENAME" <<_EOF
|
||||||
label: gpt
|
label: gpt
|
||||||
|
@ -274,6 +274,22 @@ CMDLINE="panic=10 coherent_pool=1M console=ttyS2,1500000 root=UUID=${ROOT_UUID}
|
||||||
USE_DEVICETREEDIR="yes"
|
USE_DEVICETREEDIR="yes"
|
||||||
# relative dtb path supplied to FDT line, as long as above is unset
|
# relative dtb path supplied to FDT line, as long as above is unset
|
||||||
DTBPATH=""
|
DTBPATH=""
|
||||||
|
_EOF
|
||||||
|
mkdir -p "${ROOTFS}/boot/extlinux"
|
||||||
|
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
|
||||||
|
TIMEOUT=10
|
||||||
|
# Defaults to current kernel cmdline if left empty
|
||||||
|
CMDLINE="panic=10 coherent_pool=1M console=ttyS2,115200 root=UUID=${ROOT_UUID} rw"
|
||||||
|
# set this to use a DEVICETREEDIR line in place of an FDT line
|
||||||
|
USE_DEVICETREEDIR="yes"
|
||||||
|
# relative dtb path supplied to FDT line, as long as above is unset
|
||||||
|
DTBPATH=""
|
||||||
_EOF
|
_EOF
|
||||||
mkdir -p "${ROOTFS}/boot/extlinux"
|
mkdir -p "${ROOTFS}/boot/extlinux"
|
||||||
run_cmd_chroot "${ROOTFS}" "/etc/kernel.d/post-install/60-extlinux"
|
run_cmd_chroot "${ROOTFS}" "/etc/kernel.d/post-install/60-extlinux"
|
||||||
|
|
|
@ -53,7 +53,7 @@ usage() {
|
||||||
|
|
||||||
Supported platforms: i686, x86_64, GCP,
|
Supported platforms: i686, x86_64, GCP,
|
||||||
rpi-armv6l, rpi-armv7l, rpi-aarch64,
|
rpi-armv6l, rpi-armv7l, rpi-aarch64,
|
||||||
pinebookpro, pinephone, rock64
|
pinebookpro, pinephone, rock64, rockpro64
|
||||||
|
|
||||||
OPTIONS
|
OPTIONS
|
||||||
-b <system-pkg> Set an alternative base-system package (default: base-system)
|
-b <system-pkg> Set an alternative base-system package (default: base-system)
|
||||||
|
@ -127,6 +127,7 @@ case "$PLATFORM" in
|
||||||
pinebookpro*) PKGS="$BASEPKG ${PLATFORM%-*}-base" ;;
|
pinebookpro*) PKGS="$BASEPKG ${PLATFORM%-*}-base" ;;
|
||||||
pinephone*) PKGS="$BASEPKG ${PLATFORM%-*}-base" ;;
|
pinephone*) PKGS="$BASEPKG ${PLATFORM%-*}-base" ;;
|
||||||
rock64*) PKGS="$BASEPKG ${PLATFORM%-*}-base" ;;
|
rock64*) PKGS="$BASEPKG ${PLATFORM%-*}-base" ;;
|
||||||
|
rockpro64*) PKGS="$BASEPKG ${PLATFORM%-*}-base" ;;
|
||||||
*) die "$PROGNAME: invalid platform!";;
|
*) die "$PROGNAME: invalid platform!";;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue