configs/versal_vck190_defconfig: use correct u-boot.dtb in boot.bin

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 <[email protected]>
Signed-off-by: Thomas Petazzoni <[email protected]>

diff --git a/board/versal/post-image.sh b/board/versal/post-image.sh
index 890522c31dad26b6bac8bc9c174bcca716f14528..f45f29a15598a253a7e6bd8479128ecb99eb68b5 100755 (executable)
--- 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 (file)
index 0000000..6f71907
--- /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 d87df221c69b74237c8817f319822ffa10a59375..fcda6eb431616efcef199490a532253561d53f17 100644 (file)
--- 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"