diff options
author | Patrick Vacek <patrickvacek@gmail.com> | 2020-08-07 13:02:21 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-08-07 13:02:21 +0200 |
commit | 21faebdc3a87785d8a3005671540733db6cf413b (patch) | |
tree | 77bf27949879a49bca747d9d876470dfbd4e9b01 /classes/sota_raspberrypi.bbclass | |
parent | a85ed5864ddfb60b612f69f04e3224ef71ec17c8 (diff) | |
parent | 5c667a14b326c7e73c121bb93606a3bd072b1a18 (diff) | |
download | meta-updater-21faebdc3a87785d8a3005671540733db6cf413b.tar.gz |
Merge pull request #760 from advancedtelematic/fix/master/rpi-bootfiles-append
sota_raspberrypi: Use new variable for bootfiles path.
Diffstat (limited to 'classes/sota_raspberrypi.bbclass')
-rw-r--r-- | classes/sota_raspberrypi.bbclass | 5 |
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 | ||
42 | IMAGE_BOOT_FILES_sota = "bcm2835-bootfiles/* \ | 42 | IMAGE_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 |
49 | IMAGE_BOOT_FILES_append_sota = "${@make_dtb_boot_files(d)}" | 50 | IMAGE_BOOT_FILES_append_sota = "${@make_dtb_boot_files(d)}" |