diff options
author | Olof Johansson <olof@lixom.net> | 2013-12-03 19:52:33 -0500 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2013-12-03 19:52:33 -0500 |
commit | 38e67641b9f0ec421a51a258d23974a06fb7b884 (patch) | |
tree | fadd1f526bcdd18034b8c51befc11391c0eddfb9 | |
parent | dc1ccc48159d63eca5089e507c82c7d22ef60839 (diff) | |
parent | 577092b3d11530acd8467074f6ea7e2dd36b5028 (diff) |
Merge tag 'renesas-defconfig-for-v3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/boards
From Simon Horman:
Renesas ARM based SoC defconfig updates for v3.14
* Add Genmai defconfig
- The board was added in v3.13 but the defconfig missed the cut
* Enable AUTO_ZRELADDR for kzm9d board
* Enable HPB-DMAC, PACKET, VFP on bockw and marzen boards
* Do not disable INOTIFY_USER on bockw or marzen boards
* Do not enable CONFIG_DEVTMPFS on bockw or marzen boards
* Do not enable CONFIG_SMC911X on marzen
- That hardware does not exist on the marzen board
* Do not set command line on bockw or marzen boards
- This is handled in the DTS
* Enable REGULATOR on bockw board
* tag 'renesas-defconfig-for-v3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
ARM: shmobile: kzm9d: Enable AUTO_ZRELADDR in defconfig
ARM: shmobile: bockw: enable HPB-DMAC in defconfig
ARM: shmobile: marzen: enable HPB-DMAC in defconfig
ARM: shmobile: marzen: Do not enable CONFIG_SMC911X in defconfig
ARM: shmobile: marzen: Enable CONFIG_PACKET in defconfig
ARM: shmobile: bockw: Enable CONFIG_PACKET in defconfig
ARM: shmobile: marzen: Do not enable CONFIG_DEVTMPFS defconfig
ARM: shmobile: bockw: Do not enable CONFIG_DEVTMPFS defconfig
ARM: shmobile: marzen: Enable CONFIG_VFP in defconfig
ARM: shmobile: bockw: Enable CONFIG_VFP in defconfig
ARM: shmobile: marzen: Do not disable CONFIG_INOTIFY_USER in defconfig
ARM: shmobile: bockw: Do not disable CONFIG_INOTIFY_USER in defconfig
ARM: shmobile: marzen: Do not set command line in defconfig
ARM: shmobile: bockw: Do not set command line in defconfig
ARM: shmobile: bockw: enable CONFIG_REGULATOR
ARM: shmobile: Genmai defconfig
Signed-off-by: Olof Johansson <olof@lixom.net>
-rw-r--r-- | arch/arm/configs/bockw_defconfig | 10 | ||||
-rw-r--r-- | arch/arm/configs/genmai_defconfig | 116 | ||||
-rw-r--r-- | arch/arm/configs/kzm9d_defconfig | 1 | ||||
-rw-r--r-- | arch/arm/configs/marzen_defconfig | 10 |
4 files changed, 126 insertions, 11 deletions
diff --git a/arch/arm/configs/bockw_defconfig b/arch/arm/configs/bockw_defconfig index b38cd107f82d..8110d8a653f7 100644 --- a/arch/arm/configs/bockw_defconfig +++ b/arch/arm/configs/bockw_defconfig | |||
@@ -27,12 +27,12 @@ CONFIG_HIGHMEM=y | |||
27 | CONFIG_ZBOOT_ROM_TEXT=0x0 | 27 | CONFIG_ZBOOT_ROM_TEXT=0x0 |
28 | CONFIG_ZBOOT_ROM_BSS=0x0 | 28 | CONFIG_ZBOOT_ROM_BSS=0x0 |
29 | CONFIG_ARM_APPENDED_DTB=y | 29 | CONFIG_ARM_APPENDED_DTB=y |
30 | CONFIG_CMDLINE="console=ttySC0,115200 ignore_loglevel root=/dev/nfs ip=dhcp" | 30 | CONFIG_VFP=y |
31 | CONFIG_CMDLINE_FORCE=y | ||
32 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | 31 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set |
33 | # CONFIG_SUSPEND is not set | 32 | # CONFIG_SUSPEND is not set |
34 | CONFIG_PM_RUNTIME=y | 33 | CONFIG_PM_RUNTIME=y |
35 | CONFIG_NET=y | 34 | CONFIG_NET=y |
35 | CONFIG_PACKET=y | ||
36 | CONFIG_UNIX=y | 36 | CONFIG_UNIX=y |
37 | CONFIG_INET=y | 37 | CONFIG_INET=y |
38 | CONFIG_IP_PNP=y | 38 | CONFIG_IP_PNP=y |
@@ -44,8 +44,6 @@ CONFIG_IP_PNP_DHCP=y | |||
44 | # CONFIG_INET_DIAG is not set | 44 | # CONFIG_INET_DIAG is not set |
45 | # CONFIG_IPV6 is not set | 45 | # CONFIG_IPV6 is not set |
46 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | 46 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" |
47 | CONFIG_DEVTMPFS=y | ||
48 | CONFIG_DEVTMPFS_MOUNT=y | ||
49 | # CONFIG_STANDALONE is not set | 47 | # CONFIG_STANDALONE is not set |
50 | # CONFIG_PREVENT_FIRMWARE_BUILD is not set | 48 | # CONFIG_PREVENT_FIRMWARE_BUILD is not set |
51 | # CONFIG_FW_LOADER is not set | 49 | # CONFIG_FW_LOADER is not set |
@@ -82,6 +80,7 @@ CONFIG_SERIAL_SH_SCI_CONSOLE=y | |||
82 | # CONFIG_HWMON is not set | 80 | # CONFIG_HWMON is not set |
83 | CONFIG_I2C=y | 81 | CONFIG_I2C=y |
84 | CONFIG_I2C_RCAR=y | 82 | CONFIG_I2C_RCAR=y |
83 | CONFIG_REGULATOR=y | ||
85 | CONFIG_MEDIA_SUPPORT=y | 84 | CONFIG_MEDIA_SUPPORT=y |
86 | CONFIG_MEDIA_CAMERA_SUPPORT=y | 85 | CONFIG_MEDIA_CAMERA_SUPPORT=y |
87 | CONFIG_V4L_PLATFORM_DRIVERS=y | 86 | CONFIG_V4L_PLATFORM_DRIVERS=y |
@@ -108,11 +107,12 @@ CONFIG_MMC_SDHI=y | |||
108 | CONFIG_MMC_SH_MMCIF=y | 107 | CONFIG_MMC_SH_MMCIF=y |
109 | CONFIG_RTC_CLASS=y | 108 | CONFIG_RTC_CLASS=y |
110 | CONFIG_RTC_DRV_RX8581=y | 109 | CONFIG_RTC_DRV_RX8581=y |
110 | CONFIG_DMADEVICES=y | ||
111 | CONFIG_RCAR_HPB_DMAE=y | ||
111 | CONFIG_UIO=y | 112 | CONFIG_UIO=y |
112 | CONFIG_UIO_PDRV_GENIRQ=y | 113 | CONFIG_UIO_PDRV_GENIRQ=y |
113 | # CONFIG_IOMMU_SUPPORT is not set | 114 | # CONFIG_IOMMU_SUPPORT is not set |
114 | # CONFIG_DNOTIFY is not set | 115 | # CONFIG_DNOTIFY is not set |
115 | # CONFIG_INOTIFY_USER is not set | ||
116 | CONFIG_TMPFS=y | 116 | CONFIG_TMPFS=y |
117 | # CONFIG_MISC_FILESYSTEMS is not set | 117 | # CONFIG_MISC_FILESYSTEMS is not set |
118 | CONFIG_NFS_FS=y | 118 | CONFIG_NFS_FS=y |
diff --git a/arch/arm/configs/genmai_defconfig b/arch/arm/configs/genmai_defconfig new file mode 100644 index 000000000000..69b1531a4c80 --- /dev/null +++ b/arch/arm/configs/genmai_defconfig | |||
@@ -0,0 +1,116 @@ | |||
1 | CONFIG_SYSVIPC=y | ||
2 | CONFIG_NO_HZ=y | ||
3 | CONFIG_IKCONFIG=y | ||
4 | CONFIG_IKCONFIG_PROC=y | ||
5 | CONFIG_LOG_BUF_SHIFT=16 | ||
6 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | ||
7 | CONFIG_SYSCTL_SYSCALL=y | ||
8 | CONFIG_EMBEDDED=y | ||
9 | CONFIG_PERF_EVENTS=y | ||
10 | CONFIG_SLAB=y | ||
11 | # CONFIG_LBDAF is not set | ||
12 | # CONFIG_BLK_DEV_BSG is not set | ||
13 | # CONFIG_IOSCHED_DEADLINE is not set | ||
14 | # CONFIG_IOSCHED_CFQ is not set | ||
15 | CONFIG_ARCH_SHMOBILE=y | ||
16 | CONFIG_ARCH_R7S72100=y | ||
17 | CONFIG_MACH_GENMAI=y | ||
18 | # CONFIG_SH_TIMER_CMT is not set | ||
19 | # CONFIG_SH_TIMER_MTU2 is not set | ||
20 | # CONFIG_SH_TIMER_TMU is not set | ||
21 | # CONFIG_EM_TIMER_STI is not set | ||
22 | CONFIG_ARM_ERRATA_430973=y | ||
23 | CONFIG_ARM_ERRATA_458693=y | ||
24 | CONFIG_ARM_ERRATA_460075=y | ||
25 | CONFIG_ARM_ERRATA_743622=y | ||
26 | CONFIG_ARM_ERRATA_754322=y | ||
27 | CONFIG_AEABI=y | ||
28 | # CONFIG_OABI_COMPAT is not set | ||
29 | CONFIG_FORCE_MAX_ZONEORDER=13 | ||
30 | CONFIG_ZBOOT_ROM_TEXT=0x0 | ||
31 | CONFIG_ZBOOT_ROM_BSS=0x0 | ||
32 | CONFIG_ARM_APPENDED_DTB=y | ||
33 | CONFIG_KEXEC=y | ||
34 | CONFIG_AUTO_ZRELADDR=y | ||
35 | CONFIG_VFP=y | ||
36 | CONFIG_NEON=y | ||
37 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | ||
38 | CONFIG_PM_RUNTIME=y | ||
39 | CONFIG_NET=y | ||
40 | CONFIG_PACKET=y | ||
41 | CONFIG_UNIX=y | ||
42 | CONFIG_INET=y | ||
43 | CONFIG_IP_PNP=y | ||
44 | CONFIG_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 | ||
52 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | ||
53 | CONFIG_NETDEVICES=y | ||
54 | # CONFIG_NET_CORE is not set | ||
55 | # CONFIG_NET_VENDOR_ARC is not set | ||
56 | # CONFIG_NET_CADENCE is not set | ||
57 | # CONFIG_NET_VENDOR_BROADCOM is not set | ||
58 | # CONFIG_NET_VENDOR_CIRRUS is not set | ||
59 | # CONFIG_NET_VENDOR_FARADAY is not set | ||
60 | # CONFIG_NET_VENDOR_INTEL is not set | ||
61 | # CONFIG_NET_VENDOR_MARVELL is not set | ||
62 | # CONFIG_NET_VENDOR_MICREL is not set | ||
63 | # CONFIG_NET_VENDOR_NATSEMI is not set | ||
64 | CONFIG_SH_ETH=y | ||
65 | # CONFIG_NET_VENDOR_SEEQ is not set | ||
66 | # CONFIG_NET_VENDOR_SMSC is not set | ||
67 | # CONFIG_NET_VENDOR_STMICRO is not set | ||
68 | # CONFIG_NET_VENDOR_VIA is not set | ||
69 | # CONFIG_NET_VENDOR_WIZNET is not set | ||
70 | # CONFIG_WLAN is not set | ||
71 | # CONFIG_INPUT_MOUSEDEV_PSAUX is not set | ||
72 | CONFIG_INPUT_EVDEV=y | ||
73 | # CONFIG_KEYBOARD_ATKBD is not set | ||
74 | # CONFIG_INPUT_MOUSE is not set | ||
75 | # CONFIG_SERIO is not set | ||
76 | # CONFIG_LEGACY_PTYS is not set | ||
77 | CONFIG_SERIAL_SH_SCI=y | ||
78 | CONFIG_SERIAL_SH_SCI_NR_UARTS=10 | ||
79 | CONFIG_SERIAL_SH_SCI_CONSOLE=y | ||
80 | # CONFIG_HW_RANDOM is not set | ||
81 | CONFIG_I2C_SH_MOBILE=y | ||
82 | # CONFIG_HWMON is not set | ||
83 | CONFIG_THERMAL=y | ||
84 | CONFIG_RCAR_THERMAL=y | ||
85 | CONFIG_REGULATOR=y | ||
86 | CONFIG_REGULATOR_FIXED_VOLTAGE=y | ||
87 | CONFIG_DRM=y | ||
88 | CONFIG_DRM_RCAR_DU=y | ||
89 | # CONFIG_USB_SUPPORT is not set | ||
90 | CONFIG_MMC=y | ||
91 | CONFIG_MMC_SDHI=y | ||
92 | CONFIG_MMC_SH_MMCIF=y | ||
93 | CONFIG_NEW_LEDS=y | ||
94 | CONFIG_LEDS_CLASS=y | ||
95 | CONFIG_RTC_CLASS=y | ||
96 | CONFIG_DMADEVICES=y | ||
97 | CONFIG_SH_DMAE=y | ||
98 | # CONFIG_IOMMU_SUPPORT is not set | ||
99 | # CONFIG_DNOTIFY is not set | ||
100 | CONFIG_MSDOS_FS=y | ||
101 | CONFIG_VFAT_FS=y | ||
102 | CONFIG_TMPFS=y | ||
103 | CONFIG_CONFIGFS_FS=y | ||
104 | # CONFIG_MISC_FILESYSTEMS is not set | ||
105 | CONFIG_NFS_FS=y | ||
106 | CONFIG_NFS_V3_ACL=y | ||
107 | CONFIG_NFS_V4=y | ||
108 | CONFIG_NFS_V4_1=y | ||
109 | CONFIG_ROOT_NFS=y | ||
110 | CONFIG_NLS_CODEPAGE_437=y | ||
111 | CONFIG_NLS_ISO8859_1=y | ||
112 | # CONFIG_ENABLE_WARN_DEPRECATED is not set | ||
113 | # CONFIG_ENABLE_MUST_CHECK is not set | ||
114 | # CONFIG_ARM_UNWIND is not set | ||
115 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | ||
116 | # CONFIG_CRYPTO_HW is not set | ||
diff --git a/arch/arm/configs/kzm9d_defconfig b/arch/arm/configs/kzm9d_defconfig index 6c37f4a98eb8..e6aed23ac083 100644 --- a/arch/arm/configs/kzm9d_defconfig +++ b/arch/arm/configs/kzm9d_defconfig | |||
@@ -32,6 +32,7 @@ CONFIG_FORCE_MAX_ZONEORDER=13 | |||
32 | CONFIG_ZBOOT_ROM_TEXT=0x0 | 32 | CONFIG_ZBOOT_ROM_TEXT=0x0 |
33 | CONFIG_ZBOOT_ROM_BSS=0x0 | 33 | CONFIG_ZBOOT_ROM_BSS=0x0 |
34 | CONFIG_ARM_APPENDED_DTB=y | 34 | CONFIG_ARM_APPENDED_DTB=y |
35 | CONFIG_AUTO_ZRELADDR=y | ||
35 | CONFIG_VFP=y | 36 | CONFIG_VFP=y |
36 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | 37 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set |
37 | CONFIG_PM_RUNTIME=y | 38 | CONFIG_PM_RUNTIME=y |
diff --git a/arch/arm/configs/marzen_defconfig b/arch/arm/configs/marzen_defconfig index 5cc6360340b1..dd4aced59d3c 100644 --- a/arch/arm/configs/marzen_defconfig +++ b/arch/arm/configs/marzen_defconfig | |||
@@ -30,12 +30,12 @@ CONFIG_HIGHMEM=y | |||
30 | CONFIG_ZBOOT_ROM_TEXT=0x0 | 30 | CONFIG_ZBOOT_ROM_TEXT=0x0 |
31 | CONFIG_ZBOOT_ROM_BSS=0x0 | 31 | CONFIG_ZBOOT_ROM_BSS=0x0 |
32 | CONFIG_ARM_APPENDED_DTB=y | 32 | CONFIG_ARM_APPENDED_DTB=y |
33 | CONFIG_CMDLINE="console=ttySC2,115200 earlyprintk=sh-sci.2,115200 ignore_loglevel root=/dev/nfs ip=on" | 33 | CONFIG_VFP=y |
34 | CONFIG_CMDLINE_FORCE=y | ||
35 | CONFIG_KEXEC=y | 34 | CONFIG_KEXEC=y |
36 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | 35 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set |
37 | CONFIG_PM_RUNTIME=y | 36 | CONFIG_PM_RUNTIME=y |
38 | CONFIG_NET=y | 37 | CONFIG_NET=y |
38 | CONFIG_PACKET=y | ||
39 | CONFIG_UNIX=y | 39 | CONFIG_UNIX=y |
40 | CONFIG_INET=y | 40 | CONFIG_INET=y |
41 | CONFIG_IP_PNP=y | 41 | CONFIG_IP_PNP=y |
@@ -43,8 +43,6 @@ CONFIG_IP_PNP_DHCP=y | |||
43 | # CONFIG_IPV6 is not set | 43 | # CONFIG_IPV6 is not set |
44 | # CONFIG_WIRELESS is not set | 44 | # CONFIG_WIRELESS is not set |
45 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | 45 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" |
46 | CONFIG_DEVTMPFS=y | ||
47 | CONFIG_DEVTMPFS_MOUNT=y | ||
48 | # CONFIG_STANDALONE is not set | 46 | # CONFIG_STANDALONE is not set |
49 | # CONFIG_PREVENT_FIRMWARE_BUILD is not set | 47 | # CONFIG_PREVENT_FIRMWARE_BUILD is not set |
50 | # CONFIG_FW_LOADER is not set | 48 | # CONFIG_FW_LOADER is not set |
@@ -61,7 +59,6 @@ CONFIG_NETDEVICES=y | |||
61 | # CONFIG_NET_VENDOR_MICREL is not set | 59 | # CONFIG_NET_VENDOR_MICREL is not set |
62 | # CONFIG_NET_VENDOR_NATSEMI is not set | 60 | # CONFIG_NET_VENDOR_NATSEMI is not set |
63 | # CONFIG_NET_VENDOR_SEEQ is not set | 61 | # CONFIG_NET_VENDOR_SEEQ is not set |
64 | CONFIG_SMC911X=y | ||
65 | CONFIG_SMSC911X=y | 62 | CONFIG_SMSC911X=y |
66 | # CONFIG_NET_VENDOR_STMICRO is not set | 63 | # CONFIG_NET_VENDOR_STMICRO is not set |
67 | # CONFIG_WLAN is not set | 64 | # CONFIG_WLAN is not set |
@@ -106,11 +103,12 @@ CONFIG_USB_STORAGE=y | |||
106 | CONFIG_NEW_LEDS=y | 103 | CONFIG_NEW_LEDS=y |
107 | CONFIG_LEDS_CLASS=y | 104 | CONFIG_LEDS_CLASS=y |
108 | CONFIG_LEDS_GPIO=y | 105 | CONFIG_LEDS_GPIO=y |
106 | CONFIG_DMADEVICES=y | ||
107 | CONFIG_RCAR_HPB_DMAE=y | ||
109 | CONFIG_UIO=y | 108 | CONFIG_UIO=y |
110 | CONFIG_UIO_PDRV_GENIRQ=y | 109 | CONFIG_UIO_PDRV_GENIRQ=y |
111 | # CONFIG_IOMMU_SUPPORT is not set | 110 | # CONFIG_IOMMU_SUPPORT is not set |
112 | # CONFIG_DNOTIFY is not set | 111 | # CONFIG_DNOTIFY is not set |
113 | # CONFIG_INOTIFY_USER is not set | ||
114 | CONFIG_TMPFS=y | 112 | CONFIG_TMPFS=y |
115 | # CONFIG_MISC_FILESYSTEMS is not set | 113 | # CONFIG_MISC_FILESYSTEMS is not set |
116 | CONFIG_NFS_FS=y | 114 | CONFIG_NFS_FS=y |