* [meta-rockchip][PATCH 1/5] kmeta reorganization
@ 2025-12-19 7:00 Trevor Woerner
2025-12-19 7:00 ` [meta-rockchip][PATCH 2/5] provide kernel *.inc Trevor Woerner
` (4 more replies)
0 siblings, 5 replies; 6+ messages in thread
From: Trevor Woerner @ 2025-12-19 7:00 UTC (permalink / raw)
To: yocto-patches
Reorganize the rockchip kmeta data so linux-yocto and linux-yocto-dev
share the same files.
Signed-off-by: Trevor Woerner <twoerner@gmail.com>
---
.../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"
--
2.50.0.173.g8b6f19ccfc3a
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [meta-rockchip][PATCH 2/5] provide kernel *.inc
2025-12-19 7:00 [meta-rockchip][PATCH 1/5] kmeta reorganization Trevor Woerner
@ 2025-12-19 7:00 ` Trevor Woerner
2025-12-19 7:00 ` [meta-rockchip][PATCH 3/5] move KERNEL_FEATURES Trevor Woerner
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Trevor Woerner @ 2025-12-19 7:00 UTC (permalink / raw)
To: yocto-patches
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 <twoerner@gmail.com>
---
recipes-kernel/linux/linux-%.bbappend | 1 +
.../linux/{linux-yocto_%.bbappend => linux-rockchip.inc} | 0
recipes-kernel/linux/linux-yocto-dev.bbappend | 3 ---
3 files changed, 1 insertion(+), 3 deletions(-)
create mode 100644 recipes-kernel/linux/linux-%.bbappend
rename recipes-kernel/linux/{linux-yocto_%.bbappend => linux-rockchip.inc} (100%)
delete mode 100644 recipes-kernel/linux/linux-yocto-dev.bbappend
diff --git a/recipes-kernel/linux/linux-%.bbappend b/recipes-kernel/linux/linux-%.bbappend
new file mode 100644
index 000000000000..34bf335d0b10
--- /dev/null
+++ b/recipes-kernel/linux/linux-%.bbappend
@@ -0,0 +1 @@
+require linux-rockchip.inc
diff --git a/recipes-kernel/linux/linux-yocto_%.bbappend b/recipes-kernel/linux/linux-rockchip.inc
similarity index 100%
rename from recipes-kernel/linux/linux-yocto_%.bbappend
rename to recipes-kernel/linux/linux-rockchip.inc
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"
--
2.50.0.173.g8b6f19ccfc3a
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [meta-rockchip][PATCH 3/5] move KERNEL_FEATURES
2025-12-19 7:00 [meta-rockchip][PATCH 1/5] kmeta reorganization Trevor Woerner
2025-12-19 7:00 ` [meta-rockchip][PATCH 2/5] provide kernel *.inc Trevor Woerner
@ 2025-12-19 7:00 ` Trevor Woerner
2025-12-19 7:00 ` [meta-rockchip][PATCH 4/5] kernel: clean up non-rockchip arch removal Trevor Woerner
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Trevor Woerner @ 2025-12-19 7:00 UTC (permalink / raw)
To: yocto-patches
Move KERNEL_FEATURES from SoC configurations to linux kernel recipes.
Signed-off-by: Trevor Woerner <twoerner@gmail.com>
---
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"
--
2.50.0.173.g8b6f19ccfc3a
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [meta-rockchip][PATCH 4/5] kernel: clean up non-rockchip arch removal
2025-12-19 7:00 [meta-rockchip][PATCH 1/5] kmeta reorganization Trevor Woerner
2025-12-19 7:00 ` [meta-rockchip][PATCH 2/5] provide kernel *.inc Trevor Woerner
2025-12-19 7:00 ` [meta-rockchip][PATCH 3/5] move KERNEL_FEATURES Trevor Woerner
@ 2025-12-19 7:00 ` Trevor Woerner
2025-12-19 7:00 ` [meta-rockchip][PATCH 5/5] fix u-boot for tf-a firmware Trevor Woerner
[not found] ` <18828BC83A0901CB.1614991@lists.yoctoproject.org>
4 siblings, 0 replies; 6+ messages in thread
From: Trevor Woerner @ 2025-12-19 7:00 UTC (permalink / raw)
To: yocto-patches
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 <twoerner@gmail.com>
---
.../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
--
2.50.0.173.g8b6f19ccfc3a
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [meta-rockchip][PATCH 5/5] fix u-boot for tf-a firmware
2025-12-19 7:00 [meta-rockchip][PATCH 1/5] kmeta reorganization Trevor Woerner
` (2 preceding siblings ...)
2025-12-19 7:00 ` [meta-rockchip][PATCH 4/5] kernel: clean up non-rockchip arch removal Trevor Woerner
@ 2025-12-19 7:00 ` Trevor Woerner
[not found] ` <18828BC83A0901CB.1614991@lists.yoctoproject.org>
4 siblings, 0 replies; 6+ messages in thread
From: Trevor Woerner @ 2025-12-19 7:00 UTC (permalink / raw)
To: yocto-patches
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 <twoerner@gmail.com>
---
.../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
--
2.50.0.173.g8b6f19ccfc3a
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [yocto-patches] [meta-rockchip][PATCH 2/5] provide kernel *.inc
[not found] ` <18828BC83A0901CB.1614991@lists.yoctoproject.org>
@ 2025-12-19 13:43 ` Trevor Woerner
0 siblings, 0 replies; 6+ messages in thread
From: Trevor Woerner @ 2025-12-19 13:43 UTC (permalink / raw)
To: yocto-patches
On Fri 2025-12-19 @ 02:00:11 AM, Trevor Woerner via lists.yoctoproject.org wrote:
> 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 <twoerner@gmail.com>
> ---
> recipes-kernel/linux/linux-%.bbappend | 1 +
> .../linux/{linux-yocto_%.bbappend => linux-rockchip.inc} | 0
> recipes-kernel/linux/linux-yocto-dev.bbappend | 3 ---
> 3 files changed, 1 insertion(+), 3 deletions(-)
> create mode 100644 recipes-kernel/linux/linux-%.bbappend
> rename recipes-kernel/linux/{linux-yocto_%.bbappend => linux-rockchip.inc} (100%)
> delete mode 100644 recipes-kernel/linux/linux-yocto-dev.bbappend
>
> diff --git a/recipes-kernel/linux/linux-%.bbappend b/recipes-kernel/linux/linux-%.bbappend
> new file mode 100644
> index 000000000000..34bf335d0b10
> --- /dev/null
> +++ b/recipes-kernel/linux/linux-%.bbappend
I considered this one for quite a while. I saw it in Bruce's
meta-virtualization and thought it was clever, but now that I've slept
on it, I think it's a bit too aggressive for meta-rockchip.
I think instead of 'linux-%.bbappend' maybe 'linux-yocto%.bbappend'? or
'linux-yocto_%.bbappend' would be better?
> @@ -0,0 +1 @@
> +require linux-rockchip.inc
> diff --git a/recipes-kernel/linux/linux-yocto_%.bbappend b/recipes-kernel/linux/linux-rockchip.inc
> similarity index 100%
> rename from recipes-kernel/linux/linux-yocto_%.bbappend
> rename to recipes-kernel/linux/linux-rockchip.inc
> 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"
> --
> 2.50.0.173.g8b6f19ccfc3a
>
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#2824): https://lists.yoctoproject.org/g/yocto-patches/message/2824
> Mute This Topic: https://lists.yoctoproject.org/mt/116856174/900817
> Group Owner: yocto-patches+owner@lists.yoctoproject.org
> Unsubscribe: https://lists.yoctoproject.org/g/yocto-patches/leave/13168745/900817/63955952/xyzzy [twoerner@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
>
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2025-12-19 13:43 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-12-19 7:00 [meta-rockchip][PATCH 1/5] kmeta reorganization Trevor Woerner
2025-12-19 7:00 ` [meta-rockchip][PATCH 2/5] provide kernel *.inc Trevor Woerner
2025-12-19 7:00 ` [meta-rockchip][PATCH 3/5] move KERNEL_FEATURES Trevor Woerner
2025-12-19 7:00 ` [meta-rockchip][PATCH 4/5] kernel: clean up non-rockchip arch removal Trevor Woerner
2025-12-19 7:00 ` [meta-rockchip][PATCH 5/5] fix u-boot for tf-a firmware Trevor Woerner
[not found] ` <18828BC83A0901CB.1614991@lists.yoctoproject.org>
2025-12-19 13:43 ` [yocto-patches] [meta-rockchip][PATCH 2/5] provide kernel *.inc Trevor Woerner
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.