Skip to content

Commit bba9d2b

Browse files
committed
Merge tag 'arm-soc/for-5.6/defconfig-arm64' of https://github.com/Broadcom/stblinux into arm/defconfig
This pull request contains Broadcom ARM64-based SoCs defconfig changes for 5.6, please pull the following: - Nicolas enables the Broadcom GENET controller and Broadcom STB PCIe Root Complex driver as a module for the ARM64 defconfig. The PCIe RC driver will go through the PCIe maintainers pull request for 5.6. * tag 'arm-soc/for-5.6/defconfig-arm64' of https://github.com/Broadcom/stblinux: arm64: defconfig: Enable Broadcom's GENET Ethernet controller arm64: defconfig: Enable Broadcom's STB PCIe controller Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Olof Johansson <[email protected]>
2 parents 0109ef6 + e926791 commit bba9d2b

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

arch/arm64/configs/defconfig

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -193,6 +193,7 @@ CONFIG_PCIE_ALTERA_MSI=y
193193
CONFIG_PCI_HOST_THUNDER_PEM=y
194194
CONFIG_PCI_HOST_THUNDER_ECAM=y
195195
CONFIG_PCIE_ROCKCHIP_HOST=m
196+
CONFIG_PCIE_BRCMSTB=m
196197
CONFIG_PCI_LAYERSCAPE=y
197198
CONFIG_PCI_HISI=y
198199
CONFIG_PCIE_QCOM=y
@@ -255,6 +256,7 @@ CONFIG_VIRTIO_NET=y
255256
CONFIG_AMD_XGBE=y
256257
CONFIG_NET_XGENE=y
257258
CONFIG_ATL1C=m
259+
CONFIG_BCMGENET=m
258260
CONFIG_BNX2X=m
259261
CONFIG_MACB=y
260262
CONFIG_THUNDER_NIC_PF=y

0 commit comments

Comments
 (0)