| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <20251208073306.75279-4-wenst@chromium.org>
Date: Mon, 8 Dec 2025 15:33:04 +0800
From: Chen-Yu Tsai <wenst@...omium.org>
To: Matthias Brugger <matthias.bgg@...il.com>,
AngeloGioacchino Del Regno <angelogioacchino.delregno@...labora.com>,
Rob Herring <robh@...nel.org>,
Krzysztof Kozlowski <krzk+dt@...nel.org>,
Conor Dooley <conor+dt@...nel.org>
Cc: Chen-Yu Tsai <wenst@...omium.org>,
linux-mediatek@...ts.infradead.org,
linux-arm-kernel@...ts.infradead.org,
devicetree@...r.kernel.org,
linux-kernel@...r.kernel.org
Subject: [RFC PATCH 3/3] [EXAMPLE] arm64: dts: mediatek: ciri: Drop SKU-specific overlays
The final SKU-specific overlays only set the top level board compatible
and model, but add nothing else. The specifics are not super important
to the kernel, and could be removed so we don't have to have so many
source files.
However, the ChromeOS bootloader (coreboot / depthcharge) selects the
device tree blob to load basd on the compatible string, so the mapping
from a SKU-specific compatible to a DTB (or a series of DTB/DTBOs) needs
to be maintained somewhere to build the FIT image.
Move the SKU-specific top level compatible strings to a separate file
stored with the device tree sources, and drop the SKU specific files.
Signed-off-by: Chen-Yu Tsai <wenst@...omium.org>
---
This is meant to serve as an example for dropping SKU-specific files
that just have specific identifiers that the kernel doesn't care about,
i.e. doesn't need to be present in the DTB itself, but need to be
preserved for other purposes.
---
arch/arm64/boot/dts/mediatek/Makefile | 24 +++------
.../dts/mediatek/mt8188-geralt-ciri-sku0.dtso | 11 ----
.../dts/mediatek/mt8188-geralt-ciri-sku1.dtso | 11 ----
.../dts/mediatek/mt8188-geralt-ciri-sku2.dtso | 11 ----
.../dts/mediatek/mt8188-geralt-ciri-sku3.dtso | 11 ----
.../dts/mediatek/mt8188-geralt-ciri-sku4.dtso | 11 ----
.../dts/mediatek/mt8188-geralt-ciri-sku5.dtso | 11 ----
.../dts/mediatek/mt8188-geralt-ciri-sku6.dtso | 11 ----
.../dts/mediatek/mt8188-geralt-ciri-sku7.dtso | 11 ----
arch/arm64/boot/dts/mediatek/mt8188.yaml | 51 +++++++++++++++++++
10 files changed, 59 insertions(+), 104 deletions(-)
delete mode 100644 arch/arm64/boot/dts/mediatek/mt8188-geralt-ciri-sku0.dtso
delete mode 100644 arch/arm64/boot/dts/mediatek/mt8188-geralt-ciri-sku1.dtso
delete mode 100644 arch/arm64/boot/dts/mediatek/mt8188-geralt-ciri-sku2.dtso
delete mode 100644 arch/arm64/boot/dts/mediatek/mt8188-geralt-ciri-sku3.dtso
delete mode 100644 arch/arm64/boot/dts/mediatek/mt8188-geralt-ciri-sku4.dtso
delete mode 100644 arch/arm64/boot/dts/mediatek/mt8188-geralt-ciri-sku5.dtso
delete mode 100644 arch/arm64/boot/dts/mediatek/mt8188-geralt-ciri-sku6.dtso
delete mode 100644 arch/arm64/boot/dts/mediatek/mt8188-geralt-ciri-sku7.dtso
create mode 100644 arch/arm64/boot/dts/mediatek/mt8188.yaml
diff --git a/arch/arm64/boot/dts/mediatek/Makefile b/arch/arm64/boot/dts/mediatek/Makefile
index 39a844386366..5123d15c62c1 100644
--- a/arch/arm64/boot/dts/mediatek/Makefile
+++ b/arch/arm64/boot/dts/mediatek/Makefile
@@ -89,36 +89,28 @@ dtb-$(CONFIG_ARCH_MEDIATEK) += mt8188-evb.dtb
mt8188-geralt-ciri-sku0-dtbs := mt8188-geralt-ciri.dtb \
mt8188-geralt-ciri-panel-boe.dtbo \
- mt8188-geralt-ciri-audio-max98390-rt5682s.dtbo \
- mt8188-geralt-ciri-sku0.dtbo
+ mt8188-geralt-ciri-audio-max98390-rt5682s.dtbo
mt8188-geralt-ciri-sku1-dtbs := mt8188-geralt-ciri.dtb \
mt8188-geralt-ciri-panel-ivo.dtbo \
- mt8188-geralt-ciri-audio-max98390-es8326.dtbo \
- mt8188-geralt-ciri-sku1.dtbo
+ mt8188-geralt-ciri-audio-max98390-es8326.dtbo
mt8188-geralt-ciri-sku2-dtbs := mt8188-geralt-ciri.dtb \
mt8188-geralt-ciri-panel-boe.dtbo \
- mt8188-geralt-ciri-audio-max98390-es8326.dtbo \
- mt8188-geralt-ciri-sku2.dtbo
+ mt8188-geralt-ciri-audio-max98390-es8326.dtbo
mt8188-geralt-ciri-sku3-dtbs := mt8188-geralt-ciri.dtb \
mt8188-geralt-ciri-panel-ivo.dtbo \
- mt8188-geralt-ciri-audio-max98390-rt5682s.dtbo \
- mt8188-geralt-ciri-sku3.dtbo
+ mt8188-geralt-ciri-audio-max98390-rt5682s.dtbo
mt8188-geralt-ciri-sku4-dtbs := mt8188-geralt-ciri.dtb \
mt8188-geralt-ciri-panel-boe.dtbo \
- mt8188-geralt-ciri-audio-tas2563-rt5682s.dtbo \
- mt8188-geralt-ciri-sku4.dtbo
+ mt8188-geralt-ciri-audio-tas2563-rt5682s.dtbo
mt8188-geralt-ciri-sku5-dtbs := mt8188-geralt-ciri.dtb \
mt8188-geralt-ciri-panel-ivo.dtbo \
- mt8188-geralt-ciri-audio-tas2563-es8326.dtbo \
- mt8188-geralt-ciri-sku5.dtbo
+ mt8188-geralt-ciri-audio-tas2563-es8326.dtbo
mt8188-geralt-ciri-sku6-dtbs := mt8188-geralt-ciri.dtb \
mt8188-geralt-ciri-panel-boe.dtbo \
- mt8188-geralt-ciri-audio-tas2563-es8326.dtbo \
- mt8188-geralt-ciri-sku6.dtbo
+ mt8188-geralt-ciri-audio-tas2563-es8326.dtbo
mt8188-geralt-ciri-sku7-dtbs := mt8188-geralt-ciri.dtb \
mt8188-geralt-ciri-panel-ivo.dtbo \
- mt8188-geralt-ciri-audio-tas2563-rt5682s.dtbo \
- mt8188-geralt-ciri-sku7.dtbo
+ mt8188-geralt-ciri-audio-tas2563-rt5682s.dtbo
dtb-$(CONFIG_ARCH_MEDIATEK) += mt8188-geralt-ciri-sku0.dtb
dtb-$(CONFIG_ARCH_MEDIATEK) += mt8188-geralt-ciri-sku1.dtb
diff --git a/arch/arm64/boot/dts/mediatek/mt8188-geralt-ciri-sku0.dtso b/arch/arm64/boot/dts/mediatek/mt8188-geralt-ciri-sku0.dtso
deleted file mode 100644
index 884a7b2d943c..000000000000
--- a/arch/arm64/boot/dts/mediatek/mt8188-geralt-ciri-sku0.dtso
+++ /dev/null
@@ -1,11 +0,0 @@
-// SPDX-License-Identifier: (GPL-2.0 OR MIT)
-/*
- * Copyright 2023 Google LLC
- */
-/dts-v1/;
-/plugin/;
-
-&{/} {
- model = "Google Ciri sku0 board";
- compatible = "google,ciri-sku0", "google,ciri", "mediatek,mt8188";
-};
diff --git a/arch/arm64/boot/dts/mediatek/mt8188-geralt-ciri-sku1.dtso b/arch/arm64/boot/dts/mediatek/mt8188-geralt-ciri-sku1.dtso
deleted file mode 100644
index d3ed6ea535d7..000000000000
--- a/arch/arm64/boot/dts/mediatek/mt8188-geralt-ciri-sku1.dtso
+++ /dev/null
@@ -1,11 +0,0 @@
-// SPDX-License-Identifier: (GPL-2.0 OR MIT)
-/*
- * Copyright 2023 Google LLC
- */
-/dts-v1/;
-/plugin/;
-
-&{/} {
- model = "Google Ciri sku1 board";
- compatible = "google,ciri-sku1", "google,ciri", "mediatek,mt8188";
-};
diff --git a/arch/arm64/boot/dts/mediatek/mt8188-geralt-ciri-sku2.dtso b/arch/arm64/boot/dts/mediatek/mt8188-geralt-ciri-sku2.dtso
deleted file mode 100644
index 3f9d38bc2ad2..000000000000
--- a/arch/arm64/boot/dts/mediatek/mt8188-geralt-ciri-sku2.dtso
+++ /dev/null
@@ -1,11 +0,0 @@
-// SPDX-License-Identifier: (GPL-2.0 OR MIT)
-/*
- * Copyright 2024 Google LLC
- */
-/dts-v1/;
-/plugin/;
-
-&{/} {
- model = "Google Ciri sku2 board";
- compatible = "google,ciri-sku2", "google,ciri", "mediatek,mt8188";
-};
diff --git a/arch/arm64/boot/dts/mediatek/mt8188-geralt-ciri-sku3.dtso b/arch/arm64/boot/dts/mediatek/mt8188-geralt-ciri-sku3.dtso
deleted file mode 100644
index e6a6f8f06141..000000000000
--- a/arch/arm64/boot/dts/mediatek/mt8188-geralt-ciri-sku3.dtso
+++ /dev/null
@@ -1,11 +0,0 @@
-// SPDX-License-Identifier: (GPL-2.0 OR MIT)
-/*
- * Copyright 2024 Google LLC
- */
-/dts-v1/;
-/plugin/;
-
-&{/} {
- model = "Google Ciri sku3 board";
- compatible = "google,ciri-sku3", "google,ciri", "mediatek,mt8188";
-};
diff --git a/arch/arm64/boot/dts/mediatek/mt8188-geralt-ciri-sku4.dtso b/arch/arm64/boot/dts/mediatek/mt8188-geralt-ciri-sku4.dtso
deleted file mode 100644
index ee5b28c4ef00..000000000000
--- a/arch/arm64/boot/dts/mediatek/mt8188-geralt-ciri-sku4.dtso
+++ /dev/null
@@ -1,11 +0,0 @@
-// SPDX-License-Identifier: (GPL-2.0 OR MIT)
-/*
- * Copyright 2024 Google LLC
- */
-/dts-v1/;
-/plugin/;
-
-&{/} {
- model = "Google Ciri sku4 board (rev4)";
- compatible = "google,ciri-sku4", "google,ciri", "mediatek,mt8188";
-};
diff --git a/arch/arm64/boot/dts/mediatek/mt8188-geralt-ciri-sku5.dtso b/arch/arm64/boot/dts/mediatek/mt8188-geralt-ciri-sku5.dtso
deleted file mode 100644
index ccf8d2f0eb70..000000000000
--- a/arch/arm64/boot/dts/mediatek/mt8188-geralt-ciri-sku5.dtso
+++ /dev/null
@@ -1,11 +0,0 @@
-// SPDX-License-Identifier: (GPL-2.0 OR MIT)
-/*
- * Copyright 2024 Google LLC
- */
-/dts-v1/;
-/plugin/;
-
-&{/} {
- model = "Google Ciri sku5 board (rev4)";
- compatible = "google,ciri-sku5", "google,ciri", "mediatek,mt8188";
-};
diff --git a/arch/arm64/boot/dts/mediatek/mt8188-geralt-ciri-sku6.dtso b/arch/arm64/boot/dts/mediatek/mt8188-geralt-ciri-sku6.dtso
deleted file mode 100644
index 773c702b59d8..000000000000
--- a/arch/arm64/boot/dts/mediatek/mt8188-geralt-ciri-sku6.dtso
+++ /dev/null
@@ -1,11 +0,0 @@
-// SPDX-License-Identifier: (GPL-2.0 OR MIT)
-/*
- * Copyright 2024 Google LLC
- */
-/dts-v1/;
-/plugin/;
-
-&{/} {
- model = "Google Ciri sku6 board (rev4)";
- compatible = "google,ciri-sku6", "google,ciri", "mediatek,mt8188";
-};
diff --git a/arch/arm64/boot/dts/mediatek/mt8188-geralt-ciri-sku7.dtso b/arch/arm64/boot/dts/mediatek/mt8188-geralt-ciri-sku7.dtso
deleted file mode 100644
index c22860eab9f8..000000000000
--- a/arch/arm64/boot/dts/mediatek/mt8188-geralt-ciri-sku7.dtso
+++ /dev/null
@@ -1,11 +0,0 @@
-// SPDX-License-Identifier: (GPL-2.0 OR MIT)
-/*
- * Copyright 2024 Google LLC
- */
-/dts-v1/;
-/plugin/;
-
-&{/} {
- model = "Google Ciri sku7 board (rev4)";
- compatible = "google,ciri-sku7", "google,ciri", "mediatek,mt8188";
-};
diff --git a/arch/arm64/boot/dts/mediatek/mt8188.yaml b/arch/arm64/boot/dts/mediatek/mt8188.yaml
new file mode 100644
index 000000000000..7808ae20060f
--- /dev/null
+++ b/arch/arm64/boot/dts/mediatek/mt8188.yaml
@@ -0,0 +1,51 @@
+# SPDX-License-Identifier: (GPL-2.0 OR MIT)
+%YAML 1.2
+---
+- dtb: mt8188-geralt-ciri-sku0.dtb
+ description: Google Ciri board SKU0
+ compatibles:
+ - google,ciri-sku0
+ - google,ciri
+ - mediatek,mt8188
+- dtb: mt8188-geralt-ciri-sku1.dtb
+ description: Google Ciri board SKU1
+ compatibles:
+ - google,ciri-sku1
+ - google,ciri
+ - mediatek,mt8188
+- dtb: mt8188-geralt-ciri-sku2.dtb
+ description: Google Ciri board SKU2
+ compatibles:
+ - google,ciri-sku2
+ - google,ciri
+ - mediatek,mt8188
+- dtb: mt8188-geralt-ciri-sku3.dtb
+ description: Google Ciri board SKU3
+ compatibles:
+ - google,ciri-sku3
+ - google,ciri
+ - mediatek,mt8188
+- dtb: mt8188-geralt-ciri-sku4.dtb
+ description: Google Ciri board SKU4
+ compatibles:
+ - google,ciri-sku4
+ - google,ciri
+ - mediatek,mt8188
+- dtb: mt8188-geralt-ciri-sku5.dtb
+ description: Google Ciri board SKU5
+ compatibles:
+ - google,ciri-sku5
+ - google,ciri
+ - mediatek,mt8188
+- dtb: mt8188-geralt-ciri-sku6.dtb
+ description: Google Ciri board SKU6
+ compatibles:
+ - google,ciri-sku6
+ - google,ciri
+ - mediatek,mt8188
+- dtb: mt8188-geralt-ciri-sku7.dtb
+ description: Google Ciri board SKU7
+ compatibles:
+ - google,ciri-sku7
+ - google,ciri
+ - mediatek,mt8188
--
2.52.0.223.gf5cc29aaa4-goog
Powered by blists - more mailing lists