From patchwork Wed Jan 17 11:19:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 3299 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Wed, 17 Jan 2024 12:19:45 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-yb1-f185.google.com (mail-yb1-f185.google.com [209.85.219.185]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 40HBJh4x032504 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 17 Jan 2024 12:19:44 +0100 Received: by mail-yb1-f185.google.com with SMTP id 3f1490d57ef6-dc22f3426aesf1565760276.1 for ; Wed, 17 Jan 2024 03:19:44 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1705490377; cv=pass; d=google.com; s=arc-20160816; b=vg+tEN4UMTrJ0oXNmkbIXfoIvLR8w3yJkmP4DgPRKv73sT8NSJX0mNmsSJ5raCjCoV KnKqtBC6YARBclVlnMUXwjRZfGzadjH3MMucC/4t2IZq4AFzAv44u+MkVoHM59ED0km/ p+KUuyP+BK1/88yuA0pKumRPqoIL+st+zdDPRAaBwxwVt17ot6sqi1oeP5PP2VEpZT79 zd5vm7FjjsaaRWUf5kKZAi0FR5ikdTVOm1Umrj6oyVytLsGAak7wPnBE466bC2Ooyt4G EvsozRrcp5CpmwIkU/T1tXv5MbpbDBg2xwFf8dBRgTVVSV7N/8fnZvDusoIgulYAV8nH ZWzA== 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=zMCKk2I0dDrO2JrO8Vrlq3+nRelt1F5eBPwXqWxW7Ic=; fh=xxo2rOAPT4f31TY31yIWVuVlno6QMa2Pdllc3KKolm0=; b=C6rzfvWINO3eV6skpr7fUtx0dI7befM8Y2pzTysK2uwpCV4am4vJlpmZarV+BTj2Fm xoyJcQjjEU2n1DxJCwFEaDGwzgpdOZuFpxF2RyB17exjCi7diEcaCtaqQjlMv9mq3arE vzFmcbaklA2EFn4ICX9ElHE4QX6QWfW2mOB/IvLtQL5d0u1Xd43V6OylLdkC/15Sv2qd cSy18aAnF2+LZoT5t/A65nO4L2A8fg+/4I3nLVhsC/41b2pU97R+l6XGfpmIQodksbKG HuvVoaDFFeAZnnOmlrw44v0uTUeF2g/4zbHQ6EVCrfpOSHyOpNz/unJ7YkNoMX+Pv6Tg Upag== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=qcEtX82R; spf=pass (google.com: domain of fm-294854-20240117111934412ee4a38f5078e665-1tgxo5@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-294854-20240117111934412ee4a38f5078e665-1TgXO5@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=1705490377; x=1706095177; 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=zMCKk2I0dDrO2JrO8Vrlq3+nRelt1F5eBPwXqWxW7Ic=; b=dTsihK5A0mjnPdVcOSXxgJpTf7JYJH1hXQjtC2FbadQa/ijvBM9jTzGB7d+xbBNq/P 1v8LDXpB4i2iuynJvV02qFGf9KlZy/y0Jbq8aoHyQe6dnnpCxAk94csr5GWJe3XzBSPG EfbBAQdMp4QJqloW09YEWtB4rqezkHrSFu5Qv56zwQCelB5qJJiaAZol72v1SUX6sP+p GDx/6DiSnIU9RzyhZgr/FO6M3YpMuVv7LmvC4mjjIlUXUJ+9FSXJ1fuAGBEMsgpTBxBA YKrxmHN72i5j4wPWZmgVoTwlE0txv2l2UCtzrnyzH+2ogP2v03S/VwEjdyhEcyNdy1JF YgBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705490377; x=1706095177; 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=zMCKk2I0dDrO2JrO8Vrlq3+nRelt1F5eBPwXqWxW7Ic=; b=WL8OY7DhkL+yI1NUOPAVhEwPZNeKS1LVtPm/GnZqLupejlMgynwfJuScuBcDF5cCWe Ly2kSr1aZVabfdY66zAU020hfuTOuWjMGfbNOuKWAOoQFiN42F7sCS/wJuiUz1Kxzfy6 4T4mlfhK/TV43Iz8396vdsBcKW9Qa4nn5inZqyCLm/gL1Sb3ECkfsnV/hZ2T0v+h9PT7 HA+5HgBi9pGVclmVDZA9Z9tSnMS0uPloQG8uTWN/2jmBzH9TPAiyFKMy7PhU0syFUfS4 yqpqZJNVsvLEjG6ANKnBa7jTcY6HWCApeUi/8vui/VQOE3PaNnAztk+d/igEPm6a/CG6 2cRg== X-Gm-Message-State: AOJu0Yw7HKoSjvjIijT2hIzubE3Glz5X7frSUa6ajWfPJ0h+lAwubHA+ vb1Qx6BLhb1N08ZVgXSSEfwRYpQMZPqw+HAA1ja8fjEwFH9Xmz5H X-Google-Smtp-Source: AGHT+IF7F0ifr3bGBwINJp+dCB5+wN1igKyFw6JZvihvwcL3yZvVMmtVveajCOnuTWnDqbwhBQJ7Pg== X-Received: by 2002:a5b:888:0:b0:dc2:2327:4a24 with SMTP id e8-20020a5b0888000000b00dc223274a24mr335199ybq.7.1705490376933; Wed, 17 Jan 2024 03:19:36 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a25:d244:0:b0:dc2:1c63:41cd with SMTP id j65-20020a25d244000000b00dc21c6341cdls1122481ybg.0.-pod-prod-00-us; Wed, 17 Jan 2024 03:19:36 -0800 (PST) X-Received: by 2002:a81:6c06:0:b0:5ff:6551:11e0 with SMTP id h6-20020a816c06000000b005ff655111e0mr273112ywc.23.1705490375902; Wed, 17 Jan 2024 03:19:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1705490375; cv=none; d=google.com; s=arc-20160816; b=gcyUoc7jtyePw76fR/WsZRiH2W3g79F5jPeQunGeRcaBFa2/DdMseXb8Z+BfMONijX gCpCeLfl7bhqBdo+i8k13iMt/Lm4mt23NlxSWvsIGtZlbABGztuwu3uWE+4Nhlt+HlgW 0YVLcFBmXg3ZqZfRJX1RaK70ggPTjI8odDRx9X+mdZhJONRIAEMIJZMj2mifn3+5w272 4qufqKzEoD1mHTwhJL7NRqTQpvvKogh80xOAZ/PkIJiRjHpKrbQDEm9Nxrbij15uLoNH J5ZT77029rZwYYGLua6KVWB1CE2CbzOsTEWzxEEuIflB6y4GfAFs7FuGwxXu7no757gm KEdA== 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=oRzPrMSJdze+z/1QJyz5JM4TzuIkaatk67ItjDblLZs72z7oTnBVcIJQuehtq0YcjB omBQEcq2bVERjjJx7U0DBAtvaUsD1+/lRDD45UKNZf/67NcMa/xK9NRs80XhZz4keJh3 tHzNg9FxaT9+xdOXiBJRsDrarOsB0z+p7ebEZ2zT9f1jFStSIJ40P8mxMTcshPaC7Xox VpufRKqZLfNwmufSUjWV1BCcQELXV01iDG3788OuPYA0dro1EoLUow8OUx6NCFhp6/hS Bid2ihnSxArkKttzfc87rnkq/3cdUOCsp2bwcf1/e7m/EB8jBOuWVq87V4LUqDwuBznW +2Uw== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=qcEtX82R; spf=pass (google.com: domain of fm-294854-20240117111934412ee4a38f5078e665-1tgxo5@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-294854-20240117111934412ee4a38f5078e665-1TgXO5@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from mta-64-226.siemens.flowmailer.net (mta-64-226.siemens.flowmailer.net. [185.136.64.226]) by gmr-mx.google.com with ESMTPS id g189-20020a0dddc6000000b005ff5081b46fsi422842ywe.0.2024.01.17.03.19.35 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 17 Jan 2024 03:19:35 -0800 (PST) Received-SPF: pass (google.com: domain of fm-294854-20240117111934412ee4a38f5078e665-1tgxo5@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) client-ip=185.136.64.226; Received: by mta-64-226.siemens.flowmailer.net with ESMTPSA id 20240117111934412ee4a38f5078e665 for ; Wed, 17 Jan 2024 12:19:34 +0100 X-Patchwork-Original-From: "'Jan Kiszka' via isar-users" From: Jan Kiszka To: isar-users Cc: Felix Moessbauer Subject: [PATCH v3 1/8] crossvars: Account for PACKAGE_ARCH = "${BUILD_ARCH}" Date: Wed, 17 Jan 2024 12:19:26 +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=qcEtX82R; spf=pass (google.com: domain of fm-294854-20240117111934412ee4a38f5078e665-1tgxo5@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-294854-20240117111934412ee4a38f5078e665-1TgXO5@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 Wed Jan 17 11:19:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 3298 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Wed, 17 Jan 2024 12:19:43 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-ot1-f62.google.com (mail-ot1-f62.google.com [209.85.210.62]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 40HBJgnD032486 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 17 Jan 2024 12:19:43 +0100 Received: by mail-ot1-f62.google.com with SMTP id 46e09a7af769-6df2f0e8351sf7638589a34.1 for ; Wed, 17 Jan 2024 03:19:42 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1705490376; cv=pass; d=google.com; s=arc-20160816; b=nMYiTYszk0cvFFx1C/8sxE2TkfRdEnKqyI4fcvGcijbRz4856lHJHb10u2o2BfuGUo qOTyi8kbnHkjT4KPnSCEFSg63FQx9aNTo+5prBbgQ5gOrlMOaBnk+/TuSw+cwo3qO0MP NBtI5kACkfxeAm4qazt0aP8UzYdjxMtmihZidrIV9uJ2bBP0WaYxx0ky7PtppYlL4d5N HtpTy8hVEM/EQ8DPO0fdSX3mR1BCCDvczMEw/16hMBzK6dQjJmW8bv4zaPnWUM6QoFak c2LotmTaFpb56y97N1HMP+Ss4HYl1xTrmNN83u1KnmAB5Pc+3vzLRbN9nXTUft/lxPjL qqyQ== 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=sBeIfhmrYMDF/OxycsxJXkxlN4MkFRqeSIvpdQzmuIc=; fh=xxo2rOAPT4f31TY31yIWVuVlno6QMa2Pdllc3KKolm0=; b=NMFuM5QmthvfGTGW/KnNiTdbUh3vz3tgjeAeTX7ZE/wp6lriKymRhG6GIfxKUMmShp 7elB2sFeOQ1GXSWJ3+yv0c5uZ6OWJJBFsKV1fwiGZctmyRu2nd83CSUS0QO+gD0RzQ64 9FQaloZrvVgwYJN8LAbMEFzctRJOR7UcCTJyvuZn7GzzNLdnqy+H+LG4Kn+mk9+DHp68 HaQq5RZbHOfRBcPjsoHrMuidiHv3hpcERFNXnOp9ji8RWH2HUHtSyBKOIDy3y2ZJKI/m sgdG7lTa62IzTQjY3ljTKyLDOKovoEEbbCtzGaJB9zTstXNqEtD8ibgeUk9vxmsaDMNY p4Zg== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=AVzwwhdw; spf=pass (google.com: domain of fm-294854-20240117111934061a782b8cd0926390-nhjxhn@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) smtp.mailfrom=fm-294854-20240117111934061a782b8cd0926390-NhjxHn@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=1705490376; x=1706095176; 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=sBeIfhmrYMDF/OxycsxJXkxlN4MkFRqeSIvpdQzmuIc=; b=M+7rCJlqMgjPeKCbvVsRjSmxJ10hecYXAJUkSfHTmrvsfiDwHusRCFBqCOguNPq0IS GwGyKr0G6xhJhM/iBtPQ9CrS2q3wvQnF80StofkQFrDLjNTqVo/MQCVyXxsRnheXP9UB +oHoqd7NdLoGQqjdVV7ts7KCQlcgbKk++y2q19aA+BMCcGZW+K5fWI0L/ga9n1hbPz+5 MZNZAfOCMXAJw6KxjsOhTG1Apq9uM0ocsZNOLdIg3JGzfvMDHP1z0S08Ph+t+qxADl6s 8sAeD92Jl72Kgui39BOi/5OamKNEjG1UZVA1JDuokff0LMy3lTw+QLfp1vvw8Hrn+8Qb 3LEg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705490376; x=1706095176; 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=sBeIfhmrYMDF/OxycsxJXkxlN4MkFRqeSIvpdQzmuIc=; b=IO+7cEYDm90CwBm4YNtckJtkeAPL4R9N236soe41F5CAAmTKI77bgZDrMb44FkrTR2 2T2k95MkgJYhhVsfF6cx8ES4eBva4UkmX639wIoCMe7ct585Qoeo7wymWjYn5dNSB71U iOjVPFC4935ojJ05QjZbTZXmWjEUM02Tn4IsnsaWw3FCP4mtpSphqvwGp2Q0/95PdSsD GUYS7RFG+k2rLFOFzSepDXcRB59WcsdMUed5ufJ14YeAd9eU74YslsZNUVLhrCWX/Flo e0sZ0NpzgO0f2QTemmAs4lgRc3TVs8+MJqGIqwo6U8pKR08c5g2VGzUUInEwvdwBa/dG OuBA== X-Gm-Message-State: AOJu0YxbCxmBMklvUaVs7ViCll2ok66MBnFQjI4F6FX1o/rhnLYYxkIw JPTUeV27SF9guzaHjPXeihc= X-Google-Smtp-Source: AGHT+IE6TUPvQoKSIaNGQ4HLtHcyW5WF96lQxnpqZEklH0GV48hVFWri876xdlcvIV2aKCrdBFUaGg== X-Received: by 2002:a05:6870:7807:b0:203:b957:e0bc with SMTP id hb7-20020a056870780700b00203b957e0bcmr11171735oab.116.1705490376470; Wed, 17 Jan 2024 03:19:36 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6870:45a6:b0:206:52b7:ef16 with SMTP id y38-20020a05687045a600b0020652b7ef16ls6138938oao.0.-pod-prod-01-us; Wed, 17 Jan 2024 03:19:36 -0800 (PST) X-Received: by 2002:a05:6808:4498:b0:3bd:5fb4:d338 with SMTP id eq24-20020a056808449800b003bd5fb4d338mr11297940oib.5.1705490375847; Wed, 17 Jan 2024 03:19:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1705490375; cv=none; d=google.com; s=arc-20160816; b=Sww5qco3oYXpyCyYq2lcSI5QS8GwNtGrZm0YW7THwcNMTsMePPlQP3O8ai/HIVGKjb 2sSUyOK36OMFgoxvIkpgPC1TWvrVmfdfoDMyjHc0yDf+TfrDnm2ef2W3eBqbofiPTyY4 li/Yzfwqyhq2LU0I+8H75WZLqf282P+s21qrZF0v+N1onfyISlRmVaipSE/hpRays0yT u/b1ZbHLSUzC2twNY3dVuR2RsnDUwqrdZFtVwrrMCyE67D+ipNEVoaw0oDWUMfNKgvKq fIoYaY1AOqmoF9RBZ5BYBRCIt0c/20X18TV3dtV+5EIFBRJgpFxxM8xl8sKCSEwjWU7v bokg== 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=qsNfEp07N0i55GtYR9a5MlS2XFr803th6vXiulndlLAQmab5obPaRoAlr0gbsmzUfV sbbMJGKzIvBSFa1gH3/tsG6oHVhuvK9DFQvfXpzQ9UrMHUnfA6N/jYPDRZhmOD3ToYR3 0gqWRH9zB/tVBtFR9KE+rHODKYORl9mdJXfOgkyh5O3/RLeq5hDGavt7lW0JFMcAehY9 DFf9umRI6ZWYXnd/zSx+TCctgz2Kjx+a9dcsQXGLwy8LTRQ+xDo8OjbzuY0Cnof5UbYj egSVgPKYbAUbZp9VtdjM1yVjyXVq6UVZWQUflU1ZmXtnj++b9mZWI0IMz1pNEM0VTA1X 4CaA== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=AVzwwhdw; spf=pass (google.com: domain of fm-294854-20240117111934061a782b8cd0926390-nhjxhn@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) smtp.mailfrom=fm-294854-20240117111934061a782b8cd0926390-NhjxHn@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from mta-64-228.siemens.flowmailer.net (mta-64-228.siemens.flowmailer.net. [185.136.64.228]) by gmr-mx.google.com with ESMTPS id f13-20020ac8134d000000b00429c8a3abbasi1046997qtj.1.2024.01.17.03.19.35 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 17 Jan 2024 03:19:35 -0800 (PST) Received-SPF: pass (google.com: domain of fm-294854-20240117111934061a782b8cd0926390-nhjxhn@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) client-ip=185.136.64.228; Received: by mta-64-228.siemens.flowmailer.net with ESMTPSA id 20240117111934061a782b8cd0926390 for ; Wed, 17 Jan 2024 12:19:34 +0100 X-Patchwork-Original-From: "'Jan Kiszka' via isar-users" From: Jan Kiszka To: isar-users Cc: Felix Moessbauer Subject: [PATCH v3 2/8] meta-isar: jh7110-u-boot-spl-tool: Use BPN instead of PN Date: Wed, 17 Jan 2024 12:19:27 +0100 Message-Id: <1f49824f3effd6e7a87d355a8c2ecd7332ecb575.1705490373.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=AVzwwhdw; spf=pass (google.com: domain of fm-294854-20240117111934061a782b8cd0926390-nhjxhn@rts-flowmailer.siemens.com designates 185.136.64.228 as permitted sender) smtp.mailfrom=fm-294854-20240117111934061a782b8cd0926390-NhjxHn@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 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 Wed Jan 17 11:19:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 3301 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Wed, 17 Jan 2024 12:19:46 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-il1-f186.google.com (mail-il1-f186.google.com [209.85.166.186]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 40HBJi46032532 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 17 Jan 2024 12:19:45 +0100 Received: by mail-il1-f186.google.com with SMTP id e9e14a558f8ab-3618ed4a2f5sf10526595ab.3 for ; Wed, 17 Jan 2024 03:19:45 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1705490377; cv=pass; d=google.com; s=arc-20160816; b=P4CQOd1bnGkvStFEPUEgaMyg29RsVnk+JwBilpZevq8oftGOvrLndJWOhZtOTCfSI1 3iyGvx0rVDXY4eca1+1mjxLNCUX/gfv/ESVsIMZ5utG31cS7hl/KDZ4W6hanqg6/rrwT fPbk8D90Tb7yVaO3e1cVLZSJlQO50U5lziV1zxDNVfljIE968mrnIYWq1Kfkks7neUYj /t/GLmtssgFl4Hif+98HCbGNzHEdrrSrNLkv6Kxad9nms51/iSJ5ztpj/IR0rgwEEqbK BvJnNrIIBUPbUOYe+IFyuxM1d9ttFUwe6KMCvfcz+yd7Fg2UFL9hD125/kR1uqi+OgeD 1F9w== 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=w2d/AkDrPcDFWlqgweyLT4S5K4gmWiiv9LURPEQF23w=; fh=xxo2rOAPT4f31TY31yIWVuVlno6QMa2Pdllc3KKolm0=; b=HUz7Ha53wrSOaQbqbrpxZjBtzTzK9ceP0JrRHYfUg1ss5ShdyYM8wBanqr9hU1kh5k ZBv5ve3+OQiSbbdoeAau1sI8BsED1shLlhF7LFCzo9YuVmWpxeUNLXm+Yp+QakE6xuCG BDZ8nCl5Z0EP4ih0i/1ogh6fpSIv0KnrmbigPCvGX2Zm1qSUOy1qoP+cbNWy9Mr1VRI0 W15sFLa7qw3/0NX1Kq/0Ab+R9LAvWWs15Q4te7Xp9Sx4ZsvkkiLGfBVHaWmzz8OhzdZ6 5R6Kn/D/1G2R+7pKC2D5ymsATQYxNJEkLw9lLHWzbwzar0yE12tXeSEtZ3rPxygml9RG DNWw== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=DiY1yT8x; spf=pass (google.com: domain of fm-294854-2024011711193491588c3f65bc422b09-ddxvem@rts-flowmailer.siemens.com designates 185.136.65.227 as permitted sender) smtp.mailfrom=fm-294854-2024011711193491588c3f65bc422b09-DDXveM@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=1705490377; x=1706095177; 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=w2d/AkDrPcDFWlqgweyLT4S5K4gmWiiv9LURPEQF23w=; b=tLZdJbX6cYtAP4YxKoDMcqrgVNI+YcxamKknuPCm3wjGK9aupGqkJZbwvNsbEMfTaP 7448GmywEdUPl1gG1rptpOYHqjN7A06LH7ZTIwNy+pq+0pHaTVKffU0FaHT0LTmkrRg9 9Yr6GWkTrJBCP9MWG3Ux2WrnduKL5POuVKwhIVwA3vB5/q/LMvN2TCV+reVQf8txpX0G 6KDxyyANfwhLCo+XsMJjCxgh4p8YEcQb+fV6b19n+1Td93IdLSfaEE9rCtbdLgL2nMov 3Jj7aOG60FCzOcXqC1XvSODlHzu15n2opc/eDJvNgVyXSL535zQeXqFJ08WFS2afxgYN /imQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705490377; x=1706095177; 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=w2d/AkDrPcDFWlqgweyLT4S5K4gmWiiv9LURPEQF23w=; b=wXB1efShTx+YrON5sCsxrhFSJ6Gcq209sZxOqdM2UoQ2FSpMpBi/TaHBlGu7DcTVlM C98byO6yvxTpEcc5IZPOhN9cV07dIKO8zPjdiJGlHEogQzLsSVLICN/kq1ssoLf5DGfE YesHK47/A7bji9dUNb91/WKEA6qbRALMo6KNMa/TyHHELap51tB3ixbXI0bmrL+aL9bD E8Gl2/Brpw8JQY/wKL3EMPD7xgmv4XPs5JtHVR3KtNdanOZpBygEUu8nH38mZFfr26J4 0la0aCXYythfKQf+fwmnrSt5DZBuuvNmDLEI7rxLkR3IQC+Jp02m620TslvClP6noAXn QTGA== X-Gm-Message-State: AOJu0YwwI8sJMylu/hU0FlytfbCdU98HGjRjqEDlagPkSHPa13b2g4Vp 4/Rr+NzxaRaau2HX4EGjM5M= X-Google-Smtp-Source: AGHT+IHBOiyW56ZgsIxRp7lZ121WyA1+jlxUjhnq3hDbm66cCeBytz2J/MxrRVUYhUHVmU0iMSdfrg== X-Received: by 2002:a05:6e02:1aa7:b0:360:daf2:5b36 with SMTP id l7-20020a056e021aa700b00360daf25b36mr6414313ilv.46.1705490377724; Wed, 17 Jan 2024 03:19:37 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a92:c5c3:0:b0:360:c64:4fc6 with SMTP id s3-20020a92c5c3000000b003600c644fc6ls1728830ilt.1.-pod-prod-05-us; Wed, 17 Jan 2024 03:19:37 -0800 (PST) X-Received: by 2002:a6b:6114:0:b0:7be:ea19:45c8 with SMTP id v20-20020a6b6114000000b007beea1945c8mr11116700iob.4.1705490376925; Wed, 17 Jan 2024 03:19:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1705490376; cv=none; d=google.com; s=arc-20160816; b=V2/lHz7sW3v25KLzwxfVgJ5vhyvQl85PmiyHxx1xHTSfQyB6pdetG+vW892NcnjO5t +hFdKePfsM/YN7IU7WGIdLkR50WkUBf7JU8G01eP6PN05gEO7YhDErdJlLjusKKSQ28/ OmtuhE8402BeYMmWsC85fV7DWC54fGVcVwCpU659dM9l37wb40tgSqTgbWskuvgZKKX6 dMa4mxe3stWHuFUHBgEloNaoxWPN0iAHSZEEWREvVDKd/tM6uCz7g/MYh5bEBRGe5WxA fbLnj5tZTv+Sea9FPXODCbDAA8ehhP9Xw8GwzzDCgXgJrIFvXrxSGXBNaqH1UDeSdAnv roUA== 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=JSL0ZYYWz60JOrAWsyNaAlgSNWoQAJdV52nvOeXsQKo0jMTDbOIVfjJcrYrgtmXzwc +ZLIOCy7LxTy9Bx0AKIoMj4s8hojJvMETMS1R5fUptMBYNecgEB16FYWaUecYUnmHmRK JFMkWCt03j9caO6aMV8OI7F7mZ2zafowTBsD6kxn/VbAbuMDgI5EwWA6ZlMZEC7sCafL H3ju0622aDylKRzCk0NX1cgYhrZRhj3D80KVWoUt3WwOp2t8I1VN9RCakRzMESEckLFP NhfLD2K5Pf8VXaziBlihvJSXcQEf+yDTeRm0U46nwadNtNKos8q0+B9RknrtSJew5jbh 54EA== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=DiY1yT8x; spf=pass (google.com: domain of fm-294854-2024011711193491588c3f65bc422b09-ddxvem@rts-flowmailer.siemens.com designates 185.136.65.227 as permitted sender) smtp.mailfrom=fm-294854-2024011711193491588c3f65bc422b09-DDXveM@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 k16-20020a628410000000b006db9c242a3fsi122274pfd.5.2024.01.17.03.19.36 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 17 Jan 2024 03:19:36 -0800 (PST) Received-SPF: pass (google.com: domain of fm-294854-2024011711193491588c3f65bc422b09-ddxvem@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 2024011711193491588c3f65bc422b09 for ; Wed, 17 Jan 2024 12:19:34 +0100 X-Patchwork-Original-From: "'Jan Kiszka' via isar-users" From: Jan Kiszka To: isar-users Cc: Felix Moessbauer Subject: [PATCH v3 3/8] meta-isar: starfive-visionfive2: Use kernel DTB Date: Wed, 17 Jan 2024 12:19:28 +0100 Message-Id: <98166cee53b913a4ea87bc892bb63a6020a73472.1705490373.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=DiY1yT8x; spf=pass (google.com: domain of fm-294854-2024011711193491588c3f65bc422b09-ddxvem@rts-flowmailer.siemens.com designates 185.136.65.227 as permitted sender) smtp.mailfrom=fm-294854-2024011711193491588c3f65bc422b09-DDXveM@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 Wed Jan 17 11:19:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 3302 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Wed, 17 Jan 2024 12:19:46 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-pl1-f187.google.com (mail-pl1-f187.google.com [209.85.214.187]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 40HBJiHj032527 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 17 Jan 2024 12:19:45 +0100 Received: by mail-pl1-f187.google.com with SMTP id d9443c01a7336-1d5e247e469sf17328045ad.1 for ; Wed, 17 Jan 2024 03:19:45 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1705490378; cv=pass; d=google.com; s=arc-20160816; b=bqLZ2xmJ/pinSw8ha++5JAZCBQOOFzFnHpPMi3tbLbo7yCY/PYQHWHEuWIcEbMWPfI xCZA6yOiVHErONvWLHhp0RVoRuOYgAx8Q027xK6GkvDUE66wqs740NQFUjkiONzFupFz IZXYwTalFDPGVt63QPNaKhFhV8gIJoEHUrIXCWTT9icmT8GvO2X8bg50gBt9hlkrKnhw r5yl+CTnW6YhGrXmTSAONR8TaHAw6/ODc7xMBZ3HVw4434yIkTI0hkFXL7Ck/xCp9UbT jWLvJqh5A6coSmpSRCP0QOhaCD0/LBuu4JVwwGgTPZtwDhGbfykcoixn09jY0DcOsuBJ 3RDw== 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=eUbISzDabYQCXZXfZyFdw+jrOUVWLbYZFmPLDygu3/s=; fh=xxo2rOAPT4f31TY31yIWVuVlno6QMa2Pdllc3KKolm0=; b=Gv9JPsJNwxZ760+8jZb5Fn2WclCulK4TxWOB8aT61+0NaCx6uHUl9SExwsoXXRci6P dByaBEmJupxFABbIN//6AcMmi7nuUp39QiIoND8y6fo8jp5eALpK2FgcS0HKPAObhTv2 A4/x5X+fbJsyqBqHIO9bheo1ioBl76laH+o7UwT4rbGVendNvHV9JSLwIgj8IzOTNbWo btArH9IcIkNDHTzNxmU+ac+Re9j9ubV/HuTuQcirTexoAWlqq/HbfwDhip97JHRaeNiF YtdlslxiECZ9ZS067Xs1rtwRvqsWC7/wYai8kbarYVgNqwyJRdAki3b1eBZjmqYCTQEp XAlg== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=fnyV4zoL; spf=pass (google.com: domain of fm-294854-20240117111935c6712bba830e32d233-nvwz7m@rts-flowmailer.siemens.com designates 185.136.65.227 as permitted sender) smtp.mailfrom=fm-294854-20240117111935c6712bba830e32d233-nVWZ7M@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=1705490378; x=1706095178; 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=eUbISzDabYQCXZXfZyFdw+jrOUVWLbYZFmPLDygu3/s=; b=VeOlpjTn0YM5SpGt2bY/8TE2SjaPvwrFftu1jY6xCHzpgL4EJMWXewiiLXW7A3Yy0J uHstiYRn/208dfuBcZjjOepmqj7j61pGUqoc5woTiXu4YU614jyI2ntj7vx6Y5g6LlKT N1a1iApMzmlrxWPUUJgY5wWKSl+eu/QzD/+KivuNN+l+zh9ykTE+WT8fPRQ7BKQjVpLz gvWn0xsnUCuWCkq73kdXbWZMlQL5AGtUw5k+/2/OE2BR8sdDkXpFUMcmWOIMHhK8VMhs 6TucdRu1jU2bRfcxcnYGSPT/YjYm6dDcZuOp27D5SWSwuM5n73QUM9O/tMxDxcY6tV6k GVNw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705490378; x=1706095178; 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=eUbISzDabYQCXZXfZyFdw+jrOUVWLbYZFmPLDygu3/s=; b=lFoWtwNFbfQS1n86Wxsjm4LE2unmWmGe5FM23ODkSiSWb8FvsqkL3mTmpluLwYNT2B 5y0F0DF92ioAihuBJVW2ycTWi0lxjkTwHQwk1GZCyED+rVJO9gjDttKyWti83erdlUUD QbQukMHWHcQ0l/G7HmJ+z9RtM44fWC7ny46hsAyfhK+41c+uF5xh4aMvl4ZugCHXd933 zPlxx0fJCaPIMF2tQceSySL15BhEtoX5TYx7jHFuiQYDpeUVWWWb8YTjJ8ntknLICnmO nQGIRKRfJAn2JT/uvY9U6qWvsvsWAAAYvfXtz/aFT0dDlDabI+uF7AG9oPlnjVVmsHs/ 67iQ== X-Gm-Message-State: AOJu0YwV+gtaVgEblrv4/Z9vJxF9PjAieX/eS430Qul3JxoLKlXebR1R 8PDNTvOdN3wSXZ5GAyJg2hw= X-Google-Smtp-Source: AGHT+IG5HbwutsB6wnMRus5ZkmkTOVixe0KrZItRTwTQ6kHjF7jvP3PmPodS+gX8u2OKR1BZFdUHag== X-Received: by 2002:a17:902:7844:b0:1d4:14f1:3aa1 with SMTP id e4-20020a170902784400b001d414f13aa1mr9472119pln.72.1705490378429; Wed, 17 Jan 2024 03:19:38 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:90a:db0c:b0:28f:fa7d:5070 with SMTP id g12-20020a17090adb0c00b0028ffa7d5070ls350006pjv.0.-pod-prod-06-us; Wed, 17 Jan 2024 03:19:37 -0800 (PST) X-Received: by 2002:a17:90a:b902:b0:28d:19ff:5e3f with SMTP id p2-20020a17090ab90200b0028d19ff5e3fmr6079002pjr.86.1705490377196; Wed, 17 Jan 2024 03:19:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1705490377; cv=none; d=google.com; s=arc-20160816; b=xUzpVZ/yB5BWaePXlIlTj91e7cfF9pp3r7pEkbyzYifsOIJBafoMIBZTVMSruTBox9 ISJ4ITlf14wSz+8ymNrRJj8tpnD6gx2SdVT1tKRlNzPfcCuEobU4aypHzXetX89JoSuV p9KBJkKZRfeNVGNCnKOb+fwRGo4Nz6FL+WDwAKAjM22tEdy/gCMI7fJ20TZNXdaz5iUU JE+GkAb+Z0TWXxmgXNRNIW8sU3rQdcAhI1cH266XGeSMIoLM3vCvuaKxwdtCxrxCtP5o I7/FuW3bh1e/4QucrL9yZOK+pIertTeBvPaCx7UCJhpgxtNev0acKsC62nn9jbbvGryf fpXw== 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=a9jONtyHuJFDmJzyVhBGqoYqeamKKCO+DT/QguxnmLtvjfPo2X/mbnD4t18BN3ix4d YFFTFk3rR7ollB3AVKQGAQkB5PXE64ti3l5tO2G4IJFfHaBNyV1bBzEVkQRFZoEdAPkx OGFBAZG0yku1X5YCgAqAX+Onz3GVPJeRRDGzNzvbiOeQiapjuzDa5bOgWpaWN0fn8ex9 i5o+kPauFcCbfB4swBI9HpeCpxoo9ZqYhHkvZny/u4+2IahncmMq3KJejtEi+zg6hz6+ N9Dzt8TnfVbN0bsMcN9/ZiedXGc/qumirxq8Z2a+mXPmfFRgmTrjbGayv/KBeUhVm49/ x/ow== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=fnyV4zoL; spf=pass (google.com: domain of fm-294854-20240117111935c6712bba830e32d233-nvwz7m@rts-flowmailer.siemens.com designates 185.136.65.227 as permitted sender) smtp.mailfrom=fm-294854-20240117111935c6712bba830e32d233-nVWZ7M@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 y23-20020a17090aa41700b0028ff720a0d2si71685pjp.0.2024.01.17.03.19.37 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 17 Jan 2024 03:19:37 -0800 (PST) Received-SPF: pass (google.com: domain of fm-294854-20240117111935c6712bba830e32d233-nvwz7m@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 20240117111935c6712bba830e32d233 for ; Wed, 17 Jan 2024 12:19:35 +0100 X-Patchwork-Original-From: "'Jan Kiszka' via isar-users" From: Jan Kiszka To: isar-users Cc: Felix Moessbauer Subject: [PATCH v3 4/8] meta-isar: jh7110-u-boot-spl-tool: Rework Date: Wed, 17 Jan 2024 12:19:29 +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=fnyV4zoL; spf=pass (google.com: domain of fm-294854-20240117111935c6712bba830e32d233-nvwz7m@rts-flowmailer.siemens.com designates 185.136.65.227 as permitted sender) smtp.mailfrom=fm-294854-20240117111935c6712bba830e32d233-nVWZ7M@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 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 Wed Jan 17 11:19:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 3304 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Wed, 17 Jan 2024 12:19:47 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-qk1-f187.google.com (mail-qk1-f187.google.com [209.85.222.187]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 40HBJjFs032548 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 17 Jan 2024 12:19:46 +0100 Received: by mail-qk1-f187.google.com with SMTP id af79cd13be357-78371be5e1asf124817385a.1 for ; Wed, 17 Jan 2024 03:19:46 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1705490378; cv=pass; d=google.com; s=arc-20160816; b=lX9g+elTCvlGyGmZmTak8woN0lVrflNwwb5NyybjcZ+4eLxLKitFDDEsnbvZl1ps28 2caOfc/GoFjXxMd1xiOg0aj0sEhyz0uDvOQADuJ62ttU5bF4mxNS9oLLUmrah81QCWZ1 S+O0Hxjq0gEJwa6VI7ADSzz4qgE1gbWyxJByfiZ9FiIUUjhWaldkQOOeepvbiuiNV0tZ j4uVpOp+lqC+QFGdZpyTpFdkW4Gbtd22KjgAl45bkFIL/2DQu5cayDoW4ZEEeIzzdaBO 44+U5ovx6952HwmkTeOtce0FJnZDnMPOy9jWZ85r+D4Vcb+EJwuWUQ85c4Q44trHuP3u 0lnA== 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=Y7O0Tsm505xT3CDWgIydAZ7eukIxbTQ3pBYrsrZHNFQ=; fh=xxo2rOAPT4f31TY31yIWVuVlno6QMa2Pdllc3KKolm0=; b=ag6D54/tWjt2PBmW1HZc8qYU4CUUFasHJvePblJemsNPWhzqr+kxch+lKBNKsu8x3G M9mkRuJJFUyhgXSqgmvEaPVdfM3CETWnqy7n0SUZ0kn6t1BcJXi9AVzOjgRlaoSh/90L qnSW5S/o4vrkAiUn9UI6mJWRUQiBmHIQ9EtAcACpGy+9kX2OVExShpdErM0LwzcbCbTZ dBMvUdpgd+qu+h8We2vSjLE3cwa+VsW/uh3Sf8LyKCOu3Ykg8US0puNtvn/SQVTuCN+g r80y1qL3oTRFC5ufLNdF3uLTxr2UWkvotzURM4u5NeMLQ+yjH4da9wlW9zxHLxDZj6Wm ye2w== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b="G/3dhh/t"; spf=pass (google.com: domain of fm-294854-20240117111935ec290332b68c88faf2-1cd4x7@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-294854-20240117111935ec290332b68c88faf2-1cD4X7@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=1705490378; x=1706095178; 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=Y7O0Tsm505xT3CDWgIydAZ7eukIxbTQ3pBYrsrZHNFQ=; b=G4JeKlrHJ287gHcZsAnPyXjG8qeZ6b/+W4tM1EMC5YXZWjBBSBK0urLNNgbPM7XwSF FdXIc0xtfyZMBhz5Vw4+EncanPBdtR/FiqAslFGNbAJUZh5w3l+zR5SjMNlsTpvm0qYK jJqkO96BV7o2vKW/fZv7zAgzDk/6fnUkQXncAQlNdqWbU+BpO6lgtg9BRQhoADSNZCks q9atzx1oHuv0v2LnUgr1yRe3EenqgWP7kxzBKx75iqqlBEJOu9AWDSEh++pdeS9MThym Ke29ZcAHthVGZXLUwCy215BRy00HgkDmwAPdRGdkAVZMGEhTxwjTkJK7ign0K5rtOg0Y eA1A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705490378; x=1706095178; 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=Y7O0Tsm505xT3CDWgIydAZ7eukIxbTQ3pBYrsrZHNFQ=; b=Qg3FFxz0OHER6b+vaZAsItdSMJfqgDVniukcc55cpCsaF1xd9KeNPa3cUwXbsTtVYy WB+Pg4OKv/ynwCpqbDx/OP8DZeAJNeI41zzpUvlXVnQM1YmuOCYMZqqziMNlD7hyzC0c QTdchYE8Wl+djdUiG8k6SEhds9ViThR+2aMcDLPp8HAfkWzydbdBUjaZ3AGI6fTlwfHG 1mQHZgDAenFtY/7jWMRhHG2OBvDnqWeZ/B5YszhQiJ8wctGqtmW/Vp/FWoEeGzvJxsTc uK60EH5/tMslzDLbFZ9uLwpmJg5zSuNZ/eIbyLAROg95vS4UeXqq9IcwInnyv1k2j+Mv GfDw== X-Gm-Message-State: AOJu0YyOYTsta3YPT9cIml3Owwhms7z+PfmGqhpfrYhf5fjrwDOloohU oJxlNYyW3WIoTbXCtZHA4/AghpeMR/GwOFRFtCrtb32HOFKReeSV X-Google-Smtp-Source: AGHT+IHA7weYyUrfycogo5igjfSHIYf/KNQQ6EACmWwFx5LTK/hHiUyayULhxS5MSYWS/S+hRi1SUQ== X-Received: by 2002:ad4:5cab:0:b0:680:b90a:37c1 with SMTP id q11-20020ad45cab000000b00680b90a37c1mr841757qvh.64.1705490377763; Wed, 17 Jan 2024 03:19:37 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a0c:b384:0:b0:681:7999:1bca with SMTP id t4-20020a0cb384000000b0068179991bcals1253887qve.0.-pod-prod-00-us; Wed, 17 Jan 2024 03:19:37 -0800 (PST) X-Received: by 2002:a05:6102:2411:b0:467:f036:7667 with SMTP id j17-20020a056102241100b00467f0367667mr285382vsi.23.1705490376957; Wed, 17 Jan 2024 03:19:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1705490376; cv=none; d=google.com; s=arc-20160816; b=VmiZjbPQ6L00SkjF1lgWya/6GPzq81s41bkRKohBWKB+9BuRR8mEcGp6E3lck3D8mh 4n+T+D56Qec5sQEEQ7+IW/BjRyfH4KkZvy4CiJ0qrIzaW/K7zindui57hX8cn5urbP0t NX5+1lFS4U93tQjYiBaeWI+MkaaroSfX7Hn9ipvHofZR9245Z6BTfdeHUvi5ZYCWT6Bm epU50e0GU8WAV6kL5apl5oMt/1hDoZZkMxj0AfG4lnFV+ZfsCJVKLLCnrlEM58FMg/LX T+Ro1VNzLxXOII2KeAAFeLcWupJtkSIRqZc5Y9YhDQj1vkvvK3VSu4YLPwzn88s0GCKg JKhQ== 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=XPtpblRV2GeKv7abkkitNR8MZ3QlUaZVshaXKznMn5w=; fh=xxo2rOAPT4f31TY31yIWVuVlno6QMa2Pdllc3KKolm0=; b=xiyTj7a0rwrlIKYFMjNvqStpDQSvHTupSlOOwrtDCMLTlalUnePoSW5MU0gCfxnhwd OX4f98GN5qnrxt1z5E8FieTDO3xpYlr0mMDCEvT+f4mmgAkqKXNu7cyyhGsKUM9HfxG9 +C65zTj7SvWXwo7DYf1fWlS/WLEC0wvRADjbYI2fXf3FwkOCEgmTfDYmTIfjgFP0E3D7 AXlhL1hJXJOBmNHBATjdmDzio0RVqq7knkMudBOEW4ltBO1u8h1vvTTomy8Leoa2HPqi 8x2XSbnVvV3Gqu+oP7pKt1shuTv4kRDmvHUAeXozEME6ypBXoKCOvPXIu0g8A8XoRcfr mMGw== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b="G/3dhh/t"; spf=pass (google.com: domain of fm-294854-20240117111935ec290332b68c88faf2-1cd4x7@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-294854-20240117111935ec290332b68c88faf2-1cD4X7@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from mta-64-226.siemens.flowmailer.net (mta-64-226.siemens.flowmailer.net. [185.136.64.226]) by gmr-mx.google.com with ESMTPS id cw4-20020a056130220400b007cb8c7adf99si1055969uab.0.2024.01.17.03.19.36 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 17 Jan 2024 03:19:36 -0800 (PST) Received-SPF: pass (google.com: domain of fm-294854-20240117111935ec290332b68c88faf2-1cd4x7@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) client-ip=185.136.64.226; Received: by mta-64-226.siemens.flowmailer.net with ESMTPSA id 20240117111935ec290332b68c88faf2 for ; Wed, 17 Jan 2024 12:19:35 +0100 X-Patchwork-Original-From: "'Jan Kiszka' via isar-users" From: Jan Kiszka To: isar-users Cc: Felix Moessbauer Subject: [PATCH v3 5/8] meta-isar: starfive-visionfive2: Switch to upstream U-Boot Date: Wed, 17 Jan 2024 12:19:30 +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="G/3dhh/t"; spf=pass (google.com: domain of fm-294854-20240117111935ec290332b68c88faf2-1cd4x7@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-294854-20240117111935ec290332b68c88faf2-1cD4X7@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 2024.01 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_2024.01.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_2024.01.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_2024.01.bb b/meta-isar/recipes-bsp/u-boot/u-boot-starfive-visionfive2_2024.01.bb new file mode 100644 index 00000000..9f819c3e --- /dev/null +++ b/meta-isar/recipes-bsp/u-boot/u-boot-starfive-visionfive2_2024.01.bb @@ -0,0 +1,29 @@ +# +# Copyright (c) Siemens AG, 2023-2024 +# +# 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] = "b99611f1ed237bf3541bdc8434b68c96a6e05967061f992443cb30aabebef5b3" + +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 Wed Jan 17 11:19:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 3303 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Wed, 17 Jan 2024 12:19:46 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-ot1-f60.google.com (mail-ot1-f60.google.com [209.85.210.60]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 40HBJjVZ032541 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 17 Jan 2024 12:19:46 +0100 Received: by mail-ot1-f60.google.com with SMTP id 46e09a7af769-6ddec7b52e7sf8449604a34.1 for ; Wed, 17 Jan 2024 03:19:46 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1705490379; cv=pass; d=google.com; s=arc-20160816; b=uSKrwleWDB4Uj8/aNHHQKkG5p6GaBMiYrjO+C4tK6Vf29QVK8gP449ybci13h51sU7 LfAaTZpZvo7HUg8o4wAHixcOJ/XP7xZpLWnGIjfpPWPQ7TvspvAmlTx70l8w9EePl6EG azmGoUsIDcmYJeY5FZKCTf4mOo0l83tUMpL6QOweteZW/FJgKJKl3ISkOxOQvQ8ubi1Y xkajF77H2rClVpyTlZUXkhYTBmNUsmsF0P8hFhu/oPEKtDSP1j7Xsp9lgGHB8NwMzrTx SHil7sz/qD/geQxSg8fp58/nEK4m3UJIMHSPj3vHCvl92M1J2EobsXFbDgVsfSM0XpiO bZYQ== 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=RJFAJ82x9oylKV/QqbKuaW3wzF4tUfGvL8wL2lFNRLE=; fh=xxo2rOAPT4f31TY31yIWVuVlno6QMa2Pdllc3KKolm0=; b=ONqFYpZkqGC2bt8HcQRmym4QEKyRTEYJowJw7aj3xJ+NZa2fNxJlVmBcgctHRo6Ci6 kvkYKesJKxaZWUJhiWSV3szfGh9+ziml/JHW/rb8CUWaKb91CgeFlBs/z6L7ekCOPnGn piYiHv2yI7DpbOuwnL8AARrtC77M7qRIYCY7FlAW/y+DT64syps/klEzXNAz+1xrhawE RSESvEb1bIi+EorwL05Q0hkmlBJ5/acNW6IwyNQVGKNcEOIemTdnsX00dSElfjers4BD 2XEcEF2nqufxeYgTwsslDGoDvdxOahu96RcRN67B638irETTdmpUpHyaijJl/9QcDCTX Mt/w== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=hHwSSWL4; spf=pass (google.com: domain of fm-294854-2024011711193502a220d33a009c1796-mm1oj2@rts-flowmailer.siemens.com designates 185.136.65.228 as permitted sender) smtp.mailfrom=fm-294854-2024011711193502a220d33a009c1796-MM1oJ2@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=1705490379; x=1706095179; 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=RJFAJ82x9oylKV/QqbKuaW3wzF4tUfGvL8wL2lFNRLE=; b=qbitLgy/Dd9Zruncu0vG7GLINIOH/TeOyxPBcaZ3bBGm75tXBoe9rzq8pGwr21lgN7 l7/TTbbWSTHvxzrAwz+8sUsOS/4mP1FvY1aej3rsn9WH5vynL3J7ifgAwTSWx52f/sxH Rf6+ytCLkSchPYzJYxYTzsBK+993mr1MKI1PNgXiFCWzeev6syFnnl4oA7bhHHwb2bQm JG+35iA0WG7PcMySqTHeEoouRxT+gpliGJs0HfG9lu8RPc7/2cIbSxiVQb2rJ7X3oeZg 7WDqdjCu8SiEy/r1uSP1gmuG/k9C/6B5mok70dzO9UPMXSEHOHpOxvrZyoXhWYiWcNXj Sbgg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705490379; x=1706095179; 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=RJFAJ82x9oylKV/QqbKuaW3wzF4tUfGvL8wL2lFNRLE=; b=V2kyTdFndQlwHkm4FVdBdQimMGo2u/pHjcBbhLdz5dhyqYDv2r5/Wu2F2YUpaKLZ2I FT0YxrPXfK1GdhBXCzocILgE17d5xLzrH02KrieLpFjyXHYTuEq2aBHfG5+hx84z+SQe 1adgX8cLjFL41UJbLjjT5lY4ni8Vd7rfkMug2EOJr+r41DWincAQ+Tw8gWvakc1yxXxZ FFLEFpMe9WlTvdJX81ydsvU41um6+3SQ9xqvXkccJpqmCkfwnTjqR8pAYmkFsFb+YuL/ xjvY9LXPDeVuy8FB5R4cLMAa7ac3pie6sfUpGNqA0yfOYP3KM+ede/6W2Ga8n5dSIupq oQBw== X-Gm-Message-State: AOJu0Yxes5UKOsjYmbRxE06OFJL++kcqMRsD9pfbbZHuPAdFXqEjfXhb 0LV88TAzu+nSb3UVwfCK948= X-Google-Smtp-Source: AGHT+IFz5izBzrM46u4Pck9M+vA78666+PWC+sOu8pvrCoeseZA23MN6U3psLcSepVJCGZUq76DZaA== X-Received: by 2002:a9d:7a43:0:b0:6db:d232:7f40 with SMTP id z3-20020a9d7a43000000b006dbd2327f40mr7929677otm.0.1705490378835; Wed, 17 Jan 2024 03:19:38 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6a00:a0c:b0:6d9:7f80:c7ab with SMTP id p12-20020a056a000a0c00b006d97f80c7abls4920103pfh.1.-pod-prod-02-us; Wed, 17 Jan 2024 03:19:37 -0800 (PST) X-Received: by 2002:a05:6a21:8cc5:b0:19b:1eda:ab61 with SMTP id ta5-20020a056a218cc500b0019b1edaab61mr2740888pzb.54.1705490377625; Wed, 17 Jan 2024 03:19:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1705490377; cv=none; d=google.com; s=arc-20160816; b=C8UA6HnpnmYAu1scS8OaCKX7jcBja4MleVXfwwKGUENGcLqWJST0yVWbrG5+7PRhAx V/PKCYpmYLwI5LElXJ2AS/8GZyNnhMW+Vy4+fEiP8LtQcP7ymWMIogAmnUpHGUxyFHWz ETvaOr/7oh7wV2cMQUOWISBSkssJRxs9vvSXxPtIquf/BJXO3d7hLiuVCOlCcRyp+kLm g8tXBUhlykvMLJ5dYstFkP0p1zsHHkUbyYCLztezCBhZCZNGiVhiyRoAIvmA94NmpDMi gGQRwybgusmnzUGUobYEILybgSZdrr90p4nozVkKIT2FVe1qAWe5NDqm2t0yGx25cjJk pIoA== 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=hLyDtJNV604mRa8TxUVI5SYyNsEBPSNs2/685+15BTk=; fh=xxo2rOAPT4f31TY31yIWVuVlno6QMa2Pdllc3KKolm0=; b=TwrFeXVNwwIzE/zVLkpSd3elVtVLtM4VwqwMqc8bgLnuxFOJ2aTnyPw+pOwnFn6R8x HylzN2iGFp1VCQKgXMI6n6YRSZG8vnnQ9Jfb7Tx/SooPbhmH1In3YPfdI+LoCEq0gpVn eJqVDokXG5dDLjzSAZ9qgvYcKl1Dot7x4jmXQWtnELPvdkZI/IRNPCVA/D/oMJwPAaub aIlzBLVR/ju8Dlvbu8GAThIE3oCAUqF9R1YMdPCKynYpJ8BHBYCOlkiWpb5gE6ybdR+u wGguFTEhKGiEZWRvdGSUDSHcs8twidHhnEZalkCA3e/adQ9IRa/xLPwTJ3MQx4tSxXwa vj4Q== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=hHwSSWL4; spf=pass (google.com: domain of fm-294854-2024011711193502a220d33a009c1796-mm1oj2@rts-flowmailer.siemens.com designates 185.136.65.228 as permitted sender) smtp.mailfrom=fm-294854-2024011711193502a220d33a009c1796-MM1oJ2@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from mta-65-228.siemens.flowmailer.net (mta-65-228.siemens.flowmailer.net. [185.136.65.228]) by gmr-mx.google.com with ESMTPS id ds6-20020a17090b08c600b0028e79642f11si138844pjb.1.2024.01.17.03.19.37 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 17 Jan 2024 03:19:37 -0800 (PST) Received-SPF: pass (google.com: domain of fm-294854-2024011711193502a220d33a009c1796-mm1oj2@rts-flowmailer.siemens.com designates 185.136.65.228 as permitted sender) client-ip=185.136.65.228; Received: by mta-65-228.siemens.flowmailer.net with ESMTPSA id 2024011711193502a220d33a009c1796 for ; Wed, 17 Jan 2024 12:19:35 +0100 X-Patchwork-Original-From: "'Jan Kiszka' via isar-users" From: Jan Kiszka To: isar-users Cc: Felix Moessbauer Subject: [PATCH v3 6/8] opensbi-starfive-visionfive2: Update to 1.4 release Date: Wed, 17 Jan 2024 12:19:31 +0100 Message-Id: <7002bcb1c407899d600d2f8d89cba6dfb0a9efc1.1705490373.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=hHwSSWL4; spf=pass (google.com: domain of fm-294854-2024011711193502a220d33a009c1796-mm1oj2@rts-flowmailer.siemens.com designates 185.136.65.228 as permitted sender) smtp.mailfrom=fm-294854-2024011711193502a220d33a009c1796-MM1oJ2@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_H3,RCVD_IN_MSPIKE_WL,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 Signed-off-by: Jan Kiszka --- ...2_1.2+20230310.bb => opensbi-starfive-visionfive2_1.4.bb} | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) rename meta-isar/recipes-bsp/opensbi/{opensbi-starfive-visionfive2_1.2+20230310.bb => opensbi-starfive-visionfive2_1.4.bb} (70%) 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.4.bb similarity index 70% rename from meta-isar/recipes-bsp/opensbi/opensbi-starfive-visionfive2_1.2+20230310.bb rename to meta-isar/recipes-bsp/opensbi/opensbi-starfive-visionfive2_1.4.bb index afbba0f3..766d1ed7 100644 --- a/meta-isar/recipes-bsp/opensbi/opensbi-starfive-visionfive2_1.2+20230310.bb +++ b/meta-isar/recipes-bsp/opensbi/opensbi-starfive-visionfive2_1.4.bb @@ -8,10 +8,9 @@ inherit dpkg DESCRIPTION = "OpenSBI firmware for StarFive VisionFive 2" SRC_URI = " \ - git://github.com/riscv-software-src/opensbi.git;destsuffix=opensbi-${PV};protocol=https;branch=master \ + https://github.com/riscv-software-src/opensbi/archive/refs/tags/v${PV}.tar.gz;downloadfilename=opensbi-${PV}.tar.gz \ file://starfive-visionfive2-rules" -# required patches are not yet part of a release, but will be in 1.3 -SRCREV = "2868f26131308ff345382084681ea89c5b0159f1" +SRC_URI[sha256sum] = "319b62a4186fbce9b81a0c5f0ec9f003a10c808397a72138bc9745d9b87b1eb1" S = "${WORKDIR}/opensbi-${PV}" From patchwork Wed Jan 17 11:19:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 3305 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Wed, 17 Jan 2024 12:19:48 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-oo1-f61.google.com (mail-oo1-f61.google.com [209.85.161.61]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 40HBJk8T032563 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 17 Jan 2024 12:19:47 +0100 Received: by mail-oo1-f61.google.com with SMTP id 006d021491bc7-598f58b95c7sf3233008eaf.1 for ; Wed, 17 Jan 2024 03:19:47 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1705490379; cv=pass; d=google.com; s=arc-20160816; b=RuweneEygZXWTPCfAgfutWIeVdK/lyf1m8+pGMryJoQ/e7avKUBS74bNDF4ub3628Q WFJecjO6dXQ30yfXg4PXf1EMi7bSXhzlqF64gBBwGSCvbEv1z87HrblgWRdxDpCYwQ2w t6HFhdq9/N+cnRgJCAvQjqmH+qpPJy0a7lmdP1IFA/5wFVZc9th3BFqLIfTSEI0aB8wi xVn5cP3G3EOnHBbGOR0+kN66Rk9LbXr5Gu0QwhIfiFxPi5XsI5mQ4TwLBhV+u1fYxl5l vqWQeo9EDC5QvBicMUO5iKPEOHUpjXkSwoB/DqO+CJ9bWE3A86Om4AZn9gsz+Ag3Fkr1 2ctA== 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=Hu4w42KxoGMNhd3jPFlnHh9W2H1CaRmYClDU+5PSykI=; fh=xxo2rOAPT4f31TY31yIWVuVlno6QMa2Pdllc3KKolm0=; b=oFoEA1YIxC7Onm5Tes1jvz+TdHMWXB/HriRu38++E1tX6nIukqDnK7VDhMXXifQrOd Lu5WSKOlwk/FwMFJugtGfowS/dhVrk+SWAl4x1Xs5cgr3wQjJQNx4YZWRy1HZ+7hoNxt GqDIGW+DPK0zyORE4hSvWqBjtYpvtlV0EVmVdOKO8jgSVij/XZ4jOfJdeJs+z6Slhjnf 410UoJ6qcMoVqExoajyckiq0NM7oyh89gP7z7dm6ReormkoLxvs1E/CQxoCCUgTw+iTq RmULmuEyPZPJtmUegmowIcTk/qOp21QASRhb/crGNWhWeJfvauVGAHg1Yp/vJ4MGABNb WGQQ== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=jg8jFNKt; spf=pass (google.com: domain of fm-294854-202401171119358870b3516e05bb5b28-azdvj4@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) smtp.mailfrom=fm-294854-202401171119358870b3516e05bb5b28-AzdVj4@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=1705490379; x=1706095179; 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=Hu4w42KxoGMNhd3jPFlnHh9W2H1CaRmYClDU+5PSykI=; b=FIz9zmeJZJUWUR/XlC/4P6VOmeuSDiJ50cHI87B4e9wTgAxx+xbyG9jQ/74KvuGcGT oWfo0EWI9DyB8dMELUOYgyTOvlA481JhYZWVWp6VhIk+eKnfLl2nbX6KCtPm9rNWQ7Im ZFIleqifY8Q8hCKN8ajgOuG3Duff1x6tzHoGMfUlNC2j8hMkDeYARPRkagkrUrcyYken 6fsIN1noFWH2i7HiO4OclwYUalSYiWJBpZjhOZJuET6gNCCdET9BZM7Nv8fdtWipeTkm iKUXCUC/ulIJ2l924ZV6rthFCrU00Zv11sV9z2z0E/pTGWwtHG9j12SKVkX9sFbjEYKs p1Sg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705490379; x=1706095179; 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=Hu4w42KxoGMNhd3jPFlnHh9W2H1CaRmYClDU+5PSykI=; b=qf7+dltqiNI81lsMT8EQCGBUDPXvJUyPFRLn6PCK+WOOnNeKqjd5ysY6dX5WeiVjPf orb76SPuqp3bGkXPi8/L7saJjU2f21+tA3FTNFnASSkxztNZCP2HzpAdGgn+D/jZ+tQX Fsn3bnYvpOmSEQXnaHl3OC0Gbgn3o+BN545AmmeOXEUbeNHMH/mq9+DrzIcyqeuSOeWO HDUrCQVKvQ0wLoNM55D8Fnj8YkNjejQTG+savKa6u/qAjBE3OC0TrC7W5+W4cFVpX7dl m1bzu10yn9ojURUbLBzhWNLGIkYsCudnUOXIk7vnbrtCLb+ugpAmQqxGwHbrruLeyOGq m47g== X-Gm-Message-State: AOJu0YydNK+YRirGB40EGMfsPpxawsmbKNMWr70aS8IvNXrCooXCdwt3 +jZfg6+wjJzmBeGiXI+8Q5U= X-Google-Smtp-Source: AGHT+IGg4QUiAq2sEEj8flNu0QER/sB0oh6+3+15oIECHpZQz3Gm7XpXR02yVv02KsRAwn8pvFAnXw== X-Received: by 2002:a4a:1781:0:b0:594:c97:2e3c with SMTP id 123-20020a4a1781000000b005940c972e3cmr5979625ooe.3.1705490379128; Wed, 17 Jan 2024 03:19:39 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a4a:af02:0:b0:599:25d8:29af with SMTP id w2-20020a4aaf02000000b0059925d829afls392349oon.2.-pod-prod-09-us; Wed, 17 Jan 2024 03:19:38 -0800 (PST) X-Received: by 2002:a9d:784c:0:b0:6dd:d7db:9863 with SMTP id c12-20020a9d784c000000b006ddd7db9863mr10839962otm.50.1705490377965; Wed, 17 Jan 2024 03:19:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1705490377; cv=none; d=google.com; s=arc-20160816; b=IV2jYl2OX/ukNJwKADKJo0ksSmsgRgiZkJ+7RIL6d7rls1jQqw4kN0iAb22Sc+ADUK cj2W+sbO5H5oKpGp8w2DzC+1B2bRKgNUaKSqscb+ZyUOxVVN1WGC+M+p/ehcDTb8TT5Q 18F5Ndum1Xk9bH2as12YMaAr0YfgFT0zvY0a7UC4K4P2k42sN3fK8YhJWvdZUqiVfAwc hOBJff3jBloDWYMAzsqnR2i2iL6kfS92MZbqclUAZYeesHEAviDCj3CoYksc3LjMZIop pIITQjDVObjhCg48m1neWy4BWXH+KVj6VkTrUCbKSaBeP0FqKaCPwOFVCySM/BnEY3Ki Pi+g== 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=E99OZKhDm1RZZ3WnNL9xKN4SyuUs5p1zKSEHAQpci6cQCYksJ6MW8+UuJyL3fefwYI xKpOZJkMOJAEKyeetEny9iWV2d1knmvQF4ilooXDL21/JDSfGmhoohzaBZ940iw8UGN6 EkKBFRKxvYkOoU5XqQmN7jPiegu/RetpVbfva7BiZgmFwiBd9wEHAUTj1Rr6Xg8qMZ0y WOusq3PVkNvwn0J4EXff4H0AHVsl5whqPWNqMOV2KXipwnVmZ5pvl7Z90BGFOc0W1hK7 d8TI7vWZNuCH0u/Aie2/Amml+wpHtqRopP1Qhuh4f1kH7qOJ33DLaeZwlILbaT3Vk2EU wzHg== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=jg8jFNKt; spf=pass (google.com: domain of fm-294854-202401171119358870b3516e05bb5b28-azdvj4@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) smtp.mailfrom=fm-294854-202401171119358870b3516e05bb5b28-AzdVj4@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 s23-20020a05683004d700b006dbb6f37f29si931320otd.2.2024.01.17.03.19.37 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 17 Jan 2024 03:19:37 -0800 (PST) Received-SPF: pass (google.com: domain of fm-294854-202401171119358870b3516e05bb5b28-azdvj4@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 202401171119358870b3516e05bb5b28 for ; Wed, 17 Jan 2024 12:19:35 +0100 X-Patchwork-Original-From: "'Jan Kiszka' via isar-users" From: Jan Kiszka To: isar-users Cc: Felix Moessbauer Subject: [PATCH v3 7/8] meta-isar: starfive-visionfive2: Drop obsolete recipes Date: Wed, 17 Jan 2024 12:19:32 +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=jg8jFNKt; spf=pass (google.com: domain of fm-294854-202401171119358870b3516e05bb5b28-azdvj4@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) smtp.mailfrom=fm-294854-202401171119358870b3516e05bb5b28-AzdVj4@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 Wed Jan 17 11:19:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 3300 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Wed, 17 Jan 2024 12:19:45 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-il1-f191.google.com (mail-il1-f191.google.com [209.85.166.191]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 40HBJiCK032517 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 17 Jan 2024 12:19:44 +0100 Received: by mail-il1-f191.google.com with SMTP id e9e14a558f8ab-35ff7c81f4asf102544215ab.3 for ; Wed, 17 Jan 2024 03:19:44 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1705490378; cv=pass; d=google.com; s=arc-20160816; b=YxS+J7rSdNw4ERJ9IVzxv/dpUROWT5zePL2a8PatEwDhZ3HxAmWiHbQ1FjYz2FdBNY Vd2qtAJqoGG4QMqaK0JPLiJGX9AE8gniVULG7QLsMR3SDxEVtWfocrHtCjxy1pmGHBu7 xCgI+hArAmcQjJgfLovP36yee/labgvtJsZlqstwLuPFT5q8Zg9DYBImf8UreWAa6rYn dMJJnG1fSeXujmTfcoFK2sTO66RRK4o4Fjme+pDEY6mlNwStM0oM9pNpiPSkQeWix81L 0tjngsU7yzSq7xkqRDzBo7DtVDZ7aOKWcNbfSrefmVEOI0OWSA+xlIPo8uVd6BUXYXb1 Gb9w== 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=WIX/LkpDFFowCIfodxx8djPuBTr2v0Py+uwGzXJbXNI=; fh=xxo2rOAPT4f31TY31yIWVuVlno6QMa2Pdllc3KKolm0=; b=gYW0JOgtaLDsXMGvWUKkwB326CtEYJxA1WlFKbhBMqSxJ29IhsDKBqPKF87JzfFAzJ IPOh5HhIPhUU4mtOvelblfB5KpGCRZeLHgHlFJT0RS20F7MX5oTwrwHS1aTN1Y7WCHyw WjvWDmPeNgbzifvpYFdSlKxcCdv1SfdhKTPjlgi48IflK06dh3G/MyyhoAZZl7E6SpVh 7o/99EzyPCHFUpn2aa1obpWSRjFVodEh57thMuKqPr7+a1SFy5GerIjxXzMsF6HXnM9N cSl6HIvMPS/92n5I/8gTOxF+sHefvRjQsEixqfRoFrXzf0YCJNsUCefOAnSqGHGnHkM3 3EMw== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=HVzcdmyl; spf=pass (google.com: domain of fm-294854-20240117111935ef35dbb6b3d6c7375e-g9mi2d@rts-flowmailer.siemens.com designates 185.136.65.228 as permitted sender) smtp.mailfrom=fm-294854-20240117111935ef35dbb6b3d6c7375e-g9mi2d@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=1705490378; x=1706095178; 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=WIX/LkpDFFowCIfodxx8djPuBTr2v0Py+uwGzXJbXNI=; b=aEAO/yEFVVuIyvi57LKnihwNv2CiQl2QIr3GR4ObYHiQF/Ix0wuWCYYZ5CnfSugMZY Cp4hG68h62ai3T6opjCeza9X6iIOrizQXndSkkt05ZBe9EkvAlwfexV44euoSKFXN0d6 0/Dzi2lRO5Pb4TkI0hdVCxe4mGp3sRZhO+TO7QyCfzTaIsadfqm1l9DpKmY3pfRbJ/ch ml52VSvTvyRJ8pGfLwGDF2uyrue2wF76uy6l3Gy6QMgj/Xp9f5nYWrAug9o1BDXHTOr6 LCP0EELE4AuA6bs1UbR+5f1LYzFTaUDHXRBSwyHIIuiZO1BIoO1E76QL8ph/E0YyPq69 662Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705490378; x=1706095178; 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=WIX/LkpDFFowCIfodxx8djPuBTr2v0Py+uwGzXJbXNI=; b=jzClQqlf4bI4MDV2/A4zqEpVWWPyoHA8PMzCzxlgVL3xkJfHWJOL4UrR8lXCkbaweB GwtiGIDSfGdj9Fm9TTQUyIUFSCC2aJuOk9H4dPzh1iua/t0yrSakNWfZGqSlq68AdB6l uJfjsNC8tVRgdaK4a8hKTRGYhFguJg23/5AcGumVx9Ihoj51UHeHIaj578bXEd7tcR9X nDNr8U7JnhvBxtg4j6fXHfaWcqLDAUuHqlFuXCAJoI5jIGEyH1isRNIKhywP5H/oyCTE yKdG6aCQbd0WOWMGNoeN3XOOms4cBZrUo00+E73yhC1cadZ08D55NARsbktT3U5GhGrK EojQ== X-Gm-Message-State: AOJu0YylD5mAebA8s53bQeSyyP7D7SaGkar0mThjLoAdGsw9haxyD7CA gaMCcwdZOOdab1swCm8/wOg= X-Google-Smtp-Source: AGHT+IHaQ2AemVu2cPPtFUwh6FxJvFRY45vZ/TSg6gX+8nHUB9+GbUNaEpW+mFLrtnsEt4aJuBm8ow== X-Received: by 2002:a92:b744:0:b0:35f:fd74:479c with SMTP id c4-20020a92b744000000b0035ffd74479cmr9362564ilm.29.1705490378577; Wed, 17 Jan 2024 03:19:38 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6e02:348c:b0:360:69b:4399 with SMTP id bp12-20020a056e02348c00b00360069b4399ls790622ilb.1.-pod-prod-04-us; Wed, 17 Jan 2024 03:19:38 -0800 (PST) X-Received: by 2002:a05:6602:d:b0:7be:e639:29b7 with SMTP id b13-20020a056602000d00b007bee63929b7mr10656856ioa.32.1705490377907; Wed, 17 Jan 2024 03:19:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1705490377; cv=none; d=google.com; s=arc-20160816; b=dpWlNATEvNplAmPj5jns2Qp+Z0zPfxVonGEsuwdzDEJAOCpLF48VwQnLJsOinkNYPX DMgd6Ej81nqFEMQyXRn3e0b8WsxXCz3AQfivRmqgM4ff2eQaQGW4WuFfsyBj0YMWeIAo kYr1BrSTnXwmlK2/Dsv6vEqJuCejnYhv2KsuNKqPWTrZDsJkd/uM07S4xxtCIVMftb5G 3jRBhLtv+zfedENCBI5ywnqnOwfo9oVXQHj9nzUe5uYWR6fODAvRZ1bJkAKtIkIS0fAT 4Gz/128lb3a3b68lvGwaRl5yVLWXZcO32VJgSz9f9hfayQf0V9mHusYs+XKnOTVrzEX8 1atg== 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=iBcqknNNMptfmzV19keHMACrRKVjAsCk/JVo/isdE7Y=; fh=xxo2rOAPT4f31TY31yIWVuVlno6QMa2Pdllc3KKolm0=; b=eQ0T2J0t2Gjn3dpmLgS1wM6Puxm5LUIuQ7Dk1yWjUpy2jnJX6u461mmeB7U+J90G/0 o12Qc9xRGciK2m/gqLNH5zQoSKbKkQuEftWHPPlRBWFJ6JEi3e2vPx79lK92vceeoNA3 2WADCmQjRLXrmupsiUoXp9dZstxrwYHDE+t8p9jGSSh8VZVTqwbKP5M1S0DwBo0iUgdS 69UCNi0qYZ/6H4uS9BuRyu61x9y0x7tZ7KNH31GFQW/2rhdTqUKfcM24Ed/vK015d3j1 HxlKoSg7M5bNDMDzmySL61A3hFImF1VJXU1GUdWGQjGPpmMvgjed1OBMpqzrCV3FMyLK VyAA== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=HVzcdmyl; spf=pass (google.com: domain of fm-294854-20240117111935ef35dbb6b3d6c7375e-g9mi2d@rts-flowmailer.siemens.com designates 185.136.65.228 as permitted sender) smtp.mailfrom=fm-294854-20240117111935ef35dbb6b3d6c7375e-g9mi2d@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from mta-65-228.siemens.flowmailer.net (mta-65-228.siemens.flowmailer.net. [185.136.65.228]) by gmr-mx.google.com with ESMTPS id y15-20020a02bb0f000000b0046d52ddd758si105531jan.1.2024.01.17.03.19.37 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 17 Jan 2024 03:19:37 -0800 (PST) Received-SPF: pass (google.com: domain of fm-294854-20240117111935ef35dbb6b3d6c7375e-g9mi2d@rts-flowmailer.siemens.com designates 185.136.65.228 as permitted sender) client-ip=185.136.65.228; Received: by mta-65-228.siemens.flowmailer.net with ESMTPSA id 20240117111935ef35dbb6b3d6c7375e for ; Wed, 17 Jan 2024 12:19:36 +0100 X-Patchwork-Original-From: "'Jan Kiszka' via isar-users" From: Jan Kiszka To: isar-users Cc: Felix Moessbauer Subject: [PATCH v3 8/8] linux-starfive: Update to 6.6 upstream queue Date: Wed, 17 Jan 2024 12:19:33 +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=HVzcdmyl; spf=pass (google.com: domain of fm-294854-20240117111935ef35dbb6b3d6c7375e-g9mi2d@rts-flowmailer.siemens.com designates 185.136.65.228 as permitted sender) smtp.mailfrom=fm-294854-20240117111935ef35dbb6b3d6c7375e-g9mi2d@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 compatible with Debian sid, maintains all enabled board features, and fixes the out-of-tree module build. We currently need one extra patch (that is also pending upstream) to fix breakages in the EFI stub with latest binutils coming via sid. Signed-off-by: Jan Kiszka --- .../conf/machine/starfive-visionfive2.conf | 2 +- ...sure-GP-relative-addressing-is-not-u.patch | 32 +++++++++++++++++++ .../linux/files/starfive2_extra.cfg | 6 ++-- .../linux/linux-starfive_5.15-visionfive2.bb | 19 ----------- .../linux/linux-starfive_6.6-visionfive2.bb | 21 ++++++++++++ 5 files changed, 58 insertions(+), 22 deletions(-) create mode 100644 meta-isar/recipes-kernel/linux/files/0001-riscv-efistub-Ensure-GP-relative-addressing-is-not-u.patch delete mode 100644 meta-isar/recipes-kernel/linux/linux-starfive_5.15-visionfive2.bb create mode 100644 meta-isar/recipes-kernel/linux/linux-starfive_6.6-visionfive2.bb diff --git a/meta-isar/conf/machine/starfive-visionfive2.conf b/meta-isar/conf/machine/starfive-visionfive2.conf index c7f72bb3..ed2828f1 100644 --- a/meta-isar/conf/machine/starfive-visionfive2.conf +++ b/meta-isar/conf/machine/starfive-visionfive2.conf @@ -15,5 +15,5 @@ IMAGER_INSTALL:wic += " \ IMAGER_BUILD_DEPS += "u-boot-starfive-visionfive2" # DTB file for booting -DTB_VISIONFIVE2 = "jh7110-visionfive-v2.dtb" +DTB_VISIONFIVE2 = "jh7110-starfive-visionfive-2-v1.3b.dtb" DTB_FILES = "starfive/${DTB_VISIONFIVE2}" diff --git a/meta-isar/recipes-kernel/linux/files/0001-riscv-efistub-Ensure-GP-relative-addressing-is-not-u.patch b/meta-isar/recipes-kernel/linux/files/0001-riscv-efistub-Ensure-GP-relative-addressing-is-not-u.patch new file mode 100644 index 00000000..7db1c70f --- /dev/null +++ b/meta-isar/recipes-kernel/linux/files/0001-riscv-efistub-Ensure-GP-relative-addressing-is-not-u.patch @@ -0,0 +1,32 @@ +From 80a71d31e35ac5f90e85b0b52cd080a974b91e8d Mon Sep 17 00:00:00 2001 +From: Jan Kiszka +Date: Fri, 12 Jan 2024 17:17:27 +0100 +Subject: [PATCH] riscv/efistub: Ensure GP-relative addressing is not used + +The cflags for the RISC-V efistub were missing -mno-relax, thus were +under the risk that the compiler could use GP-relative addressing. That +happened for _edata with binutils-2.41 and kernel 6.1, causing the +relocation to fail due to an invalid kernel_size in handle_kernel_image. +It was not yet observed with newer versions, but that may just be luck. + +Signed-off-by: Jan Kiszka +--- + drivers/firmware/efi/libstub/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/firmware/efi/libstub/Makefile b/drivers/firmware/efi/libstub/Makefile +index a1157c2a7170..f54715672d52 100644 +--- a/drivers/firmware/efi/libstub/Makefile ++++ b/drivers/firmware/efi/libstub/Makefile +@@ -28,7 +28,7 @@ cflags-$(CONFIG_ARM) += -DEFI_HAVE_STRLEN -DEFI_HAVE_STRNLEN \ + -DEFI_HAVE_MEMCHR -DEFI_HAVE_STRRCHR \ + -DEFI_HAVE_STRCMP -fno-builtin -fpic \ + $(call cc-option,-mno-single-pic-base) +-cflags-$(CONFIG_RISCV) += -fpic ++cflags-$(CONFIG_RISCV) += -fpic -mno-relax + cflags-$(CONFIG_LOONGARCH) += -fpie + + cflags-$(CONFIG_EFI_PARAMS_FROM_FDT) += -I$(srctree)/scripts/dtc/libfdt +-- +2.35.3 + diff --git a/meta-isar/recipes-kernel/linux/files/starfive2_extra.cfg b/meta-isar/recipes-kernel/linux/files/starfive2_extra.cfg index d11c28de..9649ec87 100644 --- a/meta-isar/recipes-kernel/linux/files/starfive2_extra.cfg +++ b/meta-isar/recipes-kernel/linux/files/starfive2_extra.cfg @@ -1,3 +1,5 @@ # additional configuration to support stock debian userlands -CONFIG_BINFMT_MISC=y -CONFIG_SQUASHFS=m +CONFIG_NLS_ISO8859_1=m + +# only complicates the build +# CONFIG_MODULE_COMPRESS_ZSTD is not set 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/recipes-kernel/linux/linux-starfive_6.6-visionfive2.bb b/meta-isar/recipes-kernel/linux/linux-starfive_6.6-visionfive2.bb new file mode 100644 index 00000000..f4dd5c9a --- /dev/null +++ b/meta-isar/recipes-kernel/linux/linux-starfive_6.6-visionfive2.bb @@ -0,0 +1,21 @@ +# +# Copyright (c) Siemens AG, 2023-2024 +# +# SPDX-License-Identifier: MIT + +require recipes-kernel/linux/linux-custom.inc + +SRC_URI += " \ + https://github.com/starfive-tech/linux/archive/${SRCREV}.tar.gz;downloadfilename=linux-starfive-${SRCREV}.tar.gz \ + file://0001-riscv-efistub-Ensure-GP-relative-addressing-is-not-u.patch \ + file://starfive2_extra.cfg" +SRCREV = "9fe004eaf1aa5b23bd5d03b4cfe9c3858bd884c4" +SRC_URI[sha256sum] = "9eaf7659aa57e2c5b399b7b33076f1376ec43ef343680e0a57e0a2a9bef6c0ae" + +S = "${WORKDIR}/linux-${SRCREV}" + +KERNEL_DEFCONFIG = "starfive_visionfive2_defconfig" + +LINUX_VERSION_EXTENSION = "-isar" + +COMPATIBLE_MACHINE = "starfive-visionfive2"