Collect patches for v0.37

azolotko · Jan 4, 2024 · 0f1d316 · 0f1d316
1 parent 875f62a
commit 0f1d316
Show file tree

Hide file tree

Showing 5 changed files with 181 additions and 39 deletions.
diff --git a/patches/buildroot.diff b/patches/buildroot.diff
@@ -39,18 +39,18 @@ index a3b3f6f664..55601033c6 100644
 -https://wiki.analog.com/university/tools/pluto
 +https://github.com/plutoplus/plutoplus
 diff --git a/configs/zynq_pluto_defconfig b/configs/zynq_pluto_defconfig
-index 7375c29a74..ff057b2955 100644
+index c02547e256..0bbce02ee7 100644
 --- a/configs/zynq_pluto_defconfig
 +++ b/configs/zynq_pluto_defconfig
-@@ -32,6 +32,7 @@ BR2_PACKAGE_MTD=y
+@@ -29,6 +29,7 @@ BR2_PACKAGE_MTD=y
  # BR2_PACKAGE_MTD_UBIRSVOL is not set
  # BR2_PACKAGE_MTD_UBIUPDATEVOL is not set
  # BR2_PACKAGE_MTD_UBIBLOCK is not set
 +BR2_PACKAGE_NFS_UTILS=y
  BR2_PACKAGE_LINUX_FIRMWARE=y
  BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT61=y
  BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT73=y
-@@ -39,22 +40,37 @@ BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT2XX=y
+@@ -36,22 +37,37 @@ BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT2XX=y
  BR2_PACKAGE_LINUX_FIRMWARE_RTL_81XX=y
  BR2_PACKAGE_LINUX_FIRMWARE_RTL_87XX=y
  BR2_PACKAGE_LINUX_FIRMWARE_RTL_88XX=y
@@ -90,7 +90,7 @@ index 7375c29a74..ff057b2955 100644
  BR2_PACKAGE_POLL_SYSFS=y
  BR2_PACKAGE_AD936X_REF_CAL=y
  BR2_TARGET_ROOTFS_CPIO=y
-@@ -63,3 +79,15 @@ BR2_TARGET_ROOTFS_CPIO_UIMAGE=y
+@@ -60,3 +76,15 @@ BR2_TARGET_ROOTFS_CPIO_UIMAGE=y
  BR2_PACKAGE_HOST_DOSFSTOOLS=y
  BR2_PACKAGE_HOST_GENIMAGE=y
  BR2_PACKAGE_HOST_MTOOLS=y

diff --git a/patches/hdl.diff b/patches/hdl.diff
@@ -1,5 +1,5 @@
 diff --git a/projects/pluto/system_bd.tcl b/projects/pluto/system_bd.tcl
-index 8a9634b9..85c1bc28 100644
+index fa47a8406..778adaf60 100644
 --- a/projects/pluto/system_bd.tcl
 +++ b/projects/pluto/system_bd.tcl
 @@ -47,6 +47,12 @@ ad_ip_parameter sys_ps7 CONFIG.PCW_FPGA0_PERIPHERAL_FREQMHZ 100.0
@@ -47,7 +47,7 @@ index 8a9634b9..85c1bc28 100644
  ad_ip_parameter sys_ps7 CONFIG.PCW_IRQ_F2P_MODE REVERSE
  ad_ip_parameter sys_ps7 CONFIG.PCW_MIO_0_PULLUP {enabled}
 diff --git a/projects/pluto/system_constr.xdc b/projects/pluto/system_constr.xdc
-index 67a9558c..9bf4e924 100644
+index 67a9558cf..9bf4e924f 100644
 --- a/projects/pluto/system_constr.xdc
 +++ b/projects/pluto/system_constr.xdc
 @@ -1,69 +1,69 @@
@@ -386,15 +386,20 @@ index 67a9558c..9bf4e924 100644
  set_property SLEW FAST [get_ports *ddr_dqs*]
  set_property PACKAGE_PIN C2 [get_ports ddr_dqs_p[0]]
 diff --git a/projects/pluto/system_project.tcl b/projects/pluto/system_project.tcl
-index 89d81a44..fec220a1 100644
+index cdd0c17fc..61e975207 100644
 --- a/projects/pluto/system_project.tcl
 +++ b/projects/pluto/system_project.tcl
-@@ -3,7 +3,7 @@ source ../scripts/adi_env.tcl
+@@ -3,7 +3,7 @@ source ../../scripts/adi_env.tcl
  source $ad_hdl_dir/projects/scripts/adi_project_xilinx.tcl
  source $ad_hdl_dir/projects/scripts/adi_board.tcl
 
--set p_device "xc7z010clg225-1"
-+set p_device "xc7z010clg400-1"
- adi_project pluto
+-adi_project_create pluto 0 {} "xc7z010clg225-1"
++adi_project_create pluto 0 {} "xc7z010clg400-1"
 
  adi_project_files pluto [list \
+   "system_top.v" \
+@@ -13,4 +13,3 @@ adi_project_files pluto [list \
+ set_property is_enabled false [get_files  *system_sys_ps7_0.xdc]
+ adi_project_run pluto
+ source $ad_hdl_dir/library/axi_ad9361/axi_ad9361_delay.tcl
+-
diff --git a/patches/linux.diff b/patches/linux.diff
@@ -1,5 +1,59 @@
+diff --git a/arch/arm/boot/dts/zynq-coraz7s.dtsi b/arch/arm/boot/dts/zynq-coraz7s.dtsi
+index b079648d2b07..7257bf30bfee 100644
+--- a/arch/arm/boot/dts/zynq-coraz7s.dtsi
++++ b/arch/arm/boot/dts/zynq-coraz7s.dtsi
+@@ -28,6 +28,14 @@ chosen {
+ 		stdout-path = "serial0:115200n8";
+ 	};
+
++	usb_phy0: phy0@e0002000 {
++		compatible = "ulpi-phy";
++		#phy-cells = <0>;
++		reg = <0xe0002000 0x1000>;
++		view-port = <0x0170>;
++		drv-vbus;
++	};
++
+ 	fpga_axi: fpga-axi@0 {
+ 		compatible = "simple-bus";
+ 		#address-cells = <0x1>;
+@@ -73,5 +81,6 @@ &uart0 {
+ &usb0 {
+ 	status = "okay";
+ 	dr_mode = "host";
++	usb-phy = <&usb_phy0>;
+ };
+
+diff --git a/arch/arm/boot/dts/zynq-m2k.dtsi b/arch/arm/boot/dts/zynq-m2k.dtsi
+index b82bf5a25641..e92c093501b9 100644
+--- a/arch/arm/boot/dts/zynq-m2k.dtsi
++++ b/arch/arm/boot/dts/zynq-m2k.dtsi
+@@ -19,6 +19,15 @@ memory {
+ 	chosen {
+ 		stdout-path = "/amba@0/uart@E0001000";
+ 	};
++
++	usb_phy0: phy0 {
++		compatible = "ulpi-phy";
++		#phy-cells = <0>;
++		reg = <0xe0002000 0x1000>;
++		view-port = <0x0170>;
++		drv-vbus;
++	};
++
+ };
+
+ &cpu0 {
+@@ -46,6 +55,7 @@ &usb0 {
+ 	xlnx,phy-reset-gpio = <&gpio0 52 0>;
+ 	dr_mode = "otg";
+ 	status = "okay";
++	usb-phy = <&usb_phy0>;
+ };
+
+ &clkc {
 diff --git a/arch/arm/boot/dts/zynq-pluto-sdr-revc.dts b/arch/arm/boot/dts/zynq-pluto-sdr-revc.dts
-index 7aff4e197d0f..5313336a30a4 100644
+index 9c9a0c9dbf9c..6971e9b645e5 100644
 --- a/arch/arm/boot/dts/zynq-pluto-sdr-revc.dts
 +++ b/arch/arm/boot/dts/zynq-pluto-sdr-revc.dts
 @@ -17,46 +17,6 @@
@@ -22,7 +76,7 @@ index 7aff4e197d0f..5313336a30a4 100644
 -};
 -
 -&amba {
--	axi_spi: axi_quad_spi@7C430000 {
+-	axi_spi: spi@7C430000 {
 -		#address-cells = <1>;
 -		#size-cells = <0>;
 -		bits-per-word = <8>;
@@ -49,7 +103,7 @@ index 7aff4e197d0f..5313336a30a4 100644
  &adc0_ad9364 {
  	/* This property is controlled by u-boot environment. */
  	adi,2rx-2tx-mode-enable;
-@@ -70,6 +30,11 @@
+@@ -70,6 +30,11 @@ &cf_ad9364_dac_core_0 {
  / {
  	model = "Analog Devices PlutoSDR Rev.C (Z7010/AD9363)";
 
@@ -61,7 +115,7 @@ index 7aff4e197d0f..5313336a30a4 100644
  	leds {
  		compatible = "gpio-leds";
  		led0 {
-@@ -92,3 +57,18 @@
+@@ -92,3 +57,18 @@ button {
  		};
  	};
  };
@@ -80,42 +134,49 @@ index 7aff4e197d0f..5313336a30a4 100644
 +    pinctrl-names = "default";
 +    pinctrl-0 = <&pinctrl_usb0_default>;
 +};
-\ No newline at end of file
 diff --git a/arch/arm/boot/dts/zynq-pluto-sdr.dtsi b/arch/arm/boot/dts/zynq-pluto-sdr.dtsi
-index e936f48dbd73..bad6c46056a5 100644
+index 08c5a42204f3..0fe5bba8a082 100644
 --- a/arch/arm/boot/dts/zynq-pluto-sdr.dtsi
 +++ b/arch/arm/boot/dts/zynq-pluto-sdr.dtsi
-@@ -40,8 +40,16 @@
-
- };
+@@ -30,10 +30,26 @@ ad9364_clkin: clock@0 {
+ 		};
+ 	};
 
++	usb_phy0: phy0 {
++		compatible = "ulpi-phy";
++		#phy-cells = <0>;
++		reg = <0xe0002000 0x1000>;
++		view-port = <0x0170>;
++		drv-vbus;
++	};
++
++};
++
 +&uart1 {
 +	u-boot,dm-pre-reloc;
 +	status = "okay";
 +	pinctrl-names = "default";
 +	pinctrl-0 = <&pinctrl_uart1_default>;
-+};
-+
+ };
+ 
  &sdhci0 {
 -	status = "disabled";
 +	status = "okay";
 +    disable-wp;
  };
 
  &watchdog0 {
-@@ -50,12 +58,29 @@
+@@ -42,9 +58,24 @@ &watchdog0 {
  };
 
  &usb0 {
 -	xlnx,phy-reset-gpio = <&gpio0 52 0>;
 +	xlnx,phy-reset-gpio = <&gpio0 46 0>;
  	dr_mode = "otg";
  	status = "okay";
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&pinctrl_usb0_default>;
- 	usb-phy = <&usb_phy0>;
- };
-
++	usb-phy = <&usb_phy0>;
++};
++
 +&gem0 {
 +	status = "ok";
 +	phy-mode = "rgmii-id";
@@ -128,13 +189,10 @@ index e936f48dbd73..bad6c46056a5 100644
 +		reg = <1>;
 +		device_type = "ethernet-phy";
 +	};
-+};
-+
-+
+ };
+
  &qspi {
- 	status = "okay";
- 	is-dual = <0>;
-@@ -98,6 +123,18 @@
+@@ -90,6 +121,18 @@ channel@0 {
  	};
  };
 
@@ -153,7 +211,7 @@ index e936f48dbd73..bad6c46056a5 100644
  / {
  	fpga_axi: fpga-axi@0 {
  		compatible = "simple-bus";
-@@ -187,6 +224,148 @@
+@@ -179,6 +222,148 @@ mwipcore@43c00000 {
  	};
  };
 
@@ -302,11 +360,90 @@ index e936f48dbd73..bad6c46056a5 100644
  &spi0 {
  	status = "okay";
 
+diff --git a/arch/arm/boot/dts/zynq-zc702.dts b/arch/arm/boot/dts/zynq-zc702.dts
+index c6b4593551c9..fb918a14fdc9 100644
+--- a/arch/arm/boot/dts/zynq-zc702.dts
++++ b/arch/arm/boot/dts/zynq-zc702.dts
+@@ -57,6 +57,14 @@ led-ds23 {
+ 			linux,default-trigger = "heartbeat";
+ 		};
+ 	};
++
++	usb_phy0: phy0@e0002000 {
++		compatible = "ulpi-phy";
++		#phy-cells = <0>;
++		reg = <0xe0002000 0x1000>;
++		view-port = <0x0170>;
++		drv-vbus;
++	};
+ };
+
+ &amba {
+@@ -454,6 +462,7 @@ &uart1 {
+ &usb0 {
+ 	status = "okay";
+ 	dr_mode = "host";
++	usb-phy = <&usb_phy0>;
+ 	pinctrl-names = "default";
+ 	pinctrl-0 = <&pinctrl_usb0_default>;
+ };
+diff --git a/arch/arm/boot/dts/zynq-zc706.dts b/arch/arm/boot/dts/zynq-zc706.dts
+index 6a6e8312b3f7..cb6e9117f3a3 100644
+--- a/arch/arm/boot/dts/zynq-zc706.dts
++++ b/arch/arm/boot/dts/zynq-zc706.dts
+@@ -27,6 +27,14 @@ chosen {
+ 		bootargs = "";
+ 		stdout-path = "serial0:115200n8";
+ 	};
++
++	usb_phy0: phy0@e0002000 {
++		compatible = "ulpi-phy";
++		#phy-cells = <0>;
++		reg = <0xe0002000 0x1000>;
++		view-port = <0x0170>;
++		drv-vbus;
++	};
+ };
+
+ &clkc {
+@@ -352,6 +360,7 @@ &uart1 {
+ &usb0 {
+ 	status = "okay";
+ 	dr_mode = "host";
++	usb-phy = <&usb_phy0>;
+ 	pinctrl-names = "default";
+ 	pinctrl-0 = <&pinctrl_usb0_default>;
+ };
+diff --git a/arch/arm/boot/dts/zynq-zed.dts b/arch/arm/boot/dts/zynq-zed.dts
+index 60f73cd2601b..2d531a6ea2ca 100644
+--- a/arch/arm/boot/dts/zynq-zed.dts
++++ b/arch/arm/boot/dts/zynq-zed.dts
+@@ -26,6 +26,14 @@ chosen {
+ 		bootargs = "";
+ 		stdout-path = "serial0:115200n8";
+ 	};
++
++	usb_phy0: phy0@e0002000 {
++		compatible = "ulpi-phy";
++		#phy-cells = <0>;
++		reg = <0xe0002000 0x1000>;
++		view-port = <0x0170>;
++		drv-vbus;
++	};
+ };
+
+ &clkc {
+@@ -93,4 +101,5 @@ &uart1 {
+ &usb0 {
+ 	status = "okay";
+ 	dr_mode = "host";
++	usb-phy = <&usb_phy0>;
+ };
 diff --git a/arch/arm/configs/zynq_pluto_defconfig b/arch/arm/configs/zynq_pluto_defconfig
-index ca72dd96a29d..01ed0ddd753d 100644
+index 1efe8ab24437..89365b48bb1f 100644
 --- a/arch/arm/configs/zynq_pluto_defconfig
 +++ b/arch/arm/configs/zynq_pluto_defconfig
-@@ -270,3 +270,15 @@ CONFIG_RCU_CPU_STALL_TIMEOUT=60
+@@ -268,3 +268,15 @@ CONFIG_RCU_CPU_STALL_TIMEOUT=60
  CONFIG_DEBUG_LL=y
  CONFIG_DEBUG_ZYNQ_UART1=y
  CONFIG_EARLY_PRINTK=y

diff --git a/patches/u-boot-xlnx.diff b/patches/u-boot-xlnx.diff
@@ -53,7 +53,7 @@ index 0daf46221e..5991fa6cf7 100644
 +CONFIG_DM_ETH=y
 +CONFIG_ZYNQ_GEM=y
 diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h
-index c0e9a47b2b..39967684bd 100644
+index fd50caf450..9765ca4a08 100644
 --- a/include/configs/zynq-common.h
 +++ b/include/configs/zynq-common.h
 @@ -257,7 +257,7 @@

diff --git a/plutosdr-fw b/plutosdr-fw
+1 −0		.gitignore
+15 −0		CI/status_rule
+141 −0		CI/upload_to_artifactory.py
+16 −19		Makefile
+36 −36		README.md
+1 −1		buildroot
+35 −0		download_and_test.sh
+1 −1		hdl
+1 −1		linux
+5 −15		scripts/create_fsbl_project.tcl
+8 −10		scripts/legal_info_html.sh
+48 −0		setup_env.sh
+1 −1		u-boot-xlnx