From b8eb602934f5e02d8a15678a82dd516b4b7765ff Mon Sep 17 00:00:00 2001 From: Shiji Yang Date: Sun, 21 Mar 2021 17:01:49 +0800 Subject: [PATCH 1/3] ramips: correct switch config of Youku yk1 There are only two lan ports and one wan port on Youku yk1 Fixes: e9baf8265bb8 ("ramips: add support for Youku YK1") Signed-off-by: Shiji Yang [add Fixes:] Signed-off-by: Adrian Schmutzler (cherry picked from commit b88d2850c66d7dc937e570661a047c647c588af5) --- target/linux/ramips/mt7620/base-files/etc/board.d/02_network | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/target/linux/ramips/mt7620/base-files/etc/board.d/02_network b/target/linux/ramips/mt7620/base-files/etc/board.d/02_network index e614de5010..398d275dae 100755 --- a/target/linux/ramips/mt7620/base-files/etc/board.d/02_network +++ b/target/linux/ramips/mt7620/base-files/etc/board.d/02_network @@ -24,7 +24,6 @@ ramips_setup_interfaces() ralink,mt7620a-mt7610e-evb|\ ralink,mt7620a-v22sg-evb|\ sanlinking,d240|\ - youku,yk1|\ zbtlink,zbt-ape522ii|\ zbtlink,zbt-we826-16m|\ zbtlink,zbt-we826-32m|\ @@ -217,6 +216,10 @@ ramips_setup_interfaces() ucidef_add_switch "switch0" \ "0:lan" "4:wan" "6@eth0" ;; + youku,yk1) + ucidef_add_switch "switch0" \ + "0:lan" "1:lan" "4:wan" "6@eth0" + ;; zbtlink,zbt-we1026-5g-16m) ucidef_add_switch "switch0" \ "0:lan" "6t@eth0" From 6f427580007f9cd25b7821644beb6f088d144ab2 Mon Sep 17 00:00:00 2001 From: INAGAKI Hiroshi Date: Thu, 25 Mar 2021 00:15:57 +0900 Subject: [PATCH 2/3] ath79: fix label_mac for NEC Aterm WG1200CR On NEC Aterm WG1200CR, the MAC address for WAN is printed in the label on the case, not LAN. This patch fixes this issue. Fixes: 50fdc0374b ("ath79: provide label MAC address") Signed-off-by: INAGAKI Hiroshi (cherry picked from commit e2331fb5491e52e3e21ab18b58d064b344e093e5) --- .../linux/ath79/generic/base-files/etc/board.d/02_network | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/target/linux/ath79/generic/base-files/etc/board.d/02_network b/target/linux/ath79/generic/base-files/etc/board.d/02_network index 084e8536dd..1e522b91c6 100755 --- a/target/linux/ath79/generic/base-files/etc/board.d/02_network +++ b/target/linux/ath79/generic/base-files/etc/board.d/02_network @@ -526,8 +526,7 @@ ath79_setup_macs() ;; dlink,dir-842-c1|\ dlink,dir-842-c2|\ - dlink,dir-842-c3|\ - nec,wg1200cr) + dlink,dir-842-c3) lan_mac=$(mtd_get_mac_ascii devdata "lanmac") wan_mac=$(mtd_get_mac_ascii devdata "wanmac") label_mac=$lan_mac @@ -588,6 +587,11 @@ ath79_setup_macs() base_mac=$(mtd_get_mac_binary u-boot 0x1fc00) wan_mac=$(macaddr_add "$base_mac" 1) ;; + nec,wg1200cr) + lan_mac=$(mtd_get_mac_ascii devdata "lanmac") + wan_mac=$(mtd_get_mac_ascii devdata "wanmac") + label_mac=$wan_mac + ;; nec,wg800hp) lan_mac=$(mtd_get_mac_text board_data 0x280) wan_mac=$(mtd_get_mac_text board_data 0x480) From 609033767918a67e92046b266230cd88ac4a37f6 Mon Sep 17 00:00:00 2001 From: David Bauer Date: Mon, 22 Feb 2021 02:00:02 +0100 Subject: [PATCH 3/3] generic: add missing symbols Signed-off-by: David Bauer (cherry picked from commit 55ed4bf6d7bf80b705d015c3b73f772db485ba9c) --- target/linux/generic/config-5.4 | 1 + 1 file changed, 1 insertion(+) diff --git a/target/linux/generic/config-5.4 b/target/linux/generic/config-5.4 index 9ca6b7573e..b44df2c2f5 100644 --- a/target/linux/generic/config-5.4 +++ b/target/linux/generic/config-5.4 @@ -4372,6 +4372,7 @@ CONFIG_RTC_DRV_CMOS=y # CONFIG_RTC_DRV_ISL12026 is not set # CONFIG_RTC_DRV_ISL12057 is not set # CONFIG_RTC_DRV_ISL1208 is not set +# CONFIG_RTC_DRV_JZ4740 is not set # CONFIG_RTC_DRV_M41T80 is not set # CONFIG_RTC_DRV_M41T93 is not set # CONFIG_RTC_DRV_M41T94 is not set