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

Merge tag 'imx-defconfig64-4.7' of... 

Merge tag 'imx-defconfig64-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/arm64

Merge "The arm64 defconfig update for Freescale/NXP support" from Shawn Guo:

 - Clean up defconfig with savedefconfig
 - Enable 48-bit virtual address support
 - Enable driver support for various Freescale/NXP devices

* tag 'imx-defconfig64-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  arm64: defconfig: enable freescale/nxp config options
  arm64: defconfig: enable 48-bit virtual addresses
  arm64: defconfig: cleanup the defconfig
parents e45a70be 3892132c

arch/arm64/configs/defconfig

+10 −2
Original line number Original line Diff line number Diff line 
# CONFIG_LOCALVERSION_AUTO is not set

# CONFIG_LOCALVERSION_AUTO is not set

CONFIG_SYSVIPC=y

CONFIG_SYSVIPC=y

CONFIG_POSIX_MQUEUE=y

CONFIG_POSIX_MQUEUE=y

CONFIG_FHANDLE=y

CONFIG_AUDIT=y

CONFIG_AUDIT=y

CONFIG_NO_HZ_IDLE=y

CONFIG_NO_HZ_IDLE=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_HIGH_RES_TIMERS=y
@@ -64,6 +63,7 @@ CONFIG_PCI_XGENE=y 
CONFIG_PCI_LAYERSCAPE=y

CONFIG_PCI_LAYERSCAPE=y

CONFIG_PCI_HISI=y

CONFIG_PCI_HISI=y

CONFIG_PCIE_QCOM=y

CONFIG_PCIE_QCOM=y

CONFIG_ARM64_VA_BITS_48=y

CONFIG_SCHED_MC=y

CONFIG_SCHED_MC=y

CONFIG_PREEMPT=y

CONFIG_PREEMPT=y

CONFIG_KSM=y

CONFIG_KSM=y
@@ -107,6 +107,7 @@ CONFIG_SATA_AHCI_PLATFORM=y 
CONFIG_AHCI_CEVA=y

CONFIG_AHCI_CEVA=y

CONFIG_AHCI_MVEBU=y

CONFIG_AHCI_MVEBU=y

CONFIG_AHCI_XGENE=y

CONFIG_AHCI_XGENE=y

CONFIG_AHCI_QORIQ=y

CONFIG_SATA_RCAR=y

CONFIG_SATA_RCAR=y

CONFIG_PATA_PLATFORM=y

CONFIG_PATA_PLATFORM=y

CONFIG_PATA_OF_PLATFORM=y

CONFIG_PATA_OF_PLATFORM=y
@@ -164,7 +165,10 @@ CONFIG_SERIAL_MVEBU_UART=y 
CONFIG_VIRTIO_CONSOLE=y

CONFIG_VIRTIO_CONSOLE=y

# CONFIG_HW_RANDOM is not set

# CONFIG_HW_RANDOM is not set

CONFIG_I2C_CHARDEV=y

CONFIG_I2C_CHARDEV=y

CONFIG_I2C_MUX=y

CONFIG_I2C_MUX_PCA954x=y

CONFIG_I2C_DESIGNWARE_PLATFORM=y

CONFIG_I2C_DESIGNWARE_PLATFORM=y

CONFIG_I2C_IMX=y

CONFIG_I2C_MV64XXX=y

CONFIG_I2C_MV64XXX=y

CONFIG_I2C_QUP=y

CONFIG_I2C_QUP=y

CONFIG_I2C_TEGRA=y

CONFIG_I2C_TEGRA=y
@@ -186,7 +190,8 @@ CONFIG_GPIO_XGENE=y 
CONFIG_POWER_RESET_MSM=y

CONFIG_POWER_RESET_MSM=y

CONFIG_POWER_RESET_XGENE=y

CONFIG_POWER_RESET_XGENE=y

CONFIG_POWER_RESET_SYSCON=y

CONFIG_POWER_RESET_SYSCON=y

# CONFIG_HWMON is not set

CONFIG_SENSORS_LM90=m

CONFIG_SENSORS_INA2XX=m

CONFIG_THERMAL=y

CONFIG_THERMAL=y

CONFIG_THERMAL_EMULATION=y

CONFIG_THERMAL_EMULATION=y

CONFIG_EXYNOS_THERMAL=y

CONFIG_EXYNOS_THERMAL=y
@@ -234,6 +239,7 @@ CONFIG_MMC_BLOCK_MINORS=32 
CONFIG_MMC_ARMMMCI=y

CONFIG_MMC_ARMMMCI=y

CONFIG_MMC_SDHCI=y

CONFIG_MMC_SDHCI=y

CONFIG_MMC_SDHCI_PLTFM=y

CONFIG_MMC_SDHCI_PLTFM=y

CONFIG_MMC_SDHCI_OF_ESDHC=y

CONFIG_MMC_SDHCI_TEGRA=y

CONFIG_MMC_SDHCI_TEGRA=y

CONFIG_MMC_SDHCI_MSM=y

CONFIG_MMC_SDHCI_MSM=y

CONFIG_MMC_SPI=y

CONFIG_MMC_SPI=y
@@ -250,6 +256,7 @@ CONFIG_LEDS_TRIGGER_HEARTBEAT=y 
CONFIG_LEDS_TRIGGER_CPU=y

CONFIG_LEDS_TRIGGER_CPU=y

CONFIG_RTC_CLASS=y

CONFIG_RTC_CLASS=y

CONFIG_RTC_DRV_S5M=y

CONFIG_RTC_DRV_S5M=y

CONFIG_RTC_DRV_DS3232=y

CONFIG_RTC_DRV_EFI=y

CONFIG_RTC_DRV_EFI=y

CONFIG_RTC_DRV_PL031=y

CONFIG_RTC_DRV_PL031=y

CONFIG_RTC_DRV_SUN6I=y

CONFIG_RTC_DRV_SUN6I=y
@@ -268,6 +275,7 @@ CONFIG_XEN_GNTDEV=y 
CONFIG_XEN_GRANT_DEV_ALLOC=y

CONFIG_XEN_GRANT_DEV_ALLOC=y

CONFIG_COMMON_CLK_SCPI=y

CONFIG_COMMON_CLK_SCPI=y

CONFIG_COMMON_CLK_CS2000_CP=y

CONFIG_COMMON_CLK_CS2000_CP=y

CONFIG_CLK_QORIQ=y

CONFIG_COMMON_CLK_QCOM=y

CONFIG_COMMON_CLK_QCOM=y

CONFIG_MSM_GCC_8916=y

CONFIG_MSM_GCC_8916=y

CONFIG_HWSPINLOCK_QCOM=y

CONFIG_HWSPINLOCK_QCOM=y

CRA Git | Maintained and supported by SUSTech CRA and CCSE