From 6fcea022e221dacd4c2484928080e1e7381f3c21 Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Mon, 29 Mar 2021 08:35:05 +0200 Subject: [PATCH] arm64: zynqmp: Rename SOM to be aligned with names in DT The reason is that fdtfile variable is generated based on compatible string in DT. Signed-off-by: Michal Simek --- arch/arm/dts/Makefile | 10 +++++----- ...-kv-g-revA01-pl.dts => zynqmp-sck-kv-g-revA-pl.dts} | 0 ...mp-sck-kv-g-revA01.dts => zynqmp-sck-kv-g-revA.dts} | 0 ...mp-sck-kv-g-revB01.dts => zynqmp-sck-kv-g-revB.dts} | 0 ...vA01-u-boot.dtsi => zynqmp-sm-k26-revA-u-boot.dtsi} | 0 ...zynqmp-sm-k26-revA01.dts => zynqmp-sm-k26-revA.dts} | 0 arch/arm/dts/zynqmp-sm-k26-revB-u-boot.dtsi | 1 + ...zynqmp-sm-k26-revB01.dts => zynqmp-sm-k26-revB.dts} | 0 arch/arm/dts/zynqmp-sm-k26-revB01-u-boot.dtsi | 1 - .../psu_init_gpl.c | 0 board/xilinx/zynqmp/zynqmp-sm-k26-revB | 1 + board/xilinx/zynqmp/zynqmp-sm-k26-revB01 | 1 - configs/xilinx_zynqmp_virt_defconfig | 2 +- 13 files changed, 8 insertions(+), 8 deletions(-) rename arch/arm/dts/{zynqmp-sck-kv-g-revA01-pl.dts => zynqmp-sck-kv-g-revA-pl.dts} (100%) rename arch/arm/dts/{zynqmp-sck-kv-g-revA01.dts => zynqmp-sck-kv-g-revA.dts} (100%) rename arch/arm/dts/{zynqmp-sck-kv-g-revB01.dts => zynqmp-sck-kv-g-revB.dts} (100%) rename arch/arm/dts/{zynqmp-sm-k26-revA01-u-boot.dtsi => zynqmp-sm-k26-revA-u-boot.dtsi} (100%) rename arch/arm/dts/{zynqmp-sm-k26-revA01.dts => zynqmp-sm-k26-revA.dts} (100%) create mode 120000 arch/arm/dts/zynqmp-sm-k26-revB-u-boot.dtsi rename arch/arm/dts/{zynqmp-sm-k26-revB01.dts => zynqmp-sm-k26-revB.dts} (100%) delete mode 120000 arch/arm/dts/zynqmp-sm-k26-revB01-u-boot.dtsi rename board/xilinx/zynqmp/{zynqmp-sm-k26-revA01 => zynqmp-sm-k26-revA}/psu_init_gpl.c (100%) create mode 120000 board/xilinx/zynqmp/zynqmp-sm-k26-revB delete mode 120000 board/xilinx/zynqmp/zynqmp-sm-k26-revB01 diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index 36f1b3d3073..fa69c62e5ba 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -316,12 +316,12 @@ dtb-$(CONFIG_ARCH_ZYNQMP) += \ zynqmp-mini-qspi-x1-stacked.dtb \ zynqmp-mini-qspi-x2-single.dtb \ zynqmp-mini-qspi-x2-stacked.dtb \ - zynqmp-sm-k26-revA01.dtb \ - zynqmp-sm-k26-revB01.dtb \ + zynqmp-sm-k26-revA.dtb \ + zynqmp-sm-k26-revB.dtb \ zynqmp-sck-kv-g-dp.dtbo \ - zynqmp-sck-kv-g-revA01.dtbo \ - zynqmp-sck-kv-g-revB01.dtbo \ - zynqmp-sck-kv-g-revA01-pl.dtbo \ + zynqmp-sck-kv-g-revA.dtbo \ + zynqmp-sck-kv-g-revB.dtbo \ + zynqmp-sck-kv-g-revA-pl.dtbo \ zynqmp-topic-miamimp-xilinx-xdp-v1r1.dtb \ zynqmp-zcu100-revC.dtb \ zynqmp-zcu102-revA.dtb \ diff --git a/arch/arm/dts/zynqmp-sck-kv-g-revA01-pl.dts b/arch/arm/dts/zynqmp-sck-kv-g-revA-pl.dts similarity index 100% rename from arch/arm/dts/zynqmp-sck-kv-g-revA01-pl.dts rename to arch/arm/dts/zynqmp-sck-kv-g-revA-pl.dts diff --git a/arch/arm/dts/zynqmp-sck-kv-g-revA01.dts b/arch/arm/dts/zynqmp-sck-kv-g-revA.dts similarity index 100% rename from arch/arm/dts/zynqmp-sck-kv-g-revA01.dts rename to arch/arm/dts/zynqmp-sck-kv-g-revA.dts diff --git a/arch/arm/dts/zynqmp-sck-kv-g-revB01.dts b/arch/arm/dts/zynqmp-sck-kv-g-revB.dts similarity index 100% rename from arch/arm/dts/zynqmp-sck-kv-g-revB01.dts rename to arch/arm/dts/zynqmp-sck-kv-g-revB.dts diff --git a/arch/arm/dts/zynqmp-sm-k26-revA01-u-boot.dtsi b/arch/arm/dts/zynqmp-sm-k26-revA-u-boot.dtsi similarity index 100% rename from arch/arm/dts/zynqmp-sm-k26-revA01-u-boot.dtsi rename to arch/arm/dts/zynqmp-sm-k26-revA-u-boot.dtsi diff --git a/arch/arm/dts/zynqmp-sm-k26-revA01.dts b/arch/arm/dts/zynqmp-sm-k26-revA.dts similarity index 100% rename from arch/arm/dts/zynqmp-sm-k26-revA01.dts rename to arch/arm/dts/zynqmp-sm-k26-revA.dts diff --git a/arch/arm/dts/zynqmp-sm-k26-revB-u-boot.dtsi b/arch/arm/dts/zynqmp-sm-k26-revB-u-boot.dtsi new file mode 120000 index 00000000000..6a0fa5e5571 --- /dev/null +++ b/arch/arm/dts/zynqmp-sm-k26-revB-u-boot.dtsi @@ -0,0 +1 @@ +zynqmp-sm-k26-revA-u-boot.dtsi \ No newline at end of file diff --git a/arch/arm/dts/zynqmp-sm-k26-revB01.dts b/arch/arm/dts/zynqmp-sm-k26-revB.dts similarity index 100% rename from arch/arm/dts/zynqmp-sm-k26-revB01.dts rename to arch/arm/dts/zynqmp-sm-k26-revB.dts diff --git a/arch/arm/dts/zynqmp-sm-k26-revB01-u-boot.dtsi b/arch/arm/dts/zynqmp-sm-k26-revB01-u-boot.dtsi deleted file mode 120000 index fb783996ea4..00000000000 --- a/arch/arm/dts/zynqmp-sm-k26-revB01-u-boot.dtsi +++ /dev/null @@ -1 +0,0 @@ -zynqmp-sm-k26-revA01-u-boot.dtsi \ No newline at end of file diff --git a/board/xilinx/zynqmp/zynqmp-sm-k26-revA01/psu_init_gpl.c b/board/xilinx/zynqmp/zynqmp-sm-k26-revA/psu_init_gpl.c similarity index 100% rename from board/xilinx/zynqmp/zynqmp-sm-k26-revA01/psu_init_gpl.c rename to board/xilinx/zynqmp/zynqmp-sm-k26-revA/psu_init_gpl.c diff --git a/board/xilinx/zynqmp/zynqmp-sm-k26-revB b/board/xilinx/zynqmp/zynqmp-sm-k26-revB new file mode 120000 index 00000000000..41c70a7f16f --- /dev/null +++ b/board/xilinx/zynqmp/zynqmp-sm-k26-revB @@ -0,0 +1 @@ +zynqmp-sm-k26-revA \ No newline at end of file diff --git a/board/xilinx/zynqmp/zynqmp-sm-k26-revB01 b/board/xilinx/zynqmp/zynqmp-sm-k26-revB01 deleted file mode 120000 index 4a9f2cd0e46..00000000000 --- a/board/xilinx/zynqmp/zynqmp-sm-k26-revB01 +++ /dev/null @@ -1 +0,0 @@ -zynqmp-sm-k26-revA01 \ No newline at end of file diff --git a/configs/xilinx_zynqmp_virt_defconfig b/configs/xilinx_zynqmp_virt_defconfig index 9c3f76dd3b4..8b429f602b5 100644 --- a/configs/xilinx_zynqmp_virt_defconfig +++ b/configs/xilinx_zynqmp_virt_defconfig @@ -67,7 +67,7 @@ CONFIG_CMD_MTDPARTS_SPREAD=y CONFIG_CMD_MTDPARTS_SHOW_NET_SIZES=y CONFIG_CMD_UBI=y CONFIG_SPL_OF_CONTROL=y -CONFIG_OF_LIST="avnet-ultra96-rev1 zynqmp-a2197-revA zynqmp-e-a2197-00-revA zynqmp-g-a2197-00-revA zynqmp-m-a2197-01-revA zynqmp-m-a2197-02-revA zynqmp-m-a2197-03-revA zynqmp-p-a2197-00-revA zynqmp-zc1232-revA zynqmp-zc1254-revA zynqmp-zc1751-xm015-dc1 zynqmp-zc1751-xm016-dc2 zynqmp-zc1751-xm017-dc3 zynqmp-zc1751-xm018-dc4 zynqmp-zc1751-xm019-dc5 zynqmp-zcu100-revC zynqmp-zcu102-rev1.1 zynqmp-zcu102-rev1.0 zynqmp-zcu102-revA zynqmp-zcu102-revB zynqmp-zcu104-revA zynqmp-zcu104-revC zynqmp-zcu106-revA zynqmp-zcu111-revA zynqmp-zcu1275-revA zynqmp-zcu1275-revB zynqmp-zcu1285-revA zynqmp-zcu208-revA zynqmp-zcu216-revA zynqmp-topic-miamimp-xilinx-xdp-v1r1 zynqmp-sm-k26-revA01 zynqmp-sm-k26-revB01" +CONFIG_OF_LIST="avnet-ultra96-rev1 zynqmp-a2197-revA zynqmp-e-a2197-00-revA zynqmp-g-a2197-00-revA zynqmp-m-a2197-01-revA zynqmp-m-a2197-02-revA zynqmp-m-a2197-03-revA zynqmp-p-a2197-00-revA zynqmp-zc1232-revA zynqmp-zc1254-revA zynqmp-zc1751-xm015-dc1 zynqmp-zc1751-xm016-dc2 zynqmp-zc1751-xm017-dc3 zynqmp-zc1751-xm018-dc4 zynqmp-zc1751-xm019-dc5 zynqmp-zcu100-revC zynqmp-zcu102-rev1.1 zynqmp-zcu102-rev1.0 zynqmp-zcu102-revA zynqmp-zcu102-revB zynqmp-zcu104-revA zynqmp-zcu104-revC zynqmp-zcu106-revA zynqmp-zcu111-revA zynqmp-zcu1275-revA zynqmp-zcu1275-revB zynqmp-zcu1285-revA zynqmp-zcu208-revA zynqmp-zcu216-revA zynqmp-topic-miamimp-xilinx-xdp-v1r1 zynqmp-sm-k26-revA zynqmp-sm-k26-revB" CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names interrupt-parent interrupts iommus power-domains" CONFIG_ENV_IS_NOWHERE=y CONFIG_ENV_IS_IN_FAT=y -- 2.47.3