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

Synchronize official source code #132

Merged
merged 3 commits into from
Sep 29, 2024
Merged

Synchronize official source code #132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5332351
ipq40xx: fix AP-303H PSE GPIO pin
blocktrron Sep 27, 2024
87477c7
tools: bzip2: use static lib and tools
robimarko Sep 26, 2024
fa0a7e0
octeon: ubnt-edgerouter: fix sysupgrade config backup/restore
sur5r Aug 22, 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
2 changes: 1 addition & 1 deletion target/linux/ipq40xx/base-files/etc/board.d/03_gpio_switches
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
3 changes: 2 additions & 1 deletion target/linux/octeon/base-files/lib/preinit/79_move_config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
;;
Expand Down
1 change: 1 addition & 0 deletions target/linux/octeon/base-files/lib/upgrade/platform.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions tools/bzip2/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
Loading