On 01.08.22 16:12, Luca Ceresoli wrote:
> Hello Jan,
>
> On Sat, 30 Jul 2022 10:24:43 +0200
> "Jan Kiszka" <jan.kis...@siemens.com> wrote:
>
>> From: Jan Kiszka <jan.kis...@siemens.com>
>>
>> For device tree using systems, add support to set a custom devices tree
>> during UEFI boot. This requires to copy the DTB file to the boot
>> partition and to add the respective loader entries to the configuration
>> files.
>>
>> Both grub and systemd-boot support only loading a specific device tree.
>> Therefore refuse to work if the 'dtb' parameter contains more than one
>> entry.
>>
>> Out of scope for now are overlays (only supported by systemd-boot).
>>
>> Signed-off-by: Jan Kiszka <jan.kis...@siemens.com>
>> ---
>
> [...]
>
>> @@ -327,11 +350,13 @@ class BootimgEFIPlugin(SourcePlugin):
>> objcopy_cmd = "objcopy \
>> --add-section .osrel=%s --change-section-vma
>> .osrel=0x20000 \
>> --add-section .cmdline=%s --change-section-vma
>> .cmdline=0x30000 \
>> + %s \
>> --add-section .linux=%s --change-section-vma
>> .linux=0x2000000 \
>> --add-section .initrd=%s --change-section-vma
>> .initrd=0x3000000 \
>> %s %s" % \
>> ("%s/usr/lib/os-release" % staging_dir_host,
>> cmdline.name,
>> + dtb_params,
>> "%s/%s" % (staging_kernel_dir, kernel),
>> initrd.name,
>> efi_stub,
>
> This hunk conflicts with the changes introduced by [0], which is
> already in my testing branch. I have applied your patch with a little
> change to resolve the conflict, can you please have a look at the result
> [1] to ensure I correctly followed the logic of your patch?
>
> [0] https://lists.openembedded.org/g/openembedded-core/message/168553
> [1]
> https://git.openembedded.org/openembedded-core-contrib/commit/?h=lucaceresoli/master-next&id=7547ec3e2065e55a8caa6118fc962130b8c6bd98
>
> Best regards.
Looks good, thanks!
Jan
--
Siemens AG, Technology
Competence Center Embedded Linux
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#168768):
https://lists.openembedded.org/g/openembedded-core/message/168768
Mute This Topic: https://lists.openembedded.org/mt/92707147/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
