summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--conf/machine/include/rpi-base.inc4
-rw-r--r--conf/machine/raspberrypi3-64.conf2
2 files changed, 4 insertions, 2 deletions
diff --git a/conf/machine/include/rpi-base.inc b/conf/machine/include/rpi-base.inc
index 529c80d..4f89989 100644
--- a/conf/machine/include/rpi-base.inc
+++ b/conf/machine/include/rpi-base.inc
@@ -51,7 +51,9 @@ KERNEL_DEVICETREE ?= " \
51# within u-boot to load the kernel. 51# within u-boot to load the kernel.
52KERNEL_BOOTCMD ??= "bootm" 52KERNEL_BOOTCMD ??= "bootm"
53KERNEL_IMAGETYPE_UBOOT ??= "uImage" 53KERNEL_IMAGETYPE_UBOOT ??= "uImage"
54KERNEL_IMAGETYPE ??= "${@bb.utils.contains('RPI_USE_U_BOOT', '1', '${KERNEL_IMAGETYPE_UBOOT}', 'zImage', d)}" 54KERNEL_IMAGETYPE_DIRECT ??= "zImage"
55KERNEL_IMAGETYPE ?= "${@bb.utils.contains('RPI_USE_U_BOOT', '1', \
56 '${KERNEL_IMAGETYPE_UBOOT}', '${KERNEL_IMAGETYPE_DIRECT}', d)}"
55 57
56MACHINE_FEATURES += "apm usbhost keyboard vfat ext2 screen touchscreen alsa bluetooth wifi sdio" 58MACHINE_FEATURES += "apm usbhost keyboard vfat ext2 screen touchscreen alsa bluetooth wifi sdio"
57 59
diff --git a/conf/machine/raspberrypi3-64.conf b/conf/machine/raspberrypi3-64.conf
index 38c3c4c..5f33802 100644
--- a/conf/machine/raspberrypi3-64.conf
+++ b/conf/machine/raspberrypi3-64.conf
@@ -44,5 +44,5 @@ MACHINE_FEATURES_append = " vc4graphics"
44# command to load the kernel 44# command to load the kernel
45KERNEL_IMAGETYPE_UBOOT ?= "Image" 45KERNEL_IMAGETYPE_UBOOT ?= "Image"
46# "zImage" not supported on arm64 and ".gz" images not supported by bootloader yet 46# "zImage" not supported on arm64 and ".gz" images not supported by bootloader yet
47KERNEL_IMAGETYPE ?= "Image" 47KERNEL_IMAGETYPE_DIRECT ?= "Image"
48KERNEL_BOOTCMD ?= "booti" 48KERNEL_BOOTCMD ?= "booti"