Message ID | 6c12a21234f1cc190cd72a06b2fb1be825cbb39f.1500547345.git.michal.simek@xilinx.com |
---|---|
State | Deferred |
Delegated to: | Michal Simek |
Headers | show |
On 20 July 2017 at 04:42, Michal Simek <michal.simek@xilinx.com> wrote: > Not using board revision is causing confusion about which board is > supported and tested. Mark dts files exactly with board revision which > was tested. When new board revision arives it can be symlink if SW view > is the same. Also add -revX suffix to compatible string because user space > tools are parsing this string and can change behavior depends of board > revision. > > Signed-off-by: Michal Simek <michal.simek@xilinx.com> > --- > > arch/arm/dts/Makefile | 2 +- > arch/arm/dts/{zynqmp-zcu102.dts => zynqmp-zcu102-revA.dts} | 2 +- > arch/arm/dts/zynqmp-zcu102-revB.dts | 2 +- > ...linx_zynqmp_zcu102_defconfig => xilinx_zynqmp_zcu102_revA_defconfig} | 2 +- > 4 files changed, 4 insertions(+), 4 deletions(-) > rename arch/arm/dts/{zynqmp-zcu102.dts => zynqmp-zcu102-revA.dts} (99%) > rename configs/{xilinx_zynqmp_zcu102_defconfig => xilinx_zynqmp_zcu102_revA_defconfig} (97%) Reviewed-by: Simon Glass <sjg@chromium.org>
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index 567d10ae2e9d..20be4db81fcc 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -138,7 +138,7 @@ dtb-$(CONFIG_ARCH_ZYNQ) += zynq-zc702.dtb \ zynq-zc770-xm013.dtb dtb-$(CONFIG_ARCH_ZYNQMP) += \ zynqmp-ep108.dtb \ - zynqmp-zcu102.dtb \ + zynqmp-zcu102-revA.dtb \ zynqmp-zcu102-revB.dtb \ zynqmp-zc1751-xm015-dc1.dtb \ zynqmp-zc1751-xm016-dc2.dtb \ diff --git a/arch/arm/dts/zynqmp-zcu102.dts b/arch/arm/dts/zynqmp-zcu102-revA.dts similarity index 99% rename from arch/arm/dts/zynqmp-zcu102.dts rename to arch/arm/dts/zynqmp-zcu102-revA.dts index 0e9150e6b1cb..d8ac008f2bca 100644 --- a/arch/arm/dts/zynqmp-zcu102.dts +++ b/arch/arm/dts/zynqmp-zcu102-revA.dts @@ -16,7 +16,7 @@ / { model = "ZynqMP ZCU102 RevA"; - compatible = "xlnx,zynqmp-zcu102", "xlnx,zynqmp"; + compatible = "xlnx,zynqmp-zcu102-revA", "xlnx,zynqmp-zcu102", "xlnx,zynqmp"; aliases { ethernet0 = &gem3; diff --git a/arch/arm/dts/zynqmp-zcu102-revB.dts b/arch/arm/dts/zynqmp-zcu102-revB.dts index 765108e43789..82337332f99f 100644 --- a/arch/arm/dts/zynqmp-zcu102-revB.dts +++ b/arch/arm/dts/zynqmp-zcu102-revB.dts @@ -8,7 +8,7 @@ * SPDX-License-Identifier: GPL-2.0+ */ -#include "zynqmp-zcu102.dts" +#include "zynqmp-zcu102-revA.dts" / { model = "ZynqMP ZCU102 RevB"; diff --git a/configs/xilinx_zynqmp_zcu102_defconfig b/configs/xilinx_zynqmp_zcu102_revA_defconfig similarity index 97% rename from configs/xilinx_zynqmp_zcu102_defconfig rename to configs/xilinx_zynqmp_zcu102_revA_defconfig index 3616065afdb7..9feb2ed6dadc 100644 --- a/configs/xilinx_zynqmp_zcu102_defconfig +++ b/configs/xilinx_zynqmp_zcu102_revA_defconfig @@ -5,7 +5,7 @@ CONFIG_SYS_TEXT_BASE=0x8000000 CONFIG_SYS_MALLOC_F_LEN=0x8000 CONFIG_IDENT_STRING=" Xilinx ZynqMP ZCU102" CONFIG_ZYNQMP_USB=y -CONFIG_DEFAULT_DEVICE_TREE="zynqmp-zcu102" +CONFIG_DEFAULT_DEVICE_TREE="zynqmp-zcu102-revA" CONFIG_DEBUG_UART=y CONFIG_AHCI=y CONFIG_DISTRO_DEFAULTS=y
Not using board revision is causing confusion about which board is supported and tested. Mark dts files exactly with board revision which was tested. When new board revision arives it can be symlink if SW view is the same. Also add -revX suffix to compatible string because user space tools are parsing this string and can change behavior depends of board revision. Signed-off-by: Michal Simek <michal.simek@xilinx.com> --- arch/arm/dts/Makefile | 2 +- arch/arm/dts/{zynqmp-zcu102.dts => zynqmp-zcu102-revA.dts} | 2 +- arch/arm/dts/zynqmp-zcu102-revB.dts | 2 +- ...linx_zynqmp_zcu102_defconfig => xilinx_zynqmp_zcu102_revA_defconfig} | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) rename arch/arm/dts/{zynqmp-zcu102.dts => zynqmp-zcu102-revA.dts} (99%) rename configs/{xilinx_zynqmp_zcu102_defconfig => xilinx_zynqmp_zcu102_revA_defconfig} (97%)