| Message ID | 20240120102520.889698-1-stephen@radxa.com |
|---|---|
| State | New |
| Headers | show |
| Series | [meta-rockchip] machines: correct rk3066/rk3188/rk3288 kernel devicetree path | expand |
On Sat 2024-01-20 @ 06:25:20 PM, Stephen Chen wrote: > Since mainline linux v6.5-rc1, this commit 724ba6751532 > ("ARM: dts: Move .dts files to vendor sub-directories") > was added. > > Link: https://github.com/torvalds/linux/commit/724ba6751532055db75992fc6ae21c3e322e94a7 > > Signed-off-by: Stephen Chen <stephen@radxa.com> > --- > 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' > diff --git a/conf/machine/firefly-rk3288.conf b/conf/machine/firefly-rk3288.conf > index 3270bb9..6ff1be8 100644 > --- a/conf/machine/firefly-rk3288.conf > +++ b/conf/machine/firefly-rk3288.conf > @@ -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" > diff --git a/conf/machine/marsboard-rk3066.conf b/conf/machine/marsboard-rk3066.conf > index 52fd256..36945e8 100644 > --- a/conf/machine/marsboard-rk3066.conf > +++ b/conf/machine/marsboard-rk3066.conf > @@ -8,4 +8,4 @@ > > require conf/machine/include/rk3066.inc > > -KERNEL_DEVICETREE = "rk3066a-marsboard.dtb" > +KERNEL_DEVICETREE = "rockchip/rk3066a-marsboard.dtb" > diff --git a/conf/machine/radxarock.conf b/conf/machine/radxarock.conf > index 42d8848..6ad8474 100644 > --- a/conf/machine/radxarock.conf > +++ b/conf/machine/radxarock.conf > @@ -9,4 +9,4 @@ > > require conf/machine/include/rk3188.inc > > -KERNEL_DEVICETREE = "rk3188-radxarock.dtb" > +KERNEL_DEVICETREE = "rockchip/rk3188-radxarock.dtb" > diff --git a/conf/machine/rock2-square.conf b/conf/machine/rock2-square.conf > index 46064ee..9468b9a 100644 > --- a/conf/machine/rock2-square.conf > +++ b/conf/machine/rock2-square.conf > @@ -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 > diff --git a/conf/machine/tinker-board-s.conf b/conf/machine/tinker-board-s.conf > index 870b9bc..3a65613 100644 > --- a/conf/machine/tinker-board-s.conf > +++ b/conf/machine/tinker-board-s.conf > @@ -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" > diff --git a/conf/machine/tinker-board.conf b/conf/machine/tinker-board.conf > index 8fe5f63..ef1a1c1 100644 > --- a/conf/machine/tinker-board.conf > +++ b/conf/machine/tinker-board.conf > @@ -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" > diff --git a/conf/machine/vyasa-rk3288.conf b/conf/machine/vyasa-rk3288.conf > index 5b44257..52b4401 100644 > --- a/conf/machine/vyasa-rk3288.conf > +++ b/conf/machine/vyasa-rk3288.conf > @@ -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" > -- > 2.34.1 >
On Sat 2024-01-20 @ 11:46:20 PM, Trevor Woerner via lists.yoctoproject.org wrote: > On Sat 2024-01-20 @ 06:25:20 PM, Stephen Chen wrote: > > Since mainline linux v6.5-rc1, this commit 724ba6751532 > > ("ARM: dts: Move .dts files to vendor sub-directories") > > was added. > > > > Link: https://github.com/torvalds/linux/commit/724ba6751532055db75992fc6ae21c3e322e94a7 > > > > Signed-off-by: Stephen Chen <stephen@radxa.com> > > --- > > 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' Perhaps also take a look the email thread here: https://lists.yoctoproject.org/g/yocto/topic/101728482#61210 > > diff --git a/conf/machine/firefly-rk3288.conf b/conf/machine/firefly-rk3288.conf > > index 3270bb9..6ff1be8 100644 > > --- a/conf/machine/firefly-rk3288.conf > > +++ b/conf/machine/firefly-rk3288.conf > > @@ -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" > > diff --git a/conf/machine/marsboard-rk3066.conf b/conf/machine/marsboard-rk3066.conf > > index 52fd256..36945e8 100644 > > --- a/conf/machine/marsboard-rk3066.conf > > +++ b/conf/machine/marsboard-rk3066.conf > > @@ -8,4 +8,4 @@ > > > > require conf/machine/include/rk3066.inc > > > > -KERNEL_DEVICETREE = "rk3066a-marsboard.dtb" > > +KERNEL_DEVICETREE = "rockchip/rk3066a-marsboard.dtb" > > diff --git a/conf/machine/radxarock.conf b/conf/machine/radxarock.conf > > index 42d8848..6ad8474 100644 > > --- a/conf/machine/radxarock.conf > > +++ b/conf/machine/radxarock.conf > > @@ -9,4 +9,4 @@ > > > > require conf/machine/include/rk3188.inc > > > > -KERNEL_DEVICETREE = "rk3188-radxarock.dtb" > > +KERNEL_DEVICETREE = "rockchip/rk3188-radxarock.dtb" > > diff --git a/conf/machine/rock2-square.conf b/conf/machine/rock2-square.conf > > index 46064ee..9468b9a 100644 > > --- a/conf/machine/rock2-square.conf > > +++ b/conf/machine/rock2-square.conf > > @@ -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 > > diff --git a/conf/machine/tinker-board-s.conf b/conf/machine/tinker-board-s.conf > > index 870b9bc..3a65613 100644 > > --- a/conf/machine/tinker-board-s.conf > > +++ b/conf/machine/tinker-board-s.conf > > @@ -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" > > diff --git a/conf/machine/tinker-board.conf b/conf/machine/tinker-board.conf > > index 8fe5f63..ef1a1c1 100644 > > --- a/conf/machine/tinker-board.conf > > +++ b/conf/machine/tinker-board.conf > > @@ -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" > > diff --git a/conf/machine/vyasa-rk3288.conf b/conf/machine/vyasa-rk3288.conf > > index 5b44257..52b4401 100644 > > --- a/conf/machine/vyasa-rk3288.conf > > +++ b/conf/machine/vyasa-rk3288.conf > > @@ -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" > > -- > > 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: yocto+owner@lists.yoctoproject.org > Unsubscribe: https://lists.yoctoproject.org/g/yocto/unsub [twoerner@gmail.com] > -=-=-=-=-=-=-=-=-=-=-=- >
Hi > > 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. > > 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' I think another patch would fix it. > > diff --git a/conf/machine/include/rockchip-wic.inc > b/conf/machine/include/rockchip-wic.inc > index 635288c..b4f4226 100644 > --- a/conf/machine/include/rockchip-wic.inc > +++ b/conf/machine/include/rockchip-wic.inc > @@ -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
On Sun 2024-01-21 @ 01:51:47 AM, Stephen Chen wrote: > Hi > > > > > 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. 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. > > > > > 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' > > I think another patch would fix it. As a courtesy, in the future please test your patches before sending them. > > > > > diff --git a/conf/machine/include/rockchip-wic.inc > > b/conf/machine/include/rockchip-wic.inc > > index 635288c..b4f4226 100644 > > --- a/conf/machine/include/rockchip-wic.inc > > +++ b/conf/machine/include/rockchip-wic.inc > > @@ -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
Hi, Sorry. I should read your email thread carefully. Thanks for your work.
diff --git a/conf/machine/firefly-rk3288.conf b/conf/machine/firefly-rk3288.conf index 3270bb9..6ff1be8 100644 --- a/conf/machine/firefly-rk3288.conf +++ b/conf/machine/firefly-rk3288.conf @@ -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" diff --git a/conf/machine/marsboard-rk3066.conf b/conf/machine/marsboard-rk3066.conf index 52fd256..36945e8 100644 --- a/conf/machine/marsboard-rk3066.conf +++ b/conf/machine/marsboard-rk3066.conf @@ -8,4 +8,4 @@ require conf/machine/include/rk3066.inc -KERNEL_DEVICETREE = "rk3066a-marsboard.dtb" +KERNEL_DEVICETREE = "rockchip/rk3066a-marsboard.dtb" diff --git a/conf/machine/radxarock.conf b/conf/machine/radxarock.conf index 42d8848..6ad8474 100644 --- a/conf/machine/radxarock.conf +++ b/conf/machine/radxarock.conf @@ -9,4 +9,4 @@ require conf/machine/include/rk3188.inc -KERNEL_DEVICETREE = "rk3188-radxarock.dtb" +KERNEL_DEVICETREE = "rockchip/rk3188-radxarock.dtb" diff --git a/conf/machine/rock2-square.conf b/conf/machine/rock2-square.conf index 46064ee..9468b9a 100644 --- a/conf/machine/rock2-square.conf +++ b/conf/machine/rock2-square.conf @@ -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 diff --git a/conf/machine/tinker-board-s.conf b/conf/machine/tinker-board-s.conf index 870b9bc..3a65613 100644 --- a/conf/machine/tinker-board-s.conf +++ b/conf/machine/tinker-board-s.conf @@ -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" diff --git a/conf/machine/tinker-board.conf b/conf/machine/tinker-board.conf index 8fe5f63..ef1a1c1 100644 --- a/conf/machine/tinker-board.conf +++ b/conf/machine/tinker-board.conf @@ -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" diff --git a/conf/machine/vyasa-rk3288.conf b/conf/machine/vyasa-rk3288.conf index 5b44257..52b4401 100644 --- a/conf/machine/vyasa-rk3288.conf +++ b/conf/machine/vyasa-rk3288.conf @@ -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"
Since mainline linux v6.5-rc1, this commit 724ba6751532 ("ARM: dts: Move .dts files to vendor sub-directories") was added. Link: https://github.com/torvalds/linux/commit/724ba6751532055db75992fc6ae21c3e322e94a7 Signed-off-by: Stephen Chen <stephen@radxa.com> --- 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(-)