From patchwork Sun Dec 21 00:48:39 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trevor Woerner X-Patchwork-Id: 77074 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 616F8E67492 for ; Sun, 21 Dec 2025 00:48:50 +0000 (UTC) Received: from mail-qk1-f174.google.com (mail-qk1-f174.google.com [209.85.222.174]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.51712.1766278128553065571 for ; Sat, 20 Dec 2025 16:48:48 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=T5WQbNIV; spf=pass (domain: gmail.com, ip: 209.85.222.174, mailfrom: twoerner@gmail.com) Received: by mail-qk1-f174.google.com with SMTP id af79cd13be357-8b5c81bd953so332215185a.1 for ; Sat, 20 Dec 2025 16:48:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1766278127; x=1766882927; darn=lists.yoctoproject.org; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=3UHwR/dKB5h7lNedGYvmsu80aose3bpffzUTGH++9Ec=; b=T5WQbNIVoLmY4/cRRO/2h8930BKJoCR6xkC9UDNEpcn8lyVPsrqNWKZmVrnR/m51nq aUTIJv1z9G7pRcdpjMAeVKRe6j175H3NmY3/A9XqCjjrz5jc8B9go9SEvQ1u8zOTE9cq nCuBOrYHcV2DwpeS3r/kBDEUI3UaWX39Mz+5qhYGf6q/SiETWEK/Jc6nN3XLijI9JFZW YiHC9IB9ys9dhG5ICOjwuATfWozjHLjiGP0ctwUWrB8Cw0s3ReHqitE+AR397zqFwkDj rzwKv2SEBfAt0lZCS3gi7Gr4wlEMzG/u9hJVJW2n4cX212uP3I724IQSXtQkPqJlWtDd 87oA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1766278127; x=1766882927; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=3UHwR/dKB5h7lNedGYvmsu80aose3bpffzUTGH++9Ec=; b=QaipjBDnN4TrXmTaAH96zP4BYmGNJ6lxjiFXD1au+VFJrcU76XmGBJbib4zsrbagdh U0nWsjgqshm9bg/Z+BAF3X9yWCOx6mkq8kJnyI0uQPqIaVAMKthDfx7bPXL5VEsLBueF L9s+iLT2eGRhcgQDNaOFVduvTi0UFiGFdjbLpyTezvWfTcpDdFTmeugW+MxrlS1DZgTN JyFmJBfRBdbCUkROtAtFTgki152GT3mbHaQvy34ZeyTF42bPUcmUmzGQ0X+2r2FaUpxj xWShVe2VPGWrDgFNZZMUX0eAHreQjJq72cUM2GSatnOV/7pGq+2UAwbYoya5PEIV8L8u 9TVw== X-Gm-Message-State: AOJu0YygZolkRqFn+0d+x1t2AkOUT5I3QhvU+UoO5Q+2TUNDSXCJCrd9 cdbp490WrzCUc4gjgoZts4UlFQHfVkWBSCjhtwhEm0/glCmkMSaDs6mGX8F9Vg== X-Gm-Gg: AY/fxX6v0GPPgxnioon2y1eRZtSK4IC9FZ5Zr7lgbz5DU8vQbqWhCp3v3XputlY7yUW 12sRg4HNvgnVjnk2vCdGVqYlBQ6Br63y47bjexappe/3QJb7xIDFIUArsreHHZmgYIA17kSfk2V YaarOEGr9GWTOU8g8c7UWHM4s2+n9cySVz6t12rAlP6AQCGxm3AxMwrcka4jMYazUndP23t4ACo Eg8Nle2DXTjxjSA3NVBk1FYiXNMQXznk1pNFSg0nHpibH8AihLrCs+vvqsud2/co3Hj3nz+/ofa mwHVSXUN1F0SDMj4d5eSiitlC2+xiTD/r1425Ur91jwmjnFyknuHChhA9fb/uPH2tYQBHvhzSwp MvX5thGZ6IMRlBoViF52NtFVId9hr1fu+CmD//wlyHPz+mDFQDkRc4LhuM+24HefBkMG3qhCT8p N6GJmjTtlV3aP+cFrIUOGigaMVzNHShkckzxXNsg== X-Google-Smtp-Source: AGHT+IFNWDeOI2uX7Zfk3Hc9UBWjDNWah7vOiDZtxX1hnbtTshVFNUXHWPbUKrKuPso46GtDl9yGpQ== X-Received: by 2002:a05:620a:488d:b0:8b2:3371:e9d6 with SMTP id af79cd13be357-8c08fd330a3mr1043969785a.62.1766278126625; Sat, 20 Dec 2025 16:48:46 -0800 (PST) Received: from localhost (pppoe-209-91-167-254.vianet.ca. [209.91.167.254]) by smtp.gmail.com with ESMTPSA id af79cd13be357-8c0973f0807sm511867385a.41.2025.12.20.16.48.45 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 20 Dec 2025 16:48:45 -0800 (PST) From: Trevor Woerner To: yocto-patches@lists.yoctoproject.org Subject: [meta-rockchip][PATCH v2 1/5] kmeta reorganization Date: Sat, 20 Dec 2025 19:48:39 -0500 Message-ID: <20251221004843.31946-1-twoerner@gmail.com> X-Mailer: git-send-email 2.51.0.193.g4975ec3473b4 MIME-Version: 1.0 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 21 Dec 2025 00:48:50 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto-patches/message/2837 Reorganize the rockchip kmeta data so linux-yocto and linux-yocto-dev share the same files. Signed-off-by: Trevor Woerner --- changes since v1: - none --- .../realtek-r8169.cfg | 0 .../rockchip/remove-non-rockchip-arch-arm.cfg | 0 .../rockchip/remove-non-rockchip-arch-arm.scc | 0 .../remove-non-rockchip-arch-arm64.cfg | 0 .../remove-non-rockchip-arch-arm64.scc | 0 recipes-kernel/linux/linux-yocto-dev.bbappend | 2 +- .../rockchip/remove-non-rockchip-arch-arm.cfg | 85 ------------------- .../rockchip/remove-non-rockchip-arch-arm.scc | 1 - .../remove-non-rockchip-arch-arm64.cfg | 62 -------------- .../remove-non-rockchip-arch-arm64.scc | 1 - recipes-kernel/linux/linux-yocto_%.bbappend | 2 +- 11 files changed, 2 insertions(+), 151 deletions(-) rename recipes-kernel/linux/{linux-yocto => linux-rockchip}/realtek-r8169.cfg (100%) rename recipes-kernel/linux/{linux-yocto-dev => linux-rockchip}/rockchip-kmeta/bsp/rockchip/remove-non-rockchip-arch-arm.cfg (100%) rename recipes-kernel/linux/{linux-yocto-dev => linux-rockchip}/rockchip-kmeta/bsp/rockchip/remove-non-rockchip-arch-arm.scc (100%) rename recipes-kernel/linux/{linux-yocto-dev => linux-rockchip}/rockchip-kmeta/bsp/rockchip/remove-non-rockchip-arch-arm64.cfg (100%) rename recipes-kernel/linux/{linux-yocto-dev => linux-rockchip}/rockchip-kmeta/bsp/rockchip/remove-non-rockchip-arch-arm64.scc (100%) delete mode 100644 recipes-kernel/linux/linux-yocto/rockchip-kmeta/bsp/rockchip/remove-non-rockchip-arch-arm.cfg delete mode 100644 recipes-kernel/linux/linux-yocto/rockchip-kmeta/bsp/rockchip/remove-non-rockchip-arch-arm.scc delete mode 100644 recipes-kernel/linux/linux-yocto/rockchip-kmeta/bsp/rockchip/remove-non-rockchip-arch-arm64.cfg delete mode 100644 recipes-kernel/linux/linux-yocto/rockchip-kmeta/bsp/rockchip/remove-non-rockchip-arch-arm64.scc diff --git a/recipes-kernel/linux/linux-yocto/realtek-r8169.cfg b/recipes-kernel/linux/linux-rockchip/realtek-r8169.cfg similarity index 100% rename from recipes-kernel/linux/linux-yocto/realtek-r8169.cfg rename to recipes-kernel/linux/linux-rockchip/realtek-r8169.cfg diff --git a/recipes-kernel/linux/linux-yocto-dev/rockchip-kmeta/bsp/rockchip/remove-non-rockchip-arch-arm.cfg b/recipes-kernel/linux/linux-rockchip/rockchip-kmeta/bsp/rockchip/remove-non-rockchip-arch-arm.cfg similarity index 100% rename from recipes-kernel/linux/linux-yocto-dev/rockchip-kmeta/bsp/rockchip/remove-non-rockchip-arch-arm.cfg rename to recipes-kernel/linux/linux-rockchip/rockchip-kmeta/bsp/rockchip/remove-non-rockchip-arch-arm.cfg diff --git a/recipes-kernel/linux/linux-yocto-dev/rockchip-kmeta/bsp/rockchip/remove-non-rockchip-arch-arm.scc b/recipes-kernel/linux/linux-rockchip/rockchip-kmeta/bsp/rockchip/remove-non-rockchip-arch-arm.scc similarity index 100% rename from recipes-kernel/linux/linux-yocto-dev/rockchip-kmeta/bsp/rockchip/remove-non-rockchip-arch-arm.scc rename to recipes-kernel/linux/linux-rockchip/rockchip-kmeta/bsp/rockchip/remove-non-rockchip-arch-arm.scc diff --git a/recipes-kernel/linux/linux-yocto-dev/rockchip-kmeta/bsp/rockchip/remove-non-rockchip-arch-arm64.cfg b/recipes-kernel/linux/linux-rockchip/rockchip-kmeta/bsp/rockchip/remove-non-rockchip-arch-arm64.cfg similarity index 100% rename from recipes-kernel/linux/linux-yocto-dev/rockchip-kmeta/bsp/rockchip/remove-non-rockchip-arch-arm64.cfg rename to recipes-kernel/linux/linux-rockchip/rockchip-kmeta/bsp/rockchip/remove-non-rockchip-arch-arm64.cfg diff --git a/recipes-kernel/linux/linux-yocto-dev/rockchip-kmeta/bsp/rockchip/remove-non-rockchip-arch-arm64.scc b/recipes-kernel/linux/linux-rockchip/rockchip-kmeta/bsp/rockchip/remove-non-rockchip-arch-arm64.scc similarity index 100% rename from recipes-kernel/linux/linux-yocto-dev/rockchip-kmeta/bsp/rockchip/remove-non-rockchip-arch-arm64.scc rename to recipes-kernel/linux/linux-rockchip/rockchip-kmeta/bsp/rockchip/remove-non-rockchip-arch-arm64.scc diff --git a/recipes-kernel/linux/linux-yocto-dev.bbappend b/recipes-kernel/linux/linux-yocto-dev.bbappend index 67a16b4d67ff..81d2b6d693c4 100644 --- a/recipes-kernel/linux/linux-yocto-dev.bbappend +++ b/recipes-kernel/linux/linux-yocto-dev.bbappend @@ -1,3 +1,3 @@ -FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/linux-rockchip:" SRC_URI:append:rockchip = " file://rockchip-kmeta;type=kmeta;name=rockchip-kmeta;destsuffix=rockchip-kmeta" diff --git a/recipes-kernel/linux/linux-yocto/rockchip-kmeta/bsp/rockchip/remove-non-rockchip-arch-arm.cfg b/recipes-kernel/linux/linux-yocto/rockchip-kmeta/bsp/rockchip/remove-non-rockchip-arch-arm.cfg deleted file mode 100644 index e9443f17895c..000000000000 --- a/recipes-kernel/linux/linux-yocto/rockchip-kmeta/bsp/rockchip/remove-non-rockchip-arch-arm.cfg +++ /dev/null @@ -1,85 +0,0 @@ -CONFIG_ARCH_ACTIONS=n -CONFIG_ARCH_AIROHA=n -CONFIG_ARCH_ALPINE=n -CONFIG_ARCH_ARTPEC=n -CONFIG_ARCH_ASPEED=n -CONFIG_ARCH_AT91=n -CONFIG_ARCH_BCM2835=n -CONFIG_ARCH_BCM=n -CONFIG_ARCH_BCMBCA=n -CONFIG_ARCH_BCMBCA_BRAHMAB15=n -CONFIG_ARCH_BCMBCA_CORTEXA7=n -CONFIG_ARCH_BCMBCA_CORTEXA9=n -CONFIG_ARCH_BCM_21664=n -CONFIG_ARCH_BCM_23550=n -CONFIG_ARCH_BCM_281XX=n -CONFIG_ARCH_BCM_5301X=n -CONFIG_ARCH_BCM_53573=n -CONFIG_ARCH_BCM_CYGNUS=n -CONFIG_ARCH_BCM_HR2=n -CONFIG_ARCH_BCM_NSP=n -CONFIG_ARCH_BERLIN=n -CONFIG_ARCH_BRCMSTB=n -CONFIG_ARCH_DIGICOLOR=n -CONFIG_ARCH_EMEV2=n -CONFIG_ARCH_EXYNOS=n -CONFIG_ARCH_HI3xxx=n -CONFIG_ARCH_HIGHBANK=n -CONFIG_ARCH_HIP01=n -CONFIG_ARCH_HIP04=n -CONFIG_ARCH_HISI=n -CONFIG_ARCH_HIX5HD2=n -CONFIG_ARCH_HPE=n -CONFIG_ARCH_HPE_GXP=n -CONFIG_ARCH_INTEL_SOCFPGA=n -CONFIG_ARCH_KEYSTONE=n -CONFIG_ARCH_MEDIATEK=n -CONFIG_ARCH_MESON=n -CONFIG_ARCH_MILBEAUT=n -CONFIG_ARCH_MILBEAUT_M10V=n -CONFIG_ARCH_MMP=n -CONFIG_ARCH_MSM8916=n -CONFIG_ARCH_MSM8960=n -CONFIG_ARCH_MSM8974=n -CONFIG_ARCH_MSM8X60=n -CONFIG_ARCH_MVEBU=n -CONFIG_ARCH_MXC=n -CONFIG_ARCH_OMAP3=n -CONFIG_ARCH_OMAP4=n -CONFIG_ARCH_QCOM=n -CONFIG_ARCH_R7S72100=n -CONFIG_ARCH_R7S9210=n -CONFIG_ARCH_R8A73A4=n -CONFIG_ARCH_R8A7740=n -CONFIG_ARCH_R8A7742=n -CONFIG_ARCH_R8A7743=n -CONFIG_ARCH_R8A7744=n -CONFIG_ARCH_R8A7745=n -CONFIG_ARCH_R8A77470=n -CONFIG_ARCH_R8A7778=n -CONFIG_ARCH_R8A7779=n -CONFIG_ARCH_R8A7790=n -CONFIG_ARCH_R8A7791=n -CONFIG_ARCH_R8A7792=n -CONFIG_ARCH_R8A7793=n -CONFIG_ARCH_R8A7794=n -CONFIG_ARCH_R9A06G032=n -CONFIG_ARCH_RENESAS=n -CONFIG_ARCH_SH73A0=n -CONFIG_ARCH_SPEAR13XX=n -CONFIG_ARCH_STI=n -CONFIG_ARCH_STM32=n -CONFIG_ARCH_SUNPLUS=n -CONFIG_ARCH_SUNXI=n -CONFIG_ARCH_TEGRA=n -CONFIG_ARCH_TEGRA_114_SOC=n -CONFIG_ARCH_TEGRA_124_SOC=n -CONFIG_ARCH_TEGRA_2x_SOC=n -CONFIG_ARCH_TEGRA_3x_SOC=n -CONFIG_ARCH_U8500=n -CONFIG_ARCH_UNIPHIER=n -CONFIG_ARCH_VEXPRESS=n -CONFIG_ARCH_VEXPRESS_TC2_PM=n -CONFIG_ARCH_VIRT=n -CONFIG_ARCH_WM8850=n -CONFIG_ARCH_ZYNQ=n diff --git a/recipes-kernel/linux/linux-yocto/rockchip-kmeta/bsp/rockchip/remove-non-rockchip-arch-arm.scc b/recipes-kernel/linux/linux-yocto/rockchip-kmeta/bsp/rockchip/remove-non-rockchip-arch-arm.scc deleted file mode 100644 index ce7770456ea4..000000000000 --- a/recipes-kernel/linux/linux-yocto/rockchip-kmeta/bsp/rockchip/remove-non-rockchip-arch-arm.scc +++ /dev/null @@ -1 +0,0 @@ -kconf hardware remove-non-rockchip-arch-arm.cfg diff --git a/recipes-kernel/linux/linux-yocto/rockchip-kmeta/bsp/rockchip/remove-non-rockchip-arch-arm64.cfg b/recipes-kernel/linux/linux-yocto/rockchip-kmeta/bsp/rockchip/remove-non-rockchip-arch-arm64.cfg deleted file mode 100644 index 597d47a424d2..000000000000 --- a/recipes-kernel/linux/linux-yocto/rockchip-kmeta/bsp/rockchip/remove-non-rockchip-arch-arm64.cfg +++ /dev/null @@ -1,62 +0,0 @@ -CONFIG_ARCH_ACTIONS=n -CONFIG_ARCH_ALPINE=n -CONFIG_ARCH_APPLE=n -CONFIG_ARCH_BCM2835=n -CONFIG_ARCH_BCM=n -CONFIG_ARCH_BCMBCA=n -CONFIG_ARCH_BCM_IPROC=n -CONFIG_ARCH_BERLIN=n -CONFIG_ARCH_BRCMSTB=n -CONFIG_ARCH_EXYNOS=n -CONFIG_ARCH_HISI=n -CONFIG_ARCH_INTEL_SOCFPGA=n -CONFIG_ARCH_K3=n -CONFIG_ARCH_KEEMBAY=n -CONFIG_ARCH_LAYERSCAPE=n -CONFIG_ARCH_LG1K=n -CONFIG_ARCH_MEDIATEK=n -CONFIG_ARCH_MESON=n -CONFIG_ARCH_MVEBU=n -CONFIG_ARCH_MXC=n -CONFIG_ARCH_NPCM=n -CONFIG_ARCH_NXP=n -CONFIG_ARCH_QCOM=n -CONFIG_ARCH_R8A774A1=n -CONFIG_ARCH_R8A774B1=n -CONFIG_ARCH_R8A774C0=n -CONFIG_ARCH_R8A774E1=n -CONFIG_ARCH_R8A77951=n -CONFIG_ARCH_R8A77960=n -CONFIG_ARCH_R8A77961=n -CONFIG_ARCH_R8A77965=n -CONFIG_ARCH_R8A77970=n -CONFIG_ARCH_R8A77980=n -CONFIG_ARCH_R8A77990=n -CONFIG_ARCH_R8A77995=n -CONFIG_ARCH_R8A779A0=n -CONFIG_ARCH_R8A779F0=n -CONFIG_ARCH_R8A779G0=n -CONFIG_ARCH_R9A07G043=n -CONFIG_ARCH_R9A07G044=n -CONFIG_ARCH_R9A07G054=n -CONFIG_ARCH_R9A09G011=n -CONFIG_ARCH_RENESAS=n -CONFIG_ARCH_S32=n -CONFIG_ARCH_SEATTLE=n -CONFIG_ARCH_SPRD=n -CONFIG_ARCH_SUNXI=n -CONFIG_ARCH_SYNQUACER=n -CONFIG_ARCH_TEGRA=n -CONFIG_ARCH_TEGRA_132_SOC=n -CONFIG_ARCH_TEGRA_186_SOC=n -CONFIG_ARCH_TEGRA_194_SOC=n -CONFIG_ARCH_TEGRA_210_SOC=n -CONFIG_ARCH_TEGRA_234_SOC=n -CONFIG_ARCH_TESLA_FSD=n -CONFIG_ARCH_THUNDER2=n -CONFIG_ARCH_THUNDER=n -CONFIG_ARCH_UNIPHIER=n -CONFIG_ARCH_VEXPRESS=n -CONFIG_ARCH_VISCONTI=n -CONFIG_ARCH_XGENE=n -CONFIG_ARCH_ZYNQMP=n diff --git a/recipes-kernel/linux/linux-yocto/rockchip-kmeta/bsp/rockchip/remove-non-rockchip-arch-arm64.scc b/recipes-kernel/linux/linux-yocto/rockchip-kmeta/bsp/rockchip/remove-non-rockchip-arch-arm64.scc deleted file mode 100644 index e169240f5067..000000000000 --- a/recipes-kernel/linux/linux-yocto/rockchip-kmeta/bsp/rockchip/remove-non-rockchip-arch-arm64.scc +++ /dev/null @@ -1 +0,0 @@ -kconf hardware remove-non-rockchip-arch-arm64.cfg diff --git a/recipes-kernel/linux/linux-yocto_%.bbappend b/recipes-kernel/linux/linux-yocto_%.bbappend index 2dba3d70a3ca..a648ecb20679 100644 --- a/recipes-kernel/linux/linux-yocto_%.bbappend +++ b/recipes-kernel/linux/linux-yocto_%.bbappend @@ -1,4 +1,4 @@ -FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/linux-rockchip:" # 32-bit devices COMPATIBLE_MACHINE:firefly-rk3288 = "firefly-rk3288" From patchwork Sun Dec 21 00:48:40 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trevor Woerner X-Patchwork-Id: 77073 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 607D2E67491 for ; Sun, 21 Dec 2025 00:48:50 +0000 (UTC) Received: from mail-qk1-f182.google.com (mail-qk1-f182.google.com [209.85.222.182]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.51310.1766278129150439867 for ; Sat, 20 Dec 2025 16:48:49 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=Oeli1a91; spf=pass (domain: gmail.com, ip: 209.85.222.182, mailfrom: twoerner@gmail.com) Received: by mail-qk1-f182.google.com with SMTP id af79cd13be357-8bb6a27d390so178868885a.3 for ; Sat, 20 Dec 2025 16:48:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1766278128; x=1766882928; 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=ZFddC83/W6GAQK2p68ayaaIpX3aCIBAgg5SVU7noUx8=; b=Oeli1a91NlsMaohnk69gB36ht2X18cn47DdrSDrzlGcV02XB5zsmEpDRheB1hB4Fqn a6+gVlJqxMJoPg5YEN+/dlYUOJzE1haqZhaPGhQQze85m6EjEv8o3xmGN8lki0HC+J5p 0ruL37J/3lCdxGoRHTNbVF6ADZnnTvw85rMYi/if+mZjlTdDsoO6N8E93e/fYuj+oYUM rxPNlevtp0D0lW0vfh/5v8wA5vg7rQkljT7TgutgGXicbRjgDJVh/ptZnMRNVW3Q4enM QCfZ4pn+z07ruYyBqtG4D7FC79+IFSmF47o5wcX1u2BbMEZya47ZwEz2I+qndqTQ1B7x dQwg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1766278128; x=1766882928; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=ZFddC83/W6GAQK2p68ayaaIpX3aCIBAgg5SVU7noUx8=; b=IVFHZyVuTF4Voo6ToMTS3BI2LU4/Un5BkcrsNilUtzUPmEFv+OR7ALtmaKkoAbNCoz KsMWJ9RrKusPhkto8K0FiR1klDvB/bTxaIkjHIcMG2y8c2OoGY1NVBe1z7H7gtBpw+Kn 16noNyZgaLeP2Rw506qT4M3nz5Z59Pl2l0cFWnFnFswT0yPdunaiNcDVnzyx068JrfeB vgS3ADfD+DxCSHbn25mT9tRbWCMSSMVHr/vfFDLcsKH+iWR6FEtsCh8uX9VRGyriqaqA AUmt3FPnuMPe9NUDoXL9a07c0L92iddkUBAEyWqnax7DeqXR3FREofEYgnnaqPhzUYTj rMMA== X-Gm-Message-State: AOJu0YzcE9/cBvDFVglOHoX9DqOKBckyeAeC9Pe8yaOlnKW4d5hFP95y 8s9gwFW9lnMAUr2GTNp34I38UVQd+ld4fgU8LRQ5m+hgFGy+x7wHRZElYoVrgw== X-Gm-Gg: AY/fxX4SIQ4PfG35nwAUT9lUBrHwPpZS4nccUG5vxSeQ25SWI7rir1w1/g2wSVehJpf 2X/fKBxCfyov1GXRJkmKdf0+t+Wb87MGOQBLaKRxGgf65O/Ji56q/0EFJdo0rLoskIQxwrauQnx XrraspDQEYf1LvtwoXtvJ96sdcOSjfGsq+5Dhnjg1gadw9bLAlV6bfHl3NsFToraDtlzf7x2aAx eNQOphkcx4g0rXwDjLUEDd/mfvuYXcaZ3pppxscUQStdzF15sRhPY78MapSVvoJwvMkiuhYFvEc /SQw2fIx1uY8VnROAjT1wh8BtEbaIS+l/1xgwZZ0kTvhuwmmPGjg/Bhsk7i5ybauPUs8I/zw7RZ nCfzZ9mYYj/Tk7LZd05so1V3S4x/p62Or+ChWpju5snlgPcWs6pGJqbGqwQo5EvP/aqXBBIYXWX wZUZJ9WViVUfpTOuo/Ok4xuOtrC/0ArTWk9votFw== X-Google-Smtp-Source: AGHT+IGUav6daCio4IuieDjJ65kDY4oNdv+rVCeYUC1nOSG0AqJa1YoqGrOjGPDkKGf5g+uQiLBkKg== X-Received: by 2002:a05:620a:1aa6:b0:8b2:9a8a:118b with SMTP id af79cd13be357-8c08ff231c4mr1165894785a.73.1766278127564; Sat, 20 Dec 2025 16:48:47 -0800 (PST) Received: from localhost (pppoe-209-91-167-254.vianet.ca. [209.91.167.254]) by smtp.gmail.com with ESMTPSA id af79cd13be357-8c0973f0807sm511867385a.41.2025.12.20.16.48.46 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 20 Dec 2025 16:48:47 -0800 (PST) From: Trevor Woerner To: yocto-patches@lists.yoctoproject.org Subject: [meta-rockchip][PATCH v2 2/5] provide kernel *.inc Date: Sat, 20 Dec 2025 19:48:40 -0500 Message-ID: <20251221004843.31946-2-twoerner@gmail.com> X-Mailer: git-send-email 2.51.0.193.g4975ec3473b4 In-Reply-To: <20251221004843.31946-1-twoerner@gmail.com> References: <20251221004843.31946-1-twoerner@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 21 Dec 2025 00:48:50 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto-patches/message/2838 Consolidate the two bbappends for linux-yocto and linux-yocto-dev and provide the "guts" of the rockchip additions in an *inc file which could be used by other linux kernel recipes outside this layer when a rockchip machine is used. Signed-off-by: Trevor Woerner --- changes since v1: - changed kernel bbappend name from "linux-%" to "linux-yocto_%" --- recipes-kernel/linux/linux-rockchip.inc | 35 ++++++++++++++++++ recipes-kernel/linux/linux-yocto-dev.bbappend | 3 -- recipes-kernel/linux/linux-yocto_%.bbappend | 36 +------------------ 3 files changed, 36 insertions(+), 38 deletions(-) create mode 100644 recipes-kernel/linux/linux-rockchip.inc delete mode 100644 recipes-kernel/linux/linux-yocto-dev.bbappend diff --git a/recipes-kernel/linux/linux-rockchip.inc b/recipes-kernel/linux/linux-rockchip.inc new file mode 100644 index 000000000000..a648ecb20679 --- /dev/null +++ b/recipes-kernel/linux/linux-rockchip.inc @@ -0,0 +1,35 @@ +FILESEXTRAPATHS:prepend := "${THISDIR}/linux-rockchip:" + +# 32-bit devices +COMPATIBLE_MACHINE:firefly-rk3288 = "firefly-rk3288" +COMPATIBLE_MACHINE:marsboard-rk3066 = "marsboard-rk3066" +COMPATIBLE_MACHINE:radxarock = "radxarock" +COMPATIBLE_MACHINE:rock2-square = "rock2-square" +COMPATIBLE_MACHINE:tinker-board = "tinker-board" +COMPATIBLE_MACHINE:tinker-board-s = "tinker-board-s" +COMPATIBLE_MACHINE:vyasa-rk3288 = "vyasa-rk3288" + +# 64-bit devices +COMPATIBLE_MACHINE:nanopc-t6 = "nanopc-t6" +COMPATIBLE_MACHINE:nanopi-m4 = "nanopi-m4" +COMPATIBLE_MACHINE:nanopi-m4-2gb = "nanopi-m4-2gb" +COMPATIBLE_MACHINE:nanopi-m4b = "nanopi-m4b" +COMPATIBLE_MACHINE:nanopi-r2s = "nanopi-r2s" +COMPATIBLE_MACHINE:nanopi-r4s = "nanopi-r4s" +COMPATIBLE_MACHINE:orangepi-3b = "orangepi-3b" +COMPATIBLE_MACHINE:orangepi-5-plus = "orangepi-5-plus" +COMPATIBLE_MACHINE:radxa-zero-3 = "radxa-zero-3" +COMPATIBLE_MACHINE:roc-rk3308-cc = "roc-rk3308-cc" +COMPATIBLE_MACHINE:roc-rk3328-cc = "roc-rk3328-cc" +COMPATIBLE_MACHINE:rock-3a = "rock-3a" +COMPATIBLE_MACHINE:rock-4c-plus = "rock-4c-plus" +COMPATIBLE_MACHINE:rock-5a = "rock-5a" +COMPATIBLE_MACHINE:rock-5b = "rock-5b" +COMPATIBLE_MACHINE:rock-pi-4 = "rock-pi-4" +COMPATIBLE_MACHINE:rock-pi-e = "rock-pi-e" +COMPATIBLE_MACHINE:rock-pi-s = "rock-pi-s" +COMPATIBLE_MACHINE:rock64 = "rock64" +COMPATIBLE_MACHINE:soquartz = "soquartz" + +SRC_URI:append:rockchip = " file://rockchip-kmeta;type=kmeta;name=rockchip-kmeta;destsuffix=rockchip-kmeta" +SRC_URI:append:nanopi-r4s = " file://realtek-r8169.cfg" diff --git a/recipes-kernel/linux/linux-yocto-dev.bbappend b/recipes-kernel/linux/linux-yocto-dev.bbappend deleted file mode 100644 index 81d2b6d693c4..000000000000 --- a/recipes-kernel/linux/linux-yocto-dev.bbappend +++ /dev/null @@ -1,3 +0,0 @@ -FILESEXTRAPATHS:prepend := "${THISDIR}/linux-rockchip:" - -SRC_URI:append:rockchip = " file://rockchip-kmeta;type=kmeta;name=rockchip-kmeta;destsuffix=rockchip-kmeta" diff --git a/recipes-kernel/linux/linux-yocto_%.bbappend b/recipes-kernel/linux/linux-yocto_%.bbappend index a648ecb20679..34bf335d0b10 100644 --- a/recipes-kernel/linux/linux-yocto_%.bbappend +++ b/recipes-kernel/linux/linux-yocto_%.bbappend @@ -1,35 +1 @@ -FILESEXTRAPATHS:prepend := "${THISDIR}/linux-rockchip:" - -# 32-bit devices -COMPATIBLE_MACHINE:firefly-rk3288 = "firefly-rk3288" -COMPATIBLE_MACHINE:marsboard-rk3066 = "marsboard-rk3066" -COMPATIBLE_MACHINE:radxarock = "radxarock" -COMPATIBLE_MACHINE:rock2-square = "rock2-square" -COMPATIBLE_MACHINE:tinker-board = "tinker-board" -COMPATIBLE_MACHINE:tinker-board-s = "tinker-board-s" -COMPATIBLE_MACHINE:vyasa-rk3288 = "vyasa-rk3288" - -# 64-bit devices -COMPATIBLE_MACHINE:nanopc-t6 = "nanopc-t6" -COMPATIBLE_MACHINE:nanopi-m4 = "nanopi-m4" -COMPATIBLE_MACHINE:nanopi-m4-2gb = "nanopi-m4-2gb" -COMPATIBLE_MACHINE:nanopi-m4b = "nanopi-m4b" -COMPATIBLE_MACHINE:nanopi-r2s = "nanopi-r2s" -COMPATIBLE_MACHINE:nanopi-r4s = "nanopi-r4s" -COMPATIBLE_MACHINE:orangepi-3b = "orangepi-3b" -COMPATIBLE_MACHINE:orangepi-5-plus = "orangepi-5-plus" -COMPATIBLE_MACHINE:radxa-zero-3 = "radxa-zero-3" -COMPATIBLE_MACHINE:roc-rk3308-cc = "roc-rk3308-cc" -COMPATIBLE_MACHINE:roc-rk3328-cc = "roc-rk3328-cc" -COMPATIBLE_MACHINE:rock-3a = "rock-3a" -COMPATIBLE_MACHINE:rock-4c-plus = "rock-4c-plus" -COMPATIBLE_MACHINE:rock-5a = "rock-5a" -COMPATIBLE_MACHINE:rock-5b = "rock-5b" -COMPATIBLE_MACHINE:rock-pi-4 = "rock-pi-4" -COMPATIBLE_MACHINE:rock-pi-e = "rock-pi-e" -COMPATIBLE_MACHINE:rock-pi-s = "rock-pi-s" -COMPATIBLE_MACHINE:rock64 = "rock64" -COMPATIBLE_MACHINE:soquartz = "soquartz" - -SRC_URI:append:rockchip = " file://rockchip-kmeta;type=kmeta;name=rockchip-kmeta;destsuffix=rockchip-kmeta" -SRC_URI:append:nanopi-r4s = " file://realtek-r8169.cfg" +require linux-rockchip.inc From patchwork Sun Dec 21 00:48:41 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trevor Woerner X-Patchwork-Id: 77076 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 5FE8CE67495 for ; Sun, 21 Dec 2025 00:49:00 +0000 (UTC) Received: from mail-qv1-f52.google.com (mail-qv1-f52.google.com [209.85.219.52]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.51312.1766278131002944800 for ; Sat, 20 Dec 2025 16:48:51 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=KTNI44NT; spf=pass (domain: gmail.com, ip: 209.85.219.52, mailfrom: twoerner@gmail.com) Received: by mail-qv1-f52.google.com with SMTP id 6a1803df08f44-888310b91c5so34017746d6.1 for ; Sat, 20 Dec 2025 16:48:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1766278129; x=1766882929; 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=da+vCF+pqdBXBDQWII5F4MlcLfZ+w64zKK/Sjyx8cJo=; b=KTNI44NT7IY485urxX7ENCV1cFq47nLMq8A4h6eEtWmz+TQZxLXOozcd7BtG1v+pn0 pXu0d/tkMOkrJqSCTnJIdEjYClOoFG8umxCVbkK24iTHX2JyVi1MyFrSpTeWWoMKqNkG E0/GCZDrFXomhoqGAOzydJ53SvyHa0IiILJyN7mNljNMa6pa8sKwsFPKzo+VtpcXzaP2 HfihbtU1Rv53d/otlOMs3ePZW3ifRpn6ADvsPofP/MRonVjms2yi/u+J2Rjm9/LP7YTP GFKVvinWUqcPuGLmyHcfIulw3SmM+xPt0u0cO3JiXo3QcPxnAOFw2B4RowyP8LGJybA4 xqaw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1766278129; x=1766882929; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=da+vCF+pqdBXBDQWII5F4MlcLfZ+w64zKK/Sjyx8cJo=; b=IEpbX+ajg5saCxa4jeE8KKaLP4sguf34EKYbzeuV5y9JrWavrnGYGnK+hE935J0zAo ohGBalb4e7ThNlSIrTQ3x8OGbScvidbMcav2Ilj7SbpUBBjmqn7oHkoHGZDzxEEejhLV tyBKRb3K5dbwjI3nKZv4fF/xNIm4wib882/foI3rSr1kA1I8oy/nC3NA5zFtk9FNZ5JJ yAz6jmuYRouiLLYbFWCaBmDeYxRXlHUAbLTQsXMd2mAf4S3JYVTmqeVFr+Fv5Uod8X7o I5u8nKQrTEkmoOLKXXD5CWIYUlyjx7pCXp/9+N6FrBeVn/Ea+U2Jbg8OxdG6GYryagvM /SZw== X-Gm-Message-State: AOJu0YwnEWuMXUsZDCil7doGE5ctO6FA+gYRNwnReg1HsM98xVM0LTMM OZSnQiigdtPfP5T0188QxOin2kVWfz9sW3Z+BBn1NM6aSze/UoE6NbCM8yUWEg== X-Gm-Gg: AY/fxX7iir+8TmlqoNKNUoauTU4qrNW+cfTuQ/2n9/KOeLR+P7XqBA28HHkbW03pxb0 Ci8EdMy6+aPLV4I3mOW/qNeULzk1tdUOH6Go4d4s4BhQUJvNkgxvEpB1iCUFa67ewGf/QvVAEyW zVQByxCgGhY43/CEFRGiHREIgU/Z2mQrryoRylIXTQotb8MeRXfDJeqL9q1vJ1irUwHaHu3zTqq mKkvi4mbMWAt3e/NNNzbYCQhIQkbufmyMw/RFtKCVYap3t0394sh9r/9MaoTwAYTn/3tCMEJnbP W7klel5ZsjuvZ27U3b3WGJtlYkCB3a+u1dT/GeeNoG2WW3cZhE23wjvv/wnpS8Xd6aoMtdFY3PM lBn3JhWP3LhJSW0QE5fdGtw7JoKovoK2YZ0p4LRkfaqYSOhTV/ZcaMSOaZ8h2nrv5lB+rUS6+kb tyFUnZ6uQHc5U9SWaLUii0M4N7UekmQa1Gzg2dtfkP5ANYyhRu X-Google-Smtp-Source: AGHT+IGpqNk6I+pE95b7jLPFoCy+/vkoGFPVfV2kiAZj4Hydnbli7KJ7gvUhTypv4SjCa67hSbfEww== X-Received: by 2002:a05:620a:4096:b0:8a2:d235:8136 with SMTP id af79cd13be357-8c090029d3emr1063253385a.25.1766278129015; Sat, 20 Dec 2025 16:48:49 -0800 (PST) Received: from localhost (pppoe-209-91-167-254.vianet.ca. [209.91.167.254]) by smtp.gmail.com with ESMTPSA id af79cd13be357-8c0973f0807sm511867385a.41.2025.12.20.16.48.47 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 20 Dec 2025 16:48:47 -0800 (PST) From: Trevor Woerner To: yocto-patches@lists.yoctoproject.org Subject: [meta-rockchip][PATCH v2 3/5] move KERNEL_FEATURES Date: Sat, 20 Dec 2025 19:48:41 -0500 Message-ID: <20251221004843.31946-3-twoerner@gmail.com> X-Mailer: git-send-email 2.51.0.193.g4975ec3473b4 In-Reply-To: <20251221004843.31946-1-twoerner@gmail.com> References: <20251221004843.31946-1-twoerner@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 21 Dec 2025 00:49:00 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto-patches/message/2839 Move KERNEL_FEATURES from SoC configurations to linux kernel recipes. Signed-off-by: Trevor Woerner --- changes since v1: - none --- conf/machine/include/rk3066.inc | 1 - conf/machine/include/rk3188.inc | 1 - conf/machine/include/rk3288.inc | 1 - conf/machine/include/rk3308.inc | 1 - conf/machine/include/rk3328.inc | 1 - conf/machine/include/rk3399.inc | 1 - conf/machine/include/rk3566.inc | 1 - conf/machine/include/rk3568.inc | 1 - conf/machine/include/rk3588s.inc | 1 - recipes-kernel/linux/linux-rockchip.inc | 3 +++ 10 files changed, 3 insertions(+), 9 deletions(-) diff --git a/conf/machine/include/rk3066.inc b/conf/machine/include/rk3066.inc index 2829a68431a8..fdca5770cc60 100644 --- a/conf/machine/include/rk3066.inc +++ b/conf/machine/include/rk3066.inc @@ -11,6 +11,5 @@ require conf/machine/include/arm/armv7a/tune-cortexa9.inc SERIAL_CONSOLES = "115200;ttyS2" KBUILD_DEFCONFIG = "multi_v7_defconfig" -KERNEL_FEATURES:append:rk3066 = " bsp/rockchip/remove-non-rockchip-arch-arm.scc" ENABLE_STATELESS_VPU_GST ?= "1" diff --git a/conf/machine/include/rk3188.inc b/conf/machine/include/rk3188.inc index 1af745524bfa..102726f59e28 100644 --- a/conf/machine/include/rk3188.inc +++ b/conf/machine/include/rk3188.inc @@ -11,6 +11,5 @@ require conf/machine/include/arm/armv7a/tune-cortexa9.inc SERIAL_CONSOLES = "115200;ttyFIQ0" KBUILD_DEFCONFIG = "multi_v7_defconfig" -KERNEL_FEATURES:append:rk3188 = " bsp/rockchip/remove-non-rockchip-arch-arm.scc" ENABLE_STATELESS_VPU_GST ?= "1" diff --git a/conf/machine/include/rk3288.inc b/conf/machine/include/rk3288.inc index 00cc04bc6378..8886beafaa4b 100644 --- a/conf/machine/include/rk3288.inc +++ b/conf/machine/include/rk3288.inc @@ -11,7 +11,6 @@ require conf/machine/include/arm/armv7a/tune-cortexa17.inc SERIAL_CONSOLES = "115200;ttyS2" KBUILD_DEFCONFIG ?= "multi_v7_defconfig" -KERNEL_FEATURES:append:rk3288 = " bsp/rockchip/remove-non-rockchip-arch-arm.scc" # Set UBOOT_SUFFIX to "itb" if you are going to use OP-TEE UBOOT_SUFFIX ?= "img" diff --git a/conf/machine/include/rk3308.inc b/conf/machine/include/rk3308.inc index 6876564fbcb2..59007ceb0f8d 100644 --- a/conf/machine/include/rk3308.inc +++ b/conf/machine/include/rk3308.inc @@ -12,7 +12,6 @@ require conf/machine/include/rockchip-wic.inc SERIAL_CONSOLES = "1500000;ttyS0" KBUILD_DEFCONFIG ?= "defconfig" -KERNEL_FEATURES:append:rk3308 = " bsp/rockchip/remove-non-rockchip-arch-arm64.scc" UBOOT_SUFFIX ?= "itb" UBOOT_ENTRYPOINT ?= "0x06000000" diff --git a/conf/machine/include/rk3328.inc b/conf/machine/include/rk3328.inc index 2fe2710399b1..34a61096cb3c 100644 --- a/conf/machine/include/rk3328.inc +++ b/conf/machine/include/rk3328.inc @@ -11,7 +11,6 @@ require conf/machine/include/arm/armv8a/tune-cortexa53.inc require conf/machine/include/rockchip-wic.inc KBUILD_DEFCONFIG ?= "defconfig" -KERNEL_FEATURES:append:rk3328 = " bsp/rockchip/remove-non-rockchip-arch-arm64.scc" TFA_PLATFORM = "rk3328" TFA_BUILD_TARGET = "bl31" diff --git a/conf/machine/include/rk3399.inc b/conf/machine/include/rk3399.inc index 8d30cf7e460b..166db7b80059 100644 --- a/conf/machine/include/rk3399.inc +++ b/conf/machine/include/rk3399.inc @@ -11,7 +11,6 @@ require conf/machine/include/arm/armv8a/tune-cortexa72-cortexa53.inc require conf/machine/include/rockchip-wic.inc KBUILD_DEFCONFIG ?= "defconfig" -KERNEL_FEATURES:append:rk3399 = " bsp/rockchip/remove-non-rockchip-arch-arm64.scc" TFA_PLATFORM = "rk3399" TFA_BUILD_TARGET = "bl31" diff --git a/conf/machine/include/rk3566.inc b/conf/machine/include/rk3566.inc index 5b65ad7d4a47..f6bf5c37d60e 100644 --- a/conf/machine/include/rk3566.inc +++ b/conf/machine/include/rk3566.inc @@ -10,7 +10,6 @@ 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" PREFERRED_PROVIDER_trusted-firmware-a = "rockchip-rkbin-tf-a" PREFERRED_PROVIDER_optee-os = "rockchip-rkbin-optee-os" diff --git a/conf/machine/include/rk3568.inc b/conf/machine/include/rk3568.inc index ad3952de074c..050110892f46 100644 --- a/conf/machine/include/rk3568.inc +++ b/conf/machine/include/rk3568.inc @@ -10,7 +10,6 @@ require conf/machine/include/arm/armv8-2a/tune-cortexa55.inc require conf/machine/include/rockchip-wic.inc KBUILD_DEFCONFIG ?= "defconfig" -KERNEL_FEATURES:append:rk3568 = " bsp/rockchip/remove-non-rockchip-arch-arm64.scc" PREFERRED_PROVIDER_trusted-firmware-a = "rockchip-rkbin-tf-a" PREFERRED_PROVIDER_optee-os = "rockchip-rkbin-optee-os" diff --git a/conf/machine/include/rk3588s.inc b/conf/machine/include/rk3588s.inc index 203b97c6353c..18c2fb2ecef8 100644 --- a/conf/machine/include/rk3588s.inc +++ b/conf/machine/include/rk3588s.inc @@ -9,7 +9,6 @@ require conf/machine/include/arm/armv8-2a/tune-cortexa76-cortexa55.inc require conf/machine/include/rockchip-wic.inc KBUILD_DEFCONFIG ?= "defconfig" -KERNEL_FEATURES:append:rk3588s = " bsp/rockchip/remove-non-rockchip-arch-arm64.scc" PREFERRED_PROVIDER_trusted-firmware-a = "rockchip-rkbin-tf-a" PREFERRED_PROVIDER_optee-os = "rockchip-rkbin-optee-os" diff --git a/recipes-kernel/linux/linux-rockchip.inc b/recipes-kernel/linux/linux-rockchip.inc index a648ecb20679..6c62e849834c 100644 --- a/recipes-kernel/linux/linux-rockchip.inc +++ b/recipes-kernel/linux/linux-rockchip.inc @@ -33,3 +33,6 @@ COMPATIBLE_MACHINE:soquartz = "soquartz" SRC_URI:append:rockchip = " file://rockchip-kmeta;type=kmeta;name=rockchip-kmeta;destsuffix=rockchip-kmeta" SRC_URI:append:nanopi-r4s = " file://realtek-r8169.cfg" + +KERNEL_FEATURES:append:rockchip:arm = " bsp/rockchip/remove-non-rockchip-arch-arm.scc" +KERNEL_FEATURES:append:rockchip:aarch64 = " bsp/rockchip/remove-non-rockchip-arch-arm64.scc" From patchwork Sun Dec 21 00:48:42 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trevor Woerner X-Patchwork-Id: 77075 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 5FE4AE67494 for ; Sun, 21 Dec 2025 00:49:00 +0000 (UTC) Received: from mail-qv1-f41.google.com (mail-qv1-f41.google.com [209.85.219.41]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.51713.1766278131463356538 for ; Sat, 20 Dec 2025 16:48:51 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=L9MzGV8t; spf=pass (domain: gmail.com, ip: 209.85.219.41, mailfrom: twoerner@gmail.com) Received: by mail-qv1-f41.google.com with SMTP id 6a1803df08f44-8885b3c06caso44992366d6.1 for ; Sat, 20 Dec 2025 16:48:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1766278130; x=1766882930; 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=w6WpzvTnWyR+O4VaVLAqcQ4q+pM0ycwKuDP37Sw9o38=; b=L9MzGV8t+1b6WWiWgVGu/SiPHhe2IKpQ4iqMwSL6BhxqbxTosLLfFA9r01B2IssWnX rFv0PTQehNIVCGar4AKwyLB7Wm6sOkfN530+buMO0HeAWG6GRJtmsHLO1xhhtLaLEjoo IWY9e3DpwhjL1ow8onOYiwheq0KAewYbHcnAjpr6ZaSUhip6wXoU9Hwe+G8ERiIAKL8+ kX3o8CKHj5Mpo8V92me7yLFnC0UcsKozeK7o5LDtuTpLUI5gCONiFOboy4H6CMXUow9D Jj3jO30szONF16zxS93JGvY0TrryqIkJJ8JiSfOq+vjJTbsFddtAxGVzzRvWj1oZ0RD7 Q9qw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1766278130; x=1766882930; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=w6WpzvTnWyR+O4VaVLAqcQ4q+pM0ycwKuDP37Sw9o38=; b=JeZSL+GsB3V9VOeJ4NIKBCyZFQo3H6bgSshEutJTPUXqqNFJ8bB2bRkwHuiMUaBYCU FIHNxH/MJ34JA5wC2lOOsWxVsJ5hJKCwhGQolCB0P+rL5J6tQ/LB/6VWBgdWV2/3Sil4 1MVJlJHr/JFPM5NFwWJOWO80Q+VpgGcGstwQFxEbbvVgT5CrDEUGMUVx0jTXm7qsMVmC xDFh+afU7AwUpPEgTKzg87NnT5HlQRg5J0CZGQgRvNW9J4ewqc97ENGjSoiUQcxBPCyf T9jtcAzUI230+Q+aaVmcNfV1rGqgs+7pTGytZZJ0KqkmjZ7PnbZjcaOFXxYhf60u/EEI M7PA== X-Gm-Message-State: AOJu0YwZy848HSQ8FKjezvcCyIeTKXAKhiAJoMS8iaPJliTMmLqjZTQH 4oExDDu53LnbCV6zO8al1N24R1dgYOJuAn5LCSaSxILWHupfnrOlRrlQrqa4cw== X-Gm-Gg: AY/fxX6eklZwSoBzxq3ChKY5zDp1Nb4Hrhit052jNtU+0oHlJjsr6t8vVSpL8/p/q4U /xuPoWFdi3bZPEVELOwy89MYfPd1WJdt73oIJ7EQEWRuMQS2Im1j2PIVKV81x6YHV6BXqvoS5ha YSy7duqx0yXCB7M3Ls9nLdLsGn5pHKBK0Rx93lyHwsNWS7uaAN/AGTyPBrTAkDltGOfJo1OiSyW pIIdpfOpZc2tB6spyG5BC8JJXKM5Ug/HX4X8Jg0VEB6F27tVAMKHBQ1bNJs/TfG6Jsd8ROz4oUK Wc0IW1xL2ALerQ08eWnQXKOy1P/g2dNvZpL1OTIQdrAJRUzRa6A6+dOx598ujb43C8Bb9m38LLd GiU0aSOmBEmgWp6zXP8srTlf2RQ5t6VlzkAhTKwzlHZxmlvWi7HymlFrcfbbGST6U1YE42WPx1s 4n8dawt7YRt2M3jz75D1B8cNKsi1j+EiTaTnWwByTUIBMMBhtz X-Google-Smtp-Source: AGHT+IFtLsaZ9Iok5gt+1yMucWhgnsN3ygz58/97GP6HKu21xEMrByPfAYaIC8IN9piNCBnybX22Kw== X-Received: by 2002:a05:620a:1904:b0:8ba:419f:c79e with SMTP id af79cd13be357-8c08fa9c407mr1091679485a.55.1766278129986; Sat, 20 Dec 2025 16:48:49 -0800 (PST) Received: from localhost (pppoe-209-91-167-254.vianet.ca. [209.91.167.254]) by smtp.gmail.com with ESMTPSA id af79cd13be357-8c0973f0807sm511867385a.41.2025.12.20.16.48.49 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 20 Dec 2025 16:48:49 -0800 (PST) From: Trevor Woerner To: yocto-patches@lists.yoctoproject.org Subject: [meta-rockchip][PATCH v2 4/5] kernel: clean up non-rockchip arch removal Date: Sat, 20 Dec 2025 19:48:42 -0500 Message-ID: <20251221004843.31946-4-twoerner@gmail.com> X-Mailer: git-send-email 2.51.0.193.g4975ec3473b4 In-Reply-To: <20251221004843.31946-1-twoerner@gmail.com> References: <20251221004843.31946-1-twoerner@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 21 Dec 2025 00:49:00 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto-patches/message/2840 Over time more architectures are supported by the linux kernel (both 32-bit and 64-bit), and others are dropped; architectures unrelated to rockchip. Clean up these non-rockchip architectures from the kernel config to help keep its size small. Signed-off-by: Trevor Woerner --- changes since v1: - none --- .../bsp/rockchip/remove-non-rockchip-arch-arm.cfg | 11 +++++++---- .../bsp/rockchip/remove-non-rockchip-arch-arm64.cfg | 5 +++++ 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/recipes-kernel/linux/linux-rockchip/rockchip-kmeta/bsp/rockchip/remove-non-rockchip-arch-arm.cfg b/recipes-kernel/linux/linux-rockchip/rockchip-kmeta/bsp/rockchip/remove-non-rockchip-arch-arm.cfg index e9443f17895c..fdd3e6964053 100644 --- a/recipes-kernel/linux/linux-rockchip/rockchip-kmeta/bsp/rockchip/remove-non-rockchip-arch-arm.cfg +++ b/recipes-kernel/linux/linux-rockchip/rockchip-kmeta/bsp/rockchip/remove-non-rockchip-arch-arm.cfg @@ -38,14 +38,16 @@ CONFIG_ARCH_MESON=n CONFIG_ARCH_MILBEAUT=n CONFIG_ARCH_MILBEAUT_M10V=n CONFIG_ARCH_MMP=n -CONFIG_ARCH_MSM8916=n -CONFIG_ARCH_MSM8960=n -CONFIG_ARCH_MSM8974=n -CONFIG_ARCH_MSM8X60=n CONFIG_ARCH_MVEBU=n CONFIG_ARCH_MXC=n +CONFIG_ARCH_OMAP=n +CONFIG_ARCH_OMAP2PLUS=n CONFIG_ARCH_OMAP3=n CONFIG_ARCH_OMAP4=n +CONFIG_SOC_OMAP5=n +CONFIG_SOC_AM33XX=n +CONFIG_SOC_AM43XX=n +CONFIG_SOC_DRA7XX=n CONFIG_ARCH_QCOM=n CONFIG_ARCH_R7S72100=n CONFIG_ARCH_R7S9210=n @@ -66,6 +68,7 @@ CONFIG_ARCH_R8A7794=n CONFIG_ARCH_R9A06G032=n CONFIG_ARCH_RENESAS=n CONFIG_ARCH_SH73A0=n +CONFIG_PLAT_SPEAR=n CONFIG_ARCH_SPEAR13XX=n CONFIG_ARCH_STI=n CONFIG_ARCH_STM32=n diff --git a/recipes-kernel/linux/linux-rockchip/rockchip-kmeta/bsp/rockchip/remove-non-rockchip-arch-arm64.cfg b/recipes-kernel/linux/linux-rockchip/rockchip-kmeta/bsp/rockchip/remove-non-rockchip-arch-arm64.cfg index 5b804a2ca26b..12fde404d64a 100644 --- a/recipes-kernel/linux/linux-rockchip/rockchip-kmeta/bsp/rockchip/remove-non-rockchip-arch-arm64.cfg +++ b/recipes-kernel/linux/linux-rockchip/rockchip-kmeta/bsp/rockchip/remove-non-rockchip-arch-arm64.cfg @@ -1,12 +1,16 @@ CONFIG_ARCH_ACTIONS=n +CONFIG_ARCH_AIROHA=n CONFIG_ARCH_ALPINE=n CONFIG_ARCH_APPLE=n +CONFIG_ARCH_AXIADO=n CONFIG_ARCH_BCM2835=n CONFIG_ARCH_BCM=n CONFIG_ARCH_BCMBCA=n CONFIG_ARCH_BCM_IPROC=n CONFIG_ARCH_BERLIN=n +CONFIG_ARCH_BLAIZE=n CONFIG_ARCH_BRCMSTB=n +CONFIG_ARCH_CIX=n CONFIG_ARCH_EXYNOS=n CONFIG_ARCH_SPARX5=n CONFIG_ARCH_HISI=n @@ -46,6 +50,7 @@ CONFIG_ARCH_R9A09G011=n CONFIG_ARCH_RENESAS=n CONFIG_ARCH_S32=n CONFIG_ARCH_SEATTLE=n +CONFIG_ARCH_SOPHGO=n CONFIG_ARCH_STM32=n CONFIG_ARCH_SPRD=n CONFIG_ARCH_SUNXI=n From patchwork Sun Dec 21 00:48:43 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trevor Woerner X-Patchwork-Id: 77077 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 65CF5E67497 for ; Sun, 21 Dec 2025 00:49:00 +0000 (UTC) Received: from mail-qk1-f177.google.com (mail-qk1-f177.google.com [209.85.222.177]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.51714.1766278133423886194 for ; Sat, 20 Dec 2025 16:48:53 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=SWYIJkfC; spf=pass (domain: gmail.com, ip: 209.85.222.177, mailfrom: twoerner@gmail.com) Received: by mail-qk1-f177.google.com with SMTP id af79cd13be357-8b2d6df99c5so386144985a.1 for ; Sat, 20 Dec 2025 16:48:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1766278132; x=1766882932; 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=W5MVt/C+mWPHjJddw6hNH1CaaQX2UooK9x4405NruFo=; b=SWYIJkfCRPXHejIhG/GRSL02WWT0HqYj8gvDXxSWu/9nfVyqCQNLq/JR8CRpO/DfAZ 3LYl/UdIvdA59uvn+fAJGNuWYccMTTUbEK8qrvehJ6hbOvdzL+89TO+JUApVgu2aSh1m DEDdoGEhV2b9fTjMq6WXcfTQS+OWae1iee1TyeoSM43SWHSOI5T27oxGekv31s02NBl2 eStt1zW6uAUCVCWV3mTk726MwBEzzbyzlhyhIZvYPwD16nIX9a6xDuTy7HYt3gWnnZBf o49sitxIFwX4anym2ewK4H5M3kN4mWSE7BeayGs6NXJu+bgqWxDeYUqzx3Su/os6Qwqp EdHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1766278132; x=1766882932; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=W5MVt/C+mWPHjJddw6hNH1CaaQX2UooK9x4405NruFo=; b=FXfEs0wlfhmgPdVJptIBhqXUcAfgXaOoWnYUvRq5ZekqTAqEKAF1pkuNC8BkEElF4X SDqyNEHez917usG9CkLrBnZ0NK9t9OQvBpGf9J+i6f+Syrdgz7Sgyq21rCw82RJYamgv zVfzCwSPMNqw0KAKwDshzGHw6tOsDBkh/SjufI5acl2gzXTIGUyTkuGlCs7KkPOGPklk qqzppxUhkzerOfBN5PwVJ/BeRV8kOlbntrlGjl7r89ufHQ9KUMMXODZTKfZplXD9ZQrg Y+k1cMNesVH/PE1GeJNAYbI1N+OHtDQ17nb/YZ96YzLdpEPEWhLGrGgXA+LOQUqdEIGo lt5A== X-Gm-Message-State: AOJu0YwLLcpTLnaQ9w2JNYF6EjKiYw4mCgRKrTjixWezoL8XCLm8iINf 74dgsXqfP/1vYf1//imVvo1ZjyhLzhh4yFyfY0VRN3dL0B2xx+1o8MpblVhP6A== X-Gm-Gg: AY/fxX7ZoyGRX0apmilSVkYpvva5+/ZKEPQgVwf+Reymc8WJnueW1v9rQbkAjq7P9/5 qCNWIEAuyfFay7Zsn5VmWdMDlnwPdg42YRqgTvD4wNlu/En02f2/YYXqCLTsdP2YgQqV7kyqAl/ 3299//0MtKY6f/4j0+Ay1Wf7cuCXlLTX1RGx7ganIPSSNYQ/BJbWKMIa/PeUp7wDT3dcTTU1cWO yb/n15bb7BbWuHOO2GPOFYm4kAXMkv3B251AzIqcVzb5et0e08mrCSjD7wVqiYFPzVlsDti4o73 cAifWTEIqBwwIU6tJqEEc3foDf+t1ytAzinLXV8IqaS4rAAplEg+laoV//FuXm09k0mpqNqJBcL whKhks7XbeaJFp3ST3WC9MPUbOt0ur1mhE1/mZXCrLlWYOs376cy8tRKU3DCFfMItzEw13P04wk gkoP+MQNP5UKpCjP100XVzdHlnFXPcTBtgSnrYrm8R0H5Oh6Cv X-Google-Smtp-Source: AGHT+IFRkms4DOwIfSQyOcfPq2GKjUaxv7ghojqsVRkszca2hb0E6eh4Dhm+VjFakKsYisMc9pD+Xg== X-Received: by 2002:a05:620a:1706:b0:8be:9218:4c62 with SMTP id af79cd13be357-8bee670c35dmr1668094285a.4.1766278131720; Sat, 20 Dec 2025 16:48:51 -0800 (PST) Received: from localhost (pppoe-209-91-167-254.vianet.ca. [209.91.167.254]) by smtp.gmail.com with ESMTPSA id af79cd13be357-8c0973f0807sm511867385a.41.2025.12.20.16.48.50 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 20 Dec 2025 16:48:50 -0800 (PST) From: Trevor Woerner To: yocto-patches@lists.yoctoproject.org Subject: [meta-rockchip][PATCH v2 5/5] fix u-boot for tf-a firmware Date: Sat, 20 Dec 2025 19:48:43 -0500 Message-ID: <20251221004843.31946-5-twoerner@gmail.com> X-Mailer: git-send-email 2.51.0.193.g4975ec3473b4 In-Reply-To: <20251221004843.31946-1-twoerner@gmail.com> References: <20251221004843.31946-1-twoerner@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 21 Dec 2025 00:49:00 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto-patches/message/2841 A change was made in the location and name of the bl31 artifact for device firmware built with trusted-firmware-a. Update the build to match so these devices continue to build successfully. Signed-off-by: Trevor Woerner --- changes since v1: - none --- .../trusted-firmware-a/trusted-firmware-a_%.bbappend | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend b/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend index 4c7fc3c4c180..7c94b646c316 100644 --- a/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend +++ b/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend @@ -47,3 +47,14 @@ fixup_baudrate:rk3588s() { # If you use upstream U-Boot with SPL_ATF_NO_PLATFORM_PARAM disabled, you can # simply override this function to do nothing. do_patch[postfuncs] += "fixup_baudrate" + +do_deploy() { + : +} +do_deploy:rk3328() { + cp -rf ${D}/firmware/trusted-firmware-a/bl31.elf ${DEPLOYDIR}/bl31-rk3328.elf +} +do_deploy:rk3399() { + cp -rf ${D}/firmware/trusted-firmware-a/bl31.elf ${DEPLOYDIR}/bl31-rk3399.elf +} +addtask deploy after do_install