Skip to contentSkip to conversation

configs/zynqmp_zcu10x_defconfig: use BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS

PATCH In review Neal Frager via buildroot 2 participants 3 messages Nov 3, 2022 – Nov 4, 2022 Arm/Zynq architecture

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 configs/zynqmp_zcu10x_defconfig: use BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS

This patch migrates the u-boot device tree definition from uboot.fragment files to use BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS instead for the zynqmp_zcu102 and zynqmp_zcu106 defconfigs.

---
 board/zynqmp/zcu102/uboot.fragment | 1 -
 board/zynqmp/zcu106/uboot.fragment | 1 -
 configs/zynqmp_zcu102_defconfig    | 2 +-
 configs/zynqmp_zcu106_defconfig    | 2 +-
 4 files changed, 2 insertions(+), 4 deletions(-)
 delete mode 100644 board/zynqmp/zcu102/uboot.fragment
 delete mode 100644 board/zynqmp/zcu106/uboot.fragment
board/zynqmp/zcu102/uboot.fragment deleted +0 -1
deleted file mode 100644
index 52d6d9dff8..0000000000
@@ -1 +0,0 @@
-CONFIG_DEFAULT_DEVICE_TREE="zynqmp-zcu102-rev1.0"
board/zynqmp/zcu106/uboot.fragment deleted +0 -1
deleted file mode 100644
index cd571171ac..0000000000
@@ -1 +0,0 @@
-CONFIG_DEFAULT_DEVICE_TREE="zynqmp-zcu106-revA"
configs/zynqmp_zcu102_defconfig +1 -1
index 66c24c4b64..e27dfdb6c9 100644
@@ -23,7 +23,7 @@ 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.1)/xlnx_rebase_v2022.01_2022.1.tar.gz"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt"
-BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/zynqmp/zcu102/uboot.fragment"
+BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=zynqmp-zcu102-rev1.0"
 BR2_TARGET_UBOOT_NEEDS_DTC=y
 BR2_TARGET_UBOOT_NEEDS_OPENSSL=y
 BR2_TARGET_UBOOT_SPL=y
configs/zynqmp_zcu106_defconfig +1 -1
index 896fea0ab2..4113a9025a 100644
@@ -23,7 +23,7 @@ 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.1)/xlnx_rebase_v2022.01_2022.1.tar.gz"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="xilinx_zynqmp_virt"
-BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/zynqmp/zcu106/uboot.fragment"
+BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=zynqmp-zcu106-revA"
 BR2_TARGET_UBOOT_NEEDS_DTC=y
 BR2_TARGET_UBOOT_NEEDS_OPENSSL=y
 BR2_TARGET_UBOOT_SPL=y
Signature · 6 lines
2.17.1

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#1 lore raw
Quoted 7 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Neal" == Neal Frager <[email protected]> writes:

This patch migrates the u-boot device tree definition from uboot.fragment files to use BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS instead for the zynqmp_zcu102 and zynqmp_zcu106 defconfigs.

Committed, thanks.

Signature · 5 lines
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#2 lore raw
In reply to Neal Frager via buildroot

Hi Neal,

Quoted 5 lines · On Thu, 3 Nov 2022 05:23:39 -0600 Neal Frager <[email protected]> wrote:

This patch migrates the u-boot device tree definition from uboot.fragment files to use BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS instead for the zynqmp_zcu102 and zynqmp_zcu106 defconfigs.

Thanks!

Signature · 7 lines
Luca Ceresoli, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot