From 4d3a148b8eaca1a7137d4f081be6b865a27b0b2a Mon Sep 17 00:00:00 2001 From: Loys Ollivier Date: Thu, 9 Nov 2017 21:31:01 +0100 Subject: raspberrypi3-64: set default kernel to Image Fixes: 50fd319205d8 for raspberrypi3-64. Fixes: #153 For raspberrypi3-64 set default kernel image to "Image". "zImage" are not supported by arm64 platforms. And ".gz" images are not handled by bootloader yet. Signed-off-by: Loys Ollivier --- conf/machine/include/rpi-base.inc | 2 +- conf/machine/raspberrypi3-64.conf | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/conf/machine/include/rpi-base.inc b/conf/machine/include/rpi-base.inc index 71c63cb..529c80d 100644 --- a/conf/machine/include/rpi-base.inc +++ b/conf/machine/include/rpi-base.inc @@ -51,7 +51,7 @@ KERNEL_DEVICETREE ?= " \ # within u-boot to load the kernel. KERNEL_BOOTCMD ??= "bootm" KERNEL_IMAGETYPE_UBOOT ??= "uImage" -KERNEL_IMAGETYPE ?= "${@bb.utils.contains('RPI_USE_U_BOOT', '1', '${KERNEL_IMAGETYPE_UBOOT}', 'zImage', d)}" +KERNEL_IMAGETYPE ??= "${@bb.utils.contains('RPI_USE_U_BOOT', '1', '${KERNEL_IMAGETYPE_UBOOT}', 'zImage', d)}" MACHINE_FEATURES += "apm usbhost keyboard vfat ext2 screen touchscreen alsa bluetooth wifi sdio" diff --git a/conf/machine/raspberrypi3-64.conf b/conf/machine/raspberrypi3-64.conf index ebc9f38..38c3c4c 100644 --- a/conf/machine/raspberrypi3-64.conf +++ b/conf/machine/raspberrypi3-64.conf @@ -43,4 +43,6 @@ MACHINE_FEATURES_append = " vc4graphics" # When u-boot is enabled we need to use the "Image" format and the "booti" # command to load the kernel KERNEL_IMAGETYPE_UBOOT ?= "Image" +# "zImage" not supported on arm64 and ".gz" images not supported by bootloader yet +KERNEL_IMAGETYPE ?= "Image" KERNEL_BOOTCMD ?= "booti" -- cgit v1.2.3-54-g00ecf