Message ID | 20211207001209.3467163-12-sjg@chromium.org |
---|---|
State | Changes Requested |
Delegated to: | Tom Rini |
Headers | show |
Series | fdt: Make OF_BOARD a boolean option | expand |
On 12/7/21 01:11, Simon Glass wrote: > Add an empty file to prevent build errors when building with > CONFIG_OF_SEPARATE enabled. > > Signed-off-by: Simon Glass <sjg@chromium.org> > --- > > (no changes since v1) a little bit weird. > > arch/arm/dts/Makefile | 3 ++- > arch/arm/dts/xilinx-versal-virt.dts | 11 +++++++++++ > configs/xilinx_versal_virt_defconfig | 1 + > 3 files changed, 14 insertions(+), 1 deletion(-) > create mode 100644 arch/arm/dts/xilinx-versal-virt.dts > > diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile > index 91302118598..b07a1b3378e 100644 > --- a/arch/arm/dts/Makefile > +++ b/arch/arm/dts/Makefile > @@ -360,7 +360,8 @@ dtb-$(CONFIG_ARCH_ZYNQMP) += \ > dtb-$(CONFIG_ARCH_VERSAL) += \ > versal-mini.dtb \ > versal-mini-emmc0.dtb \ > - versal-mini-emmc1.dtb > + versal-mini-emmc1.dtb \ > + xilinx-versal-virt.dtb > dtb-$(CONFIG_ARCH_ZYNQMP_R5) += \ > zynqmp-r5.dtb > dtb-$(CONFIG_AM33XX) += \ > diff --git a/arch/arm/dts/xilinx-versal-virt.dts b/arch/arm/dts/xilinx-versal-virt.dts > new file mode 100644 > index 00000000000..733e532f987 > --- /dev/null > +++ b/arch/arm/dts/xilinx-versal-virt.dts > @@ -0,0 +1,11 @@ > +// SPDX-License-Identifier: GPL-2.0+ OR MIT > +/* > + * Empty device tree for versal-virt board > + * > + * Copyright 2021 Google LLC > + */ > + > +/dts-v1/; > + > +/ { > +}; > diff --git a/configs/xilinx_versal_virt_defconfig b/configs/xilinx_versal_virt_defconfig > index 11598623954..f0ec2639a38 100644 > --- a/configs/xilinx_versal_virt_defconfig > +++ b/configs/xilinx_versal_virt_defconfig > @@ -7,6 +7,7 @@ CONFIG_SYS_MALLOC_F_LEN=0x100000 > CONFIG_SYS_MEMTEST_START=0x00000000 > CONFIG_SYS_MEMTEST_END=0x00001000 > CONFIG_DM_GPIO=y > +CONFIG_DEFAULT_DEVICE_TREE="xilinx-versal-virt" > CONFIG_CMD_FRU=y > CONFIG_DEFINE_TCM_OCM_MMAP=y > CONFIG_COUNTER_FREQUENCY=100000000 That's fine for me. I will add regular DTS at some point in future. Thanks, Michal
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index 91302118598..b07a1b3378e 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -360,7 +360,8 @@ dtb-$(CONFIG_ARCH_ZYNQMP) += \ dtb-$(CONFIG_ARCH_VERSAL) += \ versal-mini.dtb \ versal-mini-emmc0.dtb \ - versal-mini-emmc1.dtb + versal-mini-emmc1.dtb \ + xilinx-versal-virt.dtb dtb-$(CONFIG_ARCH_ZYNQMP_R5) += \ zynqmp-r5.dtb dtb-$(CONFIG_AM33XX) += \ diff --git a/arch/arm/dts/xilinx-versal-virt.dts b/arch/arm/dts/xilinx-versal-virt.dts new file mode 100644 index 00000000000..733e532f987 --- /dev/null +++ b/arch/arm/dts/xilinx-versal-virt.dts @@ -0,0 +1,11 @@ +// SPDX-License-Identifier: GPL-2.0+ OR MIT +/* + * Empty device tree for versal-virt board + * + * Copyright 2021 Google LLC + */ + +/dts-v1/; + +/ { +}; diff --git a/configs/xilinx_versal_virt_defconfig b/configs/xilinx_versal_virt_defconfig index 11598623954..f0ec2639a38 100644 --- a/configs/xilinx_versal_virt_defconfig +++ b/configs/xilinx_versal_virt_defconfig @@ -7,6 +7,7 @@ CONFIG_SYS_MALLOC_F_LEN=0x100000 CONFIG_SYS_MEMTEST_START=0x00000000 CONFIG_SYS_MEMTEST_END=0x00001000 CONFIG_DM_GPIO=y +CONFIG_DEFAULT_DEVICE_TREE="xilinx-versal-virt" CONFIG_CMD_FRU=y CONFIG_DEFINE_TCM_OCM_MMAP=y CONFIG_COUNTER_FREQUENCY=100000000
Add an empty file to prevent build errors when building with CONFIG_OF_SEPARATE enabled. Signed-off-by: Simon Glass <sjg@chromium.org> --- (no changes since v1) arch/arm/dts/Makefile | 3 ++- arch/arm/dts/xilinx-versal-virt.dts | 11 +++++++++++ configs/xilinx_versal_virt_defconfig | 1 + 3 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 arch/arm/dts/xilinx-versal-virt.dts