From patchwork Mon Sep 9 14:55:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trevor Woerner X-Patchwork-Id: 48851 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 E33B6ECE586 for ; Mon, 9 Sep 2024 14:55:54 +0000 (UTC) Received: from mail-ot1-f44.google.com (mail-ot1-f44.google.com [209.85.210.44]) by mx.groups.io with SMTP id smtpd.web11.55122.1725893744760274597 for ; Mon, 09 Sep 2024 07:55:44 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=kp/zDkxS; spf=pass (domain: gmail.com, ip: 209.85.210.44, mailfrom: twoerner@gmail.com) Received: by mail-ot1-f44.google.com with SMTP id 46e09a7af769-710d5d9aac1so1703285a34.3 for ; Mon, 09 Sep 2024 07:55:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1725893743; x=1726498543; darn=lists.yoctoproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ji5EQlPvSQa4KxrEh/weHYXQpnJGnD65gniEaQM5bYs=; b=kp/zDkxS/0uKhrCDyCB9E7cenzTQahi9nOJ89l5yUf9AGpeUBup/TGRVjC2hdYMri8 T07jVcmqB65WCpK8PAxOfuFRC8Ng/SCO0WSFniNZx8WAsoQOU4niYi8L0wXTIaP3ybcC YiaaatyshIS/BRfSN1BAKMrf351PD6ctfiYSgSASTjzQQwh3MSppVU1NGCw0B4GBKwTh v4XtBW6FfmO/D7gLfPdk5xtuQ9k3d/vd5Er/r97n2jBsmKR29NVY/4v+zVPIxlgwUbpf VIBpk8FmD+lmMSZf0wQ/6oUn1C9U3N4gN5pOZH5MgatImzbbQ023bsGDoqJhXRwlPH0Z miIg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725893743; x=1726498543; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ji5EQlPvSQa4KxrEh/weHYXQpnJGnD65gniEaQM5bYs=; b=U+vnl+9rOzmABVKPWklfwM67Y8ml3rI3tBz2Mg6BBicBeFbsVrtI+d0pa6wybuNtJg gj/EAmd86hJT1rceJWJPgxSk/Dc6lGS/EK6E9KRgTDkl03+NXHI1Ea7f3rIt1pAcdK0D TTnK+Oi6mqLLei9gjpdu2lu654tdEAA9hbmI8FMWdLcp9kl7IZwNQ4lfIdtT6A/HNt9a d14ekKzkC3OZzySLii7x0OGIeo3iyi7JvFFM4k4W7isl32+3KeQGNjcvtm9xwXV//Au6 k3/rUxT9QmarMnfgcM1fZZ1tJJ5ugouB3HFwn6pp8t2VXGEbT6Gett5+EgUb2MqdJTkO cuqQ== X-Gm-Message-State: AOJu0YzFZY2vZi88mqXcTe3pWWgIrqyMqKu2DbGpaIGi8wGTmU6e7gd9 2awKy2NHtGYwixBbLe8HW7IPijti/lNCQiuNtipf9cg97+kzxPtb/46nIEuD X-Google-Smtp-Source: AGHT+IGZNVDFXNGetvdAEhVfFyC8fXjbhfOm7O0SrFim4Zo3RTP8lzeA3yp+HRmtrv8KQcGqGGlIow== X-Received: by 2002:a05:6830:6310:b0:70c:9c66:af53 with SMTP id 46e09a7af769-710cc25d760mr13457266a34.25.1725893743274; Mon, 09 Sep 2024 07:55:43 -0700 (PDT) Received: from localhost.localdomain (pppoe-209-91-167-254.vianet.ca. [209.91.167.254]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-45822e772a2sm21050231cf.27.2024.09.09.07.55.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Sep 2024 07:55:42 -0700 (PDT) From: Trevor Woerner To: yocto-patches@lists.yoctoproject.org Cc: Quentin Schulz Subject: [meta-rockchip][scarthgap][PATCH 01/10] mesa: enable lima on all rk3328 boards Date: Mon, 9 Sep 2024 10:55:21 -0400 Message-ID: <20240909145530.25301-2-twoerner@gmail.com> X-Mailer: git-send-email 2.44.0.501.g19981daefd7c In-Reply-To: <20240909145530.25301-1-twoerner@gmail.com> References: <20240909145530.25301-1-twoerner@gmail.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 ; Mon, 09 Sep 2024 14:55:54 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto-patches/message/627 From: Quentin Schulz lima is the open-source implementation for the GPU found on RK3328, it is therefore not specific to the Rock64 but all boards based on the RK3328. Signed-off-by: Quentin Schulz --- recipes-graphics/mesa/mesa_%.bbappend | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-graphics/mesa/mesa_%.bbappend b/recipes-graphics/mesa/mesa_%.bbappend index 58c25e7d61bf..a31d99b5c65b 100644 --- a/recipes-graphics/mesa/mesa_%.bbappend +++ b/recipes-graphics/mesa/mesa_%.bbappend @@ -1,4 +1,4 @@ PACKAGECONFIG:append:rk3288 = " kmsro panfrost" +PACKAGECONFIG:append:rk3328 = " kmsro lima" PACKAGECONFIG:append:rk3399 = " kmsro panfrost" -PACKAGECONFIG:append:rock64 = " kmsro lima" PACKAGECONFIG:append:px30 = " kmsro panfrost" From patchwork Mon Sep 9 14:55:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trevor Woerner X-Patchwork-Id: 48848 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 D8DF3ECE584 for ; Mon, 9 Sep 2024 14:55:54 +0000 (UTC) Received: from mail-ot1-f50.google.com (mail-ot1-f50.google.com [209.85.210.50]) by mx.groups.io with SMTP id smtpd.web11.55123.1725893746799649223 for ; Mon, 09 Sep 2024 07:55:46 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=iv+jIucy; spf=pass (domain: gmail.com, ip: 209.85.210.50, mailfrom: twoerner@gmail.com) Received: by mail-ot1-f50.google.com with SMTP id 46e09a7af769-7091558067eso1893635a34.3 for ; Mon, 09 Sep 2024 07:55:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1725893745; x=1726498545; darn=lists.yoctoproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=HzDz8rk95kcE6nRSmJh+Xg6izIHEoJVNOWK0TbHVirQ=; b=iv+jIucyaW0ZdbQtNanbvpjPUrvd/U+DPaR/dx/sB5l/qOp0AJlEFttHrVhFf0YiVx XI7Oq+FRJmmut22gVK4Pl8TIguGWlLvbForf49+ZDU9Z6K0d34fYk/KVVH3+K3/cva9S X3264U3AgJhMANwphDwv2dQQYdpoqKm32jjx7XnlGBv+K2GK9Se5IWCtFyyG5n+ebLtO krhKPTyVzHjmkGC96A3jYz7GIZO+KLNkpNVaX7i7mxhCWGQTWU6qGwqk9M5ABCDzjNvT HWtRzXX8aWHUdwBeiEvtqVMdJv2fEIpm8K0LOtyRQu67qF9zQGzi/F0mFO2b4b8v+/Ze f6MQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725893745; x=1726498545; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=HzDz8rk95kcE6nRSmJh+Xg6izIHEoJVNOWK0TbHVirQ=; b=HKGdRPjOxzYEfmo8y0/j1iC9GYd/NUmCSu1Cr6MBGN6CwQ1esuIA5V+AQXq0/GeBrI dcSd7qpThYXMH1LarZEsat0tUgoLDRK3UWVx5tSngScKcmPNsa26B1QYggnEcbRSE4TX zA5UwLy/lMpO4u3NaE0fuEDxeCZw0OeGZ9XggvYq28hQwtIV8/IBVjNevQ9+1ngwuJV3 EvNnr3wTUMOlAmXEqVR4Sbxs/zYvv8UhQQefyrfZ1o2D7htphBtoxKGD1iU9iRRPQOSV j6lpNTDf7F+e9+px0GF4NqW4DUpfgG0RKUb59dzycprTgHE+11bDgm+R2bFGns8EO7Et Y/QQ== X-Gm-Message-State: AOJu0YyqN/Js69RGQSBjQo0ruNd9nffvL4ho25vNvMhPL8jIlV/9ZP+7 xWfg3CDHuy4VYKt59+M/Y56tkoQDcjWyw8RaV8f4Jc3kSeSC5o9mrL8X+XoT X-Google-Smtp-Source: AGHT+IF5LRXjBAXFngPPlGZe5vzPO4oVLPZHK2DKdCQXc4EfU62kAuqBBhw29aWWy4GmVYjsFO6QYQ== X-Received: by 2002:a05:6830:6f0d:b0:710:e67c:e817 with SMTP id 46e09a7af769-710e67d0203mr5554494a34.31.1725893745315; Mon, 09 Sep 2024 07:55:45 -0700 (PDT) Received: from localhost.localdomain (pppoe-209-91-167-254.vianet.ca. [209.91.167.254]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-45822e772a2sm21050231cf.27.2024.09.09.07.55.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Sep 2024 07:55:43 -0700 (PDT) From: Trevor Woerner To: yocto-patches@lists.yoctoproject.org Cc: Quentin Schulz Subject: [meta-rockchip][scarthgap][PATCH 02/10] mesa: build panfrost for RK3568 boards Date: Mon, 9 Sep 2024 10:55:22 -0400 Message-ID: <20240909145530.25301-3-twoerner@gmail.com> X-Mailer: git-send-email 2.44.0.501.g19981daefd7c In-Reply-To: <20240909145530.25301-1-twoerner@gmail.com> References: <20240909145530.25301-1-twoerner@gmail.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 ; Mon, 09 Sep 2024 14:55:54 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto-patches/message/628 From: Quentin Schulz The RK356x SoC family (of which we currently only support RK3568) has a Bifrost GPU that is supported by open-source Panfrost Linux kernel and Mesa drivers, therefore let's build mesa with Panfrost support for RK3568. Signed-off-by: Quentin Schulz --- recipes-graphics/mesa/mesa_%.bbappend | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes-graphics/mesa/mesa_%.bbappend b/recipes-graphics/mesa/mesa_%.bbappend index a31d99b5c65b..2d9ec2e676f7 100644 --- a/recipes-graphics/mesa/mesa_%.bbappend +++ b/recipes-graphics/mesa/mesa_%.bbappend @@ -1,4 +1,5 @@ PACKAGECONFIG:append:rk3288 = " kmsro panfrost" PACKAGECONFIG:append:rk3328 = " kmsro lima" PACKAGECONFIG:append:rk3399 = " kmsro panfrost" +PACKAGECONFIG:append:rk3568 = " kmsro panfrost" PACKAGECONFIG:append:px30 = " kmsro panfrost" From patchwork Mon Sep 9 14:55:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trevor Woerner X-Patchwork-Id: 48849 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 CB431ECE585 for ; Mon, 9 Sep 2024 14:55:54 +0000 (UTC) Received: from mail-qt1-f178.google.com (mail-qt1-f178.google.com [209.85.160.178]) by mx.groups.io with SMTP id smtpd.web10.55089.1725893749127517252 for ; Mon, 09 Sep 2024 07:55:49 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=QAgF10Wi; spf=pass (domain: gmail.com, ip: 209.85.160.178, mailfrom: twoerner@gmail.com) Received: by mail-qt1-f178.google.com with SMTP id d75a77b69052e-457ea6560a3so26738281cf.2 for ; Mon, 09 Sep 2024 07:55:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1725893747; x=1726498547; darn=lists.yoctoproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=StG4IsxOKSWlM0J0ovknX7GsQcaX4Mq6HWzfB1MgxvY=; b=QAgF10WiTinV6acmMQPiX96VoFY3w4wZC+ILwUSKCFbdAnal6XXjLKjB2PmWAEAshX O6QIwHyeM53grF/IQkHC7jRlbHJ++ntPl1Ij+rQfF2XciNQSRd2DcxBKzBSRL+zr09ZY HGStr3Dagft4X5mKWR++YZ0RZLDax1utaa3imw6Roln0GPVEkMJKkVYKJlMcHXblwpBc 9kAeZlnnMGLiih1MJWyuyFbHNN+PYJJZd8T+JpcCUo5MTjgJDLzvDJqxfwNkKGJWIOy1 VsWgcdZ9HBtUCNWsHQEoAnTk7dfAJuY3oh4okShIwyHxTE3d8q+ylPsvl1RGVutdfrxx 2jAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725893747; x=1726498547; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=StG4IsxOKSWlM0J0ovknX7GsQcaX4Mq6HWzfB1MgxvY=; b=I2EnZ9wqS9/Zaeos7Xfdgz4eKSrNMzR26nARfjcpMREcKwLUtTeJHXkBaAWQnVVpm+ ysovDHOfpH8O4SUisT552K6orEwbuQk6oPEkLr3BI02+U0yH/7kYYrooNwNInIUc1/pA BUW2WWArnzDaDgXBhOqGaznfP9AqazT+E5zV5fO1NYoRjVYQT4vIwt+AQLs9VufH6UAU CC8QD76UXCWf7qKNefqyy6nnXWlBRjUZOYUK5L16mC+o6NdZX+0Apnauqs0m5oB7aLx7 77QA4fANliWqH323lCIlsiDNIdLu5n3ZbALe6ZvdxuvBmd70xsP0EnRSSeUyc4mW5843 3fBw== X-Gm-Message-State: AOJu0YxFZdC3rJ5FHg62ZfrKJoD/GBpS69NrIUG7ilx9qcwLZ0UFUEL0 grhKsp8kS0S0tnrM99ITtvdoNaDFIlPaAymmCfIpTNV/X46Xf5F5ksInv/by X-Google-Smtp-Source: AGHT+IH7S9sobiD2NCb+eroDmnxayGLF6WTy9AEKgnJApFrmZ6BPIMwn6ZmXTh56TDA28yOYEEvZbQ== X-Received: by 2002:a05:622a:3cd:b0:458:38cf:410e with SMTP id d75a77b69052e-45838cf4326mr14359351cf.22.1725893747232; Mon, 09 Sep 2024 07:55:47 -0700 (PDT) Received: from localhost.localdomain (pppoe-209-91-167-254.vianet.ca. [209.91.167.254]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-45822e772a2sm21050231cf.27.2024.09.09.07.55.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Sep 2024 07:55:45 -0700 (PDT) From: Trevor Woerner To: yocto-patches@lists.yoctoproject.org Cc: Quentin Schulz Subject: [meta-rockchip][scarthgap][PATCH 03/10] user-selectable wic compression Date: Mon, 9 Sep 2024 10:55:23 -0400 Message-ID: <20240909145530.25301-4-twoerner@gmail.com> X-Mailer: git-send-email 2.44.0.501.g19981daefd7c In-Reply-To: <20240909145530.25301-1-twoerner@gmail.com> References: <20240909145530.25301-1-twoerner@gmail.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 ; Mon, 09 Sep 2024 14:55:54 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto-patches/message/629 For boards which build and boot wic images, the user can optionally specify a compression using the WIC_COMPRESSION_EXTENSION variable. By default "wic" images are built, but if the user would prefer, say "wic.xz" images, simply specify: WIC_COMPRESSION_EXTENSION = ".xz" in the configuration (e.g. conf/local.conf). Reviewed-by: Quentin Schulz Signed-off-by: Trevor Woerner --- README | 11 +++++++++++ conf/machine/include/rockchip-wic.inc | 5 ++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/README b/README index 605773d4ecd3..b21e92360dcc 100644 --- a/README +++ b/README @@ -47,6 +47,7 @@ Status of supported boards: Notes: ----- + rk3308 rkbin: The latest ddr initializer for the rk3308 platform does not output diagnostic messages to uart0. This causes a bunch of gibberish to be printed to the console window which only becomes legible once @@ -67,6 +68,16 @@ Notes: in the configuration (e.g. conf/local.conf). + wic compression: + For boards which build and boot wic images, the user can optionally specify + a compression using the WIC_COMPRESSION_EXTENSION variable. By default "wic" + images are built, but if the user would prefer, say "wic.xz" images, simply + specify: + + WIC_COMPRESSION_EXTENSION = ".xz" + + in the configuration (e.g. conf/local.conf). + U-Boot Environment: ------------------ In order to configure U-Boot to be able to store its environment into the diff --git a/conf/machine/include/rockchip-wic.inc b/conf/machine/include/rockchip-wic.inc index dab61d83ed2c..ebfc0cb96507 100644 --- a/conf/machine/include/rockchip-wic.inc +++ b/conf/machine/include/rockchip-wic.inc @@ -5,7 +5,10 @@ require conf/machine/include/rockchip-rk-u-boot-env.inc SPL_BINARY ?= "idbloader.img" -IMAGE_FSTYPES += "wic wic.bmap" +# if you use the following variable, make sure to add the '.' e.g. +# WIC_COMPRESSION_EXTENSION = ".xz" +WIC_COMPRESSION_EXTENSION ?= "" +IMAGE_FSTYPES += "wic${WIC_COMPRESSION_EXTENSION} wic.bmap" WKS_FILE ?= "rockchip.wks" WKS_FILE_DEPENDS ?= " \ e2fsprogs-native \ From patchwork Mon Sep 9 14:55:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Trevor Woerner X-Patchwork-Id: 48850 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 CB3EFECE57A for ; Mon, 9 Sep 2024 14:55:54 +0000 (UTC) Received: from mail-qt1-f179.google.com (mail-qt1-f179.google.com [209.85.160.179]) by mx.groups.io with SMTP id smtpd.web10.55090.1725893751808404907 for ; Mon, 09 Sep 2024 07:55:51 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=FsLAqzlQ; spf=pass (domain: gmail.com, ip: 209.85.160.179, mailfrom: twoerner@gmail.com) Received: by mail-qt1-f179.google.com with SMTP id d75a77b69052e-456954d0396so25163111cf.3 for ; Mon, 09 Sep 2024 07:55:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1725893750; x=1726498550; darn=lists.yoctoproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=GPcnU7Dxl2Sxxoi8FieL3tZGd6JlC7wVLN9S+JbKShs=; b=FsLAqzlQiOfUh6vvBuem43S3XmzMUQSqoIkwWNURI+tYdXWLDosfQRLluACF23/WZc 6laWhXfJ0i0Ue0hKmoBIkfEicnXrGqhNOWc+9SzSHy6Dld6gIxxEfZW8cbkwT0tscuy+ QDrjBH6mHedR3C2SdPVi3YaADw5dj5HZMiIYR0cbsINBd6RxHfxf2UDlVZftLxUhySfb 9IzNzyHmHbQASUy9eGBkD63oXvjEWi/F/WVAZZuUg0MKHvhojPb5O5gs90Aof658aKdm 4p9U3ILMiHSBaomoK4wd8PjLJbQK0F99DxU4Ds7cTZYNRd4NgLnLq9h7a469811gVsWW k27w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725893750; x=1726498550; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=GPcnU7Dxl2Sxxoi8FieL3tZGd6JlC7wVLN9S+JbKShs=; b=rhlmK5K7pjn5gmNRvrN9GKcx/TUHUwGkL4u8ywDrnFSIK4Hyxtcw0Mu+L+1aT19m/y Ntdwle9/lyzLdRE3nJuXIcvyfKPjU9a31oR7hoLtu7KWmjnZEQ99R4EWII+crKObwZXM b4DBF46VvhZn+upATmDdkBD/1aDdjmAAV6rl1OnYYHIE8Nc9F5foDbI+ZKXbh2pknjbf Ld+8JgQ/wgvOlgLlzVT82A48YADGRG1B5y+ioe28Cj5CHAgNco8I7m1liclxlyDBFo4W voX0w48MwqT9T9kLgWSwnnRUTck34iUqtyQ//2JZ+6C44x4/TKti8ELIuWlXW/Gwnqc7 HvEw== X-Gm-Message-State: AOJu0Yz5BSs68bEg6gFo65a4CbMkh2grdI71jZM0qK+PnlMJ2Lk4CZFb 5TwqlBlGyfnGjUdEJFnwitjviE7Za2LS6F9SWZWhtgwfZqhqvgWDUmGlHPom X-Google-Smtp-Source: AGHT+IH8bcMGlHk3hZxw4xM29f7OjgW1qKeQUTi9VVV+1JU6kLagxBE2k/uQmMPfXPEkk60+jzQzpw== X-Received: by 2002:a05:622a:13d3:b0:43f:edde:7a55 with SMTP id d75a77b69052e-4580c6e1f22mr167220061cf.28.1725893749993; Mon, 09 Sep 2024 07:55:49 -0700 (PDT) Received: from localhost.localdomain (pppoe-209-91-167-254.vianet.ca. [209.91.167.254]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-45822e772a2sm21050231cf.27.2024.09.09.07.55.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Sep 2024 07:55:47 -0700 (PDT) From: Trevor Woerner To: yocto-patches@lists.yoctoproject.org Cc: Quentin Schulz Subject: [meta-rockchip][scarthgap][PATCH 04/10] rockchip-rkbin: bump SRCREV Date: Mon, 9 Sep 2024 10:55:24 -0400 Message-ID: <20240909145530.25301-5-twoerner@gmail.com> X-Mailer: git-send-email 2.44.0.501.g19981daefd7c In-Reply-To: <20240909145530.25301-1-twoerner@gmail.com> References: <20240909145530.25301-1-twoerner@gmail.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 ; Mon, 09 Sep 2024 14:55:54 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto-patches/message/630 Update to a newer release. rk3568: - update DDR init from version 1.18 → 1.21 rk3588/s: - the name of the DDR init changed due to upstream adjusting the frequency of the LPDDR5 to 2400MHz to "improve stability" [1] - reference an exact version instead of using an '*' - update DDR init from version 1.12 → 1.16 Boot tested on: - rock-3a - rock-5a - rock-5b Link [1]: https://github.com/rockchip-linux/rkbin/commit/f02d10e468d8c783c45137d230ff33d42ca670b4 Reviewed-by: Quentin Schulz Tested-by: Quentin Schulz #RK3588 Jaguar, manual U-Boot compilation Signed-off-by: Trevor Woerner --- recipes-bsp/rkbin/rockchip-rkbin_git.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipes-bsp/rkbin/rockchip-rkbin_git.bb b/recipes-bsp/rkbin/rockchip-rkbin_git.bb index 7929c6ac3a10..f9724ddd5cd5 100644 --- a/recipes-bsp/rkbin/rockchip-rkbin_git.bb +++ b/recipes-bsp/rkbin/rockchip-rkbin_git.bb @@ -3,7 +3,7 @@ LICENSE = "Proprietary" LIC_FILES_CHKSUM = "file://LICENSE;md5=15faa4a01e7eb0f5d33f9f2bcc7bff62" SRC_URI = "git://github.com/rockchip-linux/rkbin;protocol=https;branch=master" -SRCREV = "b4558da0860ca48bf1a571dd33ccba580b9abe23" +SRCREV = "a2a0b89b6c8c612dca5ed9ed8a68db8a07f68bc0" PROVIDES += "trusted-firmware-a" PROVIDES += "optee-os" @@ -42,7 +42,7 @@ do_deploy:rk3568() { # Prebuilt OPTEE-OS install -m 644 ${S}/bin/rk35/rk3568_bl32_v*.bin ${DEPLOYDIR}/tee-rk3568.bin # Prebuilt U-Boot TPL (DDR init) - install -m 644 ${S}/bin/rk35/rk3568_ddr_1560MHz_v1.18.bin ${DEPLOYDIR}/ddr-rk3568.bin + install -m 644 ${S}/bin/rk35/rk3568_ddr_1560MHz_v1.21.bin ${DEPLOYDIR}/ddr-rk3568.bin } do_deploy:rk3588s() { @@ -51,7 +51,7 @@ do_deploy:rk3588s() { # Prebuilt OPTEE-OS install -m 644 ${S}/bin/rk35/rk3588_bl32_v*.bin ${DEPLOYDIR}/tee-rk3588.bin # Prebuilt U-Boot TPL (DDR init) - install -m 644 ${S}/bin/rk35/rk3588_ddr_lp4_2112MHz_lp5_2736MHz_v*.bin ${DEPLOYDIR}/ddr-rk3588.bin + install -m 644 ${S}/bin/rk35/rk3588_ddr_lp4_2112MHz_lp5_2400MHz_v1.16.bin ${DEPLOYDIR}/ddr-rk3588.bin } do_deploy() { From patchwork Mon Sep 9 14:55:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Trevor Woerner X-Patchwork-Id: 48847 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 AB7EBECE57E for ; Mon, 9 Sep 2024 14:55:54 +0000 (UTC) Received: from mail-yb1-f175.google.com (mail-yb1-f175.google.com [209.85.219.175]) by mx.groups.io with SMTP id smtpd.web11.55128.1725893753835570250 for ; Mon, 09 Sep 2024 07:55:53 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=H5HRXjjW; spf=pass (domain: gmail.com, ip: 209.85.219.175, mailfrom: twoerner@gmail.com) Received: by mail-yb1-f175.google.com with SMTP id 3f1490d57ef6-e0875f1e9edso4075005276.1 for ; Mon, 09 Sep 2024 07:55:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1725893752; x=1726498552; darn=lists.yoctoproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=NIJF8Ruw03yC7krYwOuKQGOwtvzuZqFoudgosJZ3PMU=; b=H5HRXjjWUe3BqgoAoyNt0c0KoOorqktl7za8R1Kxc70I+CucyGbAWlq2t+Oe6AHNl8 v3JVW3xM7WRZWnFRjIfSgJzeK97PMuLY0oKq/aPiWB/YNjfhYzMpBXbpS+qg2t/CSBq7 xLN6o6F6tPjIY5Ei0yJDFmBpq8qr78E/6xKchy04c+GnqmulhGJZzIQoFAo1ZadFSBad v9pH3P4R+MQAYd1bsCrGaV0CFOdJEr7Mbj4t+eZsP8mD0IW3sLge8l0uEzfTC/BY6mZX +QdnPtNsD/mBOMJtXDiL0UFx33T0NhnbyqETub01l2/qtwlOi4MYYob2lzUqrVEDhIMd aEBA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725893752; x=1726498552; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=NIJF8Ruw03yC7krYwOuKQGOwtvzuZqFoudgosJZ3PMU=; b=FIzcqmFhdgB9cpg8h9HIAEJ4qVIsQ2BwQNMnQB05VfUx2/ESIHMi7y1JPjsq/sZ35J CbSzFttaXbyowoIC1pxmd4aw/w8xBQdYE5Sbw20uOEzwf2db36nzIg86s6GlaD28b+C6 rDtybt5sF2ObSVY3hu7WbH0aee2i3czTAQNvj/ZbNNJQbly4tHov4+xGXNlRldKYgB5k 01i6i3aVMfZMMQbjS1wnsK+sRDt7NUAiUgHNVVPmNBBzk2ufXANp0/6XV5OmEhKtr+kP CxOXqxAbcivRiw21JZBhChsAUH2CVZOir4PHkqrRDRxx4SclZ4GEx2OkxTaGC9x0FI7T Fi0A== X-Gm-Message-State: AOJu0Yzj7cjIrLRftTFf1ozF9t2UI7Xz0/wcr5OIjcdXDdSfNt9cQi0r GUVR3VOgobq6BYf6xhSlpk6pzgxMHx8Km7mjcY744foazruYVazcStlusXvb X-Google-Smtp-Source: AGHT+IGxLDmKcyB0yqY+ZFkSh3YME0G0QBgHzkvEcYAnnnatJSP4gLPvSelvk7fNh6emHw8tJk8gqg== X-Received: by 2002:a25:d809:0:b0:e1d:3cf9:f1ea with SMTP id 3f1490d57ef6-e1d3cfa0afbmr7892269276.34.1725893752180; Mon, 09 Sep 2024 07:55:52 -0700 (PDT) Received: from localhost.localdomain (pppoe-209-91-167-254.vianet.ca. [209.91.167.254]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-45822e772a2sm21050231cf.27.2024.09.09.07.55.50 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Sep 2024 07:55:50 -0700 (PDT) From: Trevor Woerner To: yocto-patches@lists.yoctoproject.org Subject: [meta-rockchip][scarthgap][PATCH 05/10] radxa-zero-3{e|w}: add Date: Mon, 9 Sep 2024 10:55:25 -0400 Message-ID: <20240909145530.25301-6-twoerner@gmail.com> X-Mailer: git-send-email 2.44.0.501.g19981daefd7c In-Reply-To: <20240909145530.25301-1-twoerner@gmail.com> References: <20240909145530.25301-1-twoerner@gmail.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 ; Mon, 09 Sep 2024 14:55:54 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto-patches/message/631 The Radxa ZERO 3{e|w} are ultra-small, high-performance single board computers based on the Rockchip RK3566, with a compact form factor, and rich interfaces. http://radxa.com/products/zeros/zero3e/ http://radxa.com/products/zeros/zero3w/ common tech specs: - Rockchip RK3566 (4x Arm Cortex-A55 @ 1.6GHz) - Arm Mali-G52-2EE (OpenGL ES 1.1/2.0/3.0/3.1/3.2, Vulkan 1.1, OpenCL 2.0) - LPDDR4 RAM (1/2/3/8 GB) - µSD - 1x USB 2.0 Type C OTG, 1x USB 3.0 Type C Host - 1x µHDMI (1080p @ 60fps) - 1x MIPI CSI camera port - colour-coded 40-pin GPIO (uart, spi, i2c, pcm/i2s, pwm, gpio) - 72mm x 30mm Radxa ZERO 3e specific tech specs: - GbE Radxa ZERO 3w specific tech specs: - optional onboard eMMC (8/16/32/64 GB) - IEEE 802.11 b/g/n/ac/ax(WiFi6), BT5.4 with BLE NOTE: currently support for this board requires a U-Boot fork for the bootloader, and linux-next for the kernel. Support will probably come in linux kernel 6.11-ish, at which point U-Boot will then use that kernel's device tree which means U-Boot support will come after the release of whichever kernel includes support for this board. Signed-off-by: Trevor Woerner --- README | 2 ++ conf/machine/include/radxa-zero-3.inc | 8 ++++++ conf/machine/include/rk3566.inc | 21 ++++++++++++++++ conf/machine/radxa-zero-3e.conf | 7 ++++++ conf/machine/radxa-zero-3w.conf | 7 ++++++ recipes-bsp/rkbin/rockchip-rkbin_git.bb | 12 +++++++++ recipes-bsp/u-boot/u-boot_%.bbappend | 4 +++ .../linux/linux-torvalds-next_git.bb | 25 +++++++++++++++++++ 8 files changed, 86 insertions(+) create mode 100644 conf/machine/include/radxa-zero-3.inc create mode 100644 conf/machine/include/rk3566.inc create mode 100644 conf/machine/radxa-zero-3e.conf create mode 100644 conf/machine/radxa-zero-3w.conf create mode 100644 recipes-kernel/linux/linux-torvalds-next_git.bb diff --git a/README b/README index b21e92360dcc..909840de2c0d 100644 --- a/README +++ b/README @@ -40,6 +40,8 @@ Status of supported boards: orangepi-5-plus rock-3a rock-4c-plus + radxa-zero-3e + radxa-zero-3w builds: marsboard-rk3066 radxarock diff --git a/conf/machine/include/radxa-zero-3.inc b/conf/machine/include/radxa-zero-3.inc new file mode 100644 index 000000000000..1c6f972c1e31 --- /dev/null +++ b/conf/machine/include/radxa-zero-3.inc @@ -0,0 +1,8 @@ +MACHINEOVERRIDES =. "radxa-zero-3:" + +require conf/machine/include/rk3566.inc + +PREFERRED_PROVIDER_virtual/kernel = "linux-torvalds-next" +MACHINE_EXTRA_RRECOMMENDS += "kernel-modules" + +UBOOT_MACHINE = "radxa-zero-3-rk3566_defconfig" diff --git a/conf/machine/include/rk3566.inc b/conf/machine/include/rk3566.inc new file mode 100644 index 000000000000..586d68806df6 --- /dev/null +++ b/conf/machine/include/rk3566.inc @@ -0,0 +1,21 @@ +SOC_FAMILY = "rk3566" + +DEFAULTTUNE ?= "cortexa55" + +ROCKCHIP_CLOSED_TPL ?= "1" + +require conf/machine/include/soc-family.inc +require conf/machine/include/rockchip-defaults.inc +require conf/machine/include/arm/armv8-2a/tune-cortexa55.inc +require conf/machine/include/rockchip-wic.inc + +KBUILD_DEFCONFIG ?= "defconfig" +KERNEL_FEATURES:append:rk3566 = " bsp/rockchip/remove-non-rockchip-arch-arm64.scc" +KERNEL_CLASSES = "kernel-fitimage" +KERNEL_IMAGETYPE ?= "fitImage" + +PREFERRED_PROVIDER_trusted-firmware-a = "rockchip-rkbin" +PREFERRED_PROVIDER_optee-os = "rockchip-rkbin" + +UBOOT_SUFFIX ?= "itb" +UBOOT_ENTRYPOINT ?= "0x06000000" diff --git a/conf/machine/radxa-zero-3e.conf b/conf/machine/radxa-zero-3e.conf new file mode 100644 index 000000000000..37792cbf36a5 --- /dev/null +++ b/conf/machine/radxa-zero-3e.conf @@ -0,0 +1,7 @@ +#@TYPE: Machine +#@NAME: Radxa Zero 3E +#@DESCRIPTION: The Radxa ZERO 3e is an ultra-small, high-performance single board computer based on the Rockchip RK3566, with a compact form factor, and rich interfaces. +#http://radxa.com/products/zeros/zero3e/ + +require conf/machine/include/radxa-zero-3.inc +KERNEL_DEVICETREE = "rockchip/rk3566-radxa-zero-3e.dtb" diff --git a/conf/machine/radxa-zero-3w.conf b/conf/machine/radxa-zero-3w.conf new file mode 100644 index 000000000000..5193d45e1f69 --- /dev/null +++ b/conf/machine/radxa-zero-3w.conf @@ -0,0 +1,7 @@ +#@TYPE: Machine +#@NAME: Radxa Zero 3W +#@DESCRIPTION: The Radxa ZERO 3w is an ultra-small, high-performance single board computer based on the Rockchip RK3566, with a compact form factor, and rich interfaces. +#http://radxa.com/products/zeros/zero3w/ + +require conf/machine/include/radxa-zero-3.inc +KERNEL_DEVICETREE = "rockchip/rk3566-radxa-zero-3w.dtb" diff --git a/recipes-bsp/rkbin/rockchip-rkbin_git.bb b/recipes-bsp/rkbin/rockchip-rkbin_git.bb index f9724ddd5cd5..1b71414e27ca 100644 --- a/recipes-bsp/rkbin/rockchip-rkbin_git.bb +++ b/recipes-bsp/rkbin/rockchip-rkbin_git.bb @@ -14,6 +14,7 @@ S = "${WORKDIR}/git" COMPATIBLE_MACHINE = "^$" COMPATIBLE_MACHINE:rk3308 = "rk3308" +COMPATIBLE_MACHINE:rk3566 = "rk3566" COMPATIBLE_MACHINE:rk3568 = "rk3568" COMPATIBLE_MACHINE:rk3588s = "rk3588s" @@ -36,6 +37,17 @@ do_deploy:rk3308() { install -m 644 ${S}/bin/rk33/rk3308_ddr_589MHz_uart?_m0_v*.bin ${DEPLOYDIR}/ddr-rk3308.bin } +# NOTE: the following are not typos +# the rk3566 uses the same bl31/2 as the rk3568 +do_deploy:rk3566() { + # Prebuilt TF-A + install -m 644 ${S}/bin/rk35/rk3568_bl31_v*.elf ${DEPLOYDIR}/bl31-rk3566.elf + # Prebuilt OPTEE-OS + install -m 644 ${S}/bin/rk35/rk3568_bl32_v*.bin ${DEPLOYDIR}/tee-rk3566.bin + # Prebuilt U-Boot TPL (DDR init) + install -m 644 ${S}/bin/rk35/rk3566_ddr_1056MHz_v1.21.bin ${DEPLOYDIR}/ddr-rk3566.bin +} + do_deploy:rk3568() { # Prebuilt TF-A install -m 644 ${S}/bin/rk35/rk3568_bl31_v*.elf ${DEPLOYDIR}/bl31-rk3568.elf diff --git a/recipes-bsp/u-boot/u-boot_%.bbappend b/recipes-bsp/u-boot/u-boot_%.bbappend index 862ca1377692..c939a487d294 100644 --- a/recipes-bsp/u-boot/u-boot_%.bbappend +++ b/recipes-bsp/u-boot/u-boot_%.bbappend @@ -2,6 +2,10 @@ require u-boot-rockchip.inc FILESEXTRAPATHS:prepend := "${THISDIR}/files:" +SRC_URI:radxa-zero-3 = "git://github.com/Kwiboo/u-boot-rockchip.git;protocol=https;branch=rk3xxx-2024.07;name=Kwiboo" +SRCREV:radxa-zero-3 = "8cdf606e616baa36751f3b4adcfaefc781126c8c" +SRCREV:radxa-zero-3:rk-u-boot-env = "8cdf606e616baa36751f3b4adcfaefc781126c8c" + SRC_URI:append:rk-u-boot-env = " file://rockchip-enable-environment-mmc.cfg" SRCREV:rk-u-boot-env = "cdfcc37428e06f4730ab9a17cc084eeb7676ea1a" diff --git a/recipes-kernel/linux/linux-torvalds-next_git.bb b/recipes-kernel/linux/linux-torvalds-next_git.bb new file mode 100644 index 000000000000..6f3db7c61bdf --- /dev/null +++ b/recipes-kernel/linux/linux-torvalds-next_git.bb @@ -0,0 +1,25 @@ +FILESEXTRAPATHS:prepend := "${THISDIR}/linux-yocto-dev:" + +DESCRIPTION = "Linux Kernel" +SECTION = "kernel" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" + +ERROR_QA:remove = "buildpaths" +DEFAULT_PREFERENCE = "-1" +COMPATIBLE_MACHINE = "^$" +COMPATIBLE_MACHINE:radxa-zero-3 = "radxa-zero-3" + +LINUX_VERSION = "6.10-rc3" +KERNEL_VERSION_SANITY_SKIP = "1" +PV = "${LINUX_VERSION}+git${SRCPV}" +SRC_URI = " \ + git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git;protocol=https;nobranch=1 \ + file://rockchip-kmeta;type=kmeta;name=rockchip-kmeta;destsuffix=rockchip-kmeta \ + " +# this is tag 'next-20240611' +SRCREV = "a957267fa7e9159d3d2ee1421359ebf228570c68" + +inherit kernel +inherit kernel-yocto +require recipes-kernel/linux/linux-yocto.inc From patchwork Mon Sep 9 14:55:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trevor Woerner X-Patchwork-Id: 48853 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 DF20CECE57A for ; Mon, 9 Sep 2024 14:56:04 +0000 (UTC) Received: from mail-qt1-f178.google.com (mail-qt1-f178.google.com [209.85.160.178]) by mx.groups.io with SMTP id smtpd.web11.55131.1725893756390347195 for ; Mon, 09 Sep 2024 07:55:56 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=VpCPNonb; spf=pass (domain: gmail.com, ip: 209.85.160.178, mailfrom: twoerner@gmail.com) Received: by mail-qt1-f178.google.com with SMTP id d75a77b69052e-4582a0b438aso12620291cf.0 for ; Mon, 09 Sep 2024 07:55:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1725893754; x=1726498554; darn=lists.yoctoproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=D+DjYoSV3Jzgg3NRfHtFwkTEdPOGJ43OnZs29EdBhww=; b=VpCPNonby3gwpicQb6xCRcHLaZ6muVljYak33iAD3L4TS9FhDQT8iWTvWT2TTmvhiz KPBVjCuIWQTdTWoDukR+iv2SuhjvMvGO/MB/q1dQPhb5Z2Hy2xjlIbsPKsZ+Ipr/7YIQ HFP8a6aj9EdjuRCPQM3Q/HoGLkkP3qQ/G6lS9kXHb3riah/AhScAPshvHiFijAGLz2fQ hOj+aA1/tqHFmytdBx8YPM8k60BP8gdEXDoPGUmkhQyrZnoy7RlIR9WjPyFbbb0d5xVs xAvd4oNyFg35qJRKf6QBGXpk00ledztBy/fRwPekOSeTvs16qhPhzp0RcJCuMLNwvx8a cc1Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725893754; x=1726498554; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=D+DjYoSV3Jzgg3NRfHtFwkTEdPOGJ43OnZs29EdBhww=; b=XLYtqY1WenIsIx0BInONJ1W2lF9SBCJ0m9Cfrdr2K/d0WL1VL/tBxBtJjygPYSogav t88qKKj64G43ZFcT0NTDV4fNWXgjaFo5hmTuD2vaXgvg6iSXjGfmprReQnvC2eizgROR zptBtiQsAxrfov7YkLLsds9V9N1QmWCoaG7h3gsYA0qypq+C9V0eCXGKnocPZ79vSHLS DukcI+E//DcywV0k5o8xzgbhU0iLoFBSgnQPseHrJX0VfQBs1v6N8Y1AcxG0srWLcR8P iR+zyLdXblx6g5AIciWDk2Wy1nDSh+8hNI3JdU/pp7iWtN2nHZhtLN6mhiQPXdN1JHyF Bi7g== X-Gm-Message-State: AOJu0YwS3PAF7SI0xmcgaiOgh8YrJFRO1X7j+m1rqugk69X+aAQZ0wQ2 3OuW6c8e5lhQSVGTWDq2uFtkdVUEgvjgDq0i92w83wXLC5P5O8NTbv7D1gCt X-Google-Smtp-Source: AGHT+IG01g8JwrTv/6+rW9lsJ0Qorg6ceqd/H51IXYH1d6aY4ume5TTygPmKqTUX8Cl23I8x7zG6Uw== X-Received: by 2002:a05:622a:1804:b0:446:34cd:9e21 with SMTP id d75a77b69052e-4580c69761fmr210866571cf.18.1725893754334; Mon, 09 Sep 2024 07:55:54 -0700 (PDT) Received: from localhost.localdomain (pppoe-209-91-167-254.vianet.ca. [209.91.167.254]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-45822e772a2sm21050231cf.27.2024.09.09.07.55.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Sep 2024 07:55:52 -0700 (PDT) From: Trevor Woerner To: yocto-patches@lists.yoctoproject.org Cc: Quentin Schulz Subject: [meta-rockchip][scarthgap][PATCH 06/10] README: sort MACHINE names Date: Mon, 9 Sep 2024 10:55:26 -0400 Message-ID: <20240909145530.25301-7-twoerner@gmail.com> X-Mailer: git-send-email 2.44.0.501.g19981daefd7c In-Reply-To: <20240909145530.25301-1-twoerner@gmail.com> References: <20240909145530.25301-1-twoerner@gmail.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 ; Mon, 09 Sep 2024 14:56:04 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto-patches/message/632 Previously the MACHINEs were listed in the order in which they were added to the layer. Going forward, separate the list into 32 vs 64 bit, sort each of those groups, while distinguishing between which boards support wic and which don't. Reviewed-by: Quentin Schulz Signed-off-by: Trevor Woerner --- README | 59 +++++++++++++++++++++++++++++++--------------------------- 1 file changed, 32 insertions(+), 27 deletions(-) diff --git a/README b/README index 909840de2c0d..6003e7c652fe 100644 --- a/README +++ b/README @@ -18,34 +18,39 @@ Dependencies: Status of supported boards: -------------------------- builds and boots wic image: - nanopi-m4 - nanopi-m4-2gb - rock-pi-e - rock-pi-4a - rock-pi-4b - rock-pi-4c - rock64 - tinker-board - tinker-board-s - vyasa-rk3288 - firefly-rk3288 - nanopi-r4s - rock-5b - nanopi-r2s - nanopi-m4b - rock-pi-s - rock-5a - roc-rk3328-cc - roc-rk3308-cc - orangepi-5-plus - rock-3a - rock-4c-plus - radxa-zero-3e - radxa-zero-3w + 32-bit: + firefly-rk3288 + tinker-board + tinker-board-s + vyasa-rk3288 + + 64-bit: + nanopi-m4 + nanopi-m4-2gb + nanopi-m4b + nanopi-r2s + nanopi-r4s + orangepi-5-plus + radxa-zero-3e + radxa-zero-3w + roc-rk3308-cc + roc-rk3328-cc + rock-3a + rock-4c-plus + rock-5a + rock-5b + rock-pi-4a + rock-pi-4b + rock-pi-4c + rock-pi-e + rock-pi-s + rock64 + builds: - marsboard-rk3066 - radxarock - rock2-square + 32-bit: + marsboard-rk3066 + radxarock + rock2-square Notes: ----- From patchwork Mon Sep 9 14:55:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trevor Woerner X-Patchwork-Id: 48854 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 06061ECE586 for ; Mon, 9 Sep 2024 14:56:05 +0000 (UTC) Received: from mail-qt1-f180.google.com (mail-qt1-f180.google.com [209.85.160.180]) by mx.groups.io with SMTP id smtpd.web11.55132.1725893758592449702 for ; Mon, 09 Sep 2024 07:55:58 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=kjk+iFOl; spf=pass (domain: gmail.com, ip: 209.85.160.180, mailfrom: twoerner@gmail.com) Received: by mail-qt1-f180.google.com with SMTP id d75a77b69052e-4582a0b438aso12620501cf.0 for ; Mon, 09 Sep 2024 07:55:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1725893757; x=1726498557; darn=lists.yoctoproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=1lE/BaR5ScabrmOOM5NIaqj6qOY2iSq6Jx88Y4CLx2Q=; b=kjk+iFOlrnLaMrr1bnHKISDpGbFMyn/oA+5x9rzobgE1RKbbHphF1my2DCducf5y2F ZPMbJphnXePoSm+bk7ZeEAkKZVDhROOl+rMbx1zoY+cSryLIGxjJISEefCNjh6ewMnCc pRS3MiOoNczbddEPKsZqi3hT+d3lWr9I1KW0XSoooO2dLkWWjemavMFXkHi6//LRGLab L5pPQzqZuuKxHoqKO1yQJfFauG94uXR6xkLFAtRZFzWi549OjvE/AJ21SaCy9bfnAT5j lbbD4Hf3jI7Cao3mQJISsgXvsXRZPBPk1n2BViKpXOkty/O/la7JZ+NtcTwo2Zd2z4Og A90g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725893757; x=1726498557; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=1lE/BaR5ScabrmOOM5NIaqj6qOY2iSq6Jx88Y4CLx2Q=; b=g5wKjdGCsgsyLWMVUbGIbeFZoFwxw70qBaG+UoFiZfXDtCgEnl2mGjacun5IaQCa4g OZyAJd56g4jCT7Rpd0bA/7eo/HuYLH/nTHCgyPahYN8PFDVG8oAMDhS0Kvugs0LAZ3ng 8p3obOdOIbgIouOIHS3ct3Cd0I6MnKxPIX264+k1JMZdrsNiuRAKNfT8WDJxtv1JMEnN 7qNCvqLVUqJd3Rfaaldk2QAsgV3XMP7xVjOiylJGS0JUvoYYTLA2ru5OkDkL5/B71qRv +UhItrUfWaABp340Y+Pl87ecTYAaLYebcRNguz+PAlAZeu3EdshbhIpDURIO1K/66oZP OjLw== X-Gm-Message-State: AOJu0YzAJPedT4kOCoXu9poy2E11LlFKu5yLKB6Se5DdGUq72fMRfTPo XSFaH6XmUMGnKnv8eQWBU/ZZFNBnEnRjiXCUUX0wERAduB686ivxNkNNJaqy X-Google-Smtp-Source: AGHT+IGUTwtPJWJa/Oi0z+HQUzFigJ5D/yxtp912Vle59Zqdr2jXCjCx1ESmnVjs1pnYIv3e7JSXAg== X-Received: by 2002:a05:622a:1804:b0:446:34cd:9e21 with SMTP id d75a77b69052e-4580c69761fmr210868241cf.18.1725893756780; Mon, 09 Sep 2024 07:55:56 -0700 (PDT) Received: from localhost.localdomain (pppoe-209-91-167-254.vianet.ca. [209.91.167.254]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-45822e772a2sm21050231cf.27.2024.09.09.07.55.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Sep 2024 07:55:55 -0700 (PDT) From: Trevor Woerner To: yocto-patches@lists.yoctoproject.org Cc: Marcin Bober Subject: [meta-rockchip][scarthgap][PATCH 07/10] mesa: build panfrost for RK3566 boards Date: Mon, 9 Sep 2024 10:55:27 -0400 Message-ID: <20240909145530.25301-8-twoerner@gmail.com> X-Mailer: git-send-email 2.44.0.501.g19981daefd7c In-Reply-To: <20240909145530.25301-1-twoerner@gmail.com> References: <20240909145530.25301-1-twoerner@gmail.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 ; Mon, 09 Sep 2024 14:56:05 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto-patches/message/633 From: Marcin Bober The RK356x SoC family (of which we currently only support RK3568) has a Bifrost GPU that is supported by open-source Panfrost Linux kernel and Mesa drivers, therefore let's build mesa with Panfrost support for RK3566. Signed-off-by: Marcin Bober --- recipes-graphics/mesa/mesa_%.bbappend | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes-graphics/mesa/mesa_%.bbappend b/recipes-graphics/mesa/mesa_%.bbappend index 2d9ec2e676f7..00cc15c6221c 100644 --- a/recipes-graphics/mesa/mesa_%.bbappend +++ b/recipes-graphics/mesa/mesa_%.bbappend @@ -1,5 +1,6 @@ PACKAGECONFIG:append:rk3288 = " kmsro panfrost" PACKAGECONFIG:append:rk3328 = " kmsro lima" PACKAGECONFIG:append:rk3399 = " kmsro panfrost" +PACKAGECONFIG:append:rk3566 = " kmsro panfrost" PACKAGECONFIG:append:rk3568 = " kmsro panfrost" PACKAGECONFIG:append:px30 = " kmsro panfrost" From patchwork Mon Sep 9 14:55:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trevor Woerner X-Patchwork-Id: 48856 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 F1086ECE584 for ; Mon, 9 Sep 2024 14:56:04 +0000 (UTC) Received: from mail-qt1-f182.google.com (mail-qt1-f182.google.com [209.85.160.182]) by mx.groups.io with SMTP id smtpd.web10.55094.1725893761387198620 for ; Mon, 09 Sep 2024 07:56:01 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=Zm8x7ato; spf=pass (domain: gmail.com, ip: 209.85.160.182, mailfrom: twoerner@gmail.com) Received: by mail-qt1-f182.google.com with SMTP id d75a77b69052e-458362e898aso3997251cf.0 for ; Mon, 09 Sep 2024 07:56:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1725893759; x=1726498559; darn=lists.yoctoproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=pJyULRw3mAp87CVGmh57FtISy1ujOL/o1C31t4aZOHI=; b=Zm8x7ato0+EdF2J8TsJiMLT78d7FqeYXp9LEHlzdJma+aBKIe7IR+PSn5ZvmQDLTLh tl6u0VC7R8Wf0G8J8Pr1fEEmPTE5wm32q1tIxod3rA6QvZKathW6MSdvIgRmcCmmSuGm 5sOS5iFKh9nshjkLIc8mWLepSi5K1OUqxEZ10n60521XVM8mYSNs714lwc4nk35PwAq1 g69VpueCr5R8c2/ITfdA91I2sca9TTEH0IJbNpfDjorkmGlE5wnzDpihLc7ogncsrk73 4hLE14HwQ46LlrPaR17Fp29RjMjv1kjWf71acyUDZv5/tW/ixTXbqHtK+EpDRXBUb0Ih YZlw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725893759; x=1726498559; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=pJyULRw3mAp87CVGmh57FtISy1ujOL/o1C31t4aZOHI=; b=MyKuH7Fm5raEfhVHu0hTdFczm5VsF8fizz2d9Z+mwvG0Tu879pHvvscVt1I2AcelqQ K5MMTArCkfiYPzmxGhnpCSxufsjIAl4pA7IFGbxkndqhNIWFbYeI8I9t9RK5heNr0MWr uKghb7s4hNW2zZvEM5tbJzC0VjC8xpHm96XaxR0d++VVOQx9x2vN1VXsEKLohItYebpL eBlQ1MOhwFY5qsgGUGhXPIzifueGuHN7ITwEt9nbFEHi3nni8P0P97mxIpFODOdbBUrQ WeHoo9od1tzuqy23RLN9OX2qGe3tQjfZaR39xbYr+PyRT7Bop7xTpmm1P5Fo1Q0RYoGf 0fWQ== X-Gm-Message-State: AOJu0YxnUidgehJA/7WS2sRD2TEGgr/XYcBFN6NRHTZnWprkAn0+YchB 1T1sknM5xcHCM5OCW0pUPeIL7zvULut7l0M0KUhhsWxEOCZOgDWeTqZ559Ku X-Google-Smtp-Source: AGHT+IF9f07a2Z17emvI7TaNI86wB/cWv+6clz6YAmoJjqOXudO96LW2+5Dt0xzjTuinIPkeFNYe6g== X-Received: by 2002:a05:622a:1388:b0:458:3a20:bf7e with SMTP id d75a77b69052e-4583a20c35amr16431841cf.15.1725893759032; Mon, 09 Sep 2024 07:55:59 -0700 (PDT) Received: from localhost.localdomain (pppoe-209-91-167-254.vianet.ca. [209.91.167.254]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-45822e772a2sm21050231cf.27.2024.09.09.07.55.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Sep 2024 07:55:57 -0700 (PDT) From: Trevor Woerner To: yocto-patches@lists.yoctoproject.org Cc: Quentin Schulz Subject: [meta-rockchip][scarthgap][PATCH 08/10] rauc demo: add Date: Mon, 9 Sep 2024 10:55:28 -0400 Message-ID: <20240909145530.25301-9-twoerner@gmail.com> X-Mailer: git-send-email 2.44.0.501.g19981daefd7c In-Reply-To: <20240909145530.25301-1-twoerner@gmail.com> References: <20240909145530.25301-1-twoerner@gmail.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 ; Mon, 09 Sep 2024 14:56:04 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto-patches/message/634 Add an example of implementing rauc on a rockchip board. Adding the meta-rauc layer, adding 'rauc' to DISTRO_FEATURES, and enabling RK_RAUC_DEMO will build an image using the example provided in dynamic-layers/rk-rauc-demo. This example uses a simple A/B + D scheme (i.e. two root partitions and a non-updated /data partition). Repartitioning occurs automatically on first boot thanks to systemd's 'repart' mechanism. NOTE: - this example only works with systemd If you wish to provide your own implementation, simply add the meta-rauc layer, add 'rauc' to DISTRO_FEATURES, don't enable RK_RAUC_DEMO, and provide your own implementation in a separate layer. Reviewed-by: Quentin Schulz Signed-off-by: Trevor Woerner --- README | 18 +++++ .../rk-rauc-demo-features-check.bbclass | 4 + conf/layer.conf | 4 + conf/machine/include/rockchip-rauc.inc | 4 + conf/machine/include/rockchip-wic.inc | 2 + .../recipes-bsp/u-boot/files/boot.cmd.in | 51 ++++++++++++ .../recipes-bsp/u-boot/files/uboot-rauc.cfg | 8 ++ .../recipes-bsp/u-boot/u-boot_%.bbappend | 26 ++++++ .../base-files/base-files_%.bbappend | 2 + .../recipes-core/base-files/files/fstab | 5 ++ .../rauc-bundles/files/development-1.cert.pem | 80 +++++++++++++++++++ .../rauc-bundles/files/development-1.key.pem | 28 +++++++ .../rauc-bundles/rockchip-rauc-bundle.bb | 14 ++++ .../recipes-core/rauc/files/ca.cert.pem | 80 +++++++++++++++++++ .../recipes-core/rauc/files/system.conf | 17 ++++ .../recipes-core/rauc/rauc-conf.bbappend | 7 ++ .../recipes-core/systemd/abd-partition.bb | 26 ++++++ .../systemd/files/25-rootfsA.conf | 4 + .../systemd/files/35-rootfsB.conf | 7 ++ .../recipes-core/systemd/files/45-data.conf | 6 ++ .../recipes-core/systemd/files/data.mount | 10 +++ .../recipes-core/systemd/systemd_%.bbappend | 3 + .../linux/linux-torvalds-next_%.bbappend | 1 + 23 files changed, 407 insertions(+) create mode 100644 classes-recipe/rk-rauc-demo-features-check.bbclass create mode 100644 conf/machine/include/rockchip-rauc.inc create mode 100644 dynamic-layers/rk-rauc-demo/recipes-bsp/u-boot/files/boot.cmd.in create mode 100644 dynamic-layers/rk-rauc-demo/recipes-bsp/u-boot/files/uboot-rauc.cfg create mode 100644 dynamic-layers/rk-rauc-demo/recipes-bsp/u-boot/u-boot_%.bbappend create mode 100644 dynamic-layers/rk-rauc-demo/recipes-core/base-files/base-files_%.bbappend create mode 100644 dynamic-layers/rk-rauc-demo/recipes-core/base-files/files/fstab create mode 100644 dynamic-layers/rk-rauc-demo/recipes-core/rauc-bundles/files/development-1.cert.pem create mode 100644 dynamic-layers/rk-rauc-demo/recipes-core/rauc-bundles/files/development-1.key.pem create mode 100644 dynamic-layers/rk-rauc-demo/recipes-core/rauc-bundles/rockchip-rauc-bundle.bb create mode 100644 dynamic-layers/rk-rauc-demo/recipes-core/rauc/files/ca.cert.pem create mode 100644 dynamic-layers/rk-rauc-demo/recipes-core/rauc/files/system.conf create mode 100644 dynamic-layers/rk-rauc-demo/recipes-core/rauc/rauc-conf.bbappend create mode 100644 dynamic-layers/rk-rauc-demo/recipes-core/systemd/abd-partition.bb create mode 100644 dynamic-layers/rk-rauc-demo/recipes-core/systemd/files/25-rootfsA.conf create mode 100644 dynamic-layers/rk-rauc-demo/recipes-core/systemd/files/35-rootfsB.conf create mode 100644 dynamic-layers/rk-rauc-demo/recipes-core/systemd/files/45-data.conf create mode 100644 dynamic-layers/rk-rauc-demo/recipes-core/systemd/files/data.mount create mode 100644 dynamic-layers/rk-rauc-demo/recipes-core/systemd/systemd_%.bbappend create mode 100644 dynamic-layers/rk-rauc-demo/recipes-kernel/linux/linux-torvalds-next_%.bbappend diff --git a/README b/README index 6003e7c652fe..8ff006e942b9 100644 --- a/README +++ b/README @@ -85,6 +85,24 @@ Notes: in the configuration (e.g. conf/local.conf). + A/B updates with RAUC + This layer now contains one example of building an A/B update using RAUC. + Users are free to use/test this example, to optionally enable it, to build + their own update strategies based on this one, or to ignore it completely. + This example only works with + + INIT_MANAGER = "systemd" + + If you wish to use this example in your builds: + - enable 'systemd' as your init system + - add the meta-rauc layer to your build (with the corresponding branch) + - add 'rauc' to your DISTRO_FEATURES + - enable RK_RAUC_DEMO in your config + + If you wish to implement your own RAUC update without using the example from + this layer, perform the same steps as above except for the step enabling + RK_RAUC_DEMO. + U-Boot Environment: ------------------ In order to configure U-Boot to be able to store its environment into the diff --git a/classes-recipe/rk-rauc-demo-features-check.bbclass b/classes-recipe/rk-rauc-demo-features-check.bbclass new file mode 100644 index 000000000000..f6bc4ebffbc1 --- /dev/null +++ b/classes-recipe/rk-rauc-demo-features-check.bbclass @@ -0,0 +1,4 @@ +inherit features_check + +REQUIRED_DISTRO_FEATURES:append:rk-rauc-demo = " systemd rauc" +REQUIRED_MACHINE_FEATURES:append:rk-rauc-demo = " rk-u-boot-env" diff --git a/conf/layer.conf b/conf/layer.conf index 68205dd7ea4c..03914d2952e1 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -21,3 +21,7 @@ BBFILES_DYNAMIC += " \ qt5-layer:${LAYERDIR}/dynamic-layers/qt5-layer/*/*/*.bb \ qt5-layer:${LAYERDIR}/dynamic-layers/qt5-layer/*/*/*.bbappend \ " +BBFILES_DYNAMIC += " \ + rauc:${LAYERDIR}/dynamic-layers/rk-rauc-demo/*/*/*.bb \ + rauc:${LAYERDIR}/dynamic-layers/rk-rauc-demo/*/*/*.bbappend \ +" diff --git a/conf/machine/include/rockchip-rauc.inc b/conf/machine/include/rockchip-rauc.inc new file mode 100644 index 000000000000..a6f79503076b --- /dev/null +++ b/conf/machine/include/rockchip-rauc.inc @@ -0,0 +1,4 @@ +# 'RK_RAUC_DEMO' indicates the user wants to use the +# rauc demo configuration from this layer +OVERRIDES .= "${@ ':rk-rauc-demo' if bb.utils.to_boolean(d.getVar('RK_RAUC_DEMO'), False) else ''}" +IMAGE_INSTALL:append:rk-rauc-demo = " abd-partition" diff --git a/conf/machine/include/rockchip-wic.inc b/conf/machine/include/rockchip-wic.inc index ebfc0cb96507..0e0aa5d9b340 100644 --- a/conf/machine/include/rockchip-wic.inc +++ b/conf/machine/include/rockchip-wic.inc @@ -2,6 +2,7 @@ require conf/machine/include/rockchip-extlinux.inc require conf/machine/include/rockchip-rk-u-boot-env.inc +require conf/machine/include/rockchip-rauc.inc SPL_BINARY ?= "idbloader.img" @@ -9,6 +10,7 @@ SPL_BINARY ?= "idbloader.img" # WIC_COMPRESSION_EXTENSION = ".xz" WIC_COMPRESSION_EXTENSION ?= "" IMAGE_FSTYPES += "wic${WIC_COMPRESSION_EXTENSION} wic.bmap" +IMAGE_FSTYPES:append:rk-rauc-demo = " ext4" WKS_FILE ?= "rockchip.wks" WKS_FILE_DEPENDS ?= " \ e2fsprogs-native \ diff --git a/dynamic-layers/rk-rauc-demo/recipes-bsp/u-boot/files/boot.cmd.in b/dynamic-layers/rk-rauc-demo/recipes-bsp/u-boot/files/boot.cmd.in new file mode 100644 index 000000000000..0887d2b5b812 --- /dev/null +++ b/dynamic-layers/rk-rauc-demo/recipes-bsp/u-boot/files/boot.cmd.in @@ -0,0 +1,51 @@ +echo "devtype: ${devtype}" +echo "devnum: ${devnum}" +echo "distro_bootpart: ${distro_bootpart}" + +test -n "${BOOT_ORDER}" || env set BOOT_ORDER "A B" +test -n "${BOOT_A_LEFT}" || env set BOOT_A_LEFT 3 +test -n "${BOOT_B_LEFT}" || env set BOOT_B_LEFT 3 +test -n "${RAUC_BOOTDEV}" || env set RAUC_BOOTDEV "${devtype} ${devnum}:${distro_bootpart}" + +env set RAUC_BOOTPART +env set RAUC_SLOT + +echo "BOOT_ORDER: ${BOOT_ORDER}" +for RAUC_BOOTSLOT in "${BOOT_ORDER}"; do + if test "x${RAUC_BOOTPART}" != "x"; then + # skip remaining slots + elif test "x${RAUC_BOOTSLOT}" = "xA"; then + if test ${BOOT_A_LEFT} -gt 0; then + echo "using RAUC slot A" + setexpr BOOT_A_LEFT ${BOOT_A_LEFT} - 1 + env set RAUC_BOOTPART "PARTLABEL=rootfsA" + env set RAUC_SLOT "A" + env set RAUC_BOOTDEV "${devtype} ${devnum}:${distro_bootpart}" + echo "RAUC_BOOTDEV: ${RAUC_BOOTDEV}" + fi + elif test "x${RAUC_BOOTSLOT}" = "xB"; then + if test ${BOOT_B_LEFT} -gt 0; then + echo "using RAUC slot B" + setexpr BOOT_B_LEFT ${BOOT_B_LEFT} - 1 + env set RAUC_BOOTPART "PARTLABEL=rootfsB" + env set RAUC_SLOT "B" + setexpr BOOTPART1 ${distro_bootpart} + 1 + env set RAUC_BOOTDEV "${devtype} ${devnum}:${BOOTPART1}" + echo "RAUC_BOOTDEV: ${RAUC_BOOTDEV}" + fi + fi +done + +if test -n "${RAUC_BOOTPART}"; then + env set bootargs "${bootargsbase} root=${RAUC_BOOTPART} rauc.slot=${RAUC_SLOT}" + env save +else + echo "No valid RAUC slot found. Resetting tries to 3" + env set BOOT_A_LEFT 3 + env set BOOT_B_LEFT 3 + env save + reset +fi + +ext4load ${RAUC_BOOTDEV} ${kernel_addr_r} @@KERNEL_BOOTFILE@@ +bootm ${kernel_addr_r} diff --git a/dynamic-layers/rk-rauc-demo/recipes-bsp/u-boot/files/uboot-rauc.cfg b/dynamic-layers/rk-rauc-demo/recipes-bsp/u-boot/files/uboot-rauc.cfg new file mode 100644 index 000000000000..77b7164e0192 --- /dev/null +++ b/dynamic-layers/rk-rauc-demo/recipes-bsp/u-boot/files/uboot-rauc.cfg @@ -0,0 +1,8 @@ +CONFIG_CMD_BOOTDEV=y +CONFIG_CMD_BOOTMETH=y +CONFIG_CMD_SETEXPR=y +CONFIG_CMD_SETEXPR_FMT=y +CONFIG_BOOTSTD_DEFAULTS=n +CONFIG_BOOTMETH_EXTLINUX=n +CONFIG_BOOTMETH_EXTLINUX_PXE=n +CONFIG_BOOTMETH_VBE=n diff --git a/dynamic-layers/rk-rauc-demo/recipes-bsp/u-boot/u-boot_%.bbappend b/dynamic-layers/rk-rauc-demo/recipes-bsp/u-boot/u-boot_%.bbappend new file mode 100644 index 000000000000..7c77d595473d --- /dev/null +++ b/dynamic-layers/rk-rauc-demo/recipes-bsp/u-boot/u-boot_%.bbappend @@ -0,0 +1,26 @@ +inherit rk-rauc-demo-features-check + +FILESEXTRAPATHS:prepend:rk-rauc-demo := "${THISDIR}/files:" + +DEPENDS:append:rk-rauc-demo = " u-boot-mkimage-native" +SRC_URI:append:rk-rauc-demo = " \ + file://uboot-rauc.cfg \ + file://boot.cmd.in \ + " + +do_compile:append:rk-rauc-demo() { + # create boot script + sed -e 's|@@KERNEL_BOOTFILE@@|${UBOOT_EXTLINUX_KERNEL_IMAGE}|' \ + "${WORKDIR}/boot.cmd.in" > "${WORKDIR}/boot.cmd" + mkimage -A ${UBOOT_ARCH} -T script -C none -n "Boot script" -d "${WORKDIR}/boot.cmd" ${WORKDIR}/boot.scr + + # tweak environment + echo "bootmeths=script extlinux" >> ${B}/u-boot-initial-env + echo "bootargsbase=${UBOOT_EXTLINUX_KERNEL_ARGS} ${UBOOT_EXTLINUX_CONSOLE}" >> ${B}/u-boot-initial-env +} + +do_install:append:rk-rauc-demo() { + install -d ${D}/boot + install -m 0644 ${WORKDIR}/boot.scr ${D}/boot +} +FILES:${PN}-extlinux += "/boot/boot.scr" diff --git a/dynamic-layers/rk-rauc-demo/recipes-core/base-files/base-files_%.bbappend b/dynamic-layers/rk-rauc-demo/recipes-core/base-files/base-files_%.bbappend new file mode 100644 index 000000000000..705979a17c3e --- /dev/null +++ b/dynamic-layers/rk-rauc-demo/recipes-core/base-files/base-files_%.bbappend @@ -0,0 +1,2 @@ +inherit rk-rauc-demo-features-check +FILESEXTRAPATHS:prepend:rk-rauc-demo := "${THISDIR}/files:" diff --git a/dynamic-layers/rk-rauc-demo/recipes-core/base-files/files/fstab b/dynamic-layers/rk-rauc-demo/recipes-core/base-files/files/fstab new file mode 100644 index 000000000000..3be093e457e9 --- /dev/null +++ b/dynamic-layers/rk-rauc-demo/recipes-core/base-files/files/fstab @@ -0,0 +1,5 @@ +/dev/root / auto x-systemd.growfs 1 1 +proc /proc proc defaults 0 0 +devpts /dev/pts devpts mode=0620,ptmxmode=0666,gid=5 0 0 +tmpfs /run tmpfs mode=0755,nodev,nosuid,strictatime 0 0 +tmpfs /var/volatile tmpfs defaults 0 0 diff --git a/dynamic-layers/rk-rauc-demo/recipes-core/rauc-bundles/files/development-1.cert.pem b/dynamic-layers/rk-rauc-demo/recipes-core/rauc-bundles/files/development-1.cert.pem new file mode 100644 index 000000000000..92e71125d22f --- /dev/null +++ b/dynamic-layers/rk-rauc-demo/recipes-core/rauc-bundles/files/development-1.cert.pem @@ -0,0 +1,80 @@ +Certificate: + Data: + Version: 3 (0x2) + Serial Number: 2 (0x2) + Signature Algorithm: sha256WithRSAEncryption + Issuer: O=Test Org, CN=Test Org rauc CA Development + Validity + Not Before: Jan 1 00:00:00 1970 GMT + Not After : Dec 31 23:59:59 9999 GMT + Subject: O=Test Org, CN=Test Org Development-1 + Subject Public Key Info: + Public Key Algorithm: rsaEncryption + RSA Public-Key: (2048 bit) + Modulus: + 00:ac:2b:0f:05:02:d0:bb:b0:47:05:36:71:3c:20: + 0e:a7:76:8d:75:c1:23:5e:6c:7a:2d:94:ff:3c:17: + d8:0b:44:48:2a:82:03:92:c5:fd:33:76:0c:42:cf: + 4d:8a:c9:47:7f:af:52:7c:15:6c:3b:e7:60:d1:04: + 97:24:7b:07:1f:56:7d:6c:3f:31:e8:f9:36:7b:33: + 5b:cf:54:ea:37:98:a6:b1:9a:1d:da:96:a1:07:14: + 9c:15:80:4d:db:0c:03:86:ce:c7:3d:72:57:a2:da: + a0:c0:8c:b2:9a:a0:6a:e5:b8:5f:52:d2:f6:27:ca: + 48:f4:e3:86:eb:be:24:93:6a:af:60:68:7f:09:3b: + 81:96:ce:85:0c:63:93:d8:fa:91:dc:50:2e:77:bb: + bc:38:42:e9:86:d8:ac:33:dd:e6:d4:37:69:e3:01: + 8d:21:8f:a9:4a:7f:15:a5:aa:a9:be:fc:36:93:a4: + 10:0c:18:33:30:06:7f:1c:13:b3:a9:c6:57:d7:6b: + 96:45:15:e7:f5:8f:3d:48:e0:08:46:4f:7f:ef:14: + 77:95:25:25:9b:14:21:84:25:eb:37:0b:01:48:e6: + f5:c1:8b:61:c6:cb:8c:6b:a7:d8:d2:f9:31:e3:80: + 3f:78:ea:6a:41:6c:5d:4d:83:a6:54:0d:5b:c2:0e: + f6:ef + Exponent: 65537 (0x10001) + X509v3 extensions: + X509v3 Subject Key Identifier: + 89:4C:FE:8A:60:4D:C9:6D:F7:A8:C0:04:49:7F:AA:05:92:29:17:FB + X509v3 Authority Key Identifier: + keyid:44:0C:AF:4A:74:B4:C7:65:02:B2:95:F1:91:7C:A3:CC:E6:3E:99:E8 + DirName:/O=Test Org/CN=Test Org rauc CA Development + serial:01 + + X509v3 Basic Constraints: + CA:FALSE + Signature Algorithm: sha256WithRSAEncryption + 2c:d2:30:68:f5:84:52:1e:cf:ed:0d:fc:e7:02:69:0b:3b:f6: + c3:77:00:12:1d:2d:d0:8f:49:9e:5c:f1:00:7b:1d:4f:d5:a9: + 46:a5:df:54:90:50:b4:8f:8e:ba:4b:2d:82:74:eb:5b:a8:f5: + 45:7b:77:73:b1:9b:32:93:15:c0:5c:02:2a:ed:b0:1e:bb:d8: + 4e:41:17:20:af:04:46:21:20:7b:86:9f:32:ab:54:71:26:e8: + 0b:75:12:9c:63:53:4f:54:db:a7:f9:b2:fa:e9:ee:4a:9d:80: + ba:ae:3f:eb:ef:10:11:2d:4f:5a:34:fb:8b:45:10:63:0b:f8: + af:f3:8b:24:21:2a:e0:0b:44:38:44:b5:9d:6e:8a:ff:1f:bf: + 6e:44:21:22:ec:8a:8d:73:63:e5:df:1a:ec:2a:64:1f:97:f9: + 5c:3a:25:7f:03:80:4c:db:99:5e:f9:7d:2b:f1:d0:97:4d:95: + 6f:29:47:7b:3f:29:e3:96:25:b0:1c:f1:0b:8b:8b:ba:de:3b: + 3f:40:2e:bd:31:68:ea:a9:8f:dc:c9:09:22:df:76:69:08:5d: + 5d:a4:09:62:80:20:83:9e:bd:d4:a6:35:ee:97:50:66:39:62: + 66:1b:2e:75:f2:6d:e7:06:ae:67:5f:4b:63:5c:52:e7:5d:dd: + c9:0c:86:2b +-----BEGIN CERTIFICATE----- +MIIDfTCCAmWgAwIBAgIBAjANBgkqhkiG9w0BAQsFADA6MREwDwYDVQQKDAhUZXN0 +IE9yZzElMCMGA1UEAwwcVGVzdCBPcmcgcmF1YyBDQSBEZXZlbG9wbWVudDAgFw03 +MDAxMDEwMDAwMDBaGA85OTk5MTIzMTIzNTk1OVowNDERMA8GA1UECgwIVGVzdCBP +cmcxHzAdBgNVBAMMFlRlc3QgT3JnIERldmVsb3BtZW50LTEwggEiMA0GCSqGSIb3 +DQEBAQUAA4IBDwAwggEKAoIBAQCsKw8FAtC7sEcFNnE8IA6ndo11wSNebHotlP88 +F9gLREgqggOSxf0zdgxCz02KyUd/r1J8FWw752DRBJckewcfVn1sPzHo+TZ7M1vP +VOo3mKaxmh3alqEHFJwVgE3bDAOGzsc9clei2qDAjLKaoGrluF9S0vYnykj044br +viSTaq9gaH8JO4GWzoUMY5PY+pHcUC53u7w4QumG2Kwz3ebUN2njAY0hj6lKfxWl +qqm+/DaTpBAMGDMwBn8cE7OpxlfXa5ZFFef1jz1I4AhGT3/vFHeVJSWbFCGEJes3 +CwFI5vXBi2HGy4xrp9jS+THjgD946mpBbF1Ng6ZUDVvCDvbvAgMBAAGjgZEwgY4w +HQYDVR0OBBYEFIlM/opgTclt96jABEl/qgWSKRf7MGIGA1UdIwRbMFmAFEQMr0p0 +tMdlArKV8ZF8o8zmPpnooT6kPDA6MREwDwYDVQQKDAhUZXN0IE9yZzElMCMGA1UE +AwwcVGVzdCBPcmcgcmF1YyBDQSBEZXZlbG9wbWVudIIBATAJBgNVHRMEAjAAMA0G +CSqGSIb3DQEBCwUAA4IBAQAs0jBo9YRSHs/tDfznAmkLO/bDdwASHS3Qj0meXPEA +ex1P1alGpd9UkFC0j466Sy2CdOtbqPVFe3dzsZsykxXAXAIq7bAeu9hOQRcgrwRG +ISB7hp8yq1RxJugLdRKcY1NPVNun+bL66e5KnYC6rj/r7xARLU9aNPuLRRBjC/iv +84skISrgC0Q4RLWdbor/H79uRCEi7IqNc2Pl3xrsKmQfl/lcOiV/A4BM25le+X0r +8dCXTZVvKUd7PynjliWwHPELi4u63js/QC69MWjqqY/cyQki33ZpCF1dpAligCCD +nr3UpjXul1BmOWJmGy518m3nBq5nX0tjXFLnXd3JDIYr +-----END CERTIFICATE----- diff --git a/dynamic-layers/rk-rauc-demo/recipes-core/rauc-bundles/files/development-1.key.pem b/dynamic-layers/rk-rauc-demo/recipes-core/rauc-bundles/files/development-1.key.pem new file mode 100644 index 000000000000..80305f8291b1 --- /dev/null +++ b/dynamic-layers/rk-rauc-demo/recipes-core/rauc-bundles/files/development-1.key.pem @@ -0,0 +1,28 @@ +-----BEGIN PRIVATE KEY----- +MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCsKw8FAtC7sEcF +NnE8IA6ndo11wSNebHotlP88F9gLREgqggOSxf0zdgxCz02KyUd/r1J8FWw752DR +BJckewcfVn1sPzHo+TZ7M1vPVOo3mKaxmh3alqEHFJwVgE3bDAOGzsc9clei2qDA +jLKaoGrluF9S0vYnykj044brviSTaq9gaH8JO4GWzoUMY5PY+pHcUC53u7w4QumG +2Kwz3ebUN2njAY0hj6lKfxWlqqm+/DaTpBAMGDMwBn8cE7OpxlfXa5ZFFef1jz1I +4AhGT3/vFHeVJSWbFCGEJes3CwFI5vXBi2HGy4xrp9jS+THjgD946mpBbF1Ng6ZU +DVvCDvbvAgMBAAECggEASphBYq9sltVyf/ytpRpSnxYLhmiPFXs0mIlE6Nl/3qnQ +BrLcL3yfDuvntg6xjx9UXistNtvlUDMYzJcLkV/InzhPEVZ0HnfTth9zeOpWrI30 +M2EN7EZ1MGcqlVpI4U5cPM1cn+/proLBQYv0WnCEwFFY477JrkXDxG7MZ1mz6TaL +IGcCCIUu1BxECngQ344eaKrSR5F2MtlxAl19Pt5QSPfmuMdmElrK6RtBjnKrDu1K +fe6DCfObZ3nbG2fhFV4uTxhlTC9lUmfTQMKR79rLmHNKnbMx74kFNvy3XlT2l35I +ZVfRMLPWph7yMom9v/Im3Q70uhJ1lxyqbbl/DFZVmQKBgQDVo19SqR/QeDIxPIPn +XvVWzo5ml3KO/dVxA8sok6twr+G7yUeIUnuauYFA/tX/FS32azFRa/7GjUfoTx3q +GHK43TBCMyEt0we6WwZb+FkWa/b/RBoyD/audrpmgDDi1+fXPs8bBvoO8/oju20D +I6wOjSovcIMaeLo/+u3U6ShNQwKBgQDOTpoGMsQzXchZfDmxL61h3j4Gtjrl4BpU +WhAkJ9U2BRpL8NSZLErn5ik8MwgK2ut+YdU7aogI0D6Gc+4zZoJDEbhhmPD9cprv +LMyfAKoisR01OyU57mMSGQq0dfjmK6PfYJdX5sQJGkMFptNAJLTDoYtmXItSICoY +1j5KTvwe5QKBgGytxmErjfakHoxzh3pdERuOylwgMPPS5xCt6FyE+pLBtmisFQqh +QyXLtpgUy1IPOSmBED6mXJ4u4uSn0sTymPG3+8PBdOB12RmREqQYq2E/nQ/wWg8b +ldbcqShZkATl5pfV6M+L9gtDS/1/bA5LyExCvbISX29I+R5xDSnhTlI3AoGBAJRK +VVXtOa/+UhtYOpPMxGCbgZQLemxvWB2XmxCR/SRWKJ+7XOU4vCLSAoO93qMG1szB +/6Y0ndFP9hFo1SfnH+ybmR+18ksLDKisV+xWavSCwI7Zk5l/a4C/tT0fqyeu6JyQ +bliFjBVK5i/yyNfLSo9v16ZdENuYOQofPSjmezytAoGBALhwvtzgqvqGSXID2w5N +ullK8ny3WRa1o5DLXuMV19CvknmrN/zmmjQLblKkdp9VBb7uo8czon+qL1ZZyywC +W2BmHfGMPUyQHux4btsdJhlWcS7z7aYXM9QWiKlI+EKLHLILYk+LPIEf85sUcOZV +eCBpViT7fv2iv/0L+mzjWtLA +-----END PRIVATE KEY----- diff --git a/dynamic-layers/rk-rauc-demo/recipes-core/rauc-bundles/rockchip-rauc-bundle.bb b/dynamic-layers/rk-rauc-demo/recipes-core/rauc-bundles/rockchip-rauc-bundle.bb new file mode 100644 index 000000000000..5a42f59b821e --- /dev/null +++ b/dynamic-layers/rk-rauc-demo/recipes-core/rauc-bundles/rockchip-rauc-bundle.bb @@ -0,0 +1,14 @@ +DESCRIPTION = "Rockchip RAUC bundle generator" + +inherit bundle + +RAUC_BUNDLE_COMPATIBLE = "${MACHINE}" +RAUC_BUNDLE_VERSION = "v20240512" +RAUC_BUNDLE_DESCRIPTION = "RAUC Demo Bundle" +RAUC_BUNDLE_FORMAT = "verity" +RAUC_BUNDLE_SLOTS = "rootfs" +RAUC_SLOT_rootfs = "core-image-base" +RAUC_SLOT_rootfs[fstype] = "ext4" + +RAUC_KEY_FILE := "${THISDIR}/files/development-1.key.pem" +RAUC_CERT_FILE := "${THISDIR}/files/development-1.cert.pem" diff --git a/dynamic-layers/rk-rauc-demo/recipes-core/rauc/files/ca.cert.pem b/dynamic-layers/rk-rauc-demo/recipes-core/rauc/files/ca.cert.pem new file mode 100644 index 000000000000..46944a99df22 --- /dev/null +++ b/dynamic-layers/rk-rauc-demo/recipes-core/rauc/files/ca.cert.pem @@ -0,0 +1,80 @@ +Certificate: + Data: + Version: 3 (0x2) + Serial Number: 1 (0x1) + Signature Algorithm: sha256WithRSAEncryption + Issuer: O=Test Org, CN=Test Org rauc CA Development + Validity + Not Before: Jan 1 00:00:00 1970 GMT + Not After : Dec 31 23:59:59 9999 GMT + Subject: O=Test Org, CN=Test Org rauc CA Development + Subject Public Key Info: + Public Key Algorithm: rsaEncryption + RSA Public-Key: (2048 bit) + Modulus: + 00:c0:fe:7b:6c:c3:e3:47:cc:d4:15:e1:0c:b2:1c: + c9:f7:61:3e:42:d7:f1:a4:30:f2:db:0e:49:95:49: + 70:ee:97:6d:fe:48:5d:b9:22:63:47:e0:be:63:d7: + 68:9b:38:04:7d:7f:d9:65:ef:1d:6c:26:cb:05:7f: + 59:45:15:9d:76:59:c4:8d:59:a0:38:a0:25:fa:86: + 1b:f4:85:ff:cf:7c:c7:57:a3:7e:56:71:7d:69:c3: + 69:a7:fb:e6:8e:bc:f9:49:e2:f5:9a:97:e5:2d:75: + ef:f9:76:29:5f:76:11:1b:70:6f:4d:26:4f:e0:06: + 9b:8c:e3:76:91:81:4a:4e:98:5d:2e:f4:bd:23:4d: + e7:5d:9b:ea:68:4d:03:9e:35:90:c5:f2:8d:ae:ed: + 44:4f:f3:50:dc:2b:ef:ae:44:35:79:78:3d:65:4b: + d9:16:98:aa:be:08:47:25:af:68:1c:0b:8e:c1:aa: + 02:a7:61:4f:4d:15:1b:07:3c:4e:60:b3:9a:d5:c1: + 39:34:4e:8e:e7:93:46:f1:75:95:aa:16:9a:1d:e6: + 49:15:a5:ae:06:8a:45:16:a9:af:59:60:9b:c6:6d: + 3d:19:57:5d:de:31:d5:dc:96:0e:a4:25:fe:7a:07: + 71:c5:40:c0:a3:d0:d5:84:47:14:7a:5a:f1:07:75: + 79:35 + Exponent: 65537 (0x10001) + X509v3 extensions: + X509v3 Subject Key Identifier: + 44:0C:AF:4A:74:B4:C7:65:02:B2:95:F1:91:7C:A3:CC:E6:3E:99:E8 + X509v3 Authority Key Identifier: + keyid:44:0C:AF:4A:74:B4:C7:65:02:B2:95:F1:91:7C:A3:CC:E6:3E:99:E8 + DirName:/O=Test Org/CN=Test Org rauc CA Development + serial:01 + + X509v3 Basic Constraints: + CA:TRUE + Signature Algorithm: sha256WithRSAEncryption + 30:07:51:4d:d6:2c:0c:2f:3e:6c:5c:34:1f:07:21:8d:50:77: + 9a:a6:81:75:62:f0:fe:ff:3b:5b:d0:7c:d1:45:e7:e2:67:d4: + 23:cb:af:9a:8b:f4:2b:d2:33:3d:45:bb:a7:7d:b4:9b:41:db: + fb:62:ac:83:fc:41:ae:e5:dc:2d:df:7d:72:7e:df:34:01:60: + 94:7f:15:78:84:87:f0:23:e4:8e:b8:dc:71:cb:84:4b:25:bb: + 62:8f:fd:7f:d3:3c:1d:85:45:fb:03:7c:a2:bc:c4:a8:fa:2b: + ec:79:67:8d:f4:5f:37:a8:5a:54:bc:b3:78:11:0b:8b:29:90: + 8b:48:4a:d7:87:93:96:97:72:10:1d:70:29:f8:e4:c3:81:6d: + 7d:c3:6e:d4:c8:1b:0b:0d:f9:c0:b9:7b:11:54:e2:af:8b:a0: + 45:de:c2:67:81:8c:0c:9d:ba:a1:31:8b:f2:cc:da:c7:cc:6d: + 21:92:2a:57:29:9c:48:92:75:d9:1a:6e:d3:ee:53:66:83:2e: + 08:74:09:5d:78:13:99:34:7d:16:8c:ba:29:75:80:20:8b:ca: + 91:19:29:64:ef:64:37:de:5b:22:18:99:5b:63:69:9a:a2:44: + 21:70:30:41:f2:58:27:ab:4f:5c:d0:e1:94:5d:d1:5b:8d:fd: + bf:8f:a9:99 +-----BEGIN CERTIFICATE----- +MIIDhjCCAm6gAwIBAgIBATANBgkqhkiG9w0BAQsFADA6MREwDwYDVQQKDAhUZXN0 +IE9yZzElMCMGA1UEAwwcVGVzdCBPcmcgcmF1YyBDQSBEZXZlbG9wbWVudDAgFw03 +MDAxMDEwMDAwMDBaGA85OTk5MTIzMTIzNTk1OVowOjERMA8GA1UECgwIVGVzdCBP +cmcxJTAjBgNVBAMMHFRlc3QgT3JnIHJhdWMgQ0EgRGV2ZWxvcG1lbnQwggEiMA0G +CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDA/ntsw+NHzNQV4QyyHMn3YT5C1/Gk +MPLbDkmVSXDul23+SF25ImNH4L5j12ibOAR9f9ll7x1sJssFf1lFFZ12WcSNWaA4 +oCX6hhv0hf/PfMdXo35WcX1pw2mn++aOvPlJ4vWal+Utde/5dilfdhEbcG9NJk/g +BpuM43aRgUpOmF0u9L0jTeddm+poTQOeNZDF8o2u7URP81DcK++uRDV5eD1lS9kW +mKq+CEclr2gcC47BqgKnYU9NFRsHPE5gs5rVwTk0To7nk0bxdZWqFpod5kkVpa4G +ikUWqa9ZYJvGbT0ZV13eMdXclg6kJf56B3HFQMCj0NWERxR6WvEHdXk1AgMBAAGj +gZQwgZEwHQYDVR0OBBYEFEQMr0p0tMdlArKV8ZF8o8zmPpnoMGIGA1UdIwRbMFmA +FEQMr0p0tMdlArKV8ZF8o8zmPpnooT6kPDA6MREwDwYDVQQKDAhUZXN0IE9yZzEl +MCMGA1UEAwwcVGVzdCBPcmcgcmF1YyBDQSBEZXZlbG9wbWVudIIBATAMBgNVHRME +BTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQAwB1FN1iwMLz5sXDQfByGNUHeapoF1 +YvD+/ztb0HzRRefiZ9Qjy6+ai/Qr0jM9RbunfbSbQdv7YqyD/EGu5dwt331yft80 +AWCUfxV4hIfwI+SOuNxxy4RLJbtij/1/0zwdhUX7A3yivMSo+ivseWeN9F83qFpU +vLN4EQuLKZCLSErXh5OWl3IQHXAp+OTDgW19w27UyBsLDfnAuXsRVOKvi6BF3sJn +gYwMnbqhMYvyzNrHzG0hkipXKZxIknXZGm7T7lNmgy4IdAldeBOZNH0WjLopdYAg +i8qRGSlk72Q33lsiGJlbY2maokQhcDBB8lgnq09c0OGUXdFbjf2/j6mZ +-----END CERTIFICATE----- diff --git a/dynamic-layers/rk-rauc-demo/recipes-core/rauc/files/system.conf b/dynamic-layers/rk-rauc-demo/recipes-core/rauc/files/system.conf new file mode 100644 index 000000000000..4945c67345c4 --- /dev/null +++ b/dynamic-layers/rk-rauc-demo/recipes-core/rauc/files/system.conf @@ -0,0 +1,17 @@ +[system] +compatible=@MACHINE@ +bootloader=uboot +data-directory=/data/ + +[keyring] +path=/etc/rauc/ca.cert.pem + +[slot.rootfs.0] +device=/dev/disk/by-partlabel/rootfsA +type=ext4 +bootname=A + +[slot.rootfs.1] +device=/dev/disk/by-partlabel/rootfsB +type=ext4 +bootname=B diff --git a/dynamic-layers/rk-rauc-demo/recipes-core/rauc/rauc-conf.bbappend b/dynamic-layers/rk-rauc-demo/recipes-core/rauc/rauc-conf.bbappend new file mode 100644 index 000000000000..5ff9de681f6c --- /dev/null +++ b/dynamic-layers/rk-rauc-demo/recipes-core/rauc/rauc-conf.bbappend @@ -0,0 +1,7 @@ +inherit rk-rauc-demo-features-check + +FILESEXTRAPATHS:prepend:rk-rauc-demo := "${THISDIR}/files:" + +do_install:prepend:rk-rauc-demo() { + sed -ie 's!@MACHINE@!${MACHINE}!g' ${WORKDIR}/system.conf +} diff --git a/dynamic-layers/rk-rauc-demo/recipes-core/systemd/abd-partition.bb b/dynamic-layers/rk-rauc-demo/recipes-core/systemd/abd-partition.bb new file mode 100644 index 000000000000..35037e9408de --- /dev/null +++ b/dynamic-layers/rk-rauc-demo/recipes-core/systemd/abd-partition.bb @@ -0,0 +1,26 @@ +SUMMARY = "A/B+D partition definition for systemd's repart mechanism" +LICENSE = "OSL-3.0" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/OSL-3.0;md5=438ec6d864bbb958a49df939a56511cf" + +inherit rk-rauc-demo-features-check systemd + +SYSTEMD_SERVICE:${PN} = "data.mount" + +S = "${WORKDIR}" + +SRC_URI = " \ + file://data.mount \ + file://25-rootfsA.conf \ + file://35-rootfsB.conf \ + file://45-data.conf \ + " + +do_install() { + install -d ${D}${sysconfdir}/repart.d/ + install -m 0644 ${WORKDIR}/25-rootfsA.conf ${D}${sysconfdir}/repart.d/ + install -m 0644 ${WORKDIR}/35-rootfsB.conf ${D}${sysconfdir}/repart.d/ + install -m 0644 ${WORKDIR}/45-data.conf ${D}${sysconfdir}/repart.d/ + + install -d ${D}${sysconfdir}/systemd/system + install -m 0644 ${WORKDIR}/data.mount ${D}${sysconfdir}/systemd/system/ +} diff --git a/dynamic-layers/rk-rauc-demo/recipes-core/systemd/files/25-rootfsA.conf b/dynamic-layers/rk-rauc-demo/recipes-core/systemd/files/25-rootfsA.conf new file mode 100644 index 000000000000..dba01e1ff863 --- /dev/null +++ b/dynamic-layers/rk-rauc-demo/recipes-core/systemd/files/25-rootfsA.conf @@ -0,0 +1,4 @@ +[Partition] +Type=root +Weight=250 +SizeMaxBytes=5G diff --git a/dynamic-layers/rk-rauc-demo/recipes-core/systemd/files/35-rootfsB.conf b/dynamic-layers/rk-rauc-demo/recipes-core/systemd/files/35-rootfsB.conf new file mode 100644 index 000000000000..31a7c06c17ff --- /dev/null +++ b/dynamic-layers/rk-rauc-demo/recipes-core/systemd/files/35-rootfsB.conf @@ -0,0 +1,7 @@ +[Partition] +Type=root +Label=rootfsB +Weight=250 +SizeMaxBytes=5G +Format=ext4 +GrowFileSystem=yes diff --git a/dynamic-layers/rk-rauc-demo/recipes-core/systemd/files/45-data.conf b/dynamic-layers/rk-rauc-demo/recipes-core/systemd/files/45-data.conf new file mode 100644 index 000000000000..1aac59addc26 --- /dev/null +++ b/dynamic-layers/rk-rauc-demo/recipes-core/systemd/files/45-data.conf @@ -0,0 +1,6 @@ +[Partition] +Type=root-secondary +Label=data +Weight=500 +Format=ext4 +GrowFileSystem=yes diff --git a/dynamic-layers/rk-rauc-demo/recipes-core/systemd/files/data.mount b/dynamic-layers/rk-rauc-demo/recipes-core/systemd/files/data.mount new file mode 100644 index 000000000000..c81a55be1d1a --- /dev/null +++ b/dynamic-layers/rk-rauc-demo/recipes-core/systemd/files/data.mount @@ -0,0 +1,10 @@ +[Unit] +Description=data partition + +[Mount] +What=/dev/disk/by-partlabel/data +Where=/data +Type=ext4 + +[Install] +WantedBy=multi-user.target diff --git a/dynamic-layers/rk-rauc-demo/recipes-core/systemd/systemd_%.bbappend b/dynamic-layers/rk-rauc-demo/recipes-core/systemd/systemd_%.bbappend new file mode 100644 index 000000000000..cf6c188277db --- /dev/null +++ b/dynamic-layers/rk-rauc-demo/recipes-core/systemd/systemd_%.bbappend @@ -0,0 +1,3 @@ +inherit rk-rauc-demo-features-check + +PACKAGECONFIG:append:rk-rauc-demo = " repart openssl" diff --git a/dynamic-layers/rk-rauc-demo/recipes-kernel/linux/linux-torvalds-next_%.bbappend b/dynamic-layers/rk-rauc-demo/recipes-kernel/linux/linux-torvalds-next_%.bbappend new file mode 100644 index 000000000000..1a51380f0db1 --- /dev/null +++ b/dynamic-layers/rk-rauc-demo/recipes-kernel/linux/linux-torvalds-next_%.bbappend @@ -0,0 +1 @@ +require ${@ 'recipes-kernel/linux/linux-yocto_rauc.inc' if bb.utils.to_boolean(d.getVar('RK_RAUC_DEMO'), False) else ''} From patchwork Mon Sep 9 14:55:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trevor Woerner X-Patchwork-Id: 48855 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 EABE4ECE579 for ; Mon, 9 Sep 2024 14:56:04 +0000 (UTC) Received: from mail-ot1-f54.google.com (mail-ot1-f54.google.com [209.85.210.54]) by mx.groups.io with SMTP id smtpd.web10.55095.1725893761764224392 for ; Mon, 09 Sep 2024 07:56:01 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=WvWl2SLg; spf=pass (domain: gmail.com, ip: 209.85.210.54, mailfrom: twoerner@gmail.com) Received: by mail-ot1-f54.google.com with SMTP id 46e09a7af769-710daaadd9bso700880a34.2 for ; Mon, 09 Sep 2024 07:56:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1725893760; x=1726498560; darn=lists.yoctoproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=r9FklKfJXoFE3ZTBwXHiyMcSbF1pYZIhhqlDXbUPtWg=; b=WvWl2SLgcuzGqui2sMUbm8QndSvyc4xY3voHdAStb+npm5yndp7R6UJgvlN7L/GXTc n3ljgAi78BCgfLiSc878Llu3Rl7kKQ+mfJ1WawUgUQbXTsfBQjLID4pRnDzg6sS69IyW JxHbTbYOo93ZxhrTrrfRpP1RTctgkapdrau8+lOfAN9HlaDD2By9bdTpJ/LveBtlBdrL E1oK82nxRy4Z8vn3WgGac8Yp28Pjn27pBDlmFrbjSSluMGEXVtXIazeUTvJFNklubpNY 9eeZjHcEPxbv71mtefhnsmIJ4RimYmNYBCkLS3oMqnd4b3J+mrmg9RO4gZCjM5FQMdfS 0zyQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725893760; x=1726498560; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=r9FklKfJXoFE3ZTBwXHiyMcSbF1pYZIhhqlDXbUPtWg=; b=cE6iRUDMDP+MCpgHD2xivXin03ne6pPYVvDepVcxuG1ycvWZwEvi032tm6mmknqOLO LnngXNcjQIEqPj6vIjiuqEwZp6W+kLCTSAdV2WOLLIg3HTfLM9tR+GtpNNaRaH2+JdpI XAX0B/MQLj5Q7OA1c4EzvUfDOhpyyF06xJiLoUnLQvZpuNnAIyMTKGqGP+ERrwG1KHGN cEe0nmWiLm1J1YhPaWndyPQ+Huqve/94zrBkWOSJqkuUjmKIURnDh7iCYLogBMHBmpFG 93rhp/i0c0eG2Pq0om+GsUcIt0Y/VGBeDxc9hJaRdQizGk5WTI6LQIdrfCz99NmVDoOJ wS7g== X-Gm-Message-State: AOJu0YxQJu7KtUk1BxsnxEfShertwcY5GCJezakMd8VJCRcsCSsMGOPC Oj1uETdET8Wo+pLMOSjGPgNXYPZXr0tGflp/WYl7ECv6cYtvnESfrlKD9pr/ X-Google-Smtp-Source: AGHT+IFzzHg41NyPDWzpuD9Fod8mKL4PdGjx8nEVrTN8sH8RuR9rAnZ/gIZRdg7MqMmlJiWyIW6J0g== X-Received: by 2002:a05:6830:2b11:b0:703:5fbe:e0ca with SMTP id 46e09a7af769-710d838ac0fmr4509563a34.4.1725893760188; Mon, 09 Sep 2024 07:56:00 -0700 (PDT) Received: from localhost.localdomain (pppoe-209-91-167-254.vianet.ca. [209.91.167.254]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-45822e772a2sm21050231cf.27.2024.09.09.07.55.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Sep 2024 07:55:59 -0700 (PDT) From: Trevor Woerner To: yocto-patches@lists.yoctoproject.org Cc: Quentin Schulz Subject: [meta-rockchip][scarthgap][PATCH 09/10] enable HW VPU decoding for SoCs that have stateless VPUs Date: Mon, 9 Sep 2024 10:55:29 -0400 Message-ID: <20240909145530.25301-10-twoerner@gmail.com> X-Mailer: git-send-email 2.44.0.501.g19981daefd7c In-Reply-To: <20240909145530.25301-1-twoerner@gmail.com> References: <20240909145530.25301-1-twoerner@gmail.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 ; Mon, 09 Sep 2024 14:56:04 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto-patches/message/635 From: Quentin Schulz v4l2codecs is the gstreamer plugin for V4L2 stateless video hardware decoding. The Rockchip SoCs that have a VPU all seems to be based on Hantro, RKVDEC or RKVDECv2, all stateless encoding/decoding VPUs. Therefore, let's enable VPU decoding in Gstreamer whenever possible, when the SoC supports it. PX30, RK3066, RK3188, RK3288, RK3328, RK3399, RK356x and RK3588(s) all have at least one Hantro VPU. RK3328, RK3399, RK356x and RK3588(s) all have at least one RKVDEC/RKVDECv2 VPU (though not necessarily supported in the upstream kernel just yet). === PX30 Tested on PX30 Ringneck with with Haikou+Haikou Video Demo adapter: $ gst-launch-1.0 filesrc location=$FILE ! parsebin ! v4l2slh264dec ! waylandsink with FILE storing the path to any h264 file, e.g. https://download.blender.org/peach/bigbuckbunny_movies/big_buck_bunny_720p_h264.mov https://download.blender.org/peach/bigbuckbunny_movies/big_buck_bunny_1080p_h264.mov Needed packages are: - weston - gstreamer1.0-plugins-bad (for waylandsink and v4l2slh264dec) - gstreamer1.0-plugins-base (for parsebin) A few frames are dropped every other second for 1080p but otherwise smooth. === RK3399 Tested on RK3399 Puma with Haikou: $ gst-launch-1.0 filesrc location=$FILE ! parsebin ! v4l2slh264dec ! waylandsink with FILE storing the path to any h264 file, e.g. https://download.blender.org/peach/bigbuckbunny_movies/big_buck_bunny_1080p_h264.mov https://download.blender.org/demo/movies/BBB/bbb_sunflower_2160p_30fps_normal.mp4.zip Needed packages are: - weston - gstreamer1.0-plugins-bad (for waylandsink and v4l2codecs) - gstreamer1.0-plugins-base (for parsebin) === RK3588 Tested on a RK3588 Tiger with Haikou+Haikou Video Demo adapter - on a downstream v6.6 (upstream-based, not Rockchip BSP-based) with DSI patches - : $ gst-launch-1.0 filesrc location=$FILE ! parsebin ! v4l2slav1dec ! fakesink with FILE storing the path to any AV1 file, e.g. http://download.opencontent.netflix.com.s3.amazonaws.com/AV1/cmaf/spark-8b-59.94fps/spark_606kbps_432p.mp4 https://woolyss.com/f/av1-nosound-chimera.mp4 https://woolyss.com/f/av1-opus-sita.webm Needed packages are: - gstreamer1.0-plugins-bad (for fakesink and v4l2slav1dec) - gstreamer1.0-plugins-base (for parsebin) For some reason though, waylandsink is very choppy. Combining fpsdisplaysink with fakesink shows a ~60fps when decoding the 432p file, ~24fps for the two others. Note that 10b-depth isn't supported (at least in my setup). Reviewed-by: Trevor Woerner Signed-off-by: Quentin Schulz --- README | 22 +++++++++++++++++++ conf/machine/include/px30.inc | 2 ++ conf/machine/include/rk3066.inc | 2 ++ conf/machine/include/rk3188.inc | 2 ++ conf/machine/include/rk3288.inc | 2 ++ conf/machine/include/rk3328.inc | 2 ++ conf/machine/include/rk3399.inc | 2 ++ conf/machine/include/rk3566.inc | 2 ++ conf/machine/include/rk3568.inc | 2 ++ conf/machine/include/rk3588s.inc | 2 ++ .../gstreamer1.0-plugins-bad_%.bbappend | 1 + 11 files changed, 41 insertions(+) create mode 100644 recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_%.bbappend diff --git a/README b/README index 8ff006e942b9..09f8691300f4 100644 --- a/README +++ b/README @@ -103,6 +103,28 @@ Notes: this layer, perform the same steps as above except for the step enabling RK_RAUC_DEMO. + HW video decoding with gstreamer + + Most Rockchip SoCs have some integrated VPU, either Hantro, RKVDEC or + RKVDECv2. Those are called stateless VPUs and they require tools to be + adapted so they can be used. Upstream ffmpeg doesn't support them (yet) + but gstreamer does, via the v4l2sl* plugins. However, by default those + aren't built in OE-Core. This layer enables these plugins by default for + all SoCs that have at least one VPU (at the time of writing, all SoCs + supported by this layer to the exception of RK3308). + + If you wish to NOT build those plugins anymore, you can set + + ENABLE_STATELESS_VPU_GST = "0" + + in any appropriate conf file (or in a + gstreamer1.0-plugins-bad_%.bbappend in your own layer). + + Note that this is only relevant for upstream-based Linux kernels as + Rockchip have developed their own ABI for their own kernel that isn't + compatible (see Rockchip Media Process Platform (MPP) and + downstream gstreamer-rockchip plugin for those kernels). + U-Boot Environment: ------------------ In order to configure U-Boot to be able to store its environment into the diff --git a/conf/machine/include/px30.inc b/conf/machine/include/px30.inc index d78409ee5c7e..8173cb19be2c 100644 --- a/conf/machine/include/px30.inc +++ b/conf/machine/include/px30.inc @@ -19,3 +19,5 @@ TFA_BUILD_TARGET = "bl31" UBOOT_SUFFIX ?= "itb" UBOOT_ENTRYPOINT ?= "0x06000000" + +ENABLE_STATELESS_VPU_GST ?= "1" diff --git a/conf/machine/include/rk3066.inc b/conf/machine/include/rk3066.inc index 026d5b556db7..a898309bbf88 100644 --- a/conf/machine/include/rk3066.inc +++ b/conf/machine/include/rk3066.inc @@ -12,3 +12,5 @@ SERIAL_CONSOLES = "115200;ttyS2" KBUILD_DEFCONFIG = "multi_v7_defconfig" KERNEL_FEATURES:append:rk3066 = " bsp/rockchip/remove-non-rockchip-arch-arm.scc" KERNEL_IMAGETYPE ?= "zImage" + +ENABLE_STATELESS_VPU_GST ?= "1" diff --git a/conf/machine/include/rk3188.inc b/conf/machine/include/rk3188.inc index 0120e2fd585f..554d4f1c904d 100644 --- a/conf/machine/include/rk3188.inc +++ b/conf/machine/include/rk3188.inc @@ -12,3 +12,5 @@ SERIAL_CONSOLES = "115200;ttyFIQ0" KBUILD_DEFCONFIG = "multi_v7_defconfig" KERNEL_FEATURES:append:rk3188 = " bsp/rockchip/remove-non-rockchip-arch-arm.scc" KERNEL_IMAGETYPE ?= "zImage" + +ENABLE_STATELESS_VPU_GST ?= "1" diff --git a/conf/machine/include/rk3288.inc b/conf/machine/include/rk3288.inc index 684e8645d176..06fda69a3eb7 100644 --- a/conf/machine/include/rk3288.inc +++ b/conf/machine/include/rk3288.inc @@ -14,3 +14,5 @@ KERNEL_FEATURES:append:rk3288 = " bsp/rockchip/remove-non-rockchip-arch-arm.scc" KERNEL_IMAGETYPE ?= "zImage" UBOOT_SUFFIX ?= "bin" + +ENABLE_STATELESS_VPU_GST ?= "1" diff --git a/conf/machine/include/rk3328.inc b/conf/machine/include/rk3328.inc index 4ecd6814f9ba..e6f810dcd2ca 100644 --- a/conf/machine/include/rk3328.inc +++ b/conf/machine/include/rk3328.inc @@ -20,3 +20,5 @@ TFA_BUILD_TARGET = "bl31" UBOOT_SUFFIX ?= "itb" UBOOT_ENTRYPOINT ?= "0x06000000" + +ENABLE_STATELESS_VPU_GST ?= "1" diff --git a/conf/machine/include/rk3399.inc b/conf/machine/include/rk3399.inc index 47f0560d1578..cd1be49064ed 100644 --- a/conf/machine/include/rk3399.inc +++ b/conf/machine/include/rk3399.inc @@ -20,3 +20,5 @@ TFA_BUILD_TARGET = "bl31" UBOOT_SUFFIX ?= "itb" UBOOT_ENTRYPOINT ?= "0x06000000" + +ENABLE_STATELESS_VPU_GST ?= "1" diff --git a/conf/machine/include/rk3566.inc b/conf/machine/include/rk3566.inc index 586d68806df6..2522851fa392 100644 --- a/conf/machine/include/rk3566.inc +++ b/conf/machine/include/rk3566.inc @@ -19,3 +19,5 @@ PREFERRED_PROVIDER_optee-os = "rockchip-rkbin" UBOOT_SUFFIX ?= "itb" UBOOT_ENTRYPOINT ?= "0x06000000" + +ENABLE_STATELESS_VPU_GST ?= "1" diff --git a/conf/machine/include/rk3568.inc b/conf/machine/include/rk3568.inc index 1da212a1530c..db188a311297 100644 --- a/conf/machine/include/rk3568.inc +++ b/conf/machine/include/rk3568.inc @@ -19,3 +19,5 @@ PREFERRED_PROVIDER_optee-os = "rockchip-rkbin" UBOOT_SUFFIX ?= "itb" UBOOT_ENTRYPOINT ?= "0x06000000" + +ENABLE_STATELESS_VPU_GST ?= "1" diff --git a/conf/machine/include/rk3588s.inc b/conf/machine/include/rk3588s.inc index cd84461dab41..d349108fb973 100644 --- a/conf/machine/include/rk3588s.inc +++ b/conf/machine/include/rk3588s.inc @@ -18,3 +18,5 @@ PREFERRED_PROVIDER_optee-os = "rockchip-rkbin" UBOOT_SUFFIX ?= "itb" UBOOT_ENTRYPOINT ?= "0x06000000" + +ENABLE_STATELESS_VPU_GST ?= "1" diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_%.bbappend b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_%.bbappend new file mode 100644 index 000000000000..276230411e9c --- /dev/null +++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_%.bbappend @@ -0,0 +1 @@ +PACKAGECONFIG:append:rockchip = "${@' v4l2codecs' if bb.utils.to_boolean(d.getVar('ENABLE_STATELESS_VPU_GST'), False) else ''}" From patchwork Mon Sep 9 14:55:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trevor Woerner X-Patchwork-Id: 48852 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 DF7C8ECE57E for ; Mon, 9 Sep 2024 14:56:04 +0000 (UTC) Received: from mail-qt1-f176.google.com (mail-qt1-f176.google.com [209.85.160.176]) by mx.groups.io with SMTP id smtpd.web10.55098.1725893764479184786 for ; Mon, 09 Sep 2024 07:56:04 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=RcGSRoNj; spf=pass (domain: gmail.com, ip: 209.85.160.176, mailfrom: twoerner@gmail.com) Received: by mail-qt1-f176.google.com with SMTP id d75a77b69052e-456954d0396so25164831cf.3 for ; Mon, 09 Sep 2024 07:56:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1725893763; x=1726498563; darn=lists.yoctoproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=yl5z0j2JadkX4VI+nDZGTts0fxvG+EZ1wyzBRJpnEJU=; b=RcGSRoNjYRRlwA6PL6oS8nBdJzNxWXwG57tHfCtrIr3cPaBGOvMVpURwdMzeLdyVYp fTRLQdRpuIIJv77i9HLbVG06HHWzJ3pG3O7jlcDGAFU3st+p0BpFLFop63tw7XKnubjv zLwfsPfzt+mbfMKhrAEngPLadmvX6Irl5hMxzJf1uJSvWvDEKdLwjLRJ8Mm7w/M5+EXm tP8fGwI8jzoZtv8SpJ6m37BepC8aAvHbUapx9PhVuiIjYwTYb/DGCq25Voszlf/SYIR+ q2eJ0skVfogSlT45Y7z25AL2ghtBC6m8no11CZIIfGsQh17kN4n41w0FzqGyh2/dPwTI 8DaA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725893763; x=1726498563; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=yl5z0j2JadkX4VI+nDZGTts0fxvG+EZ1wyzBRJpnEJU=; b=AZNBT8llAgj2CyuXbXh7cvjy0rns6AMdCM9VA+UXzk17155BTYK79XG+LvNAic4XO7 ClvDwxgKLXfI+ZG4sv5FlqxEkBIucT/p1njuipk9+uxh+tdAVNQGYetUbK1yiF/919Iy iTYATfqJd25pS5/VqwWChu7+RtjOwHqG8/aMDlYSodtRKWKBuRak0P1NQQYqDY9IAtVK wZqV0/SwtmkZONChB8v4HrVrb/QgbNbYDQ+RZFpI1i9VTwhPi+LB8ub9x/ycWyYGhr63 DmadrVdjmK3Sj2DEd6OjvANo87VISVsExfe3Dz8NTZOth07GAIhGrJCr0lUFl5vI9I98 WVJQ== X-Gm-Message-State: AOJu0YzU7wMNfHDLhVVNkpuYUSlMtK3pLT9WJYi5/G9E7EGdOYDie2SR ung1srE+Do2g86VOGIOrEtj7+O0CLRoqerXl6dnoldqmcMSalmheDgggBrmi X-Google-Smtp-Source: AGHT+IGrdZVXjvoOh7kg/2eGp8+0w8MEES2/f1pFYaQ3HCnN6Zk9AYiiWUgspO+JzeNN8lKREQoi+g== X-Received: by 2002:ac8:7fc6:0:b0:458:2e21:e422 with SMTP id d75a77b69052e-4582e21e5f6mr61523961cf.50.1725893762757; Mon, 09 Sep 2024 07:56:02 -0700 (PDT) Received: from localhost.localdomain (pppoe-209-91-167-254.vianet.ca. [209.91.167.254]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-45822e772a2sm21050231cf.27.2024.09.09.07.56.00 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Sep 2024 07:56:02 -0700 (PDT) From: Trevor Woerner To: yocto-patches@lists.yoctoproject.org Subject: [meta-rockchip][scarthgap][PATCH 10/10] linux-torvalds-next: bump to next-20240904 Date: Mon, 9 Sep 2024 10:55:30 -0400 Message-ID: <20240909145530.25301-11-twoerner@gmail.com> X-Mailer: git-send-email 2.44.0.501.g19981daefd7c In-Reply-To: <20240909145530.25301-1-twoerner@gmail.com> References: <20240909145530.25301-1-twoerner@gmail.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 ; Mon, 09 Sep 2024 14:56:04 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto-patches/message/636 Bump kernel to tag "next-20240904". Signed-off-by: Trevor Woerner --- recipes-kernel/linux/linux-torvalds-next_git.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipes-kernel/linux/linux-torvalds-next_git.bb b/recipes-kernel/linux/linux-torvalds-next_git.bb index 6f3db7c61bdf..b961b1408f09 100644 --- a/recipes-kernel/linux/linux-torvalds-next_git.bb +++ b/recipes-kernel/linux/linux-torvalds-next_git.bb @@ -10,15 +10,15 @@ DEFAULT_PREFERENCE = "-1" COMPATIBLE_MACHINE = "^$" COMPATIBLE_MACHINE:radxa-zero-3 = "radxa-zero-3" -LINUX_VERSION = "6.10-rc3" +LINUX_VERSION = "6.11-rc6" KERNEL_VERSION_SANITY_SKIP = "1" PV = "${LINUX_VERSION}+git${SRCPV}" SRC_URI = " \ git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git;protocol=https;nobranch=1 \ file://rockchip-kmeta;type=kmeta;name=rockchip-kmeta;destsuffix=rockchip-kmeta \ " -# this is tag 'next-20240611' -SRCREV = "a957267fa7e9159d3d2ee1421359ebf228570c68" +# this is tag 'next-20240904' +SRCREV = "fdadd93817f124fd0ea6ef251d4a1068b7feceba" inherit kernel inherit kernel-yocto