Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Synchronize official source code #113

Merged
merged 5 commits into from
Jun 25, 2024
Merged

Synchronize official source code #113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3001d3c
mpc85xx: fix WS-AP3710i boot
blocktrron Jun 9, 2024
d8415fa
mpc85xx: fix Enterasys WS-AP3710i eth mac-address
blocktrron Jun 14, 2024
e367ba9
mpc85xx: fix label-mac-address for Enterasys WS-AP3710i
blocktrron Jun 15, 2024
50148a4
mt76: update to Git HEAD (2024-03-18)
nbd168 May 16, 2024
cc0527b
build: add explicit timezone in CycloneDX SBOM
RomanIOPSYS Jun 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions package/kernel/mt76/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ PKG_LICENSE_FILES:=

PKG_SOURCE_URL:=https://github.com/openwrt/mt76
PKG_SOURCE_PROTO:=git
PKG_SOURCE_DATE:=2024-02-03
PKG_SOURCE_VERSION:=6124ea9135ed512671933f5520c46842906c78bc
PKG_MIRROR_HASH:=acc326d7b15c9c72b494ed601300be329553f896e65c7f045e6a09327304c34a
PKG_SOURCE_DATE:=2024-03-18
PKG_SOURCE_VERSION:=2135e201e7a9339e018d4e2d4a33c73266e674d7
PKG_MIRROR_HASH:=810f636c60c86e6a426c676c3bf7aaea2f711feb31f4a66889d485112b612745

PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
PKG_USE_NINJA:=0
Expand Down
28 changes: 0 additions & 28 deletions package/kernel/mt76/patches/0001-wifi-mt76-fix-the-issue-of-missing-txpwr-settings-fr.patch
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion scripts/package-metadata.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -653,7 +653,7 @@ sub dump_cyclonedxsbom_json {
serialNumber => "urn:uuid:$uuid",
version => 1,
metadata => {
timestamp => gmtime->datetime,
timestamp => gmtime->datetime . 'Z',
},
"components" => [@components],
};
Expand Down
4 changes: 4 additions & 0 deletions target/linux/mpc85xx/base-files/etc/board.d/02_network
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@ aerohive,hiveap-330|\
enterasys,ws-ap3715i)
ucidef_set_interfaces_lan_wan "eth1" "eth0"
;;
enterasys,ws-ap3710i)
ucidef_set_interface_lan "eth0"
ucidef_set_label_macaddr "$(mtd_get_mac_ascii cfg1 ethaddr)"
;;
hpe,msm460)
ucidef_set_interface_lan "eth0"
;;
Expand Down
3 changes: 3 additions & 0 deletions target/linux/mpc85xx/base-files/lib/preinit/10_fix_eth_mac.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@

preinit_set_mac_address() {
case $(board_name) in
enterasys,ws-ap3710i)
ip link set dev eth0 address $(mtd_get_mac_ascii cfg1 ethaddr)
;;
enterasys,ws-ap3715i|\
extreme-networks,ws-ap3825i)
ip link set dev eth0 address $(mtd_get_mac_ascii cfg1 ethaddr)
Expand Down
1 change: 0 additions & 1 deletion target/linux/mpc85xx/files/arch/powerpc/boot/dts/ws-ap3710i.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
led-failsafe = &led_power_red;
led-running = &led_power_green;
led-upgrade = &led_power_red;
label-mac-device = &enet0;
};

chosen {
Expand Down
4 changes: 2 additions & 2 deletions target/linux/mpc85xx/image/p1020.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@ define Device/enterasys_ws-ap3710i
DEVICE_MODEL := WS-AP3710i
BLOCKSIZE := 128k
KERNEL_NAME := simpleImage.ws-ap3710i
KERNEL_ENTRY := 0x1000000
KERNEL_LOADADDR := 0x1000000
KERNEL_ENTRY := 0x1500000
KERNEL_LOADADDR := 0x1500000
KERNEL = kernel-bin | uImage none
KERNEL_INITRAMFS := kernel-bin | uImage none
IMAGES := sysupgrade.bin
Expand Down
12 changes: 7 additions & 5 deletions target/linux/mpc85xx/patches-5.15/106-powerpc-85xx-ws-ap3710i-support.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,15 @@

--- a/arch/powerpc/boot/wrapper
+++ b/arch/powerpc/boot/wrapper
@@ -326,7 +326,8 @@ adder875-redboot)
platformo="$object/fixed-head.o $object/redboot-8xx.o"
@@ -331,6 +331,11 @@ simpleboot-tl-wdr4900-v1)
link_address='0x1000000'
binary=y
;;
-simpleboot-tl-wdr4900-v1)
+simpleboot-tl-wdr4900-v1|\
+simpleboot-ws-ap3710i)
+ platformo="$object/fixed-head.o $object/simpleboot.o"
+ link_address='0x1500000'
+ binary=y
+ ;;
simpleboot-*)
platformo="$object/fixed-head.o $object/simpleboot.o"
link_address='0x1000000'
binary=y
8 changes: 4 additions & 4 deletions target/linux/mpc85xx/patches-5.15/107-powerpc-85xx-add-ws-ap3825i-support.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,12 @@ WS-AP3825i AP.

--- a/arch/powerpc/boot/wrapper
+++ b/arch/powerpc/boot/wrapper
@@ -327,7 +327,8 @@ adder875-redboot)
@@ -326,7 +326,8 @@ adder875-redboot)
platformo="$object/fixed-head.o $object/redboot-8xx.o"
binary=y
;;
simpleboot-tl-wdr4900-v1|\
-simpleboot-ws-ap3710i)
+simpleboot-ws-ap3710i|\
-simpleboot-tl-wdr4900-v1)
+simpleboot-tl-wdr4900-v1|\
+simpleboot-ws-ap3825i)
platformo="$object/fixed-head.o $object/simpleboot.o"
link_address='0x1000000'
Expand Down
4 changes: 2 additions & 2 deletions target/linux/mpc85xx/patches-5.15/109-powerpc-85xx-add-ws-ap3715i-support.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,10 @@
image-$(CONFIG_MVME7100) += dtbImage.mvme7100
--- a/arch/powerpc/boot/wrapper
+++ b/arch/powerpc/boot/wrapper
@@ -328,6 +328,7 @@ adder875-redboot)
@@ -327,6 +327,7 @@ adder875-redboot)
binary=y
;;
simpleboot-tl-wdr4900-v1|\
simpleboot-ws-ap3710i|\
+simpleboot-ws-ap3715i|\
simpleboot-ws-ap3825i)
platformo="$object/fixed-head.o $object/simpleboot.o"
Expand Down
2 changes: 1 addition & 1 deletion target/linux/mpc85xx/patches-5.15/110-powerpc-85xx-br200-wp-support.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,5 +53,5 @@
;;
+simpleboot-br200-wp|\
simpleboot-tl-wdr4900-v1|\
simpleboot-ws-ap3710i|\
simpleboot-ws-ap3715i|\
simpleboot-ws-ap3825i)
2 changes: 1 addition & 1 deletion target/linux/mpc85xx/patches-5.15/111-powerpc-85xx-hpe-msm-support.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- a/arch/powerpc/platforms/85xx/Kconfig
+++ b/arch/powerpc/platforms/85xx/Kconfig
@@ -114,6 +114,17 @@ config FIREBOX_T10
@@ -123,6 +123,17 @@ config FIREBOX_T10
This board is a VPN Gateway-Router with a
Freescale P1010 SoC.

Expand Down
Loading