From 14b9a100eff6ee58d57b9b7b4c0da9a648a7e1bf Mon Sep 17 00:00:00 2001 From: Neal Frager Date: Wed, 23 Feb 2022 11:03:36 -0700 Subject: [PATCH] configs/zynqmp_zcu10x: fix U-Boot dts config Add a U-Boot config fragment to set the correct control device tree file for each board, rather than using the default (zcu100). Signed-off-by: Neal Frager Tested-by: Peter Korsgaard [Peter: reword commit message, rename fragment files] Signed-off-by: Peter Korsgaard --- board/zynqmp/zcu102/uboot.fragment | 1 + board/zynqmp/zcu106/uboot.fragment | 1 + configs/zynqmp_zcu102_defconfig | 1 + configs/zynqmp_zcu106_defconfig | 1 + 4 files changed, 4 insertions(+) create mode 100644 board/zynqmp/zcu102/uboot.fragment create mode 100644 board/zynqmp/zcu106/uboot.fragment diff --git a/board/zynqmp/zcu102/uboot.fragment b/board/zynqmp/zcu102/uboot.fragment new file mode 100644 index 0000000000..52d6d9dff8 --- /dev/null +++ b/board/zynqmp/zcu102/uboot.fragment @@ -0,0 +1 @@ +CONFIG_DEFAULT_DEVICE_TREE="zynqmp-zcu102-rev1.0" diff --git a/board/zynqmp/zcu106/uboot.fragment b/board/zynqmp/zcu106/uboot.fragment new file mode 100644 index 0000000000..cd571171ac --- /dev/null +++ b/board/zynqmp/zcu106/uboot.fragment @@ -0,0 +1 @@ +CONFIG_DEFAULT_DEVICE_TREE="zynqmp-zcu106-revA" diff --git a/configs/zynqmp_zcu102_defconfig b/configs/zynqmp_zcu102_defconfig index 298ce2388c..4e96489179 100644 --- a/configs/zynqmp_zcu102_defconfig +++ b/configs/zynqmp_zcu102_defconfig @@ -25,6 +25,7 @@ BR2_TARGET_UBOOT_CUSTOM_GIT=y BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://github.com/Xilinx/u-boot-xlnx.git" BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="v2022.01-165-g667001319cbe511ce6353195fb4910ae5cb041ce" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" +BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/zynqmp/zcu102/uboot.fragment" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_SPL=y diff --git a/configs/zynqmp_zcu106_defconfig b/configs/zynqmp_zcu106_defconfig index 3e51cbfaab..0a97975aa0 100644 --- a/configs/zynqmp_zcu106_defconfig +++ b/configs/zynqmp_zcu106_defconfig @@ -25,6 +25,7 @@ BR2_TARGET_UBOOT_CUSTOM_GIT=y BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://github.com/Xilinx/u-boot-xlnx.git" BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="v2022.01-165-g667001319cbe511ce6353195fb4910ae5cb041ce" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt" +BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/zynqmp/zcu106/uboot.fragment" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_SPL=y