mirror of
https://git.yoctoproject.org/meta-raspberrypi
synced 2026-05-31 12:49:50 +00:00
Generalize the naming of the bootfiles deploy directory
The raspberry pi 4 variant has a BCM2711 chip, however it still uses the same boot files as the BCM2835 used in previous generations. This change generalizes the naming of the directory generated in the $DEPLOY_DIR to avoid the implication that the files are only meant for the BCM2835. Signed-off-by: Jeff Ithier <ithijme@gmail.com>
This commit is contained in:
committed by
Andrei Gherzan
parent
11318d2da1
commit
f046b4128c
@@ -85,6 +85,10 @@ MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "${@oe.utils.conditional('ENABLE_IR', '1'
|
||||
|
||||
SERIAL_CONSOLES_CHECK ??= "${SERIAL_CONSOLES}"
|
||||
|
||||
# The name of the deploy directory for raspberry pi boot files.
|
||||
# This variable is referred to by recipes fetching / generating the files.
|
||||
BOOTFILES_DIR_NAME ?= "bootfiles"
|
||||
|
||||
# Set Raspberrypi splash image
|
||||
SPLASH = "psplash-raspberrypi"
|
||||
|
||||
@@ -111,14 +115,14 @@ def make_dtb_boot_files(d):
|
||||
return ' '.join([transform(dtb) for dtb in alldtbs.split(' ') if dtb])
|
||||
|
||||
|
||||
IMAGE_BOOT_FILES ?= "bcm2835-bootfiles/* \
|
||||
IMAGE_BOOT_FILES ?= "${BOOTFILES_DIR_NAME}/* \
|
||||
${@make_dtb_boot_files(d)} \
|
||||
${@bb.utils.contains('RPI_USE_U_BOOT', '1', \
|
||||
'${KERNEL_IMAGETYPE} u-boot.bin;${SDIMG_KERNELIMAGE} boot.scr', \
|
||||
'${KERNEL_IMAGETYPE};${SDIMG_KERNELIMAGE}', d)} \
|
||||
"
|
||||
do_image_wic[depends] += " \
|
||||
bcm2835-bootfiles:do_deploy \
|
||||
bootfiles:do_deploy \
|
||||
${@bb.utils.contains('RPI_USE_U_BOOT', '1', 'u-boot:do_deploy', '',d)} \
|
||||
"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user