From patchwork Tue Jan 9 07:33:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 3268 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Tue, 09 Jan 2024 08:33:39 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-qv1-f64.google.com (mail-qv1-f64.google.com [209.85.219.64]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 4097XcI1021571 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 9 Jan 2024 08:33:39 +0100 Received: by mail-qv1-f64.google.com with SMTP id 6a1803df08f44-6805a03aeaesf51456396d6.0 for ; Mon, 08 Jan 2024 23:33:39 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1704785613; cv=pass; d=google.com; s=arc-20160816; b=Nn/o2Dv2f+Zpb9ZEZmAp4R/eWfXdP+COX8QguL19+lvHIDySyADQG/uY1UIYh8QeGn 0w2u0CW6pRiRWty+zEWcCBa1XBPcfD29BqhqLaEFGaP9yjVGaRh18nuMdpu73znMFTvi NkgeINd/WC/F9u1FYzLmUyFqusIXITh5angHSrZm/cXWo4R5ZjpoX2QXhTrR8RMI+byG EW/AGhLEg0zXc10i0iJZwPyhE/bfIJz/D8tN8ScY+xuJEz3/uYE816Gg4w09XIYRXyhH efg8A6CeOElvFMak++z6oChfgK7jmbxFFHs1XZsK6uP74SP1+I2rVO/SkTQLAAMAQf2V MnqQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to:feedback-id:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=rSxIH19+3hfwsrBfTuhkpRfrYt7ii8HcI1j6cmX3QU8=; fh=xxo2rOAPT4f31TY31yIWVuVlno6QMa2Pdllc3KKolm0=; b=HJLIB81vPYg2fR1qFB05QEhex6hMcO98zwB+9HKkb7ahaTQk8zS2fyuQnHl2BoCU/E z5KCYKyFBDRuWXge83mjGmNODmYeQsfUbnnrFBjPHSt0i4+w6Cs8dDutDE9n6GVqyN/W rwcnNcf/WAC4QFcgu574dgZ4nAtWfRdRlxr14/yOJr0ShVx6QwaI6yPfRx5KJhSx52uc qDImFJMm25AAT+ZU93qGFswa8ys3QBKZz5ziBKSmmzZFw7SxkcvkQ/LbHXKSOvS89mhX 2zrc8JE70YEQA4KjxfJlMhIhJW+ovjJmwn7XAoqeHtG4Y+KRReBatvgJIVOHw8bd1PWE LR8A== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=CjJLsxKm; spf=pass (google.com: domain of fm-294854-20240109073331e2b64372235c25942a-asclvq@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) smtp.mailfrom=fm-294854-20240109073331e2b64372235c25942a-AsClvq@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1704785613; x=1705390413; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:feedback-id :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:from:to:cc:subject:date:message-id:reply-to; bh=rSxIH19+3hfwsrBfTuhkpRfrYt7ii8HcI1j6cmX3QU8=; b=jr+tNjXLHu6mRc8y47nNhb1iDV4312O2ZQuLM3a5hFcOJinPsRvsBgm4ykBhHdz8QZ EcCljcIJApKJOGMPQUc6y5hR/Xfx0iMGidu08QDG69S4w7nYcHv1NIrI94w92lf7vBCr O3x4qnCBZXLuRlCNX033OR0O2Fc6Df83abP+a5dJPYNMeFgUUdup/8FXTeLI4NrKKqlB B2CX3bbab2sRsVoiIyY1w/w1BFFjjsuVx9WZTzdyC9c/8uVZrowMSUpWC1/BqpJw3WAc HdMkfbPFg8cpCXyTa8+9ddfVc4VIiVHNV3LBbJDASVycdfYx8tOk7rQcoXZgfERBZ9wI 4Y5Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704785613; x=1705390413; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:feedback-id :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:x-beenthere:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=rSxIH19+3hfwsrBfTuhkpRfrYt7ii8HcI1j6cmX3QU8=; b=KQwXsxU7XB50zPaTR+E72UTo1zAQJocVB5GLWkVgT3GGxvti1/31O13zALuG7mxEQd XuCFQtb1TXo+oyNQFf5hcWJJW7l6A497nHWBkTGJ+N59BcYiBdqSzn+o96404Et7HCSv 8SO48Y/mXQD2iWDW5DUuE3/zSoCGB51YvPb/L85OTf4tQX4b5zty6Lo1gPpWEC5DBnsj 7R/k5CckbS5ZQVZyJlr8aOQ0KjbwP4saWPYVBvg99r3TmI0QtmisgHfXcaAeo/2wGxB8 mk766WFlEzMBLECxBuWlci9ZMM7CRKmhGOUTVArBAEh61l3BuKBi31GRsh0Ux5AqfhEf d4pg== X-Gm-Message-State: AOJu0YwiKCTJKYgd3oPS2Hwj58jpOOuZNty0mSSoqx8qejojPGc79WG3 tSlriawMlJMPxati3xxX67g= X-Google-Smtp-Source: AGHT+IHbvJ2uhousBTrS4V4J/gWBAGOQ03RHCSZT421Se0o7oAkYMWCH5fNYtn+OSBg/EUtYk/9eig== X-Received: by 2002:a05:6214:2422:b0:67f:7599:84ad with SMTP id gy2-20020a056214242200b0067f759984admr6721239qvb.84.1704785613087; Mon, 08 Jan 2024 23:33:33 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:ad4:5f4c:0:b0:67f:74d3:afb5 with SMTP id p12-20020ad45f4c000000b0067f74d3afb5ls33225qvg.1.-pod-prod-01-us; Mon, 08 Jan 2024 23:33:32 -0800 (PST) X-Received: by 2002:ae9:f442:0:b0:783:73c:d597 with SMTP id z2-20020ae9f442000000b00783073cd597mr5660533qkl.101.1704785612386; Mon, 08 Jan 2024 23:33:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1704785612; cv=none; d=google.com; s=arc-20160816; b=mgA0PRiSjQxyE4fzD7LpITBL4Hl/8e+UaS7Mw9FCIpnMpyEOq9Wh/ZDvwJ8wjnlgFt X6QWhUQ2UZ5hp5yqpA3fynpyYJjM+3qn3Q1xukcjOrAxhqZ4XPaoQF/8YLlx/+yH4Qoi dpIkS0KNe6owtbXUfuxhksFQzrTVj8FHF7PYH6WpLGicHuOYowpTpmRUiQwra0iSsVK5 qwem9y5LSgZyCI5w0sLPL07ompw8Nnb6Mh3H1CpeesavkG1fxhrl0YzkV8xM6ZSTSel8 suhCaaeEj5l6uvYhknJH6fKwE5WCBrqOQ5Ed1XIkiEk1NFuu74BkK+2Zlp1RJ9gWgSIO Bn1A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=feedback-id:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=8dI8xROqgiUjgCxbylw+zQoBIyEsBIBteJm+ZWm5ed4=; fh=xxo2rOAPT4f31TY31yIWVuVlno6QMa2Pdllc3KKolm0=; b=Qv9CRy2NA9hjGyQXqOyUQnW8Z8MQtHJ7TjgDDlDaC7W4b8wMVW5zSmy7thPSm5khfv dwRGu6cozCu6VVYqsalQQg34yVriwBPFgfQmy8wzlwNEAMpKDpi0Yow5VzHOSXOoOeMx FJE8rk8acgYnu4XkO5sOyevsSPyWoCX12QMJCBOleBzO2cvQf5JK8GcVHgSgppaN4hNX xLpqTaihLiAwd8b0chnQyri4dNKs2Z0XL4suyeyE6Y0p78wcI92gBXzbNwBEqvkheYOq vlEE7wHay/1BIeimZ2SZbykAZiTtyNFIGBTSUEBpq+G8a/iSk9wRbAui7O4/5OKU8VWs bjUw== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=CjJLsxKm; spf=pass (google.com: domain of fm-294854-20240109073331e2b64372235c25942a-asclvq@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) smtp.mailfrom=fm-294854-20240109073331e2b64372235c25942a-AsClvq@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from mta-65-225.siemens.flowmailer.net (mta-65-225.siemens.flowmailer.net. [185.136.65.225]) by gmr-mx.google.com with ESMTPS id tv4-20020a05620a3e8400b007811b471a29si85011qkn.4.2024.01.08.23.33.32 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 08 Jan 2024 23:33:32 -0800 (PST) Received-SPF: pass (google.com: domain of fm-294854-20240109073331e2b64372235c25942a-asclvq@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) client-ip=185.136.65.225; Received: by mta-65-225.siemens.flowmailer.net with ESMTPSA id 20240109073331e2b64372235c25942a for ; Tue, 09 Jan 2024 08:33:31 +0100 X-Patchwork-Original-From: "'Jan Kiszka' via isar-users" From: Jan Kiszka To: isar-users Cc: Felix Moessbauer Subject: [PATCH v2 1/8] crossvars: Account for PACKAGE_ARCH = "${BUILD_ARCH}" Date: Tue, 9 Jan 2024 08:33:17 +0100 Message-Id: <53436f40b81b741acc11a791d1cd1a7bebe4f0f9.1704785604.git.jan.kiszka@siemens.com> In-Reply-To: References: MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-294854:519-21489:flowmailer X-Original-Sender: jan.kiszka@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=CjJLsxKm; spf=pass (google.com: domain of fm-294854-20240109073331e2b64372235c25942a-asclvq@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) smtp.mailfrom=fm-294854-20240109073331e2b64372235c25942a-AsClvq@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com X-Original-From: Jan Kiszka Reply-To: Jan Kiszka Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-Spam-Status: No, score=-1.2 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= From: Jan Kiszka 95427cc8 forgot about the case that PACKAGE_ARCH is to be derived from BUILD_ARCH - while that is considering PACKAGE_ARCH before setting BUILD_ARCH at all. Account for that case by adding the unresolved value of PACKAGE_ARCH into the cross-build case because that is what the statement is about: Set PACKAGE_ARCH to HOST_ARCH only if cross-building is enabled for a package. Fixes: 95427cc8a760 ("crossvars: Adjust logic to account for -native package builds in non-cross setups") Signed-off-by: Jan Kiszka --- meta/classes/crossvars.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/crossvars.bbclass b/meta/classes/crossvars.bbclass index a7834b99..828afe46 100644 --- a/meta/classes/crossvars.bbclass +++ b/meta/classes/crossvars.bbclass @@ -22,7 +22,7 @@ python __anonymous() { if distro_arch != host_arch and \ (package_arch == host_arch or \ - (package_arch in [distro_arch, compat_arch] and mode == "1")): + (package_arch in [distro_arch, compat_arch, '${BUILD_ARCH}'] and mode == "1")): d.setVar('BUILD_ARCH', host_arch) schroot_dir = d.getVar('SCHROOT_HOST_DIR', False) sbuild_dep = "sbuild-chroot-host" + flavor_suffix + ":do_build" From patchwork Tue Jan 9 07:33:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 3272 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Tue, 09 Jan 2024 08:33:42 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-il1-f183.google.com (mail-il1-f183.google.com [209.85.166.183]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 4097XfqR021623 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 9 Jan 2024 08:33:42 +0100 Received: by mail-il1-f183.google.com with SMTP id e9e14a558f8ab-3607d60e4c8sf25006605ab.2 for ; Mon, 08 Jan 2024 23:33:42 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1704785614; cv=pass; d=google.com; s=arc-20160816; b=xmwBGRq4/UGTo2cR97GP5fpo+ZXcoy6kQhxY9L/0mMzCyzMNV42J+oTkNB7CCDKNWL oRXt6lDrMEo8jtCGR0GsjDWeeXI5kj8xdkbNn4V7ml2WUNwVxabxBDloNhpS1PO4j+Fg pFNK6GE/6ZKQnD5IYYdtJtHOsZFIUZzKJCfBiP//dTun+wG0NcoHwdlC+fVMUebX0mUX nuKHjGjl08o7LsrDXcX9Tu3wDS17UL80MVi0v168MyCiN4u1EnIRQZkemW99op/Znll0 7VxydU1mpyVTnWDrFTbkBRmcDu8SblV5OfEPVQ3EvbX5yhP9rCi/zSVpF4lkXiY7URXe 2mgg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to:feedback-id:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=YasfeUOc/f1EKvCrbOee7Bpb1+YbK0u7fCNEDvs+EJI=; fh=xxo2rOAPT4f31TY31yIWVuVlno6QMa2Pdllc3KKolm0=; b=jXOQiz4KWzT3YtTKsZY2NYZZAWR9EIUfruMF4dV+/1vApKanuiJzBEJ92VXaL0MXCZ p6DLlvqOcSz0w44kAuZzugPorT0CmlfbmwXJmqeomjgkmzskyg+1qlTInLWEsvWG3cRz OGjwt2a0334a/rrxU4XtyfRCz30D4EBqfyUt6lDI+CiJuqWNWEOPOsRQyp8HS650Uchp iy9NgnKJSfpdkew3zGSWmd+yWkVNQ8nIaGkVxfAxQzSCU31LS1kx5CSP//oOqUXwVnAE yR9Y650Pv6phxRZmPJ3OaQbfa/OGWxOVPQ5pH3ymlNFjxHwdt1jv/iZS89UlfPBIRbI1 /QcA== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=YEnjBxiP; spf=pass (google.com: domain of fm-294854-20240109073331f5d09c9e23de9f6c31-wxxvkm@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-294854-20240109073331f5d09c9e23de9f6c31-wXXVKm@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1704785614; x=1705390414; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:feedback-id :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:from:to:cc:subject:date:message-id:reply-to; bh=YasfeUOc/f1EKvCrbOee7Bpb1+YbK0u7fCNEDvs+EJI=; b=kM4OyXEZz1V9uQRYGu/MTY9h8JC3Mv4f5hGYoDPJxAjXUxbGa7OQChDdNbek3fTGp0 6y2CzhWz5vmA0mUyyf0rQdsz3gpPsTSAttrRpFaAGpLiDR5cMNVd2Gv68b+ypInw1cF0 APZGEzprB/oDOKWFPjpDmLqXQgK09wiIMh/8SsK745LVFfckjmZE3s+BfNCdQ3eWYwI0 z+nKFTcnjp+qT4Lis98T9m1QmUe/GLoCG7vfZKaL9J4+L8iGkmepzUf7Q3dywRBZ42Dp enp0gNzg2oMFukPlNXL3MFJrInqaM5vOLtudvCeTpf5hvDoRLCnE3HmIOxC+QuoXAhV3 66Xg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704785614; x=1705390414; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:feedback-id :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:x-beenthere:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=YasfeUOc/f1EKvCrbOee7Bpb1+YbK0u7fCNEDvs+EJI=; b=oMBF7HdoxmGuP0AKDSH1PqQ3OKbkiVPHE1lodXsu2kftuA2KxDZMWdSEdQYOUZn0Nb Ha70woQQjylh44PHcYDGuEREj6tzFO1k2Q6YYrPvZa4hezKuTYLYUoyof6+FBdHo60gp zIGBgzUVPZ7di2VtYJ0sBOpH+A+moQErhbF13+C6Yg6WPhHCM/0TgPxaaHFP5tP9syDj zt1zcUnXSuWTERdWVPhBTs3Q8hmTSv/3lhMW4Zsras0WhSYa3jmBQGbK9QA5IRnA1aa7 w799FRn317EUBuLe48CKPzk0JDFkY41gWZHyvqf+Ym9vVBqLHEvFfYy31UCElIgHws6F EfFQ== X-Gm-Message-State: AOJu0YxNhde8JlzoSaH0zHwu9jwZXCqVQmym3C6MTUVIjEBhCXunYwNg u1mH3XK+H/stdP3P/c3AVks= X-Google-Smtp-Source: AGHT+IFcFSsr9gNDYr6bBuP4owAH8O6kW/L2WBezrp1BGeeOYEAbtXAT8hKXqaK3daQDdDGdFjI3zw== X-Received: by 2002:a05:6e02:1c01:b0:360:8bcf:9e39 with SMTP id l1-20020a056e021c0100b003608bcf9e39mr5217739ilh.51.1704785614164; Mon, 08 Jan 2024 23:33:34 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6e02:308d:b0:35f:c1a2:1d90 with SMTP id bf13-20020a056e02308d00b0035fc1a21d90ls1428556ilb.2.-pod-prod-07-us; Mon, 08 Jan 2024 23:33:33 -0800 (PST) X-Received: by 2002:a05:6e02:5:b0:35e:6b97:b8a4 with SMTP id bb5-20020a056e02000500b0035e6b97b8a4mr8245008ilb.4.1704785613327; Mon, 08 Jan 2024 23:33:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1704785613; cv=none; d=google.com; s=arc-20160816; b=ANJd2cTvt9MpPn74ZD4uHY8DAKNL5lgZ1rwsuqciuoQFQIIrZz0ZeAvrb5xDBXmtfI n/8pjJYCGlSF0jHi9K++JvRfUn2ArS1By3mYWKFamAybxbgh2ix6XnRcyfj4DZkrOK8l ebng8S+iQqHqg8Z/qX1/EAghLpgSD7YwOGwn7tKIE8PzAmQspa2xPEJ2hxa7cHwsenZU 7IvLs23YDgOq9YrTdajrUrNRGja1AvM1eJOnawywUgambp1hWNAi5j0SFQ2peYVHxeIF WJX7dXPORC60MkOoipWLjSyvxtK2PGZdLWtCE9wisnDVnqXxyszja1L5AQUQyxDzcxCh /dqA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=feedback-id:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=traXz1UhmfNVneM7L8R3X2iUuEjAL+j5qIwftcgsrgQ=; fh=xxo2rOAPT4f31TY31yIWVuVlno6QMa2Pdllc3KKolm0=; b=smRomwnmXX8oN1imp+40Vb9sDuVq9yvZcAj3shYfUzK4a1uxBGBMDu0b9PHlHltIah 0NtyQSO6ACHAc5M+Uy50ZeAmvd3r7PVae/P2vApEMdsmDcw3wjpffDv1Aby7qpq9/MmK Yf92lOi5J6sdvLUUvW9ctWgXMyme6LrDRkj/2mlv/rGN93fjISZ6Qrcd6mba8j6H+N6x H/8qnxt/Kx3rdFN9MlnISkIyE7Nef64k51O9nddsdD3ETIOsNqWBZUJV6z8XTON/P5lJ GX7Ivr//OqmFBAXHZiWGGFqcZUmHtCr1XKjGO02kfnE81/jCdakF5v45mASgLEIaGV7+ IbLA== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=YEnjBxiP; spf=pass (google.com: domain of fm-294854-20240109073331f5d09c9e23de9f6c31-wxxvkm@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-294854-20240109073331f5d09c9e23de9f6c31-wXXVKm@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from mta-65-226.siemens.flowmailer.net (mta-65-226.siemens.flowmailer.net. [185.136.65.226]) by gmr-mx.google.com with ESMTPS id bv12-20020a056638448c00b0046d164ee15bsi89202jab.4.2024.01.08.23.33.33 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 08 Jan 2024 23:33:33 -0800 (PST) Received-SPF: pass (google.com: domain of fm-294854-20240109073331f5d09c9e23de9f6c31-wxxvkm@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) client-ip=185.136.65.226; Received: by mta-65-226.siemens.flowmailer.net with ESMTPSA id 20240109073331f5d09c9e23de9f6c31 for ; Tue, 09 Jan 2024 08:33:31 +0100 X-Patchwork-Original-From: "'Jan Kiszka' via isar-users" From: Jan Kiszka To: isar-users Cc: Felix Moessbauer Subject: [PATCH v2 2/8] meta-isar: jh7110-u-boot-spl-tool: Use BPN instead of PN Date: Tue, 9 Jan 2024 08:33:18 +0100 Message-Id: <26a3268b6b3d535cfdeb1dfc77aef299c88c1af4.1704785604.git.jan.kiszka@siemens.com> In-Reply-To: References: MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-294854:519-21489:flowmailer X-Original-Sender: jan.kiszka@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=YEnjBxiP; spf=pass (google.com: domain of fm-294854-20240109073331f5d09c9e23de9f6c31-wxxvkm@rts-flowmailer.siemens.com designates 185.136.65.226 as permitted sender) smtp.mailfrom=fm-294854-20240109073331f5d09c9e23de9f6c31-wXXVKm@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com X-Original-From: Jan Kiszka Reply-To: Jan Kiszka Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-Spam-Status: No, score=-1.2 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= From: Jan Kiszka Fixes installation when PN is -native or -compat. Signed-off-by: Jan Kiszka --- .../jh7110-u-boot-spl-tool/jh7110-u-boot-spl-tool_0.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-isar/recipes-bsp/jh7110-u-boot-spl-tool/jh7110-u-boot-spl-tool_0.1.bb b/meta-isar/recipes-bsp/jh7110-u-boot-spl-tool/jh7110-u-boot-spl-tool_0.1.bb index 292334f6..37b52ab3 100644 --- a/meta-isar/recipes-bsp/jh7110-u-boot-spl-tool/jh7110-u-boot-spl-tool_0.1.bb +++ b/meta-isar/recipes-bsp/jh7110-u-boot-spl-tool/jh7110-u-boot-spl-tool_0.1.bb @@ -16,7 +16,7 @@ S = "${WORKDIR}/tools/spl_tool" do_prepare_build[cleandirs] += "${S}/debian" do_prepare_build(){ deb_debianize - echo "spl_tool usr/lib/jh7110-uboot-spl-tool" > ${S}/debian/${PN}.install + echo "spl_tool usr/lib/jh7110-uboot-spl-tool" > ${S}/debian/${BPN}.install } COMPATIBLE_MACHINE = "starfive-visionfive2" From patchwork Tue Jan 9 07:33:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 3275 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Tue, 09 Jan 2024 08:33:44 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-oi1-f190.google.com (mail-oi1-f190.google.com [209.85.167.190]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 4097Xhcm021639 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 9 Jan 2024 08:33:43 +0100 Received: by mail-oi1-f190.google.com with SMTP id 5614622812f47-3bd2405d326sf3584908b6e.3 for ; Mon, 08 Jan 2024 23:33:43 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1704785615; cv=pass; d=google.com; s=arc-20160816; b=qqkXoxXWprsPi6e45s8JE+2VdQp6TQ3EtHV9wZ/K7Sqd4KeZ0XXSO8FIKN5dGHO/XB /ivwxeuumj73q/E1rgbvsvcoBQtcQNvlUnn3bunp0fQJmAt1nDgEUEuxCanimNzDr/oS ctxlE489PwU5c1yaNQ/EiUO8jUfkHbav6Xa8LMb/7aVwd9EUb3OsIsNv2LxsBqgWvKb2 rLGgyFPv/9W+yMjSr0XS/svJXbZZXPjNxPB3Isu6Gk229IxK5prO+j0YIol8oDKOOfR7 g+oWPFI2d7rKVaCCD3O2hAwvmSMVshMdhbq+02gm+PIa+lVqL611FjDpJ0zt21LpLJ8H cAyw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to:feedback-id:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=IMft/sLykgJY6EKlhMBT9RSAMZdJayUmdZ/yig7MbPM=; fh=xxo2rOAPT4f31TY31yIWVuVlno6QMa2Pdllc3KKolm0=; b=mItn+3QixKJRWO8DPrF/nJWSFlQtXovP1BYacmfkbPjSnsDKxKWubLM8ZyHOMsRaHe buslaZsL4B00jhzjcWGxutn8Egmd3Iihp3qb2zfjBSAxQ084JbdkBtG2U2yAaIa9niJN pNNtSYc3KG2mVlG1cqbzQmHBtgOhIm6urKLQr7mJ/Fxi6oMQz0rDEyqJDcM1TfJVsOcB qxnvBXYqoyt82ezQA+DoCjq+skmZbEWeqO1X2hR1weu+lVif6aSv9WhL7smp72G0N0Y2 /OvACfwSVBat4zdtNkOk74gFOgBIJlq6gUakVqrTD3lo6vdRwM2Zr8A0DYHsqT7Jb3+e YvhQ== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=VuRLRUuw; spf=pass (google.com: domain of fm-294854-20240109073331e6a039fba9127a3f62-y6gvgs@rts-flowmailer.siemens.com designates 185.136.65.227 as permitted sender) smtp.mailfrom=fm-294854-20240109073331e6a039fba9127a3f62-y6GVGS@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1704785615; x=1705390415; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:feedback-id :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:from:to:cc:subject:date:message-id:reply-to; bh=IMft/sLykgJY6EKlhMBT9RSAMZdJayUmdZ/yig7MbPM=; b=J0OHyXfuF90HWmPunBbGBBkacJi4u6YfQhbseXQQE+eLj+1v4KFcPeeWDbK2sXlNd3 h2NyVRaf+dFRT0ABR3pk1UxPsCe9iAud7qp2eospPzb+dgzNP+dYWVBLsv+M2qz3Q8Um li/QXPelq3Gw17kGQ1vq8UZXc9kDvFwLefL2X160974KXUwKyikhzvkT81+vaBFFMeHD H4b74toFU/AVlVctTgqg6ODzinh02NEDJoUVwWx3kb9igHlC6/5f3g5ZOCJli7Vcckpp z+Wl38/+LiyH6or1+mYk7LsbwzZKE1xxvlLoK0KG4+0V6gxNvlMuwa/iJOO8YqaMa0fJ soeA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704785615; x=1705390415; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:feedback-id :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:x-beenthere:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=IMft/sLykgJY6EKlhMBT9RSAMZdJayUmdZ/yig7MbPM=; b=lTtBfm36W0gsmBfMfpo4kcW/4KJLcMoBRp15httKPnSTokOTp5TiGBQattUV72Z7pS SRfNGtmCfS5hMCyLMf1NyVgV5OWLLkqTp80gRq0cZ04tmcVzj7VoZBn8P4w6eqzyLwbh mDdjlC8YQHkYbHCI8WK6zFg55yI0bDpZVrm1j4vo51BXLApqLht5lxBbwB6UUInFcCKo 2MzWN1kLFHzWRdJlzYoD23woPZ/Fb5T4FucptH1CTkpi06WAd8RdV15qmCedqS/zkNsc CfUanzivewoPqm2pJsyytm+UPm9hfGaaZGGnpgE027GEqwn3WGFv8JKqjv1g4QAZHJeW fiQA== X-Gm-Message-State: AOJu0YyBDc2oyVMXyxNLPo5ceta3f91GTJfPmcCEOE1UJjVCvegEGTQ4 zARf6bCTDG4AnVHeg+E90hY= X-Google-Smtp-Source: AGHT+IFOXGqVz+75fWguJxmMe+U/m5jUTakYjzsMsNZKlLWyF/g4DDBcEGbQkjD9c92sYkCAfEleqg== X-Received: by 2002:a05:6808:3b0:b0:3bc:1f34:63c4 with SMTP id n16-20020a05680803b000b003bc1f3463c4mr5353208oie.113.1704785615643; Mon, 08 Jan 2024 23:33:35 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6a00:1784:b0:6ce:81c0:bf81 with SMTP id s4-20020a056a00178400b006ce81c0bf81ls750934pfg.2.-pod-prod-01-us; Mon, 08 Jan 2024 23:33:34 -0800 (PST) X-Received: by 2002:a05:6a00:3c81:b0:6d9:d770:bb70 with SMTP id lm1-20020a056a003c8100b006d9d770bb70mr2576226pfb.33.1704785614412; Mon, 08 Jan 2024 23:33:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1704785614; cv=none; d=google.com; s=arc-20160816; b=GH4q28hfvKkTOQ9mLrQZEfO1vHRtlBxCVxzRnWu7E8XhnR1y9JDJOf1gzJhkNpygfZ PoCxAjR87BoN5GiNmlbe6sIyZPqSGR0LfJrJIPqb4HAJUKp0npY/UrxoIRl8a/3Opk5H 6V8XJU6EXc0SfJF8vG981CRpUsVYY6w89ae6dxaFiI0+XCqHmMwiEyFhL7Ee89GjTIH1 /Qk1Jv1BGAfArbNQJ63Ew711hmgcDWoWaBSVoZyQEFKyiicZlOIT+EALIOCUdFVziFH5 JjsK9GAu9G0ExlgXRpAM/hxQRFVtAxK5mzmv+DYXdPv9RmZXaRvwb1oBRo8cX9hPQgnC AE5w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=feedback-id:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=rCeyZlrPPjTnR+gr12v1T0N4rphv6x0HyxO+iEIcSWk=; fh=xxo2rOAPT4f31TY31yIWVuVlno6QMa2Pdllc3KKolm0=; b=mcbJ6MVwWkB2liCtCgVkLc6xylh+qNviMAOC5p8XHgEPf3eu1abC/wmMIIr705qftP /uWl8jiPFupc7rqTzATX87QdM9eElypgBPsk104R/XS95IP+yRc0xGAUw31CwrFvUkx7 MFtU2edxxIDmcH4g21sbAJNFYal8Kaj1imNWCxWcXYHdaq671kUz2Iuz1//hB5u5ZcB6 cHc1991I3qYpDEPbu+4k8JD43FZe0UazdvJFpLiU7p3lQNfw6/vQIMeCloNxMaj5q00f vcgQTLLpb1sRdPQDoasMGf2SqGOUWjWB2UonVButc99msi4X3lf3z3TdeXMiq/XSB1Qd 9+ew== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=VuRLRUuw; spf=pass (google.com: domain of fm-294854-20240109073331e6a039fba9127a3f62-y6gvgs@rts-flowmailer.siemens.com designates 185.136.65.227 as permitted sender) smtp.mailfrom=fm-294854-20240109073331e6a039fba9127a3f62-y6GVGS@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from mta-65-227.siemens.flowmailer.net (mta-65-227.siemens.flowmailer.net. [185.136.65.227]) by gmr-mx.google.com with ESMTPS id x27-20020a056a00189b00b006d9b2682c7dsi69159pfh.2.2024.01.08.23.33.33 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 08 Jan 2024 23:33:33 -0800 (PST) Received-SPF: pass (google.com: domain of fm-294854-20240109073331e6a039fba9127a3f62-y6gvgs@rts-flowmailer.siemens.com designates 185.136.65.227 as permitted sender) client-ip=185.136.65.227; Received: by mta-65-227.siemens.flowmailer.net with ESMTPSA id 20240109073331e6a039fba9127a3f62 for ; Tue, 09 Jan 2024 08:33:31 +0100 X-Patchwork-Original-From: "'Jan Kiszka' via isar-users" From: Jan Kiszka To: isar-users Cc: Felix Moessbauer Subject: [PATCH v2 3/8] meta-isar: starfive-visionfive2: Use kernel DTB Date: Tue, 9 Jan 2024 08:33:19 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-294854:519-21489:flowmailer X-Original-Sender: jan.kiszka@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=VuRLRUuw; spf=pass (google.com: domain of fm-294854-20240109073331e6a039fba9127a3f62-y6gvgs@rts-flowmailer.siemens.com designates 185.136.65.227 as permitted sender) smtp.mailfrom=fm-294854-20240109073331e6a039fba9127a3f62-y6GVGS@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com X-Original-From: Jan Kiszka Reply-To: Jan Kiszka Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-Spam-Status: No, score=-1.2 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= From: Jan Kiszka This will be needed when switching to upstream U-Boot as the DTB there is not compatible with currently used downstream kernel. Signed-off-by: Jan Kiszka --- meta-isar/conf/machine/starfive-visionfive2.conf | 3 ++- .../scripts/lib/wic/canned-wks/starfive-visionfive2.wks.in | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/meta-isar/conf/machine/starfive-visionfive2.conf b/meta-isar/conf/machine/starfive-visionfive2.conf index d96041fc..806d914c 100644 --- a/meta-isar/conf/machine/starfive-visionfive2.conf +++ b/meta-isar/conf/machine/starfive-visionfive2.conf @@ -21,4 +21,5 @@ IMAGER_BUILD_DEPS += " \ # DTB file for OpenSBI DTB_UBOOT_JH7110_VF2 = "starfive_visionfive2.dtb" # DTB file for booting -DTB_FILES = "starfive/jh7110-visionfive-v2.dtb" +DTB_VISIONFIVE2 = "jh7110-visionfive-v2.dtb" +DTB_FILES = "starfive/${DTB_VISIONFIVE2}" diff --git a/meta-isar/scripts/lib/wic/canned-wks/starfive-visionfive2.wks.in b/meta-isar/scripts/lib/wic/canned-wks/starfive-visionfive2.wks.in index 0f3d76a9..99156f81 100644 --- a/meta-isar/scripts/lib/wic/canned-wks/starfive-visionfive2.wks.in +++ b/meta-isar/scripts/lib/wic/canned-wks/starfive-visionfive2.wks.in @@ -16,7 +16,7 @@ part --source rawcopy --sourceparams "file=/usr/share/jh7110-uboot-spl-image/u-b # U-Boot FIT part --source rawcopy --sourceparams "file=/usr/share/visionfive2-u-boot-firmware/visionfive2_fw_payload.img" --ondisk mmcblk1 --fixed-size 4M --offset 4M --part-type 5B193300-FC78-40CD-8002-E86C45580B47 # EFI -part /boot --source bootimg-efi-isar --sourceparams "loader=systemd-boot" --use-uuid --label efi --part-type EF00 --align 1024 +part /boot --source bootimg-efi-isar --sourceparams "loader=systemd-boot,dtb=${DTB_VISIONFIVE2}" --use-uuid --label efi --part-type EF00 --align 1024 # rootfs part / --source rootfs --use-uuid --fstype ext4 --mkfs-extraopts "-T default" --label image --active --align 1024 --exclude-path=boot/ From patchwork Tue Jan 9 07:33:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 3274 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Tue, 09 Jan 2024 08:33:44 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-yw1-f185.google.com (mail-yw1-f185.google.com [209.85.128.185]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 4097Xh8Z021640 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 9 Jan 2024 08:33:43 +0100 Received: by mail-yw1-f185.google.com with SMTP id 00721157ae682-5e73bd9079esf47692747b3.2 for ; Mon, 08 Jan 2024 23:33:43 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1704785614; cv=pass; d=google.com; s=arc-20160816; b=XS/ZPJnc9he2z+EzGwyJiDPSdIuCWdxLUUExyAynYsgH4dJIAy+i3CgiXSUeYWMZJ5 VnI20C6UbpRpDQ54sLUyx1InBOc8nudejpx5IwTpilRHBkgV+BGjf+A2owvm84S1TZot eARC9aNH6QmKcHMeCkp3malbqSPe77twKzsLcpl39G1fiXj0ub6CHV3rK7be6264LtZA aIIFsPN5xHPwGAJ2TEjTUzFpGvBliNfyR0IIBraXLKMjuE9Rmelzw36AzopUxXfjVygy ZyO2mi0Xs6sZkHvk5axAT+MZlbSo+wt57N5Tbpn/0I0LIUA1sFO6+0U67CckFfuJAksS /Cqg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to:feedback-id:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=Fw77up1Xxw9lRQX1smfMEZuynZka0/VMjGGCMuLw/5w=; fh=xxo2rOAPT4f31TY31yIWVuVlno6QMa2Pdllc3KKolm0=; b=VdolSLRYvWv7ifH8+m9j7nKxOkiUdq9O6KnLgOlpcJIbrFjn4bUemq+cei/uwr/Zof 7zOJ6BaO6M9OMJzJibh+m4sgHo2zYKVqzNIYbCY8tyX9pHOn4VdRf0ShMmd1WvUUagsB yWq2SLWWujVJRj5KY9ITSMISf/k7ZcYUcTwQKdY/lLIfb8ktLw5a2Dm811odaW0Rp5LA /4N2Xx0fqmd47LaH4SON8RRLpOCQf4Exr5XgT6pFRxStTSk7ooeMd1Et46gLe04rJx7x HoTWZoW4rgf3td1Hi4aoZLhk6BoWRY9LezryK0nL7AbPzENna5ae0ro1b3k99B79fYS9 b8Sg== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=gmt5ssgu; spf=pass (google.com: domain of fm-294854-20240109073331867bf82199f1f60719-1zooys@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) smtp.mailfrom=fm-294854-20240109073331867bf82199f1f60719-1zooYS@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1704785614; x=1705390414; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:feedback-id :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:from:to:cc:subject:date:message-id:reply-to; bh=Fw77up1Xxw9lRQX1smfMEZuynZka0/VMjGGCMuLw/5w=; b=gJmW1iiWqWtOGCAdIuYnJeVLp8fllVORY2lwwmdU7wl8d7QENIGTW43xpmkwHlL8wW CF1u9M5j7tpQt9Go2to4JQCk52vOqERhbCzkY5ZyVOuy7phz1HmvcgHKXETv0WfM8xc7 l3gAZN4au9596m0AxZRef+Mmyj1oljfA4uvsXRJgttq6bUpgR6Ym6x3WPeMhu+by6YXy s5EXn9jGx6xGKDgztQOecgqwEmIDNM+9j86x/9bvufR4Coig9Ngh+CHhqLqPtYsWhRq3 3DsOoyKqCsvM9nXhP2o6kOLrGMm6IKMKWKsc4HktTeKSBNoKHzsVODCw0MeW3uICXa89 euxQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704785614; x=1705390414; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:feedback-id :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:x-beenthere:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=Fw77up1Xxw9lRQX1smfMEZuynZka0/VMjGGCMuLw/5w=; b=e0xlLqgT2F4vvXkmfSYU9B4JKixfJuYYaDEejs97977yq0ygzP2pXAWyFTfENk9fmx ZrDfvYmQg9asRNfJWCRkK6upgouw+7kLZ0H1jErRXJOqzPqLATEV+HYXlQqCRLZgc8XX GindZWXvXTTu+cdRHJfS5oPaBF43GJPn7j/Bl3A8MpRAlA+hhQmTT/bkMhkB76Gx3PjS bZaBjOH+2UnRE1QUPEuHPrteIdsMO0yGuSy3fmRBuRRNEoSgn5UgDTYnz0I0bDIVPEy0 N1CMCzpqk+yDV8zwS5BBeY1BsmfVG2som8xsPhKCs5HgCaTDnk8hoUVyksj6TudkOCoB k7pw== X-Gm-Message-State: AOJu0YwC3Z7gX9hzOc9m+T1KfOtShOHNaAFG/BkZ94Kpk9zEu3HB0zD/ HtlKtPLMP/LITrA3B3+IMSs= X-Google-Smtp-Source: AGHT+IG4PqknEETvIOGcO2f4xM+M+ZJ+X3+i/GTh8BuuOIGs2AJXnAV4r5NxQ9hO08FeEBLf6Xa4Uw== X-Received: by 2002:a25:ae8c:0:b0:dbd:f9c5:5d6b with SMTP id b12-20020a25ae8c000000b00dbdf9c55d6bmr2720861ybj.79.1704785614616; Mon, 08 Jan 2024 23:33:34 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a25:e093:0:b0:dbd:4632:de3 with SMTP id x141-20020a25e093000000b00dbd46320de3ls541845ybg.0.-pod-prod-06-us; Mon, 08 Jan 2024 23:33:34 -0800 (PST) X-Received: by 2002:a05:6902:1b93:b0:dbd:130f:651f with SMTP id ei19-20020a0569021b9300b00dbd130f651fmr2583281ybb.109.1704785613775; Mon, 08 Jan 2024 23:33:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1704785613; cv=none; d=google.com; s=arc-20160816; b=HZQQ4WssGfGDa8QF23hyDY6sNbTBafeX0X9Yl7Ra0vfuhajezE+CUT1ZyJ9LoUHchB Gy+tIS5DrF5mwA+TuWqRaNM0I3HcXj8rJ+KvHEoGy4kqEikgLPcLLMZPn3HHHVQvwvwZ tzBE1l/it4+wSQxEYGMOoeArHEcesHONFEXBkBU2cgLj0M7vfVeCmmF0uU0izVSKXq9K Vagz+XfpKuZ27Py0uWyVrbKTjxLz80cJK4Q4e8JQTnKKRTzwMf0kQi5NR4Uxn/YmscRz +LmRsWDF2WXFOoJWHDZaXKTiB6bnrIU8oxOMehrU6TPyG/KKaZSW8uG495IahisHGizv dpOw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=feedback-id:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=9xTTp/Ox8irDijbpOoi2iJZCANkYLvIT7i+cmlaMUdI=; fh=xxo2rOAPT4f31TY31yIWVuVlno6QMa2Pdllc3KKolm0=; b=GCOa0jDKD7etBX5RuNBXHAcefFKkxEqZYEcyIyLROX38N1DoHvX36SgzB6eTZIDXeo GoBFd+l9bVsxCxiUOLvfrKUuFJHTWznoy/lSdm2YnGLSXH2qqbtZHSpYddTfjelH5mz+ JkAcTPZ02CG4fT4IAhY8rD9ZaxUU35IWk/L8UI8KyuwJemevPdl8OaYZF3+dV573sdPL S/byo1RSAUjgoFMQcjxyD5fl5st0DfEM5kuHJzHAIeE+cS6gp1fAuDfErY8gHtlqF0Wt 1LHzuKrUs790jmcuCWeoxTW2sg62fdEfCqoa/EfLqkFvYKaRvbuZZRmJhQs+13MREjRd M16Q== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=gmt5ssgu; spf=pass (google.com: domain of fm-294854-20240109073331867bf82199f1f60719-1zooys@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) smtp.mailfrom=fm-294854-20240109073331867bf82199f1f60719-1zooYS@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from mta-65-225.siemens.flowmailer.net (mta-65-225.siemens.flowmailer.net. [185.136.65.225]) by gmr-mx.google.com with ESMTPS id 126-20020a251984000000b00dbdaeed38d7si80167ybz.3.2024.01.08.23.33.33 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 08 Jan 2024 23:33:33 -0800 (PST) Received-SPF: pass (google.com: domain of fm-294854-20240109073331867bf82199f1f60719-1zooys@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) client-ip=185.136.65.225; Received: by mta-65-225.siemens.flowmailer.net with ESMTPSA id 20240109073331867bf82199f1f60719 for ; Tue, 09 Jan 2024 08:33:32 +0100 X-Patchwork-Original-From: "'Jan Kiszka' via isar-users" From: Jan Kiszka To: isar-users Cc: Felix Moessbauer Subject: [PATCH v2 4/8] meta-isar: jh7110-u-boot-spl-tool: Rework Date: Tue, 9 Jan 2024 08:33:20 +0100 Message-Id: <7b4f32f614c62659686ce4cfe3984a7d9c64b3ab.1704785604.git.jan.kiszka@siemens.com> In-Reply-To: References: MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-294854:519-21489:flowmailer X-Original-Sender: jan.kiszka@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=gmt5ssgu; spf=pass (google.com: domain of fm-294854-20240109073331867bf82199f1f60719-1zooys@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) smtp.mailfrom=fm-294854-20240109073331867bf82199f1f60719-1zooYS@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com X-Original-From: Jan Kiszka Reply-To: Jan Kiszka Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-Spam-Status: No, score=-1.2 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= From: Jan Kiszka Install the binary as normal tool under /usr/bin to simplify its usage. Signed-off-by: Jan Kiszka --- meta-isar/recipes-bsp/jh7110-u-boot-spl-image/files/rules | 2 +- ...110-u-boot-spl-tool_0.1.bb => jh7110-u-boot-spl-tool_0.2.bb} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename meta-isar/recipes-bsp/jh7110-u-boot-spl-tool/{jh7110-u-boot-spl-tool_0.1.bb => jh7110-u-boot-spl-tool_0.2.bb} (85%) diff --git a/meta-isar/recipes-bsp/jh7110-u-boot-spl-image/files/rules b/meta-isar/recipes-bsp/jh7110-u-boot-spl-image/files/rules index 6a25dd36..a8b2c6b8 100644 --- a/meta-isar/recipes-bsp/jh7110-u-boot-spl-image/files/rules +++ b/meta-isar/recipes-bsp/jh7110-u-boot-spl-image/files/rules @@ -4,7 +4,7 @@ U_BOOT_SPL_BIN := /usr/lib/u-boot/starfive-visionfive2/u-boot-spl.bin override_dh_auto_build: cp $(U_BOOT_SPL_BIN) u-boot-spl.bin - /usr/lib/jh7110-uboot-spl-tool/spl_tool -c -f u-boot-spl.bin + spl_tool -c -f u-boot-spl.bin %: dh \$@ diff --git a/meta-isar/recipes-bsp/jh7110-u-boot-spl-tool/jh7110-u-boot-spl-tool_0.1.bb b/meta-isar/recipes-bsp/jh7110-u-boot-spl-tool/jh7110-u-boot-spl-tool_0.2.bb similarity index 85% rename from meta-isar/recipes-bsp/jh7110-u-boot-spl-tool/jh7110-u-boot-spl-tool_0.1.bb rename to meta-isar/recipes-bsp/jh7110-u-boot-spl-tool/jh7110-u-boot-spl-tool_0.2.bb index 37b52ab3..6c998029 100644 --- a/meta-isar/recipes-bsp/jh7110-u-boot-spl-tool/jh7110-u-boot-spl-tool_0.1.bb +++ b/meta-isar/recipes-bsp/jh7110-u-boot-spl-tool/jh7110-u-boot-spl-tool_0.2.bb @@ -16,7 +16,7 @@ S = "${WORKDIR}/tools/spl_tool" do_prepare_build[cleandirs] += "${S}/debian" do_prepare_build(){ deb_debianize - echo "spl_tool usr/lib/jh7110-uboot-spl-tool" > ${S}/debian/${BPN}.install + echo "spl_tool usr/bin" > ${S}/debian/${BPN}.install } COMPATIBLE_MACHINE = "starfive-visionfive2" From patchwork Tue Jan 9 07:33:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 3269 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Tue, 09 Jan 2024 08:33:40 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-qv1-f55.google.com (mail-qv1-f55.google.com [209.85.219.55]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 4097XdqC021585 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 9 Jan 2024 08:33:39 +0100 Received: by mail-qv1-f55.google.com with SMTP id 6a1803df08f44-680118b101fsf58350306d6.3 for ; Mon, 08 Jan 2024 23:33:39 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1704785613; cv=pass; d=google.com; s=arc-20160816; b=inrn2MBvgoi/DDeLaDciPE3hCMWudOl0Xh+i7ff+q8xd9fX1tHYBWU6MFiTzy/Uax/ DjvziIX7BtLhdQ7vS4KoLRWLC5s+7ToAum+wWbP7t0cwLxEswsvQUKaRZhaUSkvTxTTR zic95rH5UGpHxy0t+c6fftJmueZQoz5JZK8DXv3tB9CY8pSFOl3vbfRDIpQugnDu0usx jZbKCQ1WVG+kQ+lujKr5gp1AYkw1kOYo5GlUFWdf5kDXrBm4fGR6oTA9sBsFTD7P6u1h PTtZGsYZz2gIEIYJd6Bqzsynbw6+g02E7qJRg4s2uwIX86mmA04yrIYqzqHNxdkQKch1 msTw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to:feedback-id:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=zg5H78woy8hK6K0yFKobyPBkol5lUDeHRn6Yv4R8akk=; fh=xxo2rOAPT4f31TY31yIWVuVlno6QMa2Pdllc3KKolm0=; b=CNzReB291gYnaVi0FtqgLyfNWyLh2EX3UoTwrX7oQT451ewLQFyREGBUe4WFLbdO05 Ry2VU7je15YI8wjuoc4NqJIKEbUTRPSCTuuzKc/ZcVgI0WOsjM84JrVeIXSG2NlXDANP 9jIjDBePtaByRzLp/5HT9/5j4Ssp91Tr3uqXq5O5VR71Izbyp0N+LqKBPpea1eMLyOfc 9kym3ceW7LyxoZFpsHO3tOQfh5s0y6w//dGy8O4DXtyktdAq2KN0/3MQP+N8gfFA2axI tUxgCW77WRpSqs3z2YCyLsI+DI77EurrzWsdYdnjwBuwQgMAOaHHgMrYDevtsgpdLF6k g5HQ== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=CrWlOaiV; spf=pass (google.com: domain of fm-294854-202401090733322bb8b3970bcf18b14d-edtm2m@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) smtp.mailfrom=fm-294854-202401090733322bb8b3970bcf18b14d-eDtM2m@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1704785613; x=1705390413; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:feedback-id :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:from:to:cc:subject:date:message-id:reply-to; bh=zg5H78woy8hK6K0yFKobyPBkol5lUDeHRn6Yv4R8akk=; b=worcDZLqsM6x6oF7Dq0aakDHzQyQh4xjQW5vP/PT77kwUQ8noCFFHlunx/soaz9ieE vDtMX70TvQhwr6Fz2lFdb9KGYwipca/jo2lNcklKLyMNxjfqtF34VpK3h4bf5AJfMwel xNUNhCMz5gIDpeTPYfnphe6yV1Yec2M9a49eL6ROwJwYuys2t9KQxsJ0WXr3cFL67/Nz UtvU4xAhlR0haNrlCQHnQk2faCVqCKFCOJ4zl7MdE2FS98beZ0OqlxfE1S2NLcUFKDq/ /OSgjik4wQM1EPz/p0rv3jOi9w42w0ert5J0jMp9hgSbYPcJy99u0sDHnVxf6LL2k0gT QHUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704785613; x=1705390413; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:feedback-id :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:x-beenthere:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=zg5H78woy8hK6K0yFKobyPBkol5lUDeHRn6Yv4R8akk=; b=evG9jMloItVJPVxI8Uvu27E5eHaeilph9fSy8mHbHon96fxCH7AmCVhsceMOgletLk GpLbcO1NgxnNX43qW/5o0aopxz5eMtB4TMEhgC4Ww2bD3MidJJfesNHWSvYEMBjw7gAj H89WeCrIRh5fayx3bHwIwGkM9bKiHkwKEZhi72A3G4UF65UEtFnLP7Ux47B3Ig34JWE8 FAV8tMnuJNMK43YuWoZuFvFiSjfi4136wD/+EcElIYIFo4tbN/nzOg4AqXf3xSEmebBQ lqI5oCkw8rZs4mkWAWDL3YKJGjokLSWcHTQwR+RA1QCC6u+oHLocD/vAn3OgOTnZn+rJ l30w== X-Gm-Message-State: AOJu0YzF0LcUyCgy7CbBSIyfjiEWoMxq+LfSh47Bul2h0HsbvuESnz5D CSc9kzxK40B0NvqODo8RRO4= X-Google-Smtp-Source: AGHT+IFLgMfZWUaV2xRXOhMw+pJmH7wTTynPia/tavj1YEookHbZwHWF3NmvzLp8zHRwfnGGe77TZg== X-Received: by 2002:a05:6214:1c44:b0:67f:d69e:9c45 with SMTP id if4-20020a0562141c4400b0067fd69e9c45mr7051172qvb.11.1704785613577; Mon, 08 Jan 2024 23:33:33 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6214:260d:b0:67f:38e1:6983 with SMTP id gu13-20020a056214260d00b0067f38e16983ls1863215qvb.2.-pod-prod-09-us; Mon, 08 Jan 2024 23:33:33 -0800 (PST) X-Received: by 2002:a05:620a:4506:b0:781:1c3c:da61 with SMTP id t6-20020a05620a450600b007811c3cda61mr5966824qkp.154.1704785612751; Mon, 08 Jan 2024 23:33:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1704785612; cv=none; d=google.com; s=arc-20160816; b=pwAuVT645AVDf5otzkLNtINuLk3qlHQ+QDZmT1nJNjPcWHG2rhL3HDTP1KtdC1xm68 XtRABULxuNrpQYjAuOk+gqAzktdvGEjDAizPrFHbMt8dftMdCr8L0LZEenbrQrXaIa8B CffnL71xpeQ/Ptjn+w2T8Qt7x0we+uVKKNvEwCu1Uh0id3bSg+Nb5BK9tF2J3jY9Xzxa 3neIZhuA4XXg4I+wAnypbUn9TsM2kOnRlCPPATG5VEOp/oB5GN2Chq0wsbWmG/G/7D67 wkUs/oFtLMukaUe2NATr4/gWZ2UjVD2BIgEdl19wG4zfh8uFswu5eOZ+THC/RFhJfIxe Tu2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=feedback-id:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=whX3ebLF0KsQg+nAPU8R8d4LP74hTyJLlDvDPkAPbH8=; fh=xxo2rOAPT4f31TY31yIWVuVlno6QMa2Pdllc3KKolm0=; b=VkIsiBYOk574cPguxOf3Q8RicxRYP1ovLYdE3HZy7rxZwVkySSDkIwv1+cqWr4VYap gHicwwq9tFdJVUVswFbVycBzx0CI92aVLLKcthcYLL+MQOJptaOS8G6hUb+vPeyd7Chi u7RWMu7tE6esufCrTn3mdvAnb2b0mN5hf3e/eHbhNyxhXK2odl8i+bDWLEkujqp+I7X+ NF4BOA+HiZZzj01ml/ZgDT2SnbpiZSFzblodwhk3XXwfkActTXUlbhjRP43YOixgbuKU pF5lgRtzsKkzz6RhgHZFwEi8+3R7uqgQsY5SFN8b3pXgw+4sJPVkSWuBvYULUpV13Zoh 1umw== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=CrWlOaiV; spf=pass (google.com: domain of fm-294854-202401090733322bb8b3970bcf18b14d-edtm2m@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) smtp.mailfrom=fm-294854-202401090733322bb8b3970bcf18b14d-eDtM2m@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from mta-65-225.siemens.flowmailer.net (mta-65-225.siemens.flowmailer.net. [185.136.65.225]) by gmr-mx.google.com with ESMTPS id tv4-20020a05620a3e8400b007811b471a29si85011qkn.4.2024.01.08.23.33.32 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 08 Jan 2024 23:33:32 -0800 (PST) Received-SPF: pass (google.com: domain of fm-294854-202401090733322bb8b3970bcf18b14d-edtm2m@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) client-ip=185.136.65.225; Received: by mta-65-225.siemens.flowmailer.net with ESMTPSA id 202401090733322bb8b3970bcf18b14d for ; Tue, 09 Jan 2024 08:33:32 +0100 X-Patchwork-Original-From: "'Jan Kiszka' via isar-users" From: Jan Kiszka To: isar-users Cc: Felix Moessbauer Subject: [PATCH v2 5/8] meta-isar: starfive-visionfive2: Switch to upstream U-Boot Date: Tue, 9 Jan 2024 08:33:21 +0100 Message-Id: <1cf405a41709494b23ce75f83d8c4047f67214c6.1704785604.git.jan.kiszka@siemens.com> In-Reply-To: References: MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-294854:519-21489:flowmailer X-Original-Sender: jan.kiszka@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=CrWlOaiV; spf=pass (google.com: domain of fm-294854-202401090733322bb8b3970bcf18b14d-edtm2m@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) smtp.mailfrom=fm-294854-202401090733322bb8b3970bcf18b14d-eDtM2m@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com X-Original-From: Jan Kiszka Reply-To: Jan Kiszka Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-Spam-Status: No, score=0.1 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, NUMERIC_HTTP_ADDR,RCVD_IN_MSPIKE_H2,SPF_PASS,URI_HEX autolearn=no autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= From: Jan Kiszka There are no more reasons to use the vendor tree, U-Boot 2023.10 sufficiently supports the board. Moving upstream allows for significant simplifications in the build. We are now building OpenSBI first and are then using U-Boot to finish all artifacts needed for the image. The wks file is updated accordingly, switching the GUID of the U-Boot partition to the one upstream is recommending. Unneeded options for the first two partitions are dropped at this chance. Signed-off-by: Jan Kiszka --- .../conf/machine/starfive-visionfive2.conf | 10 ++---- .../opensbi/files/starfive-visionfive2-rules | 12 +++++++ .../files/starfive-visionfive2-rules.tmpl | 17 --------- ...ensbi-starfive-visionfive2_1.2+20230310.bb | 11 ++---- .../files/starfive-visionfive2-rules.tmpl | 35 +++++++++++++++++++ ...-starfive-visionfive2_2021.10+VF2-3.0.4.bb | 31 ---------------- .../u-boot-starfive-visionfive2_2023.10.bb | 29 +++++++++++++++ .../canned-wks/starfive-visionfive2.wks.in | 4 +-- 8 files changed, 82 insertions(+), 67 deletions(-) create mode 100644 meta-isar/recipes-bsp/opensbi/files/starfive-visionfive2-rules delete mode 100644 meta-isar/recipes-bsp/opensbi/files/starfive-visionfive2-rules.tmpl create mode 100755 meta-isar/recipes-bsp/u-boot/files/starfive-visionfive2-rules.tmpl delete mode 100644 meta-isar/recipes-bsp/u-boot/u-boot-starfive-visionfive2_2021.10+VF2-3.0.4.bb create mode 100644 meta-isar/recipes-bsp/u-boot/u-boot-starfive-visionfive2_2023.10.bb diff --git a/meta-isar/conf/machine/starfive-visionfive2.conf b/meta-isar/conf/machine/starfive-visionfive2.conf index 806d914c..c7f72bb3 100644 --- a/meta-isar/conf/machine/starfive-visionfive2.conf +++ b/meta-isar/conf/machine/starfive-visionfive2.conf @@ -8,18 +8,12 @@ DISTRO_ARCH = "riscv64" KERNEL_NAME ?= "starfive" IMAGE_FSTYPES ?= "wic" - WKS_FILE ?= "starfive-visionfive2.wks.in" IMAGER_INSTALL:wic += " \ - jh7110-u-boot-spl-image \ - visionfive2-u-boot-firmware \ + u-boot-starfive-visionfive2 \ ${SYSTEMD_BOOTLOADER_INSTALL}" -IMAGER_BUILD_DEPS += " \ - jh7110-u-boot-spl-image \ - visionfive2-u-boot-firmware" +IMAGER_BUILD_DEPS += "u-boot-starfive-visionfive2" -# DTB file for OpenSBI -DTB_UBOOT_JH7110_VF2 = "starfive_visionfive2.dtb" # DTB file for booting DTB_VISIONFIVE2 = "jh7110-visionfive-v2.dtb" DTB_FILES = "starfive/${DTB_VISIONFIVE2}" diff --git a/meta-isar/recipes-bsp/opensbi/files/starfive-visionfive2-rules b/meta-isar/recipes-bsp/opensbi/files/starfive-visionfive2-rules new file mode 100644 index 00000000..452ff356 --- /dev/null +++ b/meta-isar/recipes-bsp/opensbi/files/starfive-visionfive2-rules @@ -0,0 +1,12 @@ +#!/usr/bin/make -f + +ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE)) +export CROSS_COMPILE=$(DEB_HOST_GNU_TYPE)- +endif + +override_dh_auto_build: + CFLAGS= LDFLAGS= $(MAKE) $(PARALLEL_MAKE) \ + PLATFORM=generic FW_TEXT_START=0x40000000 FW_OPTIONS=0 + +%: + dh $@ diff --git a/meta-isar/recipes-bsp/opensbi/files/starfive-visionfive2-rules.tmpl b/meta-isar/recipes-bsp/opensbi/files/starfive-visionfive2-rules.tmpl deleted file mode 100644 index 5f35c1c2..00000000 --- a/meta-isar/recipes-bsp/opensbi/files/starfive-visionfive2-rules.tmpl +++ /dev/null @@ -1,17 +0,0 @@ -#!/usr/bin/make -f - -ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE)) -export CROSS_COMPILE=$(DEB_HOST_GNU_TYPE)- -endif - -UBOOT_DTB_FILE := /usr/share/u-boot/starfive-visionfive2/${DTB_UBOOT_JH7110_VF2} -FW_TEXT_START := 0x40000000 - -override_dh_auto_build: - CFLAGS= LDFLAGS= $(MAKE) $(PARALLEL_MAKE) PLATFORM=generic \ - FW_PAYLOAD_PATH=/usr/lib/u-boot/starfive-visionfive2/u-boot.bin \ - FW_FDT_PATH=$(UBOOT_DTB_FILE) \ - FW_TEXT_START=$(FW_TEXT_START) - -%: - dh $@ diff --git a/meta-isar/recipes-bsp/opensbi/opensbi-starfive-visionfive2_1.2+20230310.bb b/meta-isar/recipes-bsp/opensbi/opensbi-starfive-visionfive2_1.2+20230310.bb index f6d6905a..afbba0f3 100644 --- a/meta-isar/recipes-bsp/opensbi/opensbi-starfive-visionfive2_1.2+20230310.bb +++ b/meta-isar/recipes-bsp/opensbi/opensbi-starfive-visionfive2_1.2+20230310.bb @@ -9,25 +9,18 @@ DESCRIPTION = "OpenSBI firmware for StarFive VisionFive 2" SRC_URI = " \ git://github.com/riscv-software-src/opensbi.git;destsuffix=opensbi-${PV};protocol=https;branch=master \ - file://starfive-visionfive2-rules.tmpl" + file://starfive-visionfive2-rules" # required patches are not yet part of a release, but will be in 1.3 SRCREV = "2868f26131308ff345382084681ea89c5b0159f1" S = "${WORKDIR}/opensbi-${PV}" -TEMPLATE_FILES += "starfive-visionfive2-rules.tmpl" -TEMPLATE_VARS += "DTB_UBOOT_JH7110_VF2" - -DEPENDS = "u-boot-starfive-visionfive2" -DEBIAN_BUILD_DEPENDS = " \ - u-boot-starfive-visionfive2, \ - u-boot-starfive-visionfive2-dev" do_prepare_build[cleandirs] += "${S}/debian" do_prepare_build() { cp ${WORKDIR}/starfive-visionfive2-rules ${WORKDIR}/rules deb_debianize - echo "build/platform/generic/firmware/fw_payload.bin /usr/lib/opensbi/starfive-visionfive2/" > ${S}/debian/install + echo "build/platform/generic/firmware/fw_dynamic.bin /usr/lib/opensbi/starfive-visionfive2/" > ${S}/debian/install } COMPATIBLE_MACHINE = "starfive-visionfive2" diff --git a/meta-isar/recipes-bsp/u-boot/files/starfive-visionfive2-rules.tmpl b/meta-isar/recipes-bsp/u-boot/files/starfive-visionfive2-rules.tmpl new file mode 100755 index 00000000..01bb9156 --- /dev/null +++ b/meta-isar/recipes-bsp/u-boot/files/starfive-visionfive2-rules.tmpl @@ -0,0 +1,35 @@ +#!/usr/bin/make -f + +# Debian rules for custom U-Boot build +# +# This software is a part of ISAR. +# Copyright (c) Siemens AG, 2018-2021 +# +# SPDX-License-Identifier: MIT + +ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE)) +export CROSS_COMPILE=$(DEB_HOST_GNU_TYPE)- +SET_CROSS_BUILD_TOOLS=CROSS_BUILD_TOOLS=y +endif + +override_dh_auto_build: + $(MAKE) $(PARALLEL_MAKE) ${U_BOOT_CONFIG} + $(MAKE) $(PARALLEL_MAKE) flash.bin OPENSBI=/usr/lib/opensbi/starfive-visionfive2/fw_dynamic.bin + spl_tool -c -f spl/u-boot-spl.bin + $(MAKE) -n u-boot-initial-env >/dev/null 2>&1; if [ $$? -ne 2 ]; then \ + $(MAKE) $(PARALLEL_MAKE) u-boot-initial-env; \ + else \ + ./scripts/get_default_envs.sh >u-boot-initial-env; \ + fi + $(MAKE) $(PARALLEL_MAKE) $(SET_CROSS_BUILD_TOOLS) NO_SDL=1 tools-only envtools + +override_dh_auto_install: + mv tools/env/lib.a tools/env/libubootenv.a + +override_dh_auto_test: + +override_dh_strip: + dh_strip -X libubootenv.a + +%: + dh $@ --parallel diff --git a/meta-isar/recipes-bsp/u-boot/u-boot-starfive-visionfive2_2021.10+VF2-3.0.4.bb b/meta-isar/recipes-bsp/u-boot/u-boot-starfive-visionfive2_2021.10+VF2-3.0.4.bb deleted file mode 100644 index 9e1b7251..00000000 --- a/meta-isar/recipes-bsp/u-boot/u-boot-starfive-visionfive2_2021.10+VF2-3.0.4.bb +++ /dev/null @@ -1,31 +0,0 @@ -# -# Copyright (c) Siemens AG, 2023 -# -# SPDX-License-Identifier: MIT - -require recipes-bsp/u-boot/u-boot-custom.inc - -SRC_URI += "git://github.com/starfive-tech/u-boot.git;nobranch=1;protocol=https;destsuffix=u-boot-${PV}" -SRCREV = "b6e2b0e85c774a18ae668223a6e5f7d335895243" - -DEBIAN_BUILD_DEPENDS .= ", libssl-dev, libssl-dev:native" - -U_BOOT_CONFIG = "starfive_visionfive2_defconfig" -U_BOOT_BIN = "u-boot.bin" -U_BOOT_SPL_BIN = "spl/u-boot-spl.bin" - -S = "${WORKDIR}/u-boot-${PV}" - -# install dtb files for opensbi -do_prepare_build[cleandirs] += "${S}/debian" -do_prepare_build:append() { - # also build and install spl component - sed -i 's|${U_BOOT_BIN}|${U_BOOT_BIN} ${U_BOOT_SPL_BIN}|g' ${S}/debian/rules - echo "${U_BOOT_SPL_BIN} usr/lib/u-boot/${MACHINE}/" \ - >> ${S}/debian/u-boot-${MACHINE}.install - # install device tree - echo "arch/riscv/dts/*.dtb usr/share/u-boot/${MACHINE}/" \ - >> ${S}/debian/u-boot-${MACHINE}-dev.install -} - -COMPATIBLE_MACHINE = "starfive-visionfive2" diff --git a/meta-isar/recipes-bsp/u-boot/u-boot-starfive-visionfive2_2023.10.bb b/meta-isar/recipes-bsp/u-boot/u-boot-starfive-visionfive2_2023.10.bb new file mode 100644 index 00000000..5428080a --- /dev/null +++ b/meta-isar/recipes-bsp/u-boot/u-boot-starfive-visionfive2_2023.10.bb @@ -0,0 +1,29 @@ +# +# Copyright (c) Siemens AG, 2023 +# +# SPDX-License-Identifier: MIT + +require recipes-bsp/u-boot/u-boot-custom.inc + +COMPATIBLE_MACHINE = "starfive-visionfive2" + +SRC_URI += "https://ftp.denx.de/pub/u-boot/u-boot-${PV}.tar.bz2 \ + file://starfive-visionfive2-rules.tmpl" +SRC_URI[sha256sum] = "e00e6c6f014e046101739d08d06f328811cebcf5ae101348f409cbbd55ce6900" + +DEPENDS += "opensbi-starfive-visionfive2 jh7110-u-boot-spl-tool-native" +DEBIAN_BUILD_DEPENDS .= ", opensbi-starfive-visionfive2, \ + jh7110-u-boot-spl-tool:native, \ + swig, python3-dev:native, python3-setuptools, \ + libssl-dev:${DISTRO_ARCH}, libssl-dev:native" + +U_BOOT_CONFIG = "starfive_visionfive2_defconfig" +U_BOOT_BIN = "u-boot.itb spl/u-boot-spl.bin.normal.out" + +TEMPLATE_FILES += "starfive-visionfive2-rules.tmpl" + +S = "${WORKDIR}/u-boot-${PV}" + +do_prepare_build:append() { + cp ${WORKDIR}/starfive-visionfive2-rules ${S}/debian/rules +} diff --git a/meta-isar/scripts/lib/wic/canned-wks/starfive-visionfive2.wks.in b/meta-isar/scripts/lib/wic/canned-wks/starfive-visionfive2.wks.in index 99156f81..ed8a3b71 100644 --- a/meta-isar/scripts/lib/wic/canned-wks/starfive-visionfive2.wks.in +++ b/meta-isar/scripts/lib/wic/canned-wks/starfive-visionfive2.wks.in @@ -12,9 +12,9 @@ # This is required to boot efi with the correct device tree, which is included in the fit image. # SPL -part --source rawcopy --sourceparams "file=/usr/share/jh7110-uboot-spl-image/u-boot-spl.bin.normal.out" --ondisk mmcblk1 --fixed-size 2M --offset 2M --part-type 2E54B353-1271-4842-806F-E436D6AF6985 +part --source rawcopy --sourceparams "file=/usr/lib/u-boot/starfive-visionfive2/u-boot-spl.bin.normal.out" --fixed-size 2M --part-type 2E54B353-1271-4842-806F-E436D6AF6985 # U-Boot FIT -part --source rawcopy --sourceparams "file=/usr/share/visionfive2-u-boot-firmware/visionfive2_fw_payload.img" --ondisk mmcblk1 --fixed-size 4M --offset 4M --part-type 5B193300-FC78-40CD-8002-E86C45580B47 +part --source rawcopy --sourceparams "file=/usr/lib/u-boot/starfive-visionfive2/u-boot.itb" --fixed-size 4M --part-type BC13C2FF-59E6-4262-A352-B275FD6F7172 # EFI part /boot --source bootimg-efi-isar --sourceparams "loader=systemd-boot,dtb=${DTB_VISIONFIVE2}" --use-uuid --label efi --part-type EF00 --align 1024 # rootfs From patchwork Tue Jan 9 07:33:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 3270 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Tue, 09 Jan 2024 08:33:42 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-qt1-f185.google.com (mail-qt1-f185.google.com [209.85.160.185]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 4097XeON021608 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 9 Jan 2024 08:33:41 +0100 Received: by mail-qt1-f185.google.com with SMTP id d75a77b69052e-4299dfcdc0fsf2237991cf.1 for ; Mon, 08 Jan 2024 23:33:41 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1704785614; cv=pass; d=google.com; s=arc-20160816; b=ypvZJoL7+RxCkXN+QeEyoft1TGio6LhribDHWh9z5p8BHNuw4mf1P5HTaOxZ9zslEb UaVCaXa0WTi85mS6BHg8VkXTVpWiT4RaI7LPMD96b70WTTguAVuZi81KcXEQ3B7Jr39s ntDSxM8OQB1wXxJZYHUbFj56Bo4CyX+9kTPI8DFnoO0BZrU/LOcGM7hQvGolHA15F5Xf /MjLFhYg/b4gPuuM/U+pF2iCBXFvdJXbnOxUckd/BB+bQPjAKFzYuqKLL4lm4k3ZCiS9 NE9IE6gMlKTtSHJrfDM3YlakU/WnVPC/3XEGq0/slCJqqcqnOM91sq9suPet7r535hXG e3Ig== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to:feedback-id:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=dRamgGb1W2Cp5MVlq+3pCO2Dz/IV2uGSS0kknt94quU=; fh=xxo2rOAPT4f31TY31yIWVuVlno6QMa2Pdllc3KKolm0=; b=j1ZRxSg9Q5KrZBK8gWs4VswaEmn7fEKQU+sanWD6ptY7FzJ4QJidLA4KyfTxCTAQbl hSKQWah2yTA4GUgChy73d9suDDfL9czPn1ohFRRBQgRYIb9VVQZuXbDh7I6k03/y8mgM iiGqO6zZCZ83hbXvibsbGziswCunPTXh9rWqCj5zgT9CBJvITc8beSAhKlX0G0DXHOe7 jQrHElkya1bHPckhJJltpFkqbOkw6sxAEIfkC38jdqyjh6KKte7fi2Az+Rm4gl/dUETe MNE/RaUaK/bR89JRQc07rFwmtLkWMef6/NU9Dz/mBVDBQ0yeMBroQLrttVGugLbTKRLV qPvw== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=EbIi4rEo; spf=pass (google.com: domain of fm-294854-20240109073332c25adf8efd2d415bba-gf2weh@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) smtp.mailfrom=fm-294854-20240109073332c25adf8efd2d415bba-GF2wEH@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1704785614; x=1705390414; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:feedback-id :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:from:to:cc:subject:date:message-id:reply-to; bh=dRamgGb1W2Cp5MVlq+3pCO2Dz/IV2uGSS0kknt94quU=; b=p00lYfJQOv2zaqjoHf/Q3kbYcAWehOtPl4odYZP1pXalF+0gTm775wm/KxQck/Czct rh55X/GUJcbaC5mtPrAs/c0Vyx1x5gPVC+qCCQiC+u4TOODWnsdKcSMI5G+//bEw+n5R gLFPvHEr3k0rfq1wHuWbou2RIruK890NyjE/y8S9OfFQyhtvDA4DORKMVS5zAjSaWQja Zlg3KMLp1KRwCWhcGMbkvlncfPEs9rHsnGZhCtWIroAizOkFFhy7pM5MfgIcAUes/Hyd Z/RngSjHR6lk6nf/n1Ao+X5BPNlCQiu/EuQHik4vHucBi4vaqzdaB8zJ7kj6Um1mXbUa dryg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704785614; x=1705390414; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:feedback-id :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:x-beenthere:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=dRamgGb1W2Cp5MVlq+3pCO2Dz/IV2uGSS0kknt94quU=; b=H9hFMTUg9jYKSux6sygYhR3JEyKxKMN3LLSwrx7HRbLBREZloK1ws12OhAa1pUiFwD QVPaJmwz6QCKxM1AV939CD5F1c+jocKx24cNxi2hovCJTznnPU5kGSgVCHn0SNaCZrur EJ9mUkDx2gVxHScaqTx19xpO01+yaJGjbnXJTJn5ttLoMkMy2ldsgiLFPA4e1gfdhVy1 +WUD7JIu8E4yZ5LNnep7KZF0HXB6GPDuxDlNHxG+iqKmFvVTDLiV1ghxr5mX3KZNc2Z3 N6Ioa9TrazGQMGzP6Vn85jpmAQRH8dTpGL1iP9kxVdOkG7toOBkx8T3duXTpNGgGUNYz fxmQ== X-Gm-Message-State: AOJu0Yy6pMsQgKiDUpbD7KmFMWP+IxJ/v8TjpEWZK5HNgH+76Bo1lcUz rv9Q0W1VgOsCKLRv8C4MNvE= X-Google-Smtp-Source: AGHT+IGRYtAq4TwY5H3dsPwGGNolueMeCaXJdWH3PfMf5IEVt//eZ9tTfXamA6mgfRz+4xuomI3K3w== X-Received: by 2002:a05:6214:2345:b0:67f:5c0b:568b with SMTP id hu5-20020a056214234500b0067f5c0b568bmr9730940qvb.0.1704785613926; Mon, 08 Jan 2024 23:33:33 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6214:21e8:b0:67f:143c:57c3 with SMTP id p8-20020a05621421e800b0067f143c57c3ls833196qvj.0.-pod-prod-03-us; Mon, 08 Jan 2024 23:33:33 -0800 (PST) X-Received: by 2002:a05:620a:430b:b0:783:23ea:8aa8 with SMTP id u11-20020a05620a430b00b0078323ea8aa8mr2325628qko.52.1704785613145; Mon, 08 Jan 2024 23:33:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1704785613; cv=none; d=google.com; s=arc-20160816; b=0/7F+jT05N9MAByquccq+ARRrrqknIzlO8+YbgMWCX9iuSaQTxNNoAspL44sSMbIKY Do0JkUbPjkEp0t7nV09dC8zP6yFjO/4duDEuZKukC3dSH8iHXPCnOBfsa1EERKcx6J6T SXUv1Yu1dLW6w5Q4bJC0qxq7RCh4A41adJ8PciJHJQXIATBIzWgWTZfvN1n7p5yiV1y+ 28ZSr8qE7lTgrIU+HgOiGNtmfIbRaBT8O+mK6chGqK5Ny7ausZmkqIdvlxXxuBpc2wDm 50RLmUUPaFR05zEaLt4XkOrkhBBCFVQiWQhuVrJfZTpCjbf7aSbpACT0gRzLu6hueb9P DNvA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=feedback-id:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=eySf5EUlWh0YRfVNMGIHUatyvrGst5Uyb03Jr3Rts/Q=; fh=xxo2rOAPT4f31TY31yIWVuVlno6QMa2Pdllc3KKolm0=; b=zmP6mhsKWt4co0zvs01DrQnH3kB+3Qf6JRIacJflA6kdIXsRzgZAbkfgn89b0yZNWt jd5iuMfcyUAqX30yZvicWslK+9XUlW5t6jgTgkzG2rzyBjiAxGpYEnOJvfklt04zjW8Z +I+hWzx+MytdN44UTZ+wEoUE9ZrhOceSP2wIObk+kiExYNdXusqATW1cEczHepjguS7I J5H0yEpY1dcpaIO3knzQDD23Chwwx/ZNkrLG+5jE35qUgscYr3oh/K9SsWM3munIjEWJ T8VMhZ9Mou9323t+gbeDxADWrRgU3fTEhXHRV3PrkF62g6vpCkREjZGSHSwYl74/v5qQ s0kg== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=EbIi4rEo; spf=pass (google.com: domain of fm-294854-20240109073332c25adf8efd2d415bba-gf2weh@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) smtp.mailfrom=fm-294854-20240109073332c25adf8efd2d415bba-GF2wEH@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from mta-65-225.siemens.flowmailer.net (mta-65-225.siemens.flowmailer.net. [185.136.65.225]) by gmr-mx.google.com with ESMTPS id tv4-20020a05620a3e8400b007811b471a29si85011qkn.4.2024.01.08.23.33.33 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 08 Jan 2024 23:33:33 -0800 (PST) Received-SPF: pass (google.com: domain of fm-294854-20240109073332c25adf8efd2d415bba-gf2weh@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) client-ip=185.136.65.225; Received: by mta-65-225.siemens.flowmailer.net with ESMTPSA id 20240109073332c25adf8efd2d415bba for ; Tue, 09 Jan 2024 08:33:32 +0100 X-Patchwork-Original-From: "'Jan Kiszka' via isar-users" From: Jan Kiszka To: isar-users Cc: Felix Moessbauer Subject: [PATCH v2 6/8] meta-isar: starfive-visionfive2: Drop obsolete recipes Date: Tue, 9 Jan 2024 08:33:22 +0100 Message-Id: <91c1b5a012e9eafe12569f9ad5f02177f427b9f7.1704785604.git.jan.kiszka@siemens.com> In-Reply-To: References: MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-294854:519-21489:flowmailer X-Original-Sender: jan.kiszka@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=EbIi4rEo; spf=pass (google.com: domain of fm-294854-20240109073332c25adf8efd2d415bba-gf2weh@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) smtp.mailfrom=fm-294854-20240109073332c25adf8efd2d415bba-GF2wEH@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com X-Original-From: Jan Kiszka Reply-To: Jan Kiszka Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-Spam-Status: No, score=-1.2 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= From: Jan Kiszka We are now using U-Boot for what these recipes where once introduced. Signed-off-by: Jan Kiszka --- .../jh7110-u-boot-spl-image/files/install | 1 - .../jh7110-u-boot-spl-image/files/rules | 10 ----- .../jh7110-u-boot-spl-image_0.1.bb | 32 --------------- .../files/rules.tmpl | 12 ------ .../files/visionfive2-u-boot-firmware.install | 1 - .../visionfive2-uboot-fit-image.its.tmpl | 41 ------------------- .../visionfive2-u-boot-firmware.bb | 38 ----------------- 7 files changed, 135 deletions(-) delete mode 100644 meta-isar/recipes-bsp/jh7110-u-boot-spl-image/files/install delete mode 100644 meta-isar/recipes-bsp/jh7110-u-boot-spl-image/files/rules delete mode 100644 meta-isar/recipes-bsp/jh7110-u-boot-spl-image/jh7110-u-boot-spl-image_0.1.bb delete mode 100644 meta-isar/recipes-bsp/visionfive2-u-boot-firmware/files/rules.tmpl delete mode 100644 meta-isar/recipes-bsp/visionfive2-u-boot-firmware/files/visionfive2-u-boot-firmware.install delete mode 100644 meta-isar/recipes-bsp/visionfive2-u-boot-firmware/files/visionfive2-uboot-fit-image.its.tmpl delete mode 100644 meta-isar/recipes-bsp/visionfive2-u-boot-firmware/visionfive2-u-boot-firmware.bb diff --git a/meta-isar/recipes-bsp/jh7110-u-boot-spl-image/files/install b/meta-isar/recipes-bsp/jh7110-u-boot-spl-image/files/install deleted file mode 100644 index c300f842..00000000 --- a/meta-isar/recipes-bsp/jh7110-u-boot-spl-image/files/install +++ /dev/null @@ -1 +0,0 @@ -u-boot-spl.bin.normal.out usr/share/jh7110-uboot-spl-image diff --git a/meta-isar/recipes-bsp/jh7110-u-boot-spl-image/files/rules b/meta-isar/recipes-bsp/jh7110-u-boot-spl-image/files/rules deleted file mode 100644 index a8b2c6b8..00000000 --- a/meta-isar/recipes-bsp/jh7110-u-boot-spl-image/files/rules +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/make -f - -U_BOOT_SPL_BIN := /usr/lib/u-boot/starfive-visionfive2/u-boot-spl.bin - -override_dh_auto_build: - cp $(U_BOOT_SPL_BIN) u-boot-spl.bin - spl_tool -c -f u-boot-spl.bin - -%: - dh \$@ diff --git a/meta-isar/recipes-bsp/jh7110-u-boot-spl-image/jh7110-u-boot-spl-image_0.1.bb b/meta-isar/recipes-bsp/jh7110-u-boot-spl-image/jh7110-u-boot-spl-image_0.1.bb deleted file mode 100644 index c004c86c..00000000 --- a/meta-isar/recipes-bsp/jh7110-u-boot-spl-image/jh7110-u-boot-spl-image_0.1.bb +++ /dev/null @@ -1,32 +0,0 @@ -# -# Copyright (c) Siemens AG, 2023 -# -# SPDX-License-Identifier: MIT - -inherit dpkg - -SRC_URI = "file://rules file://install" - -DESCRIPTION = "StarFive VisionFive 2 u-boot SPL" -DEPENDS = "jh7110-u-boot-spl-tool-native u-boot-starfive-visionfive2" -DEBIAN_BUILD_DEPENDS = "jh7110-u-boot-spl-tool:native, u-boot-starfive-visionfive2:${DISTRO_ARCH}" - -# this is a host tool -PACKAGE_ARCH = "${BUILD_ARCH}" - -do_prepare_build[cleandirs] += "${S}/debian" -do_prepare_build(){ - deb_debianize - cp ${WORKDIR}/install ${S}/debian/ -} - -do_deploy() { - dpkg --fsys-tarfile ${WORKDIR}/jh7110-u-boot-spl-image_${PV}*.deb | \ - tar xOf - "./usr/share/jh7110-uboot-spl-image/u-boot-spl.bin.normal.out" \ - > "${DEPLOY_DIR_IMAGE}/u-boot-spl.bin.normal.out" -} - -addtask deploy after do_dpkg_build before do_build -do_deploy[dirs] = "${DEPLOY_DIR_IMAGE}" - -COMPATIBLE_MACHINE = "starfive-visionfive2" diff --git a/meta-isar/recipes-bsp/visionfive2-u-boot-firmware/files/rules.tmpl b/meta-isar/recipes-bsp/visionfive2-u-boot-firmware/files/rules.tmpl deleted file mode 100644 index 4826f7d6..00000000 --- a/meta-isar/recipes-bsp/visionfive2-u-boot-firmware/files/rules.tmpl +++ /dev/null @@ -1,12 +0,0 @@ -#!/usr/bin/make -f - -KERNEL_VERSION=$(shell find /usr/lib/ -maxdepth 1 -type d -name 'linux-image-*' | head -1 | sed 's/.*linux-image-//g') - -override_dh_auto_configure: - sed -i 's||$(KERNEL_VERSION)|g' visionfive2-uboot-fit-image.its - -override_dh_auto_build: - mkimage -A riscv -O u-boot -f ${IMAGE_ITS_FILE} visionfive2_fw_payload.img - -%: - dh $@ diff --git a/meta-isar/recipes-bsp/visionfive2-u-boot-firmware/files/visionfive2-u-boot-firmware.install b/meta-isar/recipes-bsp/visionfive2-u-boot-firmware/files/visionfive2-u-boot-firmware.install deleted file mode 100644 index d1bdf6d6..00000000 --- a/meta-isar/recipes-bsp/visionfive2-u-boot-firmware/files/visionfive2-u-boot-firmware.install +++ /dev/null @@ -1 +0,0 @@ -visionfive2_fw_payload.img usr/share/visionfive2-u-boot-firmware diff --git a/meta-isar/recipes-bsp/visionfive2-u-boot-firmware/files/visionfive2-uboot-fit-image.its.tmpl b/meta-isar/recipes-bsp/visionfive2-u-boot-firmware/files/visionfive2-uboot-fit-image.its.tmpl deleted file mode 100644 index 4cbe9318..00000000 --- a/meta-isar/recipes-bsp/visionfive2-u-boot-firmware/files/visionfive2-uboot-fit-image.its.tmpl +++ /dev/null @@ -1,41 +0,0 @@ -/dts-v1/; - -/ { - description = "U-boot-spl FIT image for JH7110 VisionFive2"; - #address-cells = <2>; - - images { - firmware { - description = "u-boot"; - data = /incbin/("/usr/lib/opensbi/starfive-visionfive2/fw_payload.bin"); - type = "firmware"; - arch = "riscv"; - os = "u-boot"; - load = <0x0 0x40000000>; - entry = <0x0 0x40000000>; - compression = "none"; - }; - fdt { - description = "DTB"; - data = /incbin/("/usr/lib/linux-image-/${DTB_FILES}"); - type = "flat_dt"; - arch = "riscv"; - compression = "none"; - load = <0x46000000>; - entry = <0x46000000>; - hash { - algo = "sha1"; - }; - }; - }; - - configurations { - default = "config-1"; - - config-1 { - description = "U-boot-spl FIT config for JH7110 VisionFive2"; - firmware = "firmware"; - fdt = "fdt"; - }; - }; -}; diff --git a/meta-isar/recipes-bsp/visionfive2-u-boot-firmware/visionfive2-u-boot-firmware.bb b/meta-isar/recipes-bsp/visionfive2-u-boot-firmware/visionfive2-u-boot-firmware.bb deleted file mode 100644 index 4fe91b45..00000000 --- a/meta-isar/recipes-bsp/visionfive2-u-boot-firmware/visionfive2-u-boot-firmware.bb +++ /dev/null @@ -1,38 +0,0 @@ -# -# Copyright (c) Siemens AG, 2023 -# -# SPDX-License-Identifier: MIT - -inherit dpkg - -DESCRIPTION = "StarFive VisionFive 2 u-boot firmware" - -IMAGE_ITS_FILE = "visionfive2-uboot-fit-image.its" -SRC_URI = " \ - file://${IMAGE_ITS_FILE}.tmpl \ - file://rules.tmpl \ - file://visionfive2-u-boot-firmware.install" - -DEPENDS += "opensbi-starfive-visionfive2 linux-image-${KERNEL_NAME}" -DEBIAN_BUILD_DEPENDS += "opensbi-starfive-visionfive2, u-boot-tools, device-tree-compiler, linux-image-${KERNEL_NAME}" - -TEMPLATE_FILES = "${IMAGE_ITS_FILE}.tmpl rules.tmpl" -TEMPLATE_VARS = "IMAGE_ITS_FILE DTB_FILES" - -do_prepare_build[cleandirs] += "${S}/debian" -do_prepare_build(){ - cp ${WORKDIR}/${IMAGE_ITS_FILE} ${S}/ - cp ${WORKDIR}/visionfive2-u-boot-firmware.install ${S}/debian/ - deb_debianize -} - -do_deploy() { - dpkg --fsys-tarfile ${WORKDIR}/visionfive2-u-boot-firmware_${PV}*.deb | \ - tar xOf - "./usr/share/visionfive2-u-boot-firmware/visionfive2_fw_payload.img" \ - > "${DEPLOY_DIR_IMAGE}/visionfive2_fw_payload.img" -} - -addtask deploy after do_dpkg_build before do_build -do_deploy[dirs] = "${DEPLOY_DIR_IMAGE}" - -COMPATIBLE_MACHINE = "starfive-visionfive2" From patchwork Tue Jan 9 07:33:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 3271 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Tue, 09 Jan 2024 08:33:42 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-qv1-f58.google.com (mail-qv1-f58.google.com [209.85.219.58]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 4097XfNm021628 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 9 Jan 2024 08:33:42 +0100 Received: by mail-qv1-f58.google.com with SMTP id 6a1803df08f44-67f943c0e6bsf52647316d6.0 for ; Mon, 08 Jan 2024 23:33:42 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1704785614; cv=pass; d=google.com; s=arc-20160816; b=LPPmTU0lgZvijXW6iI1qCJMvNHyd9jOX0E6ZrcX0/4KRLhy8mXncoTMcTjS0E1bd+/ TA5CzqYdKomLeS043tB6ECnPtg3M0fD6db3tSHkkRUoi3y78iTd+DmMhiqoyekDcerLF GjIJ5gyJfLk7BhDT3q6zN0hl7M0tZ78rpchKAYjPNbZIJltSFUDcsIZIxFQWYchOKg0S f3OuKd7GYknSa2qLvdhjlkwQV4L7Manxi/vmgJMfdY9j0cJnTSruamSFSXBY2sRPTXAz eWQNPRDCaGrC1ydUt8Ej6LF4EjGrlOJnAj+Vqqchef8KOE+XA683x49nHEeDC3GA/Qs5 20PQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to:feedback-id:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=7gRWLKY0sYypfd6b9QH7dvd+yUISQ61bTlXByOroWZU=; fh=xxo2rOAPT4f31TY31yIWVuVlno6QMa2Pdllc3KKolm0=; b=jumCsfNj+voOp9ipQSBYV2Ml2D0Ozkuz+b+FnE7kFx0mRpqsih1zSITPY1afuhQ3q2 d/JCYoq5eTjEPldYrBLc7pV/PVSTR+qhhlE/cSOYIvIEVoXWgSS2FhtkFEaGWyTWWILM TPqc9lB0k2Mb188rzjLxAFPcC/cGqluXKjtY1nw3eWqJnxPLD3IWCFCmKzpV6TBqku9v OwmczPMBtUkfvCai36278rwMmOMkpBdKHbRtSlfoRN9TSLo2fRyh9rUuZYNiWJpwQZGE bX9/cKh0R6CdaNQ2OD2CcetsDlcFhOKMJzxGy3ekBIPYWTLgW6jleeBFgmVEttnfWRPH FyPA== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=a43XrGh9; spf=pass (google.com: domain of fm-294854-2024010907333305cdeb680f4f5c405d-kkpmqg@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) smtp.mailfrom=fm-294854-2024010907333305cdeb680f4f5c405d-KkpMqg@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1704785614; x=1705390414; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:feedback-id :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:from:to:cc:subject:date:message-id:reply-to; bh=7gRWLKY0sYypfd6b9QH7dvd+yUISQ61bTlXByOroWZU=; b=oe4X07i8V9CFEZSeWQ1RM1ROpn2J35zB3lCXkrxcT2a7dtzCw0Gnj7gcOVnS9E4tgP s8kRfZiC6kD54cIUOSeqxaodQeJfVmKX+PJf3aQnpYd/bHs4jp1IDdCLOW8dvWHJIkFN hGCM3qkcS8BsJcF67SpvI3FoE8XtvCGsj3SufBWrwvkVrjJokxPwRtfHFmHx1UC59aXs gTkD8gEri30ERqNTswVzF+4GoS3AktSw+M1gxdWVwmGfVyz+avjmfqbTJOkj1pYgQKXg mLGLmK6iNbcQsbgTCbbP40bKjEzXhEVQgZcudHOquyDidtt2V+QjsTuzzanxYq5R4HV/ /bcQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704785614; x=1705390414; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:feedback-id :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:x-beenthere:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=7gRWLKY0sYypfd6b9QH7dvd+yUISQ61bTlXByOroWZU=; b=UU17fldF2FrgI8drsWXuQlaM2hBmYofYFsoDQi2DiRMQR8EC2vJrEwkFlki+m6GVi2 reukKDHzJCf7pZKNdRlSIPAZU7wqQccAYcSKv68WJ2xk/xG9awAlK5ZXLI1Gvv5D9GAs SS0SzxdQG+YFvkPcTxTOag55mKg4Wcp1qko5WkSt/E2Iy48Wa0WLXSLAjx78CfPqb2rT ylyvoXjVVJjQArtedm8eEXp7yFe9SmPqM14kJBFj5f2OQJviPc1Z4tZbdw5UiZKSCSFz jQJOXuxW41m4+Fmmp2mYtQMQhaXVBgh+xf22MOuYLSq8s2pNUDmQXGwNg1udSn+n1khh kmsA== X-Gm-Message-State: AOJu0YxMY31W0VWiSN4TjdTS9XGNta9RQjfb90eDpF/5WnHNpnfUPBpp NnjW01OFpl3ITuvO9SleLUM= X-Google-Smtp-Source: AGHT+IHe9hs1kCEErjyWrJcNALw2yitLgeK3sLUHncBCSAdaBAhXGUEXyM9B6PyZEbthhCzq3u8ThA== X-Received: by 2002:a05:6214:d84:b0:681:11f0:d8e4 with SMTP id e4-20020a0562140d8400b0068111f0d8e4mr924730qve.124.1704785614348; Mon, 08 Jan 2024 23:33:34 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6214:21e8:b0:67f:143c:57c3 with SMTP id p8-20020a05621421e800b0067f143c57c3ls833202qvj.0.-pod-prod-03-us; Mon, 08 Jan 2024 23:33:33 -0800 (PST) X-Received: by 2002:a05:620a:2048:b0:783:2d83:ee1d with SMTP id d8-20020a05620a204800b007832d83ee1dmr639811qka.142.1704785613567; Mon, 08 Jan 2024 23:33:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1704785613; cv=none; d=google.com; s=arc-20160816; b=f/zwIVXnEqA/3eqc39OEEhYNaNnIzdoV6R/ingkalXcxK1GWXm7iajhitZfSQqWOqG bPvsfb5VdhkGKd172EkQ3oMTTwqH31mPV4M0MTqHzNzGnIVwh2okbiRe1QxS1s3AiDar uNy+Ytb/UWv6XChgA5QBgHePvMmDf4+lrLArnlzkT+GcDhaHE4OdXCMw7mvRKyfQuRIk FEWNflOiEOixYcunERRGStC5OQksS0ITbJ6dhwrZHO3rGOiFpOQdvaug9TpZLAN447Hx 8JnRsV+XVmf1wC/sOkhfF3S8Y8COTyz0vB557jgcHLxzfFirrx/bdvuZO7m07+BRpTbB Si7A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=feedback-id:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=9hNEDz1fsgRzC9EhJSXphQkcIyQ69eHbi9+hEnPkMrw=; fh=xxo2rOAPT4f31TY31yIWVuVlno6QMa2Pdllc3KKolm0=; b=Tsuq6txy9v8k1kCX1WE16S6Hx6bomhECsI/pyXIPIwsSiMn7vTc9+Pe1YpuEK88W6j s6XvLlMEULSU1cXf7EQ/dHl70Tk8E5M8HKVzX5qQv+NPE7gJCuZaEw5eSSMak7O7FDCa Yy5SRmimFuyd6zYyN4uL+Pccwo6gNE3s+dLvMakou+yMCH9P05LTbOwstecZlCVwhYgM 0mM7G/NiMZhgI4gU57NqBL5Bjge6uOBU6wujnYsbF38d5fmVkpPK8ZCk1zlsA2dopykt F4Wj2tPj56vQsURPDoMWinlBL4JVUHBzJoZdedTM1y0QQ7oNjlU+MStypjqj6umLWSKo Wkbg== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=a43XrGh9; spf=pass (google.com: domain of fm-294854-2024010907333305cdeb680f4f5c405d-kkpmqg@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) smtp.mailfrom=fm-294854-2024010907333305cdeb680f4f5c405d-KkpMqg@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from mta-65-225.siemens.flowmailer.net (mta-65-225.siemens.flowmailer.net. [185.136.65.225]) by gmr-mx.google.com with ESMTPS id tv4-20020a05620a3e8400b007811b471a29si85011qkn.4.2024.01.08.23.33.33 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 08 Jan 2024 23:33:33 -0800 (PST) Received-SPF: pass (google.com: domain of fm-294854-2024010907333305cdeb680f4f5c405d-kkpmqg@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) client-ip=185.136.65.225; Received: by mta-65-225.siemens.flowmailer.net with ESMTPSA id 2024010907333305cdeb680f4f5c405d for ; Tue, 09 Jan 2024 08:33:33 +0100 X-Patchwork-Original-From: "'Jan Kiszka' via isar-users" From: Jan Kiszka To: isar-users Cc: Felix Moessbauer Subject: [PATCH v2 7/8] meta-isar: linux-mainline: Update to 6.6.10 Date: Tue, 9 Jan 2024 08:33:23 +0100 Message-Id: <9be24b860c49647d7d086a48de741bb7b3d03547.1704785604.git.jan.kiszka@siemens.com> In-Reply-To: References: MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-294854:519-21489:flowmailer X-Original-Sender: jan.kiszka@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=a43XrGh9; spf=pass (google.com: domain of fm-294854-2024010907333305cdeb680f4f5c405d-kkpmqg@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) smtp.mailfrom=fm-294854-2024010907333305cdeb680f4f5c405d-KkpMqg@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com X-Original-From: Jan Kiszka Reply-To: Jan Kiszka Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-Spam-Status: No, score=-1.2 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= From: Jan Kiszka This is needed for the BeaglePlay board and will allow to use the mainline kernel also on the VisionFive 2. Signed-off-by: Jan Kiszka --- .../{linux-mainline_5.4.203.bb => linux-mainline_6.6.10.bb} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename meta-isar/recipes-kernel/linux/{linux-mainline_5.4.203.bb => linux-mainline_6.6.10.bb} (85%) diff --git a/meta-isar/recipes-kernel/linux/linux-mainline_5.4.203.bb b/meta-isar/recipes-kernel/linux/linux-mainline_6.6.10.bb similarity index 85% rename from meta-isar/recipes-kernel/linux/linux-mainline_5.4.203.bb rename to meta-isar/recipes-kernel/linux/linux-mainline_6.6.10.bb index 47270cbb..059b8534 100644 --- a/meta-isar/recipes-kernel/linux/linux-mainline_5.4.203.bb +++ b/meta-isar/recipes-kernel/linux/linux-mainline_6.6.10.bb @@ -1,7 +1,7 @@ # Example recipe for building the mainline kernel # # This software is a part of ISAR. -# Copyright (c) Siemens AG, 2018-2020 +# Copyright (c) Siemens AG, 2018-2024 # # SPDX-License-Identifier: MIT @@ -10,13 +10,13 @@ require recipes-kernel/linux/linux-custom.inc ARCHIVE_VERSION = "${@ d.getVar('PV')[:-2] if d.getVar('PV').endswith('.0') else d.getVar('PV') }" SRC_URI += " \ - https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${ARCHIVE_VERSION}.tar.xz \ + https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-${ARCHIVE_VERSION}.tar.xz \ file://x86_64_defconfig \ file://ftpm-module.cfg \ file://subdir/no-ubifs-fs.cfg \ file://no-root-nfs.cfg;apply=no" -SRC_URI[sha256sum] = "fc933f5b13066cfa54aacb5e86747a167bad1d8d23972e4a03ab5ee36c29798a" +SRC_URI[sha256sum] = "9ee627e4c109aec7fca3eda5898e81d201af2c7eb2f7d9d7d94c1f0e1205546c" S = "${WORKDIR}/linux-${ARCHIVE_VERSION}" From patchwork Tue Jan 9 07:33:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 3273 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Tue, 09 Jan 2024 08:33:43 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-il1-f190.google.com (mail-il1-f190.google.com [209.85.166.190]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 4097XfhN021619 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 9 Jan 2024 08:33:42 +0100 Received: by mail-il1-f190.google.com with SMTP id e9e14a558f8ab-35fffb6fe5bsf26690975ab.2 for ; Mon, 08 Jan 2024 23:33:42 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1704785615; cv=pass; d=google.com; s=arc-20160816; b=q1XCQZgKoMIwDdB+OTqOkYaRH4fwBfL9nqLvnF2lftWIAdMBdB063g9mKWOwDq00Pb BBbD6xSYe7OLAeSWB1dAsVa7jnehUeTnhUhMHJO0xlaY+HOINuIH8+kPHMwl7lchQECb wmnigGiwuVZ7coxmBRCpV6H4UgODekzaEVV7SDskAk1jP/OfE+aN375KCcAr+EwMnMuT HQSOGhIpIczze22MaRX8wqnawIDzVkceRO6dhmwm2HU5ija1WtL3ZxqEvJIb3pjESaGC KFPJoXOM4Rv8mugu+if2Dt4uI/cq1QNu49rysEext7jiZyn2Lk1Jp7n8LqbQ9WdZhDgp pKww== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to:feedback-id:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=mTHWMQbms/Za3jAWrCc8b+oUKqAr5bvpNl4TdB0MvMk=; fh=xxo2rOAPT4f31TY31yIWVuVlno6QMa2Pdllc3KKolm0=; b=PrSp+lPe6S3hy6OS4jTz8lcvqizLlvAq8JzmHEIzeuHRS6yfH+eApD3CPvkeD9hw1s nN2ZmU94JlVZ7rNiEgcCNKKSLdH+NX6MUlweEhjm999EHoGeAGjcZIXIDqV81dN8VxVc YTqS/DS+/k9XN9X8i+7jdbq2KqttYJv3Vpb+bnpJndfxP7G0GXzrJd5XttBlZ6CuPUX3 yQTX50nJPEaQDNHo+NlPr7iJx2Bp75uBUuxuykMh0CRmehniCT5Ua2xq8QQNgAII8vf4 q866L0IUKoaJlsyU3owDd3PP1BAntr8pPgumnDYbU4HLCfK84+x0k/+OcPa5Is27TLin jAeQ== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b="GS2Ic8P/"; spf=pass (google.com: domain of fm-294854-20240109073333e180ed9e89dc156de4-tvraan@rts-flowmailer.siemens.com designates 185.136.65.227 as permitted sender) smtp.mailfrom=fm-294854-20240109073333e180ed9e89dc156de4-TVRaan@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1704785615; x=1705390415; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:feedback-id :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:from:to:cc:subject:date:message-id:reply-to; bh=mTHWMQbms/Za3jAWrCc8b+oUKqAr5bvpNl4TdB0MvMk=; b=KN23Mrhlix5doDBgjEQ22Gd/1FFmKZA/O4rLJpN+t7y5kYA8BV9hcokVSbJz9pX1yB ZzFXf2z4vnYRy+WtPocH17t4ldywTPijyhyx8enVORi8rHqJNMGBEhM5TCTWVQK214ob Jnv3sF+mX0AMaHFhzBvyB7gM7I4X2whH2PtlwLfHCkkglukp+tJuulRPstBPXOliPALZ I49qRbY9bkto+sKHrslbqAI01NlUZc0IL7dZ8AjtIU+sUcX7vAft3b8RBgOLUY5Ijm9G mfwcWEKc6gu+ya93PjrEI1TQgenfIZM2SgOi7SMUXnEvISTuELabJjQuiqTAM1gzzih6 HXBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704785615; x=1705390415; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:feedback-id :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:x-beenthere:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=mTHWMQbms/Za3jAWrCc8b+oUKqAr5bvpNl4TdB0MvMk=; b=KIr+M/28yEw5JHRPwYcQrRqrUGSLy233iB1EYHcbjLIl/UyIomFOaZQduBwdQNRgjU 75xq9nklffO2jFA7ugQKneVo75U2A4kDSA5U6rqurP3hAAy7lRhDv1/4nuqKUn37eUlY 9olsExxcynaT/6rL0uz4St0WPB0roEipXs6mOhDmQmwj61GEDwYXYaJ4H21FHSrwZnD0 NtjUr9ycwG7n5jGIuB7PgFMNsrBbCVDq0l2y8lSM0OD0AJf+oJz7B3uHojsDbwYyzTxL k4KIoIy7KmrQ/0iWkoneJPAivGZF8IzQJchDhoHZ1o3uM6E5WbEn2TDZALSfPb35n9JB 1+fQ== X-Gm-Message-State: AOJu0YyYIGW+0y/ecYCOuqrUYa53xxjcQrJ9xyEO0Aj15k7GfguuY2fg PgIqVTgE8r2L1RrcQejeBGI= X-Google-Smtp-Source: AGHT+IGq8y8ppt7lyfoLaTP5Pg4HU+ZCjaBT/2PK58VoXR+fT8OKWAgn560s2rAoSZrF5PzgwESNsA== X-Received: by 2002:a05:6e02:1909:b0:35f:f891:b5e1 with SMTP id w9-20020a056e02190900b0035ff891b5e1mr8982973ilu.23.1704785615038; Mon, 08 Jan 2024 23:33:35 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a92:c5c3:0:b0:360:c64:4fc6 with SMTP id s3-20020a92c5c3000000b003600c644fc6ls1352974ilt.1.-pod-prod-05-us; Mon, 08 Jan 2024 23:33:34 -0800 (PST) X-Received: by 2002:a05:6e02:1bc5:b0:35f:f383:ac7b with SMTP id x5-20020a056e021bc500b0035ff383ac7bmr8428181ilv.16.1704785614025; Mon, 08 Jan 2024 23:33:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1704785614; cv=none; d=google.com; s=arc-20160816; b=Fe7/AUt35WSzBgfVEnaI9ZcgjU8pifwhbLq1e8J5vDmAJRRy3ZQKalkQUic3rUn+s1 K9o51CTQbs3wNH3b+7CcS+mLO2LJqswXVNWPMJibW6waaUD/7IO2NnjvZpLrz42Sk6xy tPrZ/tjuuLxBE7CRGXpC5MzdCuyTh2D8suRnZmT4AMeGJk6oY/NMdZhgjzshfVdstRUy 3NJ58V4eJ1ADGH4hwRmbtxhAOMNVxzRU1naUPdjG0KZ0vEgYoWHqQqRmDNjOxd1Vn/v8 KLWxRkG0BWUdSWV1p/kc4xZ9bzANvm4vixnf5WRWKdtpfC9lqHzy+tkhte0k1PdkzPKR ttAw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=feedback-id:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=QLDzSRU7epyJSqkR1ZaJj9fmB5ysacDIUPIRRVsRy/c=; fh=xxo2rOAPT4f31TY31yIWVuVlno6QMa2Pdllc3KKolm0=; b=pxEismD816VRjuGTPmegc6sls/qk4TZtI5CLPivMo2AM4HHHxwlKoDv8nsNGLDARVs rmPnU6v6LBHqRw9xIh6wdMXV/T869W17aE/SNv4d5++somC/Wu0KNU1RJC3wWJpzD6dT e31BDBur2qk6kZaBho2h9wo1kh69gK9yaG36r5jQC61825GWXxWlH1beFOQgPqnxDlX4 N44V0Ru8Q7CaQ2k7WpBq3sNxf7a1EuKpSIQjklSbPe4jG5aDVnaRYOoKEJR6kla5sC5B YgpWc/JCikk4tmSmOJx7kqNYbCibMVBGgW3MISActThnFOUnRklVdzJHTuqXHsyt1Ztw Z8SQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b="GS2Ic8P/"; spf=pass (google.com: domain of fm-294854-20240109073333e180ed9e89dc156de4-tvraan@rts-flowmailer.siemens.com designates 185.136.65.227 as permitted sender) smtp.mailfrom=fm-294854-20240109073333e180ed9e89dc156de4-TVRaan@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from mta-65-227.siemens.flowmailer.net (mta-65-227.siemens.flowmailer.net. [185.136.65.227]) by gmr-mx.google.com with ESMTPS id v11-20020a02384b000000b0046df403db86si77634jae.7.2024.01.08.23.33.33 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 08 Jan 2024 23:33:34 -0800 (PST) Received-SPF: pass (google.com: domain of fm-294854-20240109073333e180ed9e89dc156de4-tvraan@rts-flowmailer.siemens.com designates 185.136.65.227 as permitted sender) client-ip=185.136.65.227; Received: by mta-65-227.siemens.flowmailer.net with ESMTPSA id 20240109073333e180ed9e89dc156de4 for ; Tue, 09 Jan 2024 08:33:33 +0100 X-Patchwork-Original-From: "'Jan Kiszka' via isar-users" From: Jan Kiszka To: isar-users Cc: Felix Moessbauer Subject: [PATCH v2 8/8] meta-isar: Switch VisionFive 2 to mainline kernel Date: Tue, 9 Jan 2024 08:33:24 +0100 Message-Id: <894e1bfc61dcda239d38cf9ca64442cd55fe916b.1704785604.git.jan.kiszka@siemens.com> In-Reply-To: References: MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-294854:519-21489:flowmailer X-Original-Sender: jan.kiszka@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b="GS2Ic8P/"; spf=pass (google.com: domain of fm-294854-20240109073333e180ed9e89dc156de4-tvraan@rts-flowmailer.siemens.com designates 185.136.65.227 as permitted sender) smtp.mailfrom=fm-294854-20240109073333e180ed9e89dc156de4-TVRaan@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com X-Original-From: Jan Kiszka Reply-To: Jan Kiszka Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-Spam-Status: No, score=-1.2 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= From: Jan Kiszka Using 6.6 as baseline means dropping support for PCIe (M.2), timer (alternative clocksource), PWM, CAN, PWMDAC, Display, ISP (camera). We still get a connected and generally working board this way, and we no longer need to maintain a separate recipe. Also the example-module now builds fine. As mainline is fine with the DT provided by mainline U-Boot, stop using the kernel's DT. Signed-off-by: Jan Kiszka --- .../conf/machine/starfive-visionfive2.conf | 6 +----- .../linux/files/starfive2_extra.cfg | 6 +++--- .../linux/linux-mainline_6.6.10.bb | 2 ++ .../linux/linux-starfive_5.15-visionfive2.bb | 19 ------------------- .../canned-wks/starfive-visionfive2.wks.in | 2 +- 5 files changed, 7 insertions(+), 28 deletions(-) delete mode 100644 meta-isar/recipes-kernel/linux/linux-starfive_5.15-visionfive2.bb diff --git a/meta-isar/conf/machine/starfive-visionfive2.conf b/meta-isar/conf/machine/starfive-visionfive2.conf index c7f72bb3..baae7ed8 100644 --- a/meta-isar/conf/machine/starfive-visionfive2.conf +++ b/meta-isar/conf/machine/starfive-visionfive2.conf @@ -5,7 +5,7 @@ DISTRO_ARCH = "riscv64" -KERNEL_NAME ?= "starfive" +KERNEL_NAME ?= "mainline" IMAGE_FSTYPES ?= "wic" WKS_FILE ?= "starfive-visionfive2.wks.in" @@ -13,7 +13,3 @@ IMAGER_INSTALL:wic += " \ u-boot-starfive-visionfive2 \ ${SYSTEMD_BOOTLOADER_INSTALL}" IMAGER_BUILD_DEPS += "u-boot-starfive-visionfive2" - -# DTB file for booting -DTB_VISIONFIVE2 = "jh7110-visionfive-v2.dtb" -DTB_FILES = "starfive/${DTB_VISIONFIVE2}" diff --git a/meta-isar/recipes-kernel/linux/files/starfive2_extra.cfg b/meta-isar/recipes-kernel/linux/files/starfive2_extra.cfg index d11c28de..d7c42d73 100644 --- a/meta-isar/recipes-kernel/linux/files/starfive2_extra.cfg +++ b/meta-isar/recipes-kernel/linux/files/starfive2_extra.cfg @@ -1,3 +1,3 @@ -# additional configuration to support stock debian userlands -CONFIG_BINFMT_MISC=y -CONFIG_SQUASHFS=m +# still needed in 6.6, see commit 07863871dfb162965b21bb8c2e4861bdb0019da3 +CONFIG_MMC_DW=y +CONFIG_MMC_DW_STARFIVE=y diff --git a/meta-isar/recipes-kernel/linux/linux-mainline_6.6.10.bb b/meta-isar/recipes-kernel/linux/linux-mainline_6.6.10.bb index 059b8534..649e1e86 100644 --- a/meta-isar/recipes-kernel/linux/linux-mainline_6.6.10.bb +++ b/meta-isar/recipes-kernel/linux/linux-mainline_6.6.10.bb @@ -16,6 +16,8 @@ SRC_URI += " \ file://subdir/no-ubifs-fs.cfg \ file://no-root-nfs.cfg;apply=no" +SRC_URI:append:riscv64 = " file://starfive2_extra.cfg" + SRC_URI[sha256sum] = "9ee627e4c109aec7fca3eda5898e81d201af2c7eb2f7d9d7d94c1f0e1205546c" S = "${WORKDIR}/linux-${ARCHIVE_VERSION}" diff --git a/meta-isar/recipes-kernel/linux/linux-starfive_5.15-visionfive2.bb b/meta-isar/recipes-kernel/linux/linux-starfive_5.15-visionfive2.bb deleted file mode 100644 index e9e0bf4a..00000000 --- a/meta-isar/recipes-kernel/linux/linux-starfive_5.15-visionfive2.bb +++ /dev/null @@ -1,19 +0,0 @@ -# -# Copyright (c) Siemens AG, 2023 -# -# SPDX-License-Identifier: MIT - -require recipes-kernel/linux/linux-custom.inc - -SRC_URI += " \ - git://github.com/starfive-tech/linux.git;protocol=https;branch=JH7110_VisionFive2_devel;destsuffix=linux-visionfive-${PV} \ - file://starfive2_extra.cfg" -SRCREV = "a87c6861c6d96621026ee53b94f081a1a00a4cc7" - -S = "${WORKDIR}/linux-visionfive-${PV}" - -KERNEL_DEFCONFIG = "starfive_visionfive2_defconfig" - -LINUX_VERSION_EXTENSION = "-isar" - -COMPATIBLE_MACHINE = "starfive-visionfive2" diff --git a/meta-isar/scripts/lib/wic/canned-wks/starfive-visionfive2.wks.in b/meta-isar/scripts/lib/wic/canned-wks/starfive-visionfive2.wks.in index ed8a3b71..2600580a 100644 --- a/meta-isar/scripts/lib/wic/canned-wks/starfive-visionfive2.wks.in +++ b/meta-isar/scripts/lib/wic/canned-wks/starfive-visionfive2.wks.in @@ -16,7 +16,7 @@ part --source rawcopy --sourceparams "file=/usr/lib/u-boot/starfive-visionfive2/ # U-Boot FIT part --source rawcopy --sourceparams "file=/usr/lib/u-boot/starfive-visionfive2/u-boot.itb" --fixed-size 4M --part-type BC13C2FF-59E6-4262-A352-B275FD6F7172 # EFI -part /boot --source bootimg-efi-isar --sourceparams "loader=systemd-boot,dtb=${DTB_VISIONFIVE2}" --use-uuid --label efi --part-type EF00 --align 1024 +part /boot --source bootimg-efi-isar --sourceparams "loader=systemd-boot" --use-uuid --label efi --part-type EF00 --align 1024 # rootfs part / --source rootfs --use-uuid --fstype ext4 --mkfs-extraopts "-T default" --label image --active --align 1024 --exclude-path=boot/