From fb430b48e7548cd037069b3e30ad08ff6e4e0ced Mon Sep 17 00:00:00 2001 From: Hugo Yuan <429632952@163.com> Date: Tue, 20 Jul 2021 18:47:57 +0800 Subject: [PATCH 1/2] ipq806x: RT4230W add NSS Hardware Offloading support (#7452) --- .../boot/dts/qcom-ipq8065-rt4230w-rev6.dts | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8065-rt4230w-rev6.dts b/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8065-rt4230w-rev6.dts index 7342de4be..7afb0c37f 100644 --- a/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8065-rt4230w-rev6.dts +++ b/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8065-rt4230w-rev6.dts @@ -244,12 +244,29 @@ 0x00054 0xc832c832 /* LED_CTRL_1 */ >; }; + phy4: ethernet-phy@4 { + reg = <4>; + }; }; &gmac0 { status = "okay"; + compatible = "qcom,nss-gmac"; + reg = <0x37000000 0x200000>; + interrupts = ; phy-mode = "rgmii"; qcom,id = <0>; + qcom,pcs-chanid = <0>; + qcom,phy-mdio-addr = <0>; + qcom,poll-required = <0>; + qcom,rgmii-delay = <1>; + qcom,phy_mii_type = <0>; + qcom,emulation = <0>; + qcom,forced-speed = <1000>; + qcom,forced-duplex = <1>; + qcom,socver = <0>; + qcom,irq = <255>; + mdiobus = <&mdio0>; mtd-mac-address = <&ART 0x0>; @@ -264,8 +281,22 @@ &gmac1 { status = "okay"; + compatible = "qcom,nss-gmac"; + reg = <0x37200000 0x200000>; + interrupts = ; phy-mode = "sgmii"; qcom,id = <1>; + qcom,pcs-chanid = <1>; + qcom,phy-mdio-addr = <4>; + qcom,poll-required = <0>; /* no polling */ + qcom,rgmii-delay = <0>; + qcom,phy_mii_type = <1>; + qcom,emulation = <0>; + qcom,forced-speed = <1000>; + qcom,forced-duplex = <1>; + qcom,socver = <0>; + qcom,irq = <258>; + mdiobus = <&mdio0>; mtd-mac-address = <&ART 0x6>; From ca98361637b442f886927e7f8f1576ee3c962483 Mon Sep 17 00:00:00 2001 From: Beginner <70857188+Beginner-Go@users.noreply.github.com> Date: Tue, 20 Jul 2021 18:48:13 +0800 Subject: [PATCH 2/2] x86: include kmod-fs-vfat by default in generic images (#7450) As x86/64 and x86/generic may be using UEFI, mounting the FAT-32 /boot is necessary in order not to loose configuration files accross sysupgrades. Include kmod-fs-vfat by default to make sure /boot can always be mounted. Signed-off-by: Daniel Golle Co-authored-by: Daniel Golle --- target/linux/x86/image/64.mk | 2 +- target/linux/x86/image/generic.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/target/linux/x86/image/64.mk b/target/linux/x86/image/64.mk index 9b53a2378..30e02d001 100644 --- a/target/linux/x86/image/64.mk +++ b/target/linux/x86/image/64.mk @@ -1,7 +1,7 @@ define Device/generic DEVICE_TITLE := Generic x86/64 DEVICE_PACKAGES += kmod-amazon-ena kmod-bnx2 kmod-e1000e kmod-e1000 \ - kmod-forcedeth kmod-igb kmod-ixgbe kmod-amd-xgbe kmod-r8168 + kmod-forcedeth kmod-igb kmod-ixgbe kmod-amd-xgbe kmod-r8168 kmod-fs-vfat GRUB2_VARIANT := generic endef TARGET_DEVICES += generic diff --git a/target/linux/x86/image/generic.mk b/target/linux/x86/image/generic.mk index e55675827..dbdc4ca76 100644 --- a/target/linux/x86/image/generic.mk +++ b/target/linux/x86/image/generic.mk @@ -2,7 +2,7 @@ define Device/generic DEVICE_TITLE := Generic x86 DEVICE_PACKAGES += kmod-3c59x kmod-8139too kmod-e100 kmod-e1000 kmod-natsemi \ kmod-ne2k-pci kmod-pcnet32 kmod-r8168 kmod-sis900 kmod-tg3 \ - kmod-via-rhine kmod-via-velocity kmod-forcedeth + kmod-via-rhine kmod-via-velocity kmod-forcedeth kmod-fs-vfat GRUB2_VARIANT := generic endef TARGET_DEVICES += generic