kernel: bump to 4.14.193, 4.19.138, 5.4.59 (#5350)
kernel: bump to 4.14.193, 4.19.138, 5.4.59 (#5350)
431fb8c mac80211: add AQL improvements
6bdd4c9 mac80211: add missing backports for building with 4.14 kernels
0106820 mac80211: add missing return code checks in AQL improvements
e7f7101 mac80211: rework encapsulation offload support
[package]
base-files: add function for generating random MAC
dnsmasq: abort dhcp_check on interface state
boot: sync upstream source code
ath10k-ct-firmware/mt76/sch_cake: update to latest git HEAD
[script]
download: add China Mirror Station
[target]
Sync: arc770, ath79, bcm63xx, kirkwood, lantiq, layerscape,
mediatek, mvebu, octeon, oxnas, pistachio, uml
Sync most of the target patches.
Run-compiled-on: ipq40xx (4.19 & 5.4), ramips
2020-08-26 11:31:50 +08:00
|
|
|
--- a/arch/mips/include/asm/octeon/cvmx-bootinfo.h
|
|
|
|
|
+++ b/arch/mips/include/asm/octeon/cvmx-bootinfo.h
|
|
|
|
|
@@ -297,7 +297,7 @@ enum cvmx_board_types_enum {
|
|
|
|
|
CVMX_BOARD_TYPE_UBNT_E100 = 20002,
|
|
|
|
|
CVMX_BOARD_TYPE_UBNT_E200 = 20003,
|
|
|
|
|
CVMX_BOARD_TYPE_UBNT_E220 = 20005,
|
|
|
|
|
- CVMX_BOARD_TYPE_CUST_DSR1000N = 20006,
|
|
|
|
|
+ CVMX_BOARD_TYPE_ITUS_SHIELD = 20006,
|
|
|
|
|
CVMX_BOARD_TYPE_KONTRON_S1901 = 21901,
|
|
|
|
|
CVMX_BOARD_TYPE_CUST_PRIVATE_MAX = 30000,
|
|
|
|
|
|
|
|
|
|
@@ -400,7 +400,7 @@ static inline const char *cvmx_board_typ
|
|
|
|
|
ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_UBNT_E100)
|
|
|
|
|
ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_UBNT_E200)
|
|
|
|
|
ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_UBNT_E220)
|
|
|
|
|
- ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_CUST_DSR1000N)
|
|
|
|
|
+ ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_ITUS_SHIELD)
|
|
|
|
|
ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_KONTRON_S1901)
|
|
|
|
|
ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_CUST_PRIVATE_MAX)
|
|
|
|
|
}
|
|
|
|
|
--- a/arch/mips/cavium-octeon/octeon-platform.c
|
|
|
|
|
+++ b/arch/mips/cavium-octeon/octeon-platform.c
|
2022-01-28 01:53:03 +08:00
|
|
|
@@ -773,7 +773,7 @@ int __init octeon_prune_device_tree(void
|
kernel: bump to 4.14.193, 4.19.138, 5.4.59 (#5350)
kernel: bump to 4.14.193, 4.19.138, 5.4.59 (#5350)
431fb8c mac80211: add AQL improvements
6bdd4c9 mac80211: add missing backports for building with 4.14 kernels
0106820 mac80211: add missing return code checks in AQL improvements
e7f7101 mac80211: rework encapsulation offload support
[package]
base-files: add function for generating random MAC
dnsmasq: abort dhcp_check on interface state
boot: sync upstream source code
ath10k-ct-firmware/mt76/sch_cake: update to latest git HEAD
[script]
download: add China Mirror Station
[target]
Sync: arc770, ath79, bcm63xx, kirkwood, lantiq, layerscape,
mediatek, mvebu, octeon, oxnas, pistachio, uml
Sync most of the target patches.
Run-compiled-on: ipq40xx (4.19 & 5.4), ramips
2020-08-26 11:31:50 +08:00
|
|
|
if (fdt_check_header(initial_boot_params))
|
|
|
|
|
panic("Corrupt Device Tree.");
|
|
|
|
|
|
|
|
|
|
- WARN(octeon_bootinfo->board_type == CVMX_BOARD_TYPE_CUST_DSR1000N,
|
|
|
|
|
+ WARN(octeon_bootinfo->board_type == CVMX_BOARD_TYPE_ITUS_SHIELD,
|
|
|
|
|
"Built-in DTB booting is deprecated on %s. Please switch to use appended DTB.",
|
|
|
|
|
cvmx_board_type_to_string(octeon_bootinfo->board_type));
|
|
|
|
|
|
|
|
|
|
--- a/arch/mips/pci/pci-octeon.c
|
|
|
|
|
+++ b/arch/mips/pci/pci-octeon.c
|
|
|
|
|
@@ -211,8 +211,6 @@ const char *octeon_get_pci_interrupts(vo
|
|
|
|
|
return "AAABAAAAAAAAAAAAAAAAAAAAAAAAAAAA";
|
|
|
|
|
case CVMX_BOARD_TYPE_BBGW_REF:
|
|
|
|
|
return "AABCD";
|
|
|
|
|
- case CVMX_BOARD_TYPE_CUST_DSR1000N:
|
|
|
|
|
- return "CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC";
|
|
|
|
|
case CVMX_BOARD_TYPE_THUNDER:
|
|
|
|
|
case CVMX_BOARD_TYPE_EBH3000:
|
|
|
|
|
default:
|
