| Message ID | 20230202133817.56293-1-neal.frager@amd.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [v1,1/1] board/versal/post-image.sh: do not require xilinx/ prefix for .dts files | expand |
Hi Neal, On Thu, 2 Feb 2023 13:38:17 +0000 Neal Frager <neal.frager@amd.com> wrote: > If using BR2_LINUX_KERNEL_CUSTOM_DTS_PATH to copy .dts files from > buildroot into the linux tree, these .dts files are copied to > arch/arm64/boot. Unfortunately, the post-image.sh script expects to find > them in arch/arm64/boot/xilinx. > > This patch does not require the xilinx/ prefix to be present when > symlinking the device-tree to system.dtb where u-boot expects to find > it. > > It is effectively applying the below patch for zynqmp to versal as well: > https://patchwork.ozlabs.org/project/buildroot/patch/20230201195956.1758827-1-gsmecher@threespeedlogic.com/ > > Signed-off-by: Neal Frager <neal.frager@amd.com> > --- > board/versal/post-image.sh | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/board/versal/post-image.sh b/board/versal/post-image.sh > index f45f29a155..92e65ed3b7 100755 > --- a/board/versal/post-image.sh > +++ b/board/versal/post-image.sh > @@ -5,7 +5,7 @@ > # devicetree listed in the config. > > FIRST_DT=$(sed -nr \ > - -e 's|^BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/([-_/[:alnum:]\\.]*).*"$|\1|p' \ > + -e 's|^BR2_LINUX_KERNEL_INTREE_DTS_NAME="(xilinx/)?([-_/[:alnum:]\\.]*).*"$|\2|p' \ Reviewed-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
On Thu, 2 Feb 2023 13:38:17 +0000 Neal Frager via buildroot <buildroot@buildroot.org> wrote: > If using BR2_LINUX_KERNEL_CUSTOM_DTS_PATH to copy .dts files from > buildroot into the linux tree, these .dts files are copied to > arch/arm64/boot. Unfortunately, the post-image.sh script expects to find > them in arch/arm64/boot/xilinx. > > This patch does not require the xilinx/ prefix to be present when > symlinking the device-tree to system.dtb where u-boot expects to find > it. > > It is effectively applying the below patch for zynqmp to versal as well: > https://patchwork.ozlabs.org/project/buildroot/patch/20230201195956.1758827-1-gsmecher@threespeedlogic.com/ > > Signed-off-by: Neal Frager <neal.frager@amd.com> > --- > board/versal/post-image.sh | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Applied to master, thanks. Thomas
diff --git a/board/versal/post-image.sh b/board/versal/post-image.sh index f45f29a155..92e65ed3b7 100755 --- a/board/versal/post-image.sh +++ b/board/versal/post-image.sh @@ -5,7 +5,7 @@ # devicetree listed in the config. FIRST_DT=$(sed -nr \ - -e 's|^BR2_LINUX_KERNEL_INTREE_DTS_NAME="xilinx/([-_/[:alnum:]\\.]*).*"$|\1|p' \ + -e 's|^BR2_LINUX_KERNEL_INTREE_DTS_NAME="(xilinx/)?([-_/[:alnum:]\\.]*).*"$|\2|p' \ ${BR2_CONFIG}) [ -z "${FIRST_DT}" ] || ln -fs ${FIRST_DT}.dtb ${BINARIES_DIR}/system.dtb
If using BR2_LINUX_KERNEL_CUSTOM_DTS_PATH to copy .dts files from buildroot into the linux tree, these .dts files are copied to arch/arm64/boot. Unfortunately, the post-image.sh script expects to find them in arch/arm64/boot/xilinx. This patch does not require the xilinx/ prefix to be present when symlinking the device-tree to system.dtb where u-boot expects to find it. It is effectively applying the below patch for zynqmp to versal as well: https://patchwork.ozlabs.org/project/buildroot/patch/20230201195956.1758827-1-gsmecher@threespeedlogic.com/ Signed-off-by: Neal Frager <neal.frager@amd.com> --- board/versal/post-image.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)