Commit ba557cf5 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'arm-soc/for-4.10/defconfig-arm64' of http://github.com/Broadcom/stblinux into next/arm64 

Pull "Broadcom defconfig-arm64 changes for 4.10" from Florian Fainelli:

This pull request contains Broadcom ARM64-based SoCs defconfig changes for 4.10,
please pull the following changes:

- Eric updates the ARMv8 defconfig to contain everything that is needed to run
  a 64-bit kernel on the Raspberry Pi 3

- Scott enables the standard AT25 EEPROM driver as module for the ARM64 defconfig

- Martin enables the Raspberry Pi Thermal driver in the ARM64 defconfig

* tag 'arm-soc/for-4.10/defconfig-arm64' of http://github.com/Broadcom/stblinux:
  ARM64: bcm2835: add thermal driver to default config
  arm64: defconfig: enable EEPROM_AT25 config option
  arm64: Add BCM2835 (Raspberry Pi 3) support to the defconfig
parents dcc96526 9efacfc8

arch/arm64/configs/defconfig

+18 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ CONFIG_MODULE_UNLOAD=y 
# CONFIG_IOSCHED_DEADLINE is not set

CONFIG_ARCH_SUNXI=y

CONFIG_ARCH_ALPINE=y

CONFIG_ARCH_BCM2835=y

CONFIG_ARCH_BCM_IPROC=y

CONFIG_ARCH_BERLIN=y

CONFIG_ARCH_EXYNOS=y
@@ -147,6 +148,7 @@ CONFIG_MTD_SPI_NOR=y 
CONFIG_BLK_DEV_LOOP=y

CONFIG_BLK_DEV_NBD=m

CONFIG_VIRTIO_BLK=y

CONFIG_EEPROM_AT25=m

CONFIG_SRAM=y

# CONFIG_SCSI_PROC_FS is not set

CONFIG_BLK_DEV_SD=y
@@ -197,6 +199,7 @@ CONFIG_USB_NET_SMSC75XX=m 
CONFIG_USB_NET_SMSC95XX=m

CONFIG_USB_NET_PLUSB=m

CONFIG_USB_NET_MCS7830=m

CONFIG_BRCMFMAC=m

CONFIG_WL18XX=m

CONFIG_WLCORE_SDIO=m

CONFIG_INPUT_EVDEV=y
@@ -209,6 +212,9 @@ CONFIG_SERIO_AMBAKMI=y 
CONFIG_LEGACY_PTY_COUNT=16

CONFIG_SERIAL_8250=y

CONFIG_SERIAL_8250_CONSOLE=y

CONFIG_SERIAL_8250_EXTENDED=y

CONFIG_SERIAL_8250_SHARE_IRQ=y

CONFIG_SERIAL_8250_BCM2835AUX=y

CONFIG_SERIAL_8250_DW=y

CONFIG_SERIAL_8250_MT6577=y

CONFIG_SERIAL_8250_UNIPHIER=y
@@ -232,6 +238,7 @@ CONFIG_VIRTIO_CONSOLE=y 
CONFIG_I2C_CHARDEV=y

CONFIG_I2C_MUX=y

CONFIG_I2C_MUX_PCA954x=y

CONFIG_I2C_BCM2835=m

CONFIG_I2C_DESIGNWARE_PLATFORM=y

CONFIG_I2C_IMX=y

CONFIG_I2C_MESON=y
@@ -243,6 +250,8 @@ CONFIG_I2C_RCAR=y 
CONFIG_I2C_CROS_EC_TUNNEL=y

CONFIG_SPI=y

CONFIG_SPI_MESON_SPIFC=m

CONFIG_SPI_BCM2835=m

CONFIG_SPI_BCM2835AUX=m

CONFIG_SPI_ORION=y

CONFIG_SPI_PL022=y

CONFIG_SPI_QUP=y
@@ -275,8 +284,10 @@ CONFIG_THERMAL=y 
CONFIG_THERMAL_EMULATION=y

CONFIG_THERMAL_GOV_POWER_ALLOCATOR=y

CONFIG_CPU_THERMAL=y

CONFIG_BCM2835_THERMAL=y

CONFIG_EXYNOS_THERMAL=y

CONFIG_WATCHDOG=y

CONFIG_BCM2835_WDT=y

CONFIG_RENESAS_WDT=y

CONFIG_S3C2410_WATCHDOG=y

CONFIG_MESON_GXBB_WATCHDOG=m
@@ -313,6 +324,7 @@ CONFIG_DRM_RCAR_HDMI=y 
CONFIG_DRM_RCAR_LVDS=y

CONFIG_DRM_RCAR_VSP=y

CONFIG_DRM_TEGRA=m

CONFIG_DRM_VC4=m

CONFIG_DRM_PANEL_SIMPLE=m

CONFIG_DRM_I2C_ADV7511=m

CONFIG_DRM_HISI_KIRIN=m
@@ -327,6 +339,7 @@ CONFIG_LOGO=y 
CONFIG_SOUND=y

CONFIG_SND=y

CONFIG_SND_SOC=y

CONFIG_SND_BCM2835_SOC_I2S=m

CONFIG_SND_SOC_RCAR=y

CONFIG_SND_SOC_SAMSUNG=y

CONFIG_SND_SOC_AK4613=y
@@ -391,6 +404,7 @@ CONFIG_RTC_DRV_XGENE=y 
CONFIG_RTC_DRV_S3C=y

CONFIG_DMADEVICES=y

CONFIG_PL330_DMA=y

CONFIG_DMA_BCM2835=m

CONFIG_TEGRA20_APB_DMA=y

CONFIG_QCOM_BAM_DMA=y

CONFIG_QCOM_HIDMA_MGMT=y
@@ -416,8 +430,10 @@ CONFIG_HWSPINLOCK_QCOM=y 
CONFIG_MAILBOX=y

CONFIG_ARM_MHU=y

CONFIG_PLATFORM_MHU=y

CONFIG_BCM2835_MBOX=y

CONFIG_HI6220_MBOX=y

CONFIG_ARM_SMMU=y

CONFIG_RASPBERRYPI_POWER=y

CONFIG_QCOM_SMEM=y

CONFIG_QCOM_SMD=y

CONFIG_QCOM_SMD_RPM=y
@@ -426,6 +442,7 @@ CONFIG_ARCH_TEGRA_210_SOC=y 
CONFIG_ARCH_TEGRA_186_SOC=y

CONFIG_EXTCON_USB_GPIO=y

CONFIG_PWM=y

CONFIG_PWM_BCM2835=m

CONFIG_PWM_TEGRA=m

CONFIG_PWM_MESON=m

CONFIG_COMMON_RESET_HI6220=y
@@ -438,6 +455,7 @@ CONFIG_ACPI=y 
CONFIG_IIO=y

CONFIG_EXYNOS_ADC=y

CONFIG_PWM_SAMSUNG=y

CONFIG_RASPBERRYPI_FIRMWARE=y

CONFIG_EXT2_FS=y

CONFIG_EXT3_FS=y

CONFIG_EXT4_FS_POSIX_ACL=y

CRA Git | Maintained and supported by SUSTech CRA and CCSE