MIRRORS/meta-raspberrypi
1
0
Fork 0
mirror of git://git.yoctoproject.org/meta-raspberrypi.git synced 2025-07-19 21:09:03 +02:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

sdcard_image-rpi.bbclass: Move SDIMG_KERNELIMAGE definitions to their machines

Browse Source 
This unifies the configuration of SDIMG_KERNELIMAGE across machines.

Signed-off-by: Andrei Gherzan <andrei.gherzan@huawei.com>
This commit is contained in:
Andrei Gherzan 2022-09-08 20:13:20 +02:00 committed by Andrei Gherzan
parent 4b9c0dd543
commit 1440ac8589
4 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
classes/sdcard_image-rpi.bbclass
View File

@ -25,11 +25,6 @@ inherit image_types
# This image depends on the rootfs image # This image depends on the rootfs image
IMAGE_TYPEDEP:rpi-sdimg = "${SDIMG_ROOTFS_TYPE}" 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 # Boot partition volume id
# Shorten raspberrypi to just rpi to keep it under 11 characters # Shorten raspberrypi to just rpi to keep it under 11 characters
# now enforced by mkfs.vfat from dosfstools-4.2 # now enforced by mkfs.vfat from dosfstools-4.2

4
conf/machine/raspberrypi.conf
View File

@ -7,8 +7,8 @@ DEFAULTTUNE ?= "arm1176jzfshf"
require conf/machine/include/tune-arm1176jzf-s.inc require conf/machine/include/tune-arm1176jzf-s.inc
include conf/machine/include/rpi-base.inc include conf/machine/include/rpi-base.inc
SDIMG_KERNELIMAGE ?= "kernel.img"
UBOOT_MACHINE = "rpi_config"
SERIAL_CONSOLES ?= "115200;ttyAMA0" SERIAL_CONSOLES ?= "115200;ttyAMA0"
UBOOT_MACHINE = "rpi_config"
ARMSTUB ?= "armstub.bin" ARMSTUB ?= "armstub.bin"

2
conf/machine/raspberrypi2.conf
View File

@ -7,8 +7,8 @@ DEFAULTTUNE ?= "cortexa7thf-neon-vfpv4"
require conf/machine/include/arm/armv7a/tune-cortexa7.inc require conf/machine/include/arm/armv7a/tune-cortexa7.inc
include conf/machine/include/rpi-base.inc include conf/machine/include/rpi-base.inc
SDIMG_KERNELIMAGE ?= "kernel7.img"
SERIAL_CONSOLES ?= "115200;ttyAMA0" SERIAL_CONSOLES ?= "115200;ttyAMA0"
UBOOT_MACHINE = "rpi_2_config" UBOOT_MACHINE = "rpi_2_config"
ARMSTUB ?= "armstub7.bin" ARMSTUB ?= "armstub7.bin"

7
conf/machine/raspberrypi3-64.conf
View File

@ -21,16 +21,15 @@ RPI_KERNEL_DEVICETREE = " \
broadcom/bcm2710-rpi-cm3.dtb \ broadcom/bcm2710-rpi-cm3.dtb \
" "
SERIAL_CONSOLES ?= "115200;ttyS0" SDIMG_KERNELIMAGE ?= "kernel8.img"
UBOOT_MACHINE = "rpi_arm64_config"
# When u-boot is enabled we need to use the "Image" format and the "booti" # When u-boot is enabled we need to use the "Image" format and the "booti"
# command to load the kernel # command to load the kernel
KERNEL_IMAGETYPE_UBOOT ?= "Image" KERNEL_IMAGETYPE_UBOOT ?= "Image"
# "zImage" not supported on arm64 and ".gz" images not supported by bootloader yet # "zImage" not supported on arm64 and ".gz" images not supported by bootloader yet
KERNEL_IMAGETYPE_DIRECT ?= "Image" KERNEL_IMAGETYPE_DIRECT ?= "Image"
KERNEL_BOOTCMD ?= "booti" KERNEL_BOOTCMD ?= "booti"
UBOOT_MACHINE = "rpi_arm64_config"
SERIAL_CONSOLES ?= "115200;ttyS0"
VC4DTBO ?= "vc4-fkms-v3d" VC4DTBO ?= "vc4-fkms-v3d"
ARMSTUB ?= "armstub8.bin" ARMSTUB ?= "armstub8.bin"