summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick Vacek <patrickvacek@gmail.com>2020-08-04 13:50:50 +0200
committerPatrick Vacek <patrickvacek@gmail.com>2020-08-07 08:34:40 +0200
commit5c667a14b326c7e73c121bb93606a3bd072b1a18 (patch)
tree77bf27949879a49bca747d9d876470dfbd4e9b01
parenta85ed5864ddfb60b612f69f04e3224ef71ec17c8 (diff)
downloadmeta-updater-5c667a14b326c7e73c121bb93606a3bd072b1a18.tar.gz
sota_raspberrypi: Use new variable for bootfiles path.fix/master/rpi-bootfiles-append
This was changed in f046b4128c9ca3420614887006101fa2b10fc6e7 of meta-raspberrypi. This also requires e947e8590f74477505c754d016d99fc71cadf4e1 in meta-updater-raspberrypi. Signed-off-by: Patrick Vacek <patrickvacek@gmail.com>
-rw-r--r--classes/sota_raspberrypi.bbclass5
1 files changed, 3 insertions, 2 deletions
diff --git a/classes/sota_raspberrypi.bbclass b/classes/sota_raspberrypi.bbclass
index 744ba22..3935ba8 100644
--- a/classes/sota_raspberrypi.bbclass
+++ b/classes/sota_raspberrypi.bbclass
@@ -39,11 +39,12 @@ def make_dtb_boot_files(d):
39 39
40 return ' '.join([transform(dtb) for dtb in alldtbs.split(' ') if dtb]) 40 return ' '.join([transform(dtb) for dtb in alldtbs.split(' ') if dtb])
41 41
42IMAGE_BOOT_FILES_sota = "bcm2835-bootfiles/* \ 42IMAGE_BOOT_FILES_sota = "${BOOTFILES_DIR_NAME}/* \
43 u-boot.bin;${SDIMG_KERNELIMAGE} \ 43 u-boot.bin;${SDIMG_KERNELIMAGE} \
44 " 44 "
45 45
46# OSTree puts its own boot.scr to bcm2835-bootfiles 46# OSTree puts its own boot.scr in ${BOOTFILES_DIR_NAME} (historically
47# bcm2835-bootfiles, now just bootfiles).
47# rpi4 and recent rpi3 firmwares needs dtb in /boot partition 48# rpi4 and recent rpi3 firmwares needs dtb in /boot partition
48# so that they can be read by the firmware 49# so that they can be read by the firmware
49IMAGE_BOOT_FILES_append_sota = "${@make_dtb_boot_files(d)}" 50IMAGE_BOOT_FILES_append_sota = "${@make_dtb_boot_files(d)}"