From patchwork Sat Sep 10 23:05:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrei Gherzan X-Patchwork-Id: 12561 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id DB4FDC6FA8D for ; Sat, 10 Sep 2022 23:05:58 +0000 (UTC) Received: from wout5-smtp.messagingengine.com (wout5-smtp.messagingengine.com [64.147.123.21]) by mx.groups.io with SMTP id smtpd.web12.4916.1662851149714878817 for ; Sat, 10 Sep 2022 16:05:49 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@gherzan.com header.s=fm3 header.b=ZdGN8qQp; spf=pass (domain: gherzan.com, ip: 64.147.123.21, mailfrom: andrei@gherzan.com) Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.west.internal (Postfix) with ESMTP id 233113200786; Sat, 10 Sep 2022 19:05:47 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Sat, 10 Sep 2022 19:05:47 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gherzan.com; h= cc:cc:content-transfer-encoding:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:sender :subject:subject:to:to; s=fm3; t=1662851146; x=1662937546; bh=0j BdMYJKJ/7J8nu/EuhroqMeJj+WOVL2JgnjRb1cYNQ=; b=ZdGN8qQpaB4xmpx7KY /Qp9p9VJJjpkJW7TZ2YSDX5GCLZg72+th7ievH/Hz9+iOqYDETknST+MrrIPL8DH lpoYktpHX9DrM5soE1zprRcJQuX5cmq14bGuNs3sONK7SF0C7sxyx/jbPDtIrAz7 fID0cGFJTvFw5PMglDuLXMkdSKn6mznRBTm6FSyUDzW0tCJdfgmYRQMUfhUBbW+n AveaGe6kmVxI1QGxifpf1kP8gsi7mqFDUXHMGB0Plmk0smhpaxOuAOcwa3uimmW/ ltUIZK8YVtekloXXPCNWu111gO27KH7jENjuytvMTr4UTVEd3rxnWNzlfRj5Q/T9 Il4Q== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:sender:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm2; t=1662851146; x=1662937546; bh=0jBdMYJKJ/7J8 nu/EuhroqMeJj+WOVL2JgnjRb1cYNQ=; b=jXNlw/iJ19PxXzSIwlk1Lc41FQofF h4t5nyCnZfVsawTX8XwmImEHQqffkj6FV9vtuL/cIY5YblFuYfDtPdo9p4+GMS7a su0t7rM+iLlYZCU0mGBScmVC5nY9ZKIJAuiPDHcOpNzINMHmZXSKPR92sHrvqPrK K68IT+U3ql3MS/QbW+fOslD8SK59j7fyu3eFD825YbdB6i35UYm6fsIYmlDx6SFq DMKIbSRd81zZWnkQyy3+MhwTbGHutJDATnoqLKf+81j34D9ov8U/zyE90BLfp/if 9MXEeCqqmvM4p2N0JdRy5lICKRLNAMTLSAhHhmGJgED0BiE0e1VkHGOmg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvfedrfedtkedgudelucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtke ertdertddtnecuhfhrohhmpeetnhgurhgvihcuifhhvghriigrnhcuoegrnhgurhgvihes ghhhvghriigrnhdrtghomheqnecuggftrfgrthhtvghrnhepjefhvefhgefgffejgeelke ejleeiffejgffgkeeggfffgfffieeffeeghefhtdffnecuvehluhhsthgvrhfuihiivgep tdenucfrrghrrghmpehmrghilhhfrhhomheprghnughrvghisehghhgvrhiirghnrdgtoh hm X-ME-Proxy: Feedback-ID: i68994715:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sat, 10 Sep 2022 19:05:45 -0400 (EDT) From: Andrei Gherzan To: yocto@lists.yoctoproject.org Cc: andrei@gherzan.com, Andrei Gherzan Subject: [meta-raspberrypi][PATCH 1/5] sdcard_image-rpi.bbclass: Move SDIMG_KERNELIMAGE definitions to their machines Date: Sun, 11 Sep 2022 01:05:27 +0200 Message-Id: <20220910230531.4084156-2-andrei@gherzan.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220910230531.4084156-1-andrei@gherzan.com> References: <20220910230531.4084156-1-andrei@gherzan.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sat, 10 Sep 2022 23:05:58 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto/message/58014 From: Andrei Gherzan This unifies the configuration of SDIMG_KERNELIMAGE across machines. Signed-off-by: Andrei Gherzan --- classes/sdcard_image-rpi.bbclass | 5 ----- conf/machine/raspberrypi.conf | 4 ++-- conf/machine/raspberrypi2.conf | 2 +- conf/machine/raspberrypi3-64.conf | 7 +++---- 4 files changed, 6 insertions(+), 12 deletions(-) diff --git a/classes/sdcard_image-rpi.bbclass b/classes/sdcard_image-rpi.bbclass index a7b9ac8..178e4ef 100644 --- a/classes/sdcard_image-rpi.bbclass +++ b/classes/sdcard_image-rpi.bbclass @@ -25,11 +25,6 @@ inherit image_types # This image depends on the rootfs image IMAGE_TYPEDEP:rpi-sdimg = "${SDIMG_ROOTFS_TYPE}" -# Kernel image name -SDIMG_KERNELIMAGE:raspberrypi ?= "kernel.img" -SDIMG_KERNELIMAGE:raspberrypi2 ?= "kernel7.img" -SDIMG_KERNELIMAGE:raspberrypi3-64 ?= "kernel8.img" - # Boot partition volume id # Shorten raspberrypi to just rpi to keep it under 11 characters # now enforced by mkfs.vfat from dosfstools-4.2 diff --git a/conf/machine/raspberrypi.conf b/conf/machine/raspberrypi.conf index b23687b..05263d7 100644 --- a/conf/machine/raspberrypi.conf +++ b/conf/machine/raspberrypi.conf @@ -7,8 +7,8 @@ DEFAULTTUNE ?= "arm1176jzfshf" require conf/machine/include/tune-arm1176jzf-s.inc include conf/machine/include/rpi-base.inc -SERIAL_CONSOLES ?= "115200;ttyAMA0" - +SDIMG_KERNELIMAGE ?= "kernel.img" UBOOT_MACHINE = "rpi_config" +SERIAL_CONSOLES ?= "115200;ttyAMA0" ARMSTUB ?= "armstub.bin" diff --git a/conf/machine/raspberrypi2.conf b/conf/machine/raspberrypi2.conf index 403d15e..8cb859e 100644 --- a/conf/machine/raspberrypi2.conf +++ b/conf/machine/raspberrypi2.conf @@ -7,8 +7,8 @@ DEFAULTTUNE ?= "cortexa7thf-neon-vfpv4" require conf/machine/include/arm/armv7a/tune-cortexa7.inc include conf/machine/include/rpi-base.inc +SDIMG_KERNELIMAGE ?= "kernel7.img" SERIAL_CONSOLES ?= "115200;ttyAMA0" - UBOOT_MACHINE = "rpi_2_config" ARMSTUB ?= "armstub7.bin" diff --git a/conf/machine/raspberrypi3-64.conf b/conf/machine/raspberrypi3-64.conf index 95475f3..573b079 100644 --- a/conf/machine/raspberrypi3-64.conf +++ b/conf/machine/raspberrypi3-64.conf @@ -21,16 +21,15 @@ RPI_KERNEL_DEVICETREE = " \ broadcom/bcm2710-rpi-cm3.dtb \ " -SERIAL_CONSOLES ?= "115200;ttyS0" - -UBOOT_MACHINE = "rpi_arm64_config" - +SDIMG_KERNELIMAGE ?= "kernel8.img" # When u-boot is enabled we need to use the "Image" format and the "booti" # command to load the kernel KERNEL_IMAGETYPE_UBOOT ?= "Image" # "zImage" not supported on arm64 and ".gz" images not supported by bootloader yet KERNEL_IMAGETYPE_DIRECT ?= "Image" KERNEL_BOOTCMD ?= "booti" +UBOOT_MACHINE = "rpi_arm64_config" +SERIAL_CONSOLES ?= "115200;ttyS0" VC4DTBO ?= "vc4-fkms-v3d" ARMSTUB ?= "armstub8.bin" From patchwork Sat Sep 10 23:05:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrei Gherzan X-Patchwork-Id: 12562 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id BA7C7ECAAD3 for ; Sat, 10 Sep 2022 23:05:58 +0000 (UTC) Received: from wout5-smtp.messagingengine.com (wout5-smtp.messagingengine.com [64.147.123.21]) by mx.groups.io with SMTP id smtpd.web12.4915.1662851149674805820 for ; Sat, 10 Sep 2022 16:05:49 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@gherzan.com header.s=fm3 header.b=l0uCxebj; spf=pass (domain: gherzan.com, ip: 64.147.123.21, mailfrom: andrei@gherzan.com) Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.west.internal (Postfix) with ESMTP id E5B9932004CE; Sat, 10 Sep 2022 19:05:48 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Sat, 10 Sep 2022 19:05:49 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gherzan.com; h= cc:cc:content-transfer-encoding:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:sender :subject:subject:to:to; s=fm3; t=1662851148; x=1662937548; bh=iG c0ScSASIrQRP0BKgHL5W+upzjyzqKYEpRDDi65RQA=; b=l0uCxebjm/iRIMueww 7YKK62YqjL5k4FCAC3ynrjIj/MgE/eSQmhm/P2o4VgysCY6q6mxgW0J/PL7QpifH PMdexZqnYqa4/5nu3S8x5c8s17Gt4qKTYaFc5dYVHrb8BzcO6e/IUM/7PJbAkjkQ ay5y9dOl0C44OK13HdjekI2P2RDjFAyvtWFcjJiA0jzxddpCo2Ux2gmG6/bVtHze 3PEB1zm276Mvmb8g3LFtdNizZABwFP4OP/70rmXKOJiOpadOsR6GBnJ9yUoX/pqJ wQbx5RhzSwFkiBbk4HSPYkcSOOBsqqiL1OXgmFPEzGRbpE1o3WxFG0CUzE4Y0rPC 5VBw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:sender:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm2; t=1662851148; x=1662937548; bh=iGc0ScSASIrQR P0BKgHL5W+upzjyzqKYEpRDDi65RQA=; b=GEMknL1xuWUjoRgi9SloO9AiOGpT/ 74k+6sB96K8kh271xH3tu8m7dqYXXgKKtoFOSA6pKDkUMXw4ITA9Y6NXLPf59yXc e5PGbO9LGtOnb176loGM+u8ry4uIJcHDjxjKypjuXHuvMdlP3vaWvlBinQb5Bmon nBZ8l9JZ/vyagiKMGswOjaBmaEJyQn168k1TN7x+fwlVRMiIfXUaRHPUGk2re/pw QRWHHZ5Mfv6Fn3yuBL0KHYLC0hA6sTqS2Ogxqjplrq2/V377jEuiaS9KdMBCdE3Z S/tZBukehvKVFnw14EUEgBEdctYcV9pHk5nqZa4OhbVOduO0P1nlTpBrg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvfedrfedtkedgudelucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtke ertdertddtnecuhfhrohhmpeetnhgurhgvihcuifhhvghriigrnhcuoegrnhgurhgvihes ghhhvghriigrnhdrtghomheqnecuggftrfgrthhtvghrnhepjefhvefhgefgffejgeelke ejleeiffejgffgkeeggfffgfffieeffeeghefhtdffnecuvehluhhsthgvrhfuihiivgep tdenucfrrghrrghmpehmrghilhhfrhhomheprghnughrvghisehghhgvrhiirghnrdgtoh hm X-ME-Proxy: Feedback-ID: i68994715:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sat, 10 Sep 2022 19:05:47 -0400 (EDT) From: Andrei Gherzan To: yocto@lists.yoctoproject.org Cc: andrei@gherzan.com, Andrei Gherzan Subject: [meta-raspberrypi][PATCH 2/5] raspberrypi0-2w.conf: Include the RPi 0-2w dtb for all 32-bit machines Date: Sun, 11 Sep 2022 01:05:28 +0200 Message-Id: <20220910230531.4084156-3-andrei@gherzan.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220910230531.4084156-1-andrei@gherzan.com> References: <20220910230531.4084156-1-andrei@gherzan.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sat, 10 Sep 2022 23:05:58 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto/message/58013 From: Andrei Gherzan All 32-bit machines are sharing the list of machine dtbs with the exception of raspberrypi0-2w. Move this away too to unify the machine configurations. Signed-off-by: Andrei Gherzan --- conf/machine/include/rpi-base.inc | 1 + conf/machine/raspberrypi0-2w.conf | 4 ---- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/conf/machine/include/rpi-base.inc b/conf/machine/include/rpi-base.inc index a2edf06..beb1f08 100644 --- a/conf/machine/include/rpi-base.inc +++ b/conf/machine/include/rpi-base.inc @@ -68,6 +68,7 @@ RPI_KERNEL_DEVICETREE ?= " \ bcm2710-rpi-2-b.dtb \ bcm2710-rpi-3-b.dtb \ bcm2710-rpi-3-b-plus.dtb \ + bcm2710-rpi-zero-2.dtb \ bcm2711-rpi-4-b.dtb \ bcm2711-rpi-400.dtb \ bcm2708-rpi-cm.dtb \ diff --git a/conf/machine/raspberrypi0-2w.conf b/conf/machine/raspberrypi0-2w.conf index c360d90..63c7bfb 100644 --- a/conf/machine/raspberrypi0-2w.conf +++ b/conf/machine/raspberrypi0-2w.conf @@ -11,7 +11,3 @@ MACHINE_EXTRA_RRECOMMENDS += "\ linux-firmware-rpidistro-bcm43436s \ bluez-firmware-rpidistro-bcm43430b0-hcd \ " - -RPI_KERNEL_DEVICETREE = " \ - bcm2710-rpi-zero-2.dtb \ - " From patchwork Sat Sep 10 23:05:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrei Gherzan X-Patchwork-Id: 12558 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id C49A0C6FA8B for ; Sat, 10 Sep 2022 23:05:58 +0000 (UTC) Received: from wout5-smtp.messagingengine.com (wout5-smtp.messagingengine.com [64.147.123.21]) by mx.groups.io with SMTP id smtpd.web08.4894.1662851151474106742 for ; Sat, 10 Sep 2022 16:05:51 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@gherzan.com header.s=fm3 header.b=HQFi/tBW; spf=pass (domain: gherzan.com, ip: 64.147.123.21, mailfrom: andrei@gherzan.com) Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailout.west.internal (Postfix) with ESMTP id B425D32006F5; Sat, 10 Sep 2022 19:05:50 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute2.internal (MEProxy); Sat, 10 Sep 2022 19:05:51 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gherzan.com; h= cc:cc:content-transfer-encoding:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:sender :subject:subject:to:to; s=fm3; t=1662851150; x=1662937550; bh=Ds vubmPAoLSOvAdeUJD9Khl8/Uzz26NPjqWHC8OZGXI=; b=HQFi/tBWVHcniwnVee 78JqzueOqhn4/cx02Ov/635vllBZkb5CjNHH+VYa+bsd+cJdzEFt6+ZlpI/NiRFd 3gD7/dTSzySs8lpVyh1trQlbuqYb1rw04EmFqqoMeiy9uBAJBrO+WxuxaY8Fp+31 4CaIeHFr80H6q4+Ppc52cllKVitPv0ZS9Q4eDpSiuJq3DovH1tfD0G3BBbKXcTEu woLPBzFeKGKfI66cLmUqjDehCgSJQ6w8F3ZOS35pOiY3YwrQkOrDS/dAzj1BwPMa 7ONPlfgG5RdEHAq1WZTq07vrJlDhJeKRb8cYcilW/Z6SwD6HTTI0rbFWGSgYdcWy r9IA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:sender:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm2; t=1662851150; x=1662937550; bh=DsvubmPAoLSOv AdeUJD9Khl8/Uzz26NPjqWHC8OZGXI=; b=xGhN1w6r3Z1R2FYZUiYNKvVMwMEBj 88AqZVrNeBaV/bPO8yNN3rLoAk4PcxhpqmS6MBU9eRnCwd7U3M8rne1ecmeBgZCG yewOY3myRWiTPGBPmcqFHxKrvLhz6qtZNBUe8uMbZScKIjTvaTa5WVqpqSdhYX3J 3nF1T42OCDqD7xXayLODyJNbzAHqwSyD3Afb/39p7vYj0JtUWGVIVAC+PQQQYt+/ bZClkuRWgQgjzhbjUEHYViGKqzcAcYWhHlRkhFNsZ/hM7Y+3wQzjoCuv7RJC/K6v TqvffsYO4f12jz9Zx5xEZY6Io9NxZj09AZVj9ggOA9IwujbstxHhKTQ3g== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvfedrfedtkedgudelucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtke ertdertddtnecuhfhrohhmpeetnhgurhgvihcuifhhvghriigrnhcuoegrnhgurhgvihes ghhhvghriigrnhdrtghomheqnecuggftrfgrthhtvghrnhepjefhvefhgefgffejgeelke ejleeiffejgffgkeeggfffgfffieeffeeghefhtdffnecuvehluhhsthgvrhfuihiivgep tdenucfrrghrrghmpehmrghilhhfrhhomheprghnughrvghisehghhgvrhiirghnrdgtoh hm X-ME-Proxy: Feedback-ID: i68994715:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sat, 10 Sep 2022 19:05:49 -0400 (EDT) From: Andrei Gherzan To: yocto@lists.yoctoproject.org Cc: andrei@gherzan.com, Andrei Gherzan Subject: [meta-raspberrypi][PATCH 3/5] rpi-base.inc: Split IMAGE_BOOT_FILES for kernel image Date: Sun, 11 Sep 2022 01:05:29 +0200 Message-Id: <20220910230531.4084156-4-andrei@gherzan.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220910230531.4084156-1-andrei@gherzan.com> References: <20220910230531.4084156-1-andrei@gherzan.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sat, 10 Sep 2022 23:05:58 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto/message/58015 From: Andrei Gherzan The kernel image deployment is now defined in IMAGE_BOOT_FILES as a separate variable: RPI_EXTRA_IMAGE_BOOT_FILES. This allows a custom kernel image deployment by redefining this variable when needed. Signed-off-by: Andrei Gherzan --- conf/machine/include/rpi-base.inc | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/conf/machine/include/rpi-base.inc b/conf/machine/include/rpi-base.inc index beb1f08..313c7d9 100644 --- a/conf/machine/include/rpi-base.inc +++ b/conf/machine/include/rpi-base.inc @@ -134,12 +134,15 @@ def make_dtb_boot_files(d): return ' '.join([transform(dtb) for dtb in alldtbs.split(' ') if dtb]) +RPI_EXTRA_IMAGE_BOOT_FILES ?= " \ + ${@bb.utils.contains('RPI_USE_U_BOOT', '1', \ + '${KERNEL_IMAGETYPE} u-boot.bin;${SDIMG_KERNELIMAGE} boot.scr', \ + '${KERNEL_IMAGETYPE};${SDIMG_KERNELIMAGE}', d)} \ + " IMAGE_BOOT_FILES ?= "${BOOTFILES_DIR_NAME}/* \ ${@make_dtb_boot_files(d)} \ - ${@bb.utils.contains('RPI_USE_U_BOOT', '1', \ - '${KERNEL_IMAGETYPE} u-boot.bin;${SDIMG_KERNELIMAGE} boot.scr', \ - '${KERNEL_IMAGETYPE};${SDIMG_KERNELIMAGE}', d)} \ + ${RPI_EXTRA_IMAGE_BOOT_FILES} \ " do_image_wic[depends] += " \ rpi-bootfiles:do_deploy \ From patchwork Sat Sep 10 23:05:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrei Gherzan X-Patchwork-Id: 12559 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id B629AC6FA82 for ; Sat, 10 Sep 2022 23:05:58 +0000 (UTC) Received: from wout5-smtp.messagingengine.com (wout5-smtp.messagingengine.com [64.147.123.21]) by mx.groups.io with SMTP id smtpd.web11.4836.1662851153531125440 for ; Sat, 10 Sep 2022 16:05:53 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@gherzan.com header.s=fm3 header.b=V7nZoM+V; spf=pass (domain: gherzan.com, ip: 64.147.123.21, mailfrom: andrei@gherzan.com) Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailout.west.internal (Postfix) with ESMTP id 7AD8F320046E; Sat, 10 Sep 2022 19:05:52 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute2.internal (MEProxy); Sat, 10 Sep 2022 19:05:53 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gherzan.com; h= cc:cc:content-transfer-encoding:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:sender :subject:subject:to:to; s=fm3; t=1662851151; x=1662937551; bh=/+ qNz9eI1tpIewHhIhsTnq+vj9jM9GtfV1eEP91O6hk=; b=V7nZoM+VPQDqqAMI9u wbOkDNBo4dUekiP8pawoG2o53UiJtK4/ict8jMG4wyABCG+m33kMta1qk04djHbD f3ZTEB9nzgu7p64eWSdQYGKyJPt6N7TJu7ZLA9Hqkod3W9gYnBjruD7nIaIczDDS bHtvDCfmMMJeb0sArPteLhZtcqDReguk5+UuoUBtHl2oX/CeBzz8BN2yJHcaBnwB AW3rKCZEN5fTrUvFbkz44CpVZ6f+7FvqKnSGjS+yxEvh1ToRmo9uNFgxZHdl1xN3 ZzYYWl9rx4QlrrnjDnbh5IdLehFxyG0q9wVoyX94oboqZyR5ULhoNDtTHhMaDAa6 BAnQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:sender:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm2; t=1662851151; x=1662937551; bh=/+qNz9eI1tpIe wHhIhsTnq+vj9jM9GtfV1eEP91O6hk=; b=ZiAtYtvEHsGsYAYifEJXsB/ivmewN cyi/2ocknnuo5Ni+z9UqxM0gAZWLT7FOLfxuh8sHEFi+qbvYAFuCXwnOzoi0dki+ SJyDv9dptmQwQRLd0ideZgq5lkLvYKLPig73gHAZVKdBtkx8cI0fW+pr24eXOI7m MuVOUZPikrCxechCMIoWfrXJ3sBWaZe0DCtpSWrz2TghB45Sl81jCcUSQ1BYUp3e atTUiYVhDqoo2gNl+uCL7F6WXWwOwTZnFp1m+IP+ammSSrKvnOg6GYtzm6xPG4yz /NzyXWuuiZMdzmMo55RtwSOyAYJNkAnIfcPXJyAhIvzH00qzWq+NRrTog== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvfedrfedtkedgudelucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtke ertdertddtnecuhfhrohhmpeetnhgurhgvihcuifhhvghriigrnhcuoegrnhgurhgvihes ghhhvghriigrnhdrtghomheqnecuggftrfgrthhtvghrnhepjefhvefhgefgffejgeelke ejleeiffejgffgkeeggfffgfffieeffeeghefhtdffnecuvehluhhsthgvrhfuihiivgep tdenucfrrghrrghmpehmrghilhhfrhhomheprghnughrvghisehghhgvrhiirghnrdgtoh hm X-ME-Proxy: Feedback-ID: i68994715:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sat, 10 Sep 2022 19:05:51 -0400 (EDT) From: Andrei Gherzan To: yocto@lists.yoctoproject.org Cc: andrei@gherzan.com, Andrei Gherzan Subject: [meta-raspberrypi][PATCH 4/5] Add support for a multi kernel Raspberry Pi machine Date: Sun, 11 Sep 2022 01:05:30 +0200 Message-Id: <20220910230531.4084156-5-andrei@gherzan.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220910230531.4084156-1-andrei@gherzan.com> References: <20220910230531.4084156-1-andrei@gherzan.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sat, 10 Sep 2022 23:05:58 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto/message/58016 From: Andrei Gherzan The new raspberrypi-armv7.conf aims at supporting all the armv7 Raspberry Pi boards. This initial support was tested on: * Raspberry Pi 4 Model B * Raspberry Pi 3 Model B * Raspberry Pi 0 2 WiFi Signed-off-by: Andrei Gherzan --- conf/machine/include/rpi-default-versions.inc | 1 + conf/machine/raspberrypi-armv7.conf | 39 +++++++++++++++++++ docs/layer-contents.md | 16 ++++++++ recipes-kernel/linux/linux-raspberrypi-v7.inc | 13 +++++++ .../linux/linux-raspberrypi-v7_5.10.bb | 6 +++ .../linux/linux-raspberrypi-v7_5.15.bb | 6 +++ recipes-kernel/linux/linux-raspberrypi.inc | 1 + .../linux/linux-raspberrypi_5.15.bb | 12 ++++++ 8 files changed, 94 insertions(+) create mode 100644 conf/machine/raspberrypi-armv7.conf create mode 100644 recipes-kernel/linux/linux-raspberrypi-v7.inc create mode 100644 recipes-kernel/linux/linux-raspberrypi-v7_5.10.bb create mode 100644 recipes-kernel/linux/linux-raspberrypi-v7_5.15.bb diff --git a/conf/machine/include/rpi-default-versions.inc b/conf/machine/include/rpi-default-versions.inc index 8ff2839..a29fd5e 100644 --- a/conf/machine/include/rpi-default-versions.inc +++ b/conf/machine/include/rpi-default-versions.inc @@ -1,3 +1,4 @@ # RaspberryPi BSP default versions PREFERRED_VERSION_linux-raspberrypi ??= "5.15.%" +PREFERRED_VERSION_linux-raspberrypi-v7 ??= "${PREFERRED_VERSION_linux-raspberrypi}" diff --git a/conf/machine/raspberrypi-armv7.conf b/conf/machine/raspberrypi-armv7.conf new file mode 100644 index 0000000..cb2e5a2 --- /dev/null +++ b/conf/machine/raspberrypi-armv7.conf @@ -0,0 +1,39 @@ +# SPDX-FileCopyrightText: Andrei Gherzan +# +# SPDX-License-Identifier: MIT + +#@TYPE: Machine +#@NAME: RaspberryPi Development Boards (32bit) +#@DESCRIPTION: Machine configuration for the RaspberryPi boards in 32 bit mode + +DEFAULTTUNE ?= "cortexa7thf-neon-vfpv4" +require conf/machine/include/arm/armv7a/tune-cortexa7.inc +include conf/machine/include/rpi-base.inc + +# This machine includes by default the kernel for v7l. We hook in support for +# v7. +RASPBERRYPI_v7_KERNEL = "linux-raspberrypi-v7" +RASPBERRYPI_v7_KERNEL_PACKAGE_NAME = "kernel-v7" +RASPBERRYPI_v7_KERNEL_FILE ?= "kernel7.img" +# We don't need a lot for v7l because it is the default provider, +# virtual/kernel. +RASPBERRYPI_v7l_KERNEL_FILE ?= "kernel7l.img" + +MACHINE_FEATURES += "pci" +MACHINE_EXTRA_RRECOMMENDS += "\ + linux-firmware-rpidistro-bcm43430 \ + linux-firmware-rpidistro-bcm43436 \ + linux-firmware-rpidistro-bcm43436s \ + linux-firmware-rpidistro-bcm43455 \ + linux-firmware-rpidistro-bcm43456 \ + bluez-firmware-rpidistro-bcm43430a1-hcd \ + bluez-firmware-rpidistro-bcm43430b0-hcd \ + bluez-firmware-rpidistro-bcm4345c0-hcd \ + bluez-firmware-rpidistro-bcm4345c5-hcd \ +" + +# FIXME: This machine doesn't support u-boot (yet) +RPI_EXTRA_IMAGE_BOOT_FILES = " \ + ${KERNEL_IMAGETYPE};${RASPBERRYPI_v7l_KERNEL_FILE} \ + ${RASPBERRYPI_v7_KERNEL_PACKAGE_NAME}/${KERNEL_IMAGETYPE};${RASPBERRYPI_v7_KERNEL_FILE} \ +" diff --git a/docs/layer-contents.md b/docs/layer-contents.md index d12cb88..aa28a23 100644 --- a/docs/layer-contents.md +++ b/docs/layer-contents.md @@ -16,6 +16,22 @@ Note: The raspberrypi3 machines include support for Raspberry Pi 3B+. +## Multi-board Machines + +This layer generally provides support for machines that are targetting a single +Raspberry Pi board (or a very few subsets of them). This is so that the build +infrastructure can tune and tweak the configuration with the flexibility to +optimise for both runtime performance and disk storage. + +For usecases where compatibility of more boards is required, the layer provides +machines that are tagetting a wider support of Raspberry Pi boards. + +### raspberrypi-armv7 + +This machine targets support for all the ARMv7-based Raspberry Pi boards. It +will pull in the firmware and deploy the kernel image and kernel modules for +all the relevant boards. + ## Images * rpi-test-image diff --git a/recipes-kernel/linux/linux-raspberrypi-v7.inc b/recipes-kernel/linux/linux-raspberrypi-v7.inc new file mode 100644 index 0000000..77debc4 --- /dev/null +++ b/recipes-kernel/linux/linux-raspberrypi-v7.inc @@ -0,0 +1,13 @@ +# SPDX-FileCopyrightText: Andrei Gherzan +# +# SPDX-License-Identifier: MIT + +KBUILD_DEFCONFIG:raspberrypi-armv7 = "bcm2709_defconfig" +KERNEL_PACKAGE_NAME = "${RASPBERRYPI_v7_KERNEL_PACKAGE_NAME}" +PROVIDES:remove = "virtual/kernel" + +KERNEL_IMAGETYPE_DIRECT ?= "zImage" + +COMPATIBLE_MACHINE = "^raspberrypi-armv7$" + +KERNEL_DEVICETREE = "" diff --git a/recipes-kernel/linux/linux-raspberrypi-v7_5.10.bb b/recipes-kernel/linux/linux-raspberrypi-v7_5.10.bb new file mode 100644 index 0000000..d594b61 --- /dev/null +++ b/recipes-kernel/linux/linux-raspberrypi-v7_5.10.bb @@ -0,0 +1,6 @@ +# SPDX-FileCopyrightText: Andrei Gherzan +# +# SPDX-License-Identifier: MIT + +require linux-raspberrypi-v7.inc +require linux-raspberrypi_5.10.bb diff --git a/recipes-kernel/linux/linux-raspberrypi-v7_5.15.bb b/recipes-kernel/linux/linux-raspberrypi-v7_5.15.bb new file mode 100644 index 0000000..7883985 --- /dev/null +++ b/recipes-kernel/linux/linux-raspberrypi-v7_5.15.bb @@ -0,0 +1,6 @@ +# SPDX-FileCopyrightText: Andrei Gherzan +# +# SPDX-License-Identifier: MIT + +require linux-raspberrypi-v7.inc +require linux-raspberrypi_5.15.bb diff --git a/recipes-kernel/linux/linux-raspberrypi.inc b/recipes-kernel/linux/linux-raspberrypi.inc index 6362a73..2a651bd 100644 --- a/recipes-kernel/linux/linux-raspberrypi.inc +++ b/recipes-kernel/linux/linux-raspberrypi.inc @@ -26,6 +26,7 @@ KBUILD_DEFCONFIG:raspberrypi3 ?= "bcm2709_defconfig" KBUILD_DEFCONFIG:raspberrypi3-64 ?= "bcmrpi3_defconfig" KBUILD_DEFCONFIG:raspberrypi4 ?= "bcm2711_defconfig" KBUILD_DEFCONFIG:raspberrypi4-64 ?= "bcm2711_defconfig" +KBUILD_DEFCONFIG:raspberrypi-armv7 ?= "bcm2711_defconfig" LINUX_VERSION_EXTENSION ?= "" diff --git a/recipes-kernel/linux/linux-raspberrypi_5.15.bb b/recipes-kernel/linux/linux-raspberrypi_5.15.bb index db93537..468737c 100644 --- a/recipes-kernel/linux/linux-raspberrypi_5.15.bb +++ b/recipes-kernel/linux/linux-raspberrypi_5.15.bb @@ -17,3 +17,15 @@ SRC_URI = " \ require linux-raspberrypi.inc KERNEL_DTC_FLAGS += "-@ -H epapr" + +RDEPENDS:${KERNEL_PACKAGE_NAME}:raspberrypi-armv7:append = " ${RASPBERRYPI_v7_KERNEL_PACKAGE_NAME}" +RDEPENDS:${KERNEL_PACKAGE_NAME}-base:raspberrypi-armv7:append = " ${RASPBERRYPI_v7_KERNEL_PACKAGE_NAME}-base" +RDEPENDS:${KERNEL_PACKAGE_NAME}-image:raspberrypi-armv7:append = " ${RASPBERRYPI_v7_KERNEL_PACKAGE_NAME}-image" +RDEPENDS:${KERNEL_PACKAGE_NAME}-dev:raspberrypi-armv7:append = " ${RASPBERRYPI_v7_KERNEL_PACKAGE_NAME}-dev" +RDEPENDS:${KERNEL_PACKAGE_NAME}-vmlinux:raspberrypi-armv7:append = " ${RASPBERRYPI_v7_KERNEL_PACKAGE_NAME}-vmlinux" +RDEPENDS:${KERNEL_PACKAGE_NAME}-modules:raspberrypi-armv7:append = " ${RASPBERRYPI_v7_KERNEL_PACKAGE_NAME}-modules" +RDEPENDS:${KERNEL_PACKAGE_NAME}-dbg:raspberrypi-armv7:append = " ${RASPBERRYPI_v7_KERNEL_PACKAGE_NAME}-dbg" + +DEPLOYDEP = "" +DEPLOYDEP:raspberrypi-armv7 = "${RASPBERRYPI_v7_KERNEL}:do_deploy" +do_deploy[depends] += "${DEPLOYDEP}" From patchwork Sat Sep 10 23:05:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrei Gherzan X-Patchwork-Id: 12560 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id C3B30C6FA89 for ; Sat, 10 Sep 2022 23:05:58 +0000 (UTC) Received: from wout5-smtp.messagingengine.com (wout5-smtp.messagingengine.com [64.147.123.21]) by mx.groups.io with SMTP id smtpd.web11.4838.1662851155421578794 for ; Sat, 10 Sep 2022 16:05:55 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@gherzan.com header.s=fm3 header.b=rlEKn2o5; spf=pass (domain: gherzan.com, ip: 64.147.123.21, mailfrom: andrei@gherzan.com) Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.west.internal (Postfix) with ESMTP id A6EA9320079B; Sat, 10 Sep 2022 19:05:54 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Sat, 10 Sep 2022 19:05:54 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gherzan.com; h= cc:cc:content-transfer-encoding:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:sender :subject:subject:to:to; s=fm3; t=1662851154; x=1662937554; bh=Tf pr8eDd198Y2A+H1kzKIUcJjDxqiMGsWpxsloZvoB0=; b=rlEKn2o5gpWkspYWGS Crr4MmNAbR4NLLhlnkwhVHbGVd2Ngu2U4SGvgc9IsO/vOfGUKi3iX/wP29x63GWp ox5kLjo+wAw6iInamzl//Gaq7PFypUqxO2ktOSaaNEkQluTbhiWLxkGNAoC96HiM fzw6oU2LGREHm5CYxLkZv1CstT/BD19Biaxz34eLFhOruOyOV9WGfTtOjqkFCkct aa4r1Bt8nw6EFNRL3J6G4UncxHTvlh+a3DQNoYjWPcEDsFnK/Ir0yw9M412Ua0Ua oVNdkUWIkWH5eLhTM4tKilbEmmnwRaUTWd69T2p1NmGJYiGWzbUy2uj+9okqb6xL 2P2g== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:sender:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm2; t=1662851154; x=1662937554; bh=Tfpr8eDd198Y2 A+H1kzKIUcJjDxqiMGsWpxsloZvoB0=; b=fKQQgUhhQ7riIX4YR5CgwNoG9dIIX cxdkQDe7ZlXAyEibUT+Xiu/VFR6mi7N10JQv271RuiFBsEQXbRRENS5KWei8jWCl Zui8dI5tWE9gFc9YhifNZeTUKvS4g/4GJIQJ/h0gxWdx2swEiljk+cVF70lYku3A 1e6hDIHgVjCptWvPShvJ/icn9s/8aqgM92EiGqK2Pxc1tOQsNSsV8UOn00XeBS39 c6qLu5rSjAqmj3j7SdS9wzqv7hwBNlVatcDM4gtn2GiqvGobn1cgB3tpdyDjLWka r8QF3U03SlBiMHO841N4RLJS/aaFvN9hMfPoyTYjKktu29pC2MpSHPXyQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvfedrfedtkedgudelucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtke ertdertddtnecuhfhrohhmpeetnhgurhgvihcuifhhvghriigrnhcuoegrnhgurhgvihes ghhhvghriigrnhdrtghomheqnecuggftrfgrthhtvghrnhepjefhvefhgefgffejgeelke ejleeiffejgffgkeeggfffgfffieeffeeghefhtdffnecuvehluhhsthgvrhfuihiivgep tdenucfrrghrrghmpehmrghilhhfrhhomheprghnughrvghisehghhgvrhiirghnrdgtoh hm X-ME-Proxy: Feedback-ID: i68994715:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sat, 10 Sep 2022 19:05:53 -0400 (EDT) From: Andrei Gherzan To: yocto@lists.yoctoproject.org Cc: andrei@gherzan.com, Andrei Gherzan Subject: [meta-raspberrypi][PATCH 5/5] ci: Add raspberrypi-armv7 to the build matrix Date: Sun, 11 Sep 2022 01:05:31 +0200 Message-Id: <20220910230531.4084156-6-andrei@gherzan.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220910230531.4084156-1-andrei@gherzan.com> References: <20220910230531.4084156-1-andrei@gherzan.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sat, 10 Sep 2022 23:05:58 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto/message/58017 From: Andrei Gherzan Signed-off-by: Andrei Gherzan --- .github/workflows/yocto-builds.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/yocto-builds.yml b/.github/workflows/yocto-builds.yml index 824745c..8644b13 100644 --- a/.github/workflows/yocto-builds.yml +++ b/.github/workflows/yocto-builds.yml @@ -27,6 +27,7 @@ jobs: - raspberrypi4 - raspberrypi-cm3 - raspberrypi-cm + - raspberrypi-armv7 image: [rpi-test-image] distro: [poky] runs-on: [self-hosted, Linux]