mediatek: fix eap111 uboot-env and image meta-data

Signed-off-by: John Crispin <john@phrozen.org>
This commit is contained in:
John Crispin
2023-10-02 12:19:32 +02:00
parent 05bab57b1d
commit 11bc8c143e
3 changed files with 31 additions and 10 deletions

View File

@@ -21,7 +21,7 @@ jobs:
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
target: [ 'cig_wf186w', 'cig_wf188n-ca', 'cig_wf188n-ca-ath12', 'cig_wf188n-us', 'cig_wf196-us', 'cig_wf196-ca', 'cig_wf196-ca-ath12', 'cig_wf610d', 'cig_wf660a', 'cig_wf808', 'cybertan_eww622-a1', 'cybertan_eww631-a1', 'cybertan_eww631-b1', 'edgecore_eap101', 'edgecore_eap101-ath12', 'edgecore_eap102', 'edgecore_eap102-ath12', 'edgecore_eap104', 'edgecore_eap104-ath12', 'liteon_wpx8324', 'edgecore_ecs4100-12ph', 'edgecore_ecw5211', 'edgecore_ecw5410', 'edgecore_oap100', 'edgecore_oap101', 'edgecore_oap101-6e', 'edgecore_oap101e', 'edgecore_oap101e-6e', 'hfcl_ion4','hfcl_ion4xi_wp', 'hfcl_ion4xe', 'hfcl_ion4xi', 'hfcl_ion4x', 'hfcl_ion4x_2', 'hfcl_ion4xi_w', 'hfcl_ion4xi_HMR', 'hfcl_ion4x_w', 'indio_um-305ac', 'indio_um-305ax', 'indio_um-325ac', 'indio_um-510ac-v3', 'indio_um-550ac', 'indio_um-310ax-v1', 'indio_um-510axp-v1', 'indio_um-510axm-v1', 'udaya_a5-id2', 'wallys_dr40x9', 'wallys_dr6018', 'wallys_dr6018_v4', 'x64_vm', 'yuncore_ax840', 'yuncore_fap640', 'yuncore_fap650', 'yuncore_fap655' ] target: [ 'cig_wf186w', 'cig_wf188n-ca', 'cig_wf188n-ca-ath12', 'cig_wf188n-us', 'cig_wf196-us', 'cig_wf196-ca', 'cig_wf196-ca-ath12', 'cig_wf660a', 'cybertan_eww622-a1', 'cybertan_eww631-a1', 'cybertan_eww631-b1', 'edgecore_eap101', 'edgecore_eap101-ath12', 'edgecore_eap102', 'edgecore_eap102-ath12', 'edgecore_eap104', 'edgecore_eap104-ath12', 'edgecore_eap111', 'edgecore_ecw5211', 'edgecore_oap100', 'edgecore_oap101', 'edgecore_oap101-6e', 'edgecore_oap101e', 'edgecore_oap101e-6e', 'hfcl_ion4','hfcl_ion4xi_wp', 'hfcl_ion4xe', 'hfcl_ion4xi', 'hfcl_ion4x', 'hfcl_ion4x_2', 'hfcl_ion4xi_w', 'hfcl_ion4xi_HMR', 'hfcl_ion4x_w', 'indio_um-305ac', 'indio_um-305ax', 'indio_um-325ac', 'indio_um-510ac-v3', 'indio_um-550ac', 'indio_um-310ax-v1', 'indio_um-510axp-v1', 'indio_um-510axm-v1', 'udaya_a5-id2', 'wallys_dr40x9', 'wallys_dr6018', 'wallys_dr6018_v4', 'x64_vm', 'yuncore_ax840', 'yuncore_fap640', 'yuncore_fap650', 'yuncore_fap655' ]
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3

View File

@@ -1,10 +1,11 @@
From cd67118233e5912d99dc5ba5c4cae62e622572dd Mon Sep 17 00:00:00 2001 From aa7fc7b7a6efca7bf026648e6f645507d1a16408 Mon Sep 17 00:00:00 2001
From: John Crispin <john@phrozen.org> From: John Crispin <john@phrozen.org>
Date: Tue, 5 Sep 2023 08:58:23 +0200 Date: Tue, 5 Sep 2023 08:58:23 +0200
Subject: [PATCH] mediatek: add edgecore eap111 support Subject: [PATCH] mediatek: add edgecore eap111 support
Signed-off-by: John Crispin <john@phrozen.org> Signed-off-by: John Crispin <john@phrozen.org>
--- ---
.../uboot-envtools/files/mediatek_filogic | 1 +
.../mediatek/dts/mt7981a-edgecore-eap111.dts | 189 +++ .../mediatek/dts/mt7981a-edgecore-eap111.dts | 189 +++
.../mediatek/files/drivers/net/phy/en8801sc.c | 1152 +++++++++++++++++ .../mediatek/files/drivers/net/phy/en8801sc.c | 1152 +++++++++++++++++
.../mediatek/files/drivers/net/phy/en8801sc.h | 255 ++++ .../mediatek/files/drivers/net/phy/en8801sc.h | 255 ++++
@@ -13,12 +14,24 @@ Signed-off-by: John Crispin <john@phrozen.org>
target/linux/mediatek/filogic/config-5.15 | 1 + target/linux/mediatek/filogic/config-5.15 | 1 +
target/linux/mediatek/image/filogic.mk | 16 + target/linux/mediatek/image/filogic.mk | 16 +
.../mediatek/patches-5.15/999-en8801sc.patch | 28 + .../mediatek/patches-5.15/999-en8801sc.patch | 28 +
8 files changed, 1648 insertions(+) 9 files changed, 1649 insertions(+)
create mode 100644 target/linux/mediatek/dts/mt7981a-edgecore-eap111.dts create mode 100644 target/linux/mediatek/dts/mt7981a-edgecore-eap111.dts
create mode 100644 target/linux/mediatek/files/drivers/net/phy/en8801sc.c create mode 100644 target/linux/mediatek/files/drivers/net/phy/en8801sc.c
create mode 100644 target/linux/mediatek/files/drivers/net/phy/en8801sc.h create mode 100644 target/linux/mediatek/files/drivers/net/phy/en8801sc.h
create mode 100644 target/linux/mediatek/patches-5.15/999-en8801sc.patch create mode 100644 target/linux/mediatek/patches-5.15/999-en8801sc.patch
diff --git a/package/boot/uboot-envtools/files/mediatek_filogic b/package/boot/uboot-envtools/files/mediatek_filogic
index f13beed526..1e596f3063 100644
--- a/package/boot/uboot-envtools/files/mediatek_filogic
+++ b/package/boot/uboot-envtools/files/mediatek_filogic
@@ -44,6 +44,7 @@ mercusys,mr90x-v1)
local envdev=/dev/mtd$(find_mtd_index "u-boot-env")
ubootenv_add_uci_config "$envdev" "0x0" "0x20000" "0x20000" "1"
;;
+edgecore,eap111|\
netgear,wax220)
ubootenv_add_uci_config "/dev/mtd1" "0x0" "0x20000" "0x20000"
;;
diff --git a/target/linux/mediatek/dts/mt7981a-edgecore-eap111.dts b/target/linux/mediatek/dts/mt7981a-edgecore-eap111.dts diff --git a/target/linux/mediatek/dts/mt7981a-edgecore-eap111.dts b/target/linux/mediatek/dts/mt7981a-edgecore-eap111.dts
new file mode 100644 new file mode 100644
index 0000000000..e22c099b34 index 0000000000..e22c099b34
@@ -1634,7 +1647,7 @@ index 0000000000..0a077c34ab
+ +
+#endif /* End of __EN8801SC_H */ +#endif /* End of __EN8801SC_H */
diff --git a/target/linux/mediatek/filogic/base-files/etc/board.d/01_leds b/target/linux/mediatek/filogic/base-files/etc/board.d/01_leds diff --git a/target/linux/mediatek/filogic/base-files/etc/board.d/01_leds b/target/linux/mediatek/filogic/base-files/etc/board.d/01_leds
index c81bd2cd97..049779ed6c 100644 index ea126bc46f..c2744661a8 100644
--- a/target/linux/mediatek/filogic/base-files/etc/board.d/01_leds --- a/target/linux/mediatek/filogic/base-files/etc/board.d/01_leds
+++ b/target/linux/mediatek/filogic/base-files/etc/board.d/01_leds +++ b/target/linux/mediatek/filogic/base-files/etc/board.d/01_leds
@@ -9,6 +9,10 @@ case $board in @@ -9,6 +9,10 @@ case $board in
@@ -1649,10 +1662,10 @@ index c81bd2cd97..049779ed6c 100644
ucidef_set_led_netdev "lan0" "lan0" "green:lan0" "lan0" "link tx rx" ucidef_set_led_netdev "lan0" "lan0" "green:lan0" "lan0" "link tx rx"
ucidef_set_led_netdev "lan1" "lan2" "green:lan1" "lan1" "link tx rx" ucidef_set_led_netdev "lan1" "lan2" "green:lan1" "lan1" "link tx rx"
diff --git a/target/linux/mediatek/filogic/base-files/etc/board.d/02_network b/target/linux/mediatek/filogic/base-files/etc/board.d/02_network diff --git a/target/linux/mediatek/filogic/base-files/etc/board.d/02_network b/target/linux/mediatek/filogic/base-files/etc/board.d/02_network
index c05c5d25e4..cfc615c943 100644 index e5872e7fe4..78364e6787 100644
--- a/target/linux/mediatek/filogic/base-files/etc/board.d/02_network --- a/target/linux/mediatek/filogic/base-files/etc/board.d/02_network
+++ b/target/linux/mediatek/filogic/base-files/etc/board.d/02_network +++ b/target/linux/mediatek/filogic/base-files/etc/board.d/02_network
@@ -20,6 +20,9 @@ mediatek_setup_interfaces() @@ -24,6 +24,9 @@ mediatek_setup_interfaces()
cudy,wr3000-v1) cudy,wr3000-v1)
ucidef_set_interfaces_lan_wan "lan1 lan2 lan3" "wan" ucidef_set_interfaces_lan_wan "lan1 lan2 lan3" "wan"
;; ;;
@@ -1663,7 +1676,7 @@ index c05c5d25e4..cfc615c943 100644
ucidef_set_interfaces_lan_wan eth1 eth0 ucidef_set_interfaces_lan_wan eth1 eth0
;; ;;
diff --git a/target/linux/mediatek/filogic/config-5.15 b/target/linux/mediatek/filogic/config-5.15 diff --git a/target/linux/mediatek/filogic/config-5.15 b/target/linux/mediatek/filogic/config-5.15
index 4cae8c50ac..5570cf8db6 100644 index 2ffc466b7c..8aca4f15d2 100644
--- a/target/linux/mediatek/filogic/config-5.15 --- a/target/linux/mediatek/filogic/config-5.15
+++ b/target/linux/mediatek/filogic/config-5.15 +++ b/target/linux/mediatek/filogic/config-5.15
@@ -1,5 +1,6 @@ @@ -1,5 +1,6 @@
@@ -1674,10 +1687,10 @@ index 4cae8c50ac..5570cf8db6 100644
CONFIG_ARCH_DMA_ADDR_T_64BIT=y CONFIG_ARCH_DMA_ADDR_T_64BIT=y
CONFIG_ARCH_KEEP_MEMBLOCK=y CONFIG_ARCH_KEEP_MEMBLOCK=y
diff --git a/target/linux/mediatek/image/filogic.mk b/target/linux/mediatek/image/filogic.mk diff --git a/target/linux/mediatek/image/filogic.mk b/target/linux/mediatek/image/filogic.mk
index fd83b9d441..10cdc28578 100644 index 846fbcbf2c..620528670e 100644
--- a/target/linux/mediatek/image/filogic.mk --- a/target/linux/mediatek/image/filogic.mk
+++ b/target/linux/mediatek/image/filogic.mk +++ b/target/linux/mediatek/image/filogic.mk
@@ -160,6 +160,22 @@ define Device/cudy_wr3000-v1 @@ -191,6 +191,22 @@ define Device/cudy_wr3000-v1
endef endef
TARGET_DEVICES += cudy_wr3000-v1 TARGET_DEVICES += cudy_wr3000-v1
@@ -1693,7 +1706,7 @@ index fd83b9d441..10cdc28578 100644
+ PAGESIZE := 2048 + PAGESIZE := 2048
+ IMAGE_SIZE := 246272k + IMAGE_SIZE := 246272k
+ KERNEL_IN_UBI := 1 + KERNEL_IN_UBI := 1
+ IMAGE/sysupgrade.bin := sysupgrade-tar + IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
+endef +endef
+TARGET_DEVICES += edgecore_eap111 +TARGET_DEVICES += edgecore_eap111
+ +

View File

@@ -0,0 +1,8 @@
---
profile: edgecore_eap111
target: mediatek
subtarget: filogic
description: Build image for the EdgeCore EAP111
image: bin/targets/mediatek/filogic/openwrt-mediatek-filogic-edgecore_eap111-squashfs-sysupgrade.bin
include:
- ucentral-ap