From 4e70549af39bfab204125846ed85ec6a7a3fef47 Mon Sep 17 00:00:00 2001 From: Maxim Karasev Date: Fri, 23 Jul 2021 00:52:34 +0300 Subject: [PATCH] main/linux-postmarketos-allwinner: enable EMAC and GMAC in aarch64 config (MR 2377) This is needed to get ethernet working on most 64-bit sunxi boards. Basically just synced with armv7 config a bit. [ci:skip-build] already built successfully in CI --- main/linux-postmarketos-allwinner/APKBUILD | 4 ++-- .../config-postmarketos-allwinner.aarch64 | 21 ++++++++++++++----- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/main/linux-postmarketos-allwinner/APKBUILD b/main/linux-postmarketos-allwinner/APKBUILD index fb9826e00..0a6dd8e0a 100644 --- a/main/linux-postmarketos-allwinner/APKBUILD +++ b/main/linux-postmarketos-allwinner/APKBUILD @@ -7,7 +7,7 @@ _flavor=postmarketos-allwinner _config="config-$_flavor.$CARCH" pkgname=linux-$_flavor pkgver=5.12.12_git20210620 -pkgrel=2 +pkgrel=3 _tag="orange-pi-5.12-20210620-0242" pkgdesc="Kernel fork with Pine64 patches (megi's tree, slightly patched)" arch="aarch64 armv7" @@ -94,7 +94,7 @@ dev() { sha512sums=" 27f6b010841b912641cd470ffc9371e93bcee023f595eec79b04810bf3ca313b7b8cb2104e1f133ee84c17c987b739a5fe87ffaba2d0127fc3b087cf3f9be34f linux-postmarketos-allwinner-orange-pi-5.12-20210620-0242.tar.gz -c2e72510d242380845f1c39cf29b664b68674bc7597d788fde511dc530e3644d1143e2466afbcbfb2dce087ce77c5f317776084fe7232a7ae3f8e5214644dcbd config-postmarketos-allwinner.aarch64 +faa5496afa5e04bbe3ece396531f8c020cbadbbcf17a641418491e9921ecdc8f014d55996ddb696afdfd420b5da5fbddc5bb0f69e30f04458c8510e1bcd3418a config-postmarketos-allwinner.aarch64 1e874f128cd353e84fca2abed6273f805d6689d749cbf647cb6dc9af0b61018169e1dec1fc1979790985eef9ba84f77f525d2acf7cc92ff9cccffdbc886ff122 config-postmarketos-allwinner.armv7 126e0a65e04f22f14eac1281a69000d9d5b107ed8fd1b52f37e812751f55e6c45b0240ceac61c9d95ae7f0543aaf9d96b85a8532baf59283c077b9945e615367 0001-dts-add-dontbeevil-pinephone-devkit.patch 1dc710f5abacdd5698169d5e985efeca8114986c774c3d65e89812d08ceb3db5ebdc6dd64dd76a262c761f3bfc3ffb6bc237fd5236bd1f89c5975d12e42eda04 0002-dts-add-pinetab-dev-old-display-panel.patch diff --git a/main/linux-postmarketos-allwinner/config-postmarketos-allwinner.aarch64 b/main/linux-postmarketos-allwinner/config-postmarketos-allwinner.aarch64 index 949c80f99..99acd8f02 100644 --- a/main/linux-postmarketos-allwinner/config-postmarketos-allwinner.aarch64 +++ b/main/linux-postmarketos-allwinner/config-postmarketos-allwinner.aarch64 @@ -1443,6 +1443,7 @@ CONFIG_RFKILL_INPUT=y # CONFIG_LWTUNNEL is not set CONFIG_DST_CACHE=y CONFIG_GRO_CELLS=y +CONFIG_PAGE_POOL=y # CONFIG_FAILOVER is not set CONFIG_ETHTOOL_NETLINK=y CONFIG_HAVE_EBPF_JIT=y @@ -1681,7 +1682,7 @@ CONFIG_TARGET_CORE=m # CONFIG_LOOPBACK_TARGET is not set # CONFIG_ISCSI_TARGET is not set CONFIG_NETDEVICES=y -CONFIG_MII=m +CONFIG_MII=y CONFIG_NET_CORE=y # CONFIG_BONDING is not set # CONFIG_DUMMY is not set @@ -1710,7 +1711,7 @@ CONFIG_VETH=m CONFIG_ETHERNET=y # CONFIG_NET_VENDOR_ALACRITECH is not set CONFIG_NET_VENDOR_ALLWINNER=y -# CONFIG_SUN4I_EMAC is not set +CONFIG_SUN4I_EMAC=y # CONFIG_ALTERA_TSE is not set # CONFIG_NET_VENDOR_AMAZON is not set # CONFIG_NET_VENDOR_AMD is not set @@ -1747,15 +1748,25 @@ CONFIG_RMNET=m # CONFIG_NET_VENDOR_SOLARFLARE is not set # CONFIG_NET_VENDOR_SMSC is not set # CONFIG_NET_VENDOR_SOCIONEXT is not set -# CONFIG_NET_VENDOR_STMICRO is not set +CONFIG_NET_VENDOR_STMICRO=y +CONFIG_STMMAC_ETH=y +# CONFIG_STMMAC_SELFTESTS is not set +CONFIG_STMMAC_PLATFORM=y +# CONFIG_DWMAC_DWC_QOS_ETH is not set +CONFIG_DWMAC_GENERIC=y +CONFIG_DWMAC_SUNXI=y +CONFIG_DWMAC_SUN8I=y +# CONFIG_DWMAC_INTEL_PLAT is not set # CONFIG_NET_VENDOR_SYNOPSYS is not set # CONFIG_NET_VENDOR_VIA is not set # CONFIG_NET_VENDOR_WIZNET is not set # CONFIG_NET_VENDOR_XILINX is not set +CONFIG_PHYLINK=y CONFIG_PHYLIB=y CONFIG_SWPHY=y # CONFIG_LED_TRIGGER_PHY is not set CONFIG_FIXED_PHY=y +# CONFIG_SFP is not set # # MII PHY device drivers @@ -1803,7 +1814,7 @@ CONFIG_MDIO_DEVICE=y CONFIG_MDIO_BUS=y CONFIG_OF_MDIO=y CONFIG_MDIO_DEVRES=y -# CONFIG_MDIO_SUN4I is not set +CONFIG_MDIO_SUN4I=y CONFIG_MDIO_BITBANG=y # CONFIG_MDIO_BCM_UNIMAC is not set # CONFIG_MDIO_GPIO is not set @@ -1825,7 +1836,7 @@ CONFIG_MDIO_BUS_MUX_MMIOREG=y # # PCS device drivers # -# CONFIG_PCS_XPCS is not set +CONFIG_PCS_XPCS=y # end of PCS device drivers # CONFIG_PPP is not set