diff mbox series

[v1,1/1] configs/zynqmp_zcu10x_defconfig: use BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS

Message ID 20221103112339.42954-1-neal.frager@amd.com
State Accepted
Headers show
Series [v1,1/1] configs/zynqmp_zcu10x_defconfig: use BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS | expand

Commit Message

Neal Frager Nov. 3, 2022, 11:23 a.m. UTC 
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.

Signed-off-by: Neal Frager <neal.frager@amd.com>
---
 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

Comments

Peter Korsgaard Nov. 3, 2022, 3:43 p.m. UTC | #1 
>>>>> "Neal" == Neal Frager <neal.frager@amd.com> 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.

 > Signed-off-by: Neal Frager <neal.frager@amd.com>

Committed, thanks.
Luca Ceresoli Nov. 4, 2022, 7:41 a.m. UTC | #2 
Hi Neal,

On Thu, 3 Nov 2022 05:23:39 -0600
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 zynqmp_zcu102 and zynqmp_zcu106 defconfigs.
> 
> Signed-off-by: Neal Frager <neal.frager@amd.com>

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

Thanks!
diff mbox series

Patch

diff --git a/board/zynqmp/zcu102/uboot.fragment b/board/zynqmp/zcu102/uboot.fragment
deleted file mode 100644
index 52d6d9dff8..0000000000
--- a/board/zynqmp/zcu102/uboot.fragment
+++ /dev/null
@@ -1 +0,0 @@ 
-CONFIG_DEFAULT_DEVICE_TREE="zynqmp-zcu102-rev1.0"
diff --git a/board/zynqmp/zcu106/uboot.fragment b/board/zynqmp/zcu106/uboot.fragment
deleted file mode 100644
index cd571171ac..0000000000
--- a/board/zynqmp/zcu106/uboot.fragment
+++ /dev/null
@@ -1 +0,0 @@ 
-CONFIG_DEFAULT_DEVICE_TREE="zynqmp-zcu106-revA"
diff --git a/configs/zynqmp_zcu102_defconfig b/configs/zynqmp_zcu102_defconfig
index 66c24c4b64..e27dfdb6c9 100644
--- a/configs/zynqmp_zcu102_defconfig
+++ b/configs/zynqmp_zcu102_defconfig
@@ -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
diff --git a/configs/zynqmp_zcu106_defconfig b/configs/zynqmp_zcu106_defconfig
index 896fea0ab2..4113a9025a 100644
--- a/configs/zynqmp_zcu106_defconfig
+++ b/configs/zynqmp_zcu106_defconfig
@@ -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