fish/immortalwrt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge Mainline

Browse Source
This commit is contained in:
AmadeusGhost 2021-05-01 11:50:45 +08:00
commit 1e18c2be1d
13 changed files with 144 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
package/kernel/linux/modules/netdevices.mk
View File

@ -1224,28 +1224,60 @@ endef
$(eval $(call KernelPackage,mlx5-core))
define KernelPackage/qlcnic
SUBMENU:=$(NETWORK_DEVICES_MENU)
DEPENDS:=@PCI_SUPPORT
TITLE:=QLogic QLE8240 and QLE8242 device support
KCONFIG:=CONFIG_QLCNIC
FILES:=$(LINUX_DIR)/drivers/net/ethernet/qlogic/qlcnic/qlcnic.ko
AUTOLOAD:=$(call AutoProbe,qlcnic)
endef
define KernelPackage/qlcnic/description
This driver supports QLogic QLE8240 and QLE8242 Converged Ethernet
devices.
endef
$(eval $(call KernelPackage,qlcnic))
define KernelPackage/sfc
SUBMENU:=$(NETWORK_DEVICES_MENU)
TITLE:=Solarflare SFC9000/SFC9100-family 10Gbps NIC support
DEPENDS:=@PCI_SUPPORT +kmod-mdio +kmod-i2c-core +kmod-i2c-algo-bit +kmod-hwmon-core +kmod-ptp +kmod-lib-crc32c
# add PCI_IOV
TITLE:=Solarflare SFC9000/SFC9100/EF100-family support
DEPENDS:=@PCI_SUPPORT +kmod-mdio +kmod-lib-crc32c +kmod-ptp +kmod-hwmon-core
KCONFIG:= \
CONFIG_NET_VENDOR_SOLARFLARE=y \
CONFIG_SFC=y \
CONFIG_SFC_MTD=y \
CONFIG_SFC_MCDI_MON=y \
CONFIG_SFC_SRIOV=n \
CONFIG_SFC_MCDI_LOGGING=n \
CONFIG_SFC \
CONFIG_SFC_MTD=y \
CONFIG_SFC_MCDI_MON=y \
CONFIG_SFC_MCDI_LOGGING=y \
CONFIG_SFC_SRIOV=y
FILES:=$(LINUX_DIR)/drivers/net/ethernet/sfc/sfc.ko
AUTOLOAD:=$(call AutoProbe, sfc)
AUTOLOAD:=$(call AutoProbe,sfc)
endef
define KernelPackage/sfc/description
Solarflare SFC9000/SFC9100-family 10Gbps NIC support
Solarflare SFC9000/SFC9100/EF100-family support
Solarflare EF100 support requires at least kernel version 5.9
endef
$(eval $(call KernelPackage,sfc))
define KernelPackage/sfc-falcon
SUBMENU:=$(NETWORK_DEVICES_MENU)
TITLE:=Solarflare SFC4000 support
DEPENDS:=@PCI_SUPPORT +kmod-mdio +kmod-lib-crc32c +kmod-i2c-algo-bit
KCONFIG:= \
CONFIG_SFC_FALCON \
CONFIG_SFC_FALCON_MTD=y
FILES:=$(LINUX_DIR)/drivers/net/ethernet/sfc/falcon/sfc-falcon.ko
AUTOLOAD:=$(call AutoProbe,sfc-falcon)
endef
define KernelPackage/sfc-falcon/description
Solarflare SFC4000 support
endef
$(eval $(call KernelPackage,sfc-falcon))
define KernelPackage/sfp
SUBMENU:=$(NETWORK_DEVICES_MENU)

1
target/linux/generic/config-5.10
View File

@ -2662,6 +2662,7 @@ CONFIG_IPV6_NDISC_NODETYPE=y
# CONFIG_IPV6_TUNNEL is not set
# CONFIG_IPV6_VTI is not set
# CONFIG_IPVLAN is not set
# CONFIG_IPVTAP is not set
# CONFIG_IPW2100 is not set
# CONFIG_IPW2100_DEBUG is not set
CONFIG_IPW2100_MONITOR=y

1
target/linux/generic/config-5.4
View File

@ -2452,6 +2452,7 @@ CONFIG_IPV6_NDISC_NODETYPE=y
# CONFIG_IPV6_TUNNEL is not set
# CONFIG_IPV6_VTI is not set
# CONFIG_IPVLAN is not set
# CONFIG_IPVTAP is not set
# CONFIG_IPW2100 is not set
# CONFIG_IPW2100_DEBUG is not set
CONFIG_IPW2100_MONITOR=y

4
target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-c526a.dtsi
View File

@ -85,12 +85,12 @@
compatible = "gpio-leds";
led_sys: blue {
label = "c526a:blue:sys";
label = "blue:sys";
gpios = <&tlmm 36 GPIO_ACTIVE_LOW>;
};
led_boot: red {
label = "c526a:red:sys";
label = "red:sys";
gpios = <&tlmm 40 GPIO_ACTIVE_LOW>;
panic-indicator;
};

10
toolchain/binutils/Config.in
View File

@ -14,9 +14,13 @@ choice
bool "Binutils 2.34"
select BINUTILS_VERSION_2_34
config BINUTILS_USE_VERSION_2_35_1
bool "Binutils 2.35.1"
select BINUTILS_VERSION_2_35_1
config BINUTILS_USE_VERSION_2_35_2
bool "Binutils 2.35.2"
select BINUTILS_VERSION_2_35_2
config BINUTILS_USE_VERSION_2_36_1
bool "Binutils 2.36.1"
select BINUTILS_VERSION_2_36_1
endchoice
config EXTRA_BINUTILS_CONFIG_OPTIONS

8
toolchain/binutils/Config.version
View File

@ -5,11 +5,15 @@ config BINUTILS_VERSION_2_34
default y if !TOOLCHAINOPTS
bool
config BINUTILS_VERSION_2_35_1
config BINUTILS_VERSION_2_35_2
bool
config BINUTILS_VERSION_2_36_1
bool
config BINUTILS_VERSION
string
default "2.32" if BINUTILS_VERSION_2_32
default "2.34" if BINUTILS_VERSION_2_34
default "2.35.1" if BINUTILS_VERSION_2_35_1
default "2.35.2" if BINUTILS_VERSION_2_35_2
default "2.36.1" if BINUTILS_VERSION_2_36_1

8
toolchain/binutils/Makefile
View File

@ -23,8 +23,12 @@ ifeq ($(PKG_VERSION),2.34)
PKG_HASH:=f00b0e8803dc9bab1e2165bd568528135be734df3fabf8d0161828cd56028952
endif
ifeq ($(PKG_VERSION),2.35.1)
PKG_HASH:=3ced91db9bf01182b7e420eab68039f2083aed0a214c0424e257eae3ddee8607
ifeq ($(PKG_VERSION),2.35.2)
PKG_HASH:=dcd5b0416e7b0a9b24bed76cd8c6c132526805761863150a26d016415b8bdc7b
endif
ifeq ($(PKG_VERSION),2.36.1)
PKG_HASH:=e81d9edf373f193af428a0f256674aea62a9d74dfe93f65192d4eae030b0f3b0
endif
HOST_BUILD_PARALLEL:=1

0
toolchain/binutils/patches/2.35.1/300-001_ld_makefile_patch.patch → toolchain/binutils/patches/2.35.2/300-001_ld_makefile_patch.patch
View File

0
toolchain/binutils/patches/2.35.1/400-mips_no_dynamic_linking_sym.patch → toolchain/binutils/patches/2.35.2/400-mips_no_dynamic_linking_sym.patch
View File

0
toolchain/binutils/patches/2.35.1/500-Change-default-emulation-for-mips64-linux.patch → toolchain/binutils/patches/2.35.2/500-Change-default-emulation-for-mips64-linux.patch
View File

22
toolchain/binutils/patches/2.36.1/300-001_ld_makefile_patch.patch Normal file
View File

@ -0,0 +1,22 @@
--- a/ld/Makefile.am
+++ b/ld/Makefile.am
@@ -50,7 +50,7 @@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS)
# We put the scripts in the directory $(scriptdir)/ldscripts.
# We can't put the scripts in $(datadir) because the SEARCH_DIR
# directives need to be different for native and cross linkers.
-scriptdir = $(tooldir)/lib
+scriptdir = $(libdir)
EMUL = @EMUL@
EMULATION_OFILES = @EMULATION_OFILES@
--- a/ld/Makefile.in
+++ b/ld/Makefile.in
@@ -561,7 +561,7 @@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS)
# We put the scripts in the directory $(scriptdir)/ldscripts.
# We can't put the scripts in $(datadir) because the SEARCH_DIR
# directives need to be different for native and cross linkers.
-scriptdir = $(tooldir)/lib
+scriptdir = $(libdir)
BASEDIR = $(srcdir)/..
BFDDIR = $(BASEDIR)/bfd
INCDIR = $(BASEDIR)/include

18
toolchain/binutils/patches/2.36.1/400-mips_no_dynamic_linking_sym.patch Normal file
View File

@ -0,0 +1,18 @@
--- a/bfd/elfxx-mips.c
+++ b/bfd/elfxx-mips.c
@@ -8053,6 +8053,7 @@ _bfd_mips_elf_create_dynamic_sections (b
name = SGI_COMPAT (abfd) ? "_DYNAMIC_LINK" : "_DYNAMIC_LINKING";
bh = NULL;
+ if (0) {
if (!(_bfd_generic_link_add_one_symbol
(info, abfd, name, BSF_GLOBAL, bfd_abs_section_ptr, 0,
NULL, FALSE, get_elf_backend_data (abfd)->collect, &bh)))
@@ -8065,6 +8066,7 @@ _bfd_mips_elf_create_dynamic_sections (b
if (! bfd_elf_link_record_dynamic_symbol (info, h))
return FALSE;
+ }
if (! mips_elf_hash_table (info)->use_rld_obj_head)
{

38
toolchain/binutils/patches/2.36.1/500-Change-default-emulation-for-mips64-linux.patch Normal file
View File

@ -0,0 +1,38 @@
--- a/bfd/config.bfd
+++ b/bfd/config.bfd
@@ -896,12 +896,12 @@ case "${targ}" in
targ_selvecs="mips_elf32_le_vec mips_elf64_be_vec mips_elf64_le_vec mips_ecoff_be_vec mips_ecoff_le_vec"
;;
mips64*el-*-linux*)
- targ_defvec=mips_elf32_ntrad_le_vec
- targ_selvecs="mips_elf32_ntrad_be_vec mips_elf32_trad_le_vec mips_elf32_trad_be_vec mips_elf64_trad_le_vec mips_elf64_trad_be_vec"
+ targ_defvec=mips_elf64_trad_le_vec
+ targ_selvecs="mips_elf32_ntrad_le_vec mips_elf32_ntrad_be_vec mips_elf32_trad_le_vec mips_elf32_trad_be_vec mips_elf64_trad_be_vec"
;;
mips64*-*-linux*)
- targ_defvec=mips_elf32_ntrad_be_vec
- targ_selvecs="mips_elf32_ntrad_le_vec mips_elf32_trad_be_vec mips_elf32_trad_le_vec mips_elf64_trad_be_vec mips_elf64_trad_le_vec"
+ targ_defvec=mips_elf64_trad_be_vec
+ targ_selvecs="mips_elf32_ntrad_be_vec mips_elf32_ntrad_le_vec mips_elf32_trad_be_vec mips_elf32_trad_le_vec mips_elf64_trad_le_vec"
;;
mips*el-*-linux*)
targ_defvec=mips_elf32_trad_le_vec
--- a/ld/configure.tgt
+++ b/ld/configure.tgt
@@ -531,12 +531,12 @@ mips*-*-vxworks*) targ_emul=elf32ebmipvx
;;
mips*-*-windiss) targ_emul=elf32mipswindiss
;;
-mips64*el-*-linux-*) targ_emul=elf32ltsmipn32
- targ_extra_emuls="elf32btsmipn32 elf32ltsmip elf32btsmip elf64ltsmip elf64btsmip"
+mips64*el-*-linux-*) targ_emul=elf64ltsmip
+ targ_extra_emuls="elf32btsmipn32 elf32ltsmipn32 elf32ltsmip elf32btsmip elf64btsmip"
targ_extra_libpath=$targ_extra_emuls
;;
-mips64*-*-linux-*) targ_emul=elf32btsmipn32
- targ_extra_emuls="elf32ltsmipn32 elf32btsmip elf32ltsmip elf64btsmip elf64ltsmip"
+mips64*-*-linux-*) targ_emul=elf64btsmip
+ targ_extra_emuls="elf32btsmipn32 elf32ltsmipn32 elf32btsmip elf32ltsmip elf64ltsmip"
targ_extra_libpath=$targ_extra_emuls
;;
mips*el-*-linux-*) targ_emul=elf32ltsmip