diff --git a/package/boot/uboot-mediatek/patches/454-add-glinet-x3000.patch b/package/boot/uboot-mediatek/patches/454-add-glinet-x3000.patch index 9739abd250..58a4e15613 100644 --- a/package/boot/uboot-mediatek/patches/454-add-glinet-x3000.patch +++ b/package/boot/uboot-mediatek/patches/454-add-glinet-x3000.patch @@ -254,9 +254,9 @@ +serverip=192.168.1.254 +loadaddr=0x46000000 +bootdelay=3 -+bootfile_bl2=openwrt-mediatek-filogic-glinet_gl-x3000-preloader.bin -+bootfile_fip=openwrt-mediatek-filogic-glinet_gl-x3000-bl31-uboot.fip -+bootfile_firmware=openwrt-mediatek-filogic-glinet_gl-x3000-squashfs-factory.bin ++bootfile_bl2=immortalwrt-mediatek-filogic-glinet_gl-x3000-preloader.bin ++bootfile_fip=immortalwrt-mediatek-filogic-glinet_gl-x3000-bl31-uboot.fip ++bootfile_firmware=immortalwrt-mediatek-filogic-glinet_gl-x3000-squashfs-factory.bin +bootmenu_confirm_return=askenv - Press ENTER to return to menu ; bootmenu 60 +bootmenu_title= *** U-Boot Boot Menu for GL-iNet GL-X3000 *** +bootmenu_0=Startup system (Default).=run boot_system diff --git a/package/boot/uboot-mediatek/patches/456-add-arcadyan-mozart.patch b/package/boot/uboot-mediatek/patches/456-add-arcadyan-mozart.patch index 39cd199d1c..2e9259a926 100644 --- a/package/boot/uboot-mediatek/patches/456-add-arcadyan-mozart.patch +++ b/package/boot/uboot-mediatek/patches/456-add-arcadyan-mozart.patch @@ -126,10 +126,10 @@ +bootconf=config-1 +bootconf_extra= +bootdelay=0 -+bootfile=openwrt-mediatek-filogic-arcadyan_mozart-initramfs.itb -+bootfile_bl2=openwrt-mediatek-filogic-arcadyan_mozart-emmc-preloader.bin -+bootfile_fip=openwrt-mediatek-filogic-arcadyan_mozart-emmc-bl31-uboot.fip -+bootfile_upg=openwrt-mediatek-filogic-arcadyan_mozart-squashfs-sysupgrade.itb ++bootfile=immortalwrt-mediatek-filogic-arcadyan_mozart-initramfs.itb ++bootfile_bl2=immortalwrt-mediatek-filogic-arcadyan_mozart-emmc-preloader.bin ++bootfile_fip=immortalwrt-mediatek-filogic-arcadyan_mozart-emmc-bl31-uboot.fip ++bootfile_upg=immortalwrt-mediatek-filogic-arcadyan_mozart-squashfs-sysupgrade.itb +bootled_pwr=blue:status +bootled_rec=red:status +bootmenu_confirm_return=askenv - Press ENTER to return to menu ; bootmenu 60 diff --git a/package/boot/uboot-mediatek/patches/458-add-GatoNetworks-GDSP.patch b/package/boot/uboot-mediatek/patches/458-add-GatoNetworks-GDSP.patch index 11b40dd383..e796f1ab18 100644 --- a/package/boot/uboot-mediatek/patches/458-add-GatoNetworks-GDSP.patch +++ b/package/boot/uboot-mediatek/patches/458-add-GatoNetworks-GDSP.patch @@ -376,8 +376,8 @@ Signed-off-by: Enrico Mioso +loadaddr=0x46000000 +bootcmd=run boot_nor +bootdelay=0 -+bootfile=openwrt-mediatek-filogic-gatonetworks_gdsp-initramfs-kernel.bin -+bootfile_upg=openwrt-mediatek-filogic-gatonetworks_gdsp-squashfs-sysupgrade.bin ++bootfile=immortalwrt-mediatek-filogic-gatonetworks_gdsp-initramfs-kernel.bin ++bootfile_upg=immortalwrt-mediatek-filogic-gatonetworks_gdsp-squashfs-sysupgrade.bin +bootmenu_confirm_return=askenv - Press ENTER to return to menu ; bootmenu 60 +bootmenu_default=0 +bootmenu_delay=0 diff --git a/package/boot/uboot-mediatek/patches/459-add-mercusys-mr90x-v1.patch b/package/boot/uboot-mediatek/patches/459-add-mercusys-mr90x-v1.patch index 23be627fe5..2e09dcb065 100644 --- a/package/boot/uboot-mediatek/patches/459-add-mercusys-mr90x-v1.patch +++ b/package/boot/uboot-mediatek/patches/459-add-mercusys-mr90x-v1.patch @@ -296,10 +296,10 @@ +bootcmd=run check_buttons ; run boot_production ; run boot_recovery +bootconf=config-1 +bootdelay=0 -+bootfile=openwrt-mediatek-filogic-mercusys_mr90x-v1-ubi-initramfs-recovery.itb -+bootfile_bl2=openwrt-mediatek-filogic-mercusys_mr90x-v1-ubi-preloader.bin -+bootfile_fip=openwrt-mediatek-filogic-mercusys_mr90x-v1-ubi-bl31-uboot.fip -+bootfile_upg=openwrt-mediatek-filogic-mercusys_mr90x-v1-ubi-squashfs-sysupgrade.itb ++bootfile=immortalwrt-mediatek-filogic-mercusys_mr90x-v1-ubi-initramfs-recovery.itb ++bootfile_bl2=immortalwrt-mediatek-filogic-mercusys_mr90x-v1-ubi-preloader.bin ++bootfile_fip=immortalwrt-mediatek-filogic-mercusys_mr90x-v1-ubi-bl31-uboot.fip ++bootfile_upg=immortalwrt-mediatek-filogic-mercusys_mr90x-v1-ubi-squashfs-sysupgrade.itb +bootmenu_confirm_return=askenv - Press ENTER to return to menu ; bootmenu 60 +bootmenu_default=0 +bootmenu_delay=0 diff --git a/package/boot/uboot-mediatek/patches/460-add-routerich-ax3000.patch b/package/boot/uboot-mediatek/patches/460-add-routerich-ax3000.patch index 99bb8a5031..a8c3ab2225 100644 --- a/package/boot/uboot-mediatek/patches/460-add-routerich-ax3000.patch +++ b/package/boot/uboot-mediatek/patches/460-add-routerich-ax3000.patch @@ -307,10 +307,10 @@ +bootcmd=run check_buttons ; if pstore check ; then run boot_recovery ; else run boot_ubi ; fi +bootconf=config-1 +bootdelay=0 -+bootfile=openwrt-mediatek-filogic-routerich_ax3000-ubootmod-initramfs-recovery.itb -+bootfile_bl2=openwrt-mediatek-filogic-routerich_ax3000-ubootmod-preloader.bin -+bootfile_fip=openwrt-mediatek-filogic-routerich_ax3000-ubootmod-bl31-uboot.fip -+bootfile_upg=openwrt-mediatek-filogic-routerich_ax3000-ubootmod-squashfs-sysupgrade.itb ++bootfile=immortalwrt-mediatek-filogic-routerich_ax3000-ubootmod-initramfs-recovery.itb ++bootfile_bl2=immortalwrt-mediatek-filogic-routerich_ax3000-ubootmod-preloader.bin ++bootfile_fip=immortalwrt-mediatek-filogic-routerich_ax3000-ubootmod-bl31-uboot.fip ++bootfile_upg=immortalwrt-mediatek-filogic-routerich_ax3000-ubootmod-squashfs-sysupgrade.itb +bootled_pwr=blue:power +bootled_rec=blue:power +bootmenu_confirm_return=askenv - Press ENTER to return to menu ; bootmenu 60 diff --git a/package/boot/uboot-mediatek/patches/461-add-netcore-n60-pro.patch b/package/boot/uboot-mediatek/patches/461-add-netcore-n60-pro.patch index 57fd04cc80..d50b86abe6 100644 --- a/package/boot/uboot-mediatek/patches/461-add-netcore-n60-pro.patch +++ b/package/boot/uboot-mediatek/patches/461-add-netcore-n60-pro.patch @@ -1,6 +1,6 @@ --- /dev/null +++ b/configs/mt7986_netcore_n60-pro_defconfig -@@ -0,0 +1,127 @@ +@@ -0,0 +1,128 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -118,6 +118,7 @@ +CONFIG_RAM=y +CONFIG_SCSI=y +CONFIG_DM_SERIAL=y ++CONFIG_SERIAL_RX_BUFFER=y +CONFIG_MTK_SERIAL=y +CONFIG_SPI=y +CONFIG_DM_SPI=y @@ -130,7 +131,7 @@ +CONFIG_HEXDUMP=y --- /dev/null +++ b/arch/arm/dts/mt7986a-netcore-n60-pro.dts -@@ -0,0 +1,185 @@ +@@ -0,0 +1,200 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright (c) 2021 MediaTek Inc. @@ -158,32 +159,47 @@ + reg = <0x40000000 0x20000000>; + }; + -+ keys { ++ gpio-keys { + compatible = "gpio-keys"; + -+ factory { ++ button-reset { + label = "reset"; + linux,code = ; + gpios = <&gpio 9 GPIO_ACTIVE_LOW>; + }; + -+ wps { -+ label = "wps"; ++ button-mesh { ++ label = "mesh"; + linux,code = ; + gpios = <&gpio 10 GPIO_ACTIVE_LOW>; + }; + }; + -+ leds { ++ gpio-leds { + compatible = "gpio-leds"; + -+ status_red { -+ label = "red:status"; ++ led-0 { ++ label = "blue:wlan"; ++ gpios = <&gpio 1 GPIO_ACTIVE_LOW>; ++ }; ++ ++ power_led: led-1 { ++ label = "blue:power"; + gpios = <&gpio 29 GPIO_ACTIVE_LOW>; + }; + -+ status_green { -+ label = "green:status"; ++ led-2 { ++ label = "blue:status"; ++ gpios = <&gpio 30 GPIO_ACTIVE_LOW>; ++ }; ++ ++ led-3 { ++ label = "blue:mesh"; ++ gpios = <&gpio 31 GPIO_ACTIVE_LOW>; ++ }; ++ ++ led-4 { ++ label = "blue:wan"; + gpios = <&gpio 32 GPIO_ACTIVE_LOW>; + }; + }; @@ -307,7 +323,7 @@ + + partition@580000 { + label = "ubi"; -+ reg = <0x580000 0x7280000>; ++ reg = <0x580000 0x7a80000>; + }; + }; + }; @@ -326,12 +342,12 @@ +bootcmd=if pstore check ; then run boot_recovery ; else run boot_ubi ; fi +bootconf=config-1 +bootdelay=0 -+bootfile=openwrt-mediatek-filogic-netcore_n60-pro-initramfs-recovery.itb -+bootfile_bl2=openwrt-mediatek-filogic-netcore_n60-pro-preloader.bin -+bootfile_fip=openwrt-mediatek-filogic-netcore_n60-pro-bl31-uboot.fip -+bootfile_upg=openwrt-mediatek-filogic-netcore_n60-pro-squashfs-sysupgrade.itb -+bootled_pwr=green:status -+bootled_rec=red:status ++bootfile=immortalwrt-mediatek-filogic-netcore_n60-pro-initramfs-recovery.itb ++bootfile_bl2=immortalwrt-mediatek-filogic-netcore_n60-pro-preloader.bin ++bootfile_fip=immortalwrt-mediatek-filogic-netcore_n60-pro-bl31-uboot.fip ++bootfile_upg=immortalwrt-mediatek-filogic-netcore_n60-pro-squashfs-sysupgrade.itb ++bootled_pwr=blue:power ++bootled_rec=blue:power +bootmenu_confirm_return=askenv - Press ENTER to return to menu ; bootmenu 60 +bootmenu_default=0 +bootmenu_delay=0 diff --git a/target/linux/mediatek/dts/mt7986a-netcore-n60-pro.dts b/target/linux/mediatek/dts/mt7986a-netcore-n60-pro.dts index 9c298d6f3e..4272bac7a5 100644 --- a/target/linux/mediatek/dts/mt7986a-netcore-n60-pro.dts +++ b/target/linux/mediatek/dts/mt7986a-netcore-n60-pro.dts @@ -14,60 +14,67 @@ aliases { serial0 = &uart0; label-mac-device = &gmac0; - led-boot = &sys_status; - led-failsafe = &sys_status; - led-running = &sys_status; - led-upgrade = &sys_status; + led-boot = &led_power; + led-failsafe = &led_power; + led-running = &led_power; + led-upgrade = &led_power; }; chosen { - bootargs-append = " root=/dev/fit0 rootwait"; + bootargs = "root=/dev/fit0 rootwait"; rootdisk = <&ubi_rootdisk>; stdout-path = "serial0:115200n8"; }; - memory { + memory@40000000 { reg = <0 0x40000000 0 0x20000000>; }; - keys { + gpio-keys { compatible = "gpio-keys"; - reset { + button-reset { label = "reset"; linux,code = ; gpios = <&pio 9 GPIO_ACTIVE_LOW>; }; - mesh { + button-mesh { label = "mesh"; linux,code = ; gpios = <&pio 10 GPIO_ACTIVE_LOW>; }; }; - leds { + gpio-leds { compatible = "gpio-leds"; - sys_status: status { + led-0 { + color = ; + function = LED_FUNCTION_WLAN; + gpios = <&pio 1 GPIO_ACTIVE_LOW>; + linux,default-trigger = "phy1tpt"; + }; + + led_power: led-1 { color = ; function = LED_FUNCTION_POWER; gpios = <&pio 29 GPIO_ACTIVE_LOW>; }; - usb { + led-2 { color = ; function = LED_FUNCTION_USB; gpios = <&pio 30 GPIO_ACTIVE_LOW>; }; - mesh { + led-3 { color = ; - function = LED_FUNCTION_STATUS; + function = LED_FUNCTION_WPS; gpios = <&pio 31 GPIO_ACTIVE_LOW>; }; - wan { + led-4 { color = ; function = LED_FUNCTION_WAN; gpios = <&pio 32 GPIO_ACTIVE_LOW>; @@ -91,7 +98,6 @@ regulator-boot-on; regulator-always-on; }; - }; &crypto { @@ -106,7 +112,7 @@ reg = <0>; phy-mode = "2500base-x"; - nvmem-cells = <&macaddr_lan>; + nvmem-cells = <&macaddr_factory_1fef20 0>; nvmem-cell-names = "mac-address"; fixed-link { @@ -122,7 +128,7 @@ phy-handle = <&phy6>; phy-mode = "2500base-x"; - nvmem-cells = <&macaddr_wan>; + nvmem-cells = <&macaddr_factory_1fef26 0>; nvmem-cell-names = "mac-address"; }; @@ -140,11 +146,33 @@ phy5: phy@5 { compatible = "ethernet-phy-ieee802.3-c45"; reg = <5>; + + leds { + #address-cells = <1>; + #size-cells = <0>; + + led@3 { + reg = <3>; + color = ; + function = LED_FUNCTION_LAN; + }; + }; }; phy6: phy@6 { compatible = "ethernet-phy-ieee802.3-c45"; reg = <6>; + + leds { + #address-cells = <1>; + #size-cells = <0>; + + led@3 { + reg = <3>; + color = ; + function = LED_FUNCTION_WAN; + }; + }; }; switch: switch@1f { @@ -220,19 +248,19 @@ #size-cells = <1>; partition@0 { - label = "BL2"; - reg = <0x0000000 0x0100000>; + label = "bl2"; + reg = <0x0 0x100000>; read-only; }; partition@100000 { label = "u-boot-env"; - reg = <0x0100000 0x0080000>; + reg = <0x100000 0x80000>; }; - factory: partition@180000 { - label = "Factory"; - reg = <0x0180000 0x0200000>; + partition@180000 { + label = "factory"; + reg = <0x180000 0x200000>; read-only; nvmem-layout { @@ -240,25 +268,33 @@ #address-cells = <1>; #size-cells = <1>; - macaddr_lan: macaddr@1fef20 { - reg = <0x1fef20 0x6>; + eeprom_factory_0: eeprom@0 { + reg = <0x0 0x1000>; }; - macaddr_wan: macaddr@1fef26 { + macaddr_factory_1fef20: macaddr@1fef20 { + compatible = "mac-base"; + reg = <0x1fef20 0x6>; + #nvmem-cell-cells = <1>; + }; + + macaddr_factory_1fef26: macaddr@1fef26 { + compatible = "mac-base"; reg = <0x1fef26 0x6>; + #nvmem-cell-cells = <1>; }; }; }; partition@380000 { - label = "FIP"; - reg = <0x0380000 0x0200000>; + label = "fip"; + reg = <0x380000 0x200000>; read-only; }; partition@580000 { label = "ubi"; - reg = <0x0580000 0x7280000>; + reg = <0x0580000 0x7a80000>; compatible = "linux,ubi"; volumes { @@ -330,9 +366,9 @@ }; &wifi { - status = "okay"; + nvmem-cells = <&eeprom_factory_0>; + nvmem-cell-names = "eeprom"; pinctrl-names = "default"; pinctrl-0 = <&wf_2g_5g_pins>; - - mediatek,mtd-eeprom = <&factory 0x0>; -}; \ No newline at end of file + status = "okay"; +}; diff --git a/target/linux/mediatek/filogic/base-files/etc/board.d/01_leds b/target/linux/mediatek/filogic/base-files/etc/board.d/01_leds index 40c67d17a7..274e555217 100644 --- a/target/linux/mediatek/filogic/base-files/etc/board.d/01_leds +++ b/target/linux/mediatek/filogic/base-files/etc/board.d/01_leds @@ -95,6 +95,11 @@ mercusys,mr90x-v1-ubi) netcore,n60) ucidef_set_led_netdev "wan" "WAN" "mdio-bus:06:green:wan" "eth1" "link tx rx" ;; +netcore,n60-pro) + ucidef_set_led_netdev "wanlink" "WANLINK" "mdio-bus:06:green:wan" "eth1" "link_10 link_100 link_1000 link_2500 tx rx" + ucidef_set_led_netdev "lan-1" "LAN-1" "mdio-bus:05:green:lan" "lan1" "link_10 link_100 link_1000 link_2500 tx rx" + ucidef_set_led_netdev "wan" "WAN" "blue:wan" "eth1" "link" + ;; netgear,wax220) ucidef_set_led_netdev "eth0" "LAN" "green:lan" "eth0" ;; diff --git a/target/linux/mediatek/image/filogic.mk b/target/linux/mediatek/image/filogic.mk index 9017bbf134..18e675a89a 100644 --- a/target/linux/mediatek/image/filogic.mk +++ b/target/linux/mediatek/image/filogic.mk @@ -1114,7 +1114,7 @@ define Device/jdcloud_re-cp-03 IMAGE/sysupgrade.itb := append-kernel | \ fit gzip $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb external-static-with-rootfs | \ pad-rootfs | append-metadata - ARTIFACTS := gpt.bin preloader.bin bl31-uboot.fip + ARTIFACTS :=gpt.bin preloader.bin bl31-uboot.fip ARTIFACT/gpt.bin := mt798x-gpt emmc ARTIFACT/preloader.bin := mt7986-bl2 emmc-ddr4 ARTIFACT/bl31-uboot.fip := mt7986-bl31-uboot jdcloud_re-cp-03 @@ -1488,8 +1488,7 @@ define Device/netcore_n60-pro fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb with-initrd | pad-to 64k IMAGE/sysupgrade.itb := append-kernel | \ fit gzip $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb external-static-with-rootfs | append-metadata - DEVICE_PACKAGES := kmod-usb3 kmod-mt7915e kmod-mt7986-firmware mt7986-wo-firmware \ - automount f2fsck mkf2fs + DEVICE_PACKAGES := kmod-mt7915e kmod-mt7986-firmware mt7986-wo-firmware kmod-usb3 automount ARTIFACTS := preloader.bin bl31-uboot.fip ARTIFACT/preloader.bin := mt7986-bl2 spim-nand-ddr4 ARTIFACT/bl31-uboot.fip := mt7986-bl31-uboot netcore_n60-pro @@ -2109,29 +2108,3 @@ define Device/zyxel_nwa50ax-pro IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata endef TARGET_DEVICES += zyxel_nwa50ax-pro - -define Device/superbox_s20-plus - DEVICE_VENDOR := Superbox - DEVICE_MODEL := S20-Plus - DEVICE_DTS := mt7986a-superbox-s20-plus - DEVICE_DTS_DIR := ../dts - DEVICE_DTC_FLAGS := --pad 4096 - DEVICE_DTS_LOADADDR := 0x43f00000 - DEVICE_PACKAGES := kmod-mt7915e kmod-mt7986-firmware mt7986-wo-firmware kmod-usb3 \ - automount e2fsprogs f2fsck mkf2fs - KERNEL_LOADADDR := 0x44000000 - KERNEL := kernel-bin | gzip - KERNEL_INITRAMFS := kernel-bin | lzma | \ - fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb with-initrd | pad-to 64k - KERNEL_INITRAMFS_SUFFIX := -recovery.itb - IMAGES := sysupgrade.itb - IMAGE_SIZE := $$(shell expr 64 + $$(CONFIG_TARGET_ROOTFS_PARTSIZE))m - IMAGE/sysupgrade.itb := append-kernel | \ - fit gzip $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb external-static-with-rootfs | \ - pad-rootfs | append-metadata - ARTIFACTS :=gpt.bin preloader.bin bl31-uboot.fip - ARTIFACT/gpt.bin := mt798x-gpt emmc - ARTIFACT/preloader.bin := mt7986-bl2 emmc-ddr4 - ARTIFACT/bl31-uboot.fip := mt7986-bl31-uboot superbox_s20-plus -endef -TARGET_DEVICES += superbox_s20-plus