[meta-rockchip][PATCH 1/3] linux-yocto: remove mmc aliases

[meta-rockchip][PATCH 1/3] linux-yocto: remove mmc aliases

[Trevor Woerner]

Now that we're booting via UUID, we no longer need these aliases in the DT.
Personally I wasn't able to prove to myself that they actually worked (at
least not with 5.13.y) and fiddling with these aliases didn't seem to affect
the mmc probe order on boot. Additionally it looks like some of these aliases
will be landing upstream shortly.

Build (core-image-base) and run tested (both systemd and sysvinit) on:
- rock64
- rock-pi-e

(i.e. the two rk3328 MACHINEs)

Signed-off-by: Trevor Woerner <twoerner@gmail.com>
---
 ...an-dtsi-rk3328-add-mmc0-mmc1-aliases.patch | 27 -------------------
 recipes-kernel/linux/linux-yocto%.bbappend    |  3 ---
 2 files changed, 30 deletions(-)
 delete mode 100644 recipes-kernel/linux/files/0001-ayufan-dtsi-rk3328-add-mmc0-mmc1-aliases.patch

diff --git a/recipes-kernel/linux/files/0001-ayufan-dtsi-rk3328-add-mmc0-mmc1-aliases.patch b/recipes-kernel/linux/files/0001-ayufan-dtsi-rk3328-add-mmc0-mmc1-aliases.patch
deleted file mode 100644
index 1ad3b9e..0000000
--- a/recipes-kernel/linux/files/0001-ayufan-dtsi-rk3328-add-mmc0-mmc1-aliases.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From f10cfe01f753348d346374008b8e8f5f26ed94ab Mon Sep 17 00:00:00 2001
-From: Kamil Trzcinski <ayufan@ayufan.eu>
-Date: Mon, 28 Aug 2017 11:24:37 +0200
-Subject: [PATCH] ayufan: dtsi: rk3328: add mmc0/mmc1 aliases
-Upstream-Status: Pending [https://github.com/ayufan-rock64/linux-mainline-kernel/commit/f10cfe01f753348d346374008b8e8f5f26ed94ab]
-
-Change-Id: I82a5394df8a505f7d1496393621c1198895c88b0
----
- arch/arm64/boot/dts/rockchip/rk3328.dtsi | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/arch/arm64/boot/dts/rockchip/rk3328.dtsi b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
-index 0afed15bc7ff..800f1c796882 100644
---- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi
-+++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
-@@ -27,6 +27,8 @@
- 		i2c1 = &i2c1;
- 		i2c2 = &i2c2;
- 		i2c3 = &i2c3;
-+		mmc0 = &emmc;
-+		mmc1 = &sdmmc;
- 		ethernet0 = &gmac2io;
- 		ethernet1 = &gmac2phy;
- 	};
--- 
-2.30.2
-
diff --git a/recipes-kernel/linux/linux-yocto%.bbappend b/recipes-kernel/linux/linux-yocto%.bbappend
index cf63a30..470dc09 100644
--- a/recipes-kernel/linux/linux-yocto%.bbappend
+++ b/recipes-kernel/linux/linux-yocto%.bbappend
@@ -12,6 +12,3 @@ COMPATIBLE_MACHINE:rock64 = "rock64"
 COMPATIBLE_MACHINE:rock-pi-e = "rock-pi-e"
 
 FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
-
-# indeed applicable to all rk3328 boards
-SRC_URI:append:rock64 = " file://0001-ayufan-dtsi-rk3328-add-mmc0-mmc1-aliases.patch"
-- 
2.30.0.rc0

[meta-rockchip][PATCH 2/3] include/nanopi-m4: remove KMACHINE

[Trevor Woerner]

There is no "nanopi-m4" defined in any yocto kernel metadata (yet?), therefore
remove this superfluous line.

Build (core-image-base) and run tested (both systemd and sysvinit) on:
- nanopi-m4

Signed-off-by: Trevor Woerner <twoerner@gmail.com>
---
 conf/machine/include/nanopi-m4.inc | 1 -
 1 file changed, 1 deletion(-)

diff --git a/conf/machine/include/nanopi-m4.inc b/conf/machine/include/nanopi-m4.inc
index 3870b51..b8e1db1 100644
--- a/conf/machine/include/nanopi-m4.inc
+++ b/conf/machine/include/nanopi-m4.inc
@@ -5,5 +5,4 @@ require conf/machine/include/rk3399.inc
 
 MACHINE_FEATURES += "usbhost serial"
 
-KMACHINE = "nanopi-m4"
 KERNEL_DEVICETREE = "rockchip/rk3399-nanopi-m4.dtb"
-- 
2.30.0.rc0

[meta-rockchip][PATCH 3/3] nanopi-m4: add common override

[Trevor Woerner]

Add a common override for both nanopi-m4 MACHINEs.

Signed-off-by: Trevor Woerner <twoerner@gmail.com>
---
 conf/machine/include/nanopi-m4.inc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/conf/machine/include/nanopi-m4.inc b/conf/machine/include/nanopi-m4.inc
index b8e1db1..aaf07a3 100644
--- a/conf/machine/include/nanopi-m4.inc
+++ b/conf/machine/include/nanopi-m4.inc
@@ -1,6 +1,9 @@
 # Copyright (C) 2021 Blade SAS
 # Common definitions for all NanoPi M4 RK3399 board variants
 
+# add a common override for all nanopi-m4
+MACHINEOVERRIDES =. "nanopi-m4:"
+
 require conf/machine/include/rk3399.inc
 
 MACHINE_FEATURES += "usbhost serial"
-- 
2.30.0.rc0

Re: [meta-rockchip][PATCH 1/3] linux-yocto: remove mmc aliases

[Trevor Woerner]

On Wed 2021-09-29 @ 01:29:36 AM, Trevor Woerner wrote:
> Now that we're booting via UUID, we no longer need these aliases in the DT.
> Personally I wasn't able to prove to myself that they actually worked (at
> least not with 5.13.y) and fiddling with these aliases didn't seem to affect
> the mmc probe order on boot. Additionally it looks like some of these aliases
> will be landing upstream shortly.
> 
> Build (core-image-base) and run tested (both systemd and sysvinit) on:
> - rock64
> - rock-pi-e
> 
> (i.e. the two rk3328 MACHINEs)
> 
> Signed-off-by: Trevor Woerner <twoerner@gmail.com>
> ---
>  ...an-dtsi-rk3328-add-mmc0-mmc1-aliases.patch | 27 -------------------
>  recipes-kernel/linux/linux-yocto%.bbappend    |  3 ---
>  2 files changed, 30 deletions(-)
>  delete mode 100644 recipes-kernel/linux/files/0001-ayufan-dtsi-rk3328-add-mmc0-mmc1-aliases.patch

Applied to meta-rockchip, master.

Re: [meta-rockchip][PATCH 2/3] include/nanopi-m4: remove KMACHINE

[Trevor Woerner]

On Wed 2021-09-29 @ 01:29:37 AM, Trevor Woerner wrote:
> There is no "nanopi-m4" defined in any yocto kernel metadata (yet?), therefore
> remove this superfluous line.
> 
> Build (core-image-base) and run tested (both systemd and sysvinit) on:
> - nanopi-m4
> 
> Signed-off-by: Trevor Woerner <twoerner@gmail.com>
> ---
>  conf/machine/include/nanopi-m4.inc | 1 -
>  1 file changed, 1 deletion(-)

Applied to meta-rockchip, master.

Re: [meta-rockchip][PATCH 3/3] nanopi-m4: add common override

[Trevor Woerner]

On Wed 2021-09-29 @ 01:29:38 AM, Trevor Woerner wrote:
> Add a common override for both nanopi-m4 MACHINEs.
> 
> Signed-off-by: Trevor Woerner <twoerner@gmail.com>
> ---
>  conf/machine/include/nanopi-m4.inc | 3 +++
>  1 file changed, 3 insertions(+)

Applied to meta-rockchip, master.