mirror of
https://github.com/torvalds/linux.git
synced 2024-11-14 16:12:02 +00:00
95360fd636
Misc board updates:
- Greg added a handful of boards to KS8695 (since he has stepped up to
maintain it).
- Qualcomm has added DT-only board support for a couple of their newer SoCs.
- misc other updates for Samsung and Freescale boards.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
iQIcBAABAgAGBQJQaO5+AAoJEIwa5zzehBx34OAP/00W1eziYwliv08FeQ4M6Rum
OSFI1qBXubCZwyzczyM7r6ArnhdmJz0e2p1WEbS1hIQRjYR+pTwzBOSRsU460WsM
Hy3CYV7SQb551rEC3yPoVst24TgBoDJah3UORfEmi0hIMoWDPqEV/erpI2+sSLzz
KbQpI6C8V4MvLELSM1YxljorT50cRmoD+J1bdO6jI68bAwIMWBVPhezqg4/k8Gkh
TqfP2zoc/O9jlc6zgMJc1T+M/CLyFYJeV63dNQ4ER54NFdUs+NdHItNHjJlGAOSQ
2e4NDUKKklxLUno+kyTiTkWkFEgxu9W8XLZi6CLNGCO4gsiM8ljVAdW0xuWeXFkX
1OucFrBYEMonKEEWURvtNpYyEu9/Wz5WCInmqM5u92w/+GIzBYzr6sbircCOAXBv
UlVmvIltrhpTPkAuLkG/hL6KVV2UiNcr2hgALlhhnQ68hTzGGZrvUWuNCB6zjrHF
okl1bmo6kjtj9A09YmXFEPL8l8q9hRWirWTnyLWAjoeDY1juy+SdVx+8CJy/2ua5
QllqN3SGOX2WVMuBo6C24lwRa21cQ7Ax8GCavuKKB0eyIrWer1pVhO6xZCwii1gG
iZgpaOZpeOe4lms1oD2RqjV8GlW6DQAaLINlqHzj3G/BcRTMN4S/QD2S47yMgCPc
Kf1zsyukeBhfVWTUULEE
=fe76
-----END PGP SIGNATURE-----
Merge tag 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM soc board specific updates from Olof Johansson:
"Misc board updates:
- Greg added a handful of boards to KS8695 (since he has stepped up
to maintain it).
- Qualcomm has added DT-only board support for a couple of their
newer SoCs.
- misc other updates for Samsung and Freescale boards."
Fix up trivial conflict in arch/arm/mach-shmobile/board-armadillo800eva.c
due to gpio device data being added next to hdmi device data that got moved.
* tag 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
ARM: msm: Allow 8960 and 8660 to compile together
ARM: msm: Allow msm_iomap-8x60 and msm_iomap-8960 to coexist
ARM: EXYNOS: Add generic PWM lookup support for SMDKV310
ARM: EXYNOS: Add generic PWM lookup support for SMDK4X12
ARM: EXYNOS: Use generic pwm driver in Origen board
ARM: shmobile: armadillo800eva: Add support RTC
ARM: ks8695: add board support for the OpenGear boards based on the KS8695
ARM: ks8695: add board support for the SnapGear boards based on the KS8695
ARM: dts: Add heartbeat gpio-leds support to Origen
ARM: dts: Use active low flag for gpio-keys on Origen
ARM: shmobile: marzen: enable thermal sensor
ARM: shmobile: marzen: fixup regulator id for smsc911x
ARM: shmobile: marzen: add SDHI0 support
ARM: mmp: enable debug uart port in defconfig
ARM: mmp: implement DEBUG_LL port choice
ARM: S3C64XX: Register audio platform devices for Bells on Cragganmore
ARM: S3C64XX: Update configuration for WM5102 module on Cragganmore
ARM: mx27pdk: Add audio support
ARM: ttc_dkb: add nand support
151 lines
4.0 KiB
Plaintext
151 lines
4.0 KiB
Plaintext
CONFIG_EXPERIMENTAL=y
|
|
CONFIG_SYSVIPC=y
|
|
CONFIG_IKCONFIG=y
|
|
CONFIG_IKCONFIG_PROC=y
|
|
CONFIG_LOG_BUF_SHIFT=16
|
|
# CONFIG_UTS_NS is not set
|
|
# CONFIG_IPC_NS is not set
|
|
# CONFIG_PID_NS is not set
|
|
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
|
|
CONFIG_SLAB=y
|
|
CONFIG_MODULES=y
|
|
CONFIG_MODULE_UNLOAD=y
|
|
CONFIG_MODULE_FORCE_UNLOAD=y
|
|
# CONFIG_BLK_DEV_BSG is not set
|
|
# CONFIG_IOSCHED_DEADLINE is not set
|
|
# CONFIG_IOSCHED_CFQ is not set
|
|
CONFIG_ARCH_SHMOBILE=y
|
|
CONFIG_ARCH_R8A7740=y
|
|
CONFIG_MACH_ARMADILLO800EVA=y
|
|
# CONFIG_SH_TIMER_TMU is not set
|
|
CONFIG_ARM_THUMB=y
|
|
CONFIG_CPU_BPREDICT_DISABLE=y
|
|
# CONFIG_CACHE_L2X0 is not set
|
|
CONFIG_ARM_ERRATA_430973=y
|
|
CONFIG_ARM_ERRATA_458693=y
|
|
CONFIG_ARM_ERRATA_460075=y
|
|
CONFIG_ARM_ERRATA_720789=y
|
|
CONFIG_ARM_ERRATA_743622=y
|
|
CONFIG_ARM_ERRATA_751472=y
|
|
CONFIG_ARM_ERRATA_754322=y
|
|
CONFIG_AEABI=y
|
|
# CONFIG_OABI_COMPAT is not set
|
|
CONFIG_FORCE_MAX_ZONEORDER=13
|
|
CONFIG_ZBOOT_ROM_TEXT=0x0
|
|
CONFIG_ZBOOT_ROM_BSS=0x0
|
|
CONFIG_CMDLINE="console=tty0 console=ttySC1,115200 earlyprintk=sh-sci.1,115200 ignore_loglevel root=/dev/nfs ip=dhcp nfsroot=,rsize=4096,wsize=4096 rw"
|
|
CONFIG_CMDLINE_FORCE=y
|
|
CONFIG_KEXEC=y
|
|
CONFIG_VFP=y
|
|
# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
|
|
# CONFIG_SUSPEND is not set
|
|
CONFIG_NET=y
|
|
CONFIG_PACKET=y
|
|
CONFIG_UNIX=y
|
|
CONFIG_INET=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_WIRELESS is not set
|
|
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
|
|
CONFIG_SCSI=y
|
|
CONFIG_BLK_DEV_SD=y
|
|
CONFIG_MD=y
|
|
CONFIG_BLK_DEV_DM=y
|
|
CONFIG_NETDEVICES=y
|
|
# CONFIG_NET_VENDOR_BROADCOM is not set
|
|
# CONFIG_NET_VENDOR_CHELSIO 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_NET_VENDOR_MICREL is not set
|
|
# CONFIG_NET_VENDOR_NATSEMI is not set
|
|
CONFIG_SH_ETH=y
|
|
# CONFIG_NET_VENDOR_SEEQ is not set
|
|
# CONFIG_NET_VENDOR_SMSC is not set
|
|
# CONFIG_NET_VENDOR_STMICRO is not set
|
|
# CONFIG_WLAN is not set
|
|
# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
|
|
CONFIG_INPUT_EVDEV=y
|
|
# CONFIG_KEYBOARD_ATKBD is not set
|
|
CONFIG_KEYBOARD_GPIO=y
|
|
# CONFIG_INPUT_MOUSE is not set
|
|
CONFIG_INPUT_TOUCHSCREEN=y
|
|
CONFIG_TOUCHSCREEN_ST1232=y
|
|
# CONFIG_SERIO is not set
|
|
# CONFIG_LEGACY_PTYS is not set
|
|
CONFIG_SERIAL_SH_SCI=y
|
|
CONFIG_SERIAL_SH_SCI_NR_UARTS=8
|
|
CONFIG_SERIAL_SH_SCI_CONSOLE=y
|
|
# CONFIG_HW_RANDOM is not set
|
|
CONFIG_I2C=y
|
|
CONFIG_I2C_GPIO=y
|
|
CONFIG_I2C_SH_MOBILE=y
|
|
# CONFIG_HWMON is not set
|
|
CONFIG_MEDIA_SUPPORT=y
|
|
CONFIG_VIDEO_DEV=y
|
|
# CONFIG_RC_CORE is not set
|
|
# CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set
|
|
# CONFIG_V4L_USB_DRIVERS is not set
|
|
CONFIG_V4L_PLATFORM_DRIVERS=y
|
|
CONFIG_SOC_CAMERA=y
|
|
CONFIG_SOC_CAMERA_MT9T112=y
|
|
CONFIG_VIDEO_SH_MOBILE_CEU=y
|
|
# CONFIG_RADIO_ADAPTERS is not set
|
|
CONFIG_FB=y
|
|
CONFIG_FB_SH_MOBILE_LCDC=y
|
|
CONFIG_FB_SH_MOBILE_HDMI=y
|
|
CONFIG_LCD_CLASS_DEVICE=y
|
|
CONFIG_FRAMEBUFFER_CONSOLE=y
|
|
CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
|
|
CONFIG_LOGO=y
|
|
# CONFIG_LOGO_LINUX_MONO is not set
|
|
# CONFIG_LOGO_LINUX_VGA16 is not set
|
|
# CONFIG_SND_SUPPORT_OLD_API is not set
|
|
# CONFIG_SND_VERBOSE_PROCFS is not set
|
|
# CONFIG_SND_DRIVERS is not set
|
|
# CONFIG_SND_ARM is not set
|
|
CONFIG_SND_SOC_SH4_FSI=y
|
|
# CONFIG_HID_SUPPORT is not set
|
|
CONFIG_USB=y
|
|
CONFIG_USB_RENESAS_USBHS=y
|
|
CONFIG_USB_GADGET=y
|
|
CONFIG_USB_RENESAS_USBHS_UDC=y
|
|
CONFIG_USB_ETH=m
|
|
CONFIG_MMC=y
|
|
CONFIG_MMC_SDHI=y
|
|
CONFIG_MMC_SH_MMCIF=y
|
|
CONFIG_RTC_CLASS=y
|
|
CONFIG_RTC_DRV_S35390A=y
|
|
CONFIG_DMADEVICES=y
|
|
CONFIG_SH_DMAE=y
|
|
CONFIG_UIO=y
|
|
CONFIG_UIO_PDRV_GENIRQ=y
|
|
# CONFIG_DNOTIFY is not set
|
|
CONFIG_MSDOS_FS=y
|
|
CONFIG_VFAT_FS=y
|
|
CONFIG_TMPFS=y
|
|
# CONFIG_MISC_FILESYSTEMS is not set
|
|
CONFIG_NFS_FS=y
|
|
CONFIG_NFS_V3_ACL=y
|
|
CONFIG_NFS_V4=y
|
|
CONFIG_NFS_V4_1=y
|
|
CONFIG_ROOT_NFS=y
|
|
CONFIG_NLS_CODEPAGE_437=y
|
|
CONFIG_NLS_ISO8859_1=y
|
|
# CONFIG_ENABLE_WARN_DEPRECATED is not set
|
|
# CONFIG_ENABLE_MUST_CHECK is not set
|
|
# CONFIG_ARM_UNWIND is not set
|
|
CONFIG_CRYPTO=y
|
|
CONFIG_CRYPTO_CBC=y
|
|
CONFIG_CRYPTO_MD5=y
|
|
CONFIG_CRYPTO_DES=y
|
|
CONFIG_CRYPTO_ANSI_CPRNG=y
|
|
CONFIG_XZ_DEC=y
|