diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-23 12:00:40 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-23 12:00:40 -0400 |
commit | 1d767cae4dbd4116fc3b2cc3251a20760f98339f (patch) | |
tree | 79a1a48a67a9b4296ce062d61ee863fe7a46c77f /arch/sh/configs | |
parent | 6101167727932a929e37fb8a6eeb68bdbf54d58e (diff) | |
parent | 5f19f14fed7786652b9617c633db101d26a42251 (diff) |
Merge tag 'sh-for-linus' of git://github.com/pmundt/linux-sh
Pull SuperH updates from Paul Mundt:
- New CPUs: SH7734 (SH-4A), SH7264 and SH7269 (SH-2A)
- New boards: RSK2+SH7264, RSK2+SH7269
- Unbreaking kgdb for SMP
- Consolidation of _32/_64 page fault handling.
- watchdog and legacy DMA chainsawing, part 1
- Conversion to evt2irq() hwirq lookup, to support relocation of
vectored IRQs for irqdomains.
* tag 'sh-for-linus' of git://github.com/pmundt/linux-sh: (98 commits)
sh: intc: Kill off special reservation interface.
sh: Enable PIO API for hp6xx and se770x.
sh: Kill off machvec IRQ hinting.
sh: dma: More legacy cpu dma chainsawing.
sh: Kill off MAX_DMA_ADDRESS leftovers.
sh: Tidy up some of the cpu legacy dma header mess.
sh: Move sh4a dma header from cpu-sh4 to cpu-sh4a.
sh64: Fix up vmalloc fault range check.
Revert "sh: Ensure fixmap and store queue space can co-exist."
serial: sh-sci: Fix for port types without BRI interrupts.
sh: legacy PCI evt2irq migration.
sh: cpu dma evt2irq migration.
sh: sh7763rdp evt2irq migration.
sh: sdk7780 evt2irq migration.
sh: migor evt2irq migration.
sh: landisk evt2irq migration.
sh: kfr2r09 evt2irq migration.
sh: ecovec24 evt2irq migration.
sh: ap325rxa evt2irq migration.
sh: urquell evt2irq migration.
...
Diffstat (limited to 'arch/sh/configs')
-rw-r--r-- | arch/sh/configs/rsk7264_defconfig | 80 | ||||
-rw-r--r-- | arch/sh/configs/rsk7269_defconfig | 65 |
2 files changed, 145 insertions, 0 deletions
diff --git a/arch/sh/configs/rsk7264_defconfig b/arch/sh/configs/rsk7264_defconfig new file mode 100644 index 000000000000..1600426224c2 --- /dev/null +++ b/arch/sh/configs/rsk7264_defconfig | |||
@@ -0,0 +1,80 @@ | |||
1 | CONFIG_LOCALVERSION="uClinux RSK2+SH7264" | ||
2 | # CONFIG_LOCALVERSION_AUTO is not set | ||
3 | CONFIG_SYSVIPC=y | ||
4 | CONFIG_BSD_PROCESS_ACCT=y | ||
5 | CONFIG_IKCONFIG=y | ||
6 | CONFIG_LOG_BUF_SHIFT=14 | ||
7 | CONFIG_NAMESPACES=y | ||
8 | CONFIG_SYSFS_DEPRECATED=y | ||
9 | CONFIG_SYSFS_DEPRECATED_V2=y | ||
10 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | ||
11 | CONFIG_SYSCTL_SYSCALL=y | ||
12 | CONFIG_KALLSYMS_ALL=y | ||
13 | CONFIG_EMBEDDED=y | ||
14 | CONFIG_PERF_COUNTERS=y | ||
15 | # CONFIG_VM_EVENT_COUNTERS is not set | ||
16 | CONFIG_SLAB=y | ||
17 | CONFIG_MMAP_ALLOW_UNINITIALIZED=y | ||
18 | CONFIG_PROFILING=y | ||
19 | # CONFIG_LBDAF is not set | ||
20 | # CONFIG_BLK_DEV_BSG is not set | ||
21 | CONFIG_PARTITION_ADVANCED=y | ||
22 | # CONFIG_IOSCHED_DEADLINE is not set | ||
23 | # CONFIG_IOSCHED_CFQ is not set | ||
24 | CONFIG_CPU_SUBTYPE_SH7264=y | ||
25 | CONFIG_MEMORY_START=0x0c000000 | ||
26 | CONFIG_FLATMEM_MANUAL=y | ||
27 | CONFIG_CPU_BIG_ENDIAN=y | ||
28 | CONFIG_SH_RSK=y | ||
29 | # CONFIG_SH_TIMER_MTU2 is not set | ||
30 | CONFIG_BINFMT_FLAT=y | ||
31 | CONFIG_NET=y | ||
32 | CONFIG_INET=y | ||
33 | CONFIG_IP_PNP=y | ||
34 | CONFIG_IP_PNP_DHCP=y | ||
35 | # CONFIG_INET_XFRM_MODE_TRANSPORT is not set | ||
36 | # CONFIG_INET_XFRM_MODE_TUNNEL is not set | ||
37 | # CONFIG_INET_XFRM_MODE_BEET is not set | ||
38 | # CONFIG_INET_LRO is not set | ||
39 | # CONFIG_INET_DIAG is not set | ||
40 | # CONFIG_IPV6 is not set | ||
41 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | ||
42 | # CONFIG_PREVENT_FIRMWARE_BUILD is not set | ||
43 | # CONFIG_FW_LOADER is not set | ||
44 | CONFIG_BLK_DEV_LOOP=y | ||
45 | CONFIG_BLK_DEV_RAM=y | ||
46 | CONFIG_BLK_DEV_RAM_COUNT=4 | ||
47 | CONFIG_SCSI=y | ||
48 | CONFIG_BLK_DEV_SD=y | ||
49 | CONFIG_NETDEVICES=y | ||
50 | CONFIG_SMSC911X=y | ||
51 | CONFIG_SMSC_PHY=y | ||
52 | CONFIG_INPUT_FF_MEMLESS=y | ||
53 | # CONFIG_INPUT_MOUSEDEV is not set | ||
54 | # CONFIG_INPUT_KEYBOARD is not set | ||
55 | # CONFIG_INPUT_MOUSE is not set | ||
56 | # CONFIG_SERIO is not set | ||
57 | CONFIG_VT_HW_CONSOLE_BINDING=y | ||
58 | CONFIG_SERIAL_SH_SCI=y | ||
59 | CONFIG_SERIAL_SH_SCI_NR_UARTS=8 | ||
60 | CONFIG_SERIAL_SH_SCI_CONSOLE=y | ||
61 | # CONFIG_HWMON is not set | ||
62 | CONFIG_USB=y | ||
63 | CONFIG_USB_DEBUG=y | ||
64 | CONFIG_USB_ANNOUNCE_NEW_DEVICES=y | ||
65 | # CONFIG_USB_DEVICE_CLASS is not set | ||
66 | CONFIG_USB_R8A66597_HCD=y | ||
67 | CONFIG_USB_STORAGE=y | ||
68 | CONFIG_USB_STORAGE_DEBUG=y | ||
69 | CONFIG_USB_LIBUSUAL=y | ||
70 | CONFIG_EXT2_FS=y | ||
71 | CONFIG_EXT3_FS=y | ||
72 | # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set | ||
73 | CONFIG_VFAT_FS=y | ||
74 | CONFIG_NFS_FS=y | ||
75 | CONFIG_NFS_V3=y | ||
76 | CONFIG_ROOT_NFS=y | ||
77 | CONFIG_NLS_CODEPAGE_437=y | ||
78 | CONFIG_NLS_ISO8859_1=y | ||
79 | # CONFIG_ENABLE_MUST_CHECK is not set | ||
80 | # CONFIG_FTRACE is not set | ||
diff --git a/arch/sh/configs/rsk7269_defconfig b/arch/sh/configs/rsk7269_defconfig new file mode 100644 index 000000000000..9f062b5837d7 --- /dev/null +++ b/arch/sh/configs/rsk7269_defconfig | |||
@@ -0,0 +1,65 @@ | |||
1 | CONFIG_LOG_BUF_SHIFT=14 | ||
2 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | ||
3 | CONFIG_EMBEDDED=y | ||
4 | # CONFIG_VM_EVENT_COUNTERS is not set | ||
5 | CONFIG_SLAB=y | ||
6 | # CONFIG_LBDAF is not set | ||
7 | # CONFIG_BLK_DEV_BSG is not set | ||
8 | # CONFIG_IOSCHED_DEADLINE is not set | ||
9 | # CONFIG_IOSCHED_CFQ is not set | ||
10 | CONFIG_SWAP_IO_SPACE=y | ||
11 | CONFIG_CPU_SUBTYPE_SH7269=y | ||
12 | CONFIG_MEMORY_START=0x0c000000 | ||
13 | CONFIG_MEMORY_SIZE=0x02000000 | ||
14 | CONFIG_FLATMEM_MANUAL=y | ||
15 | CONFIG_CPU_BIG_ENDIAN=y | ||
16 | CONFIG_SH_RSK=y | ||
17 | # CONFIG_SH_TIMER_MTU2 is not set | ||
18 | CONFIG_SH_PCLK_FREQ=66700000 | ||
19 | CONFIG_BINFMT_FLAT=y | ||
20 | CONFIG_NET=y | ||
21 | CONFIG_INET=y | ||
22 | CONFIG_IP_PNP=y | ||
23 | CONFIG_IP_PNP_DHCP=y | ||
24 | # CONFIG_INET_XFRM_MODE_TRANSPORT is not set | ||
25 | # CONFIG_INET_XFRM_MODE_TUNNEL is not set | ||
26 | # CONFIG_INET_XFRM_MODE_BEET is not set | ||
27 | # CONFIG_INET_LRO is not set | ||
28 | # CONFIG_INET_DIAG is not set | ||
29 | # CONFIG_IPV6 is not set | ||
30 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | ||
31 | # CONFIG_FW_LOADER is not set | ||
32 | CONFIG_SCSI=y | ||
33 | CONFIG_BLK_DEV_SD=y | ||
34 | CONFIG_NETDEVICES=y | ||
35 | CONFIG_SMSC911X=y | ||
36 | CONFIG_SMSC_PHY=y | ||
37 | # CONFIG_INPUT_MOUSEDEV is not set | ||
38 | # CONFIG_INPUT_KEYBOARD is not set | ||
39 | # CONFIG_INPUT_MOUSE is not set | ||
40 | # CONFIG_SERIO is not set | ||
41 | CONFIG_SERIAL_SH_SCI=y | ||
42 | CONFIG_SERIAL_SH_SCI_NR_UARTS=8 | ||
43 | CONFIG_SERIAL_SH_SCI_CONSOLE=y | ||
44 | # CONFIG_HWMON is not set | ||
45 | CONFIG_USB=y | ||
46 | CONFIG_USB_DEBUG=y | ||
47 | CONFIG_USB_ANNOUNCE_NEW_DEVICES=y | ||
48 | # CONFIG_USB_DEVICE_CLASS is not set | ||
49 | CONFIG_USB_R8A66597_HCD=y | ||
50 | CONFIG_USB_STORAGE=y | ||
51 | CONFIG_USB_STORAGE_DEBUG=y | ||
52 | CONFIG_USB_LIBUSUAL=y | ||
53 | CONFIG_EXT2_FS=y | ||
54 | CONFIG_EXT3_FS=y | ||
55 | # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set | ||
56 | CONFIG_VFAT_FS=y | ||
57 | CONFIG_NFS_FS=y | ||
58 | CONFIG_NFS_V3=y | ||
59 | CONFIG_ROOT_NFS=y | ||
60 | CONFIG_PARTITION_ADVANCED=y | ||
61 | CONFIG_NLS_CODEPAGE_437=y | ||
62 | CONFIG_NLS_ISO8859_1=y | ||
63 | # CONFIG_ENABLE_MUST_CHECK is not set | ||
64 | CONFIG_SYSCTL_SYSCALL_CHECK=y | ||
65 | # CONFIG_FTRACE is not set | ||