Skip to content

Commit

Permalink
[bot] AutoMerging: merge all upstream's changes:
Browse files Browse the repository at this point in the history
* https://github.com/coolsnowwolf/lede:
  meson: auto-repartition for EMMC (coolsnowwolf#11679)
  x86/64: set CONFIG_NVME_HWMON=y
  x86: increase default swiotlb size to 64MB
  x86: set CONFIG_X86_AMD_PLATFORM_DEVICE
  linux-firmware: intel: add firmware for AX101
  uboot-mediatek: Fix ubi command in commands
  mediatek: add support for GL.iNet GL-MT2500
  • Loading branch information
github-actions[bot] committed Dec 2, 2023
2 parents a761662 + f3df2a6 commit 3fece0b
Show file tree
Hide file tree
Showing 22 changed files with 252 additions and 24 deletions.
7 changes: 7 additions & 0 deletions package/boot/uboot-envtools/files/mediatek_filogic
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,13 @@ bananapi,bpi-r3)
;;
esac
;;
glinet,gl-mt2500)
local envdev=$(find_mmc_part "u-boot-env")
ubootenv_add_uci_config "$envdev" "0x400000" "0x80000"
;;
glinet,gl-mt3000)
ubootenv_add_uci_config "/dev/mtd1" "0x0" "0x80000" "0x20000"
;;
glinet,gl-mt6000)
local envdev=$(find_mmc_part "u-boot-env")
ubootenv_add_uci_config "$envdev" "0x0" "0x80000"
Expand Down
2 changes: 1 addition & 1 deletion package/boot/uboot-mediatek/patches/430-add-bpi-r3.patch
Original file line number Diff line number Diff line change
Expand Up @@ -1176,7 +1176,7 @@
+ubi_init_emmc_install=run sdmmc_read_emmc_install && run ubi_write_emmc_install
+ubi_prepare_rootfs=if ubi check rootfs_data ; then else if env exists rootfs_data_max ; then ubi create rootfs_data $rootfs_data_max dynamic || ubi create rootfs_data - dynamic ; else ubi create rootfs_data - dynamic ; fi ; fi
+ubi_remove_rootfs=ubi check rootfs_data && ubi remove rootfs_data
+ubi_write_emmc_install=ubi check emmc_install && ubi remote emmc_install ; ubi create emmc_install 0x800000 dynamic ; ubi write $loadaddr emmc_install 0x800000
+ubi_write_emmc_install=ubi check emmc_install && ubi remove emmc_install ; ubi create emmc_install 0x800000 dynamic ; ubi write $loadaddr emmc_install 0x800000
+ubi_write_production=ubi check fit && ubi remove fit ; run ubi_remove_rootfs ; ubi create fit $filesize dynamic 2 && ubi write $loadaddr fit $filesize
+ubi_write_recovery=ubi check recovery && ubi remove recovery ; run ubi_remove_rootfs ; ubi create recovery $filesize dynamic 3 && ubi write $loadaddr recovery $filesize
+_init_env=setenv _init_env ; setenv _create_env ; saveenv ; saveenv
Expand Down
7 changes: 7 additions & 0 deletions package/firmware/linux-firmware/intel.mk
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,13 @@ define Package/iwlwifi-firmware-iwl9260/install
endef
$(eval $(call BuildPackage,iwlwifi-firmware-iwl9260))

Package/iwlwifi-firmware-ax101 = $(call Package/firmware-default,Intel AX101 firmware)
define Package/iwlwifi-firmware-ax101/install
$(INSTALL_DIR) $(1)/lib/firmware
$(INSTALL_DATA) $(PKG_BUILD_DIR)/iwlwifi-so-a0-hr-b0-81.ucode $(1)/lib/firmware
endef
$(eval $(call BuildPackage,iwlwifi-firmware-ax101))

Package/iwlwifi-firmware-ax200 = $(call Package/firmware-default,Intel AX200 firmware)
define Package/iwlwifi-firmware-ax200/install
$(INSTALL_DIR) $(1)/lib/firmware
Expand Down
151 changes: 151 additions & 0 deletions target/linux/mediatek/dts/mt7981b-glinet-gl-mt2500.dts
Original file line number Diff line number Diff line change
@@ -0,0 +1,151 @@
// SPDX-License-Identifier: (GPL-2.0 OR MIT)

/dts-v1/;
#include "mt7981.dtsi"

/ {
model = "GL.iNet GL-MT2500";
compatible = "glinet,gl-mt2500", "mediatek,mt7981";

aliases {
label-mac-device = &gmac0;
led-boot = &led_sys_white;
led-failsafe = &led_sys_blue;
led-running = &led_sys_white;
led-upgrade = &led_sys_blue;
serial0 = &uart0;
};

chosen {
stdout-path = "serial0:115200n8";
bootargs-append = " root=PARTLABEL=rootfs rootwait";
};

gpio-keys {
compatible = "gpio-keys";

reset {
label = "reset";
linux,code = <KEY_RESTART>;
gpios = <&pio 1 GPIO_ACTIVE_LOW>;
};
};

leds {
compatible = "gpio-leds";

led-vpn {
label = "white:vpn";
gpios = <&pio 31 GPIO_ACTIVE_LOW>;
};

led_sys_white: led-system-white {
label = "white:system";
gpios = <&pio 30 GPIO_ACTIVE_LOW>;
};

led_sys_blue: led-system-blue {
label = "blue:system";
gpios = <&pio 29 GPIO_ACTIVE_LOW>;
};
};

usb_vbus: regulstor-usb {
compatible = "regulator-fixed";

regulator-name = "usb-vbus";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;

gpio = <&pio 12 GPIO_ACTIVE_HIGH>;
enable-active-high;
regulator-boot-on;
};

reg_3p3v: regulator-3p3v {
compatible = "regulator-fixed";
regulator-name = "fixed-3.3V";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
regulator-boot-on;
regulator-always-on;
};
};

&pio {
mmc0_pins_default: mmc0-pins-default {
mux {
function = "flash";
groups = "emmc_45";
};
};
mmc0_pins_uhs: mmc0-pins-uhs {
mux {
function = "flash";
groups = "emmc_45";
};
};
};

&uart0 {
status = "okay";
};

&watchdog {
status = "okay";
};

&eth {
status = "okay";

pinctrl-names = "default";
pinctrl-0 = <&mdio_pins>;

gmac0: mac@0 {
compatible = "mediatek,eth-mac";
reg = <0>;

phy-mode = "2500base-x";
phy-handle = <&phy5>;
};

gmac1: mac@1 {
compatible = "mediatek,eth-mac";
reg = <1>;
phy-mode = "gmii";
phy-handle = <&int_gbe_phy>;
};
};

&mdio_bus {
reset-gpios = <&pio 14 GPIO_ACTIVE_LOW>;
reset-delay-us = <600>;
reset-post-delay-us = <20000>;

phy5: ethernet-phy@5 {
reg = <5>;
compatible = "ethernet-phy-ieee802.3-c45";
};
};

&usb_phy {
status = "okay";
};

&xhci {
status = "okay";
vbus-supply = <&usb_vbus>;
};

&mmc0 {
status = "okay";

pinctrl-names = "default", "state_uhs";
pinctrl-0 = <&mmc0_pins_default>;
pinctrl-1 = <&mmc0_pins_uhs>;
bus-width = <8>;
max-frequency = <52000000>;
vmmc-supply = <&reg_3p3v>;
cap-mmc-highspeed;
non-removable;
};
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ mediatek_setup_interfaces()
qihoo,360t7)
ucidef_set_interfaces_lan_wan "lan1 lan2 lan3" wan
;;
glinet,gl-mt2500|\
glinet,gl-mt3000)
ucidef_set_interfaces_lan_wan eth1 eth0
;;
Expand Down Expand Up @@ -67,6 +68,11 @@ mediatek_setup_macs()
bananapi,bpi-r3)
wan_mac=$(macaddr_add $(cat /sys/class/net/eth0/address) 1)
;;
glinet,gl-mt2500)
label_mac="$(get_mac_binary "/dev/mmcblk0boot1" 0xa)"
wan_mac="$label_mac"
lan_mac="$(macaddr_add $label_mac 1)"
;;
glinet,gl-mt6000)
label_mac=$(mmc_get_mac_binary factory 0x0a)
wan_mac=$label_mac
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ platform_do_upgrade() {
;;
esac
;;
glinet,gl-mt2500|\
glinet,gl-mt6000)
CI_KERNPART="kernel"
CI_ROOTPART="rootfs"
Expand Down Expand Up @@ -74,6 +75,7 @@ platform_copy_config() {
;;
esac
;;
glinet,gl-mt2500|\
glinet,gl-mt6000)
emmc_copy_config
;;
Expand Down
21 changes: 19 additions & 2 deletions target/linux/mediatek/image/filogic.mk
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,23 @@ define Device/cetron_ct3003-mod
endef
TARGET_DEVICES += cetron_ct3003-mod

define Device/glinet_gl-mt2500
DEVICE_VENDOR := GL.iNet
DEVICE_MODEL := GL-MT2500
DEVICE_DTS := mt7981b-glinet-gl-mt2500
DEVICE_DTS_DIR := ../dts
DEVICE_DTS_LOADADDR := 0x47000000
DEVICE_PACKAGES := kmod-usb3
SUPPORTED_DEVICES += glinet,mt2500-emmc
IMAGES := sysupgrade.bin
KERNEL := kernel-bin | lzma | \
fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb with-initrd | pad-to 64k
KERNEL_INITRAMFS := kernel-bin | lzma | \
fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb with-initrd | pad-to 64k
IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
endef
TARGET_DEVICES += glinet_gl-mt2500

define Device/glinet_gl-mt3000
DEVICE_VENDOR := GL.iNet
DEVICE_MODEL := GL-MT3000
Expand All @@ -158,7 +175,7 @@ define Device/glinet_gl-mt3000
KERNEL_IN_UBI := 1
IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
endef
#TARGET_DEVICES += glinet_gl-mt3000
TARGET_DEVICES += glinet_gl-mt3000

define Device/glinet_gl-mt6000
DEVICE_VENDOR := GL.iNet
Expand All @@ -172,7 +189,7 @@ define Device/glinet_gl-mt6000
IMAGES := sysupgrade.bin
IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
endef
#TARGET_DEVICES += glinet_gl-mt6000
TARGET_DEVICES += glinet_gl-mt6000

define Device/h3c_magic-nx30-pro
DEVICE_VENDOR := H3C
Expand Down
3 changes: 2 additions & 1 deletion target/linux/meson/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ DEFAULT_PACKAGES += \
mkf2fs \
automount \
resize2fs \
partx-utils
partx-utils \
losetup

KERNELNAME:=Image dtbs

Expand Down
5 changes: 5 additions & 0 deletions target/linux/meson/base-files/etc/rc.local
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# Put your custom commands here that should be executed once
# the system init finished. By default this file does nothing.

bash /root/resize.sh
exit 0
10 changes: 10 additions & 0 deletions target/linux/meson/base-files/root/resize.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
#!/bin/bash

parted /dev/mmcblk1 resizepart 2 100%
losetup /dev/loop0 /dev/mmcblk1p2
resize2fs -f /dev/loop0
echo "# Put your custom commands here that should be executed once
# the system init finished. By default this file does nothing.
exit 0">/etc/rc.local
rm -rf /root/resize.sh && reboot
22 changes: 22 additions & 0 deletions target/linux/meson/meson8b/config-6.1
Original file line number Diff line number Diff line change
Expand Up @@ -120,25 +120,47 @@ CONFIG_CRC16=y
CONFIG_CRC7=y
CONFIG_CRC_ITU_T=y
CONFIG_CRYPTO_AES_ARM=y
CONFIG_CRYPTO_AES_ARM_BS=y
CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA=y
CONFIG_CRYPTO_ARCH_HAVE_LIB_CURVE25519=y
CONFIG_CRYPTO_ARCH_HAVE_LIB_POLY1305=y
CONFIG_CRYPTO_BLAKE2B=y
CONFIG_CRYPTO_BLAKE2B_NEON=y
CONFIG_CRYPTO_CBC=y
CONFIG_CRYPTO_CHACHA20_NEON=y
CONFIG_CRYPTO_CMAC=y
CONFIG_CRYPTO_CRC32=y
CONFIG_CRYPTO_CRC32C=y
CONFIG_CRYPTO_CRC32_ARM_CE=y
CONFIG_CRYPTO_CRYPTD=y
CONFIG_CRYPTO_CURVE25519_NEON=y
CONFIG_CRYPTO_DRBG=y
CONFIG_CRYPTO_DRBG_HMAC=y
CONFIG_CRYPTO_DRBG_MENU=y
CONFIG_CRYPTO_HMAC=y
CONFIG_CRYPTO_JITTERENTROPY=y
CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=y
CONFIG_CRYPTO_LIB_POLY1305_GENERIC=y
CONFIG_CRYPTO_LIB_SHA1=y
CONFIG_CRYPTO_LIB_SHA256=y
CONFIG_CRYPTO_LIB_UTILS=y
CONFIG_CRYPTO_NHPOLY1305=y
CONFIG_CRYPTO_NHPOLY1305_NEON=y
CONFIG_CRYPTO_POLY1305_ARM=y
CONFIG_CRYPTO_RNG=y
CONFIG_CRYPTO_RNG2=y
CONFIG_CRYPTO_RNG_DEFAULT=y
CONFIG_CRYPTO_RSA=y
CONFIG_CRYPTO_SEQIV=y
CONFIG_CRYPTO_SHA1=y
CONFIG_CRYPTO_SHA1_ARM=y
CONFIG_CRYPTO_SHA1_ARM_NEON=y
CONFIG_CRYPTO_SHA256=y
CONFIG_CRYPTO_SHA256_ARM=y
CONFIG_CRYPTO_SHA512=y
CONFIG_CRYPTO_SHA512_ARM=y
CONFIG_CRYPTO_SIMD=y
CONFIG_CURRENT_POINTER_IN_TPIDRURO=y
CONFIG_DCACHE_WORD_ACCESS=y
CONFIG_DEBUG_INFO=y
Expand Down
4 changes: 2 additions & 2 deletions target/linux/x86/64/config-5.10
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@ CONFIG_NR_CPUS_DEFAULT=512
CONFIG_NR_CPUS_RANGE_BEGIN=2
CONFIG_NR_CPUS_RANGE_END=512
CONFIG_NVME_CORE=y
# CONFIG_NVME_HWMON is not set
CONFIG_NVME_HWMON=y
CONFIG_NVME_MULTIPATH=y
# CONFIG_NVME_TCP is not set
CONFIG_OUTPUT_FORMAT="elf64-x86-64"
Expand Down Expand Up @@ -431,7 +431,7 @@ CONFIG_X86_64_SMP=y
CONFIG_X86_ACPI_CPUFREQ=y
# CONFIG_X86_ACPI_CPUFREQ_CPB is not set
CONFIG_X86_AMD_FREQ_SENSITIVITY=y
# CONFIG_X86_AMD_PLATFORM_DEVICE is not set
CONFIG_X86_AMD_PLATFORM_DEVICE=y
CONFIG_X86_CPUID=y
CONFIG_X86_DIRECT_GBPAGES=y
CONFIG_X86_HV_CALLBACK_VECTOR=y
Expand Down
4 changes: 2 additions & 2 deletions target/linux/x86/64/config-5.15
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,7 @@ CONFIG_NR_CPUS_DEFAULT=512
CONFIG_NR_CPUS_RANGE_BEGIN=2
CONFIG_NR_CPUS_RANGE_END=512
CONFIG_NVME_CORE=y
# CONFIG_NVME_HWMON is not set
CONFIG_NVME_HWMON=y
CONFIG_NVME_MULTIPATH=y
# CONFIG_NVME_TCP is not set
CONFIG_OUTPUT_FORMAT="elf64-x86-64"
Expand Down Expand Up @@ -438,7 +438,7 @@ CONFIG_X86_64_SMP=y
CONFIG_X86_ACPI_CPUFREQ=y
# CONFIG_X86_ACPI_CPUFREQ_CPB is not set
CONFIG_X86_AMD_FREQ_SENSITIVITY=y
# CONFIG_X86_AMD_PLATFORM_DEVICE is not set
CONFIG_X86_AMD_PLATFORM_DEVICE=y
CONFIG_X86_CPUID=y
CONFIG_X86_DIRECT_GBPAGES=y
CONFIG_X86_HV_CALLBACK_VECTOR=y
Expand Down
2 changes: 1 addition & 1 deletion target/linux/x86/64/config-5.4
Original file line number Diff line number Diff line change
Expand Up @@ -445,7 +445,7 @@ CONFIG_X86_64_SMP=y
CONFIG_X86_ACPI_CPUFREQ=y
# CONFIG_X86_ACPI_CPUFREQ_CPB is not set
CONFIG_X86_AMD_FREQ_SENSITIVITY=y
# CONFIG_X86_AMD_PLATFORM_DEVICE is not set
CONFIG_X86_AMD_PLATFORM_DEVICE=y
CONFIG_X86_CMOV=y
CONFIG_X86_CPUID=y
CONFIG_X86_DEBUGCTLMSR=y
Expand Down
Loading

0 comments on commit 3fece0b

Please sign in to comment.