Skip to contentSkip to conversation

machines: correct rk3066/rk3188/rk3288 kernel devicetree path

PATCH In review Stephen Chen 2 participants 6 messages Jan 20, 2024 – Jan 22, 2024 1 message not in the archive

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 machines: correct rk3066/rk3188/rk3288 kernel devicetree path

Since mainline linux v6.5-rc1, this commit 724ba6751532 ("ARM: dts: Move .dts files to vendor sub-directories") was added.

---
 conf/machine/firefly-rk3288.conf   | 2 +-
 conf/machine/marsboard-rk3066.conf | 2 +-
 conf/machine/radxarock.conf        | 2 +-
 conf/machine/rock2-square.conf     | 2 +-
 conf/machine/tinker-board-s.conf   | 2 +-
 conf/machine/tinker-board.conf     | 2 +-
 conf/machine/vyasa-rk3288.conf     | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)
conf/machine/firefly-rk3288.conf +1 -1
index 3270bb9..6ff1be8 100644
@@ -9,5 +9,5 @@
 require conf/machine/include/rk3288.inc
 require conf/machine/include/rockchip-wic.inc
 
-KERNEL_DEVICETREE = "rk3288-firefly.dtb"
+KERNEL_DEVICETREE = "rockchip/rk3288-firefly.dtb"
 UBOOT_MACHINE = "firefly-rk3288_defconfig"
conf/machine/marsboard-rk3066.conf +1 -1
index 52fd256..36945e8 100644
@@ -8,4 +8,4 @@
 
 require conf/machine/include/rk3066.inc
 
-KERNEL_DEVICETREE = "rk3066a-marsboard.dtb"
+KERNEL_DEVICETREE = "rockchip/rk3066a-marsboard.dtb"
conf/machine/radxarock.conf +1 -1
index 42d8848..6ad8474 100644
@@ -9,4 +9,4 @@
 
 require conf/machine/include/rk3188.inc
 
-KERNEL_DEVICETREE = "rk3188-radxarock.dtb"
+KERNEL_DEVICETREE = "rockchip/rk3188-radxarock.dtb"
conf/machine/rock2-square.conf +1 -1
index 46064ee..9468b9a 100644
@@ -9,7 +9,7 @@
 require conf/machine/include/rk3288.inc
 
 SPL_BINARY = "u-boot-spl-dtb.bin"
-KERNEL_DEVICETREE = "rk3288-rock2-square.dtb"
+KERNEL_DEVICETREE = "rockchip/rk3288-rock2-square.dtb"
 UBOOT_MACHINE = "rock2_defconfig"
 
 # This board doesn't support the combined idbloader, so resort to the older
conf/machine/tinker-board-s.conf +1 -1
index 870b9bc..3a65613 100644
@@ -7,5 +7,5 @@
 
 require conf/machine/include/tinker.inc
 
-KERNEL_DEVICETREE = "rk3288-tinker-s.dtb"
+KERNEL_DEVICETREE = "rockchip/rk3288-tinker-s.dtb"
 UBOOT_MACHINE = "tinker-s-rk3288_defconfig"
conf/machine/tinker-board.conf +1 -1
index 8fe5f63..ef1a1c1 100644
@@ -7,5 +7,5 @@
 
 require conf/machine/include/tinker.inc
 
-KERNEL_DEVICETREE = "rk3288-tinker.dtb"
+KERNEL_DEVICETREE = "rockchip/rk3288-tinker.dtb"
 UBOOT_MACHINE = "tinker-rk3288_defconfig"
conf/machine/vyasa-rk3288.conf +1 -1
index 5b44257..52b4401 100644
@@ -9,7 +9,7 @@ require conf/machine/include/rk3288.inc
 require conf/machine/include/rockchip-wic.inc
 
 KERNEL_IMAGETYPE = "uImage"
-KERNEL_DEVICETREE = "rk3288-vyasa.dtb"
+KERNEL_DEVICETREE = "rockchip/rk3288-vyasa.dtb"
 KERNEL_EXTRA_ARGS += "LOADADDR=0x02000000"
 
 UBOOT_MACHINE = "vyasa-rk3288_defconfig"
Signature · 1 line
2.34.1
#1 lore raw
Quoted 7 lines · Stephen Chen

Since mainline linux v6.5-rc1, this commit 724ba6751532 ("ARM: dts: Move .dts files to vendor sub-directories") was added.

Quoted 9 lines
---
 conf/machine/firefly-rk3288.conf   | 2 +-
 conf/machine/marsboard-rk3066.conf | 2 +-
 conf/machine/radxarock.conf        | 2 +-
 conf/machine/rock2-square.conf     | 2 +-
 conf/machine/tinker-board-s.conf   | 2 +-
 conf/machine/tinker-board.conf     | 2 +-
 conf/machine/vyasa-rk3288.conf     | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

When I build I get:

	| /opt/oe/configs/z/build-master/tinker-board/layers/openembedded-core/scripts/lib/wic/engine.py:362: SyntaxWarning: invalid escape sequence '\/'
	|   abs_path = re.sub('\/\/+', '/', path)
	| INFO: Creating image(s)...
	| 
	| ERROR: _exec_cmd: install -m 0644 -D /z/build-master/tinker-board/build/tmp-glibc/deploy/images/tinker-board/rockchip/rk3288-tinker.dtb /z/build-master/tinker-board/build/tmp-glibc/work/tinker_board-oe-linux-gnueabi/core-image-base/1.0/tmp-wic/boot.6/rockchip/rk3288-tinker.dtb returned '1' instead of 0
	| output: install: cannot stat '/z/build-master/tinker-board/build/tmp-glibc/deploy/images/tinker-board/rockchip/rk3288-tinker.dtb': No such file or directory
	| 
	| WARNING: /z/build-master/tinker-board/build/tmp-glibc/work/tinker_board-oe-linux-gnueabi/core-image-base/1.0/temp/run.do_image_wic.449:160 exit 1 from 'BUILDDIR="/z/build-master/tinker-board/build" PSEUDO_UNLOAD=1 wic create "$wks" --vars "/z/build-master/tinker-board/build/tmp-glibc/sysroots/tinker-board/imgdata/" -e "core-image-base" -o "$build_wic/" -w "$tmp_wic"'
	| WARNING: Backtrace (BB generated script):
	|       #1: do_image_wic, /z/build-master/tinker-board/build/tmp-glibc/work/tinker_board-oe-linux-gnueabi/core-image-base/1.0/temp/run.do_image_wic.449, line 160
	|       #2: main, /z/build-master/tinker-board/build/tmp-glibc/work/tinker_board-oe-linux-gnueabi/core-image-base/1.0/temp/run.do_image_wic.449, line 177

ERROR: Task (/opt/oe/configs/z/build-master/tinker-board/layers/openembedded-core/meta/recipes-core/images/core-image-base.bb:do_image_wic) failed with exit code '1'

Quoted 82 lines
conf/machine/firefly-rk3288.conf +1 -1
index 3270bb9..6ff1be8 100644
@@ -9,5 +9,5 @@
 require conf/machine/include/rk3288.inc
 require conf/machine/include/rockchip-wic.inc
 
-KERNEL_DEVICETREE = "rk3288-firefly.dtb"
+KERNEL_DEVICETREE = "rockchip/rk3288-firefly.dtb"
 UBOOT_MACHINE = "firefly-rk3288_defconfig"
conf/machine/marsboard-rk3066.conf +1 -1
index 52fd256..36945e8 100644
@@ -8,4 +8,4 @@
 
 require conf/machine/include/rk3066.inc
 
-KERNEL_DEVICETREE = "rk3066a-marsboard.dtb"
+KERNEL_DEVICETREE = "rockchip/rk3066a-marsboard.dtb"
conf/machine/radxarock.conf +1 -1
index 42d8848..6ad8474 100644
@@ -9,4 +9,4 @@
 
 require conf/machine/include/rk3188.inc
 
-KERNEL_DEVICETREE = "rk3188-radxarock.dtb"
+KERNEL_DEVICETREE = "rockchip/rk3188-radxarock.dtb"
conf/machine/rock2-square.conf +1 -1
index 46064ee..9468b9a 100644
@@ -9,7 +9,7 @@
 require conf/machine/include/rk3288.inc
 
 SPL_BINARY = "u-boot-spl-dtb.bin"
-KERNEL_DEVICETREE = "rk3288-rock2-square.dtb"
+KERNEL_DEVICETREE = "rockchip/rk3288-rock2-square.dtb"
 UBOOT_MACHINE = "rock2_defconfig"
 
 # This board doesn't support the combined idbloader, so resort to the older
conf/machine/tinker-board-s.conf +1 -1
index 870b9bc..3a65613 100644
@@ -7,5 +7,5 @@
 
 require conf/machine/include/tinker.inc
 
-KERNEL_DEVICETREE = "rk3288-tinker-s.dtb"
+KERNEL_DEVICETREE = "rockchip/rk3288-tinker-s.dtb"
 UBOOT_MACHINE = "tinker-s-rk3288_defconfig"
conf/machine/tinker-board.conf +1 -1
index 8fe5f63..ef1a1c1 100644
@@ -7,5 +7,5 @@
 
 require conf/machine/include/tinker.inc
 
-KERNEL_DEVICETREE = "rk3288-tinker.dtb"
+KERNEL_DEVICETREE = "rockchip/rk3288-tinker.dtb"
 UBOOT_MACHINE = "tinker-rk3288_defconfig"
conf/machine/vyasa-rk3288.conf +1 -1
index 5b44257..52b4401 100644
@@ -9,7 +9,7 @@ require conf/machine/include/rk3288.inc
 require conf/machine/include/rockchip-wic.inc
 
 KERNEL_IMAGETYPE = "uImage"
-KERNEL_DEVICETREE = "rk3288-vyasa.dtb"
+KERNEL_DEVICETREE = "rockchip/rk3288-vyasa.dtb"
 KERNEL_EXTRA_ARGS += "LOADADDR=0x02000000"
 
 UBOOT_MACHINE = "vyasa-rk3288_defconfig"
Signature · 1 line
2.34.1

A message that is not in the archive (sent off-list or not yet received): [email protected]

#3 lore raw
Quoted 31 lines · Trevor Woerner via lists.yoctoproject.org
Quoted 7 lines · Stephen Chen

Since mainline linux v6.5-rc1, this commit 724ba6751532 ("ARM: dts: Move .dts files to vendor sub-directories") was added.

Quoted 9 lines
---
 conf/machine/firefly-rk3288.conf   | 2 +-
 conf/machine/marsboard-rk3066.conf | 2 +-
 conf/machine/radxarock.conf        | 2 +-
 conf/machine/rock2-square.conf     | 2 +-
 conf/machine/tinker-board-s.conf   | 2 +-
 conf/machine/tinker-board.conf     | 2 +-
 conf/machine/vyasa-rk3288.conf     | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

When I build I get:

	| /opt/oe/configs/z/build-master/tinker-board/layers/openembedded-core/scripts/lib/wic/engine.py:362: SyntaxWarning: invalid escape sequence '\/'
	|   abs_path = re.sub('\/\/+', '/', path)
	| INFO: Creating image(s)...
	| 
	| ERROR: _exec_cmd: install -m 0644 -D /z/build-master/tinker-board/build/tmp-glibc/deploy/images/tinker-board/rockchip/rk3288-tinker.dtb /z/build-master/tinker-board/build/tmp-glibc/work/tinker_board-oe-linux-gnueabi/core-image-base/1.0/tmp-wic/boot.6/rockchip/rk3288-tinker.dtb returned '1' instead of 0
	| output: install: cannot stat '/z/build-master/tinker-board/build/tmp-glibc/deploy/images/tinker-board/rockchip/rk3288-tinker.dtb': No such file or directory
	| 
	| WARNING: /z/build-master/tinker-board/build/tmp-glibc/work/tinker_board-oe-linux-gnueabi/core-image-base/1.0/temp/run.do_image_wic.449:160 exit 1 from 'BUILDDIR="/z/build-master/tinker-board/build" PSEUDO_UNLOAD=1 wic create "$wks" --vars "/z/build-master/tinker-board/build/tmp-glibc/sysroots/tinker-board/imgdata/" -e "core-image-base" -o "$build_wic/" -w "$tmp_wic"'
	| WARNING: Backtrace (BB generated script):
	|       #1: do_image_wic, /z/build-master/tinker-board/build/tmp-glibc/work/tinker_board-oe-linux-gnueabi/core-image-base/1.0/temp/run.do_image_wic.449, line 160
	|       #2: main, /z/build-master/tinker-board/build/tmp-glibc/work/tinker_board-oe-linux-gnueabi/core-image-base/1.0/temp/run.do_image_wic.449, line 177
Quoted 1 line

ERROR: Task (/opt/oe/configs/z/build-master/tinker-board/layers/openembedded-core/meta/recipes-core/images/core-image-base.bb:do_image_wic) failed with exit code '1'

Perhaps also take a look the email thread here:

	https://lists.yoctoproject.org/g/yocto/topic/101728482#61210
Quoted 92 lines
Quoted 82 lines
conf/machine/firefly-rk3288.conf +1 -1
index 3270bb9..6ff1be8 100644
@@ -9,5 +9,5 @@
 require conf/machine/include/rk3288.inc
 require conf/machine/include/rockchip-wic.inc
 
-KERNEL_DEVICETREE = "rk3288-firefly.dtb"
+KERNEL_DEVICETREE = "rockchip/rk3288-firefly.dtb"
 UBOOT_MACHINE = "firefly-rk3288_defconfig"
conf/machine/marsboard-rk3066.conf +1 -1
index 52fd256..36945e8 100644
@@ -8,4 +8,4 @@
 
 require conf/machine/include/rk3066.inc
 
-KERNEL_DEVICETREE = "rk3066a-marsboard.dtb"
+KERNEL_DEVICETREE = "rockchip/rk3066a-marsboard.dtb"
conf/machine/radxarock.conf +1 -1
index 42d8848..6ad8474 100644
@@ -9,4 +9,4 @@
 
 require conf/machine/include/rk3188.inc
 
-KERNEL_DEVICETREE = "rk3188-radxarock.dtb"
+KERNEL_DEVICETREE = "rockchip/rk3188-radxarock.dtb"
conf/machine/rock2-square.conf +1 -1
index 46064ee..9468b9a 100644
@@ -9,7 +9,7 @@
 require conf/machine/include/rk3288.inc
 
 SPL_BINARY = "u-boot-spl-dtb.bin"
-KERNEL_DEVICETREE = "rk3288-rock2-square.dtb"
+KERNEL_DEVICETREE = "rockchip/rk3288-rock2-square.dtb"
 UBOOT_MACHINE = "rock2_defconfig"
 
 # This board doesn't support the combined idbloader, so resort to the older
conf/machine/tinker-board-s.conf +1 -1
index 870b9bc..3a65613 100644
@@ -7,5 +7,5 @@
 
 require conf/machine/include/tinker.inc
 
-KERNEL_DEVICETREE = "rk3288-tinker-s.dtb"
+KERNEL_DEVICETREE = "rockchip/rk3288-tinker-s.dtb"
 UBOOT_MACHINE = "tinker-s-rk3288_defconfig"
conf/machine/tinker-board.conf +1 -1
index 8fe5f63..ef1a1c1 100644
@@ -7,5 +7,5 @@
 
 require conf/machine/include/tinker.inc
 
-KERNEL_DEVICETREE = "rk3288-tinker.dtb"
+KERNEL_DEVICETREE = "rockchip/rk3288-tinker.dtb"
 UBOOT_MACHINE = "tinker-rk3288_defconfig"
conf/machine/vyasa-rk3288.conf +1 -1
index 5b44257..52b4401 100644
@@ -9,7 +9,7 @@ require conf/machine/include/rk3288.inc
 require conf/machine/include/rockchip-wic.inc
 
 KERNEL_IMAGETYPE = "uImage"
-KERNEL_DEVICETREE = "rk3288-vyasa.dtb"
+KERNEL_DEVICETREE = "rockchip/rk3288-vyasa.dtb"
 KERNEL_EXTRA_ARGS += "LOADADDR=0x02000000"
 
 UBOOT_MACHINE = "vyasa-rk3288_defconfig"
Signature · 1 line
2.34.1

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#62211): https://lists.yoctoproject.org/g/yocto/message/62211
Mute This Topic: https://lists.yoctoproject.org/mt/103847371/900817
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/yocto/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

#4 lore raw

Hi

Quoted 3 lines

Perhaps also take a look the email thread here:
https://lists.yoctoproject.org/g/yocto/topic/101728482#61210

This patch fixes kernel build error like this.

Run command "MACHINE=rock2-square bitbake linux-yocto" and get the error.

|   SYNC    include/config/auto.conf
|   GEN     Makefile
| make[2]: *** No rule to make target 'arch/arm/boot/dts/rk3288-rock2-square.dtb'.  Stop.

You can run "MACHINE=tinker-board bitbake linux-yocto" to test it.

Quoted 25 lines

When I build I get:

| /opt/oe/configs/z/build-master/tinker-board/layers/openembedded-core/scripts/lib/wic/engine.py:362:
SyntaxWarning: invalid escape sequence '\/'

| abs_path = re.sub('\/\/+', '/', path)
| INFO: Creating image(s)...
|
| ERROR: _exec_cmd: install -m 0644 -D

/z/build-master/tinker-board/build/tmp-glibc/deploy/images/tinker-board/rockchip/rk3288-tinker.dtb /z/build-master/tinker-board/build/tmp-glibc/work/tinker_board-oe-linux-gnueabi/core-image-base/1.0/tmp-wic/boot.6/rockchip/rk3288-tinker.dtb returned '1' instead of 0
| output: install: cannot stat '/z/build-master/tinker-board/build/tmp-glibc/deploy/images/tinker-board/rockchip/rk3288-tinker.dtb':
No such file or directory
|
| WARNING:
/z/build-master/tinker-board/build/tmp-glibc/work/tinker_board-oe-linux-gnueabi/core-image-base/1.0/temp/run.do_image_wic.449:160 exit 1 from 'BUILDDIR="/z/build-master/tinker-board/build" PSEUDO_UNLOAD=1
wic create "$wks" --vars
"/z/build-master/tinker-board/build/tmp-glibc/sysroots/tinker-board/imgdata/"
-e "core-image-base" -o "$build_wic/" -w "$tmp_wic"'
| WARNING: Backtrace (BB generated script):
| #1: do_image_wic,

Quoted 8 lines

/z/build-master/tinker-board/build/tmp-glibc/work/tinker_board-oe-linux-gnueabi/core-image-base/1.0/temp/run.do_image_wic.449, line 160
| #2: main, /z/build-master/tinker-board/build/tmp-glibc/work/tinker_board-oe-linux-gnueabi/core-image-base/1.0/temp/run.do_image_wic.449, line 177
ERROR: Task (/opt/oe/configs/z/build-master/tinker-board/layers/openembedded-core/meta/recipes-core/images/core-image-base.bb:do_image_wic) failed with exit code '1'

I think another patch would fix it.

Quoted 17 lines
conf/machine/include/rockchip-wic.inc +0 -0
index 635288c..b4f4226 100644
@@ -13,7 +13,7 @@ WKS_FILE_DEPENDS ?= " \

"
IMAGE_BOOT_FILES = " \
${KERNEL_IMAGETYPE} \
-       ${@bb.utils.contains('KERNEL_IMAGETYPE', 'fitImage', '', '${KERNEL_DEVICETREE}', d)} \
+       ${@bb.utils.contains('KERNEL_IMAGETYPE', 'fitImage', '', '${SOC_FAMILY}*.dtb', d)} \
"

# use the first-defined <baud>;<device> pair in SERIAL_CONSOLES
#5 lore raw
Quoted 8 lines · Stephen Chen

Hi

Quoted 3 lines

Perhaps also take a look the email thread here:
https://lists.yoctoproject.org/g/yocto/topic/101728482#61210

This patch fixes kernel build error like this.

Quoted 7 lines

Run command "MACHINE=rock2-square bitbake linux-yocto" and get the error.

|   SYNC    include/config/auto.conf
|   GEN     Makefile
| make[2]: *** No rule to make target 'arch/arm/boot/dts/rk3288-rock2-square.dtb'.  Stop.

You can run "MACHINE=tinker-board bitbake linux-yocto" to test it.

If you would have read the email thread which I linked above, you would have noticed that I submitted a patch to do the same thing in the beginning of November, and you would have seen why it wasn't applied then.

Quoted 35 lines
Quoted 26 lines

When I build I get:

| /opt/oe/configs/z/build-master/tinker-board/layers/openembedded-core/scripts/lib/wic/engine.py:362:
SyntaxWarning: invalid escape sequence '\/'

| abs_path = re.sub('\/\/+', '/', path)
| INFO: Creating image(s)...
|
| ERROR: _exec_cmd: install -m 0644 -D

/z/build-master/tinker-board/build/tmp-glibc/deploy/images/tinker-board/rockchip/rk3288-tinker.dtb /z/build-master/tinker-board/build/tmp-glibc/work/tinker_board-oe-linux-gnueabi/core-image-base/1.0/tmp-wic/boot.6/rockchip/rk3288-tinker.dtb returned '1' instead of 0
| output: install: cannot stat '/z/build-master/tinker-board/build/tmp-glibc/deploy/images/tinker-board/rockchip/rk3288-tinker.dtb':
No such file or directory
|
| WARNING:
/z/build-master/tinker-board/build/tmp-glibc/work/tinker_board-oe-linux-gnueabi/core-image-base/1.0/temp/run.do_image_wic.449:160 exit 1 from 'BUILDDIR="/z/build-master/tinker-board/build" PSEUDO_UNLOAD=1
wic create "$wks" --vars
"/z/build-master/tinker-board/build/tmp-glibc/sysroots/tinker-board/imgdata/"
-e "core-image-base" -o "$build_wic/" -w "$tmp_wic"'
| WARNING: Backtrace (BB generated script):
| #1: do_image_wic,

Quoted 8 lines

/z/build-master/tinker-board/build/tmp-glibc/work/tinker_board-oe-linux-gnueabi/core-image-base/1.0/temp/run.do_image_wic.449, line 160
| #2: main, /z/build-master/tinker-board/build/tmp-glibc/work/tinker_board-oe-linux-gnueabi/core-image-base/1.0/temp/run.do_image_wic.449, line 177
ERROR: Task (/opt/oe/configs/z/build-master/tinker-board/layers/openembedded-core/meta/recipes-core/images/core-image-base.bb:do_image_wic) failed with exit code '1'

Quoted 1 line

I think another patch would fix it.

As a courtesy, in the future please test your patches before sending them.

Quoted 18 lines
Quoted 18 lines
conf/machine/include/rockchip-wic.inc +0 -0
index 635288c..b4f4226 100644
@@ -13,7 +13,7 @@ WKS_FILE_DEPENDS ?= " \

"
IMAGE_BOOT_FILES = " \
${KERNEL_IMAGETYPE} \
-       ${@bb.utils.contains('KERNEL_IMAGETYPE', 'fitImage', '', '${KERNEL_DEVICETREE}', d)} \
+       ${@bb.utils.contains('KERNEL_IMAGETYPE', 'fitImage', '', '${SOC_FAMILY}*.dtb', d)} \
"

# use the first-defined <baud>;<device> pair in SERIAL_CONSOLES
#6 lore raw

Hi,
Sorry. I should read your email thread carefully.
Thanks for your work.