diff options
author | Olof Johansson <olof@lixom.net> | 2013-04-02 20:28:40 -0400 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2013-04-02 20:28:46 -0400 |
commit | 33fe1e0ea97090dd3ab96e1bad3ef54f77509f95 (patch) | |
tree | 91ad93eb88bbdd77bcfd96f9a2df4bc931e963fe | |
parent | 926f638c3c2159e118f5935241bfc939ded0a790 (diff) | |
parent | 03d409a5c4f8b590caaebd8c99e8977227c3dee7 (diff) |
Merge tag 'renesas-defconfig2-for-v3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/soc
Second round of Renesas ARM based SoC defconfig updates for v3.10
* Add defconfig for ape6evm board
* GPIO updates for marzen
* tag 'renesas-defconfig2-for-v3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
ARM: shmobile: ape6evm: add defconfig
ARM: shmobile: marzen: defconfig: enable GPIO LEDs driver
ARM: shmobile: marzen: defconfig: add GPIO RCAR driver support
Signed-off-by: Olof Johansson <olof@lixom.net>
-rw-r--r-- | arch/arm/configs/ape6evm_defconfig | 95 | ||||
-rw-r--r-- | arch/arm/configs/marzen_defconfig | 4 |
2 files changed, 99 insertions, 0 deletions
diff --git a/arch/arm/configs/ape6evm_defconfig b/arch/arm/configs/ape6evm_defconfig new file mode 100644 index 000000000000..dab5a7dfadc6 --- /dev/null +++ b/arch/arm/configs/ape6evm_defconfig | |||
@@ -0,0 +1,95 @@ | |||
1 | CONFIG_SYSVIPC=y | ||
2 | CONFIG_POSIX_MQUEUE=y | ||
3 | CONFIG_NO_HZ=y | ||
4 | CONFIG_HIGH_RES_TIMERS=y | ||
5 | CONFIG_BSD_PROCESS_ACCT=y | ||
6 | CONFIG_IKCONFIG=y | ||
7 | CONFIG_IKCONFIG_PROC=y | ||
8 | CONFIG_LOG_BUF_SHIFT=16 | ||
9 | CONFIG_CGROUPS=y | ||
10 | CONFIG_CGROUP_SCHED=y | ||
11 | CONFIG_KALLSYMS_ALL=y | ||
12 | CONFIG_EMBEDDED=y | ||
13 | CONFIG_PERF_EVENTS=y | ||
14 | CONFIG_SLAB=y | ||
15 | # CONFIG_BLOCK is not set | ||
16 | CONFIG_ARCH_SHMOBILE=y | ||
17 | CONFIG_ARCH_R8A73A4=y | ||
18 | CONFIG_MACH_APE6EVM=y | ||
19 | # CONFIG_ARM_THUMB is not set | ||
20 | CONFIG_CPU_BPREDICT_DISABLE=y | ||
21 | CONFIG_PL310_ERRATA_588369=y | ||
22 | CONFIG_ARM_ERRATA_754322=y | ||
23 | CONFIG_SMP=y | ||
24 | CONFIG_SCHED_MC=y | ||
25 | CONFIG_HAVE_ARM_ARCH_TIMER=y | ||
26 | CONFIG_NR_CPUS=8 | ||
27 | CONFIG_AEABI=y | ||
28 | CONFIG_HIGHMEM=y | ||
29 | CONFIG_HIGHPTE=y | ||
30 | # CONFIG_HW_PERF_EVENTS is not set | ||
31 | # CONFIG_COMPACTION is not set | ||
32 | # CONFIG_CROSS_MEMORY_ATTACH is not set | ||
33 | CONFIG_ARM_APPENDED_DTB=y | ||
34 | CONFIG_VFP=y | ||
35 | CONFIG_NEON=y | ||
36 | CONFIG_BINFMT_MISC=y | ||
37 | CONFIG_NET=y | ||
38 | CONFIG_PACKET=y | ||
39 | CONFIG_UNIX=y | ||
40 | CONFIG_XFRM_USER=y | ||
41 | CONFIG_NET_KEY=y | ||
42 | CONFIG_NET_KEY_MIGRATE=y | ||
43 | CONFIG_INET=y | ||
44 | CONFIG_IP_MULTICAST=y | ||
45 | CONFIG_IP_PNP=y | ||
46 | CONFIG_IP_PNP_DHCP=y | ||
47 | # CONFIG_INET_LRO is not set | ||
48 | # CONFIG_IPV6_SIT is not set | ||
49 | CONFIG_NETFILTER=y | ||
50 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | ||
51 | # CONFIG_FW_LOADER_USER_HELPER is not set | ||
52 | CONFIG_NETDEVICES=y | ||
53 | # CONFIG_NET_CADENCE is not set | ||
54 | CONFIG_SMC91X=y | ||
55 | CONFIG_SMSC911X=y | ||
56 | # CONFIG_INPUT_MOUSEDEV is not set | ||
57 | # CONFIG_INPUT_KEYBOARD is not set | ||
58 | # CONFIG_INPUT_MOUSE is not set | ||
59 | # CONFIG_SERIO is not set | ||
60 | CONFIG_SERIAL_NONSTANDARD=y | ||
61 | CONFIG_SERIAL_SH_SCI=y | ||
62 | CONFIG_SERIAL_SH_SCI_NR_UARTS=12 | ||
63 | CONFIG_SERIAL_SH_SCI_CONSOLE=y | ||
64 | CONFIG_GPIO_SH_PFC=y | ||
65 | CONFIG_GPIOLIB=y | ||
66 | # CONFIG_HWMON is not set | ||
67 | CONFIG_THERMAL=y | ||
68 | CONFIG_RCAR_THERMAL=y | ||
69 | CONFIG_REGULATOR=y | ||
70 | CONFIG_REGULATOR_FIXED_VOLTAGE=y | ||
71 | CONFIG_REGULATOR_GPIO=y | ||
72 | # CONFIG_HID is not set | ||
73 | # CONFIG_USB_SUPPORT is not set | ||
74 | # CONFIG_IOMMU_SUPPORT is not set | ||
75 | # CONFIG_DNOTIFY is not set | ||
76 | CONFIG_TMPFS=y | ||
77 | # CONFIG_MISC_FILESYSTEMS is not set | ||
78 | CONFIG_NFS_FS=y | ||
79 | CONFIG_NFS_V3_ACL=y | ||
80 | CONFIG_NFS_V4=y | ||
81 | CONFIG_NFS_V4_1=y | ||
82 | CONFIG_ROOT_NFS=y | ||
83 | CONFIG_MAGIC_SYSRQ=y | ||
84 | CONFIG_ENABLE_DEFAULT_TRACERS=y | ||
85 | CONFIG_CRYPTO_CBC=y | ||
86 | CONFIG_CRYPTO_ECB=y | ||
87 | CONFIG_CRYPTO_MD5=y | ||
88 | CONFIG_CRYPTO_MICHAEL_MIC=y | ||
89 | CONFIG_CRYPTO_TWOFISH=y | ||
90 | CONFIG_CRC_CCITT=y | ||
91 | CONFIG_CRC16=y | ||
92 | CONFIG_CRC_T10DIF=y | ||
93 | CONFIG_CRC_ITU_T=y | ||
94 | CONFIG_CRC7=y | ||
95 | CONFIG_LIBCRC32C=y | ||
diff --git a/arch/arm/configs/marzen_defconfig b/arch/arm/configs/marzen_defconfig index 8e7329b3ebaf..494e70aeb9e1 100644 --- a/arch/arm/configs/marzen_defconfig +++ b/arch/arm/configs/marzen_defconfig | |||
@@ -79,6 +79,7 @@ CONFIG_I2C_RCAR=y | |||
79 | CONFIG_SPI=y | 79 | CONFIG_SPI=y |
80 | CONFIG_SPI_SH_HSPI=y | 80 | CONFIG_SPI_SH_HSPI=y |
81 | CONFIG_GPIO_SYSFS=y | 81 | CONFIG_GPIO_SYSFS=y |
82 | CONFIG_GPIO_RCAR=y | ||
82 | # CONFIG_HWMON is not set | 83 | # CONFIG_HWMON is not set |
83 | CONFIG_THERMAL=y | 84 | CONFIG_THERMAL=y |
84 | CONFIG_RCAR_THERMAL=y | 85 | CONFIG_RCAR_THERMAL=y |
@@ -92,6 +93,9 @@ CONFIG_USB_OHCI_HCD=y | |||
92 | CONFIG_USB_OHCI_HCD_PLATFORM=y | 93 | CONFIG_USB_OHCI_HCD_PLATFORM=y |
93 | CONFIG_USB_EHCI_HCD_PLATFORM=y | 94 | CONFIG_USB_EHCI_HCD_PLATFORM=y |
94 | CONFIG_USB_STORAGE=y | 95 | CONFIG_USB_STORAGE=y |
96 | CONFIG_NEW_LEDS=y | ||
97 | CONFIG_LEDS_CLASS=y | ||
98 | CONFIG_LEDS_GPIO=y | ||
95 | CONFIG_UIO=y | 99 | CONFIG_UIO=y |
96 | CONFIG_UIO_PDRV_GENIRQ=y | 100 | CONFIG_UIO_PDRV_GENIRQ=y |
97 | # CONFIG_IOMMU_SUPPORT is not set | 101 | # CONFIG_IOMMU_SUPPORT is not set |