Skip to content

GitLab

U
u-boot
Commit 5d614923 authored by Vladimir Bashkirtsev's avatar Vladimir Bashkirtsev
Browse files
Options

Disable watchdog for iWave G35M and enable it only for blank device; move eth1 to eth0

parent d72a5ee9
Hide whitespace changes
Inline Side-by-side
Showing with 33 additions and 34 deletions
Makefile
View file @ 5d614923
...@@ -550,6 +550,9 @@ iwaveg35m-mender: iwaveg35m-boot-cmd-mender iwaveg35m-fw_env.config-mender iwave ...@@ -550,6 +550,9 @@ iwaveg35m-mender: iwaveg35m-boot-cmd-mender iwaveg35m-fw_env.config-mender iwave
@echo "# CONFIG_ENV_IS_IN_FAT is not set" >> u-boot-2021.04/.config @echo "# CONFIG_ENV_IS_IN_FAT is not set" >> u-boot-2021.04/.config
@echo "CONFIG_ENV_IS_IN_MMC=y" >> u-boot-2021.04/.config @echo "CONFIG_ENV_IS_IN_MMC=y" >> u-boot-2021.04/.config
@echo "CONFIG_SYS_REDUNDAND_ENVIRONMENT=y" >> u-boot-2021.04/.config @echo "CONFIG_SYS_REDUNDAND_ENVIRONMENT=y" >> u-boot-2021.04/.config
@echo "CONFIG_WATCHDOG=y" >> u-boot-2021.04/.config
@echo "CONFIG_WDT_CDNS=y" >> u-boot-2021.04/.config
@echo "CONFIG_WDT=y" >> u-boot-2021.04/.config
$(MAKE) -C u-boot-2021.04 oldconfig $(MAKE) -C u-boot-2021.04 oldconfig
$(MAKE) -C u-boot-2021.04 $(MAKE) -C u-boot-2021.04
mount /dev/$(DISK)1 /uboot mount /dev/$(DISK)1 /uboot
......
u-boot-2021.04-iwaveg35m.patch
View file @ 5d614923
diff -uNr u-boot-2021.04/arch/arm/dts/Makefile u-boot-2021.04-iwaveg35m/arch/arm/dts/Makefile diff -uNr u-boot-2021.04/arch/arm/dts/Makefile u-boot-2021.04-iwaveg35m/arch/arm/dts/Makefile
--- u-boot-2021.04/arch/arm/dts/Makefile 2021-04-05 15:03:29.000000000 +0000 --- u-boot-2021.04/arch/arm/dts/Makefile 2021-04-05 15:03:29.000000000 +0000
+++ u-boot-2021.04-iwaveg35m/arch/arm/dts/Makefile 2025-01-05 07:44:35.828300623 +0000 +++ u-boot-2021.04-iwaveg35m/arch/arm/dts/Makefile 2025-01-24 23:55:38.720330867 +0000
@@ -323,7 +323,8 @@ @@ -323,7 +323,8 @@
zynqmp-zc1751-xm016-dc2.dtb \ zynqmp-zc1751-xm016-dc2.dtb \
zynqmp-zc1751-xm017-dc3.dtb \ zynqmp-zc1751-xm017-dc3.dtb \
...@@ -13,7 +13,7 @@ diff -uNr u-boot-2021.04/arch/arm/dts/Makefile u-boot-2021.04-iwaveg35m/arch/arm ...@@ -13,7 +13,7 @@ diff -uNr u-boot-2021.04/arch/arm/dts/Makefile u-boot-2021.04-iwaveg35m/arch/arm
versal-mini-emmc0.dtb \ versal-mini-emmc0.dtb \
diff -uNr u-boot-2021.04/arch/arm/dts/pcw.dtsi u-boot-2021.04-iwaveg35m/arch/arm/dts/pcw.dtsi diff -uNr u-boot-2021.04/arch/arm/dts/pcw.dtsi u-boot-2021.04-iwaveg35m/arch/arm/dts/pcw.dtsi
--- u-boot-2021.04/arch/arm/dts/pcw.dtsi 1970-01-01 00:00:00.000000000 +0000 --- u-boot-2021.04/arch/arm/dts/pcw.dtsi 1970-01-01 00:00:00.000000000 +0000
+++ u-boot-2021.04-iwaveg35m/arch/arm/dts/pcw.dtsi 2025-01-05 07:44:35.832300703 +0000 +++ u-boot-2021.04-iwaveg35m/arch/arm/dts/pcw.dtsi 2025-01-24 23:55:38.720330867 +0000
@@ -0,0 +1,205 @@ @@ -0,0 +1,205 @@
+/* +/*
+ * CAUTION: This file is automatically generated by Xilinx. + * CAUTION: This file is automatically generated by Xilinx.
...@@ -222,7 +222,7 @@ diff -uNr u-boot-2021.04/arch/arm/dts/pcw.dtsi u-boot-2021.04-iwaveg35m/arch/arm ...@@ -222,7 +222,7 @@ diff -uNr u-boot-2021.04/arch/arm/dts/pcw.dtsi u-boot-2021.04-iwaveg35m/arch/arm
+}; +};
diff -uNr u-boot-2021.04/arch/arm/dts/pl.dtsi u-boot-2021.04-iwaveg35m/arch/arm/dts/pl.dtsi diff -uNr u-boot-2021.04/arch/arm/dts/pl.dtsi u-boot-2021.04-iwaveg35m/arch/arm/dts/pl.dtsi
--- u-boot-2021.04/arch/arm/dts/pl.dtsi 1970-01-01 00:00:00.000000000 +0000 --- u-boot-2021.04/arch/arm/dts/pl.dtsi 1970-01-01 00:00:00.000000000 +0000
+++ u-boot-2021.04-iwaveg35m/arch/arm/dts/pl.dtsi 2025-01-05 07:44:35.832300703 +0000 +++ u-boot-2021.04-iwaveg35m/arch/arm/dts/pl.dtsi 2025-01-24 23:55:38.724330939 +0000
@@ -0,0 +1,785 @@ @@ -0,0 +1,785 @@
+/* +/*
+ * CAUTION: This file is automatically generated by Xilinx. + * CAUTION: This file is automatically generated by Xilinx.
...@@ -1011,7 +1011,7 @@ diff -uNr u-boot-2021.04/arch/arm/dts/pl.dtsi u-boot-2021.04-iwaveg35m/arch/arm/ ...@@ -1011,7 +1011,7 @@ diff -uNr u-boot-2021.04/arch/arm/dts/pl.dtsi u-boot-2021.04-iwaveg35m/arch/arm/
+}; +};
diff -uNr u-boot-2021.04/arch/arm/dts/system-conf.dtsi u-boot-2021.04-iwaveg35m/arch/arm/dts/system-conf.dtsi diff -uNr u-boot-2021.04/arch/arm/dts/system-conf.dtsi u-boot-2021.04-iwaveg35m/arch/arm/dts/system-conf.dtsi
--- u-boot-2021.04/arch/arm/dts/system-conf.dtsi 1970-01-01 00:00:00.000000000 +0000 --- u-boot-2021.04/arch/arm/dts/system-conf.dtsi 1970-01-01 00:00:00.000000000 +0000
+++ u-boot-2021.04-iwaveg35m/arch/arm/dts/system-conf.dtsi 2025-01-05 07:44:35.832300703 +0000 +++ u-boot-2021.04-iwaveg35m/arch/arm/dts/system-conf.dtsi 2025-01-24 23:55:38.724330939 +0000
@@ -0,0 +1,17 @@ @@ -0,0 +1,17 @@
+/* +/*
+ * CAUTION: This file is automatically generated by PetaLinux SDK. + * CAUTION: This file is automatically generated by PetaLinux SDK.
...@@ -1032,8 +1032,8 @@ diff -uNr u-boot-2021.04/arch/arm/dts/system-conf.dtsi u-boot-2021.04-iwaveg35m/ ...@@ -1032,8 +1032,8 @@ diff -uNr u-boot-2021.04/arch/arm/dts/system-conf.dtsi u-boot-2021.04-iwaveg35m/
+ +
diff -uNr u-boot-2021.04/arch/arm/dts/system-top.dts u-boot-2021.04-iwaveg35m/arch/arm/dts/system-top.dts diff -uNr u-boot-2021.04/arch/arm/dts/system-top.dts u-boot-2021.04-iwaveg35m/arch/arm/dts/system-top.dts
--- u-boot-2021.04/arch/arm/dts/system-top.dts 1970-01-01 00:00:00.000000000 +0000 --- u-boot-2021.04/arch/arm/dts/system-top.dts 1970-01-01 00:00:00.000000000 +0000
+++ u-boot-2021.04-iwaveg35m/arch/arm/dts/system-top.dts 2025-01-05 07:44:35.832300703 +0000 +++ u-boot-2021.04-iwaveg35m/arch/arm/dts/system-top.dts 2025-01-24 23:58:10.907097793 +0000
@@ -0,0 +1,32 @@ @@ -0,0 +1,31 @@
+/* +/*
+ * CAUTION: This file is automatically generated by Xilinx. + * CAUTION: This file is automatically generated by Xilinx.
+ * Version: XSCT + * Version: XSCT
...@@ -1053,8 +1053,7 @@ diff -uNr u-boot-2021.04/arch/arm/dts/system-top.dts u-boot-2021.04-iwaveg35m/ar ...@@ -1053,8 +1053,7 @@ diff -uNr u-boot-2021.04/arch/arm/dts/system-top.dts u-boot-2021.04-iwaveg35m/ar
+ stdout-path = "serial0:115200n8"; + stdout-path = "serial0:115200n8";
+ }; + };
+ aliases { + aliases {
+ ethernet0 = &ETH_10G_xxv_ethernet_0; + ethernet0 = &gem0;
+ ethernet1 = &gem0;
+ i2c0 = &i2c0; + i2c0 = &i2c0;
+ serial0 = &uart0; + serial0 = &uart0;
+ serial1 = &uart1; + serial1 = &uart1;
...@@ -1068,7 +1067,7 @@ diff -uNr u-boot-2021.04/arch/arm/dts/system-top.dts u-boot-2021.04-iwaveg35m/ar ...@@ -1068,7 +1067,7 @@ diff -uNr u-boot-2021.04/arch/arm/dts/system-top.dts u-boot-2021.04-iwaveg35m/ar
+#include "system-user.dtsi" +#include "system-user.dtsi"
diff -uNr u-boot-2021.04/arch/arm/dts/system-user.dtsi u-boot-2021.04-iwaveg35m/arch/arm/dts/system-user.dtsi diff -uNr u-boot-2021.04/arch/arm/dts/system-user.dtsi u-boot-2021.04-iwaveg35m/arch/arm/dts/system-user.dtsi
--- u-boot-2021.04/arch/arm/dts/system-user.dtsi 1970-01-01 00:00:00.000000000 +0000 --- u-boot-2021.04/arch/arm/dts/system-user.dtsi 1970-01-01 00:00:00.000000000 +0000
+++ u-boot-2021.04-iwaveg35m/arch/arm/dts/system-user.dtsi 2025-01-05 07:44:35.836300784 +0000 +++ u-boot-2021.04-iwaveg35m/arch/arm/dts/system-user.dtsi 2025-01-24 23:55:38.724330939 +0000
@@ -0,0 +1,455 @@ @@ -0,0 +1,455 @@
+#include <dt-bindings/gpio/gpio.h> +#include <dt-bindings/gpio/gpio.h>
+/include/ "system-conf.dtsi" +/include/ "system-conf.dtsi"
...@@ -1527,7 +1526,7 @@ diff -uNr u-boot-2021.04/arch/arm/dts/system-user.dtsi u-boot-2021.04-iwaveg35m/ ...@@ -1527,7 +1526,7 @@ diff -uNr u-boot-2021.04/arch/arm/dts/system-user.dtsi u-boot-2021.04-iwaveg35m/
+}; +};
diff -uNr u-boot-2021.04/arch/arm/dts/zynqmp.dtsi u-boot-2021.04-iwaveg35m/arch/arm/dts/zynqmp.dtsi diff -uNr u-boot-2021.04/arch/arm/dts/zynqmp.dtsi u-boot-2021.04-iwaveg35m/arch/arm/dts/zynqmp.dtsi
--- u-boot-2021.04/arch/arm/dts/zynqmp.dtsi 2021-04-05 15:03:29.000000000 +0000 --- u-boot-2021.04/arch/arm/dts/zynqmp.dtsi 2021-04-05 15:03:29.000000000 +0000
+++ u-boot-2021.04-iwaveg35m/arch/arm/dts/zynqmp.dtsi 2025-01-05 07:44:35.836300784 +0000 +++ u-boot-2021.04-iwaveg35m/arch/arm/dts/zynqmp.dtsi 2025-01-24 23:55:38.728331012 +0000
@@ -667,6 +667,15 @@ @@ -667,6 +667,15 @@
power-domains = <&zynqmp_firmware PD_QSPI>; power-domains = <&zynqmp_firmware PD_QSPI>;
}; };
...@@ -1566,7 +1565,7 @@ diff -uNr u-boot-2021.04/arch/arm/dts/zynqmp.dtsi u-boot-2021.04-iwaveg35m/arch/ ...@@ -1566,7 +1565,7 @@ diff -uNr u-boot-2021.04/arch/arm/dts/zynqmp.dtsi u-boot-2021.04-iwaveg35m/arch/
status = "disabled"; status = "disabled";
diff -uNr u-boot-2021.04/board/xilinx/common/cpu-info.c u-boot-2021.04-iwaveg35m/board/xilinx/common/cpu-info.c diff -uNr u-boot-2021.04/board/xilinx/common/cpu-info.c u-boot-2021.04-iwaveg35m/board/xilinx/common/cpu-info.c
--- u-boot-2021.04/board/xilinx/common/cpu-info.c 1970-01-01 00:00:00.000000000 +0000 --- u-boot-2021.04/board/xilinx/common/cpu-info.c 1970-01-01 00:00:00.000000000 +0000
+++ u-boot-2021.04-iwaveg35m/board/xilinx/common/cpu-info.c 2025-01-05 07:44:35.836300784 +0000 +++ u-boot-2021.04-iwaveg35m/board/xilinx/common/cpu-info.c 2025-01-24 23:55:38.728331012 +0000
@@ -0,0 +1,36 @@ @@ -0,0 +1,36 @@
+// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0+
+/* +/*
...@@ -1606,7 +1605,7 @@ diff -uNr u-boot-2021.04/board/xilinx/common/cpu-info.c u-boot-2021.04-iwaveg35m ...@@ -1606,7 +1605,7 @@ diff -uNr u-boot-2021.04/board/xilinx/common/cpu-info.c u-boot-2021.04-iwaveg35m
+} +}
diff -uNr u-boot-2021.04/board/xilinx/common/Makefile u-boot-2021.04-iwaveg35m/board/xilinx/common/Makefile diff -uNr u-boot-2021.04/board/xilinx/common/Makefile u-boot-2021.04-iwaveg35m/board/xilinx/common/Makefile
--- u-boot-2021.04/board/xilinx/common/Makefile 2021-04-05 15:03:29.000000000 +0000 --- u-boot-2021.04/board/xilinx/common/Makefile 2021-04-05 15:03:29.000000000 +0000
+++ u-boot-2021.04-iwaveg35m/board/xilinx/common/Makefile 2025-01-05 07:44:35.840300864 +0000 +++ u-boot-2021.04-iwaveg35m/board/xilinx/common/Makefile 2025-01-24 23:55:38.728331012 +0000
@@ -5,6 +5,9 @@ @@ -5,6 +5,9 @@
# #
...@@ -1619,7 +1618,7 @@ diff -uNr u-boot-2021.04/board/xilinx/common/Makefile u-boot-2021.04-iwaveg35m/b ...@@ -1619,7 +1618,7 @@ diff -uNr u-boot-2021.04/board/xilinx/common/Makefile u-boot-2021.04-iwaveg35m/b
endif endif
diff -uNr u-boot-2021.04/board/xilinx/zynqmp/zynqmp.c u-boot-2021.04-iwaveg35m/board/xilinx/zynqmp/zynqmp.c diff -uNr u-boot-2021.04/board/xilinx/zynqmp/zynqmp.c u-boot-2021.04-iwaveg35m/board/xilinx/zynqmp/zynqmp.c
--- u-boot-2021.04/board/xilinx/zynqmp/zynqmp.c 2021-04-05 15:03:29.000000000 +0000 --- u-boot-2021.04/board/xilinx/zynqmp/zynqmp.c 2021-04-05 15:03:29.000000000 +0000
+++ u-boot-2021.04-iwaveg35m/board/xilinx/zynqmp/zynqmp.c 2025-01-05 07:44:36.680317775 +0000 +++ u-boot-2021.04-iwaveg35m/board/xilinx/zynqmp/zynqmp.c 2025-01-24 23:55:39.012336186 +0000
@@ -10,6 +10,7 @@ @@ -10,6 +10,7 @@
#include <debug_uart.h> #include <debug_uart.h>
#include <env.h> #include <env.h>
...@@ -2118,7 +2117,7 @@ diff -uNr u-boot-2021.04/board/xilinx/zynqmp/zynqmp.c u-boot-2021.04-iwaveg35m/b ...@@ -2118,7 +2117,7 @@ diff -uNr u-boot-2021.04/board/xilinx/zynqmp/zynqmp.c u-boot-2021.04-iwaveg35m/b
+#endif +#endif
diff -uNr u-boot-2021.04/cmd/cmd_custom_memtests.c u-boot-2021.04-iwaveg35m/cmd/cmd_custom_memtests.c diff -uNr u-boot-2021.04/cmd/cmd_custom_memtests.c u-boot-2021.04-iwaveg35m/cmd/cmd_custom_memtests.c
--- u-boot-2021.04/cmd/cmd_custom_memtests.c 1970-01-01 00:00:00.000000000 +0000 --- u-boot-2021.04/cmd/cmd_custom_memtests.c 1970-01-01 00:00:00.000000000 +0000
+++ u-boot-2021.04-iwaveg35m/cmd/cmd_custom_memtests.c 2025-01-05 07:44:38.640357234 +0000 +++ u-boot-2021.04-iwaveg35m/cmd/cmd_custom_memtests.c 2025-01-24 23:55:39.012336186 +0000
@@ -0,0 +1,537 @@ @@ -0,0 +1,537 @@
+/* This file contains the custom DDR memory tests as a part of POST +/* This file contains the custom DDR memory tests as a part of POST
+ * + *
...@@ -2659,7 +2658,7 @@ diff -uNr u-boot-2021.04/cmd/cmd_custom_memtests.c u-boot-2021.04-iwaveg35m/cmd/ ...@@ -2659,7 +2658,7 @@ diff -uNr u-boot-2021.04/cmd/cmd_custom_memtests.c u-boot-2021.04-iwaveg35m/cmd/
+ +
diff -uNr u-boot-2021.04/cmd/Kconfig u-boot-2021.04-iwaveg35m/cmd/Kconfig diff -uNr u-boot-2021.04/cmd/Kconfig u-boot-2021.04-iwaveg35m/cmd/Kconfig
--- u-boot-2021.04/cmd/Kconfig 2021-04-05 15:03:29.000000000 +0000 --- u-boot-2021.04/cmd/Kconfig 2021-04-05 15:03:29.000000000 +0000
+++ u-boot-2021.04-iwaveg35m/cmd/Kconfig 2025-01-05 07:44:38.640357234 +0000 +++ u-boot-2021.04-iwaveg35m/cmd/Kconfig 2025-01-24 23:55:39.016336259 +0000
@@ -737,6 +737,12 @@ @@ -737,6 +737,12 @@
within the range are displayed. The minimum number of characters within the range are displayed. The minimum number of characters
for a sequence to be considered a string can be provided. for a sequence to be considered a string can be provided.
...@@ -2675,7 +2674,7 @@ diff -uNr u-boot-2021.04/cmd/Kconfig u-boot-2021.04-iwaveg35m/cmd/Kconfig ...@@ -2675,7 +2674,7 @@ diff -uNr u-boot-2021.04/cmd/Kconfig u-boot-2021.04-iwaveg35m/cmd/Kconfig
menu "Compression commands" menu "Compression commands"
diff -uNr u-boot-2021.04/cmd/Makefile u-boot-2021.04-iwaveg35m/cmd/Makefile diff -uNr u-boot-2021.04/cmd/Makefile u-boot-2021.04-iwaveg35m/cmd/Makefile
--- u-boot-2021.04/cmd/Makefile 2021-04-05 15:03:29.000000000 +0000 --- u-boot-2021.04/cmd/Makefile 2021-04-05 15:03:29.000000000 +0000
+++ u-boot-2021.04-iwaveg35m/cmd/Makefile 2025-01-05 07:44:38.780360052 +0000 +++ u-boot-2021.04-iwaveg35m/cmd/Makefile 2025-01-24 23:55:39.016336259 +0000
@@ -29,6 +29,7 @@ @@ -29,6 +29,7 @@
obj-$(CONFIG_CMD_BLOCK_CACHE) += blkcache.o obj-$(CONFIG_CMD_BLOCK_CACHE) += blkcache.o
obj-$(CONFIG_CMD_BMP) += bmp.o obj-$(CONFIG_CMD_BMP) += bmp.o
...@@ -2686,8 +2685,8 @@ diff -uNr u-boot-2021.04/cmd/Makefile u-boot-2021.04-iwaveg35m/cmd/Makefile ...@@ -2686,8 +2685,8 @@ diff -uNr u-boot-2021.04/cmd/Makefile u-boot-2021.04-iwaveg35m/cmd/Makefile
obj-$(CONFIG_CMD_BOOTSTAGE) += bootstage.o obj-$(CONFIG_CMD_BOOTSTAGE) += bootstage.o
diff -uNr u-boot-2021.04/configs/zynqmp_iwg35m_defconfig u-boot-2021.04-iwaveg35m/configs/zynqmp_iwg35m_defconfig diff -uNr u-boot-2021.04/configs/zynqmp_iwg35m_defconfig u-boot-2021.04-iwaveg35m/configs/zynqmp_iwg35m_defconfig
--- u-boot-2021.04/configs/zynqmp_iwg35m_defconfig 1970-01-01 00:00:00.000000000 +0000 --- u-boot-2021.04/configs/zynqmp_iwg35m_defconfig 1970-01-01 00:00:00.000000000 +0000
+++ u-boot-2021.04-iwaveg35m/configs/zynqmp_iwg35m_defconfig 2025-01-05 07:45:43.889670819 +0000 +++ u-boot-2021.04-iwaveg35m/configs/zynqmp_iwg35m_defconfig 2025-01-24 23:59:28.376502679 +0000
@@ -0,0 +1,332 @@ @@ -0,0 +1,329 @@
+CONFIG_CREATE_ARCH_SYMLINK=y +CONFIG_CREATE_ARCH_SYMLINK=y
+CONFIG_SYS_CACHE_SHIFT_6=y +CONFIG_SYS_CACHE_SHIFT_6=y
+CONFIG_SYS_CACHELINE_SIZE=64 +CONFIG_SYS_CACHELINE_SIZE=64
...@@ -3016,13 +3015,10 @@ diff -uNr u-boot-2021.04/configs/zynqmp_iwg35m_defconfig u-boot-2021.04-iwaveg35 ...@@ -3016,13 +3015,10 @@ diff -uNr u-boot-2021.04/configs/zynqmp_iwg35m_defconfig u-boot-2021.04-iwaveg35
+CONFIG_TPL_OF_LIBFDT_ASSUME_MASK=0xff +CONFIG_TPL_OF_LIBFDT_ASSUME_MASK=0xff
+CONFIG_MKIMAGE_DTC_PATH="dtc" +CONFIG_MKIMAGE_DTC_PATH="dtc"
+CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET=0x0 +CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET=0x0
+CONFIG_WATCHDOG=y
+CONFIG_WDT_CDNS=y
+CONFIG_WDT=y
+CONFIG_ENV_IS_NOWHERE=y +CONFIG_ENV_IS_NOWHERE=y
diff -uNr u-boot-2021.04/drivers/gpio/pca953x_gpio.c u-boot-2021.04-iwaveg35m/drivers/gpio/pca953x_gpio.c diff -uNr u-boot-2021.04/drivers/gpio/pca953x_gpio.c u-boot-2021.04-iwaveg35m/drivers/gpio/pca953x_gpio.c
--- u-boot-2021.04/drivers/gpio/pca953x_gpio.c 2021-04-05 15:03:29.000000000 +0000 --- u-boot-2021.04/drivers/gpio/pca953x_gpio.c 2021-04-05 15:03:29.000000000 +0000
+++ u-boot-2021.04-iwaveg35m/drivers/gpio/pca953x_gpio.c 2025-01-05 07:44:51.764621446 +0000 +++ u-boot-2021.04-iwaveg35m/drivers/gpio/pca953x_gpio.c 2025-01-24 23:55:39.020336332 +0000
@@ -373,6 +373,7 @@ @@ -373,6 +373,7 @@
{ .compatible = "ti,tca6416", .data = OF_953X(16, PCA_INT), }, { .compatible = "ti,tca6416", .data = OF_953X(16, PCA_INT), },
{ .compatible = "ti,tca6424", .data = OF_953X(24, PCA_INT), }, { .compatible = "ti,tca6424", .data = OF_953X(24, PCA_INT), },
...@@ -3033,7 +3029,7 @@ diff -uNr u-boot-2021.04/drivers/gpio/pca953x_gpio.c u-boot-2021.04-iwaveg35m/dr ...@@ -3033,7 +3029,7 @@ diff -uNr u-boot-2021.04/drivers/gpio/pca953x_gpio.c u-boot-2021.04-iwaveg35m/dr
diff -uNr u-boot-2021.04/drivers/misc/fru_eeprom.c u-boot-2021.04-iwaveg35m/drivers/misc/fru_eeprom.c diff -uNr u-boot-2021.04/drivers/misc/fru_eeprom.c u-boot-2021.04-iwaveg35m/drivers/misc/fru_eeprom.c
--- u-boot-2021.04/drivers/misc/fru_eeprom.c 1970-01-01 00:00:00.000000000 +0000 --- u-boot-2021.04/drivers/misc/fru_eeprom.c 1970-01-01 00:00:00.000000000 +0000
+++ u-boot-2021.04-iwaveg35m/drivers/misc/fru_eeprom.c 2025-01-05 07:44:51.768621527 +0000 +++ u-boot-2021.04-iwaveg35m/drivers/misc/fru_eeprom.c 2025-01-24 23:55:39.024336405 +0000
@@ -0,0 +1,939 @@ @@ -0,0 +1,939 @@
+ +
+#include <errno.h> +#include <errno.h>
...@@ -3976,7 +3972,7 @@ diff -uNr u-boot-2021.04/drivers/misc/fru_eeprom.c u-boot-2021.04-iwaveg35m/driv ...@@ -3976,7 +3972,7 @@ diff -uNr u-boot-2021.04/drivers/misc/fru_eeprom.c u-boot-2021.04-iwaveg35m/driv
+U_BOOT_CMD(frudump, 3, 1, do_fru_dump, "Dump FMC Card Details", "fru-dump <i2c Bus No> <Chip Address>"); +U_BOOT_CMD(frudump, 3, 1, do_fru_dump, "Dump FMC Card Details", "fru-dump <i2c Bus No> <Chip Address>");
diff -uNr u-boot-2021.04/drivers/misc/Kconfig u-boot-2021.04-iwaveg35m/drivers/misc/Kconfig diff -uNr u-boot-2021.04/drivers/misc/Kconfig u-boot-2021.04-iwaveg35m/drivers/misc/Kconfig
--- u-boot-2021.04/drivers/misc/Kconfig 2021-04-05 15:03:29.000000000 +0000 --- u-boot-2021.04/drivers/misc/Kconfig 2021-04-05 15:03:29.000000000 +0000
+++ u-boot-2021.04-iwaveg35m/drivers/misc/Kconfig 2025-01-05 07:44:51.768621527 +0000 +++ u-boot-2021.04-iwaveg35m/drivers/misc/Kconfig 2025-01-24 23:55:39.024336405 +0000
@@ -377,6 +377,12 @@ @@ -377,6 +377,12 @@
help help
Enable a generic driver for EEPROMs attached via I2C. Enable a generic driver for EEPROMs attached via I2C.
...@@ -3992,7 +3988,7 @@ diff -uNr u-boot-2021.04/drivers/misc/Kconfig u-boot-2021.04-iwaveg35m/drivers/m ...@@ -3992,7 +3988,7 @@ diff -uNr u-boot-2021.04/drivers/misc/Kconfig u-boot-2021.04-iwaveg35m/drivers/m
bool "Enable driver for generic I2C-attached EEPROMs for SPL" bool "Enable driver for generic I2C-attached EEPROMs for SPL"
diff -uNr u-boot-2021.04/drivers/misc/Makefile u-boot-2021.04-iwaveg35m/drivers/misc/Makefile diff -uNr u-boot-2021.04/drivers/misc/Makefile u-boot-2021.04-iwaveg35m/drivers/misc/Makefile
--- u-boot-2021.04/drivers/misc/Makefile 2021-04-05 15:03:29.000000000 +0000 --- u-boot-2021.04/drivers/misc/Makefile 2021-04-05 15:03:29.000000000 +0000
+++ u-boot-2021.04-iwaveg35m/drivers/misc/Makefile 2025-01-05 07:44:51.768621527 +0000 +++ u-boot-2021.04-iwaveg35m/drivers/misc/Makefile 2025-01-24 23:55:39.024336405 +0000
@@ -22,6 +22,7 @@ @@ -22,6 +22,7 @@
obj-$(CONFIG_SANDBOX) += i2c_eeprom_emul.o obj-$(CONFIG_SANDBOX) += i2c_eeprom_emul.o
endif endif
...@@ -4003,7 +3999,7 @@ diff -uNr u-boot-2021.04/drivers/misc/Makefile u-boot-2021.04-iwaveg35m/drivers/ ...@@ -4003,7 +3999,7 @@ diff -uNr u-boot-2021.04/drivers/misc/Makefile u-boot-2021.04-iwaveg35m/drivers/
obj-$(CONFIG_SANDBOX) += spltest_sandbox.o obj-$(CONFIG_SANDBOX) += spltest_sandbox.o
diff -uNr u-boot-2021.04/drivers/net/zynq_gem.c u-boot-2021.04-iwaveg35m/drivers/net/zynq_gem.c diff -uNr u-boot-2021.04/drivers/net/zynq_gem.c u-boot-2021.04-iwaveg35m/drivers/net/zynq_gem.c
--- u-boot-2021.04/drivers/net/zynq_gem.c 2021-04-05 15:03:29.000000000 +0000 --- u-boot-2021.04/drivers/net/zynq_gem.c 2021-04-05 15:03:29.000000000 +0000
+++ u-boot-2021.04-iwaveg35m/drivers/net/zynq_gem.c 2025-01-05 07:44:53.380653979 +0000 +++ u-boot-2021.04-iwaveg35m/drivers/net/zynq_gem.c 2025-01-24 23:55:39.024336405 +0000
@@ -63,11 +63,7 @@ @@ -63,11 +63,7 @@
#define ZYNQ_GEM_NWCFG_FSREM 0x00020000 /* FCS removal */ #define ZYNQ_GEM_NWCFG_FSREM 0x00020000 /* FCS removal */
#define ZYNQ_GEM_NWCFG_SGMII_ENBL 0x08000000 /* SGMII Enable */ #define ZYNQ_GEM_NWCFG_SGMII_ENBL 0x08000000 /* SGMII Enable */
...@@ -4018,7 +4014,7 @@ diff -uNr u-boot-2021.04/drivers/net/zynq_gem.c u-boot-2021.04-iwaveg35m/drivers ...@@ -4018,7 +4014,7 @@ diff -uNr u-boot-2021.04/drivers/net/zynq_gem.c u-boot-2021.04-iwaveg35m/drivers
# define ZYNQ_GEM_DBUS_WIDTH (1 << 21) /* 64 bit bus */ # define ZYNQ_GEM_DBUS_WIDTH (1 << 21) /* 64 bit bus */
diff -uNr u-boot-2021.04/include/autoconf.mk u-boot-2021.04-iwaveg35m/include/autoconf.mk diff -uNr u-boot-2021.04/include/autoconf.mk u-boot-2021.04-iwaveg35m/include/autoconf.mk
--- u-boot-2021.04/include/autoconf.mk 1970-01-01 00:00:00.000000000 +0000 --- u-boot-2021.04/include/autoconf.mk 1970-01-01 00:00:00.000000000 +0000
+++ u-boot-2021.04-iwaveg35m/include/autoconf.mk 2025-01-05 07:44:53.380653979 +0000 +++ u-boot-2021.04-iwaveg35m/include/autoconf.mk 2025-01-24 23:55:39.028336477 +0000
@@ -0,0 +1,43 @@ @@ -0,0 +1,43 @@
+CONFIG_SYS_BOOTM_LEN="(60 * 1024 * 1024)" +CONFIG_SYS_BOOTM_LEN="(60 * 1024 * 1024)"
+CONFIG_SYS_LOAD_ADDR=0x8000000 +CONFIG_SYS_LOAD_ADDR=0x8000000
...@@ -4065,7 +4061,7 @@ diff -uNr u-boot-2021.04/include/autoconf.mk u-boot-2021.04-iwaveg35m/include/au ...@@ -4065,7 +4061,7 @@ diff -uNr u-boot-2021.04/include/autoconf.mk u-boot-2021.04-iwaveg35m/include/au
+CONFIG_BOARDDIR="board/xilinx/zynqmp" +CONFIG_BOARDDIR="board/xilinx/zynqmp"
diff -uNr u-boot-2021.04/include/autoconf.mk.dep u-boot-2021.04-iwaveg35m/include/autoconf.mk.dep diff -uNr u-boot-2021.04/include/autoconf.mk.dep u-boot-2021.04-iwaveg35m/include/autoconf.mk.dep
--- u-boot-2021.04/include/autoconf.mk.dep 1970-01-01 00:00:00.000000000 +0000 --- u-boot-2021.04/include/autoconf.mk.dep 1970-01-01 00:00:00.000000000 +0000
+++ u-boot-2021.04-iwaveg35m/include/autoconf.mk.dep 2025-01-05 07:44:53.380653979 +0000 +++ u-boot-2021.04-iwaveg35m/include/autoconf.mk.dep 2025-01-24 23:55:39.028336477 +0000
@@ -0,0 +1,85 @@ @@ -0,0 +1,85 @@
+include/config/auto.conf: include/common.h include/linux/kconfig.h \ +include/config/auto.conf: include/common.h include/linux/kconfig.h \
+ include/generated/autoconf.h include/config.h include/config_uncmd_spl.h \ + include/generated/autoconf.h include/config.h include/config_uncmd_spl.h \
...@@ -4154,7 +4150,7 @@ diff -uNr u-boot-2021.04/include/autoconf.mk.dep u-boot-2021.04-iwaveg35m/includ ...@@ -4154,7 +4150,7 @@ diff -uNr u-boot-2021.04/include/autoconf.mk.dep u-boot-2021.04-iwaveg35m/includ
+include/linux/byteorder/generic.h: +include/linux/byteorder/generic.h:
diff -uNr u-boot-2021.04/include/config_distro_bootcmd.h u-boot-2021.04-iwaveg35m/include/config_distro_bootcmd.h diff -uNr u-boot-2021.04/include/config_distro_bootcmd.h u-boot-2021.04-iwaveg35m/include/config_distro_bootcmd.h
--- u-boot-2021.04/include/config_distro_bootcmd.h 2021-04-05 15:03:29.000000000 +0000 --- u-boot-2021.04/include/config_distro_bootcmd.h 2021-04-05 15:03:29.000000000 +0000
+++ u-boot-2021.04-iwaveg35m/include/config_distro_bootcmd.h 2025-01-05 07:44:53.384654060 +0000 +++ u-boot-2021.04-iwaveg35m/include/config_distro_bootcmd.h 2025-01-24 23:55:39.028336477 +0000
@@ -489,6 +489,23 @@ @@ -489,6 +489,23 @@
\ \
BOOT_TARGET_DEVICES(BOOTENV_DEV) \ BOOT_TARGET_DEVICES(BOOTENV_DEV) \
...@@ -4181,7 +4177,7 @@ diff -uNr u-boot-2021.04/include/config_distro_bootcmd.h u-boot-2021.04-iwaveg35 ...@@ -4181,7 +4177,7 @@ diff -uNr u-boot-2021.04/include/config_distro_bootcmd.h u-boot-2021.04-iwaveg35
BOOTENV_SET_IDE_NEED_INIT \ BOOTENV_SET_IDE_NEED_INIT \
diff -uNr u-boot-2021.04/include/config.h u-boot-2021.04-iwaveg35m/include/config.h diff -uNr u-boot-2021.04/include/config.h u-boot-2021.04-iwaveg35m/include/config.h
--- u-boot-2021.04/include/config.h 1970-01-01 00:00:00.000000000 +0000 --- u-boot-2021.04/include/config.h 1970-01-01 00:00:00.000000000 +0000
+++ u-boot-2021.04-iwaveg35m/include/config.h 2025-01-05 07:44:53.384654060 +0000 +++ u-boot-2021.04-iwaveg35m/include/config.h 2025-01-24 23:55:39.028336477 +0000
@@ -0,0 +1,7 @@ @@ -0,0 +1,7 @@
+/* Automatically generated - do not edit */ +/* Automatically generated - do not edit */
+#define CONFIG_BOARDDIR board/xilinx/zynqmp +#define CONFIG_BOARDDIR board/xilinx/zynqmp
...@@ -4192,7 +4188,7 @@ diff -uNr u-boot-2021.04/include/config.h u-boot-2021.04-iwaveg35m/include/confi ...@@ -4192,7 +4188,7 @@ diff -uNr u-boot-2021.04/include/config.h u-boot-2021.04-iwaveg35m/include/confi
+#include <config_fallbacks.h> +#include <config_fallbacks.h>
diff -uNr u-boot-2021.04/include/configs/xilinx_zynqmp.h u-boot-2021.04-iwaveg35m/include/configs/xilinx_zynqmp.h diff -uNr u-boot-2021.04/include/configs/xilinx_zynqmp.h u-boot-2021.04-iwaveg35m/include/configs/xilinx_zynqmp.h
--- u-boot-2021.04/include/configs/xilinx_zynqmp.h 2021-04-05 15:03:29.000000000 +0000 --- u-boot-2021.04/include/configs/xilinx_zynqmp.h 2021-04-05 15:03:29.000000000 +0000
+++ u-boot-2021.04-iwaveg35m/include/configs/xilinx_zynqmp.h 2025-01-05 07:44:53.384654060 +0000 +++ u-boot-2021.04-iwaveg35m/include/configs/xilinx_zynqmp.h 2025-01-24 23:55:39.032336550 +0000
@@ -19,6 +19,10 @@ @@ -19,6 +19,10 @@
#define GICD_BASE 0xF9010000 #define GICD_BASE 0xF9010000
#define GICC_BASE 0xF9020000 #define GICC_BASE 0xF9020000
...@@ -4206,7 +4202,7 @@ diff -uNr u-boot-2021.04/include/configs/xilinx_zynqmp.h u-boot-2021.04-iwaveg35 ...@@ -4206,7 +4202,7 @@ diff -uNr u-boot-2021.04/include/configs/xilinx_zynqmp.h u-boot-2021.04-iwaveg35
/* Generic Timer Definitions - setup in EL3. Setup by ATF for other cases */ /* Generic Timer Definitions - setup in EL3. Setup by ATF for other cases */
diff -uNr u-boot-2021.04/include/configs/zynqmp_iwg35m.h u-boot-2021.04-iwaveg35m/include/configs/zynqmp_iwg35m.h diff -uNr u-boot-2021.04/include/configs/zynqmp_iwg35m.h u-boot-2021.04-iwaveg35m/include/configs/zynqmp_iwg35m.h
--- u-boot-2021.04/include/configs/zynqmp_iwg35m.h 1970-01-01 00:00:00.000000000 +0000 --- u-boot-2021.04/include/configs/zynqmp_iwg35m.h 1970-01-01 00:00:00.000000000 +0000
+++ u-boot-2021.04-iwaveg35m/include/configs/zynqmp_iwg35m.h 2025-01-05 07:44:53.384654060 +0000 +++ u-boot-2021.04-iwaveg35m/include/configs/zynqmp_iwg35m.h 2025-01-24 23:55:39.032336550 +0000
@@ -0,0 +1,21 @@ @@ -0,0 +1,21 @@
+/* +/*
+ * (C) Copyright 2018 - 2019 iWave System Technologies Pvt Ltd. + * (C) Copyright 2018 - 2019 iWave System Technologies Pvt Ltd.
...@@ -4231,7 +4227,7 @@ diff -uNr u-boot-2021.04/include/configs/zynqmp_iwg35m.h u-boot-2021.04-iwaveg35 ...@@ -4231,7 +4227,7 @@ diff -uNr u-boot-2021.04/include/configs/zynqmp_iwg35m.h u-boot-2021.04-iwaveg35
+#endif /* __CONFIG_ZYNQMP_IWG35M_H */ +#endif /* __CONFIG_ZYNQMP_IWG35M_H */
diff -uNr u-boot-2021.04/include/iw_fru.h u-boot-2021.04-iwaveg35m/include/iw_fru.h diff -uNr u-boot-2021.04/include/iw_fru.h u-boot-2021.04-iwaveg35m/include/iw_fru.h
--- u-boot-2021.04/include/iw_fru.h 1970-01-01 00:00:00.000000000 +0000 --- u-boot-2021.04/include/iw_fru.h 1970-01-01 00:00:00.000000000 +0000
+++ u-boot-2021.04-iwaveg35m/include/iw_fru.h 2025-01-05 07:44:53.388654141 +0000 +++ u-boot-2021.04-iwaveg35m/include/iw_fru.h 2025-01-24 23:55:39.032336550 +0000
@@ -0,0 +1,127 @@ @@ -0,0 +1,127 @@
+/* +/*
+ * fru.h + * fru.h
...@@ -4362,7 +4358,7 @@ diff -uNr u-boot-2021.04/include/iw_fru.h u-boot-2021.04-iwaveg35m/include/iw_fr ...@@ -4362,7 +4358,7 @@ diff -uNr u-boot-2021.04/include/iw_fru.h u-boot-2021.04-iwaveg35m/include/iw_fr
+ +
diff -uNr u-boot-2021.04/scripts/config_whitelist.txt u-boot-2021.04-iwaveg35m/scripts/config_whitelist.txt diff -uNr u-boot-2021.04/scripts/config_whitelist.txt u-boot-2021.04-iwaveg35m/scripts/config_whitelist.txt
--- u-boot-2021.04/scripts/config_whitelist.txt 2021-04-05 15:03:29.000000000 +0000 --- u-boot-2021.04/scripts/config_whitelist.txt 2021-04-05 15:03:29.000000000 +0000
+++ u-boot-2021.04-iwaveg35m/scripts/config_whitelist.txt 2025-01-05 07:44:53.388654141 +0000 +++ u-boot-2021.04-iwaveg35m/scripts/config_whitelist.txt 2025-01-24 23:55:39.036336623 +0000
@@ -3986,4 +3986,5 @@ @@ -3986,4 +3986,5 @@
CONFIG_YAFFS_WINCE CONFIG_YAFFS_WINCE
CONFIG_YELLOW_LED CONFIG_YELLOW_LED
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment