Commit fd2307ee authored by Arnd Bergmann's avatar Arnd Bergmann

Merge tag 'arm-soc/for-5.18/defconfig-arm64' of...

Merge tag 'arm-soc/for-5.18/defconfig-arm64' of https://github.com/Broadcom/stblinux into arm/defconfig

This pull request contains Broadcom ARM64-based defconfig updates for
5.18, please pull the following:

- Florian enables Broadcom STB drivers for NAND, SATA, Ethernet switch,
USB PHY and host controllers, watchdog, PWM and Ethernet controller

* tag 'arm-soc/for-5.18/defconfig-arm64' of https://github.com/Broadcom/stblinux:
  arm64: defconfig: Enable additional Broadcom STB drivers
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents b3b44f50 d20e1df5
...@@ -263,6 +263,7 @@ CONFIG_MTD_PHYSMAP_OF=y ...@@ -263,6 +263,7 @@ CONFIG_MTD_PHYSMAP_OF=y
CONFIG_MTD_DATAFLASH=y CONFIG_MTD_DATAFLASH=y
CONFIG_MTD_SST25L=y CONFIG_MTD_SST25L=y
CONFIG_MTD_RAW_NAND=y CONFIG_MTD_RAW_NAND=y
CONFIG_MTD_NAND_BRCMNAND=m
CONFIG_MTD_NAND_DENALI_DT=y CONFIG_MTD_NAND_DENALI_DT=y
CONFIG_MTD_NAND_MARVELL=y CONFIG_MTD_NAND_MARVELL=y
CONFIG_MTD_NAND_FSL_IFC=y CONFIG_MTD_NAND_FSL_IFC=y
...@@ -292,6 +293,7 @@ CONFIG_SCSI_UFS_EXYNOS=y ...@@ -292,6 +293,7 @@ CONFIG_SCSI_UFS_EXYNOS=y
CONFIG_ATA=y CONFIG_ATA=y
CONFIG_SATA_AHCI=y CONFIG_SATA_AHCI=y
CONFIG_SATA_AHCI_PLATFORM=y CONFIG_SATA_AHCI_PLATFORM=y
CONFIG_AHCI_BRCM=m
CONFIG_AHCI_CEVA=y CONFIG_AHCI_CEVA=y
CONFIG_AHCI_MVEBU=y CONFIG_AHCI_MVEBU=y
CONFIG_AHCI_XGENE=y CONFIG_AHCI_XGENE=y
...@@ -311,11 +313,13 @@ CONFIG_MACVTAP=m ...@@ -311,11 +313,13 @@ CONFIG_MACVTAP=m
CONFIG_TUN=y CONFIG_TUN=y
CONFIG_VETH=m CONFIG_VETH=m
CONFIG_VIRTIO_NET=y CONFIG_VIRTIO_NET=y
CONFIG_NET_DSA_BCM_SF2=m
CONFIG_NET_DSA_MSCC_FELIX=m CONFIG_NET_DSA_MSCC_FELIX=m
CONFIG_AMD_XGBE=y CONFIG_AMD_XGBE=y
CONFIG_NET_XGENE=y CONFIG_NET_XGENE=y
CONFIG_ATL1C=m CONFIG_ATL1C=m
CONFIG_BCMGENET=m CONFIG_BCMGENET=m
CONFIG_SYSTEMPORT=m
CONFIG_BNX2X=m CONFIG_BNX2X=m
CONFIG_MACB=y CONFIG_MACB=y
CONFIG_THUNDER_NIC_PF=y CONFIG_THUNDER_NIC_PF=y
...@@ -368,6 +372,7 @@ CONFIG_DP83867_PHY=y ...@@ -368,6 +372,7 @@ CONFIG_DP83867_PHY=y
CONFIG_VITESSE_PHY=y CONFIG_VITESSE_PHY=y
CONFIG_MDIO_BUS_MUX_MULTIPLEXER=y CONFIG_MDIO_BUS_MUX_MULTIPLEXER=y
CONFIG_MDIO_BUS_MUX_MMIOREG=y CONFIG_MDIO_BUS_MUX_MMIOREG=y
CONFIG_USB_BRCMSTB=m
CONFIG_USB_PEGASUS=m CONFIG_USB_PEGASUS=m
CONFIG_USB_RTL8150=m CONFIG_USB_RTL8150=m
CONFIG_USB_RTL8152=m CONFIG_USB_RTL8152=m
...@@ -598,6 +603,7 @@ CONFIG_SL28CPLD_WATCHDOG=m ...@@ -598,6 +603,7 @@ CONFIG_SL28CPLD_WATCHDOG=m
CONFIG_ARM_SP805_WATCHDOG=y CONFIG_ARM_SP805_WATCHDOG=y
CONFIG_ARM_SBSA_WATCHDOG=y CONFIG_ARM_SBSA_WATCHDOG=y
CONFIG_S3C2410_WATCHDOG=y CONFIG_S3C2410_WATCHDOG=y
CONFIG_BCM7038_WDT=m
CONFIG_DW_WATCHDOG=y CONFIG_DW_WATCHDOG=y
CONFIG_SUNXI_WATCHDOG=m CONFIG_SUNXI_WATCHDOG=m
CONFIG_IMX2_WDT=y CONFIG_IMX2_WDT=y
...@@ -1123,6 +1129,7 @@ CONFIG_IIO_CROS_EC_BARO=m ...@@ -1123,6 +1129,7 @@ CONFIG_IIO_CROS_EC_BARO=m
CONFIG_MPL3115=m CONFIG_MPL3115=m
CONFIG_PWM=y CONFIG_PWM=y
CONFIG_PWM_BCM2835=m CONFIG_PWM_BCM2835=m
CONFIG_PWM_BRCMSTB=m
CONFIG_PWM_CROS_EC=m CONFIG_PWM_CROS_EC=m
CONFIG_PWM_IMX27=m CONFIG_PWM_IMX27=m
CONFIG_PWM_MESON=m CONFIG_PWM_MESON=m
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment