Skip to contentSkip to conversation

ARM: dts: sunxi: Removed redundant sun8i entry

PATCH In review Ke Li 3 participants 3 messages Jun 3, 2024

Subsystems (2)
lore
Share & tools
lore

Ke Li

author
#0 lore raw

PATCH 1/1 ARM: dts: sunxi: Removed redundant sun8i entry

Hi, Jernej.skrabec@ and [email protected],

I'm looking into the dts Makefile of Allwinner. It seems like in 724ba6751532055db75992fc6ae21c3e322e94a7 "ARM: dts: Move .dts files to vendor sub-directories", we made a mistake and duplicate the "dtb-$(CONFIG_MACH_SUN8I)" entry on line 202 and line 265. A patched is generated for this.

KL

---
 arch/arm/boot/dts/allwinner/Makefile | 65 +---------------------------
 1 file changed, 2 insertions(+), 63 deletions(-)
arch/arm/boot/dts/allwinner/Makefile +2 -63
index 4247f19b1..f9484f8d4 100644
@@ -260,69 +260,8 @@ dtb-$(CONFIG_MACH_SUN8I) += \
 	sun8i-v3s-anbernic-rg-nano.dtb \
 	sun8i-v3s-licheepi-zero.dtb \
 	sun8i-v3s-licheepi-zero-dock.dtb \
-	sun8i-v40-bananapi-m2-berry.dtb
-dtb-$(CONFIG_MACH_SUN8I) += \
-	sun8i-a23-evb.dtb \
-	sun8i-a23-gt90h-v4.dtb \
-	sun8i-a23-inet86dz.dtb \
-	sun8i-a23-ippo-q8h-v5.dtb \
-	sun8i-a23-ippo-q8h-v1.2.dtb \
-	sun8i-a23-polaroid-mid2407pxe03.dtb \
-	sun8i-a23-polaroid-mid2809pxe04.dtb \
-	sun8i-a23-q8-tablet.dtb \
-	sun8i-a33-et-q8-v1.6.dtb \
-	sun8i-a33-ga10h-v1.1.dtb \
-	sun8i-a33-inet-d978-rev2.dtb \
-	sun8i-a33-ippo-q8h-v1.2.dtb \
-	sun8i-a33-olinuxino.dtb \
-	sun8i-a33-q8-tablet.dtb \
-	sun8i-a33-sinlinx-sina33.dtb \
-	sun8i-a83t-allwinner-h8homlet-v2.dtb \
-	sun8i-a83t-bananapi-m3.dtb \
-	sun8i-a83t-cubietruck-plus.dtb \
-	sun8i-a83t-tbs-a711.dtb \
-	sun8i-h2-plus-bananapi-m2-zero.dtb \
-	sun8i-h2-plus-libretech-all-h3-cc.dtb \
-	sun8i-h2-plus-orangepi-r1.dtb \
-	sun8i-h2-plus-orangepi-zero.dtb \
-	sun8i-h3-bananapi-m2-plus.dtb \
-	sun8i-h3-bananapi-m2-plus-v1.2.dtb \
-	sun8i-h3-beelink-x2.dtb \
-	sun8i-h3-libretech-all-h3-cc.dtb \
-	sun8i-h3-mapleboard-mp130.dtb \
-	sun8i-h3-nanopi-duo2.dtb \
-	sun8i-h3-nanopi-m1.dtb\
-	\
-	sun8i-h3-nanopi-m1-plus.dtb \
-	sun8i-h3-nanopi-neo.dtb \
-	sun8i-h3-nanopi-neo-air.dtb \
-	sun8i-h3-nanopi-r1.dtb \
-	sun8i-h3-orangepi-2.dtb \
-	sun8i-h3-orangepi-lite.dtb \
-	sun8i-h3-orangepi-one.dtb \
-	sun8i-h3-orangepi-pc.dtb \
-	sun8i-h3-orangepi-pc-plus.dtb \
-	sun8i-h3-orangepi-plus.dtb \
-	sun8i-h3-orangepi-plus2e.dtb \
-	sun8i-h3-orangepi-zero-plus2.dtb \
-	sun8i-h3-rervision-dvk.dtb \
-	sun8i-h3-zeropi.dtb \
-	sun8i-h3-emlid-neutis-n5h3-devboard.dtb \
-	sun8i-r16-bananapi-m2m.dtb \
-	sun8i-r16-nintendo-nes-classic.dtb \
-	sun8i-r16-nintendo-super-nes-classic.dtb \
-	sun8i-r16-parrot.dtb \
-	sun8i-r40-bananapi-m2-ultra.dtb \
-	sun8i-r40-oka40i-c.dtb \
-	sun8i-s3-elimo-initium.dtb \
-	sun8i-s3-lichee-zero-plus.dtb \
-	sun8i-s3-pinecube.dtb \
-	sun8i-t113s-mangopi-mq-r-t113.dtb \
-	sun8i-t3-cqa3t-bv3.dtb \
-	sun8i-v3-sl631-imx179.dtb \
-	sun8i-v3s-licheepi-zero.dtb \
-	sun8i-v3s-licheepi-zero-dock.dtb \
-	sun8i-v40-bananapi-m2-berry.dtb
+	sun8i-v40-bananapi-m2-berry.dtb \
+	sun8i-h3-nanopi-m1.dtb
 dtb-$(CONFIG_MACH_SUN9I) += \
 	sun9i-a80-optimus.dtb \
 	sun9i-a80-cubieboard4.dtb
Signature · 1 line
2.34.1
#1 lore raw

On Mon, 3 Jun 2024 17:51:34 +0800
Ke Li <[email protected]> wrote:

Hi KL,

Quoted 1 line

Hi, Jernej.skrabec@ and [email protected],

please use scripts/get_maintainer.pl on the patch file to generate a list of emails that patches should be send to. You do not need to include everyone mentioned in that output, but at least the maintainers and the lists.

Quoted 2 lines

I'm looking into the dts Makefile of Allwinner. It seems like in 724ba6751532055db75992fc6ae21c3e322e94a7 "ARM: dts: Move .dts files to vendor sub-directories", we made a mistake and duplicate the "dtb-$(CONFIG_MACH_SUN8I)" entry on line 202 and line 265. A patched is generated for this.

Pavel sent the same patch already two months ago:
https://lore.kernel.org/linux-sunxi/[email protected]/

Having said this, I wonder what happened to that patch. I think we agreed on this, but I don't see it any tree?

Cheers,
Andre

Quoted 84 lines

KL

---
 arch/arm/boot/dts/allwinner/Makefile | 65 +---------------------------
 1 file changed, 2 insertions(+), 63 deletions(-)
arch/arm/boot/dts/allwinner/Makefile +2 -63
index 4247f19b1..f9484f8d4 100644
@@ -260,69 +260,8 @@ dtb-$(CONFIG_MACH_SUN8I) += \
 	sun8i-v3s-anbernic-rg-nano.dtb \
 	sun8i-v3s-licheepi-zero.dtb \
 	sun8i-v3s-licheepi-zero-dock.dtb \
-	sun8i-v40-bananapi-m2-berry.dtb
-dtb-$(CONFIG_MACH_SUN8I) += \
-	sun8i-a23-evb.dtb \
-	sun8i-a23-gt90h-v4.dtb \
-	sun8i-a23-inet86dz.dtb \
-	sun8i-a23-ippo-q8h-v5.dtb \
-	sun8i-a23-ippo-q8h-v1.2.dtb \
-	sun8i-a23-polaroid-mid2407pxe03.dtb \
-	sun8i-a23-polaroid-mid2809pxe04.dtb \
-	sun8i-a23-q8-tablet.dtb \
-	sun8i-a33-et-q8-v1.6.dtb \
-	sun8i-a33-ga10h-v1.1.dtb \
-	sun8i-a33-inet-d978-rev2.dtb \
-	sun8i-a33-ippo-q8h-v1.2.dtb \
-	sun8i-a33-olinuxino.dtb \
-	sun8i-a33-q8-tablet.dtb \
-	sun8i-a33-sinlinx-sina33.dtb \
-	sun8i-a83t-allwinner-h8homlet-v2.dtb \
-	sun8i-a83t-bananapi-m3.dtb \
-	sun8i-a83t-cubietruck-plus.dtb \
-	sun8i-a83t-tbs-a711.dtb \
-	sun8i-h2-plus-bananapi-m2-zero.dtb \
-	sun8i-h2-plus-libretech-all-h3-cc.dtb \
-	sun8i-h2-plus-orangepi-r1.dtb \
-	sun8i-h2-plus-orangepi-zero.dtb \
-	sun8i-h3-bananapi-m2-plus.dtb \
-	sun8i-h3-bananapi-m2-plus-v1.2.dtb \
-	sun8i-h3-beelink-x2.dtb \
-	sun8i-h3-libretech-all-h3-cc.dtb \
-	sun8i-h3-mapleboard-mp130.dtb \
-	sun8i-h3-nanopi-duo2.dtb \
-	sun8i-h3-nanopi-m1.dtb\
-	\
-	sun8i-h3-nanopi-m1-plus.dtb \
-	sun8i-h3-nanopi-neo.dtb \
-	sun8i-h3-nanopi-neo-air.dtb \
-	sun8i-h3-nanopi-r1.dtb \
-	sun8i-h3-orangepi-2.dtb \
-	sun8i-h3-orangepi-lite.dtb \
-	sun8i-h3-orangepi-one.dtb \
-	sun8i-h3-orangepi-pc.dtb \
-	sun8i-h3-orangepi-pc-plus.dtb \
-	sun8i-h3-orangepi-plus.dtb \
-	sun8i-h3-orangepi-plus2e.dtb \
-	sun8i-h3-orangepi-zero-plus2.dtb \
-	sun8i-h3-rervision-dvk.dtb \
-	sun8i-h3-zeropi.dtb \
-	sun8i-h3-emlid-neutis-n5h3-devboard.dtb \
-	sun8i-r16-bananapi-m2m.dtb \
-	sun8i-r16-nintendo-nes-classic.dtb \
-	sun8i-r16-nintendo-super-nes-classic.dtb \
-	sun8i-r16-parrot.dtb \
-	sun8i-r40-bananapi-m2-ultra.dtb \
-	sun8i-r40-oka40i-c.dtb \
-	sun8i-s3-elimo-initium.dtb \
-	sun8i-s3-lichee-zero-plus.dtb \
-	sun8i-s3-pinecube.dtb \
-	sun8i-t113s-mangopi-mq-r-t113.dtb \
-	sun8i-t3-cqa3t-bv3.dtb \
-	sun8i-v3-sl631-imx179.dtb \
-	sun8i-v3s-licheepi-zero.dtb \
-	sun8i-v3s-licheepi-zero-dock.dtb \
-	sun8i-v40-bananapi-m2-berry.dtb
+	sun8i-v40-bananapi-m2-berry.dtb \
+	sun8i-h3-nanopi-m1.dtb
 dtb-$(CONFIG_MACH_SUN9I) += \
 	sun9i-a80-optimus.dtb \
 	sun9i-a80-cubieboard4.dtb
#2 lore raw
Quoted 13 lines · Andre Przywara

On Mon, 3 Jun 2024 17:51:34 +0800
Ke Li <[email protected]> wrote:

Hi KL,

Quoted 1 line

Hi, Jernej.skrabec@ and [email protected],

please use scripts/get_maintainer.pl on the patch file to generate a list of emails that patches should be send to. You do not need to include everyone mentioned in that output, but at least the maintainers and the lists.

Quoted 8 lines
Quoted 2 lines

I'm looking into the dts Makefile of Allwinner. It seems like in 724ba6751532055db75992fc6ae21c3e322e94a7 "ARM: dts: Move .dts files to vendor sub-directories", we made a mistake and duplicate the "dtb-$(CONFIG_MACH_SUN8I)" entry on line 202 and line 265. A patched is generated for this.

Pavel sent the same patch already two months ago:
https://lore.kernel.org/linux-sunxi/[email protected]/

Having said this, I wonder what happened to that patch. I think we agreed on this, but I don't see it any tree?

Looks like there were some comments on the last patch and the whole series ended up not getting merged.

ChenYu

Quoted 88 lines

Cheers,
Andre

Quoted 84 lines

KL

---
 arch/arm/boot/dts/allwinner/Makefile | 65 +---------------------------
 1 file changed, 2 insertions(+), 63 deletions(-)
arch/arm/boot/dts/allwinner/Makefile +2 -63
index 4247f19b1..f9484f8d4 100644
@@ -260,69 +260,8 @@ dtb-$(CONFIG_MACH_SUN8I) += \
      sun8i-v3s-anbernic-rg-nano.dtb \
      sun8i-v3s-licheepi-zero.dtb \
      sun8i-v3s-licheepi-zero-dock.dtb \
-     sun8i-v40-bananapi-m2-berry.dtb
-dtb-$(CONFIG_MACH_SUN8I) += \
-     sun8i-a23-evb.dtb \
-     sun8i-a23-gt90h-v4.dtb \
-     sun8i-a23-inet86dz.dtb \
-     sun8i-a23-ippo-q8h-v5.dtb \
-     sun8i-a23-ippo-q8h-v1.2.dtb \
-     sun8i-a23-polaroid-mid2407pxe03.dtb \
-     sun8i-a23-polaroid-mid2809pxe04.dtb \
-     sun8i-a23-q8-tablet.dtb \
-     sun8i-a33-et-q8-v1.6.dtb \
-     sun8i-a33-ga10h-v1.1.dtb \
-     sun8i-a33-inet-d978-rev2.dtb \
-     sun8i-a33-ippo-q8h-v1.2.dtb \
-     sun8i-a33-olinuxino.dtb \
-     sun8i-a33-q8-tablet.dtb \
-     sun8i-a33-sinlinx-sina33.dtb \
-     sun8i-a83t-allwinner-h8homlet-v2.dtb \
-     sun8i-a83t-bananapi-m3.dtb \
-     sun8i-a83t-cubietruck-plus.dtb \
-     sun8i-a83t-tbs-a711.dtb \
-     sun8i-h2-plus-bananapi-m2-zero.dtb \
-     sun8i-h2-plus-libretech-all-h3-cc.dtb \
-     sun8i-h2-plus-orangepi-r1.dtb \
-     sun8i-h2-plus-orangepi-zero.dtb \
-     sun8i-h3-bananapi-m2-plus.dtb \
-     sun8i-h3-bananapi-m2-plus-v1.2.dtb \
-     sun8i-h3-beelink-x2.dtb \
-     sun8i-h3-libretech-all-h3-cc.dtb \
-     sun8i-h3-mapleboard-mp130.dtb \
-     sun8i-h3-nanopi-duo2.dtb \
-     sun8i-h3-nanopi-m1.dtb\
-     \
-     sun8i-h3-nanopi-m1-plus.dtb \
-     sun8i-h3-nanopi-neo.dtb \
-     sun8i-h3-nanopi-neo-air.dtb \
-     sun8i-h3-nanopi-r1.dtb \
-     sun8i-h3-orangepi-2.dtb \
-     sun8i-h3-orangepi-lite.dtb \
-     sun8i-h3-orangepi-one.dtb \
-     sun8i-h3-orangepi-pc.dtb \
-     sun8i-h3-orangepi-pc-plus.dtb \
-     sun8i-h3-orangepi-plus.dtb \
-     sun8i-h3-orangepi-plus2e.dtb \
-     sun8i-h3-orangepi-zero-plus2.dtb \
-     sun8i-h3-rervision-dvk.dtb \
-     sun8i-h3-zeropi.dtb \
-     sun8i-h3-emlid-neutis-n5h3-devboard.dtb \
-     sun8i-r16-bananapi-m2m.dtb \
-     sun8i-r16-nintendo-nes-classic.dtb \
-     sun8i-r16-nintendo-super-nes-classic.dtb \
-     sun8i-r16-parrot.dtb \
-     sun8i-r40-bananapi-m2-ultra.dtb \
-     sun8i-r40-oka40i-c.dtb \
-     sun8i-s3-elimo-initium.dtb \
-     sun8i-s3-lichee-zero-plus.dtb \
-     sun8i-s3-pinecube.dtb \
-     sun8i-t113s-mangopi-mq-r-t113.dtb \
-     sun8i-t3-cqa3t-bv3.dtb \
-     sun8i-v3-sl631-imx179.dtb \
-     sun8i-v3s-licheepi-zero.dtb \
-     sun8i-v3s-licheepi-zero-dock.dtb \
-     sun8i-v40-bananapi-m2-berry.dtb
+     sun8i-v40-bananapi-m2-berry.dtb \
+     sun8i-h3-nanopi-m1.dtb
 dtb-$(CONFIG_MACH_SUN9I) += \
      sun9i-a80-optimus.dtb \
      sun9i-a80-cubieboard4.dtb