diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-07 13:57:51 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-07 13:57:51 -0400 |
commit | a8c4b90e670be3b01e9395c7310639c8109fc77e (patch) | |
tree | 272f7988aeeaf930efd594f66c1a41a7d28ecd74 /arch/arm/configs | |
parent | eac84105cddf8686440aaa9fbcb58093e37e4180 (diff) | |
parent | 9251c6c0dc929d8eec6751c12ef312597f84e147 (diff) |
Merge tag 'soc-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC platform updates (part 2) from Arnd Bergmann:
"These patches are all for Renesas shmobile, and depend on the earlier
pinctrl updates. Remarkably, this adds support for three new SoCs:
r8a73a4, r8a73a4 and r8a7778. The bulk of the code added for these is
for pinctrl (using the new subsystem) and for clocks (not yet using
the common clock subsystem). The latter will have to get converted in
one of the upcoming releases, but shmobile is not ready for that yet.
The series also contains Renesas shmobile board changes, adding one
board file for each of the three new SoCs. These boards are using a
mix of classic and device-tree based probing, as there is still a lot
of infrastructure in shmobile that has not been converted to DT yet.
Once those are resolved to the degree that no board specific setup
code is needed, they can get folded into the respective SoC setup files."
* tag 'soc-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (78 commits)
ARM: shmobile: use r8a7790 timer setup code on Lager
ARM: shmobile: force enable of r8a7790 arch timer
ARM: shmobile: Add second I/O range for r8a7790 PFC
ARM: shmobile: bockw: enable network settings on bootargs
ARM: shmobile: bockw: add SMSC ethernet support
ARM: shmobile: R8A7778: add Ether support
ARM: shmobile: bockw: enable SMSC ethernet on defconfig
ARM: shmobile: r8a7778: add r8a7778_init_irq_extpin()
ARM: shmobile: r8a7778: remove pointless PLATFORM_INFO()
ARM: shmobile: mackerel: clean up MMCIF vs. SDHI1 selection
ARM: shmobile: mackerel: add interrupt names for SDHI0
ARM: shmobile: mackerel: switch SDHI and MMCIF interfaces to slot-gpio
ARM: shmobile: mackerel: remove OCR masks, where regulators are used
ARM: shmobile: mackerel: SDHI resources do not have to be numbered
ARM: shmobile: Initial r8a7790 Lager board support
ARM: shmobile: APE6EVM LAN9220 support
ARM: shmobile: APE6EVM PFC support
ARM: shmobile: APE6EVM base support
ARM: shmobile: kzm9g-reference: add ethernet support
ARM: shmobile: add R-Car M1A Bock-W platform support
...
Diffstat (limited to 'arch/arm/configs')
-rw-r--r-- | arch/arm/configs/bockw_defconfig | 94 |
1 files changed, 94 insertions, 0 deletions
diff --git a/arch/arm/configs/bockw_defconfig b/arch/arm/configs/bockw_defconfig new file mode 100644 index 000000000000..6524cdf3b08d --- /dev/null +++ b/arch/arm/configs/bockw_defconfig | |||
@@ -0,0 +1,94 @@ | |||
1 | # CONFIG_ARM_PATCH_PHYS_VIRT is not set | ||
2 | CONFIG_KERNEL_LZMA=y | ||
3 | CONFIG_NO_HZ=y | ||
4 | CONFIG_IKCONFIG=y | ||
5 | CONFIG_IKCONFIG_PROC=y | ||
6 | CONFIG_LOG_BUF_SHIFT=16 | ||
7 | CONFIG_SYSCTL_SYSCALL=y | ||
8 | CONFIG_EMBEDDED=y | ||
9 | CONFIG_SLAB=y | ||
10 | # CONFIG_IOSCHED_CFQ is not set | ||
11 | CONFIG_ARCH_SHMOBILE=y | ||
12 | CONFIG_ARCH_R8A7778=y | ||
13 | CONFIG_MACH_BOCKW=y | ||
14 | CONFIG_MEMORY_START=0x60000000 | ||
15 | CONFIG_MEMORY_SIZE=0x10000000 | ||
16 | CONFIG_SHMOBILE_TIMER_HZ=1024 | ||
17 | # CONFIG_SH_TIMER_CMT is not set | ||
18 | # CONFIG_EM_TIMER_STI is not set | ||
19 | CONFIG_ARM_ERRATA_430973=y | ||
20 | CONFIG_ARM_ERRATA_458693=y | ||
21 | CONFIG_ARM_ERRATA_460075=y | ||
22 | CONFIG_ARM_ERRATA_743622=y | ||
23 | CONFIG_ARM_ERRATA_754322=y | ||
24 | CONFIG_AEABI=y | ||
25 | # CONFIG_OABI_COMPAT is not set | ||
26 | CONFIG_HIGHMEM=y | ||
27 | CONFIG_ZBOOT_ROM_TEXT=0x0 | ||
28 | CONFIG_ZBOOT_ROM_BSS=0x0 | ||
29 | CONFIG_ARM_APPENDED_DTB=y | ||
30 | CONFIG_CMDLINE="console=ttySC0,115200 ignore_loglevel root=/dev/nfs ip=dhcp" | ||
31 | CONFIG_CMDLINE_FORCE=y | ||
32 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | ||
33 | # CONFIG_SUSPEND is not set | ||
34 | CONFIG_NET=y | ||
35 | CONFIG_UNIX=y | ||
36 | CONFIG_INET=y | ||
37 | CONFIG_IP_PNP=y | ||
38 | CONFIG_IP_PNP_DHCP=y | ||
39 | # CONFIG_INET_XFRM_MODE_TRANSPORT is not set | ||
40 | # CONFIG_INET_XFRM_MODE_TUNNEL is not set | ||
41 | # CONFIG_INET_XFRM_MODE_BEET is not set | ||
42 | # CONFIG_INET_LRO is not set | ||
43 | # CONFIG_INET_DIAG is not set | ||
44 | # CONFIG_IPV6 is not set | ||
45 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | ||
46 | CONFIG_DEVTMPFS=y | ||
47 | CONFIG_DEVTMPFS_MOUNT=y | ||
48 | # CONFIG_STANDALONE is not set | ||
49 | # CONFIG_PREVENT_FIRMWARE_BUILD is not set | ||
50 | # CONFIG_FW_LOADER is not set | ||
51 | CONFIG_NETDEVICES=y | ||
52 | # CONFIG_NET_CADENCE is not set | ||
53 | # CONFIG_NET_VENDOR_BROADCOM is not set | ||
54 | # CONFIG_NET_VENDOR_CIRRUS is not set | ||
55 | # CONFIG_NET_VENDOR_FARADAY is not set | ||
56 | # CONFIG_NET_VENDOR_INTEL is not set | ||
57 | # CONFIG_NET_VENDOR_MARVELL is not set | ||
58 | # CONFIG_NET_VENDOR_MICREL is not set | ||
59 | # CONFIG_NET_VENDOR_NATSEMI is not set | ||
60 | # CONFIG_NET_VENDOR_SEEQ is not set | ||
61 | CONFIG_SMSC911X=y | ||
62 | # CONFIG_NET_VENDOR_STMICRO is not set | ||
63 | # CONFIG_NET_VENDOR_WIZNET is not set | ||
64 | # CONFIG_INPUT is not set | ||
65 | # CONFIG_SERIO is not set | ||
66 | # CONFIG_VT is not set | ||
67 | # CONFIG_LEGACY_PTYS is not set | ||
68 | # CONFIG_DEVKMEM is not set | ||
69 | CONFIG_SERIAL_SH_SCI=y | ||
70 | CONFIG_SERIAL_SH_SCI_NR_UARTS=6 | ||
71 | CONFIG_SERIAL_SH_SCI_CONSOLE=y | ||
72 | # CONFIG_HW_RANDOM is not set | ||
73 | # CONFIG_HWMON is not set | ||
74 | # CONFIG_USB_SUPPORT is not set | ||
75 | CONFIG_UIO=y | ||
76 | CONFIG_UIO_PDRV_GENIRQ=y | ||
77 | # CONFIG_IOMMU_SUPPORT is not set | ||
78 | # CONFIG_DNOTIFY is not set | ||
79 | # CONFIG_INOTIFY_USER is not set | ||
80 | CONFIG_TMPFS=y | ||
81 | # CONFIG_MISC_FILESYSTEMS is not set | ||
82 | CONFIG_NFS_FS=y | ||
83 | CONFIG_NFS_V3_ACL=y | ||
84 | CONFIG_NFS_V4=y | ||
85 | CONFIG_NFS_SWAP=y | ||
86 | CONFIG_NFS_V4_1=y | ||
87 | CONFIG_ROOT_NFS=y | ||
88 | # CONFIG_ENABLE_WARN_DEPRECATED is not set | ||
89 | # CONFIG_ENABLE_MUST_CHECK is not set | ||
90 | # CONFIG_SCHED_DEBUG is not set | ||
91 | # CONFIG_DEBUG_BUGVERBOSE is not set | ||
92 | # CONFIG_FTRACE is not set | ||
93 | # CONFIG_ARM_UNWIND is not set | ||
94 | CONFIG_AVERAGE=y | ||