mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-06 02:50:43 +00:00
![Linus Torvalds](/assets/img/avatar_default.png)
We keep collecting defconfig updates in a separate branch mostly to encourage people to handle them separately and avoid conflicts between different topics. Most of these are enablement of new SoCs, boards or drivers that have come in, or minor config refreshes due to reorderings in Kconfig files, etc. I.e. mostly minor churn of various kinds. Conflicts: None -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAABAgAGBQJVi4RbAAoJEFk3GJrT+8Zl8IkP/3X9+EQrk7zzSEtzpQilWVc+ r6Usx3TwvrXnmFUhy/Vxwc9f+nsn7cuDXo1ms8OeNq3tY94pHINMsgfLQBEYdamu 4A73cy0HwYh5lo4XGEWNYAPP70iCAwHaLY0bFvmRcT3skqA9XeVy2uEe4iGy75fc tPdfjhFigiFrkeLOa2hy/4h5BkT5adqWFf6IOl+GY13QKdjPBndbeaarHC77bVoM yxRQMp2cpx/jsNnN4IuAr1RHCtYC+ENz26TdnOiTYhGGtPUTwmF4qNKDUBykGEAu 8AVqpujHt3OvfZKWDcxiv5bXJDRrFQqsQDcdVv8jJ6ynUluXKmCX1sdrzs65uB9s X7KNtpn8rmDgumaPvJ63oesaZVe2AhTMPFUbq694UPLR9odb/bGyh1ESELlwBqX/ cVgOTlmD0J2j4MwxWgMdFm1JEg3uFOrkXOotD8yes5e2eh9k9Zl/c6l5fz8kWxLf yQj0gc11vdDiCvmbHWvyhW5B/XVB6qZd9UbbY3kpAsxSigfuLqX66qGfGmXqTa8E B8DHVQo5leTw+hDMk8ibW1nANXZ28odr3lY2hiUJl0PZg+92Vr7/Gr6eUlJH/1Rh Zs6g7jWkvarAKr+NfUon0+cXoJIqLYJeOqqLmMpNn8k9qQdsvA4r/rIh0tqh7FQY Ig5uZEI19xegAtgKG4Ue =q6ks -----END PGP SIGNATURE----- Merge tag 'armsoc-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc Pull ARM SoC defconfig updates from Kevin Hilman: "We keep collecting defconfig updates in a separate branch mostly to encourage people to handle them separately and avoid conflicts between different topics. Most of these are enablement of new SoCs, boards or drivers that have come in, or minor config refreshes due to reorderings in Kconfig files, etc. I.e. mostly minor churn of various kinds" * tag 'armsoc-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (55 commits) ARM: multi_v7_defconfig: remove duplicate CONFIG_COMMON_CLK_QCOM=y ARM: multi_v7_defconfig: Enable display on Trats2 board ARM64: add GPIO keys to the defconfig ARM: keystone: defconfig: enable netcp driver by default ARM: exynos_defconfig: Enable CONFIG_SENSORS_INA2XX for Odroid-XU3 ARM: exynos_defconfig: Enable CONFIG_SENSORS_PWM_FAN for Odroid-XU3 ARM: omap2plus_defconfig: Enable TOUCHSCREEN_PIXCIR ARM: omap2plus_defconfig: Add dm816x USB PHY as a loadable module ARM: omap2plus_defconifg: Enable DM9000 in omap2plus_defconfig ARM: lpc18xx: remove DEBUG_LL_UART_8250 from defconfig ARM: multi_v7_defconfig: Make media support modular ARM: multi_v7_defconfig: Make sound support modular ARM: multi_v7_defconfig: Enable shmobile r8a7778/bockw platform ARM: exynos_defconfig: savedefconfig ARM: exynos_defconfig: Enable display on Trats2 board ARM: multi_v7_defconfig: Enable OHCI on exynos SoCs ARM: multi_v7_defconfig: Enable TMU for exynos SoCs ARM: multi_v7_defconfig: Enable PMIC and MUIC drivers for exynos ARM: multi_v7_defconfig: Enable CPU idle for exynos SoCs ARM: multi_v7_defconfig: Enable Cypress APA I2C Trackpad support ...
103 lines
2.8 KiB
Text
103 lines
2.8 KiB
Text
CONFIG_HIGH_RES_TIMERS=y
|
|
CONFIG_LOG_BUF_SHIFT=12
|
|
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
|
|
# CONFIG_UID16 is not set
|
|
# CONFIG_BASE_FULL is not set
|
|
# CONFIG_FUTEX is not set
|
|
# CONFIG_EPOLL is not set
|
|
# CONFIG_SIGNALFD is not set
|
|
# CONFIG_EVENTFD is not set
|
|
# CONFIG_AIO is not set
|
|
CONFIG_EMBEDDED=y
|
|
# CONFIG_VM_EVENT_COUNTERS is not set
|
|
# CONFIG_SLUB_DEBUG is not set
|
|
# CONFIG_LBDAF is not set
|
|
# CONFIG_BLK_DEV_BSG is not set
|
|
# CONFIG_IOSCHED_DEADLINE is not set
|
|
# CONFIG_IOSCHED_CFQ is not set
|
|
# CONFIG_MMU is not set
|
|
CONFIG_ARM_SINGLE_ARMV7M=y
|
|
CONFIG_ARCH_EFM32=y
|
|
CONFIG_SET_MEM_PARAM=y
|
|
CONFIG_DRAM_BASE=0x88000000
|
|
CONFIG_DRAM_SIZE=0x00400000
|
|
CONFIG_FLASH_MEM_BASE=0x8c000000
|
|
CONFIG_FLASH_SIZE=0x01000000
|
|
CONFIG_PREEMPT=y
|
|
CONFIG_ZBOOT_ROM_TEXT=0x0
|
|
CONFIG_ZBOOT_ROM_BSS=0x0
|
|
CONFIG_XIP_KERNEL=y
|
|
CONFIG_XIP_PHYS_ADDR=0x8c000000
|
|
CONFIG_BINFMT_FLAT=y
|
|
CONFIG_BINFMT_SHARED_FLAT=y
|
|
# CONFIG_COREDUMP is not set
|
|
CONFIG_NET=y
|
|
CONFIG_PACKET=y
|
|
CONFIG_UNIX=y
|
|
CONFIG_INET=y
|
|
# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
|
|
# CONFIG_INET_XFRM_MODE_TUNNEL is not set
|
|
# CONFIG_INET_XFRM_MODE_BEET is not set
|
|
# CONFIG_INET_LRO is not set
|
|
# CONFIG_INET_DIAG is not set
|
|
# CONFIG_IPV6 is not set
|
|
# CONFIG_WIRELESS is not set
|
|
CONFIG_DEVTMPFS=y
|
|
CONFIG_DEVTMPFS_MOUNT=y
|
|
# CONFIG_FW_LOADER is not set
|
|
CONFIG_MTD=y
|
|
CONFIG_MTD_BLOCK_RO=y
|
|
CONFIG_MTD_ROM=y
|
|
CONFIG_MTD_UCLINUX=y
|
|
# CONFIG_BLK_DEV is not set
|
|
CONFIG_NETDEVICES=y
|
|
# 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_FARADAY is not set
|
|
# CONFIG_NET_VENDOR_INTEL is not set
|
|
# CONFIG_NET_VENDOR_MARVELL is not set
|
|
CONFIG_KS8851=y
|
|
# CONFIG_NET_VENDOR_MICROCHIP is not set
|
|
# CONFIG_NET_VENDOR_NATSEMI is not set
|
|
# CONFIG_NET_VENDOR_SEEQ 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_WLAN is not set
|
|
# CONFIG_INPUT is not set
|
|
# CONFIG_SERIO is not set
|
|
# CONFIG_VT is not set
|
|
# CONFIG_UNIX98_PTYS is not set
|
|
# CONFIG_LEGACY_PTYS is not set
|
|
CONFIG_SERIAL_NONSTANDARD=y
|
|
# CONFIG_DEVKMEM is not set
|
|
CONFIG_SERIAL_EFM32_UART=y
|
|
CONFIG_SERIAL_EFM32_UART_CONSOLE=y
|
|
# CONFIG_HW_RANDOM is not set
|
|
CONFIG_I2C=y
|
|
# CONFIG_I2C_COMPAT is not set
|
|
CONFIG_I2C_EFM32=y
|
|
CONFIG_SPI=y
|
|
CONFIG_SPI_EFM32=y
|
|
CONFIG_GPIO_SYSFS=y
|
|
# CONFIG_USB_SUPPORT is not set
|
|
CONFIG_MMC=y
|
|
CONFIG_MMC_SPI=y
|
|
CONFIG_EXT2_FS=y
|
|
# CONFIG_FILE_LOCKING is not set
|
|
# CONFIG_DNOTIFY is not set
|
|
# CONFIG_INOTIFY_USER is not set
|
|
CONFIG_ROMFS_FS=y
|
|
CONFIG_ROMFS_BACKED_BY_MTD=y
|
|
# CONFIG_NETWORK_FILESYSTEMS is not set
|
|
CONFIG_PRINTK_TIME=y
|
|
CONFIG_DEBUG_INFO=y
|
|
# CONFIG_ENABLE_WARN_DEPRECATED is not set
|
|
# CONFIG_ENABLE_MUST_CHECK is not set
|
|
CONFIG_MAGIC_SYSRQ=y
|
|
# CONFIG_SCHED_DEBUG is not set
|
|
# CONFIG_DEBUG_BUGVERBOSE is not set
|
|
# CONFIG_FTRACE is not set
|