From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7118849486659518464 X-Received: by 2002:a1c:ed0e:0:b0:3a2:d7d0:c607 with SMTP id l14-20020a1ced0e000000b003a2d7d0c607mr15449894wmh.147.1657545143110; Mon, 11 Jul 2022 06:12:23 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6000:156e:b0:21d:2eb7:c707 with SMTP id 14-20020a056000156e00b0021d2eb7c707ls16059976wrz.3.gmail; Mon, 11 Jul 2022 06:12:22 -0700 (PDT) X-Google-Smtp-Source: AGRyM1u1KlfNqacxP1zEpM2IXsKUfzbT+HeXGm+tLo1J062hajrn0vIKH4uPretqgZWnPuIm6CWM X-Received: by 2002:a5d:45c5:0:b0:21d:978e:f93 with SMTP id b5-20020a5d45c5000000b0021d978e0f93mr11783264wrs.134.1657545142124; Mon, 11 Jul 2022 06:12:22 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1657545142; cv=pass; d=google.com; s=arc-20160816; b=DbKjfJWN09mzeKpIGcb7/M/+pptonvXmvvxOE8RLfFJ+q733tzH9orX/mJYidv0LTb x5G3S3VWS4HNaA+WSjBLOtsvVMUYNwNHEr2KbenYlktpGGlbNEGqdACgRIbAdC4EzNKF P3S28ZjXcJFxyhIefXp6Aq82lWqzOWT95Cdtwy8CrNl84lG4ZI3/JaZVe4NVA1qmY2z4 PhylYE+Sj8b2oCu/Gcnp67yT6L5PeDYoiuKoFUa6ayMI3mf0HvxYW44AuC8WWWXRKPkW m5qw0AYEF38SEYsXiyzMRuGionLYFjBEd+RwP1+YeK4YrnSlU3xmltQkcuXnCObiXal0 L5bg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:content-transfer-encoding:references:in-reply-to :message-id:subject:cc:to:from:date:dkim-signature; bh=asrKRPEAUUlyKh8kkd1RM09r/m3EVfdTdxZ+qcB3P+E=; b=rG2eKyUlATP8pxiXwnFOPKC5kFn5b+CWteyIrxJJVTqOjkZt4pQx/gz06PaE8y/EoI 5p4cQWsgkrKMD2mbBr7BOeqd5QNWXeiEshDHi2FYKl7uFdgdqmXI0OUVuiPY2s4ohGVr hCgzBbcaEmkP2cRUq+HuuJ0pPRBEBTTc/eRUU6sBV/LgpFnGgoO4W04i7y5xXleOspeL 1dBaFmp2lOn5Ox8ZXgE6wo8vd2Ki8f4v3WzbUy2lBl/d8JTe3nRR5ZKYsClKlud7jiWp tyWNFpX/dWE/tBnBDbi8KJk+G0YshEM2ngF4VlHOX2tEg4pnHp6QC2QEg41O5UWIGzCn yUag== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=rd+VC8TT; arc=pass (i=1 spf=pass spfdomain=siemens.com dkim=pass dkdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of henning.schild@siemens.com designates 40.107.5.44 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from EUR03-VE1-obe.outbound.protection.outlook.com (mail-eopbgr50044.outbound.protection.outlook.com. [40.107.5.44]) by gmr-mx.google.com with ESMTPS id f18-20020adfb612000000b0021d9c42c7f4si194327wre.2.2022.07.11.06.12.21 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 11 Jul 2022 06:12:22 -0700 (PDT) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 40.107.5.44 as permitted sender) client-ip=40.107.5.44; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=rd+VC8TT; arc=pass (i=1 spf=pass spfdomain=siemens.com dkim=pass dkdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of henning.schild@siemens.com designates 40.107.5.44 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nAbU7fbD/5lJMzWjUeR7zbiRlMavI8gDFkHBoa0+Wd0zTakNwneRlK9nGOSvcXrQmpjpZXi5NzCf89Cq6LTV1dvISil+TbAN3/Ta2oPRJ9GD63yGzdyZmT0vHW7npBke0PCMMXy4qv6GP3tqcBMBJG4McB3GSL+TJhN8XzRKdUhKVFL0yYO8RRg2OUIjCoq+VzJbNYzRrAlMGLdHYxaLI1eajSw9zWD1H5fSxEr2Mm8KTTZ89TLSrVbT2gV9B1TZIIX5cpz0jlMgHP7+HnlhaMl5YgfDNpMKI8pobT6GjI1oa3xuW3sraylp/Os08GKu0w5DnUjvhisvqPBfZoyo/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=asrKRPEAUUlyKh8kkd1RM09r/m3EVfdTdxZ+qcB3P+E=; b=DaSmgajQVIJx3AzeXH7DuUFlOq3Xdz/gvXE9bMglAmALHgR17kB1GRcAgjxnL97WbqwWarfe+aoohun1P8M+08q0NBq9uxLvSXFv9T90LFy4z6S5TlRZzgMqBNkYD7YxdrEbgvarGMsLvG76o498h3HTl8v6XgcSuGPYY6khm5dE9T1v0I314DfBVqOE7Jx9tH2Z7cTUnWmx3PurW7Zwj5KRO6gEBgSgTrXISLk8m14zW63fCzjuQzyIYPDui+2zeE0Os55IzdtlobI+XUHq8FZLxOr3rX51PCl0n6L+t22cHcBXk32zZBvjmffczhFPZhtEJG16d9d2zBYyKqZrCQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=siemens.com; dmarc=pass action=none header.from=siemens.com; dkim=pass header.d=siemens.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=siemens.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=asrKRPEAUUlyKh8kkd1RM09r/m3EVfdTdxZ+qcB3P+E=; b=rd+VC8TTAc6Bkrql10dsL6ZrQaQIiWZbEmBXWOyo+xhKsZ4vdmEY9iBHLX8na3hzENy/fqoipiaQUzw9HV6b8dNrTtJFQf2oFL4uXNnxKuunYvfFVA1SAYg9/lk+HTAIj4gIWbIL8Oo2dsyIzRzJ9C1j+mh66T9ySr/nkKrtw7FkmrxoQs97wAFg2AGcqxmZGyCPqt2ZosVpRgwGWoN7j5Zzn0lrosdT9omqsHcbESjwqN/zaxPrpIsIAyI03dtcHQZW6WbiGQG5SxdcePMInEj9097ulzaScc4WT9nvM43d6w5cV8a0lRpTjiCeEQPqPS8DV8X+rwZnVUNYdFES5A== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=siemens.com; Received: from PA4PR10MB5780.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:102:269::8) by AS4PR10MB6301.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:58c::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5417.26; Mon, 11 Jul 2022 13:12:20 +0000 Received: from PA4PR10MB5780.EURPRD10.PROD.OUTLOOK.COM ([fe80::253b:4d66:1a99:f6e0]) by PA4PR10MB5780.EURPRD10.PROD.OUTLOOK.COM ([fe80::253b:4d66:1a99:f6e0%9]) with mapi id 15.20.5417.025; Mon, 11 Jul 2022 13:12:20 +0000 Date: Mon, 11 Jul 2022 15:12:14 +0200 From: Henning Schild To: Jan Kiszka Cc: isar-users Subject: Re: [PATCH] wic: bootimg-efi-isar: Add support for loading device tree files Message-ID: <20220711151214.271e944a@md1za8fc.ad001.siemens.net> In-Reply-To: References: X-Mailer: Claws Mail 4.1.0 (GTK 3.24.34; x86_64-pc-linux-gnu) Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-ClientProxiedBy: CH2PR14CA0038.namprd14.prod.outlook.com (2603:10b6:610:56::18) To PA4PR10MB5780.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:102:269::8) Return-Path: henning.schild@siemens.com MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 80de8849-27d2-4dd7-c94b-08da633efc8f X-MS-TrafficTypeDiagnostic: AS4PR10MB6301:EE_ X-LD-Processed: 38ae3bcd-9579-4fd4-adda-b42e1495d55a,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Wyyx+aBXvnVYMqmP4RltiDk7RdlHsE837vgdFwsIGBcgJC0YRKKr1Q8xnoqNVGdhaghddm+1UcyeGifS5CIMb8NxM04/RgNyCzo5VfZG6+VcuhZbclbtnniHw9IP3Vk5QyHBGi/DUmeodEzH0Hzj3hCY0a1icO86XebxaLwiFR6ReU5MDFdWgez5Wl3g6p9AXY8+GVHsEYSSUN++aiIGGokExsM6bATs/hFTHkvk5VXLIi/KAoyCnHVEhsXwTxqEf28eXsOYxdMazQDehRzb7GtE7aXTip94x/QYSJL0AlghR/8Wwi5CnLRfKTkV+H8U2vCgU8OrCB1+BlfbTSYQyybRw3ny6Cpjsjl/pEPfQseTQzb9zuLmKkt9gzz3dCfazdwNuzwR5OjXC/5B2AUegv7OgQGz3NN4DSIqHQ0YhHOkJRAukuDQPfvvCsqwMSMwkXA7VfBRMe9nvr2y5J3KO82QWGXAQo7mXV50YMdBolqPZL1mKtdzPmGF/g50/MnT9gABWjIFRJQsVfB/lpCdfevFTg7ln0CU3Mh4JCr2KaejUzY4D+HZ9auG9RIaaC66Lj1ykTq9cuISSPUoAGXbVwke5NhGbSb1XZFELcbOD04u5RvEsFcEPP56FhmfupuGHzbu/lyHzxS4wwE9orjqhYmgxKEwS9s05VAow7bypqpW889KtZylZTABt7D0ZJKprD7q2jI1QxfKaXIOuX6FRxC3X6MNo3oPb7a4eqDZZcnNABiWU03tmgT5NxaT8ytogFgEH7buGwKpzlvCeoxRJQ== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PA4PR10MB5780.EURPRD10.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230016)(4636009)(396003)(376002)(39860400002)(366004)(136003)(346002)(66556008)(44832011)(26005)(1076003)(66946007)(66476007)(8676002)(4326008)(6862004)(8936002)(5660300002)(2906002)(6512007)(6636002)(186003)(9686003)(316002)(86362001)(478600001)(82960400001)(83380400001)(6666004)(41300700001)(6506007)(6486002)(38100700002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?fHpMA1yOt2+LSpo+nn5aOcKAzY6EEbikAt+QQDfs6V/+8h+7/enId0+EOclK?= =?us-ascii?Q?P+EIXwykOgGljCmHLym7+pQEFSLBaGWD+DMeoA/VnuVeSFM6DHIuZ3QoYVOL?= =?us-ascii?Q?3SmHNzuk/k6ofoNcrXnxwbufJo+HJ2jZypnvFkSfBAwXHc3h2RHC8nEmyGmw?= =?us-ascii?Q?mhpOSpcAJ8K1EsT3uCcE0OLoBIE/Y1rcwMsTZcvIG2W3KsOqKTDqFVDUXSmp?= =?us-ascii?Q?73rGyn8F69z5gAXzXxGbYO+8BOwsVlgAY/z2yVP1xvZGhbzjLSHBxpwL/jQE?= =?us-ascii?Q?dk/xJ4dzVwBPFiTRiJuLu5ek3v1zSoorc0IBysasnrtd3nc+OUfgBqwGOBi7?= =?us-ascii?Q?U76insQ0CsIs9/or3boedUQ+cMlnLS9UUBLDeXmLbeuRlhduhnra+qWKtp9O?= =?us-ascii?Q?PhacN0YfGlA6QslESkn/TE4DHoYlGOMa5hvEWasQwVF0WQKwPMZr+WqNU0ok?= =?us-ascii?Q?CjXh5GMwsmbAeD2YQ6vVYSpLaGrBuMozMzvaVnXGpoJPo27lDiZPmCkQs5ir?= =?us-ascii?Q?w/SuPJTXNH/gIXaVimMbeXY+fPoBorZkVVxR0SUc2YMuk0iduAXsAL9EBo+h?= =?us-ascii?Q?V+1+MYDa51zLoBm3Dv8/rvwTU195AC6W064aWXR9TPLAYYmFAAeBv6KpKws7?= =?us-ascii?Q?itPjiYc5T1OnygzQLuRvEUoMIDEgy0a8rQwrB7z94M8P+ZpkHSOfGUDHnKLA?= =?us-ascii?Q?ieH8U3RQHnfCzevTh0sB2Aou5/F4yHtVLNhGdzCtS99enGq9brAhDvEPKWhS?= =?us-ascii?Q?tHr8YasaxQb5gpuVDLJKxEvXrCOmnxFhLZS/KJIqf1+9zXhSQcRjOPHSBoLz?= =?us-ascii?Q?qB61LVM5QC+raz8vOQY05+a7gBAA61rs9vS0H1zQs0M3mbwGuRl3Ep2KITkj?= =?us-ascii?Q?n2iVgo8ezKTd5Uc5wGKue1bKqXnM8xQZ92sMUZgGozVK+L4yCsIal//HGpA6?= =?us-ascii?Q?S6k2ZFtj1QO6y5Jvyk8T7Uyy5MrMsE4ndLph3CLRyFpFRHAwsunxx7PaL8GV?= =?us-ascii?Q?MiOwKjGloJlqdRvblJ94Yae4RvnzbyfyadtlHvF3GsoP0968TMM75X6xWcYj?= =?us-ascii?Q?aI0sE0KHRAtEK+7ntZUdAOyzE0czMixH1HEzyyVa2jJkjB8GdVBz6yzO4RVN?= =?us-ascii?Q?uuoQGpYACSOukr4me739e4/EeO/9N8FUXKNusXH65yogtw3cYgnH4cH9prda?= =?us-ascii?Q?TNliynNwajY51CkeShAbC0iM7KJn5BrcsslUIWvKRhqesDswU2+NfDGBOPaJ?= =?us-ascii?Q?O/KSTeRTyQEUveqP36N1D3KEJl3XWwMQ8Uu9yExefCprE0WqckFB3O2V8Jcp?= =?us-ascii?Q?ttID7bJ4X+GFwyzRCAAtahuFxF1+DDAWmqNzs+DWAlZ/mHthEjNm7ajrQpen?= =?us-ascii?Q?wp8B+U/VLtYpLpC+AAm9SGcqzm2beF1fRybFgYVJCuE7A91hQNvpwcXL2kwm?= =?us-ascii?Q?PA4g2uIRUI/BxnDXVIqxZIuoYrKbAYlZUupozbBg8LC43p6XPhbcCXYXdjXc?= =?us-ascii?Q?imU+G0qT+SKX701e+WlWD5tVYGqjVH17NkbTpvUmixswAP7DeKH481iOlDiJ?= =?us-ascii?Q?OnOJqIPBC6PwQBLkd+NzyT/6CHfOBg8IHcceh8+4MR+e3VLwhZNRBTAWv9mi?= =?us-ascii?Q?4A=3D=3D?= X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: 80de8849-27d2-4dd7-c94b-08da633efc8f X-MS-Exchange-CrossTenant-AuthSource: PA4PR10MB5780.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jul 2022 13:12:20.4781 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 38ae3bcd-9579-4fd4-adda-b42e1495d55a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: PYhz3S6kQxoJxw856x2qlvFiOSbjO8BA7pEZwgfB1TYZzNS3D8lmZfd/Ew9C/BmAqX5ldWQ5vRa+aEncbwKvTHh05vS786ztetleNQNfTzI= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS4PR10MB6301 X-TUID: tMBPAhnM6tb/ Am Sun, 10 Jul 2022 22:51:44 +0200 schrieb Jan Kiszka : > From: Jan Kiszka > > 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 DTB_FILES contains more than one > entry. > > This has been tested with grub from bullseye and systemd from > bullseye-backport. The latter is needed as only systemd 250 gained the > required feature. > > Out of scope are overlays (only supported by systemd-boot) as well as > unified kernel images (practically broken on non-x86 with current > toolchains). > > Signed-off-by: Jan Kiszka > --- > meta/classes/imagetypes_wic.bbclass | 2 +- > .../wic/plugins/source/bootimg-efi-isar.py | 39 > +++++++++++++------ 2 files changed, 29 insertions(+), 12 deletions(-) > > diff --git a/meta/classes/imagetypes_wic.bbclass > b/meta/classes/imagetypes_wic.bbclass index 61a74d4a..3a577f71 100644 > --- a/meta/classes/imagetypes_wic.bbclass > +++ b/meta/classes/imagetypes_wic.bbclass > @@ -106,7 +106,7 @@ WICVARS += "\ > ROOTFS_SIZE STAGING_DATADIR STAGING_DIR STAGING_LIBDIR > TARGET_SYS TRANSLATED_TARGET_ARCH" > # Isar specific vars used in our plugins > -WICVARS += "DISTRO DISTRO_ARCH" > +WICVARS += "DISTRO DISTRO_ARCH DTB_FILES" > > python do_rootfs_wicenv () { > wicvars = d.getVar('WICVARS', True) > diff --git a/meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py > b/meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py index > a24e04f3..aff51e81 100644 --- > a/meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py +++ > b/meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py This file is a fork from OE with very minimal non-functional changes to make it into Isar. I am afraid that feature will have to make it via OE. Henning > @@ -58,13 > +58,12 @@ class BootimgEFIPlugin(SourcePlugin): raise > WicError("configfile is specified but failed to " "get it from %s." % > configfile) > - initrd = source_params.get('initrd') > + bootimg_dir = get_bitbake_var("DEPLOY_DIR_IMAGE") > + if not bootimg_dir: > + raise WicError("Couldn't find DEPLOY_DIR_IMAGE, exiting") > > + initrd = source_params.get('initrd') > if initrd: > - bootimg_dir = get_bitbake_var("DEPLOY_DIR_IMAGE") > - if not bootimg_dir: > - raise WicError("Couldn't find DEPLOY_DIR_IMAGE, > exiting") - > initrds = initrd.split(';') > for rd in initrds: > cp_cmd = "cp %s/%s %s" % (bootimg_dir, rd, hdddir) > @@ -72,6 +71,13 @@ class BootimgEFIPlugin(SourcePlugin): > else: > logger.debug("Ignoring missing initrd") > > + dtb_files = (get_bitbake_var("DTB_FILES") or '').split() > + if dtb_files: > + if len(dtb_files) > 1: > + raise WicError("Only one DTB support in grub > configuration, exiting") > + cp_cmd = "cp %s/%s %s" % (bootimg_dir, dtb_files[0], > hdddir) > + exec_cmd(cp_cmd, True) > + > if not custom_cfg: > # Create grub configuration using parameters from wks > file bootloader = creator.ks.bootloader > @@ -108,6 +114,9 @@ class BootimgEFIPlugin(SourcePlugin): > grubefi_conf += " /%s" % rd > grubefi_conf += "\n" > > + if dtb_files: > + grubefi_conf += "devicetree /%s\n" % dtb_files[0] > + > grubefi_conf += "}\n" > > logger.debug("Writing grubefi config > %s/hdd/boot/EFI/BOOT/grub.cfg", @@ -134,14 +143,12 @@ class > BootimgEFIPlugin(SourcePlugin): loader_conf += "default boot\n" > loader_conf += "timeout %d\n" % bootloader.timeout > > - initrd = source_params.get('initrd') > + bootimg_dir = get_bitbake_var("DEPLOY_DIR_IMAGE") > + if not bootimg_dir: > + raise WicError("Couldn't find DEPLOY_DIR_IMAGE, exiting") > > + initrd = source_params.get('initrd') > if initrd and > source_params.get('create-unified-kernel-image') != "true": > - # obviously we need to have a common common deploy var > - bootimg_dir = get_bitbake_var("DEPLOY_DIR_IMAGE") > - if not bootimg_dir: > - raise WicError("Couldn't find DEPLOY_DIR_IMAGE, > exiting") - > initrds = initrd.split(';') > for rd in initrds: > cp_cmd = "cp %s/%s %s" % (bootimg_dir, rd, hdddir) > @@ -149,6 +156,13 @@ class BootimgEFIPlugin(SourcePlugin): > else: > logger.debug("Ignoring missing initrd") > > + dtb_files = (get_bitbake_var("DTB_FILES") or '').split() > + if dtb_files: > + if len(dtb_files) > 1: > + raise WicError("Only one DTB support in grub > configuration, exiting") > + cp_cmd = "cp %s/%s %s" % (bootimg_dir, dtb_files[0], > hdddir) > + exec_cmd(cp_cmd, True) > + > logger.debug("Writing systemd-boot config " > "%s/hdd/boot/loader/loader.conf", cr_workdir) > cfg = open("%s/hdd/boot/loader/loader.conf" % cr_workdir, > "w") @@ -197,6 +211,9 @@ class BootimgEFIPlugin(SourcePlugin): > for rd in initrds: > boot_conf += "initrd /%s\n" % rd > > + if dtb_files: > + boot_conf += "devicetree /%s\n" % dtb_files[0] > + > if source_params.get('create-unified-kernel-image') != > "true": logger.debug("Writing systemd-boot config " > "%s/hdd/boot/loader/entries/boot.conf", > cr_workdir)