summaryrefslogtreecommitdiffstats
path: root/kernel-armv7hl.config
diff options
context:
space:
mode:
authorPeter Robinson <pbrobinson@gmail.com>2019-07-22 00:42:57 +0100
committerPeter Robinson <pbrobinson@gmail.com>2019-07-22 00:42:57 +0100
commitcb88675efe2006563ccda3ab61d59cf1db71568d (patch)
treec2d9b156073b98c1389c5eed18d498dfd4c5f18b /kernel-armv7hl.config
parent364bffc7b72f390b2c7253e1ba611cc86be3bc4a (diff)
downloadkernel-cb88675efe2006563ccda3ab61d59cf1db71568d.tar.gz
kernel-cb88675efe2006563ccda3ab61d59cf1db71568d.tar.xz
kernel-cb88675efe2006563ccda3ab61d59cf1db71568d.zip
arm updates for 5.3 part 2
Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
Diffstat (limited to 'kernel-armv7hl.config')
-rw-r--r--kernel-armv7hl.config21
1 files changed, 8 insertions, 13 deletions
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index 08062f4fc..e608b7e3d 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -551,6 +551,7 @@ CONFIG_BATTERY_DA9052=m
# CONFIG_BATTERY_MAX17040 is not set
# CONFIG_BATTERY_MAX17042 is not set
# CONFIG_BATTERY_MAX1721X is not set
+CONFIG_BATTERY_OLPC=m
CONFIG_BATTERY_RX51=m
CONFIG_BATTERY_SBS=m
CONFIG_BATTERY_TWL4030_MADC=m
@@ -1691,8 +1692,8 @@ CONFIG_DVB_USB_ZD1301=m
CONFIG_DW_DMAC_CORE=m
CONFIG_DW_DMAC=m
CONFIG_DW_DMAC_PCI=m
-# CONFIG_DW_EDMA is not set
-# CONFIG_DW_EDMA_PCIE is not set
+CONFIG_DW_EDMA=m
+CONFIG_DW_EDMA_PCIE=m
CONFIG_DWMAC_DWC_QOS_ETH=m
CONFIG_DWMAC_GENERIC=m
CONFIG_DWMAC_IPQ806X=m
@@ -1838,7 +1839,6 @@ CONFIG_FB_EFI=y
# CONFIG_FB_METRONOME is not set
CONFIG_FB_MODE_HELPERS=y
# CONFIG_FB_MX3 is not set
-CONFIG_FB_MXS=m
# CONFIG_FB_NEOMAGIC is not set
# CONFIG_FB_NVIDIA is not set
# CONFIG_FB_OPENCORES is not set
@@ -1930,7 +1930,7 @@ CONFIG_FSI_SCOM=m
# CONFIG_FSL_ENETC is not set
# CONFIG_FSL_ENETC_PTP_CLOCK is not set
# CONFIG_FSL_ENETC_VF is not set
-CONFIG_FSL_IMX8_DDR_PMU=m
+# CONFIG_FSL_IMX8_DDR_PMU is not set
# CONFIG_FSL_PQ_MDIO is not set
# CONFIG_FSL_QDMA is not set
# CONFIG_FSL_XGMAC_MDIO is not set
@@ -2494,9 +2494,8 @@ CONFIG_IMX_IPUV3_CORE=m
# CONFIG_IMX_IRQSTEER is not set
CONFIG_IMX_MBOX=m
CONFIG_IMX_REMOTEPROC=m
-# CONFIG_IMX_SCU_PD is not set
+# CONFIG_IMX_SCU is not set
# CONFIG_IMX_SCU_SOC is not set
-CONFIG_IMX_SCU=y
CONFIG_IMX_SC_WDT=m
CONFIG_IMX_SDMA=m
CONFIG_IMX_THERMAL=m
@@ -4327,10 +4326,8 @@ CONFIG_NOUVEAU_PLATFORM_DRIVER=y
CONFIG_NOZOMI=m
CONFIG_NR_CPUS=32
CONFIG_NS83820=m
-CONFIG_NTB_IDT=m
# CONFIG_NTB is not set
# CONFIG_NTB_MSI is not set
-CONFIG_NTB_SWITCHTEC=m
# CONFIG_NTFS_FS is not set
CONFIG_NULL_TTY=m
CONFIG_NVEC_PAZ00=y
@@ -4338,7 +4335,6 @@ CONFIG_NVEC_POWER=y
CONFIG_NVME_FC=m
CONFIG_NVMEM_IMX_IIM=m
CONFIG_NVMEM_IMX_OCOTP=m
-# CONFIG_NVMEM_IMX_OCOTP_SCU is not set
# CONFIG_NVMEM_REBOOT_MODE is not set
CONFIG_NVMEM_SNVS_LPGPR=m
CONFIG_NVMEM_STM32_ROMEM=m
@@ -4380,7 +4376,8 @@ CONFIG_OF_RESERVED_MEM=y
CONFIG_OF_RESOLVE=y
# CONFIG_OF_UNITTEST is not set
CONFIG_OF=y
-# CONFIG_OLPC_XO175 is not set
+CONFIG_OLPC_EC=y
+CONFIG_OLPC_XO175=y
# CONFIG_OMAP2_DSS_DEBUGFS is not set
# CONFIG_OMAP2_DSS_DEBUG is not set
CONFIG_OMAP2_DSS_DPI=y
@@ -4659,7 +4656,6 @@ CONFIG_PINCTRL_CEDARFORK=m
CONFIG_PINCTRL_DOVE=y
# CONFIG_PINCTRL_GEMINILAKE is not set
CONFIG_PINCTRL_IMX6SL=y
-# CONFIG_PINCTRL_IMX8MN is not set
# CONFIG_PINCTRL_IPQ4019 is not set
# CONFIG_PINCTRL_IPQ8064 is not set
# CONFIG_PINCTRL_IPQ8074 is not set
@@ -6360,7 +6356,6 @@ CONFIG_SPI_STM32_QSPI=m
CONFIG_SPI_ST_SSC4=m
CONFIG_SPI_SUN4I=m
CONFIG_SPI_SUN6I=m
-# CONFIG_SPI_SYNQUACER is not set
CONFIG_SPI_TEGRA114=m
CONFIG_SPI_TEGRA20_SFLASH=m
CONFIG_SPI_TEGRA20_SLINK=m
@@ -7381,7 +7376,7 @@ CONFIG_VIDEO_MESON_AO_CEC=m
CONFIG_VIDEO_MESON_G12A_AO_CEC=m
CONFIG_VIDEO_MESON_VDEC=m
CONFIG_VIDEO_MEYE=m
-# CONFIG_VIDEO_MMP_CAMERA is not set
+CONFIG_VIDEO_MMP_CAMERA=m
CONFIG_VIDEO_MUX=m
CONFIG_VIDEO_MXB=m
# CONFIG_VIDEO_OMAP3_DEBUG is not set