Raspi2-3_GenImage Commit - r184:bc2d9952f399 · Collaboration Tremplin des Sciences

set better defaults for arm64 builds...

Brian J. Tarricone -

r184:bc2d9952f399

parent child

Context file:

r184:bc2d9952f399

README.md +3 -3

             This sets the kernel architecture for the compiler.
             ##### `KERNEL_IMAGE`="kernel7.img"
-            Name of the image file in the boot partition.
+            Name of the image file in the boot partition. If not set, `KERNEL_IMAGE` will be set to "kernel8.img" automatically if building for arm64.
             ##### `KERNEL_BRANCH`=""
             Name of the requested branch from the GIT location for the RPi Kernel. Default is using the current default branch from the GIT site.
             ##### `QEMU_BINARY`="/usr/bin/qemu-arm-static"
-            Sets the QEMU enviornment for the Debian archive.
+            Sets the QEMU enviornment for the Debian archive. If not set, `QEMU_BINARY` will be set to "/usr/bin/qemu-aarch64-static" automatically if building for arm64.
             ##### `KERNEL_DEFCONFIG`="bcm2709_defconfig"
-            Sets the default config for kernel compiling.
+            Sets the default config for kernel compiling. If not set, `KERNEL_DEFCONFIG` will be set to "bcmrpi3\_defconfig" automatically if building for arm64.
             ##### `KERNEL_REDUCE`=false
             Reduce the size of the generated kernel by removing unwanted device, network and filesystem drivers (experimental).

rpi23-gen-image.sh +13 0

             RELEASE_ARCH=${RELEASE_ARCH:=armhf}
             CROSS_COMPILE=${CROSS_COMPILE:=arm-linux-gnueabihf-}
             COLLABORA_KERNEL=${COLLABORA_KERNEL:=3.18.0-trunk-rpi2}
+            if [ "$KERNEL_ARCH" = "arm64" ] ; then
+              KERNEL_DEFCONFIG=${KERNEL_DEFCONFIG:=bcmrpi3_defconfig}
+              KERNEL_IMAGE=${KERNEL_IMAGE:=kernel8.img}
+            else
               KERNEL_DEFCONFIG=${KERNEL_DEFCONFIG:=bcm2709_defconfig}
               KERNEL_IMAGE=${KERNEL_IMAGE:=kernel7.img}
+            fi
+            if [ "$RELEASE_ARCH" = "arm64" ] ; then
+              QEMU_BINARY=${QEMU_BINARY:=/usr/bin/qemu-aarch64-static}
+            else
               QEMU_BINARY=${QEMU_BINARY:=/usr/bin/qemu-arm-static}
+            fi
             KERNEL_BRANCH=${KERNEL_BRANCH:=""}
             # URLs
             KERNEL_HEADERS=${KERNEL_HEADERS:=true}
             KERNEL_MENUCONFIG=${KERNEL_MENUCONFIG:=false}
             KERNEL_REMOVESRC=${KERNEL_REMOVESRC:=true}
+            if [ "$KERNEL_ARCH" = "arm64" ] ; then
+              KERNEL_BIN_IMAGE=${KERNEL_BIN_IMAGE:="Image"}
+            else
               KERNEL_BIN_IMAGE=${KERNEL_BIN_IMAGE:="zImage"}
+            fi
             # Kernel compilation from source directory settings
             KERNELSRC_DIR=${KERNELSRC_DIR:=""}

General Comments 0

Vous devez vous connecter pour laisser un commentaire. Se connecter maintenant

No TODOs yet

	Dépôts
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages