From: Rosen Penev Date: Sat, 18 May 2024 20:45:34 +0000 (-0700) Subject: packages: refresh patches X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=2f4bb69664d2b4d3a2d21200240a4cf5cd25f183;p=openwrt%2Fstaging%2Fansuel.git packages: refresh patches CI is supposed to catch all of these. Some of these predate CI. Signed-off-by: Rosen Penev --- diff --git a/package/boot/uboot-bcm4908/patches/100-check-config-allow-to-complete-build-even-with-ad-ho.patch b/package/boot/uboot-bcm4908/patches/100-check-config-allow-to-complete-build-even-with-ad-ho.patch index 44aa4c17e6..5ef293c4f6 100644 --- a/package/boot/uboot-bcm4908/patches/100-check-config-allow-to-complete-build-even-with-ad-ho.patch +++ b/package/boot/uboot-bcm4908/patches/100-check-config-allow-to-complete-build-even-with-ad-ho.patch @@ -22,7 +22,7 @@ Signed-off-by: Masahiro Yamada --- a/scripts/check-config.sh +++ b/scripts/check-config.sh -@@ -50,14 +50,13 @@ cat `find ${srctree} -name "Kconfig*"` |sed -n \ +@@ -50,14 +50,13 @@ cat `find ${srctree} -name "Kconfig*"` | |sort |uniq > ${ok} comm -23 ${suspects} ${ok} >${new_adhoc} if [ -s ${new_adhoc} ]; then diff --git a/package/boot/uboot-kirkwood/patches/180-netgear-stora.patch b/package/boot/uboot-kirkwood/patches/180-netgear-stora.patch index 5eed89d5e6..c6aced4221 100644 --- a/package/boot/uboot-kirkwood/patches/180-netgear-stora.patch +++ b/package/boot/uboot-kirkwood/patches/180-netgear-stora.patch @@ -1,7 +1,6 @@ -diff -ruN u-boot-2020.04.old/arch/arm/mach-kirkwood/Kconfig u-boot-2020.04/arch/arm/mach-kirkwood/Kconfig ---- u-boot-2020.04.old/arch/arm/mach-kirkwood/Kconfig 2020-07-09 00:46:15.000000000 +0200 -+++ u-boot-2020.04/arch/arm/mach-kirkwood/Kconfig 2020-07-09 01:07:00.309219477 +0200 -@@ -44,6 +44,9 @@ +--- a/arch/arm/mach-kirkwood/Kconfig ++++ b/arch/arm/mach-kirkwood/Kconfig +@@ -44,6 +44,9 @@ config TARGET_NET2BIG_V2 config TARGET_NETSPACE_V2 bool "LaCie netspace_v2 Board" @@ -11,7 +10,7 @@ diff -ruN u-boot-2020.04.old/arch/arm/mach-kirkwood/Kconfig u-boot-2020.04/arch/ config TARGET_IB62X0 bool "ib62x0 Board" -@@ -92,6 +95,7 @@ +@@ -95,6 +98,7 @@ source "board/iomega/iconnect/Kconfig" source "board/keymile/Kconfig" source "board/LaCie/net2big_v2/Kconfig" source "board/LaCie/netspace_v2/Kconfig" @@ -19,9 +18,8 @@ diff -ruN u-boot-2020.04.old/arch/arm/mach-kirkwood/Kconfig u-boot-2020.04/arch/ source "board/raidsonic/ib62x0/Kconfig" source "board/Seagate/dockstar/Kconfig" source "board/Seagate/goflexhome/Kconfig" -diff -ruN u-boot-2020.04.old/board/Marvell/netgear_ms2110/Kconfig u-boot-2020.04/board/Marvell/netgear_ms2110/Kconfig ---- u-boot-2020.04.old/board/Marvell/netgear_ms2110/Kconfig 1970-01-01 01:00:00.000000000 +0100 -+++ u-boot-2020.04/board/Marvell/netgear_ms2110/Kconfig 2020-07-09 00:59:29.000000000 +0200 +--- /dev/null ++++ b/board/Marvell/netgear_ms2110/Kconfig @@ -0,0 +1,12 @@ +if TARGET_NETGEAR_MS2110 + @@ -35,9 +33,8 @@ diff -ruN u-boot-2020.04.old/board/Marvell/netgear_ms2110/Kconfig u-boot-2020.04 + default "netgear_ms2110" + +endif -diff -ruN u-boot-2020.04.old/board/Marvell/netgear_ms2110/kwbimage.cfg u-boot-2020.04/board/Marvell/netgear_ms2110/kwbimage.cfg ---- u-boot-2020.04.old/board/Marvell/netgear_ms2110/kwbimage.cfg 1970-01-01 01:00:00.000000000 +0100 -+++ u-boot-2020.04/board/Marvell/netgear_ms2110/kwbimage.cfg 2020-07-09 00:59:29.000000000 +0200 +--- /dev/null ++++ b/board/Marvell/netgear_ms2110/kwbimage.cfg @@ -0,0 +1,167 @@ +# +# (C) Copyright 2009 @@ -206,9 +203,8 @@ diff -ruN u-boot-2020.04.old/board/Marvell/netgear_ms2110/kwbimage.cfg u-boot-20 + +# End of Header extension +DATA 0x0 0x0 -diff -ruN u-boot-2020.04.old/board/Marvell/netgear_ms2110/MAINTAINERS u-boot-2020.04/board/Marvell/netgear_ms2110/MAINTAINERS ---- u-boot-2020.04.old/board/Marvell/netgear_ms2110/MAINTAINERS 1970-01-01 01:00:00.000000000 +0100 -+++ u-boot-2020.04/board/Marvell/netgear_ms2110/MAINTAINERS 2020-07-09 00:59:29.000000000 +0200 +--- /dev/null ++++ b/board/Marvell/netgear_ms2110/MAINTAINERS @@ -0,0 +1,6 @@ +NETGEAR_MS2110 BOARD +M: bodhi @@ -216,9 +212,8 @@ diff -ruN u-boot-2020.04.old/board/Marvell/netgear_ms2110/MAINTAINERS u-boot-202 +F: board/Marvell/netgear_ms2110 +F: include/configs/netgear_ms2110.h +F: configs/netgear_ms2110_defconfig -diff -ruN u-boot-2020.04.old/board/Marvell/netgear_ms2110/Makefile u-boot-2020.04/board/Marvell/netgear_ms2110/Makefile ---- u-boot-2020.04.old/board/Marvell/netgear_ms2110/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ u-boot-2020.04/board/Marvell/netgear_ms2110/Makefile 2020-07-09 00:59:29.000000000 +0200 +--- /dev/null ++++ b/board/Marvell/netgear_ms2110/Makefile @@ -0,0 +1,13 @@ +# +# (C) Copyright 2014 bodhi @@ -233,9 +228,8 @@ diff -ruN u-boot-2020.04.old/board/Marvell/netgear_ms2110/Makefile u-boot-2020.0 + +obj-y := netgear_ms2110.o + -diff -ruN u-boot-2020.04.old/board/Marvell/netgear_ms2110/netgear_ms2110.c u-boot-2020.04/board/Marvell/netgear_ms2110/netgear_ms2110.c ---- u-boot-2020.04.old/board/Marvell/netgear_ms2110/netgear_ms2110.c 1970-01-01 01:00:00.000000000 +0100 -+++ u-boot-2020.04/board/Marvell/netgear_ms2110/netgear_ms2110.c 2020-07-09 00:59:29.000000000 +0200 +--- /dev/null ++++ b/board/Marvell/netgear_ms2110/netgear_ms2110.c @@ -0,0 +1,151 @@ +/* + * Copyright (C) 2014-2017 bodhi @@ -388,9 +382,8 @@ diff -ruN u-boot-2020.04.old/board/Marvell/netgear_ms2110/netgear_ms2110.c u-boo +} +#endif /* CONFIG_RESET_PHY_R */ + -diff -ruN u-boot-2020.04.old/board/Marvell/netgear_ms2110/netgear_ms2110.h u-boot-2020.04/board/Marvell/netgear_ms2110/netgear_ms2110.h ---- u-boot-2020.04.old/board/Marvell/netgear_ms2110/netgear_ms2110.h 1970-01-01 01:00:00.000000000 +0100 -+++ u-boot-2020.04/board/Marvell/netgear_ms2110/netgear_ms2110.h 2020-07-09 00:59:29.000000000 +0200 +--- /dev/null ++++ b/board/Marvell/netgear_ms2110/netgear_ms2110.h @@ -0,0 +1,41 @@ +/* + * (C) Copyright 2009 @@ -433,9 +426,8 @@ diff -ruN u-boot-2020.04.old/board/Marvell/netgear_ms2110/netgear_ms2110.h u-boo +#define MV88E1116_RGMII_RXTM_CTRL (1 << 5) + +#endif /* __NETGEAR_MS2110_H */ -diff -ruN a/configs/netgear_ms2110_defconfig b/configs/netgear_ms2110_defconfig ---- a/configs/netgear_ms2110_defconfig 1970-01-01 01:00:00.000000000 +0100 -+++ b/configs/netgear_ms2110_defconfig 2020-07-14 17:59:18.000000000 +0200 +--- /dev/null ++++ b/configs/netgear_ms2110_defconfig @@ -0,0 +1,50 @@ +CONFIG_ARM=y +CONFIG_KIRKWOOD=y @@ -487,9 +479,8 @@ diff -ruN a/configs/netgear_ms2110_defconfig b/configs/netgear_ms2110_defconfig +CONFIG_MVSATA_IDE=y +CONFIG_DM_RTC=y +CONFIG_RTC_MV=y -diff -ruN a/include/configs/netgear_ms2110.h b/include/configs/netgear_ms2110.h ---- a/include/configs/netgear_ms2110.h 1970-01-01 01:00:00.000000000 +0100 -+++ b/include/configs/netgear_ms2110.h 2020-07-14 17:49:15.000000000 +0200 +--- /dev/null ++++ b/include/configs/netgear_ms2110.h @@ -0,0 +1,155 @@ +/* + * (C) Copyright 2014-2017 bodhi diff --git a/package/boot/uboot-kirkwood/patches/200-openwrt-config.patch b/package/boot/uboot-kirkwood/patches/200-openwrt-config.patch index bfd3d3278e..4cf874b368 100644 --- a/package/boot/uboot-kirkwood/patches/200-openwrt-config.patch +++ b/package/boot/uboot-kirkwood/patches/200-openwrt-config.patch @@ -1,6 +1,6 @@ --- a/arch/arm/mach-kirkwood/Kconfig +++ b/arch/arm/mach-kirkwood/Kconfig -@@ -107,4 +107,7 @@ source "board/alliedtelesis/SBx81LIFXCAT +@@ -111,4 +111,7 @@ source "board/alliedtelesis/SBx81LIFXCAT source "board/Marvell/db-88f6281-bp/Kconfig" source "board/checkpoint/l-50/Kconfig" diff --git a/package/boot/uboot-lantiq/patches/0021-MIPS-vrx200-add-NAND-SPL-support.patch b/package/boot/uboot-lantiq/patches/0021-MIPS-vrx200-add-NAND-SPL-support.patch index 8296f2c75e..6d127394df 100644 --- a/package/boot/uboot-lantiq/patches/0021-MIPS-vrx200-add-NAND-SPL-support.patch +++ b/package/boot/uboot-lantiq/patches/0021-MIPS-vrx200-add-NAND-SPL-support.patch @@ -19,7 +19,7 @@ Signed-off-by: Daniel Schwierzeck endif --- a/arch/mips/include/asm/arch-vrx200/config.h +++ b/arch/mips/include/asm/arch-vrx200/config.h -@@ -167,7 +167,7 @@ +@@ -168,7 +168,7 @@ #define CONFIG_SYS_TEXT_BASE 0xB0000000 #endif diff --git a/package/boot/uboot-lantiq/patches/0028-gcc-compat.patch b/package/boot/uboot-lantiq/patches/0028-gcc-compat.patch index 7955429f60..37ffb2a382 100644 --- a/package/boot/uboot-lantiq/patches/0028-gcc-compat.patch +++ b/package/boot/uboot-lantiq/patches/0028-gcc-compat.patch @@ -22,8 +22,6 @@ Signed-off-by: Tom Rini delete mode 100644 include/linux/compiler-gcc4.h create mode 100644 include/linux/compiler-intel.h -diff --git a/include/linux/compiler-gcc.h b/include/linux/compiler-gcc.h -index 9896e54..22ab246 100644 --- a/include/linux/compiler-gcc.h +++ b/include/linux/compiler-gcc.h @@ -5,11 +5,28 @@ @@ -147,20 +145,6 @@ index 9896e54..22ab246 100644 */ -#ifndef __pure -# define __pure __attribute__((pure)) --#endif --#ifndef __aligned --# define __aligned(x) __attribute__((aligned(x))) --#endif --#define __printf(a,b) __attribute__((format(printf,a,b))) --#define noinline __attribute__((noinline)) --#define __attribute_const__ __attribute__((__const__)) --#define __maybe_unused __attribute__((unused)) --#define __always_unused __attribute__((unused)) -- --#define __gcc_header(x) #x --#define _gcc_header(x) __gcc_header(linux/compiler-gcc##x.h) --#define gcc_header(x) _gcc_header(x) --#include gcc_header(__GNUC__) +#define __pure __attribute__((pure)) +#define __aligned(x) __attribute__((aligned(x))) +#define __printf(a, b) __attribute__((format(printf, a, b))) @@ -189,7 +173,9 @@ index 9896e54..22ab246 100644 + +#if GCC_VERSION >= 30400 +#define __must_check __attribute__((warn_unused_result)) -+#endif + #endif +-#ifndef __aligned +-# define __aligned(x) __attribute__((aligned(x))) + +#if GCC_VERSION >= 40000 + @@ -206,7 +192,17 @@ index 9896e54..22ab246 100644 + +#if GCC_VERSION >= 40100 && GCC_VERSION < 40600 +# define __compiletime_object_size(obj) __builtin_object_size(obj, 0) -+#endif + #endif +-#define __printf(a,b) __attribute__((format(printf,a,b))) +-#define noinline __attribute__((noinline)) +-#define __attribute_const__ __attribute__((__const__)) +-#define __maybe_unused __attribute__((unused)) +-#define __always_unused __attribute__((unused)) +- +-#define __gcc_header(x) #x +-#define _gcc_header(x) __gcc_header(linux/compiler-gcc##x.h) +-#define gcc_header(x) _gcc_header(x) +-#include gcc_header(__GNUC__) + +#if GCC_VERSION >= 40300 +/* Mark functions as cold. gcc will assume any path leading to a call @@ -328,9 +324,6 @@ index 9896e54..22ab246 100644 + * code + */ +#define uninitialized_var(x) x = x -diff --git a/include/linux/compiler-gcc3.h b/include/linux/compiler-gcc3.h -deleted file mode 100644 -index 2befe65..0000000 --- a/include/linux/compiler-gcc3.h +++ /dev/null @@ -1,21 +0,0 @@ @@ -355,9 +348,6 @@ index 2befe65..0000000 -#define uninitialized_var(x) x = x - -#define __always_inline inline __attribute__((always_inline)) -diff --git a/include/linux/compiler-gcc4.h b/include/linux/compiler-gcc4.h -deleted file mode 100644 -index 27d11ca..0000000 --- a/include/linux/compiler-gcc4.h +++ /dev/null @@ -1,63 +0,0 @@ @@ -424,9 +414,6 @@ index 27d11ca..0000000 -#define __compiletime_warning(message) __attribute__((warning(message))) -#define __compiletime_error(message) __attribute__((error(message))) -#endif -diff --git a/include/linux/compiler-intel.h b/include/linux/compiler-intel.h -new file mode 100644 -index 0000000..d4c7113 --- /dev/null +++ b/include/linux/compiler-intel.h @@ -0,0 +1,45 @@ @@ -475,8 +462,6 @@ index 0000000..d4c7113 +#define __builtin_bswap16 _bswap16 +#endif + -diff --git a/include/linux/compiler.h b/include/linux/compiler.h -index 5be3dab..020ad16 100644 --- a/include/linux/compiler.h +++ b/include/linux/compiler.h @@ -5,16 +5,24 @@ @@ -505,7 +490,7 @@ index 5be3dab..020ad16 100644 extern void __chk_user_ptr(const volatile void __user *); extern void __chk_io_ptr(const volatile void __iomem *); #else -@@ -27,20 +35,32 @@ extern void __chk_io_ptr(const volatile void __iomem *); +@@ -27,20 +35,32 @@ extern void __chk_io_ptr(const volatile # define __chk_user_ptr(x) (void)0 # define __chk_io_ptr(x) (void)0 # define __builtin_warning(x, y...) (1) @@ -538,7 +523,7 @@ index 5be3dab..020ad16 100644 /* Intel compiler defines __GNUC__. So we will overwrite implementations * coming from above header files here -@@ -49,6 +69,13 @@ extern void __chk_io_ptr(const volatile void __iomem *); +@@ -49,6 +69,13 @@ extern void __chk_io_ptr(const volatile # include #endif @@ -552,7 +537,7 @@ index 5be3dab..020ad16 100644 /* * Generic compiler-dependent macros required for kernel * build go below this comment. Actual compiler/compiler version -@@ -117,7 +144,7 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect); +@@ -117,7 +144,7 @@ void ftrace_likely_update(struct ftrace_ */ #define if(cond, ...) __trace_if( (cond , ## __VA_ARGS__) ) #define __trace_if(cond) \ @@ -561,7 +546,7 @@ index 5be3dab..020ad16 100644 ({ \ int ______r; \ static struct ftrace_branch_data \ -@@ -144,6 +171,10 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect); +@@ -144,6 +171,10 @@ void ftrace_likely_update(struct ftrace_ # define barrier() __memory_barrier() #endif @@ -572,7 +557,7 @@ index 5be3dab..020ad16 100644 /* Unreachable code */ #ifndef unreachable # define unreachable() do { } while (1) -@@ -156,6 +187,135 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect); +@@ -156,6 +187,135 @@ void ftrace_likely_update(struct ftrace_ (typeof(ptr)) (__ptr + (off)); }) #endif @@ -708,7 +693,7 @@ index 5be3dab..020ad16 100644 #endif /* __KERNEL__ */ #endif /* __ASSEMBLY__ */ -@@ -228,7 +388,7 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect); +@@ -228,7 +388,7 @@ void ftrace_likely_update(struct ftrace_ /* * Rather then using noinline to prevent stack consumption, use @@ -717,7 +702,7 @@ index 5be3dab..020ad16 100644 */ #define noinline_for_stack noinline -@@ -270,11 +430,28 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect); +@@ -270,11 +430,28 @@ void ftrace_likely_update(struct ftrace_ # define __section(S) __attribute__ ((__section__(#S))) #endif @@ -746,7 +731,7 @@ index 5be3dab..020ad16 100644 /* Compile time object size, -1 for unknown */ #ifndef __compiletime_object_size # define __compiletime_object_size(obj) -1 -@@ -284,7 +461,48 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect); +@@ -284,8 +461,49 @@ void ftrace_likely_update(struct ftrace_ #endif #ifndef __compiletime_error # define __compiletime_error(message) @@ -760,11 +745,11 @@ index 5be3dab..020ad16 100644 +# define __compiletime_error_fallback(condition) \ + do { ((void)sizeof(char[1 - 2 * condition])); } while (0) +# endif - #endif ++#endif +#ifndef __compiletime_error_fallback +# define __compiletime_error_fallback(condition) do { } while (0) -+#endif -+ + #endif + +#define __compiletime_assert(condition, msg, prefix, suffix) \ + do { \ + bool __cond = !(condition); \ @@ -792,10 +777,11 @@ index 5be3dab..020ad16 100644 +#define compiletime_assert_atomic_type(t) \ + compiletime_assert(__native_word(t), \ + "Need native word sized stores/loads for atomicity.") - ++ /* * Prevent the compiler from merging or refetching accesses. The compiler -@@ -293,11 +511,45 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect); + * is also forbidden from reordering successive instances of ACCESS_ONCE(), +@@ -293,11 +511,45 @@ void ftrace_likely_update(struct ftrace_ * to make the compiler aware of ordering is to put the two invocations of * ACCESS_ONCE() in different C statements. * @@ -847,6 +833,3 @@ index 5be3dab..020ad16 100644 +# define nokprobe_inline inline +#endif #endif /* __LINUX_COMPILER_H */ --- -2.7.4 - diff --git a/package/boot/uboot-mxs/patches/001-add-i2se-duckbill.patch b/package/boot/uboot-mxs/patches/001-add-i2se-duckbill.patch index 50702cb3cb..13673e9682 100644 --- a/package/boot/uboot-mxs/patches/001-add-i2se-duckbill.patch +++ b/package/boot/uboot-mxs/patches/001-add-i2se-duckbill.patch @@ -43,8 +43,6 @@ Signed-off-by: Stefan Wahren create mode 100644 configs/duckbill_defconfig create mode 100644 include/configs/duckbill.h -diff --git a/arch/arm/mach-imx/mxs/Kconfig b/arch/arm/mach-imx/mxs/Kconfig -index b90d7b6e41..e7d8bc6792 100644 --- a/arch/arm/mach-imx/mxs/Kconfig +++ b/arch/arm/mach-imx/mxs/Kconfig @@ -50,6 +50,10 @@ config TARGET_APX4DEVKIT @@ -66,9 +64,6 @@ index b90d7b6e41..e7d8bc6792 100644 source "board/liebherr/xea/Kconfig" source "board/ppcag/bg0900/Kconfig" source "board/schulercontrol/sc_sps_1/Kconfig" -diff --git a/board/i2se/duckbill/Kconfig b/board/i2se/duckbill/Kconfig -new file mode 100644 -index 0000000000..98c1e4689f --- /dev/null +++ b/board/i2se/duckbill/Kconfig @@ -0,0 +1,15 @@ @@ -87,9 +82,6 @@ index 0000000000..98c1e4689f + default "duckbill" + +endif -diff --git a/board/i2se/duckbill/MAINTAINERS b/board/i2se/duckbill/MAINTAINERS -new file mode 100644 -index 0000000000..5496baa330 --- /dev/null +++ b/board/i2se/duckbill/MAINTAINERS @@ -0,0 +1,6 @@ @@ -99,9 +91,6 @@ index 0000000000..5496baa330 +F: board/i2se/duckbill/ +F: include/configs/duckbill.h +F: configs/duckbill_defconfig -diff --git a/board/i2se/duckbill/Makefile b/board/i2se/duckbill/Makefile -new file mode 100644 -index 0000000000..11bac98e4c --- /dev/null +++ b/board/i2se/duckbill/Makefile @@ -0,0 +1,10 @@ @@ -115,9 +104,6 @@ index 0000000000..11bac98e4c +else +obj-y := iomux.o +endif -diff --git a/board/i2se/duckbill/duckbill.c b/board/i2se/duckbill/duckbill.c -new file mode 100644 -index 0000000000..93defc6c28 --- /dev/null +++ b/board/i2se/duckbill/duckbill.c @@ -0,0 +1,189 @@ @@ -310,9 +296,6 @@ index 0000000000..93defc6c28 + + return 0; +} -diff --git a/board/i2se/duckbill/iomux.c b/board/i2se/duckbill/iomux.c -new file mode 100644 -index 0000000000..c6cc211181 --- /dev/null +++ b/board/i2se/duckbill/iomux.c @@ -0,0 +1,157 @@ @@ -473,9 +456,6 @@ index 0000000000..c6cc211181 + else + mxs_iomux_setup_multiple_pads(iomux_setup_v1, ARRAY_SIZE(iomux_setup_v1)); +} -diff --git a/configs/duckbill_defconfig b/configs/duckbill_defconfig -new file mode 100644 -index 0000000000..b2d7fbcf77 --- /dev/null +++ b/configs/duckbill_defconfig @@ -0,0 +1,43 @@ @@ -522,9 +502,6 @@ index 0000000000..b2d7fbcf77 +CONFIG_MII=y +CONFIG_CONS_INDEX=0 +CONFIG_OF_LIBFDT=y -diff --git a/include/configs/duckbill.h b/include/configs/duckbill.h -new file mode 100644 -index 0000000000..565d8c58b7 --- /dev/null +++ b/include/configs/duckbill.h @@ -0,0 +1,172 @@ @@ -700,6 +677,3 @@ index 0000000000..565d8c58b7 +#include + +#endif /* __CONFIGS_DUCKBILL_H__ */ --- -2.17.1 - diff --git a/package/boot/uboot-sifiveu/patches/0002-board-sifive-spl-Initialized-the-PWM-setting-in-the-.patch b/package/boot/uboot-sifiveu/patches/0002-board-sifive-spl-Initialized-the-PWM-setting-in-the-.patch index 27cda75326..7e11d4c18b 100644 --- a/package/boot/uboot-sifiveu/patches/0002-board-sifive-spl-Initialized-the-PWM-setting-in-the-.patch +++ b/package/boot/uboot-sifiveu/patches/0002-board-sifive-spl-Initialized-the-PWM-setting-in-the-.patch @@ -14,8 +14,6 @@ LED's color will be set to yellow. 3 files changed, 60 insertions(+) create mode 100644 board/sifive/unmatched/pwm.c -diff --git a/board/sifive/unmatched/Makefile b/board/sifive/unmatched/Makefile -index 1345330089..5df01982e9 100644 --- a/board/sifive/unmatched/Makefile +++ b/board/sifive/unmatched/Makefile @@ -9,3 +9,4 @@ obj-y += spl.o @@ -23,9 +21,6 @@ index 1345330089..5df01982e9 100644 obj-y += unmatched.o endif +obj-y += pwm.o -diff --git a/board/sifive/unmatched/pwm.c b/board/sifive/unmatched/pwm.c -new file mode 100644 -index 0000000000..e1cc02310a --- /dev/null +++ b/board/sifive/unmatched/pwm.c @@ -0,0 +1,57 @@ @@ -86,8 +81,6 @@ index 0000000000..e1cc02310a + writel(PWM_CMP_ENABLE_VAL, (void *)&pwm1->cmp3); + writel(PWM_CFG_INIT, (void *)&pwm1->cfg); +} -diff --git a/board/sifive/unmatched/spl.c b/board/sifive/unmatched/spl.c -index 7c0beedc08..f3a661a81e 100644 --- a/board/sifive/unmatched/spl.c +++ b/board/sifive/unmatched/spl.c @@ -90,6 +90,8 @@ int spl_board_init_f(void) @@ -99,6 +92,3 @@ index 7c0beedc08..f3a661a81e 100644 ret = spl_gemgxl_init(); if (ret) { debug("Gigabit ethernet PHY (VSC8541) init failed: %d\n", ret); --- -2.27.0 - diff --git a/package/boot/uboot-sifiveu/patches/0003-board-sifive-Set-LED-s-color-to-purple-in-the-U-boot.patch b/package/boot/uboot-sifiveu/patches/0003-board-sifive-Set-LED-s-color-to-purple-in-the-U-boot.patch index 9820d2e2f9..a98271acbc 100644 --- a/package/boot/uboot-sifiveu/patches/0003-board-sifive-Set-LED-s-color-to-purple-in-the-U-boot.patch +++ b/package/boot/uboot-sifiveu/patches/0003-board-sifive-Set-LED-s-color-to-purple-in-the-U-boot.patch @@ -14,8 +14,6 @@ stage. configs/sifive_unmatched_defconfig | 1 + 3 files changed, 14 insertions(+) -diff --git a/board/sifive/unmatched/pwm.c b/board/sifive/unmatched/pwm.c -index e1cc02310a..bd67672c22 100644 --- a/board/sifive/unmatched/pwm.c +++ b/board/sifive/unmatched/pwm.c @@ -36,6 +36,7 @@ void pwm_device_init(void) @@ -37,8 +35,6 @@ index e1cc02310a..bd67672c22 100644 + writel(PWM_CMP_ENABLE_VAL, (void *)&pwm0->cmp3); +#endif } -diff --git a/board/sifive/unmatched/unmatched.c b/board/sifive/unmatched/unmatched.c -index 6295deeae2..30c082d001 100644 --- a/board/sifive/unmatched/unmatched.c +++ b/board/sifive/unmatched/unmatched.c @@ -22,6 +22,12 @@ void *board_fdt_blob_setup(int *err) @@ -54,15 +50,10 @@ index 6295deeae2..30c082d001 100644 int board_init(void) { /* enable all cache ways */ -diff --git a/configs/sifive_unmatched_defconfig b/configs/sifive_unmatched_defconfig -index d400ed0b23..0758f8e90f 100644 --- a/configs/sifive_unmatched_defconfig +++ b/configs/sifive_unmatched_defconfig -@@ -51,3 +51,4 @@ CONFIG_DM_SCSI=y +@@ -62,3 +62,4 @@ CONFIG_DM_SCSI=y CONFIG_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_PCI=y +CONFIG_BOARD_EARLY_INIT_F=y --- -2.27.0 - diff --git a/package/boot/uboot-sifiveu/patches/0009-riscv-Fix-build-against-binutils.patch b/package/boot/uboot-sifiveu/patches/0009-riscv-Fix-build-against-binutils.patch index 87dbf984ec..f7c6a62291 100644 --- a/package/boot/uboot-sifiveu/patches/0009-riscv-Fix-build-against-binutils.patch +++ b/package/boot/uboot-sifiveu/patches/0009-riscv-Fix-build-against-binutils.patch @@ -26,8 +26,6 @@ Date: Mon Oct 3 18:07:54 2022 +0200 Tested-by: Christian Stewart Reviewed-by: Rick Chen -diff --git a/arch/riscv/Makefile b/arch/riscv/Makefile -index 0b80eb8d86..53d1194ffb 100644 --- a/arch/riscv/Makefile +++ b/arch/riscv/Makefile @@ -24,7 +24,16 @@ ifeq ($(CONFIG_CMODEL_MEDANY),y) diff --git a/package/boot/uboot-sifiveu/patches/100-mkimage-check-environment-for-dtc-binary-location.patch b/package/boot/uboot-sifiveu/patches/100-mkimage-check-environment-for-dtc-binary-location.patch index 482aa1a369..789172f21b 100644 --- a/package/boot/uboot-sifiveu/patches/100-mkimage-check-environment-for-dtc-binary-location.patch +++ b/package/boot/uboot-sifiveu/patches/100-mkimage-check-environment-for-dtc-binary-location.patch @@ -17,7 +17,7 @@ Cc: Simon Glass --- a/tools/fit_image.c +++ b/tools/fit_image.c -@@ -726,9 +726,14 @@ static int fit_handle_file(struct image_ +@@ -729,9 +729,14 @@ static int fit_handle_file(struct image_ } *cmd = '\0'; } else if (params->datafile) { diff --git a/package/boot/uboot-sifiveu/patches/130-fix-mkimage-host-build.patch b/package/boot/uboot-sifiveu/patches/130-fix-mkimage-host-build.patch index cd65c1321f..8b110a880f 100644 --- a/package/boot/uboot-sifiveu/patches/130-fix-mkimage-host-build.patch +++ b/package/boot/uboot-sifiveu/patches/130-fix-mkimage-host-build.patch @@ -1,6 +1,6 @@ --- a/tools/image-host.c +++ b/tools/image-host.c -@@ -1125,6 +1125,7 @@ static int fit_config_add_verification_d +@@ -1122,6 +1122,7 @@ static int fit_config_add_verification_d * 2) get public key (X509_get_pubkey) * 3) provide der format (d2i_RSAPublicKey) */ @@ -8,7 +8,7 @@ static int read_pub_key(const char *keydir, const void *name, unsigned char **pubkey, int *pubkey_len) { -@@ -1178,6 +1179,13 @@ err_cert: +@@ -1175,6 +1176,13 @@ err_cert: fclose(f); return ret; } diff --git a/package/boot/uboot-zynq/patches/010-fix_dtc_compilation_on_host_gcc10.patch b/package/boot/uboot-zynq/patches/010-fix_dtc_compilation_on_host_gcc10.patch index a4080e4ea9..6abb151608 100644 --- a/package/boot/uboot-zynq/patches/010-fix_dtc_compilation_on_host_gcc10.patch +++ b/package/boot/uboot-zynq/patches/010-fix_dtc_compilation_on_host_gcc10.patch @@ -34,8 +34,6 @@ Signed-off-by: Rob Herring scripts/dtc/dtc-lexer.l | 1 - 1 file changed, 1 deletion(-) -diff --git a/scripts/dtc/dtc-lexer.l b/scripts/dtc/dtc-lexer.l -index 5c6c3fd557d7f..b3b7270300de5 100644 --- a/scripts/dtc/dtc-lexer.l +++ b/scripts/dtc/dtc-lexer.l @@ -38,7 +38,6 @@ LINECOMMENT "//".*\n diff --git a/package/kernel/cryptodev-linux/patches/0001-cryptodev_verbosity-fix-build-for-linux-6.4.patch b/package/kernel/cryptodev-linux/patches/0001-cryptodev_verbosity-fix-build-for-linux-6.4.patch index 390faec9c2..2d958f904c 100644 --- a/package/kernel/cryptodev-linux/patches/0001-cryptodev_verbosity-fix-build-for-linux-6.4.patch +++ b/package/kernel/cryptodev-linux/patches/0001-cryptodev_verbosity-fix-build-for-linux-6.4.patch @@ -13,11 +13,9 @@ Signed-off-by: Gaurav Jain ioctl.c | 6 ++++++ 1 file changed, 6 insertions(+) -diff --git a/ioctl.c b/ioctl.c -index 8f241b86..4262bbd5 100644 --- a/ioctl.c +++ b/ioctl.c -@@ -1246,7 +1246,9 @@ static struct ctl_table verbosity_ctl_root[] = { +@@ -1246,7 +1246,9 @@ static struct ctl_table verbosity_ctl_ro { .procname = "ioctl", .mode = 0555, diff --git a/package/kernel/cryptodev-linux/patches/0001-zero-copy-fix-build-for-linux-6.4.patch b/package/kernel/cryptodev-linux/patches/0001-zero-copy-fix-build-for-linux-6.4.patch index 0b8147d56e..4d2dd13ae1 100644 --- a/package/kernel/cryptodev-linux/patches/0001-zero-copy-fix-build-for-linux-6.4.patch +++ b/package/kernel/cryptodev-linux/patches/0001-zero-copy-fix-build-for-linux-6.4.patch @@ -12,11 +12,9 @@ Signed-off-by: Gaurav Jain zc.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) -diff --git a/zc.c b/zc.c -index fdf7da17..6637945a 100644 --- a/zc.c +++ b/zc.c -@@ -80,10 +80,14 @@ int __get_userbuf(uint8_t __user *addr, uint32_t len, int write, +@@ -80,10 +80,14 @@ int __get_userbuf(uint8_t __user *addr, ret = get_user_pages_remote(task, mm, (unsigned long)addr, pgcount, write ? FOLL_WRITE : 0, pg, NULL, NULL); diff --git a/package/kernel/cryptodev-linux/patches/0003-move-recent-linux-version-ifdefs-from-v6.4-to-v6.5.patch b/package/kernel/cryptodev-linux/patches/0003-move-recent-linux-version-ifdefs-from-v6.4-to-v6.5.patch index baf5b805cd..576269c100 100644 --- a/package/kernel/cryptodev-linux/patches/0003-move-recent-linux-version-ifdefs-from-v6.4-to-v6.5.patch +++ b/package/kernel/cryptodev-linux/patches/0003-move-recent-linux-version-ifdefs-from-v6.4-to-v6.5.patch @@ -23,11 +23,9 @@ Signed-off-by: Joan Bruguera Micó zc.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) -diff --git a/ioctl.c b/ioctl.c -index 4262bbd..e3eefe1 100644 --- a/ioctl.c +++ b/ioctl.c -@@ -1246,7 +1246,7 @@ static struct ctl_table verbosity_ctl_root[] = { +@@ -1246,7 +1246,7 @@ static struct ctl_table verbosity_ctl_ro { .procname = "ioctl", .mode = 0555, @@ -45,11 +43,9 @@ index 4262bbd..e3eefe1 100644 verbosity_sysctl_header = register_sysctl_table(verbosity_ctl_root); #else verbosity_sysctl_header = register_sysctl(verbosity_ctl_root->procname, verbosity_ctl_dir); -diff --git a/zc.c b/zc.c -index 6637945..00e00c1 100644 --- a/zc.c +++ b/zc.c -@@ -80,7 +80,7 @@ int __get_userbuf(uint8_t __user *addr, uint32_t len, int write, +@@ -80,7 +80,7 @@ int __get_userbuf(uint8_t __user *addr, ret = get_user_pages_remote(task, mm, (unsigned long)addr, pgcount, write ? FOLL_WRITE : 0, pg, NULL, NULL); diff --git a/package/kernel/cryptodev-linux/patches/0004-fix-build-for-linux-6.7-rc1.patch b/package/kernel/cryptodev-linux/patches/0004-fix-build-for-linux-6.7-rc1.patch index 3ef9e28ce7..4fded72faa 100644 --- a/package/kernel/cryptodev-linux/patches/0004-fix-build-for-linux-6.7-rc1.patch +++ b/package/kernel/cryptodev-linux/patches/0004-fix-build-for-linux-6.7-rc1.patch @@ -17,11 +17,9 @@ Signed-off-by: Joan Bruguera Micó cryptlib.c | 4 ++++ 1 file changed, 4 insertions(+) -diff --git a/cryptlib.c b/cryptlib.c -index 4d739e5..0e59d4c 100644 --- a/cryptlib.c +++ b/cryptlib.c -@@ -381,7 +381,11 @@ int cryptodev_hash_init(struct hash_data *hdata, const char *alg_name, +@@ -381,7 +381,11 @@ int cryptodev_hash_init(struct hash_data } hdata->digestsize = crypto_ahash_digestsize(hdata->async.s); diff --git a/package/kernel/lantiq/ltq-ptm/patches/100-fix-compilation-warning-debugfs.patch b/package/kernel/lantiq/ltq-ptm/patches/100-fix-compilation-warning-debugfs.patch index 283982fdef..7317d51163 100644 --- a/package/kernel/lantiq/ltq-ptm/patches/100-fix-compilation-warning-debugfs.patch +++ b/package/kernel/lantiq/ltq-ptm/patches/100-fix-compilation-warning-debugfs.patch @@ -12,7 +12,7 @@ #if defined(ENABLE_FW_PROC) && ENABLE_FW_PROC static int proc_read_genconf(char *, char **, off_t, int, int *, void *); #endif -@@ -889,6 +891,7 @@ static INLINE void proc_file_delete(void +@@ -896,6 +898,7 @@ static INLINE void proc_file_delete(void remove_proc_entry("driver/ifx_ptm", NULL); } @@ -20,7 +20,7 @@ static int proc_read_version(char *buf, char **start, off_t offset, int count, int *eof, void *data) { int len = 0; -@@ -963,8 +966,9 @@ static int proc_write_wanmib(struct file +@@ -970,8 +973,9 @@ static int proc_write_wanmib(struct file return count; } diff --git a/package/kernel/lantiq/ltq-ptm/patches/101-fix-more-compilation-warning-debugfs.patch b/package/kernel/lantiq/ltq-ptm/patches/101-fix-more-compilation-warning-debugfs.patch index 55551ad91d..538d569cbe 100644 --- a/package/kernel/lantiq/ltq-ptm/patches/101-fix-more-compilation-warning-debugfs.patch +++ b/package/kernel/lantiq/ltq-ptm/patches/101-fix-more-compilation-warning-debugfs.patch @@ -19,7 +19,7 @@ static INLINE int strincmp(const char *, const char *, int); #endif static INLINE int ifx_ptm_version(char *); -@@ -1159,8 +1159,6 @@ static int proc_write_dbg(struct file *f +@@ -1166,8 +1166,6 @@ static int proc_write_dbg(struct file *f return count; } @@ -28,7 +28,7 @@ static INLINE int stricmp(const char *p1, const char *p2) { int c1, c2; -@@ -1178,7 +1176,6 @@ static INLINE int stricmp(const char *p1 +@@ -1185,7 +1183,6 @@ static INLINE int stricmp(const char *p1 return *p1 - *p2; } diff --git a/package/kernel/lantiq/ltq-tapi/patches/600-fix-compilation-warning-switch-fallthrough.patch b/package/kernel/lantiq/ltq-tapi/patches/600-fix-compilation-warning-switch-fallthrough.patch index bb27ff355a..b3e4eb93b8 100644 --- a/package/kernel/lantiq/ltq-tapi/patches/600-fix-compilation-warning-switch-fallthrough.patch +++ b/package/kernel/lantiq/ltq-tapi/patches/600-fix-compilation-warning-switch-fallthrough.patch @@ -1,6 +1,6 @@ --- a/src/drv_tapi_cid.c +++ b/src/drv_tapi_cid.c -@@ -1424,6 +1424,8 @@ static IFX_int32_t cid_lookup_transparent(TAPI_CIDTX_DATA_t *pTxData, +@@ -1424,6 +1424,8 @@ static IFX_int32_t cid_lookup_transparen cidfsk_set_tx_time (pTxData, &pConfData->TapiCidFskConf); @@ -9,7 +9,7 @@ case IFX_TAPI_CID_GEN_TYPE_DTMF: memcpy (pTxData->cidBuf[IFX_TAPI_CID_GEN_TYPE_DTMF].pBuf, pMessage[0].transparent.data, pMessage[0].transparent.len); -@@ -1497,6 +1499,7 @@ static IFX_int32_t cid_prepare_data(TAPI_CHANNEL *pChannel, +@@ -1497,6 +1499,7 @@ static IFX_int32_t cid_prepare_data(TAPI break; case IFX_TAPI_CID_STD_KPN_DTMF: /*lint -fallthrough*/ @@ -17,7 +17,7 @@ case IFX_TAPI_CID_STD_KPN_DTMF_FSK: if (IFX_TAPI_CID_HM_ONHOOK == pTxData->txHookMode) { -@@ -1506,6 +1509,7 @@ static IFX_int32_t cid_prepare_data(TAPI_CHANNEL *pChannel, +@@ -1506,6 +1509,7 @@ static IFX_int32_t cid_prepare_data(TAPI } /* KPN CID Type 2 (off-hook) always using FSK */ /*lint -fallthrough*/ @@ -25,7 +25,7 @@ default: pTxData->cidGenType = IFX_TAPI_CID_GEN_TYPE_FSK; break; -@@ -1532,6 +1536,7 @@ static IFX_int32_t cid_prepare_data(TAPI_CHANNEL *pChannel, +@@ -1532,6 +1536,7 @@ static IFX_int32_t cid_prepare_data(TAPI break; /*lint -fallthrough*/ @@ -33,7 +33,7 @@ case IFX_TAPI_CID_GEN_TYPE_FSK: if (IFX_TAPI_CID_STD_NTT == pConfData->nStandard) -@@ -2036,6 +2041,7 @@ static FSM_STATUS_t cid_fsm_alert_exec(TAPI_CHANNEL *pChannel) +@@ -2036,6 +2041,7 @@ static FSM_STATUS_t cid_fsm_alert_exec(T } pTxData->nCidSubState++; /*lint -fallthrough*/ @@ -41,7 +41,7 @@ case 1: if (pConfData->OSIoffhook && pConfData->nSAStone) { -@@ -2052,6 +2058,7 @@ static FSM_STATUS_t cid_fsm_alert_exec(TAPI_CHANNEL *pChannel) +@@ -2052,6 +2058,7 @@ static FSM_STATUS_t cid_fsm_alert_exec(T } pTxData->nCidSubState++; /*lint -fallthrough*/ @@ -49,7 +49,7 @@ case 2: if (pConfData->nSAStone) { -@@ -2069,6 +2076,7 @@ static FSM_STATUS_t cid_fsm_alert_exec(TAPI_CHANNEL *pChannel) +@@ -2069,6 +2076,7 @@ static FSM_STATUS_t cid_fsm_alert_exec(T } pTxData->nCidSubState++; /*lint -fallthrough*/ @@ -57,7 +57,7 @@ default: /* Play CAS tone on data channel, use unprotected function, protection is done around cid_fsm_alert_exec */ -@@ -3458,6 +3466,7 @@ IFX_int32_t TAPI_Phone_CID_Stop_Tx(TAPI_CHANNEL *pChannel) +@@ -3458,6 +3466,7 @@ IFX_int32_t TAPI_Phone_CID_Stop_Tx(TAPI_ } /* deliberately fall through */ /*lint -fallthrough*/ @@ -65,7 +65,7 @@ case TAPI_CID_STATE_ACK: /* deactivate the DTMF override - last two params are ignored */ if (ptr_chk(pDrvCtx->SIG.DTMFD_Override, "")) -@@ -3469,6 +3478,7 @@ IFX_int32_t TAPI_Phone_CID_Stop_Tx(TAPI_CHANNEL *pChannel) +@@ -3469,6 +3478,7 @@ IFX_int32_t TAPI_Phone_CID_Stop_Tx(TAPI_ } /* deliberately fall through */ /*lint -fallthrough*/ @@ -73,7 +73,7 @@ case TAPI_CID_STATE_SENDING: TAPI_Stop_Timer (pTxData->CidTimerID); break; -@@ -4066,6 +4076,7 @@ IFX_int32_t TAPI_Phone_Get_CidRxData (TAPI_CHANNEL *pChannel, +@@ -4066,6 +4076,7 @@ IFX_int32_t TAPI_Phone_Get_CidRxData (TA /* If the fifo is not empty take the data from the fifo first. */ /* deliberately fallthrough to default case */ /*lint -fallthrough*/ @@ -83,7 +83,7 @@ When there is no data in the fifo TAPI_statusErr is returned. */ --- a/src/drv_tapi_dial.c +++ b/src/drv_tapi_dial.c -@@ -319,6 +319,8 @@ static IFX_void_t ifx_tapi_dial_OnTimer(Timer_ID Timer, IFX_ulong_t nArg) +@@ -319,6 +319,8 @@ static IFX_void_t ifx_tapi_dial_OnTimer( /* NOTE: the "break" statement has been intentionally omitted */ /*lint -fallthrough */ @@ -94,7 +94,7 @@ certain low pulse (not noise). The next state is the overlap with --- a/src/drv_tapi_event.c +++ b/src/drv_tapi_event.c -@@ -1545,6 +1545,7 @@ IFX_int32_t IFX_TAPI_Event_Dispatch_ProcessCtx(IFX_TAPI_EXT_EVENT_PARAM_t* +@@ -1545,6 +1545,7 @@ IFX_int32_t IFX_TAPI_Event_Dispatch_Proc /**\todo put in device fifo */ pEvent->ch = IFX_TAPI_DEVICE_CH_NUMBER; /*lint -fallthrough */ @@ -104,7 +104,7 @@ break; --- a/src/drv_tapi_ioctl.c +++ b/src/drv_tapi_ioctl.c -@@ -1552,6 +1553,7 @@ static IFX_int32_t TAPI_IoctlCh (IFX_TAPI_DRV_CTX_t* pDrvCtx, +@@ -1552,6 +1552,7 @@ static IFX_int32_t TAPI_IoctlCh (IFX_TA /* Dial Services */ ret = TAPI_statusNotSupported; /*lint -fallthrough*/ diff --git a/package/kernel/lantiq/ltq-tapi/patches/601-fix-compilation-warning-ret-not-handled.patch b/package/kernel/lantiq/ltq-tapi/patches/601-fix-compilation-warning-ret-not-handled.patch index b97ced30f8..3dd6eae25b 100644 --- a/package/kernel/lantiq/ltq-tapi/patches/601-fix-compilation-warning-ret-not-handled.patch +++ b/package/kernel/lantiq/ltq-tapi/patches/601-fix-compilation-warning-ret-not-handled.patch @@ -1,6 +1,6 @@ --- a/src/drv_tapi_ioctl.c +++ b/src/drv_tapi_ioctl.c -@@ -702,7 +702,8 @@ static IFX_int32_t TAPI_IoctlDev (IFX_TAPI_DRV_CTX_t* pDrvCtx, +@@ -702,7 +702,8 @@ static IFX_int32_t TAPI_IoctlDev (IFX_TA if (ret == TAPI_statusOk || ret == 1) { diff --git a/package/kernel/lantiq/ltq-vdsl-vr11/patches/211-fix-compilation-warning-missing-fallthrough.patch b/package/kernel/lantiq/ltq-vdsl-vr11/patches/211-fix-compilation-warning-missing-fallthrough.patch index 96e1ffef97..698141b8c7 100644 --- a/package/kernel/lantiq/ltq-vdsl-vr11/patches/211-fix-compilation-warning-missing-fallthrough.patch +++ b/package/kernel/lantiq/ltq-vdsl-vr11/patches/211-fix-compilation-warning-missing-fallthrough.patch @@ -38,7 +38,7 @@ #ifdef INCLUDE_DSL_CPE_PM_SHOWTIME_COUNTERS --- a/src/common/drv_dsl_cpe_api.c +++ b/src/common/drv_dsl_cpe_api.c -@@ -2652,6 +2652,8 @@ DSL_Error_t DSL_DRV_AutobootControlSet( +@@ -2653,6 +2653,8 @@ DSL_Error_t DSL_DRV_AutobootControlSet( /* no break */ /* ... pass to restart*/ diff --git a/package/kernel/lantiq/ltq-vdsl-vr9/patches/300-fix-compilation-warning-fallthrough.patch b/package/kernel/lantiq/ltq-vdsl-vr9/patches/300-fix-compilation-warning-fallthrough.patch index b0e106a5f5..5ce50a4184 100644 --- a/package/kernel/lantiq/ltq-vdsl-vr9/patches/300-fix-compilation-warning-fallthrough.patch +++ b/package/kernel/lantiq/ltq-vdsl-vr9/patches/300-fix-compilation-warning-fallthrough.patch @@ -33,4 +33,4 @@ + fallthrough; case DSL_PM_RESET_HISTORY_SHOWTIME: #ifdef INCLUDE_DSL_CPE_PM_SHOWTIME_COUNTERS - nErrCode = DSL_DRV_PM_HistoryDelete(pContext, EpData.pHistShowtime ); \ No newline at end of file + nErrCode = DSL_DRV_PM_HistoryDelete(pContext, EpData.pHistShowtime ); diff --git a/package/kernel/lantiq/ltq-vdsl-vr9/patches/301-fix-compilation-warning-simple-fix.patch b/package/kernel/lantiq/ltq-vdsl-vr9/patches/301-fix-compilation-warning-simple-fix.patch index 99f1908f0f..3a5e4acd74 100644 --- a/package/kernel/lantiq/ltq-vdsl-vr9/patches/301-fix-compilation-warning-simple-fix.patch +++ b/package/kernel/lantiq/ltq-vdsl-vr9/patches/301-fix-compilation-warning-simple-fix.patch @@ -1,6 +1,6 @@ --- a/src/common/drv_dsl_cpe_os_linux.c +++ b/src/common/drv_dsl_cpe_os_linux.c -@@ -54,7 +54,7 @@ static int DSL_DRV_Release(DSL_DRV_inode_t * ino, DSL_DRV_file_t * fil); +@@ -54,7 +54,7 @@ static int DSL_DRV_Release(DSL_DRV_inode static DSL_uint_t DSL_DRV_Poll(DSL_DRV_file_t *pFile, DSL_DRV_Poll_Table_t *wait); @@ -9,7 +9,7 @@ static void DSL_DRV_NlSendMsg(DSL_char_t* pMsg); #endif -@@ -368,10 +368,10 @@ int DSL_DRV_debug_printf(DSL_Context_t const *pContext, DSL_char_t const *fmt, . +@@ -368,10 +368,10 @@ int DSL_DRV_debug_printf(DSL_Context_t c { DSL_int_t nRet = 0; #ifndef _lint @@ -22,7 +22,7 @@ DSL_char_t debugString[DSL_DBG_MAX_DEBUG_PRINT_CHAR + 1] = {0}; va_list ap; /* points to each unnamed arg in turn */ -@@ -406,6 +406,8 @@ int DSL_DRV_debug_printf(DSL_Context_t const *pContext, DSL_char_t const *fmt, . +@@ -406,6 +406,8 @@ int DSL_DRV_debug_printf(DSL_Context_t c #endif /* DSL_DEBUG_DISABLE */ return nRet; #else @@ -51,7 +51,7 @@ --- a/src/device/drv_dsl_cpe_msg_vrx.c +++ b/src/device/drv_dsl_cpe_msg_vrx.c -@@ -2456,32 +2456,32 @@ DSL_Error_t DSL_DRV_VRX_SendMsgSnrPerGroupesGet( +@@ -2456,32 +2456,32 @@ DSL_Error_t DSL_DRV_VRX_SendMsgSnrPerGro #endif /* defined(INCLUDE_DSL_G997_PER_TONE) || defined(INCLUDE_DSL_DELT)*/ #ifdef INCLUDE_DSL_DELT @@ -78,9 +78,6 @@ - memcpy(pDst,pSrc,valueSize); - } - } -- -- return DSL_SUCCESS; --} +// static DSL_Error_t DSL_DRV_VRX_SpreadArray( +// DSL_void_t* pArray, +// DSL_uint16_t valueSize, @@ -104,7 +101,9 @@ +// memcpy(pDst,pSrc,valueSize); +// } +// } -+ + +- return DSL_SUCCESS; +-} +// return DSL_SUCCESS; +// } @@ -112,7 +111,7 @@ This function requests a set of up to 60 entries of the DELT data. --- a/src/device/drv_dsl_cpe_device_vrx.c +++ b/src/device/drv_dsl_cpe_device_vrx.c -@@ -3356,7 +3356,9 @@ static DSL_Error_t DSL_DRV_VRX_TestParametersFeUpdate( +@@ -3356,7 +3356,9 @@ static DSL_Error_t DSL_DRV_VRX_TestParam DSL_Error_t nErrCode = DSL_SUCCESS; DSL_uint16_t i = 0; DSL_uint16_t nDataLen = 0; @@ -122,7 +121,7 @@ DSL_DEBUG( DSL_DBG_MSG, (pContext, SYS_DBG_MSG"DSL[%02d]: IN - DSL_DRV_VRX_TestParametersFeUpdate" -@@ -8312,6 +8314,7 @@ DSL_Error_t DSL_DRV_DEV_AutobootHandleTraining( +@@ -8312,6 +8314,7 @@ DSL_Error_t DSL_DRV_DEV_AutobootHandleTr (pContext, SYS_DBG_MSG"DSL[%02d]: ORDERLY_SHUTDOWN state reached" DSL_DRV_CRLF, DSL_DEV_NUM(pContext))); /* do not use break here, continue handling */ diff --git a/package/kernel/lantiq/ltq-vectoring/patches/300-fix-compilation-warning-stack-limit.patch b/package/kernel/lantiq/ltq-vectoring/patches/300-fix-compilation-warning-stack-limit.patch index 4d18f8e3b7..434d7d830d 100644 --- a/package/kernel/lantiq/ltq-vectoring/patches/300-fix-compilation-warning-stack-limit.patch +++ b/package/kernel/lantiq/ltq-vectoring/patches/300-fix-compilation-warning-stack-limit.patch @@ -1,6 +1,6 @@ --- a/src/vectoring/ifxmips_vectoring.c +++ b/src/vectoring/ifxmips_vectoring.c -@@ -298,7 +298,7 @@ static int proc_write_dbg(struct file *file, const char __user *buf, size_t coun +@@ -298,7 +298,7 @@ static int proc_write_dbg(struct file *f DBG_ENABLE_MASK_ALL }; @@ -9,7 +9,7 @@ char *p; int len, rlen; -@@ -306,6 +306,10 @@ static int proc_write_dbg(struct file *file, const char __user *buf, size_t coun +@@ -306,6 +306,10 @@ static int proc_write_dbg(struct file *f int f_enable = 0; int i; @@ -20,7 +20,7 @@ len = count < sizeof(str) ? count : sizeof(str) - 1; rlen = len - copy_from_user(str, buf, len); while ( rlen && str[rlen - 1] <= ' ' ) -@@ -365,6 +369,8 @@ static int proc_write_dbg(struct file *file, const char __user *buf, size_t coun +@@ -365,6 +369,8 @@ static int proc_write_dbg(struct file *f } } @@ -39,7 +39,7 @@ #include "ifxmips_vectoring_stub.h" -@@ -46,13 +47,17 @@ static int proc_write_vectoring(struct file *file, const char __user *buf, size_ +@@ -46,13 +47,17 @@ static int proc_write_vectoring(struct f { char *p; int len; @@ -58,7 +58,7 @@ len = sizeof(local_buf) < count ? sizeof(local_buf) - 1 : count; len = len - copy_from_user(local_buf, buf, len); local_buf[len] = 0; -@@ -81,6 +86,8 @@ static int proc_write_vectoring(struct file *file, const char __user *buf, size_ +@@ -81,6 +86,8 @@ static int proc_write_vectoring(struct f else printk("echo send > /proc/driver/vectoring_test\n"); diff --git a/package/kernel/qca-ssdk/patches/103-hsl_phy-add-support-for-AQR114C-B0-PHY.patch b/package/kernel/qca-ssdk/patches/103-hsl_phy-add-support-for-AQR114C-B0-PHY.patch index d93cf0978c..4422b67cf7 100644 --- a/package/kernel/qca-ssdk/patches/103-hsl_phy-add-support-for-AQR114C-B0-PHY.patch +++ b/package/kernel/qca-ssdk/patches/103-hsl_phy-add-support-for-AQR114C-B0-PHY.patch @@ -23,7 +23,7 @@ Signed-off-by: Paweł Owoc #define PHY_805XV2 0x004DD082 --- a/src/hsl/phy/hsl_phy.c +++ b/src/hsl/phy/hsl_phy.c -@@ -271,6 +271,7 @@ phy_type_t hsl_phytype_get_by_phyid(a_uint32_t dev_id, a_uint32_t phy_id) +@@ -271,6 +271,7 @@ phy_type_t hsl_phytype_get_by_phyid(a_ui case AQUANTIA_PHY_113C_B0: case AQUANTIA_PHY_113C_B1: case AQUANTIA_PHY_112C: diff --git a/package/network/config/ltq-adsl-app/patches/001-stupid_breakage_fix.patch b/package/network/config/ltq-adsl-app/patches/001-stupid_breakage_fix.patch index a868678d1e..ed04b94ba2 100644 --- a/package/network/config/ltq-adsl-app/patches/001-stupid_breakage_fix.patch +++ b/package/network/config/ltq-adsl-app/patches/001-stupid_breakage_fix.patch @@ -1,6 +1,6 @@ ---- a/src/dsl_cpe_cli_access.c 2016-05-27 12:34:43.612485449 -0700 -+++ b/src/dsl_cpe_cli_access.c 2016-05-27 12:45:37.491727862 -0700 -@@ -1142,7 +1142,7 @@ +--- a/src/dsl_cpe_cli_access.c ++++ b/src/dsl_cpe_cli_access.c +@@ -1142,7 +1142,7 @@ DSL_CLI_LOCAL DSL_int_t DSL_CPE_CLI_Auto if ((ret < 0) && (autobootCtrl.accessCtl.nReturn < DSL_SUCCESS)) { @@ -9,7 +9,7 @@ } else { -@@ -1213,7 +1213,7 @@ +@@ -1213,7 +1213,7 @@ DSL_CLI_LOCAL DSL_int_t DSL_CPE_CLI_Auto if ((ret < 0) && (pData.accessCtl.nReturn < DSL_SUCCESS)) { @@ -18,7 +18,7 @@ } else { -@@ -1290,7 +1290,7 @@ +@@ -1290,7 +1290,7 @@ DSL_CLI_LOCAL DSL_int_t DSL_CPE_CLI_Line if ((ret < 0) && (pData.accessCtl.nReturn < DSL_SUCCESS)) { @@ -27,7 +27,7 @@ } else { -@@ -1355,7 +1355,7 @@ +@@ -1355,7 +1355,7 @@ DSL_CLI_LOCAL DSL_int_t DSL_CPE_CLI_Reso pCtx, &resourceUsageStatisticsData); if (ret < 0) { @@ -36,7 +36,7 @@ } else { -@@ -3084,7 +3084,7 @@ +@@ -3084,7 +3084,7 @@ DSL_CLI_LOCAL DSL_int_t DSL_CPE_CLI_G997 if ((ret < 0) && (pData->accessCtl.nReturn < DSL_SUCCESS)) { @@ -45,7 +45,7 @@ } else { -@@ -4654,7 +4654,7 @@ +@@ -4654,7 +4654,7 @@ DSL_CLI_LOCAL DSL_int_t DSL_CPE_CLI_G997 if ((ret < 0) && (pData.accessCtl.nReturn < DSL_SUCCESS)) { @@ -54,7 +54,7 @@ } else { -@@ -5714,7 +5714,7 @@ +@@ -5714,7 +5714,7 @@ DSL_CLI_LOCAL DSL_int_t DSL_CPE_CLI_G997 if ((ret < 0) && (pData.accessCtl.nReturn < DSL_SUCCESS)) { diff --git a/package/network/ipv6/thc-ipv6/patches/101-remove-march-native.patch b/package/network/ipv6/thc-ipv6/patches/101-remove-march-native.patch index da6c7caa7c..b397f402b1 100644 --- a/package/network/ipv6/thc-ipv6/patches/101-remove-march-native.patch +++ b/package/network/ipv6/thc-ipv6/patches/101-remove-march-native.patch @@ -1,6 +1,6 @@ --- a/Makefile +++ b/Makefile -@@ -7,7 +7,7 @@ HAVE_SSL=yes +@@ -7,7 +7,7 @@ #CC=gcc #CFLAGS=-g diff --git a/package/system/apk/patches/0001-openwrt-move-layer-db-to-temp-folder.patch b/package/system/apk/patches/0001-openwrt-move-layer-db-to-temp-folder.patch index eac8a965e5..092ab1d726 100644 --- a/package/system/apk/patches/0001-openwrt-move-layer-db-to-temp-folder.patch +++ b/package/system/apk/patches/0001-openwrt-move-layer-db-to-temp-folder.patch @@ -10,12 +10,12 @@ Signed-off-by: Paul Spooren --- a/src/database.c +++ b/src/database.c -@@ -1604,7 +1604,7 @@ const char *apk_db_layer_name(int layer) +@@ -1643,7 +1643,7 @@ const char *apk_db_layer_name(int layer) { switch (layer) { case APK_DB_LAYER_ROOT: return "lib/apk/db"; - case APK_DB_LAYER_UVOL: return "lib/apk/db-uvol"; + case APK_DB_LAYER_UVOL: return "tmp/run/uvol/.meta/apk"; default: - assert("invalid layer"); + assert(!"invalid layer"); return 0; diff --git a/package/system/iucode-tool/patches/001-iucode_tool-add-missing-limits.h-for-USE_CPUID_DEVIC.patch b/package/system/iucode-tool/patches/001-iucode_tool-add-missing-limits.h-for-USE_CPUID_DEVIC.patch index ef9e5ab2f8..fe25f8aee7 100644 --- a/package/system/iucode-tool/patches/001-iucode_tool-add-missing-limits.h-for-USE_CPUID_DEVIC.patch +++ b/package/system/iucode-tool/patches/001-iucode_tool-add-missing-limits.h-for-USE_CPUID_DEVIC.patch @@ -12,8 +12,6 @@ Signed-off-by: Christian Marangi iucode_tool.c | 1 + 1 file changed, 1 insertion(+) -diff --git a/iucode_tool.c b/iucode_tool.c -index 4bba5db..0246035 100644 --- a/iucode_tool.c +++ b/iucode_tool.c @@ -19,6 +19,7 @@ @@ -24,6 +22,3 @@ index 4bba5db..0246035 100644 #include #include #include --- -2.37.2 - diff --git a/package/system/refpolicy/patches/100-no-docs.patch b/package/system/refpolicy/patches/100-no-docs.patch index 21767951a4..21342731b5 100644 --- a/package/system/refpolicy/patches/100-no-docs.patch +++ b/package/system/refpolicy/patches/100-no-docs.patch @@ -1,7 +1,5 @@ -Index: refpolicy-2.20200229/Makefile -=================================================================== ---- refpolicy-2.20200229.orig/Makefile -+++ refpolicy-2.20200229/Makefile +--- a/Makefile ++++ b/Makefile @@ -648,6 +648,6 @@ ifneq ($(generated_fc),) endif endif