[Buildroot] [PATCH v1 1/1] configs/zynq_xxx_defconfig: use BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS

[Buildroot] [PATCH v1 1/1] configs/zynq_xxx_defconfig: use BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS

[Neal Frager via buildroot]

This patch migrates the u-boot device tree definition
from uboot.fragment files to use BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS
instead for the zynq_zc706, zynq_zed and zynq_microzed defconfigs.

Signed-off-by: Neal Frager <neal.frager@amd.com>
---
 board/zynq/microzed/uboot.fragment | 1 -
 board/zynq/zc706/uboot.fragment    | 1 -
 board/zynq/zed/uboot.fragment      | 1 -
 configs/zynq_microzed_defconfig    | 2 +-
 configs/zynq_zc706_defconfig       | 2 +-
 configs/zynq_zed_defconfig         | 2 +-
 6 files changed, 3 insertions(+), 6 deletions(-)
 delete mode 100644 board/zynq/microzed/uboot.fragment
 delete mode 100644 board/zynq/zc706/uboot.fragment
 delete mode 100644 board/zynq/zed/uboot.fragment

diff --git a/board/zynq/microzed/uboot.fragment b/board/zynq/microzed/uboot.fragment
deleted file mode 100644
index bc4dffaffa..0000000000
--- a/board/zynq/microzed/uboot.fragment
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DEFAULT_DEVICE_TREE="zynq-microzed"
diff --git a/board/zynq/zc706/uboot.fragment b/board/zynq/zc706/uboot.fragment
deleted file mode 100644
index ad5efa6204..0000000000
--- a/board/zynq/zc706/uboot.fragment
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DEFAULT_DEVICE_TREE="zynq-zc706"
diff --git a/board/zynq/zed/uboot.fragment b/board/zynq/zed/uboot.fragment
deleted file mode 100644
index d58fcd5439..0000000000
--- a/board/zynq/zed/uboot.fragment
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DEFAULT_DEVICE_TREE="zynq-zed"
diff --git a/configs/zynq_microzed_defconfig b/configs/zynq_microzed_defconfig
index 10a4f4095f..5f3fc5e6ab 100644
--- a/configs/zynq_microzed_defconfig
+++ b/configs/zynq_microzed_defconfig
@@ -21,7 +21,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_zynq_virt"
-BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/zynq/microzed/uboot.fragment"
+BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=zynq-microzed"
 BR2_TARGET_UBOOT_NEEDS_DTC=y
 BR2_TARGET_UBOOT_NEEDS_OPENSSL=y
 BR2_TARGET_UBOOT_FORMAT_IMG=y
diff --git a/configs/zynq_zc706_defconfig b/configs/zynq_zc706_defconfig
index 82c47be7a5..0daaeca872 100644
--- a/configs/zynq_zc706_defconfig
+++ b/configs/zynq_zc706_defconfig
@@ -21,7 +21,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_zynq_virt"
-BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/zynq/zc706/uboot.fragment"
+BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=zynq-zc706"
 BR2_TARGET_UBOOT_NEEDS_DTC=y
 BR2_TARGET_UBOOT_NEEDS_OPENSSL=y
 BR2_TARGET_UBOOT_FORMAT_IMG=y
diff --git a/configs/zynq_zed_defconfig b/configs/zynq_zed_defconfig
index 34e1b67184..74c2e8c4d3 100644
--- a/configs/zynq_zed_defconfig
+++ b/configs/zynq_zed_defconfig
@@ -21,7 +21,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_zynq_virt"
-BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/zynq/zed/uboot.fragment"
+BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="DEVICE_TREE=zynq-zed"
 BR2_TARGET_UBOOT_NEEDS_DTC=y
 BR2_TARGET_UBOOT_NEEDS_OPENSSL=y
 BR2_TARGET_UBOOT_FORMAT_IMG=y
-- 
2.17.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v1 1/1] configs/zynq_xxx_defconfig: use BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS

[Luca Ceresoli via buildroot]

On Mon, 7 Nov 2022 05:43:18 -0700
Neal Frager <neal.frager@amd.com> wrote:

> This patch migrates the u-boot device tree definition
> from uboot.fragment files to use BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS
> instead for the zynq_zc706, zynq_zed and zynq_microzed defconfigs.
> 
> Signed-off-by: Neal Frager <neal.frager@amd.com>

Reviewed-by: Luca Ceresoli <luca.ceresoli@bootlin.com>

...before Peter applies the patch, this time! ;-)

-- 
Luca Ceresoli, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH v1 1/1] configs/zynq_xxx_defconfig: use BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS

[Thomas Petazzoni via buildroot]

On Mon, 7 Nov 2022 05:43:18 -0700
Neal Frager via buildroot <buildroot@buildroot.org> wrote:

> This patch migrates the u-boot device tree definition
> from uboot.fragment files to use BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS
> instead for the zynq_zc706, zynq_zed and zynq_microzed defconfigs.
> 
> Signed-off-by: Neal Frager <neal.frager@amd.com>
> ---
>  board/zynq/microzed/uboot.fragment | 1 -
>  board/zynq/zc706/uboot.fragment    | 1 -
>  board/zynq/zed/uboot.fragment      | 1 -
>  configs/zynq_microzed_defconfig    | 2 +-
>  configs/zynq_zc706_defconfig       | 2 +-
>  configs/zynq_zed_defconfig         | 2 +-
>  6 files changed, 3 insertions(+), 6 deletions(-)
>  delete mode 100644 board/zynq/microzed/uboot.fragment
>  delete mode 100644 board/zynq/zc706/uboot.fragment
>  delete mode 100644 board/zynq/zed/uboot.fragment

Applied to next, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot