Skip to content

dtbtool-sprd: switch source to fix error if -p arg or dtb dir do not end with /

Administrator requested to merge dtbtool-sprd-trailing-slashes into master

Currently, running

dtbTool-sprd -p "scripts/dtc" -o "arch/arm/boot/dt.img" "arch/arm/boot/dts"

fails with something like

DTB combiner:
  Input directory: 'arch/arm/boot/dts'
  Output file: 'dt.img'
Found file: sprd-scx20_sp7731ceb.dtb ... skip, failed to scan for 'sprd,sc-id = 
<' tag
=> Found 0 unique DTB(s)

This happens due to paths being concatenates without a slash in between, so the tools tries to run for example scripts/dtcdtc instead of scripts/dtc/dtc.

I wanted to just add a patch to fix this, but this does not seem to be possible when source is a single file rather than an archive? I am getting

File dtbtool-sprd-f0e4a4c5025b8f7a13e69db3af9446717702f4f2-dtbtool.c is not a regular file -- refusing to patch

so instead I set up a small repository for it.

Edited by Administrator

Merge request reports