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

realtek: rename hpe,1920-8g-poe to match hardware

Browse Source 
There are two hardware models of the HPE 1920-8g-poe switch. The version
currently in the repository is the model with a PoE budget of 180W. In
preparation of the addition of the 65W model, the existing model is
renamed to clarify the hardware version it targets.

As suggested by Pawel, the 'SUPPORTED_DEVICES' includes the old target
name to enable an upgrade path of builds with the old name.

Suggested-by: Pawel Dembicki <paweldembicki@gmail.com>
Signed-off-by: Kevin Jilissen <info@kevinjilissen.nl>
(cherry picked from commit 987c96e889)
This commit is contained in:
Kevin Jilissen
2023-10-08 16:56:40 +02:00
committed by Sander Vanheule
parent 0bc33a6505
commit 2ce5521bd2
4 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
target/linux/realtek/base-files/etc/board.d/02_network
View File

@@ -31,7 +31,7 @@ lan_mac_end=""
label_mac=""
case $board in
hpe,1920-8g|\
hpe,1920-8g-poe|\
hpe,1920-8g-poe-180w|\
hpe,1920-16g|\
hpe,1920-24g)
label_mac=$(mtd_get_mac_binary factory 0x68)
@@ -67,7 +67,7 @@ done
[ -n "$label_mac" ] && ucidef_set_label_macaddr $label_mac
case $board in
hpe,1920-8g-poe)
hpe,1920-8g-poe-180w)
ucidef_set_poe 180 "$lan_list_rev" "lan9 lan10"
;;
netgear,gs110tpp-v1)

2
target/linux/realtek/base-files/etc/board.d/03_gpio_switches
View File

@@ -6,7 +6,7 @@ board_config_update
board=$(board_name)
case "$board" in
hpe,1920-8g-poe)
hpe,1920-8g-poe-180w)
ucidef_add_gpio_switch "fan_ctrl" "Fan control" "456" "0"
;;
esac

4
target/linux/realtek/dts-5.15/rtl8380_hpe_1920-8g-poe.dts → target/linux/realtek/dts-5.15/rtl8380_hpe_1920-8g-poe-180w.dts
View File

@@ -3,8 +3,8 @@
#include "rtl8380_hpe_1920-8g.dtsi"
/ {
compatible = "hpe,1920-8g-poe", "realtek,rtl838x-soc";
model = "HPE 1920-8G-PoE+ (JG922A)";
compatible = "hpe,1920-8g-poe-180w", "realtek,rtl838x-soc";
model = "HPE 1920-8G-PoE+ 180W (JG922A)";
};
&uart1 {

7
target/linux/realtek/image/rtl838x.mk
View File

@@ -99,13 +99,14 @@ define Device/hpe_1920-8g
endef
TARGET_DEVICES += hpe_1920-8g
define Device/hpe_1920-8g-poe
define Device/hpe_1920-8g-poe-180w
$(Device/hpe_1920)
SOC := rtl8380
DEVICE_MODEL := 1920-8G-PoE+ (JG922A)
DEVICE_MODEL := 1920-8G-PoE+ 180W (JG922A)
H3C_DEVICE_ID := 0x00010025
SUPPORTED_DEVICES += hpe_1920-8g-poe
endef
TARGET_DEVICES += hpe_1920-8g-poe
TARGET_DEVICES += hpe_1920-8g-poe-180w
define Device/hpe_1920-16g
$(Device/hpe_1920)