[1/5] conf/machine: rk3288: Add some machine files

Submitted by ayaka on April 21, 2019, 3:53 p.m. | Patch ID: 160566

Details

Message ID 20190421155339.6332-2-ayaka@soulik.info
State New
Headers show

Commit Message

ayaka April 21, 2019, 3:53 p.m.
Evb-rk3288 is the offical evaluate board.
Fennec-rk3288 and Tinker-rk3288 is rk3288 based SBCs.
Tinker Boards is a RPi compatible board made by ASUS.

Signed-off-by: Jacob Chen <jacob-chen@rock-chips.com>
Signed-off-by: Randy 'ayaka' Li <ayaka@soulik.info>
---
 conf/machine/evb-rk3288.conf    | 10 ++++++++++
 conf/machine/fennec-rk3288.conf | 10 ++++++++++
 conf/machine/include/rk3288.inc |  5 +++++
 conf/machine/tinker-rk3288.conf |  2 ++
 4 files changed, 27 insertions(+)
 create mode 100644 conf/machine/evb-rk3288.conf
 create mode 100644 conf/machine/fennec-rk3288.conf

Patch hide | download patch | download mbox

diff --git a/conf/machine/evb-rk3288.conf b/conf/machine/evb-rk3288.conf
new file mode 100644
index 0000000..e6c1f1e
--- /dev/null
+++ b/conf/machine/evb-rk3288.conf
@@ -0,0 +1,10 @@ 
+# Copyright (C) 2017 Fuzhou Rockchip Electronics Co., Ltd
+# Released under the MIT license (see COPYING.MIT for the terms)
+
+#@TYPE: Machine
+#@NAME: EVB 3288
+
+include conf/machine/include/rk3288.inc
+
+KERNEL_DEVICETREE = "rk3288-evb-act8846.dtb"
+UBOOT_MACHINE = "evb-rk3288_defconfig"
diff --git a/conf/machine/fennec-rk3288.conf b/conf/machine/fennec-rk3288.conf
new file mode 100644
index 0000000..23e3ee7
--- /dev/null
+++ b/conf/machine/fennec-rk3288.conf
@@ -0,0 +1,10 @@ 
+# Copyright (C) 2017 Fuzhou Rockchip Electronics Co., Ltd
+# Released under the MIT license (see COPYING.MIT for the terms)
+
+#@TYPE: Machine
+#@NAME: FENNEC RK3288
+
+include conf/machine/include/rk3288.inc
+
+KERNEL_DEVICETREE = "rk3288-fennec.dtb"
+UBOOT_MACHINE = "fennec-rk3288_defconfig"
diff --git a/conf/machine/include/rk3288.inc b/conf/machine/include/rk3288.inc
index 0528e8a..73b39fb 100644
--- a/conf/machine/include/rk3288.inc
+++ b/conf/machine/include/rk3288.inc
@@ -8,9 +8,14 @@  require conf/machine/include/soc-family.inc
 require conf/machine/include/rockchip-defaults.inc
 
 SERIAL_CONSOLES = "115200;ttyS2"
+SPL_BINARY = "u-boot-spl-dtb.bin"
+KERNEL_IMAGETYPE = "zImage"
+KBUILD_DEFCONFIG = "multi_v7_defconfig"
 
 PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot"
 SPL_BINARY ?= "u-boot-spl-dtb.bin"
 
 IMAGE_FSTYPES = "rockchip-gpt-img"
 IMAGE_CLASSES += "rockchip-gpt-img"
+
+APPEND = "console=ttyS2,115200n8 rw root=/dev/mmcblk2p7 rootfstype=ext4 init=/sbin/init"
diff --git a/conf/machine/tinker-rk3288.conf b/conf/machine/tinker-rk3288.conf
index 294bdc7..cf793cd 100644
--- a/conf/machine/tinker-rk3288.conf
+++ b/conf/machine/tinker-rk3288.conf
@@ -9,3 +9,5 @@  require conf/machine/include/rk3288.inc
 
 KERNEL_DEVICETREE = "rk3288-tinker.dtb"
 UBOOT_MACHINE = "tinker-rk3288_defconfig"
+
+GPTIMG_APPEND = "console=tty1 console=ttyS2,115200n8 rw root=/dev/mmcblk0p7 rootfstype=ext4 init=/sbin/init"

Comments

Trevor Woerner April 23, 2019, 8:24 a.m.
On Sun 2019-04-21 @ 11:53:35 PM, Randy 'ayaka' Li wrote:
> Evb-rk3288 is the offical evaluate board.
> Fennec-rk3288 and Tinker-rk3288 is rk3288 based SBCs.
> Tinker Boards is a RPi compatible board made by ASUS.

I would rather these were separated out as individual commits. meta-rockchip
already has working support for the tinker-rk3288 board, so it's not being
added here.

> 
> Signed-off-by: Jacob Chen <jacob-chen@rock-chips.com>
> Signed-off-by: Randy 'ayaka' Li <ayaka@soulik.info>
> ---
>  conf/machine/evb-rk3288.conf    | 10 ++++++++++
>  conf/machine/fennec-rk3288.conf | 10 ++++++++++
>  conf/machine/include/rk3288.inc |  5 +++++
>  conf/machine/tinker-rk3288.conf |  2 ++
>  4 files changed, 27 insertions(+)
>  create mode 100644 conf/machine/evb-rk3288.conf
>  create mode 100644 conf/machine/fennec-rk3288.conf
> 
> diff --git a/conf/machine/evb-rk3288.conf b/conf/machine/evb-rk3288.conf
> new file mode 100644
> index 0000000..e6c1f1e
> --- /dev/null
> +++ b/conf/machine/evb-rk3288.conf
> @@ -0,0 +1,10 @@
> +# Copyright (C) 2017 Fuzhou Rockchip Electronics Co., Ltd
> +# Released under the MIT license (see COPYING.MIT for the terms)
> +
> +#@TYPE: Machine
> +#@NAME: EVB 3288
> +
> +include conf/machine/include/rk3288.inc
> +
> +KERNEL_DEVICETREE = "rk3288-evb-act8846.dtb"
> +UBOOT_MACHINE = "evb-rk3288_defconfig"


> diff --git a/conf/machine/fennec-rk3288.conf b/conf/machine/fennec-rk3288.conf
> new file mode 100644
> index 0000000..23e3ee7
> --- /dev/null
> +++ b/conf/machine/fennec-rk3288.conf
> @@ -0,0 +1,10 @@
> +# Copyright (C) 2017 Fuzhou Rockchip Electronics Co., Ltd
> +# Released under the MIT license (see COPYING.MIT for the terms)
> +
> +#@TYPE: Machine
> +#@NAME: FENNEC RK3288
> +
> +include conf/machine/include/rk3288.inc
> +
> +KERNEL_DEVICETREE = "rk3288-fennec.dtb"
> +UBOOT_MACHINE = "fennec-rk3288_defconfig"


> diff --git a/conf/machine/include/rk3288.inc b/conf/machine/include/rk3288.inc
> index 0528e8a..73b39fb 100644
> --- a/conf/machine/include/rk3288.inc
> +++ b/conf/machine/include/rk3288.inc
> @@ -8,9 +8,14 @@ require conf/machine/include/soc-family.inc
>  require conf/machine/include/rockchip-defaults.inc
>  
>  SERIAL_CONSOLES = "115200;ttyS2"
> +SPL_BINARY = "u-boot-spl-dtb.bin"

You've put a U-Boot variable in the middle of a Linux block. This variable is
already defined in this file just a couple lines down (in the U-Boot section)
and uses a ?= to set it to the exact same thing you're setting it to.

> +KERNEL_IMAGETYPE = "zImage"
> +KBUILD_DEFCONFIG = "multi_v7_defconfig"

These two things are defined exactly the same in
conf/machine/include/rockchip-defaults.inc, which is already included above
with the "require ..." line.

>  
>  PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot"
>  SPL_BINARY ?= "u-boot-spl-dtb.bin"
>  
>  IMAGE_FSTYPES = "rockchip-gpt-img"
>  IMAGE_CLASSES += "rockchip-gpt-img"
> +
> +APPEND = "console=ttyS2,115200n8 rw root=/dev/mmcblk2p7 rootfstype=ext4 init=/sbin/init"

I'm guessing this was supposed to be 'GPTIMG_APPEND = "..."'? In any case, I'm
curious why you're switching from mmcblk0 to mmcblk2 here,
classes/rockchip-gpt-img.bbclass already contains this logic.


> diff --git a/conf/machine/tinker-rk3288.conf b/conf/machine/tinker-rk3288.conf
> index 294bdc7..cf793cd 100644
> --- a/conf/machine/tinker-rk3288.conf
> +++ b/conf/machine/tinker-rk3288.conf
> @@ -9,3 +9,5 @@ require conf/machine/include/rk3288.inc
>  
>  KERNEL_DEVICETREE = "rk3288-tinker.dtb"
>  UBOOT_MACHINE = "tinker-rk3288_defconfig"
> +
> +GPTIMG_APPEND = "console=tty1 console=ttyS2,115200n8 rw root=/dev/mmcblk0p7 rootfstype=ext4 init=/sbin/init"
> -- 
> 2.20.1
>