From 1440ac858979f06ad8f2a73a5de8d25f672cc4e8 Mon Sep 17 00:00:00 2001 From: Andrei Gherzan Date: Thu, 8 Sep 2022 20:13:20 +0200 Subject: [PATCH] sdcard_image-rpi.bbclass: Move SDIMG_KERNELIMAGE definitions to their machines This unifies the configuration of SDIMG_KERNELIMAGE across machines. Signed-off-by: Andrei Gherzan --- classes/sdcard_image-rpi.bbclass | 5 ----- conf/machine/raspberrypi.conf | 4 ++-- conf/machine/raspberrypi2.conf | 2 +- conf/machine/raspberrypi3-64.conf | 7 +++---- 4 files changed, 6 insertions(+), 12 deletions(-) diff --git a/classes/sdcard_image-rpi.bbclass b/classes/sdcard_image-rpi.bbclass index a7b9ac8..178e4ef 100644 --- a/classes/sdcard_image-rpi.bbclass +++ b/classes/sdcard_image-rpi.bbclass @@ -25,11 +25,6 @@ inherit image_types # This image depends on the rootfs image IMAGE_TYPEDEP:rpi-sdimg = "${SDIMG_ROOTFS_TYPE}" -# Kernel image name -SDIMG_KERNELIMAGE:raspberrypi ?= "kernel.img" -SDIMG_KERNELIMAGE:raspberrypi2 ?= "kernel7.img" -SDIMG_KERNELIMAGE:raspberrypi3-64 ?= "kernel8.img" - # Boot partition volume id # Shorten raspberrypi to just rpi to keep it under 11 characters # now enforced by mkfs.vfat from dosfstools-4.2 diff --git a/conf/machine/raspberrypi.conf b/conf/machine/raspberrypi.conf index b23687b..05263d7 100644 --- a/conf/machine/raspberrypi.conf +++ b/conf/machine/raspberrypi.conf @@ -7,8 +7,8 @@ DEFAULTTUNE ?= "arm1176jzfshf" require conf/machine/include/tune-arm1176jzf-s.inc include conf/machine/include/rpi-base.inc +SDIMG_KERNELIMAGE ?= "kernel.img" +UBOOT_MACHINE = "rpi_config" SERIAL_CONSOLES ?= "115200;ttyAMA0" -UBOOT_MACHINE = "rpi_config" - ARMSTUB ?= "armstub.bin" diff --git a/conf/machine/raspberrypi2.conf b/conf/machine/raspberrypi2.conf index 403d15e..8cb859e 100644 --- a/conf/machine/raspberrypi2.conf +++ b/conf/machine/raspberrypi2.conf @@ -7,8 +7,8 @@ DEFAULTTUNE ?= "cortexa7thf-neon-vfpv4" require conf/machine/include/arm/armv7a/tune-cortexa7.inc include conf/machine/include/rpi-base.inc +SDIMG_KERNELIMAGE ?= "kernel7.img" SERIAL_CONSOLES ?= "115200;ttyAMA0" - UBOOT_MACHINE = "rpi_2_config" ARMSTUB ?= "armstub7.bin" diff --git a/conf/machine/raspberrypi3-64.conf b/conf/machine/raspberrypi3-64.conf index 95475f3..573b079 100644 --- a/conf/machine/raspberrypi3-64.conf +++ b/conf/machine/raspberrypi3-64.conf @@ -21,16 +21,15 @@ RPI_KERNEL_DEVICETREE = " \ broadcom/bcm2710-rpi-cm3.dtb \ " -SERIAL_CONSOLES ?= "115200;ttyS0" - -UBOOT_MACHINE = "rpi_arm64_config" - +SDIMG_KERNELIMAGE ?= "kernel8.img" # 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_DIRECT ?= "Image" KERNEL_BOOTCMD ?= "booti" +UBOOT_MACHINE = "rpi_arm64_config" +SERIAL_CONSOLES ?= "115200;ttyS0" VC4DTBO ?= "vc4-fkms-v3d" ARMSTUB ?= "armstub8.bin"