* [meta-rockchip][PATCH v2] Add machine definitions for NanoPi-M4 boards, 2GB and 4GB variants
@ 2021-03-22 15:07 Yann Dirson
2021-03-23 4:25 ` Trevor Woerner
0 siblings, 1 reply; 3+ messages in thread
From: Yann Dirson @ 2021-03-22 15:07 UTC (permalink / raw)
To: yocto; +Cc: twoerner, Yann Dirson
From: Yann Dirson <yann@blade-group.com>
---
Changes from v1: split in two distinct machines: nanopi-m4 and nanopi-m4-2gb
conf/machine/include/nanopi-m4.inc | 22 +++++++++++++++++++
conf/machine/nanopi-m4-2gb.conf | 8 +++++++
conf/machine/nanopi-m4.conf | 8 +++++++
recipes-kernel/linux/linux-yocto-dev.bbappend | 2 ++
.../linux/linux-yocto-rt_%.bbappend | 2 ++
.../linux/linux-yocto-tiny_%.bbappend | 2 ++
recipes-kernel/linux/linux-yocto_%.bbappend | 2 ++
7 files changed, 46 insertions(+)
create mode 100644 conf/machine/include/nanopi-m4.inc
create mode 100644 conf/machine/nanopi-m4-2gb.conf
create mode 100644 conf/machine/nanopi-m4.conf
diff --git a/conf/machine/include/nanopi-m4.inc b/conf/machine/include/nanopi-m4.inc
new file mode 100644
index 0000000..f6d9c11
--- /dev/null
+++ b/conf/machine/include/nanopi-m4.inc
@@ -0,0 +1,22 @@
+# Copyright (C) 2021 Blade SAS
+# Common definitions for all NanoPi M4 RK3399 board variants
+
+require rk3399.inc
+
+KERNEL_DEVICETREE = "rockchip/rk3399-nanopi-m4.dtb"
+
+RK_BOOT_DEVICE = "mmcblk1"
+WKS_FILE ?= "rock-pi-4.wks"
+IMAGE_FSTYPES += "wic"
+
+WKS_FILE_DEPENDS ?= " \
+ mtools-native \
+ dosfstools-native \
+ virtual/bootloader \
+ virtual/kernel \
+ "
+IMAGE_BOOT_FILES ?= "\
+ ${KERNEL_IMAGETYPE} \
+ "
+
+SERIAL_CONSOLES = "1500000;ttyS2"
diff --git a/conf/machine/nanopi-m4-2gb.conf b/conf/machine/nanopi-m4-2gb.conf
new file mode 100644
index 0000000..9fd7279
--- /dev/null
+++ b/conf/machine/nanopi-m4-2gb.conf
@@ -0,0 +1,8 @@
+# Copyright (C) 2021 Blade SAS
+
+#@TYPE: Machine
+#@NAME: NanoPi M4
+#@DESCRIPTION: NanoPi M4 RK3399 board from FriendlyElec, 2GB variant
+
+require include/nanopi-m4.inc
+UBOOT_MACHINE = "nanopi-m4-2gb-rk3399_defconfig"
diff --git a/conf/machine/nanopi-m4.conf b/conf/machine/nanopi-m4.conf
new file mode 100644
index 0000000..648fc75
--- /dev/null
+++ b/conf/machine/nanopi-m4.conf
@@ -0,0 +1,8 @@
+# Copyright (C) 2021 Blade SAS
+
+#@TYPE: Machine
+#@NAME: NanoPi M4
+#@DESCRIPTION: NanoPi M4 RK3399 board from FriendlyElec, 4GB variant
+
+require include/nanopi-m4.inc
+UBOOT_MACHINE = "nanopi-m4-rk3399_defconfig"
diff --git a/recipes-kernel/linux/linux-yocto-dev.bbappend b/recipes-kernel/linux/linux-yocto-dev.bbappend
index e5ea197..7702e3f 100644
--- a/recipes-kernel/linux/linux-yocto-dev.bbappend
+++ b/recipes-kernel/linux/linux-yocto-dev.bbappend
@@ -6,3 +6,5 @@ COMPATIBLE_MACHINE_vyasa-rk3288 = "vyasa-rk3288"
COMPATIBLE_MACHINE_tinker-board = "tinker-board"
COMPATIBLE_MACHINE_tinker-board-s = "tinker-board-s"
COMPATIBLE_MACHINE_rock-pi-4 = "rock-pi-4"
+COMPATIBLE_MACHINE_nanopi-m4 = "nanopi-m4"
+COMPATIBLE_MACHINE_nanopi-m4-2gb = "nanopi-m4-2gb"
diff --git a/recipes-kernel/linux/linux-yocto-rt_%.bbappend b/recipes-kernel/linux/linux-yocto-rt_%.bbappend
index e5ea197..7702e3f 100644
--- a/recipes-kernel/linux/linux-yocto-rt_%.bbappend
+++ b/recipes-kernel/linux/linux-yocto-rt_%.bbappend
@@ -6,3 +6,5 @@ COMPATIBLE_MACHINE_vyasa-rk3288 = "vyasa-rk3288"
COMPATIBLE_MACHINE_tinker-board = "tinker-board"
COMPATIBLE_MACHINE_tinker-board-s = "tinker-board-s"
COMPATIBLE_MACHINE_rock-pi-4 = "rock-pi-4"
+COMPATIBLE_MACHINE_nanopi-m4 = "nanopi-m4"
+COMPATIBLE_MACHINE_nanopi-m4-2gb = "nanopi-m4-2gb"
diff --git a/recipes-kernel/linux/linux-yocto-tiny_%.bbappend b/recipes-kernel/linux/linux-yocto-tiny_%.bbappend
index e5ea197..7702e3f 100644
--- a/recipes-kernel/linux/linux-yocto-tiny_%.bbappend
+++ b/recipes-kernel/linux/linux-yocto-tiny_%.bbappend
@@ -6,3 +6,5 @@ COMPATIBLE_MACHINE_vyasa-rk3288 = "vyasa-rk3288"
COMPATIBLE_MACHINE_tinker-board = "tinker-board"
COMPATIBLE_MACHINE_tinker-board-s = "tinker-board-s"
COMPATIBLE_MACHINE_rock-pi-4 = "rock-pi-4"
+COMPATIBLE_MACHINE_nanopi-m4 = "nanopi-m4"
+COMPATIBLE_MACHINE_nanopi-m4-2gb = "nanopi-m4-2gb"
diff --git a/recipes-kernel/linux/linux-yocto_%.bbappend b/recipes-kernel/linux/linux-yocto_%.bbappend
index e5ea197..7702e3f 100644
--- a/recipes-kernel/linux/linux-yocto_%.bbappend
+++ b/recipes-kernel/linux/linux-yocto_%.bbappend
@@ -6,3 +6,5 @@ COMPATIBLE_MACHINE_vyasa-rk3288 = "vyasa-rk3288"
COMPATIBLE_MACHINE_tinker-board = "tinker-board"
COMPATIBLE_MACHINE_tinker-board-s = "tinker-board-s"
COMPATIBLE_MACHINE_rock-pi-4 = "rock-pi-4"
+COMPATIBLE_MACHINE_nanopi-m4 = "nanopi-m4"
+COMPATIBLE_MACHINE_nanopi-m4-2gb = "nanopi-m4-2gb"
--
2.30.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [meta-rockchip][PATCH v2] Add machine definitions for NanoPi-M4 boards, 2GB and 4GB variants
2021-03-22 15:07 [meta-rockchip][PATCH v2] Add machine definitions for NanoPi-M4 boards, 2GB and 4GB variants Yann Dirson
@ 2021-03-23 4:25 ` Trevor Woerner
2021-03-23 4:31 ` Trevor Woerner
0 siblings, 1 reply; 3+ messages in thread
From: Trevor Woerner @ 2021-03-23 4:25 UTC (permalink / raw)
To: yann.dirson; +Cc: yocto, Yann Dirson
Hi Yann,
Sorry to nitpick…
Could you please tighten up the commit message? For example, please set
the subject to something like: "NanoPi-M4: add" or perhaps "NanoPi-M4: add
machines" then in the body give the details of exactly which boards are being
added; rather than having a long subject line and nothing in the body.
Also, I'm going to need a "signed-off-by:" line in order to accept this patch.
On Mon 2021-03-22 @ 04:07:20 PM, yann.dirson@blade-group.com wrote:
> From: Yann Dirson <yann@blade-group.com>
>
> ---
>
> Changes from v1: split in two distinct machines: nanopi-m4 and nanopi-m4-2gb
>
> conf/machine/include/nanopi-m4.inc | 22 +++++++++++++++++++
> conf/machine/nanopi-m4-2gb.conf | 8 +++++++
> conf/machine/nanopi-m4.conf | 8 +++++++
> recipes-kernel/linux/linux-yocto-dev.bbappend | 2 ++
> .../linux/linux-yocto-rt_%.bbappend | 2 ++
> .../linux/linux-yocto-tiny_%.bbappend | 2 ++
> recipes-kernel/linux/linux-yocto_%.bbappend | 2 ++
> 7 files changed, 46 insertions(+)
> create mode 100644 conf/machine/include/nanopi-m4.inc
> create mode 100644 conf/machine/nanopi-m4-2gb.conf
> create mode 100644 conf/machine/nanopi-m4.conf
>
> diff --git a/conf/machine/include/nanopi-m4.inc b/conf/machine/include/nanopi-m4.inc
> new file mode 100644
> index 0000000..f6d9c11
> --- /dev/null
> +++ b/conf/machine/include/nanopi-m4.inc
> @@ -0,0 +1,22 @@
> +# Copyright (C) 2021 Blade SAS
> +# Common definitions for all NanoPi M4 RK3399 board variants
> +
> +require rk3399.inc
> +
> +KERNEL_DEVICETREE = "rockchip/rk3399-nanopi-m4.dtb"
> +
> +RK_BOOT_DEVICE = "mmcblk1"
> +WKS_FILE ?= "rock-pi-4.wks"
> +IMAGE_FSTYPES += "wic"
Please add "wic.bmap" to IMAGE_FSTYPES in addition to "wic". It makes creating
an µSD card so much faster.
> +
> +WKS_FILE_DEPENDS ?= " \
> + mtools-native \
> + dosfstools-native \
> + virtual/bootloader \
> + virtual/kernel \
> + "
> +IMAGE_BOOT_FILES ?= "\
> + ${KERNEL_IMAGETYPE} \
> + "
> +
> +SERIAL_CONSOLES = "1500000;ttyS2"
> diff --git a/conf/machine/nanopi-m4-2gb.conf b/conf/machine/nanopi-m4-2gb.conf
> new file mode 100644
> index 0000000..9fd7279
> --- /dev/null
> +++ b/conf/machine/nanopi-m4-2gb.conf
> @@ -0,0 +1,8 @@
> +# Copyright (C) 2021 Blade SAS
> +
> +#@TYPE: Machine
> +#@NAME: NanoPi M4
> +#@DESCRIPTION: NanoPi M4 RK3399 board from FriendlyElec, 2GB variant
> +
> +require include/nanopi-m4.inc
> +UBOOT_MACHINE = "nanopi-m4-2gb-rk3399_defconfig"
> diff --git a/conf/machine/nanopi-m4.conf b/conf/machine/nanopi-m4.conf
> new file mode 100644
> index 0000000..648fc75
> --- /dev/null
> +++ b/conf/machine/nanopi-m4.conf
> @@ -0,0 +1,8 @@
> +# Copyright (C) 2021 Blade SAS
> +
> +#@TYPE: Machine
> +#@NAME: NanoPi M4
> +#@DESCRIPTION: NanoPi M4 RK3399 board from FriendlyElec, 4GB variant
> +
> +require include/nanopi-m4.inc
> +UBOOT_MACHINE = "nanopi-m4-rk3399_defconfig"
> diff --git a/recipes-kernel/linux/linux-yocto-dev.bbappend b/recipes-kernel/linux/linux-yocto-dev.bbappend
> index e5ea197..7702e3f 100644
> --- a/recipes-kernel/linux/linux-yocto-dev.bbappend
> +++ b/recipes-kernel/linux/linux-yocto-dev.bbappend
> @@ -6,3 +6,5 @@ COMPATIBLE_MACHINE_vyasa-rk3288 = "vyasa-rk3288"
> COMPATIBLE_MACHINE_tinker-board = "tinker-board"
> COMPATIBLE_MACHINE_tinker-board-s = "tinker-board-s"
> COMPATIBLE_MACHINE_rock-pi-4 = "rock-pi-4"
> +COMPATIBLE_MACHINE_nanopi-m4 = "nanopi-m4"
> +COMPATIBLE_MACHINE_nanopi-m4-2gb = "nanopi-m4-2gb"
> diff --git a/recipes-kernel/linux/linux-yocto-rt_%.bbappend b/recipes-kernel/linux/linux-yocto-rt_%.bbappend
> index e5ea197..7702e3f 100644
> --- a/recipes-kernel/linux/linux-yocto-rt_%.bbappend
> +++ b/recipes-kernel/linux/linux-yocto-rt_%.bbappend
> @@ -6,3 +6,5 @@ COMPATIBLE_MACHINE_vyasa-rk3288 = "vyasa-rk3288"
> COMPATIBLE_MACHINE_tinker-board = "tinker-board"
> COMPATIBLE_MACHINE_tinker-board-s = "tinker-board-s"
> COMPATIBLE_MACHINE_rock-pi-4 = "rock-pi-4"
> +COMPATIBLE_MACHINE_nanopi-m4 = "nanopi-m4"
> +COMPATIBLE_MACHINE_nanopi-m4-2gb = "nanopi-m4-2gb"
> diff --git a/recipes-kernel/linux/linux-yocto-tiny_%.bbappend b/recipes-kernel/linux/linux-yocto-tiny_%.bbappend
> index e5ea197..7702e3f 100644
> --- a/recipes-kernel/linux/linux-yocto-tiny_%.bbappend
> +++ b/recipes-kernel/linux/linux-yocto-tiny_%.bbappend
> @@ -6,3 +6,5 @@ COMPATIBLE_MACHINE_vyasa-rk3288 = "vyasa-rk3288"
> COMPATIBLE_MACHINE_tinker-board = "tinker-board"
> COMPATIBLE_MACHINE_tinker-board-s = "tinker-board-s"
> COMPATIBLE_MACHINE_rock-pi-4 = "rock-pi-4"
> +COMPATIBLE_MACHINE_nanopi-m4 = "nanopi-m4"
> +COMPATIBLE_MACHINE_nanopi-m4-2gb = "nanopi-m4-2gb"
> diff --git a/recipes-kernel/linux/linux-yocto_%.bbappend b/recipes-kernel/linux/linux-yocto_%.bbappend
> index e5ea197..7702e3f 100644
> --- a/recipes-kernel/linux/linux-yocto_%.bbappend
> +++ b/recipes-kernel/linux/linux-yocto_%.bbappend
> @@ -6,3 +6,5 @@ COMPATIBLE_MACHINE_vyasa-rk3288 = "vyasa-rk3288"
> COMPATIBLE_MACHINE_tinker-board = "tinker-board"
> COMPATIBLE_MACHINE_tinker-board-s = "tinker-board-s"
> COMPATIBLE_MACHINE_rock-pi-4 = "rock-pi-4"
> +COMPATIBLE_MACHINE_nanopi-m4 = "nanopi-m4"
> +COMPATIBLE_MACHINE_nanopi-m4-2gb = "nanopi-m4-2gb"
> --
> 2.30.2
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [meta-rockchip][PATCH v2] Add machine definitions for NanoPi-M4 boards, 2GB and 4GB variants
2021-03-23 4:25 ` Trevor Woerner
@ 2021-03-23 4:31 ` Trevor Woerner
0 siblings, 0 replies; 3+ messages in thread
From: Trevor Woerner @ 2021-03-23 4:31 UTC (permalink / raw)
To: yocto
On Tue 2021-03-23 @ 12:25:17 AM, Trevor Woerner wrote:
> On Mon 2021-03-22 @ 04:07:20 PM, yann.dirson@blade-group.com wrote:
> > +IMAGE_FSTYPES += "wic"
>
> Please add "wic.bmap" to IMAGE_FSTYPES in addition to "wic". It makes creating
> an µSD card so much faster.
Personally, specifying wic should add wic.bmap implicitly. I can't imagine why
anyone would want to generate a wic without the bmap to go with it. But my
use-case is probably narrow.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-03-23 4:31 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-03-22 15:07 [meta-rockchip][PATCH v2] Add machine definitions for NanoPi-M4 boards, 2GB and 4GB variants Yann Dirson
2021-03-23 4:25 ` Trevor Woerner
2021-03-23 4:31 ` 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.