forked from coolsnowwolf/lede
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[bot] AutoMerging: merge all upstream's changes:
* https://github.com/coolsnowwolf/lede: (46 commits) rockchip: sync rk3568 upstream dts changes rockchip: fix rk3568 nvme detection issue tools: fix build on macOS Sonoma (coolsnowwolf#12212) ramips: mt7621: fixes gpio config elfutils: fix build with GCC 12/13 x86: 6.6: Activate CONFIG_FB_DEVICE kernel: Add CONFIG_FB_DEVICE to kmod-fb ramips: add support for JDCloud RE-CP-02 ramips: gl-mt1300: downclock SPI to 50MHz build: introduce PKG_BUILD_FLAGS ramips: add support for OpenFi 5Pro (coolsnowwolf#12196) hostapd: fix mbo module build kernel: bump 6.6 to 6.6.32 (coolsnowwolf#12186) kernel: bump 6.1 to 6.1.92 (coolsnowwolf#12187) mtd: spi-nor: add support for Winbond W25Q512 mvebu: add support for QNAP QHora-321/322 with commo image base-files: add legacy-sdcard sysupgrade support kernel: bump 5.4 to 5.4.277 (coolsnowwolf#12191) kernel: bump 5.10 to 5.10.218 (coolsnowwolf#12190) kernel: bump 5.15 to 5.15.160 (coolsnowwolf#12188) ...
- Loading branch information
Showing
209 changed files
with
26,080 additions
and
1,561 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,2 @@ | ||
| LINUX_VERSION-5.10 = .215 | ||
| LINUX_KERNEL_HASH-5.10.215 = 879ca159c34ea9d3a6775f292cc59c2d3931d57dca00f0bebe2675ea0c82c6a9 | ||
| LINUX_VERSION-5.10 = .218 | ||
| LINUX_KERNEL_HASH-5.10.218 = 9c36b243e8c3ec1d5963366618f336710b84340bf95be2037b26c452392cb2d6 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,2 @@ | ||
| LINUX_VERSION-5.15 = .157 | ||
| LINUX_KERNEL_HASH-5.15.157 = aff22351d34d69a16762dcf1fd51fe228da55d4b96b67247bdd598a86cc7a414 | ||
| LINUX_VERSION-5.15 = .160 | ||
| LINUX_KERNEL_HASH-5.15.160 = f41e718e33b88f269a6b6a7653e5e9824c4ba541f6ffe5bf26ecc37c540a1b05 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,2 @@ | ||
| LINUX_VERSION-5.4 = .274 | ||
| LINUX_KERNEL_HASH-5.4.274 = eac7b421a43cd46a3dbebf7c85d075faa7e164d80d215d31fcd35544b6f79ed4 | ||
| LINUX_VERSION-5.4 = .277 | ||
| LINUX_KERNEL_HASH-5.4.277 = 7e1f5b28588e49ddfd18e7772476e4e8b52bdc9c3e19beafcbb7c103e6c01f51 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,2 @@ | ||
| LINUX_VERSION-6.1 = .90 | ||
| LINUX_KERNEL_HASH-6.1.90 = 83a3d72e764fceda2c1fc68a4ea6b91253a28da56a688a2b61776b0d19788e1d | ||
| LINUX_VERSION-6.1 = .92 | ||
| LINUX_KERNEL_HASH-6.1.92 = 9019f427bfdc9ced5bc954d760d37ac08c0cdffb45ad28087fc45a73e64336c9 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,2 @@ | ||
| LINUX_VERSION-6.6 = .30 | ||
| LINUX_KERNEL_HASH-6.6.30 = b66a5b863b0f8669448b74ca83bd641a856f164b29956e539bbcb5fdeeab9cc6 | ||
| LINUX_VERSION-6.6 = .32 | ||
| LINUX_KERNEL_HASH-6.6.32 = aaa824eaf07f61911d22b75ff090a403c3dd0bd73e23933e0bba8b5971436ce1 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,91 @@ | ||
| legacy_sdcard_check_image() { | ||
| local file="$1" | ||
| local diskdev partdev diff | ||
|
|
||
| export_bootdevice && export_partdevice diskdev 0 || { | ||
| v "Unable to determine upgrade device" | ||
| return 1 | ||
| } | ||
|
|
||
| get_partitions "/dev/$diskdev" bootdisk | ||
|
|
||
| v "Extract boot sector from the image" | ||
| get_image_dd "$1" of=/tmp/image.bs count=1 bs=512b | ||
|
|
||
| get_partitions /tmp/image.bs image | ||
|
|
||
| #compare tables | ||
| diff="$(grep -F -x -v -f /tmp/partmap.bootdisk /tmp/partmap.image)" | ||
|
|
||
| rm -f /tmp/image.bs /tmp/partmap.bootdisk /tmp/partmap.image | ||
|
|
||
| if [ -n "$diff" ]; then | ||
| v "Partition layout has changed. Full image will be written." | ||
| ask_bool 0 "Abort" && exit 1 | ||
| return 0 | ||
| fi | ||
| } | ||
|
|
||
| legacy_sdcard_do_upgrade() { | ||
| local board=$(board_name) | ||
| local diskdev partdev diff | ||
|
|
||
| export_bootdevice && export_partdevice diskdev 0 || { | ||
| v "Unable to determine upgrade device" | ||
| return 1 | ||
| } | ||
|
|
||
| sync | ||
|
|
||
| if [ "$UPGRADE_OPT_SAVE_PARTITIONS" = "1" ]; then | ||
| get_partitions "/dev/$diskdev" bootdisk | ||
|
|
||
| v "Extract boot sector from the image" | ||
| get_image_dd "$1" of=/tmp/image.bs count=1 bs=512b | ||
|
|
||
| get_partitions /tmp/image.bs image | ||
|
|
||
| #compare tables | ||
| diff="$(grep -F -x -v -f /tmp/partmap.bootdisk /tmp/partmap.image)" | ||
| else | ||
| diff=1 | ||
| fi | ||
|
|
||
| if [ -n "$diff" ]; then | ||
| get_image_dd "$1" of="/dev/$diskdev" bs=4096 conv=fsync | ||
|
|
||
| # Separate removal and addtion is necessary; otherwise, partition 1 | ||
| # will be missing if it overlaps with the old partition 2 | ||
| partx -d - "/dev/$diskdev" | ||
| partx -a - "/dev/$diskdev" | ||
| else | ||
| v "Writing bootloader to /dev/$diskdev" | ||
| get_image_dd "$1" of="$diskdev" bs=512 skip=1 seek=1 count=2048 conv=fsync | ||
| #iterate over each partition from the image and write it to the boot disk | ||
| while read part start size; do | ||
| if export_partdevice partdev $part; then | ||
| v "Writing image to /dev/$partdev..." | ||
| get_image_dd "$1" of="/dev/$partdev" ibs="512" obs=1M skip="$start" count="$size" conv=fsync | ||
| else | ||
| v "Unable to find partition $part device, skipped." | ||
| fi | ||
| done < /tmp/partmap.image | ||
|
|
||
| v "Writing new UUID to /dev/$diskdev..." | ||
| get_image_dd "$1" of="/dev/$diskdev" bs=1 skip=440 count=4 seek=440 conv=fsync | ||
| fi | ||
|
|
||
| sleep 1 | ||
| } | ||
|
|
||
| legacy_sdcard_copy_config() { | ||
| local partdev | ||
|
|
||
| if export_partdevice partdev 1; then | ||
| mkdir -p /boot | ||
| [ -f /boot/kernel.img ] || mount -o rw,noatime /dev/$partdev /boot | ||
| cp -af "$UPGRADE_BACKUP" "/boot/$BACKUP_FILE" | ||
| sync | ||
| umount /boot | ||
| fi | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| # | ||
| # Download realtek r8126 linux driver from official site: | ||
| # [https://www.realtek.com/en/component/zoo/category/network-interface-controllers-10-100-1000m-gigabit-ethernet-pci-express-software] | ||
| # | ||
|
|
||
| include $(TOPDIR)/rules.mk | ||
| include $(INCLUDE_DIR)/kernel.mk | ||
|
|
||
| PKG_NAME:=r8126 | ||
| PKG_VERSION:=10.013.00 | ||
| PKG_RELEASE:=1 | ||
|
|
||
| PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) | ||
|
|
||
| include $(INCLUDE_DIR)/package.mk | ||
|
|
||
| define KernelPackage/r8126 | ||
| TITLE:=Driver for Realtek r8126 chipsets | ||
| SUBMENU:=Network Devices | ||
| VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE) | ||
| DEPENDS:=@PCI_SUPPORT | ||
| FILES:= $(PKG_BUILD_DIR)/r8126.ko | ||
| AUTOLOAD:=$(call AutoProbe,r8126) | ||
| endef | ||
|
|
||
| define Package/r8126/description | ||
| This package contains a driver for Realtek r8126 chipsets. | ||
| endef | ||
|
|
||
| define Build/Compile | ||
| +$(KERNEL_MAKE) M=$(PKG_BUILD_DIR) modules | ||
| endef | ||
|
|
||
| $(eval $(call KernelPackage,r8126)) |
Oops, something went wrong.