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

Merge Official Source

Browse Source 
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
This commit is contained in:
Tianling Shen 2024-09-29 12:11:27 +08:00
commit 5637dd20a4
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,7 +7,7 @@ board=$(board_name)
case "$board" in
aruba,ap-303h)
ucidef_add_gpio_switch "poe_passtrough" "POE passtrough disable" "546" "1"
ucidef_add_gpio_switch "poe_passtrough" "POE passtrough disable" "446" "1"
;;
cellc,rtl30vw)
ucidef_add_gpio_switch "w_disable" "W_DISABLE mPCIE pin" "398" "1"

3
target/linux/octeon/base-files/lib/preinit/79_move_config
View File

@ -22,7 +22,8 @@ octeon_move_config() {
itus,shield-router)
move_config "/dev/mmcblk1p1"
;;
ubnt,edgerouter-4 | \
er|\
ubnt,edgerouter-4|\
ubnt,edgerouter-6p)
move_config "/dev/mmcblk0p1"
;;

1
target/linux/octeon/base-files/lib/upgrade/platform.sh
View File

@ -34,6 +34,7 @@ platform_copy_config() {
itus,shield-router)
platform_copy_config_helper /dev/mmcblk1p1
;;
er|\
ubnt,edgerouter-4|\
ubnt,edgerouter-6p)
platform_copy_config_helper /dev/mmcblk0p1

6
tools/bzip2/Makefile
View File

@ -29,9 +29,9 @@ HOST_CFLAGS += $(HOST_FPIC)
HOST_MAKE_FLAGS+= \
CFLAGS="$(HOST_CFLAGS)" \
LDFLAGS="$(HOST_LDFLAGS)" \
ENABLE_BIN_SHARED=1 \
ENABLE_BIN_STATIC=0 \
ENABLE_LIB_SHARED=1 \
ENABLE_BIN_SHARED=0 \
ENABLE_BIN_STATIC=1 \
ENABLE_LIB_SHARED=0 \
ENABLE_LIB_STATIC=1 \
ENABLE_DEV=1 \
ENABLE_DOCS=1 \