diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-07 17:50:14 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-07 17:50:14 -0500 |
commit | d074b104cefcb6e8ded55a53e62fed59a246f55d (patch) | |
tree | 8c5b3a3992c5abab8b41b6e1f2837bc46f82b207 /arch/arm/configs | |
parent | 31b6ca0af758a88e5e769b48cc6dde037ee37b96 (diff) | |
parent | c413521eb4e2d7ffd5ce432a144708d479054bd3 (diff) |
Merge branch 'rmobile-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
* 'rmobile-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (67 commits)
ARM: mach-shmobile: update for SMP changes.
ARM: mach-shmobile: update for GIC changes.
ARM: mach-shmobile: Fix up clkdev fallout for SH73A0.
dma: shdma: don't register the global die notifier multiple times
ARM: mach-shmobile: Rely on run-time IRQ handlers
ARM: mach-shmobile: Run-time IRQ handler for GIC
ARM: mach-shmobile: Run-time IRQ handler for INTCA
ARM: mach-shmobile: Enable CONFIG_MULTI_IRQ_HANDLER
ARM: mach-shmobile: Use shared GIC entry macros
ARM: mach-shmobile: mackerel: Add zboot support
ARM: mach-shmobile: mackerel: Add HDMI sound support
ARM: mach-shmobile: mackerel: add HDMI video support
ARM: mach-shmobile: ap4evb: fixup clk_put timing of fsib_clk
ARM: mach-shmobile: sh73a0: fix div4 table
ARM: mach-shmobile: ap4/mackerel: modify wrong comment out of USB
ARM: mach-shmobile: Mackerel VGA camera support
mmc: sh_mmcif: make DMA support by the driver unconditional
ARM: mach-shmobile: Add eMMC support through MMCIF on AG5EVM
ARM: mach-shmobile: Use pullups for AG5EVM KEYSC pins
ARM: mach-shmobile: sh73a0 GPIO pullup improvement
...
Diffstat (limited to 'arch/arm/configs')
-rw-r--r-- | arch/arm/configs/ag5evm_defconfig | 83 | ||||
-rw-r--r-- | arch/arm/configs/mackerel_defconfig | 138 |
2 files changed, 221 insertions, 0 deletions
diff --git a/arch/arm/configs/ag5evm_defconfig b/arch/arm/configs/ag5evm_defconfig new file mode 100644 index 000000000000..2b9cf56db363 --- /dev/null +++ b/arch/arm/configs/ag5evm_defconfig | |||
@@ -0,0 +1,83 @@ | |||
1 | CONFIG_EXPERIMENTAL=y | ||
2 | CONFIG_SYSVIPC=y | ||
3 | CONFIG_IKCONFIG=y | ||
4 | CONFIG_IKCONFIG_PROC=y | ||
5 | CONFIG_LOG_BUF_SHIFT=16 | ||
6 | CONFIG_NAMESPACES=y | ||
7 | # CONFIG_UTS_NS is not set | ||
8 | # CONFIG_IPC_NS is not set | ||
9 | # CONFIG_USER_NS is not set | ||
10 | # CONFIG_PID_NS is not set | ||
11 | CONFIG_BLK_DEV_INITRD=y | ||
12 | CONFIG_INITRAMFS_SOURCE="" | ||
13 | CONFIG_EMBEDDED=y | ||
14 | CONFIG_SLAB=y | ||
15 | # CONFIG_BLK_DEV_BSG is not set | ||
16 | # CONFIG_IOSCHED_DEADLINE is not set | ||
17 | # CONFIG_IOSCHED_CFQ is not set | ||
18 | CONFIG_ARCH_SHMOBILE=y | ||
19 | CONFIG_ARCH_SH73A0=y | ||
20 | CONFIG_MACH_AG5EVM=y | ||
21 | CONFIG_MEMORY_SIZE=0x10000000 | ||
22 | CONFIG_CPU_BPREDICT_DISABLE=y | ||
23 | CONFIG_ARM_ERRATA_430973=y | ||
24 | CONFIG_ARM_ERRATA_458693=y | ||
25 | CONFIG_NO_HZ=y | ||
26 | CONFIG_AEABI=y | ||
27 | # CONFIG_OABI_COMPAT is not set | ||
28 | CONFIG_HIGHMEM=y | ||
29 | CONFIG_ZBOOT_ROM_TEXT=0x0 | ||
30 | CONFIG_ZBOOT_ROM_BSS=0x0 | ||
31 | CONFIG_CMDLINE="console=tty0 console=ttySC2,115200 earlyprintk=sh-sci.2,115200 ignore_loglevel" | ||
32 | CONFIG_CMDLINE_FORCE=y | ||
33 | CONFIG_KEXEC=y | ||
34 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | ||
35 | CONFIG_PM=y | ||
36 | # CONFIG_SUSPEND is not set | ||
37 | CONFIG_PM_RUNTIME=y | ||
38 | CONFIG_NET=y | ||
39 | CONFIG_PACKET=y | ||
40 | CONFIG_UNIX=y | ||
41 | CONFIG_INET=y | ||
42 | # CONFIG_INET_XFRM_MODE_TRANSPORT is not set | ||
43 | # CONFIG_INET_XFRM_MODE_TUNNEL is not set | ||
44 | # CONFIG_INET_XFRM_MODE_BEET is not set | ||
45 | # CONFIG_INET_LRO is not set | ||
46 | # CONFIG_INET_DIAG is not set | ||
47 | # CONFIG_IPV6 is not set | ||
48 | # CONFIG_WIRELESS is not set | ||
49 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | ||
50 | # CONFIG_BLK_DEV is not set | ||
51 | CONFIG_NETDEVICES=y | ||
52 | CONFIG_NET_ETHERNET=y | ||
53 | CONFIG_SMSC911X=y | ||
54 | # CONFIG_NETDEV_1000 is not set | ||
55 | # CONFIG_NETDEV_10000 is not set | ||
56 | # CONFIG_WLAN is not set | ||
57 | CONFIG_INPUT_SPARSEKMAP=y | ||
58 | # CONFIG_INPUT_MOUSEDEV_PSAUX is not set | ||
59 | CONFIG_INPUT_EVDEV=y | ||
60 | # CONFIG_INPUT_KEYBOARD is not set | ||
61 | # CONFIG_INPUT_MOUSE is not set | ||
62 | CONFIG_SERIAL_SH_SCI=y | ||
63 | CONFIG_SERIAL_SH_SCI_NR_UARTS=9 | ||
64 | CONFIG_SERIAL_SH_SCI_CONSOLE=y | ||
65 | # CONFIG_LEGACY_PTYS is not set | ||
66 | # CONFIG_HW_RANDOM is not set | ||
67 | CONFIG_I2C=y | ||
68 | CONFIG_I2C_SH_MOBILE=y | ||
69 | # CONFIG_HWMON is not set | ||
70 | # CONFIG_MFD_SUPPORT is not set | ||
71 | CONFIG_FB=y | ||
72 | CONFIG_FB_SH_MOBILE_LCDC=y | ||
73 | CONFIG_FRAMEBUFFER_CONSOLE=y | ||
74 | CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y | ||
75 | # CONFIG_HID_SUPPORT is not set | ||
76 | # CONFIG_USB_SUPPORT is not set | ||
77 | # CONFIG_DNOTIFY is not set | ||
78 | # CONFIG_INOTIFY_USER is not set | ||
79 | CONFIG_TMPFS=y | ||
80 | # CONFIG_MISC_FILESYSTEMS is not set | ||
81 | CONFIG_MAGIC_SYSRQ=y | ||
82 | CONFIG_DEBUG_KERNEL=y | ||
83 | # CONFIG_FTRACE is not set | ||
diff --git a/arch/arm/configs/mackerel_defconfig b/arch/arm/configs/mackerel_defconfig new file mode 100644 index 000000000000..306a2e2d3622 --- /dev/null +++ b/arch/arm/configs/mackerel_defconfig | |||
@@ -0,0 +1,138 @@ | |||
1 | CONFIG_EXPERIMENTAL=y | ||
2 | CONFIG_SYSVIPC=y | ||
3 | CONFIG_IKCONFIG=y | ||
4 | CONFIG_IKCONFIG_PROC=y | ||
5 | CONFIG_LOG_BUF_SHIFT=16 | ||
6 | # CONFIG_UTS_NS is not set | ||
7 | # CONFIG_IPC_NS is not set | ||
8 | # CONFIG_USER_NS is not set | ||
9 | # CONFIG_PID_NS is not set | ||
10 | # CONFIG_NET_NS is not set | ||
11 | CONFIG_SLAB=y | ||
12 | CONFIG_MODULES=y | ||
13 | CONFIG_MODULE_UNLOAD=y | ||
14 | # CONFIG_BLK_DEV_BSG is not set | ||
15 | # CONFIG_IOSCHED_DEADLINE is not set | ||
16 | # CONFIG_IOSCHED_CFQ is not set | ||
17 | CONFIG_ARCH_SHMOBILE=y | ||
18 | CONFIG_ARCH_SH7372=y | ||
19 | CONFIG_MACH_MACKEREL=y | ||
20 | CONFIG_MEMORY_SIZE=0x10000000 | ||
21 | CONFIG_AEABI=y | ||
22 | # CONFIG_OABI_COMPAT is not set | ||
23 | CONFIG_FORCE_MAX_ZONEORDER=15 | ||
24 | CONFIG_ZBOOT_ROM_TEXT=0x0 | ||
25 | CONFIG_ZBOOT_ROM_BSS=0x0 | ||
26 | CONFIG_CMDLINE="console=tty0, console=ttySC0,115200 earlyprintk=sh-sci.0,115200 root=/dev/nfs nfsroot=,tcp,v3 ip=dhcp memchunk.vpu=64m memchunk.veu0=8m memchunk.spu0=2m mem=240m" | ||
27 | CONFIG_KEXEC=y | ||
28 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | ||
29 | CONFIG_PM=y | ||
30 | CONFIG_PM_RUNTIME=y | ||
31 | CONFIG_NET=y | ||
32 | CONFIG_PACKET=y | ||
33 | CONFIG_UNIX=y | ||
34 | CONFIG_INET=y | ||
35 | CONFIG_IP_MULTICAST=y | ||
36 | CONFIG_IP_PNP=y | ||
37 | CONFIG_IP_PNP_DHCP=y | ||
38 | # CONFIG_INET_XFRM_MODE_TRANSPORT is not set | ||
39 | # CONFIG_INET_XFRM_MODE_TUNNEL is not set | ||
40 | # CONFIG_INET_XFRM_MODE_BEET is not set | ||
41 | # CONFIG_IPV6 is not set | ||
42 | # CONFIG_WIRELESS is not set | ||
43 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | ||
44 | # CONFIG_FIRMWARE_IN_KERNEL is not set | ||
45 | CONFIG_MTD=y | ||
46 | CONFIG_MTD_CONCAT=y | ||
47 | CONFIG_MTD_PARTITIONS=y | ||
48 | CONFIG_MTD_CHAR=y | ||
49 | CONFIG_MTD_BLOCK=y | ||
50 | CONFIG_MTD_CFI=y | ||
51 | CONFIG_MTD_CFI_ADV_OPTIONS=y | ||
52 | CONFIG_MTD_CFI_INTELEXT=y | ||
53 | CONFIG_MTD_PHYSMAP=y | ||
54 | CONFIG_MTD_ARM_INTEGRATOR=y | ||
55 | CONFIG_MTD_BLOCK2MTD=y | ||
56 | CONFIG_SCSI=y | ||
57 | CONFIG_BLK_DEV_SD=y | ||
58 | # CONFIG_SCSI_LOWLEVEL is not set | ||
59 | CONFIG_NETDEVICES=y | ||
60 | CONFIG_NET_ETHERNET=y | ||
61 | CONFIG_SMSC911X=y | ||
62 | # CONFIG_NETDEV_1000 is not set | ||
63 | # CONFIG_NETDEV_10000 is not set | ||
64 | # CONFIG_WLAN is not set | ||
65 | # CONFIG_INPUT_MOUSEDEV_PSAUX is not set | ||
66 | # CONFIG_INPUT_KEYBOARD is not set | ||
67 | # CONFIG_INPUT_MOUSE is not set | ||
68 | CONFIG_SERIAL_SH_SCI=y | ||
69 | CONFIG_SERIAL_SH_SCI_NR_UARTS=8 | ||
70 | CONFIG_SERIAL_SH_SCI_CONSOLE=y | ||
71 | # CONFIG_LEGACY_PTYS is not set | ||
72 | # CONFIG_HW_RANDOM is not set | ||
73 | # CONFIG_HWMON is not set | ||
74 | # CONFIG_MFD_SUPPORT is not set | ||
75 | CONFIG_FB=y | ||
76 | CONFIG_FB_MODE_HELPERS=y | ||
77 | CONFIG_FB_SH_MOBILE_LCDC=y | ||
78 | CONFIG_FRAMEBUFFER_CONSOLE=y | ||
79 | CONFIG_LOGO=y | ||
80 | # CONFIG_LOGO_LINUX_MONO is not set | ||
81 | # CONFIG_LOGO_LINUX_CLUT224 is not set | ||
82 | # CONFIG_HID_SUPPORT is not set | ||
83 | # CONFIG_USB_SUPPORT is not set | ||
84 | CONFIG_EXT2_FS=y | ||
85 | CONFIG_EXT2_FS_XATTR=y | ||
86 | CONFIG_EXT2_FS_POSIX_ACL=y | ||
87 | CONFIG_EXT2_FS_SECURITY=y | ||
88 | CONFIG_EXT2_FS_XIP=y | ||
89 | CONFIG_EXT3_FS=y | ||
90 | # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set | ||
91 | CONFIG_EXT3_FS_POSIX_ACL=y | ||
92 | CONFIG_EXT3_FS_SECURITY=y | ||
93 | # CONFIG_DNOTIFY is not set | ||
94 | # CONFIG_INOTIFY_USER is not set | ||
95 | CONFIG_MSDOS_FS=y | ||
96 | CONFIG_VFAT_FS=y | ||
97 | CONFIG_TMPFS=y | ||
98 | # CONFIG_MISC_FILESYSTEMS is not set | ||
99 | CONFIG_NFS_FS=y | ||
100 | CONFIG_NFS_V3=y | ||
101 | CONFIG_NFS_V3_ACL=y | ||
102 | CONFIG_NFS_V4=y | ||
103 | CONFIG_NFS_V4_1=y | ||
104 | CONFIG_ROOT_NFS=y | ||
105 | CONFIG_NLS_CODEPAGE_437=y | ||
106 | CONFIG_NLS_CODEPAGE_737=y | ||
107 | CONFIG_NLS_CODEPAGE_775=y | ||
108 | CONFIG_NLS_CODEPAGE_850=y | ||
109 | CONFIG_NLS_CODEPAGE_852=y | ||
110 | CONFIG_NLS_CODEPAGE_855=y | ||
111 | CONFIG_NLS_CODEPAGE_857=y | ||
112 | CONFIG_NLS_CODEPAGE_860=y | ||
113 | CONFIG_NLS_CODEPAGE_861=y | ||
114 | CONFIG_NLS_CODEPAGE_862=y | ||
115 | CONFIG_NLS_CODEPAGE_863=y | ||
116 | CONFIG_NLS_CODEPAGE_864=y | ||
117 | CONFIG_NLS_CODEPAGE_865=y | ||
118 | CONFIG_NLS_CODEPAGE_866=y | ||
119 | CONFIG_NLS_CODEPAGE_869=y | ||
120 | CONFIG_NLS_ISO8859_1=y | ||
121 | CONFIG_NLS_ISO8859_2=y | ||
122 | CONFIG_NLS_ISO8859_3=y | ||
123 | CONFIG_NLS_ISO8859_4=y | ||
124 | CONFIG_NLS_ISO8859_5=y | ||
125 | CONFIG_NLS_ISO8859_6=y | ||
126 | CONFIG_NLS_ISO8859_7=y | ||
127 | CONFIG_NLS_ISO8859_9=y | ||
128 | CONFIG_NLS_ISO8859_13=y | ||
129 | CONFIG_NLS_ISO8859_14=y | ||
130 | CONFIG_NLS_ISO8859_15=y | ||
131 | CONFIG_NLS_KOI8_R=y | ||
132 | CONFIG_NLS_KOI8_U=y | ||
133 | CONFIG_NLS_UTF8=y | ||
134 | # CONFIG_ENABLE_WARN_DEPRECATED is not set | ||
135 | # CONFIG_ENABLE_MUST_CHECK is not set | ||
136 | # CONFIG_ARM_UNWIND is not set | ||
137 | CONFIG_CRYPTO=y | ||
138 | CONFIG_CRYPTO_ANSI_CPRNG=y | ||