diff options
| author | Olof Johansson <olof@lixom.net> | 2018-09-25 11:39:42 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2018-09-25 11:39:42 -0700 |
| commit | 478bf0b470987a7d833999ff5066e3752182bf93 (patch) | |
| tree | 2565fbc52cfee1c08553cb7250ead632751471d3 /arch/arm64 | |
| parent | 786bd99c91f50482fb9e2b828b203d7e8acc1b56 (diff) | |
| parent | 7265b3d9ddaae3dfbda9b1d1436809a6d1b5da7f (diff) | |
| download | linux-478bf0b470987a7d833999ff5066e3752182bf93.tar.gz linux-478bf0b470987a7d833999ff5066e3752182bf93.tar.bz2 linux-478bf0b470987a7d833999ff5066e3752182bf93.zip | |
Merge tag 'hisi-defconfig-for-4.20' of git://github.com/hisilicon/linux-hisi into next/defconfig
ARM64: hisilicon: defconfig updates for 4.20
- Enable integrated NIC driver(hns3) for hisilicon SoCs
- Enable PCIe Port bus to support some PCIe features like
AER, hotplug, PME and DPC
* tag 'hisi-defconfig-for-4.20' of git://github.com/hisilicon/linux-hisi:
arm64: defconfig: Enable PCIEPORTBUS
arm64: defconfig: enable HiSilicon HNS3 driver
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm64')
| -rw-r--r-- | arch/arm64/configs/defconfig | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index db8d364f8476..a9a2561410be 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -68,6 +68,7 @@ CONFIG_ARCH_XGENE=y CONFIG_ARCH_ZX=y CONFIG_ARCH_ZYNQMP=y CONFIG_PCI=y +CONFIG_PCIEPORTBUS=y CONFIG_PCI_IOV=y CONFIG_HOTPLUG_PCI=y CONFIG_HOTPLUG_PCI_ACPI=y @@ -222,6 +223,9 @@ CONFIG_THUNDER_NIC_PF=y CONFIG_HIX5HD2_GMAC=y CONFIG_HNS_DSAF=y CONFIG_HNS_ENET=y +CONFIG_HNS3=y +CONFIG_HNS3_HCLGE=y +CONFIG_HNS3_ENET=y CONFIG_E1000E=y CONFIG_IGB=y CONFIG_IGBVF=y |