Skip to contentSkip to conversation

conf/machine/include/nanopi-m4.inc: add full include path

PATCH Applied Trevor Woerner 1 participant 6 messages Jun 28, 2021 – Jun 30, 2021 Arm Rockchip

lore
Share & tools
lore
#0 lore raw

PATCH 1/3 conf/machine/include/nanopi-m4.inc: add full include path

Specify the full include path to the rk3399.inc file.

---
 conf/machine/include/nanopi-m4.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
conf/machine/include/nanopi-m4.inc +1 -1
index 7ca91db..b5251a1 100644
@@ -1,7 +1,7 @@
 # Copyright (C) 2021 Blade SAS
 # Common definitions for all NanoPi M4 RK3399 board variants
 
-require rk3399.inc
+require conf/machine/include/rk3399.inc
 
 MACHINE_FEATURES += "usbhost serial"
 
Signature · 1 line
2.30.0.rc0
#1 lore raw

PATCH 2/3 IMAGE_FSTYPES: remove ext4

The ext4 IMAGE_FSTYPES does not need to be mentioned explicitly. It will be automatically generated in cases where it is needed.

---
 conf/machine/include/rockchip-defaults.inc | 1 -
 1 file changed, 1 deletion(-)
conf/machine/include/rockchip-defaults.inc +0 -1
index b41c523..0666119 100644
@@ -22,4 +22,3 @@ XSERVER = " \
 
 # misc
 SERIAL_CONSOLES ?= "1500000;ttyS2"
-IMAGE_FSTYPES += "ext4"
Signature · 1 line
2.30.0.rc0
author Applied
#2 lore raw

Re: [meta-rockchip][PATCH 2/3] IMAGE_FSTYPES: remove ext4

conf/machine/include/rockchip-defaults.inc

Quoted 10 lines · Trevor Woerner

The ext4 IMAGE_FSTYPES does not need to be mentioned explicitly. It will be automatically generated in cases where it is needed.

---
 conf/machine/include/rockchip-defaults.inc | 1 -
 1 file changed, 1 deletion(-)
conf/machine/include/rockchip-defaults.inc +0 -0
index b41c523..0666119 100644

Applied to meta-rockchip master.

#3 lore raw

PATCH 3/3 wic/wks cleanup

In reply to Trevor Woerner

By exporting a couple more variables the wks file for every rockchip device can be built from one template instead of having separate wks files for each board and platform.

The following BSP variables were checked before and after this change to make sure they remained valid/sensible:
- WKS_FILE
- UBOOT_SUFFIX
- SPL_BINARY
- IMAGE_FSTYPES

Built-tested for every MACHINE in this BSP.

Run-tested on the following devices to ensure they continue to boot correctly to a cmdline (core-image-base):
- tinker-board
- rock-pi-e
- rock-pi-4b
- rock64
- nanopi-m4-2gb

---
 conf/machine/firefly-rk3288.conf      |  2 --
 conf/machine/include/nanopi-m4.inc    |  1 -
 conf/machine/include/rk3288.inc       |  3 +--
 conf/machine/include/rk3328.inc       |  1 -
 conf/machine/include/rk3399.inc       |  2 --
 conf/machine/include/rock-pi-4.inc    |  1 -
 conf/machine/include/rockchip-wic.inc |  5 +++++
 conf/machine/include/tinker.inc       |  2 --
 conf/machine/rock-pi-e.conf           |  2 --
 conf/machine/rock64.conf              |  2 --
 conf/machine/vyasa-rk3288.conf        |  1 -
 wic/firefly-rk3288.wks                |  7 -------
 wic/rk3288-boot.wks                   | 24 ------------------------
 wic/rk3399-boot.wks                   | 24 ------------------------
 wic/rock-pi-4.wks                     |  7 -------
 wic/rock-pi-e.wks                     |  4 ----
 wic/{rk3328-boot.wks => rockchip.wks} |  9 ++++++---
 wic/tinker-board.wks                  |  8 --------
 wic/vyasa-rk3288.wks                  |  8 --------
 19 files changed, 12 insertions(+), 101 deletions(-)
 delete mode 100644 wic/firefly-rk3288.wks
 delete mode 100644 wic/rk3288-boot.wks
 delete mode 100644 wic/rk3399-boot.wks
 delete mode 100644 wic/rock-pi-4.wks
 delete mode 100644 wic/rock-pi-e.wks
 rename wic/{rk3328-boot.wks => rockchip.wks} (64%)
 delete mode 100644 wic/tinker-board.wks
 delete mode 100644 wic/vyasa-rk3288.wks
conf/machine/firefly-rk3288.conf +0 -2
index 138e840..3270bb9 100644
@@ -11,5 +11,3 @@ require conf/machine/include/rockchip-wic.inc
 
 KERNEL_DEVICETREE = "rk3288-firefly.dtb"
 UBOOT_MACHINE = "firefly-rk3288_defconfig"
-
-WKS_FILE ?= "firefly-rk3288.wks"
conf/machine/include/nanopi-m4.inc +0 -1
index b5251a1..ac6479d 100644
@@ -9,4 +9,3 @@ KMACHINE = "nanopi-m4"
 KERNEL_DEVICETREE = "rockchip/rk3399-nanopi-m4.dtb"
 
 RK_BOOT_DEVICE = "mmcblk1"
-WKS_FILE ?= "rock-pi-4.wks"
conf/machine/include/rk3288.inc +1 -2
index a109f26..6b5f70a 100644
@@ -13,5 +13,4 @@ KBUILD_DEFCONFIG ?= "multi_v7_defconfig"
 KERNEL_IMAGETYPE = "zImage"
 
 PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot"
-SPL_BINARY ?= "idbloader.img"
-
+UBOOT_SUFFIX ?= "bin"
conf/machine/include/rk3328.inc +0 -1
index b0cafb5..70261a0 100644
@@ -21,4 +21,3 @@ UBOOT_SUFFIX ?= "itb"
 UBOOT_ENTRYPOINT ?= "0x06000000"
 
 PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot"
-SPL_BINARY ?= "idbloader.img"
conf/machine/include/rk3399.inc +0 -2
index 79e83e2..3fc712f 100644
@@ -21,5 +21,3 @@ UBOOT_SUFFIX ?= "itb"
 UBOOT_ENTRYPOINT ?= "0x06000000"
 
 PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot"
-SPL_BINARY ?= "idbloader.img"
-
conf/machine/include/rock-pi-4.inc +0 -1
index 92fc330..b6fb3dd 100644
@@ -4,6 +4,5 @@ MACHINEOVERRIDES =. "rock-pi-4:"
 require conf/machine/include/rk3399.inc
 
 RK_BOOT_DEVICE = "mmcblk1"
-WKS_FILE ?= "rock-pi-4.wks"
 
 MACHINE_EXTRA_RRECOMMENDS += "kernel-modules"
conf/machine/include/rockchip-wic.inc +5 -0
index 0ee8c0e..61d9f3d 100644
@@ -1,6 +1,9 @@
 # common meta-rockchip wic/wks items
 
+SPL_BINARY ?= "idbloader.img"
+
 IMAGE_FSTYPES += "wic wic.bmap"
+WKS_FILE = "rockchip.wks"
 WKS_FILE_DEPENDS ?= " \
 	mtools-native \
 	dosfstools-native \
@@ -24,4 +27,6 @@ WICVARS_append = " \
 	RK_BOOT_DEVICE \
 	RK_CONSOLE_BAUD \
 	RK_CONSOLE_DEVICE \
+	SPL_BINARY \
+	UBOOT_SUFFIX \
 	"
conf/machine/include/tinker.inc +0 -2
index eaeb564..2d05bef 100644
@@ -1,4 +1,2 @@
 require conf/machine/include/rk3288.inc
 require conf/machine/include/rockchip-wic.inc
-
-WKS_FILE ?= "tinker-board.wks"
conf/machine/rock-pi-e.conf +0 -2
index 3fdbb5e..7afe143 100644
@@ -13,5 +13,3 @@ MACHINE_EXTRA_RRECOMMENDS += "kernel-modules"
 
 PREFERRED_PROVIDER_virtual/bootloader = "u-boot"
 UBOOT_MACHINE = "rock-pi-e-rk3328_defconfig"
-
-WKS_FILE = "rock-pi-e.wks"
conf/machine/rock64.conf +0 -2
index 93e68e0..21755a8 100644
@@ -15,6 +15,4 @@ KERNEL_DEVICETREE = "rockchip/rk3328-rock64.dtb"
 # set to mmcblk0 for booting from optional eMMC
 RK_BOOT_DEVICE ?= "mmcblk1"
 
-WKS_FILE ?= "rock-pi-e.wks"
-
 KBUILD_DEFCONFIG = "defconfig"
conf/machine/vyasa-rk3288.conf +0 -1
index 3e1f395..9ad1ed4 100644
@@ -15,4 +15,3 @@ KERNEL_EXTRA_ARGS += "LOADADDR=0x02000000"
 UBOOT_MACHINE = "vyasa-rk3288_defconfig"
 
 RK_BOOT_DEVICE = "mmcblk2"
-WKS_FILE ?= "vyasa-rk3288.wks"
wic/firefly-rk3288.wks deleted +0 -7
deleted file mode 100644
index 7b14d1f..0000000
@@ -1,7 +0,0 @@
-# Copyright (C) 2019 Garmin Ltd. or its subsidiaries
-# Released under the MIT license (see COPYING.MIT for the terms)
-
-include rk3288-boot.wks
-part / --ondisk ${RK_BOOT_DEVICE} --source rootfs --fstype=ext4 --label root
-
-bootloader --ptable gpt --append="console=tty1 console=${RK_CONSOLE_DEVICE},${RK_CONSOLE_BAUD}n8 rw root=/dev/${RK_BOOT_DEVICE}p7 rootfstype=ext4 init=/sbin/init"
wic/rk3288-boot.wks deleted +0 -24
deleted file mode 100644
index e4d30cc..0000000
@@ -1,24 +0,0 @@
-# Copyright (C) 2020 Garmin Ltd. or its subsidiaries
-# Released under the MIT license (see COPYING.MIT for the terms)
-#
-# Disk layout
-# Note that the reference documentation refers to 512 byte disk sectors, but
-# wic uses 1KB blocks
-#
-#   Partition   Start Sector    Number of Sectors
-#   loader1     64              8000
-#   reserved1   8064            128
-#   reserved2   8192            8192
-#   loader2     16384           8192
-#   atf         24576           8192
-#   boot        32768           229376
-#   root        262144          -           (suggested)
-#
-
-part loader1    --offset 32     --fixed-size 4000K            --ondisk ${RK_BOOT_DEVICE} --source rawcopy --sourceparams="file=idbloader.img"
-part reserved1  --offset 4032   --fixed-size 64K              --ondisk ${RK_BOOT_DEVICE}
-part reserved2  --offset 4096   --fixed-size 4096K            --ondisk ${RK_BOOT_DEVICE}
-part loader2    --offset 8192   --fixed-size 4096K            --ondisk ${RK_BOOT_DEVICE} --source rawcopy --sourceparams="file=u-boot.bin"
-part atf        --offset 12288  --fixed-size 4096K            --ondisk ${RK_BOOT_DEVICE}
-part /boot      --offset 16384  --size       114688K --active --ondisk ${RK_BOOT_DEVICE} --source bootimg-partition --fstype=vfat --label boot --sourceparams="loader=u-boot"
-
wic/rk3399-boot.wks deleted +0 -24
deleted file mode 100644
index 8a65179..0000000
@@ -1,24 +0,0 @@
-# Copyright (C) 2020 Garmin Ltd. or its subsidiaries
-# Released under the MIT license (see COPYING.MIT for the terms)
-#
-# Disk layout
-# Note that the reference documentation refers to 512 byte disk sectors, but
-# wic uses 1KB blocks
-#
-#   Partition   Start Sector    Number of Sectors
-#   loader1     64              8000
-#   reserved1   8064            128
-#   reserved2   8192            8192
-#   loader2     16384           8192
-#   atf         24576           8192
-#   boot        32768           229376
-#   root        262144          -           (suggested)
-#
-
-part loader1    --offset 32     --fixed-size 4000K            --ondisk ${RK_BOOT_DEVICE} --source rawcopy --sourceparams="file=idbloader.img"
-part reserved1  --offset 4032   --fixed-size 64K              --ondisk ${RK_BOOT_DEVICE}
-part reserved2  --offset 4096   --fixed-size 4096K            --ondisk ${RK_BOOT_DEVICE}
-part loader2    --offset 8192   --fixed-size 4096K            --ondisk ${RK_BOOT_DEVICE} --source rawcopy --sourceparams="file=u-boot.itb"
-part atf        --offset 12288  --fixed-size 4096K            --ondisk ${RK_BOOT_DEVICE}
-part /boot      --offset 16384  --size       114688K --active --ondisk ${RK_BOOT_DEVICE} --source bootimg-partition --fstype=vfat --label boot --sourceparams="loader=u-boot"
-
wic/rock-pi-4.wks deleted +0 -7
deleted file mode 100644
index 5c02e9f..0000000
@@ -1,7 +0,0 @@
-# Copyright (C) 2020 Garmin Ltd. or its subsidiaries
-# Released under the MIT license (see COPYING.MIT for the terms)
-
-include rk3399-boot.wks
-part / --ondisk ${RK_BOOT_DEVICE} --source rootfs --fstype=ext4 --label root
-
-bootloader --ptable gpt --append="console=tty1 console=${RK_CONSOLE_DEVICE},${RK_CONSOLE_BAUD}n8 rw root=/dev/${RK_BOOT_DEVICE}p7 rootfstype=ext4 init=/sbin/init"
wic/rock-pi-e.wks deleted +0 -4
deleted file mode 100644
index 9c10d90..0000000
@@ -1,4 +0,0 @@
-include rk3328-boot.wks
-part / --ondisk ${RK_BOOT_DEVICE} --source rootfs --fstype=ext4 --label root
-
-bootloader --ptable gpt --append="console=tty1 console=${RK_CONSOLE_DEVICE},${RK_CONSOLE_BAUD}n8 rw root=/dev/${RK_BOOT_DEVICE}p7 rootfstype=ext4 init=/sbin/init"
wic/rockchip.wks renamed from wic/rk3328-boot.wks +6 -3
similarity index 64%
rename from wic/rk3328-boot.wks
rename to wic/rockchip.wks
index 194145b..eedae0d 100644
@@ -1,3 +1,4 @@
+# Copyright (C) 2019,2020 Garmin Ltd. or its subsidiaries
 # Copyright (C) 2021 Trevor Woerner
 # Released under the MIT license (see COPYING.MIT for the terms)
 #
@@ -13,11 +14,13 @@
 #   atf         24576           8192
 #   boot        32768           229376
 #   root        262144          -           (suggested)
-#
 
-part loader1    --offset 32     --fixed-size 4000K            --ondisk ${RK_BOOT_DEVICE} --source rawcopy --sourceparams="file=idbloader.img"
+part loader1    --offset 32     --fixed-size 4000K            --ondisk ${RK_BOOT_DEVICE} --source rawcopy                                      --sourceparams="file=${SPL_BINARY}"
 part reserved1  --offset 4032   --fixed-size 64K              --ondisk ${RK_BOOT_DEVICE}
 part reserved2  --offset 4096   --fixed-size 4096K            --ondisk ${RK_BOOT_DEVICE}
-part loader2    --offset 8192   --fixed-size 4096K            --ondisk ${RK_BOOT_DEVICE} --source rawcopy --sourceparams="file=u-boot.itb"
+part loader2    --offset 8192   --fixed-size 4096K            --ondisk ${RK_BOOT_DEVICE} --source rawcopy                                      --sourceparams="file=u-boot.${UBOOT_SUFFIX}"
 part atf        --offset 12288  --fixed-size 4096K            --ondisk ${RK_BOOT_DEVICE}
 part /boot      --offset 16384  --size       114688K --active --ondisk ${RK_BOOT_DEVICE} --source bootimg-partition --fstype=vfat --label boot --sourceparams="loader=u-boot"
+part /                                                        --ondisk ${RK_BOOT_DEVICE} --source rootfs            --fstype=ext4 --label root
+
+bootloader --ptable gpt --append="console=tty1 console=${RK_CONSOLE_DEVICE},${RK_CONSOLE_BAUD}n8 rw root=/dev/${RK_BOOT_DEVICE}p7 rootfstype=ext4 init=/sbin/init"
wic/tinker-board.wks deleted +0 -8
deleted file mode 100644
index 00ae820..0000000
@@ -1,8 +0,0 @@
-# Copyright (C) 2019 Garmin Ltd. or its subsidiaries
-# Released under the MIT license (see COPYING.MIT for the terms)
-
-include rk3288-boot.wks
-
-part / --ondisk ${RK_BOOT_DEVICE} --source rootfs --fstype=ext4 --label root
-
-bootloader --ptable gpt --append="console=tty1 console=${RK_CONSOLE_DEVICE},${RK_CONSOLE_BAUD}n8 rw root=/dev/${RK_BOOT_DEVICE}p7 rootfstype=ext4 init=/sbin/init"
wic/vyasa-rk3288.wks deleted +0 -8
deleted file mode 100644
index 5346fbd..0000000
@@ -1,8 +0,0 @@
-# Copyright (C) 2019 Garmin Ltd. or its subsidiaries
-# Released under the MIT license (see COPYING.MIT for the terms)
-
-include rk3288-boot.wks
-part / --ondisk ${RK_BOOT_DEVICE} --source rootfs --fstype=ext4 --label root
-
-bootloader --ptable gpt --append="console=tty1 console=${RK_CONSOLE_DEVICE},${RK_CONSOLE_BAUD}n8 rw root=/dev/${RK_BOOT_DEVICE}p7 rootfstype=ext4 init=/sbin/init"
-
Signature · 1 line
2.30.0.rc0
author Applied
#4 lore raw

Re: [meta-rockchip][PATCH 3/3] wic/wks cleanup

conf/machine/firefly-rk3288.conf

Quoted 54 lines · Trevor Woerner

By exporting a couple more variables the wks file for every rockchip device can be built from one template instead of having separate wks files for each board and platform.

The following BSP variables were checked before and after this change to make sure they remained valid/sensible:
- WKS_FILE
- UBOOT_SUFFIX
- SPL_BINARY
- IMAGE_FSTYPES

Built-tested for every MACHINE in this BSP.

Run-tested on the following devices to ensure they continue to boot correctly to a cmdline (core-image-base):
- tinker-board
- rock-pi-e
- rock-pi-4b
- rock64
- nanopi-m4-2gb

---
 conf/machine/firefly-rk3288.conf      |  2 --
 conf/machine/include/nanopi-m4.inc    |  1 -
 conf/machine/include/rk3288.inc       |  3 +--
 conf/machine/include/rk3328.inc       |  1 -
 conf/machine/include/rk3399.inc       |  2 --
 conf/machine/include/rock-pi-4.inc    |  1 -
 conf/machine/include/rockchip-wic.inc |  5 +++++
 conf/machine/include/tinker.inc       |  2 --
 conf/machine/rock-pi-e.conf           |  2 --
 conf/machine/rock64.conf              |  2 --
 conf/machine/vyasa-rk3288.conf        |  1 -
 wic/firefly-rk3288.wks                |  7 -------
 wic/rk3288-boot.wks                   | 24 ------------------------
 wic/rk3399-boot.wks                   | 24 ------------------------
 wic/rock-pi-4.wks                     |  7 -------
 wic/rock-pi-e.wks                     |  4 ----
 wic/{rk3328-boot.wks => rockchip.wks} |  9 ++++++---
 wic/tinker-board.wks                  |  8 --------
 wic/vyasa-rk3288.wks                  |  8 --------
 19 files changed, 12 insertions(+), 101 deletions(-)
 delete mode 100644 wic/firefly-rk3288.wks
 delete mode 100644 wic/rk3288-boot.wks
 delete mode 100644 wic/rk3399-boot.wks
 delete mode 100644 wic/rock-pi-4.wks
 delete mode 100644 wic/rock-pi-e.wks
 rename wic/{rk3328-boot.wks => rockchip.wks} (64%)
 delete mode 100644 wic/tinker-board.wks
 delete mode 100644 wic/vyasa-rk3288.wks
conf/machine/firefly-rk3288.conf +0 -0
index 138e840..3270bb9 100644

Applied to meta-rockchip master.

author Applied
#5 lore raw
In reply to Trevor Woerner

conf/machine/include/nanopi-m4.inc

Quoted 9 lines · Trevor Woerner

Specify the full include path to the rk3399.inc file.

---
 conf/machine/include/nanopi-m4.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
conf/machine/include/nanopi-m4.inc +0 -0
index 7ca91db..b5251a1 100644

Applied to meta-rockchip master.