Skip to contentSkip to conversation

ARM: zynq: Start to use unified configurations

PATCH Superseded Michal Simek 3 participants 11 messages Feb 18, 2020 – Mar 4, 2020

Subsystems (4)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

cover ARM: zynq: Start to use unified configurations

Hi,

over the time there are a lot of zynq configurations which are almost the same. It just increasing amount of time for building/testing/maintaining that's why this patch starts to use xilinx_zynq_virt_defconfig which is all in one configurations which can be used on all zynq board.
The series contains two patches.
The first which setup device tree name for SPL FIT image selection. The second which removes all xilinx/avnet/myirtech configurations with extending defconfig and OF_LIST which ensures that u-boot.img contains DTS files for all these boards.

Thanks,
Michal

Michal Simek (2):
Makefile: Add environment variable DEVICE_TREE to header
ARM: zynq: Switch to single zynq configurations

 Makefile                               | 14 ++++-
 arch/arm/mach-zynq/spl.c               |  8 ++-
 configs/xilinx_zynq_virt_defconfig     | 19 +++++-
 configs/zynq_cc108_defconfig           | 61 ------------------
 configs/zynq_dlc20_rev1_0_defconfig    | 76 ----------------------
 configs/zynq_microzed_defconfig        | 66 -------------------
 configs/zynq_minized_defconfig         | 67 --------------------
 configs/zynq_picozed_defconfig         | 54 ----------------
 configs/zynq_z_turn_defconfig          | 67 --------------------
 configs/zynq_zc702_defconfig           | 83 ------------------------
 configs/zynq_zc706_defconfig           | 87 --------------------------
 configs/zynq_zc770_xm010_defconfig     | 61 ------------------
 configs/zynq_zc770_xm011_defconfig     | 48 --------------
 configs/zynq_zc770_xm011_x16_defconfig | 48 --------------
 configs/zynq_zc770_xm012_defconfig     | 50 ---------------
 configs/zynq_zc770_xm013_defconfig     | 53 ----------------
 configs/zynq_zed_defconfig             | 70 ---------------------
 configs/zynq_zybo_defconfig            | 69 --------------------
 configs/zynq_zybo_z7_defconfig         | 66 -------------------
 19 files changed, 37 insertions(+), 1030 deletions(-)
 delete mode 100644 configs/zynq_cc108_defconfig
 delete mode 100644 configs/zynq_dlc20_rev1_0_defconfig
 delete mode 100644 configs/zynq_microzed_defconfig
 delete mode 100644 configs/zynq_minized_defconfig
 delete mode 100644 configs/zynq_picozed_defconfig
 delete mode 100644 configs/zynq_z_turn_defconfig
 delete mode 100644 configs/zynq_zc702_defconfig
 delete mode 100644 configs/zynq_zc706_defconfig
 delete mode 100644 configs/zynq_zc770_xm010_defconfig
 delete mode 100644 configs/zynq_zc770_xm011_defconfig
 delete mode 100644 configs/zynq_zc770_xm011_x16_defconfig
 delete mode 100644 configs/zynq_zc770_xm012_defconfig
 delete mode 100644 configs/zynq_zc770_xm013_defconfig
 delete mode 100644 configs/zynq_zed_defconfig
 delete mode 100644 configs/zynq_zybo_defconfig
 delete mode 100644 configs/zynq_zybo_z7_defconfig
Signature · 1 line
2.25.0
#1 lore raw

PATCH 1/2 Makefile: Add environment variable DEVICE_TREE to header

Users have option to overwrite default device tree (CONFIG_DEFAULT_DEVICE_TREE) via environment variable DEVICE_TREE.

Feature has been added long time ago by commit 74de8c9a1672 ("dts/Makefile: Build the user specified dts") for a little bit different reason.

But this variable can be also used for different purpose like choosing proper configuration from FIT image in SPL.
And this is the functionality I would like to use on Xilinx Zynq devices that current u-boot.img can be composed in the same way based on OF_LIST and different configuration is taken based on platform specific SPL. SPL requires low level ps7_init_gpl configuration that's why different boards require different SPL with fixed board_fit_config_name_match().

---

I have done it in this way but maybe there is any smarter way how this can be done. Also macro name can change if you want.

---
 Makefile                 | 14 +++++++++++++-
 arch/arm/mach-zynq/spl.c |  8 ++++++--
 2 files changed, 19 insertions(+), 3 deletions(-)
Makefile +13 -1
index 0af89e0a7881..15f7cce445f6 100644
@@ -483,6 +483,7 @@ endif
 version_h := include/generated/version_autogenerated.h
 timestamp_h := include/generated/timestamp_autogenerated.h
 defaultenv_h := include/generated/defaultenv_autogenerated.h
+dt_h := include/generated/dt.h
 
 no-dot-config-targets := clean clobber mrproper distclean \
 			 help %docs check% coccicheck \
@@ -1768,7 +1769,7 @@ endif
 # prepare2 creates a makefile if using a separate output directory
 prepare2: prepare3 outputmakefile cfg
 
-prepare1: prepare2 $(version_h) $(timestamp_h) \
+prepare1: prepare2 $(version_h) $(timestamp_h) $(dt_h) \
                    include/config/auto.conf
 ifeq ($(wildcard $(LDSCRIPT)),)
 	@echo >&2 "  Could not find linker script."
@@ -1834,12 +1835,23 @@ define filechk_defaultenv.h
 	 xxd -i ; echo ", 0x00" ; )
 endef
 
+define filechk_dt.h
+	(if test -n "$${DEVICE_TREE}"; then \
+		echo \#define DEVICE_TREE \"$(DEVICE_TREE)\"; \
+	else \
+		echo \#define DEVICE_TREE CONFIG_DEFAULT_DEVICE_TREE; \
+	fi)
+endef
+
 $(version_h): include/config/uboot.release FORCE
 	$(call filechk,version.h)
 
 $(timestamp_h): $(srctree)/Makefile FORCE
 	$(call filechk,timestamp.h)
 
+$(dt_h): $(srctree)/Makefile FORCE
+	$(call filechk,dt.h)
+
 $(defaultenv_h): $(CONFIG_DEFAULT_ENV_FILE:"%"=%) FORCE
 	$(call filechk,defaultenv.h)
 
arch/arm/mach-zynq/spl.c +6 -2
index 96ba90fb7a76..e89e46c1038d 100644
@@ -6,6 +6,7 @@
 #include <debug_uart.h>
 #include <hang.h>
 #include <spl.h>
+#include <generated/dt.h>
 
 #include <asm/io.h>
 #include <asm/spl.h>
@@ -89,8 +90,11 @@ void spl_board_prepare_for_boot(void)
 int board_fit_config_name_match(const char *name)
 {
 	/* Just empty function now - can't decide what to choose */
-	debug("%s: %s\n", __func__, name);
+	debug("%s: Check %s, default %s\n", __func__, name, DEVICE_TREE);
 
-	return 0;
+	if (!strcmp(name, DEVICE_TREE))
+		return 0;
+
+	return -1;
 }
 #endif
Signature · 1 line
2.25.0
#2 lore raw

PATCH 1/2 Makefile: Add environment variable DEVICE_TREE to header

Quoted 15 lines · Michal Simek

Users have option to overwrite default device tree (CONFIG_DEFAULT_DEVICE_TREE) via environment variable DEVICE_TREE.

Feature has been added long time ago by commit 74de8c9a1672 ("dts/Makefile: Build the user specified dts") for a little bit different reason.

But this variable can be also used for different purpose like choosing proper configuration from FIT image in SPL.
And this is the functionality I would like to use on Xilinx Zynq devices that current u-boot.img can be composed in the same way based on OF_LIST and different configuration is taken based on platform specific SPL. SPL requires low level ps7_init_gpl configuration that's why different boards require different SPL with fixed board_fit_config_name_match().

Quoted 1 line
Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200224/066e11d0/attachment.sig>
#3 lore raw

PATCH 1/2 Makefile: Add environment variable DEVICE_TREE to header

In reply to Michal Simek

Hi Michal,

Quoted 16 lines · Michal Simek

Users have option to overwrite default device tree (CONFIG_DEFAULT_DEVICE_TREE) via environment variable DEVICE_TREE.

Feature has been added long time ago by commit 74de8c9a1672 ("dts/Makefile: Build the user specified dts") for a little bit different reason.

But this variable can be also used for different purpose like choosing proper configuration from FIT image in SPL.
And this is the functionality I would like to use on Xilinx Zynq devices that current u-boot.img can be composed in the same way based on OF_LIST and different configuration is taken based on platform specific SPL. SPL requires low level ps7_init_gpl configuration that's why different boards require different SPL with fixed board_fit_config_name_match().

Quoted 5 lines

---

I have done it in this way but maybe there is any smarter way how this can be done. Also macro name can change if you want.

Can you please add a bit of documentation to doc/README.fdt-control ?

Quoted 27 lines
---
 Makefile                 | 14 +++++++++++++-
 arch/arm/mach-zynq/spl.c |  8 ++++++--
 2 files changed, 19 insertions(+), 3 deletions(-)
Makefile +2 -1
index 0af89e0a7881..15f7cce445f6 100644
@@ -483,6 +483,7 @@ endif
 version_h := include/generated/version_autogenerated.h
 timestamp_h := include/generated/timestamp_autogenerated.h
 defaultenv_h := include/generated/defaultenv_autogenerated.h
+dt_h := include/generated/dt.h
 
 no-dot-config-targets := clean clobber mrproper distclean \
                         help %docs check% coccicheck \
@@ -1768,7 +1769,7 @@ endif
 # prepare2 creates a makefile if using a separate output directory
 prepare2: prepare3 outputmakefile cfg
 
-prepare1: prepare2 $(version_h) $(timestamp_h) \
+prepare1: prepare2 $(version_h) $(timestamp_h) $(dt_h) \
                    include/config/auto.conf
 ifeq ($(wildcard $(LDSCRIPT)),)
        @echo >&2 "  Could not find linker script."

Makefile define filechk_defaultenv.h · line 1839

Quoted 5 lines
Makefile +2 -0
@@ -1834,12 +1835,23 @@ define filechk_defaultenv.h
         xxd -i ; echo ", 0x00" ; )
 endef
 
+define filechk_dt.h
+       (if test -n "$${DEVICE_TREE}"; then \

I think this can be:

ifneq($(DEVICE_TREE),)

Quoted 45 lines
Makefile +9 -0
+               echo \#define DEVICE_TREE \"$(DEVICE_TREE)\"; \
+       else \
+               echo \#define DEVICE_TREE CONFIG_DEFAULT_DEVICE_TREE; \
+       fi)
+endef
+
 $(version_h): include/config/uboot.release FORCE
        $(call filechk,version.h)
 
 $(timestamp_h): $(srctree)/Makefile FORCE
        $(call filechk,timestamp.h)
 
+$(dt_h): $(srctree)/Makefile FORCE
+       $(call filechk,dt.h)
+
 $(defaultenv_h): $(CONFIG_DEFAULT_ENV_FILE:"%"=%) FORCE
        $(call filechk,defaultenv.h)
 
arch/arm/mach-zynq/spl.c +6 -3
index 96ba90fb7a76..e89e46c1038d 100644
@@ -6,6 +6,7 @@
 #include <debug_uart.h>
 #include <hang.h>
 #include <spl.h>
+#include <generated/dt.h>
 
 #include <asm/io.h>
 #include <asm/spl.h>
@@ -89,8 +90,11 @@ void spl_board_prepare_for_boot(void)
 int board_fit_config_name_match(const char *name)
 {
        /* Just empty function now - can't decide what to choose */
-       debug("%s: %s\n", __func__, name);
+       debug("%s: Check %s, default %s\n", __func__, name, DEVICE_TREE);
 
-       return 0;
+       if (!strcmp(name, DEVICE_TREE))
+               return 0;
+
+       return -1;
 }
 #endif
--
Quoted 2 lines

2.25.0

Regards,
Simon

#4 lore raw

PATCH 1/2 Makefile: Add environment variable DEVICE_TREE to header

Quoted 19 lines · Simon Glass

Hi Michal,

Quoted 16 lines · Michal Simek

Users have option to overwrite default device tree (CONFIG_DEFAULT_DEVICE_TREE) via environment variable DEVICE_TREE.

Feature has been added long time ago by commit 74de8c9a1672 ("dts/Makefile: Build the user specified dts") for a little bit different reason.

But this variable can be also used for different purpose like choosing proper configuration from FIT image in SPL.
And this is the functionality I would like to use on Xilinx Zynq devices that current u-boot.img can be composed in the same way based on OF_LIST and different configuration is taken based on platform specific SPL. SPL requires low level ps7_init_gpl configuration that's why different boards require different SPL with fixed board_fit_config_name_match().

Quoted 7 lines
Quoted 5 lines

---

I have done it in this way but maybe there is any smarter way how this can be done. Also macro name can change if you want.

Can you please add a bit of documentation to doc/README.fdt-control ?

This feature is cover by documentation in this file already. What exactly do you think that should be added?

Thanks,
Michal

169 Build:
170
171 After board configuration is done, fdt supported u-boot can be build in two ways:
172 1) build the default dts which is defined from CONFIG_DEFAULT_DEVICE_TREE

173     $ make
174 2)  build the user specified dts file
175     $ make DEVICE_TREE=<dts-file-name>

176
177

#5 lore raw

PATCH 1/2 Makefile: Add environment variable DEVICE_TREE to header

Hi Michal,

Quoted 24 lines · Michal Simek
Quoted 22 lines · Simon Glass

Hi Michal,

Quoted 19 lines · Michal Simek

Users have option to overwrite default device tree (CONFIG_DEFAULT_DEVICE_TREE) via environment variable DEVICE_TREE.

Feature has been added long time ago by commit 74de8c9a1672 ("dts/Makefile: Build the user specified dts") for a little bit different reason.

But this variable can be also used for different purpose like choosing proper configuration from FIT image in SPL.
And this is the functionality I would like to use on Xilinx Zynq devices that current u-boot.img can be composed in the same way based on OF_LIST and different configuration is taken based on platform specific SPL. SPL requires low level ps7_init_gpl configuration that's why different boards require different SPL with fixed board_fit_config_name_match().

---

Quoted 8 lines
Quoted 4 lines
Quoted 2 lines

I have done it in this way but maybe there is any smarter way how this can be done. Also macro name can change if you want.

Can you please add a bit of documentation to doc/README.fdt-control ?

This feature is cover by documentation in this file already. What exactly do you think that should be added?

Then I suppose I am confused as to what this patch does. I thought it was allowing U-Boot to pass the DT to Linux, which wasn't previously supported?

Regards,
Simon

Quoted 15 lines

Thanks,
Michal

169 Build:
170
171 After board configuration is done, fdt supported u-boot can be build in two ways:
172 1) build the default dts which is defined from CONFIG_DEFAULT_DEVICE_TREE

173     $ make
174 2)  build the user specified dts file
175     $ make DEVICE_TREE=<dts-file-name>

176
177

#6 lore raw

PATCH 1/2 Makefile: Add environment variable DEVICE_TREE to header

Quoted 32 lines · Simon Glass

Hi Michal,

Quoted 29 lines · Michal Simek
Quoted 26 lines · Simon Glass

Hi Michal,

Quoted 16 lines · Michal Simek

Users have option to overwrite default device tree (CONFIG_DEFAULT_DEVICE_TREE) via environment variable DEVICE_TREE.

Feature has been added long time ago by commit 74de8c9a1672 ("dts/Makefile: Build the user specified dts") for a little bit different reason.

But this variable can be also used for different purpose like choosing proper configuration from FIT image in SPL.
And this is the functionality I would like to use on Xilinx Zynq devices that current u-boot.img can be composed in the same way based on OF_LIST and different configuration is taken based on platform specific SPL. SPL requires low level ps7_init_gpl configuration that's why different boards require different SPL with fixed board_fit_config_name_match().

Quoted 5 lines

---

I have done it in this way but maybe there is any smarter way how this can be done. Also macro name can change if you want.

Can you please add a bit of documentation to doc/README.fdt-control ?

Quoted 7 lines
Quoted 3 lines

This feature is cover by documentation in this file already. What exactly do you think that should be added?

Then I suppose I am confused as to what this patch does. I thought it was allowing U-Boot to pass the DT to Linux, which wasn't previously supported?

Just a note this is also not supported and would be good to have support for it.

The patch is putting device tree name as macro to header and I am using this value just in zynq SPL to choose proper dtb file from u-boot.img.

On ZynqMP generic platform I am using mkimage_fit_atf.sh script to automatically fill default configuration.
https://gitlab.denx.de/u-boot/u-boot/blob/master/arch/arm/mach-zynqmp/mkimage_fit_atf.sh#L94
And I didn't want to create different u-boot.img/itb for Zynq that's why SPL has device tree built it directly in SPL.

As I said maybe there is smarter way how to do it but this was the one I used.
In our case SPL another way could be to put filename from ps7_init_* files and save it as variable and use it.

Thanks,
Michal

#7 lore raw

PATCH 1/2 Makefile: Add environment variable DEVICE_TREE to header

Hi Michal,

Quoted 54 lines · Michal Simek
Quoted 32 lines · Simon Glass

Hi Michal,

Quoted 29 lines · Michal Simek
Quoted 26 lines · Simon Glass

Hi Michal,

Quoted 16 lines · Michal Simek

Users have option to overwrite default device tree (CONFIG_DEFAULT_DEVICE_TREE) via environment variable DEVICE_TREE.

Feature has been added long time ago by commit 74de8c9a1672 ("dts/Makefile: Build the user specified dts") for a little bit different reason.

But this variable can be also used for different purpose like choosing proper configuration from FIT image in SPL.
And this is the functionality I would like to use on Xilinx Zynq devices that current u-boot.img can be composed in the same way based on OF_LIST and different configuration is taken based on platform specific SPL. SPL requires low level ps7_init_gpl configuration that's why different boards require different SPL with fixed board_fit_config_name_match().

Quoted 5 lines

---

I have done it in this way but maybe there is any smarter way how this can be done. Also macro name can change if you want.

Can you please add a bit of documentation to doc/README.fdt-control ?

Quoted 7 lines
Quoted 3 lines

This feature is cover by documentation in this file already. What exactly do you think that should be added?

Then I suppose I am confused as to what this patch does. I thought it was allowing U-Boot to pass the DT to Linux, which wasn't previously supported?

Just a note this is also not supported and would be good to have support for it.

The patch is putting device tree name as macro to header and I am using this value just in zynq SPL to choose proper dtb file from u-boot.img.

On ZynqMP generic platform I am using mkimage_fit_atf.sh script to automatically fill default configuration.
https://gitlab.denx.de/u-boot/u-boot/blob/master/arch/arm/mach-zynqmp/mkimage_fit_atf.sh#L94
And I didn't want to create different u-boot.img/itb for Zynq that's why SPL has device tree built it directly in SPL.

Quoted 4 lines

As I said maybe there is smarter way how to do it but this was the one I used.
In our case SPL another way could be to put filename from ps7_init_* files and save it as variable and use it.

OK I see. So are you using OF_CONTROL for SPL?

Regards,
Simon

#8 lore raw

PATCH 1/2 Makefile: Add environment variable DEVICE_TREE to header

Quoted 57 lines · Simon Glass

Hi Michal,

Quoted 54 lines · Michal Simek
Quoted 32 lines · Simon Glass

Hi Michal,

Quoted 29 lines · Michal Simek
Quoted 26 lines · Simon Glass

Hi Michal,

Quoted 16 lines · Michal Simek

Users have option to overwrite default device tree (CONFIG_DEFAULT_DEVICE_TREE) via environment variable DEVICE_TREE.

Feature has been added long time ago by commit 74de8c9a1672 ("dts/Makefile: Build the user specified dts") for a little bit different reason.

But this variable can be also used for different purpose like choosing proper configuration from FIT image in SPL.
And this is the functionality I would like to use on Xilinx Zynq devices that current u-boot.img can be composed in the same way based on OF_LIST and different configuration is taken based on platform specific SPL. SPL requires low level ps7_init_gpl configuration that's why different boards require different SPL with fixed board_fit_config_name_match().

Quoted 5 lines

---

I have done it in this way but maybe there is any smarter way how this can be done. Also macro name can change if you want.

Can you please add a bit of documentation to doc/README.fdt-control ?

Quoted 7 lines
Quoted 3 lines

This feature is cover by documentation in this file already. What exactly do you think that should be added?

Then I suppose I am confused as to what this patch does. I thought it was allowing U-Boot to pass the DT to Linux, which wasn't previously supported?

Just a note this is also not supported and would be good to have support for it.

The patch is putting device tree name as macro to header and I am using this value just in zynq SPL to choose proper dtb file from u-boot.img.

On ZynqMP generic platform I am using mkimage_fit_atf.sh script to automatically fill default configuration.
https://gitlab.denx.de/u-boot/u-boot/blob/master/arch/arm/mach-zynqmp/mkimage_fit_atf.sh#L94
And I didn't want to create different u-boot.img/itb for Zynq that's why SPL has device tree built it directly in SPL.

Quoted 6 lines
Quoted 4 lines

As I said maybe there is smarter way how to do it but this was the one I used.
In our case SPL another way could be to put filename from ps7_init_* files and save it as variable and use it.

OK I see. So are you using OF_CONTROL for SPL?

Yes.

M

#9 lore raw

PATCH 1/2 Makefile: Add environment variable DEVICE_TREE to header

Hi Michal,

Quoted 59 lines · Michal Simek
Quoted 57 lines · Simon Glass

Hi Michal,

Quoted 54 lines · Michal Simek
Quoted 32 lines · Simon Glass

Hi Michal,

Quoted 29 lines · Michal Simek
Quoted 26 lines · Simon Glass

Hi Michal,

Quoted 16 lines · Michal Simek

Users have option to overwrite default device tree (CONFIG_DEFAULT_DEVICE_TREE) via environment variable DEVICE_TREE.

Feature has been added long time ago by commit 74de8c9a1672 ("dts/Makefile: Build the user specified dts") for a little bit different reason.

But this variable can be also used for different purpose like choosing proper configuration from FIT image in SPL.
And this is the functionality I would like to use on Xilinx Zynq devices that current u-boot.img can be composed in the same way based on OF_LIST and different configuration is taken based on platform specific SPL. SPL requires low level ps7_init_gpl configuration that's why different boards require different SPL with fixed board_fit_config_name_match().

Quoted 5 lines

---

I have done it in this way but maybe there is any smarter way how this can be done. Also macro name can change if you want.

Can you please add a bit of documentation to doc/README.fdt-control ?

Quoted 7 lines
Quoted 3 lines

This feature is cover by documentation in this file already. What exactly do you think that should be added?

Then I suppose I am confused as to what this patch does. I thought it was allowing U-Boot to pass the DT to Linux, which wasn't previously supported?

Just a note this is also not supported and would be good to have support for it.

The patch is putting device tree name as macro to header and I am using this value just in zynq SPL to choose proper dtb file from u-boot.img.

On ZynqMP generic platform I am using mkimage_fit_atf.sh script to automatically fill default configuration.
https://gitlab.denx.de/u-boot/u-boot/blob/master/arch/arm/mach-zynqmp/mkimage_fit_atf.sh#L94
And I didn't want to create different u-boot.img/itb for Zynq that's why SPL has device tree built it directly in SPL.

Quoted 8 lines
Quoted 6 lines
Quoted 4 lines

As I said maybe there is smarter way how to do it but this was the one I used.
In our case SPL another way could be to put filename from ps7_init_* files and save it as variable and use it.

OK I see. So are you using OF_CONTROL for SPL?

Yes.

OK ta.

Regards,
Simon

#10 lore raw

PATCH 2/2 ARM: zynq: Switch to single zynq configurations

In reply to Michal Simek

There are a lot of zynq configurations which can be merged together and use only one for all. The similar change has been done for ZynqMP by commit be1b6c32d940 ("arm64: zynqmp: Use zynqmp_virt platform")

Build SPL with u-boot.img for zc706 like this.
export DEVICE_TREE=zynq-zc706 && make xilinx_zynq_virt_defconfig && make -j8 u-boot.img is generic for all boards.

Tested on Zybo, zc702, zc706, zc770-xm011-x16, cc108 and microzed.

---

 configs/xilinx_zynq_virt_defconfig     | 19 +++++-
 configs/zynq_cc108_defconfig           | 61 ------------------
 configs/zynq_dlc20_rev1_0_defconfig    | 76 ----------------------
 configs/zynq_microzed_defconfig        | 66 -------------------
 configs/zynq_minized_defconfig         | 67 --------------------
 configs/zynq_picozed_defconfig         | 54 ----------------
 configs/zynq_z_turn_defconfig          | 67 --------------------
 configs/zynq_zc702_defconfig           | 83 ------------------------
 configs/zynq_zc706_defconfig           | 87 --------------------------
 configs/zynq_zc770_xm010_defconfig     | 61 ------------------
 configs/zynq_zc770_xm011_defconfig     | 48 --------------
 configs/zynq_zc770_xm011_x16_defconfig | 48 --------------
 configs/zynq_zc770_xm012_defconfig     | 50 ---------------
 configs/zynq_zc770_xm013_defconfig     | 53 ----------------
 configs/zynq_zed_defconfig             | 70 ---------------------
 configs/zynq_zybo_defconfig            | 69 --------------------
 configs/zynq_zybo_z7_defconfig         | 66 -------------------
 17 files changed, 18 insertions(+), 1027 deletions(-)
 delete mode 100644 configs/zynq_cc108_defconfig
 delete mode 100644 configs/zynq_dlc20_rev1_0_defconfig
 delete mode 100644 configs/zynq_microzed_defconfig
 delete mode 100644 configs/zynq_minized_defconfig
 delete mode 100644 configs/zynq_picozed_defconfig
 delete mode 100644 configs/zynq_z_turn_defconfig
 delete mode 100644 configs/zynq_zc702_defconfig
 delete mode 100644 configs/zynq_zc706_defconfig
 delete mode 100644 configs/zynq_zc770_xm010_defconfig
 delete mode 100644 configs/zynq_zc770_xm011_defconfig
 delete mode 100644 configs/zynq_zc770_xm011_x16_defconfig
 delete mode 100644 configs/zynq_zc770_xm012_defconfig
 delete mode 100644 configs/zynq_zc770_xm013_defconfig
 delete mode 100644 configs/zynq_zed_defconfig
 delete mode 100644 configs/zynq_zybo_defconfig
 delete mode 100644 configs/zynq_zybo_z7_defconfig
configs/xilinx_zynq_virt_defconfig +18 -1
index ece619f239b2..2e9f3a0f7508 100644
@@ -11,13 +11,17 @@ CONFIG_SYS_LDSCRIPT="arch/arm/mach-zynq/u-boot.lds"
 CONFIG_FIT=y
 CONFIG_FIT_SIGNATURE=y
 CONFIG_FIT_VERBOSE=y
+CONFIG_SPL_FIT_PRINT=y
+CONFIG_SPL_LOAD_FIT=y
 CONFIG_LEGACY_IMAGE_FORMAT=y
 CONFIG_USE_PREBOOT=y
 CONFIG_SPL_STACK_R=y
+CONFIG_SPL_FPGA_SUPPORT=y
 CONFIG_SPL_OS_BOOT=y
 CONFIG_SPL_SPI_LOAD=y
 CONFIG_SYS_SPI_U_BOOT_OFFS=0x100000
 # CONFIG_BOOTM_NETBSD is not set
+CONFIG_CMD_IMLS=y
 CONFIG_CMD_THOR_DOWNLOAD=y
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_DFU=y
@@ -28,12 +32,14 @@ CONFIG_CMD_FPGA_LOADP=y
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_MMC=y
+CONFIG_CMD_NAND_LOCK_UNLOCK=y
 CONFIG_CMD_USB=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_TFTPPUT=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_EXT4_WRITE=y
-CONFIG_OF_BOARD=y
+CONFIG_DEFAULT_DEVICE_TREE="zynq-zc706"
+CONFIG_OF_LIST="zynq-zc702 zynq-zc706 zynq-zc770-xm010 zynq-zc770-xm011 zynq-zc770-xm011-x16 zynq-zc770-xm012 zynq-zc770-xm013 zynq-cc108 zynq-microzed zynq-minized zynq-picozed zynq-zed zynq-zturn zynq-zybo zynq-zybo-z7 zynq-dlc20-rev1.0"
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_NET_RANDOM_ETHADDR=y
@@ -52,11 +58,19 @@ CONFIG_SYS_I2C_EEPROM_ADDR=0x0
 CONFIG_SYS_I2C_EEPROM_ADDR_OVERFLOW=0x0
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_ZYNQ=y
+CONFIG_MTD=y
+CONFIG_MTD_NOR_FLASH=y
+CONFIG_FLASH_CFI_DRIVER=y
+CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
+CONFIG_SYS_FLASH_CFI=y
+CONFIG_MTD_RAW_NAND=y
+CONFIG_NAND_ZYNQ=y
 CONFIG_SF_DEFAULT_SPEED=30000000
 CONFIG_SPI_FLASH_ISSI=y
 CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_FLASH_SST=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_PHY_MARVELL=y
 CONFIG_PHY_REALTEK=y
@@ -64,6 +78,7 @@ CONFIG_PHY_XILINX=y
 CONFIG_MII=y
 CONFIG_ZYNQ_GEM=y
 CONFIG_ZYNQ_SERIAL=y
+CONFIG_ZYNQ_SPI=y
 CONFIG_ZYNQ_QSPI=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
@@ -76,3 +91,5 @@ CONFIG_USB_GADGET_PRODUCT_NUM=0x0300
 CONFIG_CI_UDC=y
 CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_USB_FUNCTION_THOR=y
+CONFIG_DISPLAY=y
+CONFIG_SPL_GZIP=y
configs/zynq_cc108_defconfig deleted +0 -61

61 lines not on this page · raw message

configs/zynq_dlc20_rev1_0_defconfig deleted +0 -76

76 lines not on this page · raw message

configs/zynq_microzed_defconfig deleted +0 -66

66 lines not on this page · raw message

configs/zynq_minized_defconfig deleted +0 -67

67 lines not on this page · raw message

configs/zynq_picozed_defconfig deleted +0 -54

54 lines not on this page · raw message

configs/zynq_z_turn_defconfig deleted +0 -67

67 lines not on this page · raw message

configs/zynq_zc702_defconfig deleted +0 -83

83 lines not on this page · raw message

configs/zynq_zc706_defconfig deleted +0 -87

87 lines not on this page · raw message

configs/zynq_zc770_xm010_defconfig deleted +0 -61

61 lines not on this page · raw message

configs/zynq_zc770_xm011_defconfig deleted +0 -48

48 lines not on this page · raw message

configs/zynq_zc770_xm011_x16_defconfig deleted +0 -48

48 lines not on this page · raw message

configs/zynq_zc770_xm012_defconfig deleted +0 -50

50 lines not on this page · raw message

configs/zynq_zc770_xm013_defconfig deleted +0 -53

53 lines not on this page · raw message

configs/zynq_zed_defconfig deleted +0 -70

70 lines not on this page · raw message

configs/zynq_zybo_defconfig deleted +0 -69

69 lines not on this page · raw message

configs/zynq_zybo_z7_defconfig deleted +0 -66

66 lines not on this page · raw message

Signature · 1 line
2.25.0