mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-16 00:34:20 +08:00
421b759b86
Conflicts: arch/arm/mach-imx/mach-imx6q.c arch/arm/mach-omap2/board-ti8168evm.c arch/arm/mach-s3c64xx/Kconfig arch/arm/mach-tegra/Makefile arch/arm/mach-tegra/board-dt-tegra20.c arch/arm/mach-tegra/common.c Lots of relatively simple conflicts between the board changes and stuff from the arm tree. This pulls in the resolution from the samsung/cleanup tree, so we don't get conflicting merges. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
172 lines
3.9 KiB
Plaintext
172 lines
3.9 KiB
Plaintext
CONFIG_EXPERIMENTAL=y
|
|
# CONFIG_SWAP is not set
|
|
CONFIG_SYSVIPC=y
|
|
CONFIG_POSIX_MQUEUE=y
|
|
CONFIG_LOG_BUF_SHIFT=14
|
|
CONFIG_EXPERT=y
|
|
# CONFIG_COMPAT_BRK is not set
|
|
CONFIG_SLAB=y
|
|
CONFIG_PROFILING=y
|
|
CONFIG_OPROFILE=y
|
|
CONFIG_KPROBES=y
|
|
CONFIG_MODULES=y
|
|
CONFIG_MODULE_UNLOAD=y
|
|
# CONFIG_BLK_DEV_BSG is not set
|
|
# CONFIG_IOSCHED_DEADLINE is not set
|
|
# CONFIG_IOSCHED_CFQ is not set
|
|
CONFIG_ARCH_MXC=y
|
|
CONFIG_ARCH_IMX_V4_V5=y
|
|
CONFIG_ARCH_MX1ADS=y
|
|
CONFIG_MACH_SCB9328=y
|
|
CONFIG_MACH_APF9328=y
|
|
CONFIG_MACH_MX21ADS=y
|
|
CONFIG_MACH_MX25_3DS=y
|
|
CONFIG_MACH_EUKREA_CPUIMX25SD=y
|
|
CONFIG_MACH_MX27ADS=y
|
|
CONFIG_MACH_PCM038=y
|
|
CONFIG_MACH_CPUIMX27=y
|
|
CONFIG_MACH_EUKREA_CPUIMX27_USESDHC2=y
|
|
CONFIG_MACH_EUKREA_CPUIMX27_USEUART4=y
|
|
CONFIG_MACH_MX27_3DS=y
|
|
CONFIG_MACH_IMX27_VISSTRIM_M10=y
|
|
CONFIG_MACH_IMX27LITE=y
|
|
CONFIG_MACH_PCA100=y
|
|
CONFIG_MACH_MXT_TD60=y
|
|
CONFIG_MACH_IMX27IPCAM=y
|
|
CONFIG_MXC_IRQ_PRIOR=y
|
|
CONFIG_MXC_PWM=y
|
|
CONFIG_NO_HZ=y
|
|
CONFIG_HIGH_RES_TIMERS=y
|
|
CONFIG_PREEMPT=y
|
|
CONFIG_AEABI=y
|
|
CONFIG_ZBOOT_ROM_TEXT=0x0
|
|
CONFIG_ZBOOT_ROM_BSS=0x0
|
|
CONFIG_FPE_NWFPE=y
|
|
CONFIG_FPE_NWFPE_XP=y
|
|
CONFIG_PM_DEBUG=y
|
|
CONFIG_NET=y
|
|
CONFIG_PACKET=y
|
|
CONFIG_UNIX=y
|
|
CONFIG_INET=y
|
|
CONFIG_IP_MULTICAST=y
|
|
CONFIG_IP_PNP=y
|
|
CONFIG_IP_PNP_DHCP=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_UEVENT_HELPER_PATH="/sbin/hotplug"
|
|
CONFIG_DEVTMPFS=y
|
|
CONFIG_DEVTMPFS_MOUNT=y
|
|
CONFIG_MTD=y
|
|
CONFIG_MTD_CMDLINE_PARTS=y
|
|
CONFIG_MTD_CHAR=y
|
|
CONFIG_MTD_BLOCK=y
|
|
CONFIG_MTD_CFI=y
|
|
CONFIG_MTD_CFI_ADV_OPTIONS=y
|
|
CONFIG_MTD_CFI_GEOMETRY=y
|
|
# CONFIG_MTD_MAP_BANK_WIDTH_1 is not set
|
|
# CONFIG_MTD_CFI_I2 is not set
|
|
CONFIG_MTD_CFI_INTELEXT=y
|
|
CONFIG_MTD_PHYSMAP=y
|
|
CONFIG_MTD_NAND=y
|
|
CONFIG_MTD_NAND_MXC=y
|
|
CONFIG_MTD_UBI=y
|
|
CONFIG_MISC_DEVICES=y
|
|
CONFIG_EEPROM_AT24=y
|
|
CONFIG_EEPROM_AT25=y
|
|
CONFIG_NETDEVICES=y
|
|
CONFIG_DM9000=y
|
|
CONFIG_SMC91X=y
|
|
CONFIG_SMC911X=y
|
|
CONFIG_SMSC_PHY=y
|
|
# CONFIG_INPUT_MOUSEDEV is not set
|
|
CONFIG_INPUT_EVDEV=y
|
|
# CONFIG_INPUT_KEYBOARD is not set
|
|
# CONFIG_INPUT_MOUSE is not set
|
|
CONFIG_INPUT_TOUCHSCREEN=y
|
|
CONFIG_TOUCHSCREEN_ADS7846=m
|
|
# CONFIG_SERIO is not set
|
|
# CONFIG_LEGACY_PTYS is not set
|
|
CONFIG_SERIAL_8250=m
|
|
CONFIG_SERIAL_IMX=y
|
|
CONFIG_SERIAL_IMX_CONSOLE=y
|
|
# CONFIG_HW_RANDOM is not set
|
|
CONFIG_I2C=y
|
|
CONFIG_I2C_CHARDEV=y
|
|
CONFIG_I2C_IMX=y
|
|
CONFIG_SPI=y
|
|
CONFIG_SPI_IMX=y
|
|
CONFIG_SPI_SPIDEV=y
|
|
CONFIG_W1=y
|
|
CONFIG_W1_MASTER_MXC=y
|
|
CONFIG_W1_SLAVE_THERM=y
|
|
# CONFIG_HWMON is not set
|
|
CONFIG_WATCHDOG=y
|
|
CONFIG_IMX2_WDT=y
|
|
CONFIG_MFD_MC13XXX=y
|
|
CONFIG_REGULATOR=y
|
|
CONFIG_REGULATOR_MC13783=y
|
|
CONFIG_REGULATOR_MC13892=y
|
|
CONFIG_FB=y
|
|
CONFIG_FB_IMX=y
|
|
CONFIG_BACKLIGHT_LCD_SUPPORT=y
|
|
CONFIG_LCD_CLASS_DEVICE=y
|
|
CONFIG_BACKLIGHT_CLASS_DEVICE=y
|
|
CONFIG_BACKLIGHT_PWM=y
|
|
CONFIG_FRAMEBUFFER_CONSOLE=y
|
|
CONFIG_FONTS=y
|
|
CONFIG_FONT_8x8=y
|
|
CONFIG_LOGO=y
|
|
CONFIG_SOUND=y
|
|
CONFIG_SND=y
|
|
# CONFIG_SND_ARM is not set
|
|
# CONFIG_SND_SPI is not set
|
|
CONFIG_SND_SOC=y
|
|
CONFIG_SND_IMX_SOC=y
|
|
CONFIG_SND_SOC_MX27VIS_AIC32X4=y
|
|
CONFIG_SND_SOC_PHYCORE_AC97=y
|
|
CONFIG_SND_SOC_EUKREA_TLV320=y
|
|
CONFIG_USB_HID=m
|
|
CONFIG_USB=y
|
|
# CONFIG_USB_DEVICE_CLASS is not set
|
|
CONFIG_USB_EHCI_HCD=y
|
|
CONFIG_USB_EHCI_MXC=y
|
|
CONFIG_USB_ULPI=y
|
|
CONFIG_MMC=y
|
|
CONFIG_MMC_MXC=y
|
|
CONFIG_NEW_LEDS=y
|
|
CONFIG_LEDS_CLASS=y
|
|
CONFIG_LEDS_GPIO=y
|
|
CONFIG_LEDS_MC13783=y
|
|
CONFIG_LEDS_TRIGGERS=y
|
|
CONFIG_LEDS_TRIGGER_TIMER=y
|
|
CONFIG_LEDS_TRIGGER_HEARTBEAT=y
|
|
CONFIG_LEDS_TRIGGER_BACKLIGHT=y
|
|
CONFIG_LEDS_TRIGGER_GPIO=y
|
|
CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
|
|
CONFIG_RTC_CLASS=y
|
|
CONFIG_RTC_DRV_PCF8563=y
|
|
CONFIG_RTC_DRV_IMXDI=y
|
|
CONFIG_RTC_MXC=y
|
|
CONFIG_DMADEVICES=y
|
|
CONFIG_IMX_SDMA=y
|
|
CONFIG_IMX_DMA=y
|
|
# CONFIG_IOMMU_SUPPORT is not set
|
|
# CONFIG_DNOTIFY is not set
|
|
# CONFIG_PROC_PAGE_MONITOR is not set
|
|
CONFIG_TMPFS=y
|
|
CONFIG_JFFS2_FS=y
|
|
CONFIG_UBIFS_FS=y
|
|
CONFIG_NFS_FS=y
|
|
CONFIG_NFS_V3=y
|
|
CONFIG_ROOT_NFS=y
|
|
CONFIG_NLS_CODEPAGE_437=m
|
|
CONFIG_NLS_CODEPAGE_850=m
|
|
CONFIG_NLS_ISO8859_1=y
|
|
CONFIG_NLS_ISO8859_15=m
|
|
CONFIG_SYSCTL_SYSCALL_CHECK=y
|
|
# CONFIG_CRYPTO_ANSI_CPRNG is not set
|