summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2014-03-17 03:02:36 -0400
committerOlof Johansson <olof@lixom.net>2014-03-17 03:02:36 -0400
commitaf8cdfd332df41669c28f979d16d521a15541bcc (patch)
tree48615feca871b7e6564b5e64076287c9bea083cc
parentd89893272a0e2193be8532177c1850f356f4d5db (diff)
parent7573e89ba1fcbe492c52d5b1e72fcf5d23da21d1 (diff)
Merge tag 'renesas-defconfig3-for-v3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/boards
Merge "Third Round of Renesas ARM Based SoC Defconfig Updates for v3.15" from Simon Horman: * r7s72100 (RZ/A1H) based Genmai board - update defconfig for I2C usage * r8a7791 (R-Car M2) based Koelsch board - Enable SDHI, GPIO and regulators in defconfig * r8a7790 (R-Car H2) based Lager board - Enable RSPI and MTD_M25P80 * emev2 (Emma Mobile) based KZM9D board - Remove legacy KZM9D defconfig * Multiplatform - Add defconfig for shmobile multiplatform * tag 'renesas-defconfig3-for-v3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: ARM: shmobile: r7s72100: update defconfig for I2C usage ARM: shmobile: koelsch: Enable SDHI, GPIO and regulators in defconfig ARM: shmobile: Get rid of legacy KZM9D defconfig ARM: shmobile: Add defconfig for shmobile multiplatform ARM: shmobile: lager defconfig: Enable RSPI and MTD_M25P80 Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat
-rw-r--r--arch/arm/configs/genmai_defconfig4
-rw-r--r--arch/arm/configs/koelsch_defconfig9
-rw-r--r--arch/arm/configs/kzm9d_defconfig91
-rw-r--r--arch/arm/configs/lager_defconfig4
-rw-r--r--arch/arm/configs/shmobile_defconfig129
5 files changed, 145 insertions, 92 deletions
diff --git a/arch/arm/configs/genmai_defconfig b/arch/arm/configs/genmai_defconfig
index 5ee6ac0931f7..d238fafb6762 100644
--- a/arch/arm/configs/genmai_defconfig
+++ b/arch/arm/configs/genmai_defconfig
@@ -52,6 +52,7 @@ CONFIG_IP_PNP_DHCP=y
52CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 52CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
53CONFIG_DEVTMPFS=y 53CONFIG_DEVTMPFS=y
54CONFIG_DEVTMPFS_MOUNT=y 54CONFIG_DEVTMPFS_MOUNT=y
55CONFIG_EEPROM_AT24=y
55CONFIG_NETDEVICES=y 56CONFIG_NETDEVICES=y
56# CONFIG_NET_CORE is not set 57# CONFIG_NET_CORE is not set
57# CONFIG_NET_VENDOR_ARC is not set 58# CONFIG_NET_VENDOR_ARC is not set
@@ -80,7 +81,8 @@ CONFIG_SERIAL_SH_SCI=y
80CONFIG_SERIAL_SH_SCI_NR_UARTS=10 81CONFIG_SERIAL_SH_SCI_NR_UARTS=10
81CONFIG_SERIAL_SH_SCI_CONSOLE=y 82CONFIG_SERIAL_SH_SCI_CONSOLE=y
82# CONFIG_HW_RANDOM is not set 83# CONFIG_HW_RANDOM is not set
83CONFIG_I2C_SH_MOBILE=y 84CONFIG_I2C_CHARDEV=y
85CONFIG_I2C_RIIC=y
84CONFIG_SPI=y 86CONFIG_SPI=y
85CONFIG_SPI_RSPI=y 87CONFIG_SPI_RSPI=y
86# CONFIG_HWMON is not set 88# CONFIG_HWMON is not set
diff --git a/arch/arm/configs/koelsch_defconfig b/arch/arm/configs/koelsch_defconfig
index 95611392a20e..86faab565a96 100644
--- a/arch/arm/configs/koelsch_defconfig
+++ b/arch/arm/configs/koelsch_defconfig
@@ -59,6 +59,7 @@ CONFIG_SH_ETH=y
59# CONFIG_NET_VENDOR_VIA is not set 59# CONFIG_NET_VENDOR_VIA is not set
60# CONFIG_NET_VENDOR_WIZNET is not set 60# CONFIG_NET_VENDOR_WIZNET is not set
61# CONFIG_INPUT_MOUSEDEV_PSAUX is not set 61# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
62CONFIG_KEYBOARD_GPIO=y
62# CONFIG_INPUT_MOUSE is not set 63# CONFIG_INPUT_MOUSE is not set
63# CONFIG_LEGACY_PTYS is not set 64# CONFIG_LEGACY_PTYS is not set
64CONFIG_SERIAL_SH_SCI=y 65CONFIG_SERIAL_SH_SCI=y
@@ -68,13 +69,21 @@ CONFIG_I2C=y
68CONFIG_I2C_RCAR=y 69CONFIG_I2C_RCAR=y
69CONFIG_SPI=y 70CONFIG_SPI=y
70CONFIG_SPI_RSPI=y 71CONFIG_SPI_RSPI=y
72CONFIG_GPIOLIB=y
73CONFIG_GPIO_RCAR=y
71# CONFIG_HWMON is not set 74# CONFIG_HWMON is not set
72CONFIG_THERMAL=y 75CONFIG_THERMAL=y
73CONFIG_RCAR_THERMAL=y 76CONFIG_RCAR_THERMAL=y
77CONFIG_REGULATOR=y
78CONFIG_REGULATOR_FIXED_VOLTAGE=y
79CONFIG_REGULATOR_GPIO=y
74# CONFIG_HID is not set 80# CONFIG_HID is not set
75# CONFIG_USB_SUPPORT is not set 81# CONFIG_USB_SUPPORT is not set
82CONFIG_MMC=y
83CONFIG_MMC_SDHI=y
76CONFIG_NEW_LEDS=y 84CONFIG_NEW_LEDS=y
77CONFIG_LEDS_CLASS=y 85CONFIG_LEDS_CLASS=y
86CONFIG_LEDS_GPIO=y
78# CONFIG_IOMMU_SUPPORT is not set 87# CONFIG_IOMMU_SUPPORT is not set
79# CONFIG_DNOTIFY is not set 88# CONFIG_DNOTIFY is not set
80CONFIG_TMPFS=y 89CONFIG_TMPFS=y
diff --git a/arch/arm/configs/kzm9d_defconfig b/arch/arm/configs/kzm9d_defconfig
deleted file mode 100644
index 1cc330b06bf6..000000000000
--- a/arch/arm/configs/kzm9d_defconfig
+++ /dev/null
@@ -1,91 +0,0 @@
1# CONFIG_ARM_PATCH_PHYS_VIRT is not set
2CONFIG_EXPERIMENTAL=y
3CONFIG_SYSVIPC=y
4CONFIG_NO_HZ=y
5CONFIG_IKCONFIG=y
6CONFIG_IKCONFIG_PROC=y
7CONFIG_LOG_BUF_SHIFT=16
8CONFIG_CC_OPTIMIZE_FOR_SIZE=y
9CONFIG_SYSCTL_SYSCALL=y
10CONFIG_EMBEDDED=y
11CONFIG_PERF_EVENTS=y
12CONFIG_SLAB=y
13# CONFIG_BLK_DEV_BSG is not set
14# CONFIG_IOSCHED_DEADLINE is not set
15# CONFIG_IOSCHED_CFQ is not set
16CONFIG_ARCH_SHMOBILE_LEGACY=y
17CONFIG_ARCH_EMEV2=y
18CONFIG_MACH_KZM9D=y
19CONFIG_MEMORY_START=0x40000000
20CONFIG_MEMORY_SIZE=0x10000000
21# CONFIG_SH_TIMER_TMU is not set
22# CONFIG_SWP_EMULATE is not set
23# CONFIG_CACHE_L2X0 is not set
24CONFIG_SMP=y
25CONFIG_NR_CPUS=2
26CONFIG_HOTPLUG_CPU=y
27# CONFIG_LOCAL_TIMERS is not set
28CONFIG_AEABI=y
29# CONFIG_OABI_COMPAT is not set
30# CONFIG_CROSS_MEMORY_ATTACH is not set
31CONFIG_FORCE_MAX_ZONEORDER=13
32CONFIG_ZBOOT_ROM_TEXT=0x0
33CONFIG_ZBOOT_ROM_BSS=0x0
34CONFIG_ARM_APPENDED_DTB=y
35CONFIG_AUTO_ZRELADDR=y
36CONFIG_VFP=y
37# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
38CONFIG_PM_RUNTIME=y
39CONFIG_NET=y
40CONFIG_PACKET=y
41CONFIG_UNIX=y
42CONFIG_INET=y
43CONFIG_IP_PNP=y
44CONFIG_IP_PNP_DHCP=y
45# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
46# CONFIG_INET_XFRM_MODE_TUNNEL is not set
47# CONFIG_INET_XFRM_MODE_BEET is not set
48# CONFIG_INET_LRO is not set
49# CONFIG_INET_DIAG is not set
50# CONFIG_IPV6 is not set
51# CONFIG_WIRELESS is not set
52CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
53CONFIG_DEVTMPFS=y
54CONFIG_DEVTMPFS_MOUNT=y
55# CONFIG_BLK_DEV is not set
56CONFIG_NETDEVICES=y
57# CONFIG_NET_VENDOR_BROADCOM is not set
58# CONFIG_NET_VENDOR_CHELSIO is not set
59# CONFIG_NET_VENDOR_CIRRUS is not set
60# CONFIG_NET_VENDOR_FARADAY is not set
61# CONFIG_NET_VENDOR_INTEL is not set
62# CONFIG_NET_VENDOR_MARVELL is not set
63# CONFIG_NET_VENDOR_MICREL is not set
64# CONFIG_NET_VENDOR_NATSEMI is not set
65# CONFIG_NET_VENDOR_SEEQ is not set
66CONFIG_SMSC911X=y
67# CONFIG_NET_VENDOR_STMICRO is not set
68# CONFIG_NET_VENDOR_WIZNET is not set
69# CONFIG_WLAN is not set
70# CONFIG_INPUT_MOUSEDEV is not set
71# CONFIG_INPUT_KEYBOARD is not set
72# CONFIG_INPUT_MOUSE is not set
73# CONFIG_SERIO is not set
74# CONFIG_LEGACY_PTYS is not set
75# CONFIG_DEVKMEM is not set
76CONFIG_SERIAL_8250=y
77CONFIG_SERIAL_8250_CONSOLE=y
78CONFIG_SERIAL_8250_EM=y
79# CONFIG_HW_RANDOM is not set
80CONFIG_GPIOLIB=y
81CONFIG_GPIO_EM=y
82# CONFIG_HWMON is not set
83# CONFIG_HID_SUPPORT is not set
84# CONFIG_USB_SUPPORT is not set
85# CONFIG_IOMMU_SUPPORT is not set
86# CONFIG_DNOTIFY is not set
87CONFIG_TMPFS=y
88# CONFIG_MISC_FILESYSTEMS is not set
89CONFIG_NFS_FS=y
90CONFIG_ROOT_NFS=y
91# CONFIG_FTRACE is not set
diff --git a/arch/arm/configs/lager_defconfig b/arch/arm/configs/lager_defconfig
index b17f48739013..58702440472a 100644
--- a/arch/arm/configs/lager_defconfig
+++ b/arch/arm/configs/lager_defconfig
@@ -51,6 +51,8 @@ CONFIG_IP_PNP_DHCP=y
51CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 51CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
52CONFIG_DEVTMPFS=y 52CONFIG_DEVTMPFS=y
53CONFIG_DEVTMPFS_MOUNT=y 53CONFIG_DEVTMPFS_MOUNT=y
54CONFIG_MTD=y
55CONFIG_MTD_M25P80=y
54CONFIG_BLK_DEV_SD=y 56CONFIG_BLK_DEV_SD=y
55CONFIG_ATA=y 57CONFIG_ATA=y
56CONFIG_SATA_RCAR=y 58CONFIG_SATA_RCAR=y
@@ -86,6 +88,8 @@ CONFIG_SERIAL_SH_SCI_CONSOLE=y
86CONFIG_I2C=y 88CONFIG_I2C=y
87CONFIG_I2C_GPIO=y 89CONFIG_I2C_GPIO=y
88CONFIG_I2C_RCAR=y 90CONFIG_I2C_RCAR=y
91CONFIG_SPI=y
92CONFIG_SPI_RSPI=y
89CONFIG_GPIO_SH_PFC=y 93CONFIG_GPIO_SH_PFC=y
90CONFIG_GPIOLIB=y 94CONFIG_GPIOLIB=y
91CONFIG_GPIO_RCAR=y 95CONFIG_GPIO_RCAR=y
diff --git a/arch/arm/configs/shmobile_defconfig b/arch/arm/configs/shmobile_defconfig
new file mode 100644
index 000000000000..83b07258a385
--- /dev/null
+++ b/arch/arm/configs/shmobile_defconfig
@@ -0,0 +1,129 @@
1CONFIG_SYSVIPC=y
2CONFIG_NO_HZ=y
3CONFIG_IKCONFIG=y
4CONFIG_IKCONFIG_PROC=y
5CONFIG_LOG_BUF_SHIFT=16
6CONFIG_CC_OPTIMIZE_FOR_SIZE=y
7CONFIG_SYSCTL_SYSCALL=y
8CONFIG_EMBEDDED=y
9CONFIG_PERF_EVENTS=y
10CONFIG_SLAB=y
11CONFIG_ARCH_SHMOBILE_MULTI=y
12CONFIG_ARCH_EMEV2=y
13CONFIG_ARCH_R8A7790=y
14CONFIG_ARCH_R8A7791=y
15CONFIG_MACH_KOELSCH=y
16CONFIG_MACH_LAGER=y
17# CONFIG_SWP_EMULATE is not set
18CONFIG_CPU_BPREDICT_DISABLE=y
19CONFIG_PL310_ERRATA_588369=y
20CONFIG_ARM_ERRATA_754322=y
21CONFIG_PCI=y
22CONFIG_PCI_RCAR_GEN2=y
23CONFIG_SMP=y
24CONFIG_SCHED_MC=y
25CONFIG_HAVE_ARM_ARCH_TIMER=y
26CONFIG_NR_CPUS=8
27CONFIG_AEABI=y
28CONFIG_ZBOOT_ROM_TEXT=0x0
29CONFIG_ZBOOT_ROM_BSS=0x0
30CONFIG_ARM_APPENDED_DTB=y
31CONFIG_KEXEC=y
32CONFIG_VFP=y
33CONFIG_NEON=y
34# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
35CONFIG_NET=y
36CONFIG_PACKET=y
37CONFIG_UNIX=y
38CONFIG_INET=y
39CONFIG_IP_PNP=y
40CONFIG_IP_PNP_DHCP=y
41CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
42CONFIG_DEVTMPFS=y
43CONFIG_DEVTMPFS_MOUNT=y
44CONFIG_MTD=y
45CONFIG_MTD_M25P80=y
46CONFIG_BLK_DEV_SD=y
47CONFIG_ATA=y
48CONFIG_SATA_RCAR=y
49CONFIG_NETDEVICES=y
50# CONFIG_NET_VENDOR_ARC is not set
51# CONFIG_NET_CADENCE is not set
52# CONFIG_NET_VENDOR_BROADCOM is not set
53# CONFIG_NET_VENDOR_CIRRUS is not set
54# CONFIG_NET_VENDOR_FARADAY is not set
55# CONFIG_NET_VENDOR_INTEL is not set
56# CONFIG_NET_VENDOR_MARVELL is not set
57# CONFIG_NET_VENDOR_MICREL is not set
58# CONFIG_NET_VENDOR_NATSEMI is not set
59CONFIG_SH_ETH=y
60# CONFIG_NET_VENDOR_SEEQ is not set
61CONFIG_SMSC911X=y
62# CONFIG_NET_VENDOR_STMICRO is not set
63# CONFIG_NET_VENDOR_VIA is not set
64# CONFIG_NET_VENDOR_WIZNET is not set
65CONFIG_SMSC_PHY=y
66# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
67CONFIG_KEYBOARD_GPIO=y
68# CONFIG_INPUT_MOUSE is not set
69# CONFIG_LEGACY_PTYS is not set
70CONFIG_SERIAL_8250=y
71CONFIG_SERIAL_8250_CONSOLE=y
72CONFIG_SERIAL_8250_EXTENDED=y
73CONFIG_SERIAL_8250_EM=y
74CONFIG_SERIAL_SH_SCI=y
75CONFIG_SERIAL_SH_SCI_NR_UARTS=20
76CONFIG_SERIAL_SH_SCI_CONSOLE=y
77CONFIG_I2C_GPIO=y
78CONFIG_I2C_RCAR=y
79CONFIG_SPI=y
80CONFIG_SPI_RSPI=y
81CONFIG_GPIO_EM=y
82CONFIG_GPIO_RCAR=y
83# CONFIG_HWMON is not set
84CONFIG_THERMAL=y
85CONFIG_RCAR_THERMAL=y
86CONFIG_REGULATOR=y
87CONFIG_REGULATOR_FIXED_VOLTAGE=y
88CONFIG_REGULATOR_GPIO=y
89CONFIG_MEDIA_SUPPORT=y
90CONFIG_MEDIA_CAMERA_SUPPORT=y
91CONFIG_V4L_PLATFORM_DRIVERS=y
92CONFIG_SOC_CAMERA=y
93CONFIG_SOC_CAMERA_PLATFORM=y
94CONFIG_VIDEO_RCAR_VIN=y
95# CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set
96CONFIG_VIDEO_ADV7180=y
97CONFIG_DRM=y
98CONFIG_DRM_RCAR_DU=y
99CONFIG_SOUND=y
100CONFIG_SND=y
101CONFIG_SND_SOC=y
102CONFIG_SND_SOC_RCAR=y
103CONFIG_USB_RCAR_GEN2_PHY=y
104CONFIG_MMC=y
105CONFIG_MMC_SDHI=y
106CONFIG_MMC_SH_MMCIF=y
107CONFIG_NEW_LEDS=y
108CONFIG_LEDS_CLASS=y
109CONFIG_LEDS_GPIO=y
110CONFIG_RTC_CLASS=y
111CONFIG_DMADEVICES=y
112CONFIG_SH_DMAE=y
113# CONFIG_IOMMU_SUPPORT is not set
114# CONFIG_DNOTIFY is not set
115CONFIG_MSDOS_FS=y
116CONFIG_VFAT_FS=y
117CONFIG_TMPFS=y
118CONFIG_CONFIGFS_FS=y
119# CONFIG_MISC_FILESYSTEMS is not set
120CONFIG_NFS_FS=y
121CONFIG_NFS_V3_ACL=y
122CONFIG_NFS_V4=y
123CONFIG_NFS_V4_1=y
124CONFIG_ROOT_NFS=y
125CONFIG_NLS_CODEPAGE_437=y
126CONFIG_NLS_ISO8859_1=y
127# CONFIG_ENABLE_WARN_DEPRECATED is not set
128# CONFIG_ENABLE_MUST_CHECK is not set
129# CONFIG_ARM_UNWIND is not set
generated by cgit v1.2.2 (git 2.25.0) at 2025-02-25 14:37:37 -0500