From 7adb27af9a0b0b6b8cb12db687e563a68be315c8 Mon Sep 17 00:00:00 2001 From: Michael Hennerich Date: Wed, 8 Aug 2018 16:06:43 +0200 Subject: [PATCH] arch: arm: configs: zynq_pluto_defconfig: Update for kernel 4.14 Signed-off-by: Michael Hennerich --- arch/arm/configs/zynq_pluto_defconfig | 31 ++++++++++++++++++--------- 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/arch/arm/configs/zynq_pluto_defconfig b/arch/arm/configs/zynq_pluto_defconfig index 84369e156b2141..cf4e499656aa0d 100644 --- a/arch/arm/configs/zynq_pluto_defconfig +++ b/arch/arm/configs/zynq_pluto_defconfig @@ -26,7 +26,6 @@ CONFIG_XILINX_RESET_CODE=y CONFIG_PL310_ERRATA_588369=y CONFIG_PL310_ERRATA_727915=y CONFIG_PL310_ERRATA_769419=y -# CONFIG_DEBUG_RODATA is not set # CONFIG_ARM_ERRATA_643719 is not set CONFIG_ARM_ERRATA_754322=y CONFIG_ARM_ERRATA_754327=y @@ -36,7 +35,6 @@ CONFIG_SMP=y CONFIG_SCHED_MC=y CONFIG_SCHED_SMT=y CONFIG_PREEMPT=y -CONFIG_AEABI=y CONFIG_HIGHMEM=y # CONFIG_HIGHPTE is not set # CONFIG_COMPACTION is not set @@ -91,19 +89,36 @@ CONFIG_SCSI=y CONFIG_BLK_DEV_SD=y CONFIG_CHR_DEV_SG=y CONFIG_NETDEVICES=y +# CONFIG_NET_VENDOR_ALACRITECH is not set +# CONFIG_NET_VENDOR_AMAZON is not set +# CONFIG_NET_VENDOR_AQUANTIA is not set +# CONFIG_NET_VENDOR_ARC is not set +# CONFIG_NET_CADENCE is not set # CONFIG_NET_VENDOR_BROADCOM is not set # CONFIG_NET_VENDOR_CIRRUS is not set +# CONFIG_NET_VENDOR_EZCHIP is not set # CONFIG_NET_VENDOR_FARADAY is not set +# CONFIG_NET_VENDOR_HISILICON is not set +# CONFIG_NET_VENDOR_HUAWEI is not set # CONFIG_NET_VENDOR_INTEL is not set # CONFIG_NET_VENDOR_MARVELL is not set +# CONFIG_NET_VENDOR_MELLANOX is not set # CONFIG_NET_VENDOR_MICREL is not set # CONFIG_NET_VENDOR_MICROCHIP is not set # CONFIG_NET_VENDOR_NATSEMI is not set +# CONFIG_NET_VENDOR_NETRONOME is not set +# CONFIG_NET_VENDOR_QUALCOMM is not set +# CONFIG_NET_VENDOR_RENESAS is not set +# CONFIG_NET_VENDOR_ROCKER is not set +# CONFIG_NET_VENDOR_SAMSUNG is not set # CONFIG_NET_VENDOR_SEEQ is not set +# CONFIG_NET_VENDOR_SOLARFLARE is not set # CONFIG_NET_VENDOR_SMSC is not set # CONFIG_NET_VENDOR_STMICRO is not set # CONFIG_NET_VENDOR_VIA is not set # CONFIG_NET_VENDOR_WIZNET is not set +# CONFIG_NET_VENDOR_XILINX is not set +# CONFIG_NET_VENDOR_SYNOPSYS is not set CONFIG_USB_RTL8152=y CONFIG_USB_LAN78XX=y CONFIG_USB_USBNET=y @@ -147,11 +162,9 @@ CONFIG_KEYBOARD_GPIO=y # CONFIG_INPUT_MOUSE is not set CONFIG_VT_HW_CONSOLE_BINDING=y # CONFIG_LEGACY_PTYS is not set -# CONFIG_DEVKMEM is not set CONFIG_SERIAL_XILINX_PS_UART=y CONFIG_SERIAL_XILINX_PS_UART_CONSOLE=y # CONFIG_HW_RANDOM is not set -CONFIG_XILINX_DEVCFG=y CONFIG_I2C=y CONFIG_I2C_CHARDEV=y CONFIG_I2C_CADENCE=y @@ -172,15 +185,14 @@ CONFIG_WATCHDOG=y CONFIG_XILINX_WATCHDOG=y CONFIG_CADENCE_WATCHDOG=y CONFIG_SSB=y -CONFIG_BCMA=y CONFIG_REGULATOR=y CONFIG_REGULATOR_FIXED_VOLTAGE=y +# CONFIG_RC_CORE is not set CONFIG_HIDRAW=y CONFIG_USB_HIDDEV=y CONFIG_USB=y CONFIG_USB_ANNOUNCE_NEW_DEVICES=y CONFIG_USB_OTG=y -CONFIG_USB_ULPI_BUS=y CONFIG_USB_EHCI_HCD=y # CONFIG_USB_EHCI_TT_NEWSCHED is not set CONFIG_USB_STORAGE=y @@ -204,6 +216,7 @@ CONFIG_USB_CONFIGFS_RNDIS=y CONFIG_USB_CONFIGFS_EEM=y CONFIG_USB_CONFIGFS_MASS_STORAGE=y CONFIG_USB_CONFIGFS_F_FS=y +CONFIG_USB_ULPI_BUS=y CONFIG_NEW_LEDS=y CONFIG_LEDS_CLASS=y CONFIG_LEDS_GPIO=y @@ -213,8 +226,6 @@ CONFIG_LEDS_TRIGGER_HEARTBEAT=y CONFIG_LEDS_TRIGGER_CPU=y CONFIG_LEDS_TRIGGER_GPIO=y CONFIG_LEDS_TRIGGER_DEFAULT_ON=y -CONFIG_EDAC=y -CONFIG_EDAC_MM_EDAC=y CONFIG_DMADEVICES=y CONFIG_AXI_DMAC=y CONFIG_UIO=y @@ -224,7 +235,6 @@ CONFIG_UIO_XILINX_APM=y CONFIG_STAGING=y CONFIG_R8712U=y CONFIG_R8188EU=y -CONFIG_IIO_TRIGGER_HRTIMER=y CONFIG_COMMON_CLK_AXI_CLKGEN=y # CONFIG_IOMMU_SUPPORT is not set CONFIG_MEMORY=y @@ -234,7 +244,8 @@ CONFIG_AD9361=y CONFIG_ADMC=y CONFIG_XILINX_XADC=y CONFIG_CF_AXI_DDS=y -# CONFIG_RESET_CONTROLLER is not set +CONFIG_FPGA=y +CONFIG_FPGA_MGR_ZYNQ_FPGA=y # CONFIG_DNOTIFY is not set CONFIG_MSDOS_FS=y CONFIG_VFAT_FS=y