| Message ID | 20221207154634.48866-1-neal.frager@amd.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [v1,1/1] configs/versal_vck190_defconfig: use correct u-boot.dtb in boot.bin | expand |
On Wed, 7 Dec 2022 08:46:34 -0700 Neal Frager via buildroot <buildroot@buildroot.org> wrote: > This patch fixes a problem in the vck190 boot.bin generation as it should be > using the u-boot.dtb as the u-boot device tree and not the Linux system.dtb. > While both dtbs are basically the same, it is better not to mix this up. > > Signed-off-by: Neal Frager <neal.frager@amd.com> > --- > board/versal/post-image.sh | 2 +- > board/versal/uboot.fragment | 1 + > configs/versal_vck190_defconfig | 2 ++ > 3 files changed, 4 insertions(+), 1 deletion(-) > create mode 100644 board/versal/uboot.fragment Applied to master, thanks. Thomas
diff --git a/board/versal/post-image.sh b/board/versal/post-image.sh index 890522c31d..f45f29a155 100755 --- a/board/versal/post-image.sh +++ b/board/versal/post-image.sh @@ -24,7 +24,7 @@ cat <<-__HEADER_EOF > "${BINARIES_DIR}/bootgen.bif" } image { id = 0x1c000000, name=apu_subsystem - { type=raw, load=0x00001000, file=${BINARIES_DIR}/system.dtb } + { type=raw, load=0x00001000, file=${BINARIES_DIR}/u-boot.dtb } { core=a72-0, exception_level=el-3, trustzone, file=${BINARIES_DIR}/bl31.elf } { core=a72-0, exception_level=el-2, file=${BINARIES_DIR}/u-boot.elf } } diff --git a/board/versal/uboot.fragment b/board/versal/uboot.fragment new file mode 100644 index 0000000000..6f71907379 --- /dev/null +++ b/board/versal/uboot.fragment @@ -0,0 +1 @@ +CONFIG_OF_SEPARATE=y diff --git a/configs/versal_vck190_defconfig b/configs/versal_vck190_defconfig index d87df221c6..fcda6eb431 100644 --- a/configs/versal_vck190_defconfig +++ b/configs/versal_vck190_defconfig @@ -25,10 +25,12 @@ BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_TARBALL=y BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,u-boot-xlnx,xlnx_rebase_v2022.01_2022.2)/xlnx_rebase_v2022.01_2022.2.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_versal_virt" +BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/versal/uboot.fragment" BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=versal-vck190-rev1.1" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_FORMAT_REMAKE_ELF=y +BR2_TARGET_UBOOT_FORMAT_DTB=y BR2_PACKAGE_VERSAL_FIRMWARE=y BR2_PACKAGE_VERSAL_FIRMWARE_VERSION="v2022.2" BR2_PACKAGE_VERSAL_FIRMWARE_BOARD="vck190"
This patch fixes a problem in the vck190 boot.bin generation as it should be using the u-boot.dtb as the u-boot device tree and not the Linux system.dtb. While both dtbs are basically the same, it is better not to mix this up. Signed-off-by: Neal Frager <neal.frager@amd.com> --- board/versal/post-image.sh | 2 +- board/versal/uboot.fragment | 1 + configs/versal_vck190_defconfig | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 board/versal/uboot.fragment