diff options
-rw-r--r-- | arch/sh/boards/renesas/rts7751r2d/setup.c | 9 | ||||
-rw-r--r-- | arch/sh/configs/hs7751rvoip_defconfig | 2 | ||||
-rw-r--r-- | arch/sh/configs/landisk_defconfig | 2 | ||||
-rw-r--r-- | arch/sh/configs/lboxre2_defconfig | 2 | ||||
-rw-r--r-- | arch/sh/configs/rts7751r2d_defconfig | 8 | ||||
-rw-r--r-- | arch/sh/configs/snapgear_defconfig | 587 | ||||
-rw-r--r-- | arch/sh/configs/systemh_defconfig | 2 | ||||
-rw-r--r-- | arch/sh/configs/titan_defconfig | 2 | ||||
-rw-r--r-- | arch/sh/kernel/cpu/sh3/entry.S | 3 | ||||
-rw-r--r-- | arch/sh/kernel/traps.c | 5 | ||||
-rw-r--r-- | arch/sh/mm/Makefile | 4 | ||||
-rw-r--r-- | arch/sh/mm/fault-nommu.c | 47 | ||||
-rw-r--r-- | arch/sh/mm/fault.c | 3 | ||||
-rw-r--r-- | include/asm-sh/rts7751r2d.h | 2 |
14 files changed, 282 insertions, 396 deletions
diff --git a/arch/sh/boards/renesas/rts7751r2d/setup.c b/arch/sh/boards/renesas/rts7751r2d/setup.c index e165d85c03b5..6f7029d33241 100644 --- a/arch/sh/boards/renesas/rts7751r2d/setup.c +++ b/arch/sh/boards/renesas/rts7751r2d/setup.c | |||
@@ -140,12 +140,19 @@ static struct platform_device sm501_device = { | |||
140 | static struct platform_device *rts7751r2d_devices[] __initdata = { | 140 | static struct platform_device *rts7751r2d_devices[] __initdata = { |
141 | &uart_device, | 141 | &uart_device, |
142 | &heartbeat_device, | 142 | &heartbeat_device, |
143 | &cf_ide_device, | ||
144 | &sm501_device, | 143 | &sm501_device, |
145 | }; | 144 | }; |
146 | 145 | ||
147 | static int __init rts7751r2d_devices_setup(void) | 146 | static int __init rts7751r2d_devices_setup(void) |
148 | { | 147 | { |
148 | int ret; | ||
149 | |||
150 | if (ctrl_inw(PA_BVERREG) == 0x10) { /* only working on R2D-PLUS */ | ||
151 | ret = platform_device_register(&cf_ide_device); | ||
152 | if (ret) | ||
153 | return ret; | ||
154 | } | ||
155 | |||
149 | return platform_add_devices(rts7751r2d_devices, | 156 | return platform_add_devices(rts7751r2d_devices, |
150 | ARRAY_SIZE(rts7751r2d_devices)); | 157 | ARRAY_SIZE(rts7751r2d_devices)); |
151 | } | 158 | } |
diff --git a/arch/sh/configs/hs7751rvoip_defconfig b/arch/sh/configs/hs7751rvoip_defconfig index e1a886d621db..5d9da5a02759 100644 --- a/arch/sh/configs/hs7751rvoip_defconfig +++ b/arch/sh/configs/hs7751rvoip_defconfig | |||
@@ -145,7 +145,7 @@ CONFIG_CPU_SH4=y | |||
145 | # CONFIG_CPU_SUBTYPE_SH7091 is not set | 145 | # CONFIG_CPU_SUBTYPE_SH7091 is not set |
146 | # CONFIG_CPU_SUBTYPE_SH7750R is not set | 146 | # CONFIG_CPU_SUBTYPE_SH7750R is not set |
147 | # CONFIG_CPU_SUBTYPE_SH7750S is not set | 147 | # CONFIG_CPU_SUBTYPE_SH7750S is not set |
148 | CONFIG_CPU_SUBTYPE_SH7751=y | 148 | # CONFIG_CPU_SUBTYPE_SH7751 is not set |
149 | CONFIG_CPU_SUBTYPE_SH7751R=y | 149 | CONFIG_CPU_SUBTYPE_SH7751R=y |
150 | # CONFIG_CPU_SUBTYPE_SH7760 is not set | 150 | # CONFIG_CPU_SUBTYPE_SH7760 is not set |
151 | # CONFIG_CPU_SUBTYPE_SH4_202 is not set | 151 | # CONFIG_CPU_SUBTYPE_SH4_202 is not set |
diff --git a/arch/sh/configs/landisk_defconfig b/arch/sh/configs/landisk_defconfig index 07310fa03250..f52db125432f 100644 --- a/arch/sh/configs/landisk_defconfig +++ b/arch/sh/configs/landisk_defconfig | |||
@@ -156,7 +156,7 @@ CONFIG_CPU_SH4=y | |||
156 | # CONFIG_CPU_SUBTYPE_SH7091 is not set | 156 | # CONFIG_CPU_SUBTYPE_SH7091 is not set |
157 | # CONFIG_CPU_SUBTYPE_SH7750R is not set | 157 | # CONFIG_CPU_SUBTYPE_SH7750R is not set |
158 | # CONFIG_CPU_SUBTYPE_SH7750S is not set | 158 | # CONFIG_CPU_SUBTYPE_SH7750S is not set |
159 | CONFIG_CPU_SUBTYPE_SH7751=y | 159 | # CONFIG_CPU_SUBTYPE_SH7751 is not set |
160 | CONFIG_CPU_SUBTYPE_SH7751R=y | 160 | CONFIG_CPU_SUBTYPE_SH7751R=y |
161 | # CONFIG_CPU_SUBTYPE_SH7760 is not set | 161 | # CONFIG_CPU_SUBTYPE_SH7760 is not set |
162 | # CONFIG_CPU_SUBTYPE_SH4_202 is not set | 162 | # CONFIG_CPU_SUBTYPE_SH4_202 is not set |
diff --git a/arch/sh/configs/lboxre2_defconfig b/arch/sh/configs/lboxre2_defconfig index fa09d68d057a..9fa66d92a4e7 100644 --- a/arch/sh/configs/lboxre2_defconfig +++ b/arch/sh/configs/lboxre2_defconfig | |||
@@ -159,7 +159,7 @@ CONFIG_CPU_SH4=y | |||
159 | # CONFIG_CPU_SUBTYPE_SH7091 is not set | 159 | # CONFIG_CPU_SUBTYPE_SH7091 is not set |
160 | # CONFIG_CPU_SUBTYPE_SH7750R is not set | 160 | # CONFIG_CPU_SUBTYPE_SH7750R is not set |
161 | # CONFIG_CPU_SUBTYPE_SH7750S is not set | 161 | # CONFIG_CPU_SUBTYPE_SH7750S is not set |
162 | CONFIG_CPU_SUBTYPE_SH7751=y | 162 | # CONFIG_CPU_SUBTYPE_SH7751 is not set |
163 | CONFIG_CPU_SUBTYPE_SH7751R=y | 163 | CONFIG_CPU_SUBTYPE_SH7751R=y |
164 | # CONFIG_CPU_SUBTYPE_SH7760 is not set | 164 | # CONFIG_CPU_SUBTYPE_SH7760 is not set |
165 | # CONFIG_CPU_SUBTYPE_SH4_202 is not set | 165 | # CONFIG_CPU_SUBTYPE_SH4_202 is not set |
diff --git a/arch/sh/configs/rts7751r2d_defconfig b/arch/sh/configs/rts7751r2d_defconfig index f1e979b1e495..b64f73b704d6 100644 --- a/arch/sh/configs/rts7751r2d_defconfig +++ b/arch/sh/configs/rts7751r2d_defconfig | |||
@@ -243,8 +243,8 @@ CONFIG_SH_PCLK_FREQ=60000000 | |||
243 | # | 243 | # |
244 | # DMA support | 244 | # DMA support |
245 | # | 245 | # |
246 | CONFIG_SH_DMA=y | 246 | # CONFIG_SH_DMA is not set |
247 | CONFIG_NR_ONCHIP_DMA_CHANNELS=8 | 247 | # CONFIG_NR_ONCHIP_DMA_CHANNELS is not set |
248 | # CONFIG_NR_DMA_CHANNELS_BOOL is not set | 248 | # CONFIG_NR_DMA_CHANNELS_BOOL is not set |
249 | 249 | ||
250 | # | 250 | # |
@@ -280,7 +280,7 @@ CONFIG_ZERO_PAGE_OFFSET=0x00010000 | |||
280 | CONFIG_BOOT_LINK_OFFSET=0x00800000 | 280 | CONFIG_BOOT_LINK_OFFSET=0x00800000 |
281 | # CONFIG_UBC_WAKEUP is not set | 281 | # CONFIG_UBC_WAKEUP is not set |
282 | CONFIG_CMDLINE_BOOL=y | 282 | CONFIG_CMDLINE_BOOL=y |
283 | CONFIG_CMDLINE="console=tty0 console=ttySC0,115200 root=/dev/sda1 earlyprintk=bios" | 283 | CONFIG_CMDLINE="console=tty0 console=ttySC0,115200 root=/dev/sda1 earlyprintk=serial" |
284 | 284 | ||
285 | # | 285 | # |
286 | # Bus options | 286 | # Bus options |
@@ -1323,7 +1323,7 @@ CONFIG_ENABLE_MUST_CHECK=y | |||
1323 | # CONFIG_DEBUG_KERNEL is not set | 1323 | # CONFIG_DEBUG_KERNEL is not set |
1324 | CONFIG_LOG_BUF_SHIFT=14 | 1324 | CONFIG_LOG_BUF_SHIFT=14 |
1325 | # CONFIG_DEBUG_BUGVERBOSE is not set | 1325 | # CONFIG_DEBUG_BUGVERBOSE is not set |
1326 | CONFIG_SH_STANDARD_BIOS=y | 1326 | # CONFIG_SH_STANDARD_BIOS is not set |
1327 | CONFIG_EARLY_SCIF_CONSOLE=y | 1327 | CONFIG_EARLY_SCIF_CONSOLE=y |
1328 | CONFIG_EARLY_SCIF_CONSOLE_PORT=0xffe80000 | 1328 | CONFIG_EARLY_SCIF_CONSOLE_PORT=0xffe80000 |
1329 | CONFIG_EARLY_PRINTK=y | 1329 | CONFIG_EARLY_PRINTK=y |
diff --git a/arch/sh/configs/snapgear_defconfig b/arch/sh/configs/snapgear_defconfig index 98503f16f3f5..e4e5d2178131 100644 --- a/arch/sh/configs/snapgear_defconfig +++ b/arch/sh/configs/snapgear_defconfig | |||
@@ -1,15 +1,24 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.18 | 3 | # Linux kernel version: 2.6.23-rc1 |
4 | # Tue Oct 3 12:55:47 2006 | 4 | # Thu Jul 26 11:49:11 2007 |
5 | # | 5 | # |
6 | CONFIG_SUPERH=y | 6 | CONFIG_SUPERH=y |
7 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 7 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
8 | CONFIG_GENERIC_BUG=y | ||
8 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 9 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
9 | CONFIG_GENERIC_HWEIGHT=y | 10 | CONFIG_GENERIC_HWEIGHT=y |
10 | CONFIG_GENERIC_HARDIRQS=y | 11 | CONFIG_GENERIC_HARDIRQS=y |
11 | CONFIG_GENERIC_IRQ_PROBE=y | 12 | CONFIG_GENERIC_IRQ_PROBE=y |
12 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 13 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
14 | CONFIG_GENERIC_TIME=y | ||
15 | CONFIG_GENERIC_CLOCKEVENTS=y | ||
16 | CONFIG_SYS_SUPPORTS_PCI=y | ||
17 | CONFIG_STACKTRACE_SUPPORT=y | ||
18 | CONFIG_LOCKDEP_SUPPORT=y | ||
19 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | ||
20 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | ||
21 | CONFIG_ARCH_NO_VIRT_TO_BUS=y | ||
13 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 22 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
14 | 23 | ||
15 | # | 24 | # |
@@ -24,15 +33,18 @@ CONFIG_INIT_ENV_ARG_LIMIT=32 | |||
24 | # | 33 | # |
25 | CONFIG_LOCALVERSION="" | 34 | CONFIG_LOCALVERSION="" |
26 | CONFIG_LOCALVERSION_AUTO=y | 35 | CONFIG_LOCALVERSION_AUTO=y |
27 | CONFIG_SWAP=y | 36 | # CONFIG_SWAP is not set |
28 | # CONFIG_SYSVIPC is not set | 37 | # CONFIG_SYSVIPC is not set |
29 | # CONFIG_POSIX_MQUEUE is not set | 38 | # CONFIG_POSIX_MQUEUE is not set |
30 | # CONFIG_BSD_PROCESS_ACCT is not set | 39 | # CONFIG_BSD_PROCESS_ACCT is not set |
31 | # CONFIG_TASKSTATS is not set | 40 | # CONFIG_TASKSTATS is not set |
32 | # CONFIG_UTS_NS is not set | 41 | # CONFIG_USER_NS is not set |
33 | # CONFIG_AUDIT is not set | 42 | # CONFIG_AUDIT is not set |
34 | # CONFIG_IKCONFIG is not set | 43 | # CONFIG_IKCONFIG is not set |
44 | CONFIG_LOG_BUF_SHIFT=14 | ||
45 | # CONFIG_SYSFS_DEPRECATED is not set | ||
35 | # CONFIG_RELAY is not set | 46 | # CONFIG_RELAY is not set |
47 | CONFIG_BLK_DEV_INITRD=y | ||
36 | CONFIG_INITRAMFS_SOURCE="" | 48 | CONFIG_INITRAMFS_SOURCE="" |
37 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | 49 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y |
38 | CONFIG_SYSCTL=y | 50 | CONFIG_SYSCTL=y |
@@ -47,27 +59,25 @@ CONFIG_BUG=y | |||
47 | CONFIG_ELF_CORE=y | 59 | CONFIG_ELF_CORE=y |
48 | CONFIG_BASE_FULL=y | 60 | CONFIG_BASE_FULL=y |
49 | CONFIG_FUTEX=y | 61 | CONFIG_FUTEX=y |
62 | CONFIG_ANON_INODES=y | ||
50 | CONFIG_EPOLL=y | 63 | CONFIG_EPOLL=y |
64 | CONFIG_SIGNALFD=y | ||
65 | CONFIG_TIMERFD=y | ||
66 | CONFIG_EVENTFD=y | ||
51 | CONFIG_SHMEM=y | 67 | CONFIG_SHMEM=y |
52 | CONFIG_SLAB=y | ||
53 | CONFIG_VM_EVENT_COUNTERS=y | 68 | CONFIG_VM_EVENT_COUNTERS=y |
69 | CONFIG_SLAB=y | ||
70 | # CONFIG_SLUB is not set | ||
71 | # CONFIG_SLOB is not set | ||
54 | CONFIG_RT_MUTEXES=y | 72 | CONFIG_RT_MUTEXES=y |
55 | # CONFIG_TINY_SHMEM is not set | 73 | # CONFIG_TINY_SHMEM is not set |
56 | CONFIG_BASE_SMALL=0 | 74 | CONFIG_BASE_SMALL=0 |
57 | # CONFIG_SLOB is not set | ||
58 | |||
59 | # | ||
60 | # Loadable module support | ||
61 | # | ||
62 | # CONFIG_MODULES is not set | 75 | # CONFIG_MODULES is not set |
63 | |||
64 | # | ||
65 | # Block layer | ||
66 | # | ||
67 | CONFIG_BLOCK=y | 76 | CONFIG_BLOCK=y |
68 | # CONFIG_LBD is not set | 77 | # CONFIG_LBD is not set |
69 | # CONFIG_BLK_DEV_IO_TRACE is not set | 78 | # CONFIG_BLK_DEV_IO_TRACE is not set |
70 | # CONFIG_LSF is not set | 79 | # CONFIG_LSF is not set |
80 | # CONFIG_BLK_DEV_BSG is not set | ||
71 | 81 | ||
72 | # | 82 | # |
73 | # IO Schedulers | 83 | # IO Schedulers |
@@ -85,122 +95,103 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" | |||
85 | # | 95 | # |
86 | # System type | 96 | # System type |
87 | # | 97 | # |
88 | # CONFIG_SH_SOLUTION_ENGINE is not set | ||
89 | # CONFIG_SH_7751_SOLUTION_ENGINE is not set | ||
90 | # CONFIG_SH_7300_SOLUTION_ENGINE is not set | ||
91 | # CONFIG_SH_7343_SOLUTION_ENGINE is not set | ||
92 | # CONFIG_SH_73180_SOLUTION_ENGINE is not set | ||
93 | # CONFIG_SH_7751_SYSTEMH is not set | ||
94 | # CONFIG_SH_HP6XX is not set | ||
95 | # CONFIG_SH_EC3104 is not set | ||
96 | # CONFIG_SH_SATURN is not set | ||
97 | # CONFIG_SH_DREAMCAST is not set | ||
98 | # CONFIG_SH_BIGSUR is not set | ||
99 | # CONFIG_SH_MPC1211 is not set | ||
100 | # CONFIG_SH_SH03 is not set | ||
101 | CONFIG_SH_SECUREEDGE5410=y | ||
102 | # CONFIG_SH_HS7751RVOIP is not set | ||
103 | # CONFIG_SH_7710VOIPGW is not set | ||
104 | # CONFIG_SH_RTS7751R2D is not set | ||
105 | # CONFIG_SH_R7780RP is not set | ||
106 | # CONFIG_SH_EDOSK7705 is not set | ||
107 | # CONFIG_SH_SH4202_MICRODEV is not set | ||
108 | # CONFIG_SH_LANDISK is not set | ||
109 | # CONFIG_SH_TITAN is not set | ||
110 | # CONFIG_SH_SHMIN is not set | ||
111 | # CONFIG_SH_UNKNOWN is not set | ||
112 | |||
113 | # | ||
114 | # Processor selection | ||
115 | # | ||
116 | CONFIG_CPU_SH4=y | 98 | CONFIG_CPU_SH4=y |
117 | 99 | # CONFIG_CPU_SUBTYPE_SH7619 is not set | |
118 | # | 100 | # CONFIG_CPU_SUBTYPE_SH7206 is not set |
119 | # SH-2 Processor Support | ||
120 | # | ||
121 | # CONFIG_CPU_SUBTYPE_SH7604 is not set | ||
122 | |||
123 | # | ||
124 | # SH-3 Processor Support | ||
125 | # | ||
126 | # CONFIG_CPU_SUBTYPE_SH7300 is not set | ||
127 | # CONFIG_CPU_SUBTYPE_SH7705 is not set | 101 | # CONFIG_CPU_SUBTYPE_SH7705 is not set |
128 | # CONFIG_CPU_SUBTYPE_SH7706 is not set | 102 | # CONFIG_CPU_SUBTYPE_SH7706 is not set |
129 | # CONFIG_CPU_SUBTYPE_SH7707 is not set | 103 | # CONFIG_CPU_SUBTYPE_SH7707 is not set |
130 | # CONFIG_CPU_SUBTYPE_SH7708 is not set | 104 | # CONFIG_CPU_SUBTYPE_SH7708 is not set |
131 | # CONFIG_CPU_SUBTYPE_SH7709 is not set | 105 | # CONFIG_CPU_SUBTYPE_SH7709 is not set |
132 | # CONFIG_CPU_SUBTYPE_SH7710 is not set | 106 | # CONFIG_CPU_SUBTYPE_SH7710 is not set |
133 | 107 | # CONFIG_CPU_SUBTYPE_SH7712 is not set | |
134 | # | ||
135 | # SH-4 Processor Support | ||
136 | # | ||
137 | # CONFIG_CPU_SUBTYPE_SH7750 is not set | 108 | # CONFIG_CPU_SUBTYPE_SH7750 is not set |
138 | # CONFIG_CPU_SUBTYPE_SH7091 is not set | 109 | # CONFIG_CPU_SUBTYPE_SH7091 is not set |
139 | # CONFIG_CPU_SUBTYPE_SH7750R is not set | 110 | # CONFIG_CPU_SUBTYPE_SH7750R is not set |
140 | # CONFIG_CPU_SUBTYPE_SH7750S is not set | 111 | # CONFIG_CPU_SUBTYPE_SH7750S is not set |
141 | CONFIG_CPU_SUBTYPE_SH7751=y | 112 | # CONFIG_CPU_SUBTYPE_SH7751 is not set |
142 | CONFIG_CPU_SUBTYPE_SH7751R=y | 113 | CONFIG_CPU_SUBTYPE_SH7751R=y |
143 | # CONFIG_CPU_SUBTYPE_SH7760 is not set | 114 | # CONFIG_CPU_SUBTYPE_SH7760 is not set |
144 | # CONFIG_CPU_SUBTYPE_SH4_202 is not set | 115 | # CONFIG_CPU_SUBTYPE_SH4_202 is not set |
145 | |||
146 | # | ||
147 | # ST40 Processor Support | ||
148 | # | ||
149 | # CONFIG_CPU_SUBTYPE_ST40STB1 is not set | 116 | # CONFIG_CPU_SUBTYPE_ST40STB1 is not set |
150 | # CONFIG_CPU_SUBTYPE_ST40GX1 is not set | 117 | # CONFIG_CPU_SUBTYPE_ST40GX1 is not set |
151 | |||
152 | # | ||
153 | # SH-4A Processor Support | ||
154 | # | ||
155 | # CONFIG_CPU_SUBTYPE_SH7770 is not set | 118 | # CONFIG_CPU_SUBTYPE_SH7770 is not set |
156 | # CONFIG_CPU_SUBTYPE_SH7780 is not set | 119 | # CONFIG_CPU_SUBTYPE_SH7780 is not set |
157 | 120 | # CONFIG_CPU_SUBTYPE_SH7785 is not set | |
158 | # | 121 | # CONFIG_CPU_SUBTYPE_SHX3 is not set |
159 | # SH4AL-DSP Processor Support | ||
160 | # | ||
161 | # CONFIG_CPU_SUBTYPE_SH73180 is not set | ||
162 | # CONFIG_CPU_SUBTYPE_SH7343 is not set | 122 | # CONFIG_CPU_SUBTYPE_SH7343 is not set |
123 | # CONFIG_CPU_SUBTYPE_SH7722 is not set | ||
163 | 124 | ||
164 | # | 125 | # |
165 | # Memory management options | 126 | # Memory management options |
166 | # | 127 | # |
128 | CONFIG_QUICKLIST=y | ||
167 | CONFIG_MMU=y | 129 | CONFIG_MMU=y |
168 | CONFIG_PAGE_OFFSET=0x80000000 | 130 | CONFIG_PAGE_OFFSET=0x80000000 |
169 | CONFIG_MEMORY_START=0x08000000 | 131 | CONFIG_MEMORY_START=0x08000000 |
170 | CONFIG_MEMORY_SIZE=0x01000000 | 132 | CONFIG_MEMORY_SIZE=0x01000000 |
171 | CONFIG_VSYSCALL=y | 133 | CONFIG_VSYSCALL=y |
134 | CONFIG_ARCH_FLATMEM_ENABLE=y | ||
135 | CONFIG_ARCH_SPARSEMEM_ENABLE=y | ||
136 | CONFIG_ARCH_SPARSEMEM_DEFAULT=y | ||
137 | CONFIG_MAX_ACTIVE_REGIONS=1 | ||
138 | CONFIG_ARCH_POPULATES_NODE_MAP=y | ||
139 | CONFIG_ARCH_SELECT_MEMORY_MODEL=y | ||
140 | CONFIG_PAGE_SIZE_4KB=y | ||
141 | # CONFIG_PAGE_SIZE_8KB is not set | ||
142 | # CONFIG_PAGE_SIZE_64KB is not set | ||
172 | CONFIG_SELECT_MEMORY_MODEL=y | 143 | CONFIG_SELECT_MEMORY_MODEL=y |
173 | CONFIG_FLATMEM_MANUAL=y | 144 | CONFIG_FLATMEM_MANUAL=y |
174 | # CONFIG_DISCONTIGMEM_MANUAL is not set | 145 | # CONFIG_DISCONTIGMEM_MANUAL is not set |
175 | # CONFIG_SPARSEMEM_MANUAL is not set | 146 | # CONFIG_SPARSEMEM_MANUAL is not set |
176 | CONFIG_FLATMEM=y | 147 | CONFIG_FLATMEM=y |
177 | CONFIG_FLAT_NODE_MEM_MAP=y | 148 | CONFIG_FLAT_NODE_MEM_MAP=y |
178 | # CONFIG_SPARSEMEM_STATIC is not set | 149 | CONFIG_SPARSEMEM_STATIC=y |
179 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 150 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
180 | # CONFIG_RESOURCES_64BIT is not set | 151 | # CONFIG_RESOURCES_64BIT is not set |
152 | CONFIG_ZONE_DMA_FLAG=0 | ||
153 | CONFIG_NR_QUICK=2 | ||
181 | 154 | ||
182 | # | 155 | # |
183 | # Cache configuration | 156 | # Cache configuration |
184 | # | 157 | # |
185 | # CONFIG_SH_DIRECT_MAPPED is not set | 158 | # CONFIG_SH_DIRECT_MAPPED is not set |
186 | # CONFIG_SH_WRITETHROUGH is not set | 159 | # CONFIG_SH_WRITETHROUGH is not set |
187 | # CONFIG_SH_OCRAM is not set | ||
188 | 160 | ||
189 | # | 161 | # |
190 | # Processor features | 162 | # Processor features |
191 | # | 163 | # |
192 | CONFIG_CPU_LITTLE_ENDIAN=y | 164 | CONFIG_CPU_LITTLE_ENDIAN=y |
165 | # CONFIG_CPU_BIG_ENDIAN is not set | ||
193 | CONFIG_SH_FPU=y | 166 | CONFIG_SH_FPU=y |
194 | # CONFIG_SH_DSP is not set | 167 | # CONFIG_SH_DSP is not set |
195 | # CONFIG_SH_STORE_QUEUES is not set | 168 | # CONFIG_SH_STORE_QUEUES is not set |
196 | CONFIG_CPU_HAS_INTEVT=y | 169 | CONFIG_CPU_HAS_INTEVT=y |
170 | CONFIG_CPU_HAS_INTC_IRQ=y | ||
171 | CONFIG_CPU_HAS_IPR_IRQ=y | ||
197 | CONFIG_CPU_HAS_SR_RB=y | 172 | CONFIG_CPU_HAS_SR_RB=y |
173 | CONFIG_CPU_HAS_PTEA=y | ||
174 | |||
175 | # | ||
176 | # Board support | ||
177 | # | ||
178 | # CONFIG_SH_7751_SYSTEMH is not set | ||
179 | CONFIG_SH_SECUREEDGE5410=y | ||
180 | # CONFIG_SH_HS7751RVOIP is not set | ||
181 | # CONFIG_SH_RTS7751R2D is not set | ||
182 | # CONFIG_SH_LANDISK is not set | ||
183 | # CONFIG_SH_TITAN is not set | ||
184 | # CONFIG_SH_LBOX_RE2 is not set | ||
198 | 185 | ||
199 | # | 186 | # |
200 | # Timer support | 187 | # Timer and clock configuration |
201 | # | 188 | # |
202 | CONFIG_SH_TMU=y | 189 | CONFIG_SH_TMU=y |
190 | CONFIG_SH_TIMER_IRQ=16 | ||
203 | CONFIG_SH_PCLK_FREQ=60000000 | 191 | CONFIG_SH_PCLK_FREQ=60000000 |
192 | # CONFIG_TICK_ONESHOT is not set | ||
193 | # CONFIG_NO_HZ is not set | ||
194 | # CONFIG_HIGH_RES_TIMERS is not set | ||
204 | 195 | ||
205 | # | 196 | # |
206 | # CPU Frequency scaling | 197 | # CPU Frequency scaling |
@@ -210,24 +201,31 @@ CONFIG_SH_PCLK_FREQ=60000000 | |||
210 | # | 201 | # |
211 | # DMA support | 202 | # DMA support |
212 | # | 203 | # |
204 | CONFIG_SH_DMA_API=y | ||
213 | CONFIG_SH_DMA=y | 205 | CONFIG_SH_DMA=y |
214 | CONFIG_NR_ONCHIP_DMA_CHANNELS=4 | 206 | CONFIG_NR_ONCHIP_DMA_CHANNELS=8 |
215 | # CONFIG_NR_DMA_CHANNELS_BOOL is not set | 207 | # CONFIG_NR_DMA_CHANNELS_BOOL is not set |
216 | 208 | ||
217 | # | 209 | # |
218 | # Companion Chips | 210 | # Companion Chips |
219 | # | 211 | # |
220 | # CONFIG_HD6446X_SERIES is not set | 212 | |
213 | # | ||
214 | # Additional SuperH Device Drivers | ||
215 | # | ||
216 | # CONFIG_HEARTBEAT is not set | ||
217 | # CONFIG_PUSH_SWITCH is not set | ||
221 | 218 | ||
222 | # | 219 | # |
223 | # Kernel features | 220 | # Kernel features |
224 | # | 221 | # |
225 | # CONFIG_HZ_100 is not set | 222 | # CONFIG_HZ_100 is not set |
226 | CONFIG_HZ_250=y | 223 | CONFIG_HZ_250=y |
224 | # CONFIG_HZ_300 is not set | ||
227 | # CONFIG_HZ_1000 is not set | 225 | # CONFIG_HZ_1000 is not set |
228 | CONFIG_HZ=250 | 226 | CONFIG_HZ=250 |
229 | # CONFIG_KEXEC is not set | 227 | # CONFIG_KEXEC is not set |
230 | # CONFIG_SMP is not set | 228 | # CONFIG_CRASH_DUMP is not set |
231 | CONFIG_PREEMPT_NONE=y | 229 | CONFIG_PREEMPT_NONE=y |
232 | # CONFIG_PREEMPT_VOLUNTARY is not set | 230 | # CONFIG_PREEMPT_VOLUNTARY is not set |
233 | # CONFIG_PREEMPT is not set | 231 | # CONFIG_PREEMPT is not set |
@@ -243,33 +241,24 @@ CONFIG_BOOT_LINK_OFFSET=0x00800000 | |||
243 | # | 241 | # |
244 | # Bus options | 242 | # Bus options |
245 | # | 243 | # |
244 | CONFIG_SH_CONCAT_FS=y | ||
246 | CONFIG_PCI=y | 245 | CONFIG_PCI=y |
247 | # CONFIG_SH_PCIDMA_NONCOHERENT is not set | 246 | CONFIG_SH_PCIDMA_NONCOHERENT=y |
248 | CONFIG_PCI_AUTO=y | 247 | CONFIG_PCI_AUTO=y |
249 | CONFIG_PCI_AUTO_UPDATE_RESOURCES=y | 248 | CONFIG_PCI_AUTO_UPDATE_RESOURCES=y |
250 | # CONFIG_PCI_MULTITHREAD_PROBE is not set | 249 | # CONFIG_ARCH_SUPPORTS_MSI is not set |
251 | 250 | ||
252 | # | 251 | # |
253 | # PCCARD (PCMCIA/CardBus) support | 252 | # PCCARD (PCMCIA/CardBus) support |
254 | # | 253 | # |
255 | 254 | ||
256 | # | 255 | # |
257 | # PCI Hotplug Support | ||
258 | # | ||
259 | |||
260 | # | ||
261 | # Executable file formats | 256 | # Executable file formats |
262 | # | 257 | # |
263 | CONFIG_BINFMT_ELF=y | 258 | CONFIG_BINFMT_ELF=y |
264 | # CONFIG_BINFMT_FLAT is not set | ||
265 | # CONFIG_BINFMT_MISC is not set | 259 | # CONFIG_BINFMT_MISC is not set |
266 | 260 | ||
267 | # | 261 | # |
268 | # Power management options (EXPERIMENTAL) | ||
269 | # | ||
270 | # CONFIG_PM is not set | ||
271 | |||
272 | # | ||
273 | # Networking | 262 | # Networking |
274 | # | 263 | # |
275 | CONFIG_NET=y | 264 | CONFIG_NET=y |
@@ -277,21 +266,14 @@ CONFIG_NET=y | |||
277 | # | 266 | # |
278 | # Networking options | 267 | # Networking options |
279 | # | 268 | # |
280 | # CONFIG_NETDEBUG is not set | ||
281 | # CONFIG_PACKET is not set | 269 | # CONFIG_PACKET is not set |
282 | # CONFIG_UNIX is not set | 270 | # CONFIG_UNIX is not set |
283 | CONFIG_XFRM=y | ||
284 | # CONFIG_XFRM_USER is not set | ||
285 | # CONFIG_XFRM_SUB_POLICY is not set | ||
286 | # CONFIG_NET_KEY is not set | 271 | # CONFIG_NET_KEY is not set |
287 | CONFIG_INET=y | 272 | CONFIG_INET=y |
288 | # CONFIG_IP_MULTICAST is not set | 273 | # CONFIG_IP_MULTICAST is not set |
289 | # CONFIG_IP_ADVANCED_ROUTER is not set | 274 | # CONFIG_IP_ADVANCED_ROUTER is not set |
290 | CONFIG_IP_FIB_HASH=y | 275 | CONFIG_IP_FIB_HASH=y |
291 | CONFIG_IP_PNP=y | 276 | # CONFIG_IP_PNP is not set |
292 | CONFIG_IP_PNP_DHCP=y | ||
293 | # CONFIG_IP_PNP_BOOTP is not set | ||
294 | # CONFIG_IP_PNP_RARP is not set | ||
295 | # CONFIG_NET_IPIP is not set | 277 | # CONFIG_NET_IPIP is not set |
296 | # CONFIG_NET_IPGRE is not set | 278 | # CONFIG_NET_IPGRE is not set |
297 | # CONFIG_ARPD is not set | 279 | # CONFIG_ARPD is not set |
@@ -301,32 +283,21 @@ CONFIG_IP_PNP_DHCP=y | |||
301 | # CONFIG_INET_IPCOMP is not set | 283 | # CONFIG_INET_IPCOMP is not set |
302 | # CONFIG_INET_XFRM_TUNNEL is not set | 284 | # CONFIG_INET_XFRM_TUNNEL is not set |
303 | # CONFIG_INET_TUNNEL is not set | 285 | # CONFIG_INET_TUNNEL is not set |
304 | CONFIG_INET_XFRM_MODE_TRANSPORT=y | 286 | # CONFIG_INET_XFRM_MODE_TRANSPORT is not set |
305 | CONFIG_INET_XFRM_MODE_TUNNEL=y | 287 | # CONFIG_INET_XFRM_MODE_TUNNEL is not set |
306 | CONFIG_INET_DIAG=y | 288 | # CONFIG_INET_XFRM_MODE_BEET is not set |
307 | CONFIG_INET_TCP_DIAG=y | 289 | # CONFIG_INET_DIAG is not set |
308 | # CONFIG_TCP_CONG_ADVANCED is not set | 290 | # CONFIG_TCP_CONG_ADVANCED is not set |
309 | CONFIG_TCP_CONG_CUBIC=y | 291 | CONFIG_TCP_CONG_CUBIC=y |
310 | CONFIG_DEFAULT_TCP_CONG="cubic" | 292 | CONFIG_DEFAULT_TCP_CONG="cubic" |
293 | # CONFIG_TCP_MD5SIG is not set | ||
311 | # CONFIG_IPV6 is not set | 294 | # CONFIG_IPV6 is not set |
312 | # CONFIG_INET6_XFRM_TUNNEL is not set | 295 | # CONFIG_INET6_XFRM_TUNNEL is not set |
313 | # CONFIG_INET6_TUNNEL is not set | 296 | # CONFIG_INET6_TUNNEL is not set |
314 | # CONFIG_NETWORK_SECMARK is not set | 297 | # CONFIG_NETWORK_SECMARK is not set |
315 | # CONFIG_NETFILTER is not set | 298 | # CONFIG_NETFILTER is not set |
316 | |||
317 | # | ||
318 | # DCCP Configuration (EXPERIMENTAL) | ||
319 | # | ||
320 | # CONFIG_IP_DCCP is not set | 299 | # CONFIG_IP_DCCP is not set |
321 | |||
322 | # | ||
323 | # SCTP Configuration (EXPERIMENTAL) | ||
324 | # | ||
325 | # CONFIG_IP_SCTP is not set | 300 | # CONFIG_IP_SCTP is not set |
326 | |||
327 | # | ||
328 | # TIPC Configuration (EXPERIMENTAL) | ||
329 | # | ||
330 | # CONFIG_TIPC is not set | 301 | # CONFIG_TIPC is not set |
331 | # CONFIG_ATM is not set | 302 | # CONFIG_ATM is not set |
332 | # CONFIG_BRIDGE is not set | 303 | # CONFIG_BRIDGE is not set |
@@ -352,7 +323,17 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
352 | # CONFIG_HAMRADIO is not set | 323 | # CONFIG_HAMRADIO is not set |
353 | # CONFIG_IRDA is not set | 324 | # CONFIG_IRDA is not set |
354 | # CONFIG_BT is not set | 325 | # CONFIG_BT is not set |
326 | # CONFIG_AF_RXRPC is not set | ||
327 | |||
328 | # | ||
329 | # Wireless | ||
330 | # | ||
331 | # CONFIG_CFG80211 is not set | ||
332 | # CONFIG_WIRELESS_EXT is not set | ||
333 | # CONFIG_MAC80211 is not set | ||
355 | # CONFIG_IEEE80211 is not set | 334 | # CONFIG_IEEE80211 is not set |
335 | # CONFIG_RFKILL is not set | ||
336 | # CONFIG_NET_9P is not set | ||
356 | 337 | ||
357 | # | 338 | # |
358 | # Device Drivers | 339 | # Device Drivers |
@@ -364,30 +345,88 @@ CONFIG_DEFAULT_TCP_CONG="cubic" | |||
364 | CONFIG_STANDALONE=y | 345 | CONFIG_STANDALONE=y |
365 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 346 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
366 | # CONFIG_SYS_HYPERVISOR is not set | 347 | # CONFIG_SYS_HYPERVISOR is not set |
367 | |||
368 | # | ||
369 | # Connector - unified userspace <-> kernelspace linker | ||
370 | # | ||
371 | # CONFIG_CONNECTOR is not set | 348 | # CONFIG_CONNECTOR is not set |
372 | 349 | CONFIG_MTD=y | |
373 | # | 350 | # CONFIG_MTD_DEBUG is not set |
374 | # Memory Technology Devices (MTD) | 351 | # CONFIG_MTD_CONCAT is not set |
375 | # | 352 | CONFIG_MTD_PARTITIONS=y |
376 | # CONFIG_MTD is not set | 353 | # CONFIG_MTD_REDBOOT_PARTS is not set |
377 | 354 | # CONFIG_MTD_CMDLINE_PARTS is not set | |
378 | # | 355 | |
379 | # Parallel port support | 356 | # |
380 | # | 357 | # User Modules And Translation Layers |
358 | # | ||
359 | CONFIG_MTD_CHAR=y | ||
360 | CONFIG_MTD_BLKDEVS=y | ||
361 | # CONFIG_MTD_BLOCK is not set | ||
362 | CONFIG_MTD_BLOCK_RO=y | ||
363 | # CONFIG_FTL is not set | ||
364 | # CONFIG_NFTL is not set | ||
365 | # CONFIG_INFTL is not set | ||
366 | # CONFIG_RFD_FTL is not set | ||
367 | # CONFIG_SSFDC is not set | ||
368 | |||
369 | # | ||
370 | # RAM/ROM/Flash chip drivers | ||
371 | # | ||
372 | CONFIG_MTD_CFI=y | ||
373 | # CONFIG_MTD_JEDECPROBE is not set | ||
374 | CONFIG_MTD_GEN_PROBE=y | ||
375 | CONFIG_MTD_CFI_ADV_OPTIONS=y | ||
376 | CONFIG_MTD_CFI_NOSWAP=y | ||
377 | # CONFIG_MTD_CFI_BE_BYTE_SWAP is not set | ||
378 | # CONFIG_MTD_CFI_LE_BYTE_SWAP is not set | ||
379 | CONFIG_MTD_CFI_GEOMETRY=y | ||
380 | CONFIG_MTD_MAP_BANK_WIDTH_1=y | ||
381 | # CONFIG_MTD_MAP_BANK_WIDTH_2 is not set | ||
382 | # CONFIG_MTD_MAP_BANK_WIDTH_4 is not set | ||
383 | # CONFIG_MTD_MAP_BANK_WIDTH_8 is not set | ||
384 | # CONFIG_MTD_MAP_BANK_WIDTH_16 is not set | ||
385 | # CONFIG_MTD_MAP_BANK_WIDTH_32 is not set | ||
386 | CONFIG_MTD_CFI_I1=y | ||
387 | # CONFIG_MTD_CFI_I2 is not set | ||
388 | # CONFIG_MTD_CFI_I4 is not set | ||
389 | # CONFIG_MTD_CFI_I8 is not set | ||
390 | # CONFIG_MTD_OTP is not set | ||
391 | CONFIG_MTD_CFI_INTELEXT=y | ||
392 | # CONFIG_MTD_CFI_AMDSTD is not set | ||
393 | # CONFIG_MTD_CFI_STAA is not set | ||
394 | CONFIG_MTD_CFI_UTIL=y | ||
395 | CONFIG_MTD_RAM=y | ||
396 | # CONFIG_MTD_ROM is not set | ||
397 | # CONFIG_MTD_ABSENT is not set | ||
398 | |||
399 | # | ||
400 | # Mapping drivers for chip access | ||
401 | # | ||
402 | # CONFIG_MTD_COMPLEX_MAPPINGS is not set | ||
403 | # CONFIG_MTD_PHYSMAP is not set | ||
404 | CONFIG_MTD_PLATRAM=y | ||
405 | |||
406 | # | ||
407 | # Self-contained MTD device drivers | ||
408 | # | ||
409 | # CONFIG_MTD_PMC551 is not set | ||
410 | # CONFIG_MTD_SLRAM is not set | ||
411 | # CONFIG_MTD_PHRAM is not set | ||
412 | # CONFIG_MTD_MTDRAM is not set | ||
413 | # CONFIG_MTD_BLOCK2MTD is not set | ||
414 | |||
415 | # | ||
416 | # Disk-On-Chip Device Drivers | ||
417 | # | ||
418 | # CONFIG_MTD_DOC2000 is not set | ||
419 | # CONFIG_MTD_DOC2001 is not set | ||
420 | # CONFIG_MTD_DOC2001PLUS is not set | ||
421 | # CONFIG_MTD_NAND is not set | ||
422 | # CONFIG_MTD_ONENAND is not set | ||
423 | |||
424 | # | ||
425 | # UBI - Unsorted block images | ||
426 | # | ||
427 | # CONFIG_MTD_UBI is not set | ||
381 | # CONFIG_PARPORT is not set | 428 | # CONFIG_PARPORT is not set |
382 | 429 | CONFIG_BLK_DEV=y | |
383 | # | ||
384 | # Plug and Play support | ||
385 | # | ||
386 | |||
387 | # | ||
388 | # Block devices | ||
389 | # | ||
390 | # CONFIG_BLK_CPQ_DA is not set | ||
391 | # CONFIG_BLK_CPQ_CISS_DA is not set | 430 | # CONFIG_BLK_CPQ_CISS_DA is not set |
392 | # CONFIG_BLK_DEV_DAC960 is not set | 431 | # CONFIG_BLK_DEV_DAC960 is not set |
393 | # CONFIG_BLK_DEV_UMEM is not set | 432 | # CONFIG_BLK_DEV_UMEM is not set |
@@ -399,13 +438,9 @@ CONFIG_BLK_DEV_RAM=y | |||
399 | CONFIG_BLK_DEV_RAM_COUNT=16 | 438 | CONFIG_BLK_DEV_RAM_COUNT=16 |
400 | CONFIG_BLK_DEV_RAM_SIZE=4096 | 439 | CONFIG_BLK_DEV_RAM_SIZE=4096 |
401 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | 440 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 |
402 | CONFIG_BLK_DEV_INITRD=y | ||
403 | # CONFIG_CDROM_PKTCDVD is not set | 441 | # CONFIG_CDROM_PKTCDVD is not set |
404 | # CONFIG_ATA_OVER_ETH is not set | 442 | # CONFIG_ATA_OVER_ETH is not set |
405 | 443 | # CONFIG_MISC_DEVICES is not set | |
406 | # | ||
407 | # ATA/ATAPI/MFM/RLL support | ||
408 | # | ||
409 | # CONFIG_IDE is not set | 444 | # CONFIG_IDE is not set |
410 | 445 | ||
411 | # | 446 | # |
@@ -413,16 +448,9 @@ CONFIG_BLK_DEV_INITRD=y | |||
413 | # | 448 | # |
414 | # CONFIG_RAID_ATTRS is not set | 449 | # CONFIG_RAID_ATTRS is not set |
415 | # CONFIG_SCSI is not set | 450 | # CONFIG_SCSI is not set |
451 | # CONFIG_SCSI_DMA is not set | ||
416 | # CONFIG_SCSI_NETLINK is not set | 452 | # CONFIG_SCSI_NETLINK is not set |
417 | |||
418 | # | ||
419 | # Serial ATA (prod) and Parallel ATA (experimental) drivers | ||
420 | # | ||
421 | # CONFIG_ATA is not set | 453 | # CONFIG_ATA is not set |
422 | |||
423 | # | ||
424 | # Multi-device support (RAID and LVM) | ||
425 | # | ||
426 | # CONFIG_MD is not set | 454 | # CONFIG_MD is not set |
427 | 455 | ||
428 | # | 456 | # |
@@ -433,35 +461,18 @@ CONFIG_BLK_DEV_INITRD=y | |||
433 | # | 461 | # |
434 | # IEEE 1394 (FireWire) support | 462 | # IEEE 1394 (FireWire) support |
435 | # | 463 | # |
464 | # CONFIG_FIREWIRE is not set | ||
436 | # CONFIG_IEEE1394 is not set | 465 | # CONFIG_IEEE1394 is not set |
437 | |||
438 | # | ||
439 | # I2O device support | ||
440 | # | ||
441 | # CONFIG_I2O is not set | 466 | # CONFIG_I2O is not set |
442 | |||
443 | # | ||
444 | # Network device support | ||
445 | # | ||
446 | CONFIG_NETDEVICES=y | 467 | CONFIG_NETDEVICES=y |
468 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
447 | # CONFIG_DUMMY is not set | 469 | # CONFIG_DUMMY is not set |
448 | # CONFIG_BONDING is not set | 470 | # CONFIG_BONDING is not set |
471 | # CONFIG_MACVLAN is not set | ||
449 | # CONFIG_EQUALIZER is not set | 472 | # CONFIG_EQUALIZER is not set |
450 | # CONFIG_TUN is not set | 473 | # CONFIG_TUN is not set |
451 | |||
452 | # | ||
453 | # ARCnet devices | ||
454 | # | ||
455 | # CONFIG_ARCNET is not set | 474 | # CONFIG_ARCNET is not set |
456 | |||
457 | # | ||
458 | # PHY device support | ||
459 | # | ||
460 | # CONFIG_PHYLIB is not set | 475 | # CONFIG_PHYLIB is not set |
461 | |||
462 | # | ||
463 | # Ethernet (10 or 100Mbit) | ||
464 | # | ||
465 | CONFIG_NET_ETHERNET=y | 476 | CONFIG_NET_ETHERNET=y |
466 | CONFIG_MII=y | 477 | CONFIG_MII=y |
467 | # CONFIG_STNIC is not set | 478 | # CONFIG_STNIC is not set |
@@ -470,10 +481,6 @@ CONFIG_MII=y | |||
470 | # CONFIG_CASSINI is not set | 481 | # CONFIG_CASSINI is not set |
471 | # CONFIG_NET_VENDOR_3COM is not set | 482 | # CONFIG_NET_VENDOR_3COM is not set |
472 | # CONFIG_SMC91X is not set | 483 | # CONFIG_SMC91X is not set |
473 | |||
474 | # | ||
475 | # Tulip family network device support | ||
476 | # | ||
477 | # CONFIG_NET_TULIP is not set | 484 | # CONFIG_NET_TULIP is not set |
478 | # CONFIG_HP100 is not set | 485 | # CONFIG_HP100 is not set |
479 | CONFIG_NET_PCI=y | 486 | CONFIG_NET_PCI=y |
@@ -488,9 +495,9 @@ CONFIG_NET_PCI=y | |||
488 | # CONFIG_FEALNX is not set | 495 | # CONFIG_FEALNX is not set |
489 | # CONFIG_NATSEMI is not set | 496 | # CONFIG_NATSEMI is not set |
490 | # CONFIG_NE2K_PCI is not set | 497 | # CONFIG_NE2K_PCI is not set |
491 | # CONFIG_8139CP is not set | 498 | CONFIG_8139CP=y |
492 | CONFIG_8139TOO=y | 499 | CONFIG_8139TOO=y |
493 | # CONFIG_8139TOO_PIO is not set | 500 | CONFIG_8139TOO_PIO=y |
494 | # CONFIG_8139TOO_TUNE_TWISTER is not set | 501 | # CONFIG_8139TOO_TUNE_TWISTER is not set |
495 | # CONFIG_8139TOO_8129 is not set | 502 | # CONFIG_8139TOO_8129 is not set |
496 | # CONFIG_8139_OLD_RX_RESET is not set | 503 | # CONFIG_8139_OLD_RX_RESET is not set |
@@ -499,47 +506,16 @@ CONFIG_8139TOO=y | |||
499 | # CONFIG_SUNDANCE is not set | 506 | # CONFIG_SUNDANCE is not set |
500 | # CONFIG_TLAN is not set | 507 | # CONFIG_TLAN is not set |
501 | # CONFIG_VIA_RHINE is not set | 508 | # CONFIG_VIA_RHINE is not set |
502 | 509 | # CONFIG_SC92031 is not set | |
503 | # | 510 | # CONFIG_NETDEV_1000 is not set |
504 | # Ethernet (1000 Mbit) | 511 | # CONFIG_NETDEV_10000 is not set |
505 | # | ||
506 | # CONFIG_ACENIC is not set | ||
507 | # CONFIG_DL2K is not set | ||
508 | # CONFIG_E1000 is not set | ||
509 | # CONFIG_NS83820 is not set | ||
510 | # CONFIG_HAMACHI is not set | ||
511 | # CONFIG_YELLOWFIN is not set | ||
512 | # CONFIG_R8169 is not set | ||
513 | # CONFIG_SIS190 is not set | ||
514 | # CONFIG_SKGE is not set | ||
515 | # CONFIG_SKY2 is not set | ||
516 | # CONFIG_SK98LIN is not set | ||
517 | # CONFIG_VIA_VELOCITY is not set | ||
518 | # CONFIG_TIGON3 is not set | ||
519 | # CONFIG_BNX2 is not set | ||
520 | # CONFIG_QLA3XXX is not set | ||
521 | |||
522 | # | ||
523 | # Ethernet (10000 Mbit) | ||
524 | # | ||
525 | # CONFIG_CHELSIO_T1 is not set | ||
526 | # CONFIG_IXGB is not set | ||
527 | # CONFIG_S2IO is not set | ||
528 | # CONFIG_MYRI10GE is not set | ||
529 | |||
530 | # | ||
531 | # Token Ring devices | ||
532 | # | ||
533 | # CONFIG_TR is not set | 512 | # CONFIG_TR is not set |
534 | 513 | ||
535 | # | 514 | # |
536 | # Wireless LAN (non-hamradio) | 515 | # Wireless LAN |
537 | # | ||
538 | # CONFIG_NET_RADIO is not set | ||
539 | |||
540 | # | ||
541 | # Wan interfaces | ||
542 | # | 516 | # |
517 | # CONFIG_WLAN_PRE80211 is not set | ||
518 | # CONFIG_WLAN_80211 is not set | ||
543 | # CONFIG_WAN is not set | 519 | # CONFIG_WAN is not set |
544 | # CONFIG_FDDI is not set | 520 | # CONFIG_FDDI is not set |
545 | # CONFIG_HIPPI is not set | 521 | # CONFIG_HIPPI is not set |
@@ -549,15 +525,7 @@ CONFIG_8139TOO=y | |||
549 | # CONFIG_NETCONSOLE is not set | 525 | # CONFIG_NETCONSOLE is not set |
550 | # CONFIG_NETPOLL is not set | 526 | # CONFIG_NETPOLL is not set |
551 | # CONFIG_NET_POLL_CONTROLLER is not set | 527 | # CONFIG_NET_POLL_CONTROLLER is not set |
552 | |||
553 | # | ||
554 | # ISDN subsystem | ||
555 | # | ||
556 | # CONFIG_ISDN is not set | 528 | # CONFIG_ISDN is not set |
557 | |||
558 | # | ||
559 | # Telephony Support | ||
560 | # | ||
561 | # CONFIG_PHONE is not set | 529 | # CONFIG_PHONE is not set |
562 | 530 | ||
563 | # | 531 | # |
@@ -565,14 +533,12 @@ CONFIG_8139TOO=y | |||
565 | # | 533 | # |
566 | CONFIG_INPUT=y | 534 | CONFIG_INPUT=y |
567 | # CONFIG_INPUT_FF_MEMLESS is not set | 535 | # CONFIG_INPUT_FF_MEMLESS is not set |
536 | # CONFIG_INPUT_POLLDEV is not set | ||
568 | 537 | ||
569 | # | 538 | # |
570 | # Userland interfaces | 539 | # Userland interfaces |
571 | # | 540 | # |
572 | CONFIG_INPUT_MOUSEDEV=y | 541 | # CONFIG_INPUT_MOUSEDEV is not set |
573 | CONFIG_INPUT_MOUSEDEV_PSAUX=y | ||
574 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 | ||
575 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 | ||
576 | # CONFIG_INPUT_JOYDEV is not set | 542 | # CONFIG_INPUT_JOYDEV is not set |
577 | # CONFIG_INPUT_TSDEV is not set | 543 | # CONFIG_INPUT_TSDEV is not set |
578 | # CONFIG_INPUT_EVDEV is not set | 544 | # CONFIG_INPUT_EVDEV is not set |
@@ -584,27 +550,20 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 | |||
584 | # CONFIG_INPUT_KEYBOARD is not set | 550 | # CONFIG_INPUT_KEYBOARD is not set |
585 | # CONFIG_INPUT_MOUSE is not set | 551 | # CONFIG_INPUT_MOUSE is not set |
586 | # CONFIG_INPUT_JOYSTICK is not set | 552 | # CONFIG_INPUT_JOYSTICK is not set |
553 | # CONFIG_INPUT_TABLET is not set | ||
587 | # CONFIG_INPUT_TOUCHSCREEN is not set | 554 | # CONFIG_INPUT_TOUCHSCREEN is not set |
588 | # CONFIG_INPUT_MISC is not set | 555 | # CONFIG_INPUT_MISC is not set |
589 | 556 | ||
590 | # | 557 | # |
591 | # Hardware I/O ports | 558 | # Hardware I/O ports |
592 | # | 559 | # |
593 | CONFIG_SERIO=y | 560 | # CONFIG_SERIO is not set |
594 | CONFIG_SERIO_I8042=y | ||
595 | CONFIG_SERIO_SERPORT=y | ||
596 | # CONFIG_SERIO_PCIPS2 is not set | ||
597 | # CONFIG_SERIO_LIBPS2 is not set | ||
598 | # CONFIG_SERIO_RAW is not set | ||
599 | # CONFIG_GAMEPORT is not set | 561 | # CONFIG_GAMEPORT is not set |
600 | 562 | ||
601 | # | 563 | # |
602 | # Character devices | 564 | # Character devices |
603 | # | 565 | # |
604 | CONFIG_VT=y | 566 | # CONFIG_VT is not set |
605 | CONFIG_VT_CONSOLE=y | ||
606 | CONFIG_HW_CONSOLE=y | ||
607 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | ||
608 | # CONFIG_SERIAL_NONSTANDARD is not set | 567 | # CONFIG_SERIAL_NONSTANDARD is not set |
609 | 568 | ||
610 | # | 569 | # |
@@ -615,42 +574,24 @@ CONFIG_HW_CONSOLE=y | |||
615 | # | 574 | # |
616 | # Non-8250 serial port support | 575 | # Non-8250 serial port support |
617 | # | 576 | # |
618 | # CONFIG_SERIAL_SH_SCI is not set | 577 | CONFIG_SERIAL_SH_SCI=y |
578 | CONFIG_SERIAL_SH_SCI_NR_UARTS=2 | ||
579 | CONFIG_SERIAL_SH_SCI_CONSOLE=y | ||
580 | CONFIG_SERIAL_CORE=y | ||
581 | CONFIG_SERIAL_CORE_CONSOLE=y | ||
619 | # CONFIG_SERIAL_JSM is not set | 582 | # CONFIG_SERIAL_JSM is not set |
620 | CONFIG_UNIX98_PTYS=y | 583 | CONFIG_UNIX98_PTYS=y |
621 | CONFIG_LEGACY_PTYS=y | 584 | CONFIG_LEGACY_PTYS=y |
622 | CONFIG_LEGACY_PTY_COUNT=256 | 585 | CONFIG_LEGACY_PTY_COUNT=256 |
623 | |||
624 | # | ||
625 | # IPMI | ||
626 | # | ||
627 | # CONFIG_IPMI_HANDLER is not set | 586 | # CONFIG_IPMI_HANDLER is not set |
628 | |||
629 | # | ||
630 | # Watchdog Cards | ||
631 | # | ||
632 | # CONFIG_WATCHDOG is not set | 587 | # CONFIG_WATCHDOG is not set |
633 | CONFIG_HW_RANDOM=y | 588 | # CONFIG_HW_RANDOM is not set |
634 | # CONFIG_GEN_RTC is not set | ||
635 | # CONFIG_DTLK is not set | ||
636 | # CONFIG_R3964 is not set | 589 | # CONFIG_R3964 is not set |
637 | # CONFIG_APPLICOM is not set | 590 | # CONFIG_APPLICOM is not set |
638 | |||
639 | # | ||
640 | # Ftape, the floppy tape device driver | ||
641 | # | ||
642 | # CONFIG_DRM is not set | 591 | # CONFIG_DRM is not set |
643 | # CONFIG_RAW_DRIVER is not set | 592 | # CONFIG_RAW_DRIVER is not set |
644 | |||
645 | # | ||
646 | # TPM devices | ||
647 | # | ||
648 | # CONFIG_TCG_TPM is not set | 593 | # CONFIG_TCG_TPM is not set |
649 | # CONFIG_TELCLOCK is not set | 594 | CONFIG_DEVPORT=y |
650 | |||
651 | # | ||
652 | # I2C support | ||
653 | # | ||
654 | # CONFIG_I2C is not set | 595 | # CONFIG_I2C is not set |
655 | 596 | ||
656 | # | 597 | # |
@@ -658,98 +599,46 @@ CONFIG_HW_RANDOM=y | |||
658 | # | 599 | # |
659 | # CONFIG_SPI is not set | 600 | # CONFIG_SPI is not set |
660 | # CONFIG_SPI_MASTER is not set | 601 | # CONFIG_SPI_MASTER is not set |
602 | # CONFIG_W1 is not set | ||
603 | # CONFIG_POWER_SUPPLY is not set | ||
604 | # CONFIG_HWMON is not set | ||
661 | 605 | ||
662 | # | 606 | # |
663 | # Dallas's 1-wire bus | 607 | # Multifunction device drivers |
664 | # | ||
665 | |||
666 | # | ||
667 | # Hardware Monitoring support | ||
668 | # | ||
669 | CONFIG_HWMON=y | ||
670 | # CONFIG_HWMON_VID is not set | ||
671 | # CONFIG_SENSORS_ABITUGURU is not set | ||
672 | # CONFIG_SENSORS_F71805F is not set | ||
673 | # CONFIG_SENSORS_VT1211 is not set | ||
674 | # CONFIG_HWMON_DEBUG_CHIP is not set | ||
675 | |||
676 | # | ||
677 | # Misc devices | ||
678 | # | 608 | # |
609 | # CONFIG_MFD_SM501 is not set | ||
679 | 610 | ||
680 | # | 611 | # |
681 | # Multimedia devices | 612 | # Multimedia devices |
682 | # | 613 | # |
683 | # CONFIG_VIDEO_DEV is not set | 614 | # CONFIG_VIDEO_DEV is not set |
684 | CONFIG_VIDEO_V4L2=y | 615 | # CONFIG_DVB_CORE is not set |
685 | 616 | # CONFIG_DAB is not set | |
686 | # | ||
687 | # Digital Video Broadcasting Devices | ||
688 | # | ||
689 | # CONFIG_DVB is not set | ||
690 | 617 | ||
691 | # | 618 | # |
692 | # Graphics support | 619 | # Graphics support |
693 | # | 620 | # |
694 | CONFIG_FIRMWARE_EDID=y | 621 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set |
695 | # CONFIG_FB is not set | ||
696 | 622 | ||
697 | # | 623 | # |
698 | # Console display driver support | 624 | # Display device support |
699 | # | 625 | # |
700 | CONFIG_DUMMY_CONSOLE=y | 626 | # CONFIG_DISPLAY_SUPPORT is not set |
701 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | 627 | # CONFIG_VGASTATE is not set |
628 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set | ||
629 | # CONFIG_FB is not set | ||
702 | 630 | ||
703 | # | 631 | # |
704 | # Sound | 632 | # Sound |
705 | # | 633 | # |
706 | # CONFIG_SOUND is not set | 634 | # CONFIG_SOUND is not set |
707 | 635 | # CONFIG_HID_SUPPORT is not set | |
708 | # | 636 | # CONFIG_USB_SUPPORT is not set |
709 | # USB support | ||
710 | # | ||
711 | CONFIG_USB_ARCH_HAS_HCD=y | ||
712 | CONFIG_USB_ARCH_HAS_OHCI=y | ||
713 | CONFIG_USB_ARCH_HAS_EHCI=y | ||
714 | # CONFIG_USB is not set | ||
715 | |||
716 | # | ||
717 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | ||
718 | # | ||
719 | |||
720 | # | ||
721 | # USB Gadget Support | ||
722 | # | ||
723 | # CONFIG_USB_GADGET is not set | ||
724 | |||
725 | # | ||
726 | # MMC/SD Card support | ||
727 | # | ||
728 | # CONFIG_MMC is not set | 637 | # CONFIG_MMC is not set |
729 | |||
730 | # | ||
731 | # LED devices | ||
732 | # | ||
733 | # CONFIG_NEW_LEDS is not set | 638 | # CONFIG_NEW_LEDS is not set |
734 | |||
735 | # | ||
736 | # LED drivers | ||
737 | # | ||
738 | |||
739 | # | ||
740 | # LED Triggers | ||
741 | # | ||
742 | |||
743 | # | ||
744 | # InfiniBand support | ||
745 | # | ||
746 | # CONFIG_INFINIBAND is not set | 639 | # CONFIG_INFINIBAND is not set |
747 | 640 | ||
748 | # | 641 | # |
749 | # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) | ||
750 | # | ||
751 | |||
752 | # | ||
753 | # Real Time Clock | 642 | # Real Time Clock |
754 | # | 643 | # |
755 | # CONFIG_RTC_CLASS is not set | 644 | # CONFIG_RTC_CLASS is not set |
@@ -768,23 +657,29 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
768 | # | 657 | # |
769 | 658 | ||
770 | # | 659 | # |
660 | # Userspace I/O | ||
661 | # | ||
662 | # CONFIG_UIO is not set | ||
663 | |||
664 | # | ||
771 | # File systems | 665 | # File systems |
772 | # | 666 | # |
773 | CONFIG_EXT2_FS=y | 667 | CONFIG_EXT2_FS=y |
774 | # CONFIG_EXT2_FS_XATTR is not set | 668 | # CONFIG_EXT2_FS_XATTR is not set |
775 | # CONFIG_EXT2_FS_XIP is not set | 669 | # CONFIG_EXT2_FS_XIP is not set |
776 | # CONFIG_EXT3_FS is not set | 670 | # CONFIG_EXT3_FS is not set |
671 | # CONFIG_EXT4DEV_FS is not set | ||
777 | # CONFIG_REISERFS_FS is not set | 672 | # CONFIG_REISERFS_FS is not set |
778 | # CONFIG_JFS_FS is not set | 673 | # CONFIG_JFS_FS is not set |
779 | # CONFIG_FS_POSIX_ACL is not set | 674 | # CONFIG_FS_POSIX_ACL is not set |
780 | # CONFIG_XFS_FS is not set | 675 | # CONFIG_XFS_FS is not set |
676 | # CONFIG_GFS2_FS is not set | ||
781 | # CONFIG_OCFS2_FS is not set | 677 | # CONFIG_OCFS2_FS is not set |
782 | # CONFIG_MINIX_FS is not set | 678 | # CONFIG_MINIX_FS is not set |
783 | CONFIG_ROMFS_FS=y | 679 | CONFIG_ROMFS_FS=y |
784 | CONFIG_INOTIFY=y | 680 | # CONFIG_INOTIFY is not set |
785 | CONFIG_INOTIFY_USER=y | ||
786 | # CONFIG_QUOTA is not set | 681 | # CONFIG_QUOTA is not set |
787 | CONFIG_DNOTIFY=y | 682 | # CONFIG_DNOTIFY is not set |
788 | # CONFIG_AUTOFS_FS is not set | 683 | # CONFIG_AUTOFS_FS is not set |
789 | # CONFIG_AUTOFS4_FS is not set | 684 | # CONFIG_AUTOFS4_FS is not set |
790 | # CONFIG_FUSE_FS is not set | 685 | # CONFIG_FUSE_FS is not set |
@@ -826,6 +721,7 @@ CONFIG_RAMFS=y | |||
826 | # CONFIG_BEFS_FS is not set | 721 | # CONFIG_BEFS_FS is not set |
827 | # CONFIG_BFS_FS is not set | 722 | # CONFIG_BFS_FS is not set |
828 | # CONFIG_EFS_FS is not set | 723 | # CONFIG_EFS_FS is not set |
724 | # CONFIG_JFFS2_FS is not set | ||
829 | CONFIG_CRAMFS=y | 725 | CONFIG_CRAMFS=y |
830 | # CONFIG_VXFS_FS is not set | 726 | # CONFIG_VXFS_FS is not set |
831 | # CONFIG_HPFS_FS is not set | 727 | # CONFIG_HPFS_FS is not set |
@@ -836,25 +732,13 @@ CONFIG_CRAMFS=y | |||
836 | # | 732 | # |
837 | # Network File Systems | 733 | # Network File Systems |
838 | # | 734 | # |
839 | CONFIG_NFS_FS=y | 735 | # CONFIG_NFS_FS is not set |
840 | CONFIG_NFS_V3=y | ||
841 | # CONFIG_NFS_V3_ACL is not set | ||
842 | # CONFIG_NFS_V4 is not set | ||
843 | # CONFIG_NFS_DIRECTIO is not set | ||
844 | # CONFIG_NFSD is not set | 736 | # CONFIG_NFSD is not set |
845 | CONFIG_ROOT_NFS=y | ||
846 | CONFIG_LOCKD=y | ||
847 | CONFIG_LOCKD_V4=y | ||
848 | CONFIG_NFS_COMMON=y | ||
849 | CONFIG_SUNRPC=y | ||
850 | # CONFIG_RPCSEC_GSS_KRB5 is not set | ||
851 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | ||
852 | # CONFIG_SMB_FS is not set | 737 | # CONFIG_SMB_FS is not set |
853 | # CONFIG_CIFS is not set | 738 | # CONFIG_CIFS is not set |
854 | # CONFIG_NCP_FS is not set | 739 | # CONFIG_NCP_FS is not set |
855 | # CONFIG_CODA_FS is not set | 740 | # CONFIG_CODA_FS is not set |
856 | # CONFIG_AFS_FS is not set | 741 | # CONFIG_AFS_FS is not set |
857 | # CONFIG_9P_FS is not set | ||
858 | 742 | ||
859 | # | 743 | # |
860 | # Partition Types | 744 | # Partition Types |
@@ -868,6 +752,11 @@ CONFIG_MSDOS_PARTITION=y | |||
868 | # CONFIG_NLS is not set | 752 | # CONFIG_NLS is not set |
869 | 753 | ||
870 | # | 754 | # |
755 | # Distributed Lock Manager | ||
756 | # | ||
757 | # CONFIG_DLM is not set | ||
758 | |||
759 | # | ||
871 | # Profiling support | 760 | # Profiling support |
872 | # | 761 | # |
873 | # CONFIG_PROFILING is not set | 762 | # CONFIG_PROFILING is not set |
@@ -875,36 +764,38 @@ CONFIG_MSDOS_PARTITION=y | |||
875 | # | 764 | # |
876 | # Kernel hacking | 765 | # Kernel hacking |
877 | # | 766 | # |
767 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
878 | # CONFIG_PRINTK_TIME is not set | 768 | # CONFIG_PRINTK_TIME is not set |
879 | CONFIG_ENABLE_MUST_CHECK=y | 769 | CONFIG_ENABLE_MUST_CHECK=y |
880 | # CONFIG_MAGIC_SYSRQ is not set | 770 | # CONFIG_MAGIC_SYSRQ is not set |
881 | # CONFIG_UNUSED_SYMBOLS is not set | 771 | # CONFIG_UNUSED_SYMBOLS is not set |
772 | # CONFIG_DEBUG_FS is not set | ||
773 | # CONFIG_HEADERS_CHECK is not set | ||
882 | # CONFIG_DEBUG_KERNEL is not set | 774 | # CONFIG_DEBUG_KERNEL is not set |
883 | CONFIG_LOG_BUF_SHIFT=14 | ||
884 | # CONFIG_DEBUG_BUGVERBOSE is not set | 775 | # CONFIG_DEBUG_BUGVERBOSE is not set |
885 | # CONFIG_DEBUG_FS is not set | ||
886 | # CONFIG_UNWIND_INFO is not set | ||
887 | # CONFIG_SH_STANDARD_BIOS is not set | 776 | # CONFIG_SH_STANDARD_BIOS is not set |
888 | # CONFIG_EARLY_SCIF_CONSOLE is not set | 777 | # CONFIG_EARLY_SCIF_CONSOLE is not set |
889 | # CONFIG_KGDB is not set | 778 | # CONFIG_SH_KGDB is not set |
890 | 779 | ||
891 | # | 780 | # |
892 | # Security options | 781 | # Security options |
893 | # | 782 | # |
894 | # CONFIG_KEYS is not set | 783 | # CONFIG_KEYS is not set |
895 | # CONFIG_SECURITY is not set | 784 | # CONFIG_SECURITY is not set |
896 | |||
897 | # | ||
898 | # Cryptographic options | ||
899 | # | ||
900 | # CONFIG_CRYPTO is not set | 785 | # CONFIG_CRYPTO is not set |
901 | 786 | ||
902 | # | 787 | # |
903 | # Library routines | 788 | # Library routines |
904 | # | 789 | # |
790 | CONFIG_BITREVERSE=y | ||
905 | # CONFIG_CRC_CCITT is not set | 791 | # CONFIG_CRC_CCITT is not set |
906 | # CONFIG_CRC16 is not set | 792 | # CONFIG_CRC16 is not set |
793 | # CONFIG_CRC_ITU_T is not set | ||
907 | CONFIG_CRC32=y | 794 | CONFIG_CRC32=y |
795 | # CONFIG_CRC7 is not set | ||
908 | # CONFIG_LIBCRC32C is not set | 796 | # CONFIG_LIBCRC32C is not set |
909 | CONFIG_ZLIB_INFLATE=y | 797 | CONFIG_ZLIB_INFLATE=y |
910 | CONFIG_PLIST=y | 798 | CONFIG_PLIST=y |
799 | CONFIG_HAS_IOMEM=y | ||
800 | CONFIG_HAS_IOPORT=y | ||
801 | CONFIG_HAS_DMA=y | ||
diff --git a/arch/sh/configs/systemh_defconfig b/arch/sh/configs/systemh_defconfig index c16350dac01b..af921b5a9d46 100644 --- a/arch/sh/configs/systemh_defconfig +++ b/arch/sh/configs/systemh_defconfig | |||
@@ -141,7 +141,7 @@ CONFIG_CPU_SH4=y | |||
141 | # CONFIG_CPU_SUBTYPE_SH7091 is not set | 141 | # CONFIG_CPU_SUBTYPE_SH7091 is not set |
142 | # CONFIG_CPU_SUBTYPE_SH7750R is not set | 142 | # CONFIG_CPU_SUBTYPE_SH7750R is not set |
143 | # CONFIG_CPU_SUBTYPE_SH7750S is not set | 143 | # CONFIG_CPU_SUBTYPE_SH7750S is not set |
144 | CONFIG_CPU_SUBTYPE_SH7751=y | 144 | # CONFIG_CPU_SUBTYPE_SH7751 is not set |
145 | CONFIG_CPU_SUBTYPE_SH7751R=y | 145 | CONFIG_CPU_SUBTYPE_SH7751R=y |
146 | # CONFIG_CPU_SUBTYPE_SH7760 is not set | 146 | # CONFIG_CPU_SUBTYPE_SH7760 is not set |
147 | # CONFIG_CPU_SUBTYPE_SH4_202 is not set | 147 | # CONFIG_CPU_SUBTYPE_SH4_202 is not set |
diff --git a/arch/sh/configs/titan_defconfig b/arch/sh/configs/titan_defconfig index 41049cf14b79..0686ed6fe17a 100644 --- a/arch/sh/configs/titan_defconfig +++ b/arch/sh/configs/titan_defconfig | |||
@@ -147,7 +147,7 @@ CONFIG_CPU_SH4=y | |||
147 | # CONFIG_CPU_SUBTYPE_SH7091 is not set | 147 | # CONFIG_CPU_SUBTYPE_SH7091 is not set |
148 | # CONFIG_CPU_SUBTYPE_SH7750R is not set | 148 | # CONFIG_CPU_SUBTYPE_SH7750R is not set |
149 | # CONFIG_CPU_SUBTYPE_SH7750S is not set | 149 | # CONFIG_CPU_SUBTYPE_SH7750S is not set |
150 | CONFIG_CPU_SUBTYPE_SH7751=y | 150 | # CONFIG_CPU_SUBTYPE_SH7751 is not set |
151 | CONFIG_CPU_SUBTYPE_SH7751R=y | 151 | CONFIG_CPU_SUBTYPE_SH7751R=y |
152 | # CONFIG_CPU_SUBTYPE_SH7760 is not set | 152 | # CONFIG_CPU_SUBTYPE_SH7760 is not set |
153 | # CONFIG_CPU_SUBTYPE_SH4_202 is not set | 153 | # CONFIG_CPU_SUBTYPE_SH4_202 is not set |
diff --git a/arch/sh/kernel/cpu/sh3/entry.S b/arch/sh/kernel/cpu/sh3/entry.S index d8e122971c3e..0d12a124055c 100644 --- a/arch/sh/kernel/cpu/sh3/entry.S +++ b/arch/sh/kernel/cpu/sh3/entry.S | |||
@@ -149,8 +149,7 @@ call_dpf: | |||
149 | lds r10, pr | 149 | lds r10, pr |
150 | rts | 150 | rts |
151 | nop | 151 | nop |
152 | 0: sti | 152 | 0: mov.l 3f, r0 |
153 | mov.l 3f, r0 | ||
154 | mov r9, r6 | 153 | mov r9, r6 |
155 | mov r8, r5 | 154 | mov r8, r5 |
156 | jmp @r0 | 155 | jmp @r0 |
diff --git a/arch/sh/kernel/traps.c b/arch/sh/kernel/traps.c index 502d43e4785c..67015044d74a 100644 --- a/arch/sh/kernel/traps.c +++ b/arch/sh/kernel/traps.c | |||
@@ -854,9 +854,14 @@ void __init trap_init(void) | |||
854 | set_exception_table_evt(0x800, do_reserved_inst); | 854 | set_exception_table_evt(0x800, do_reserved_inst); |
855 | set_exception_table_evt(0x820, do_illegal_slot_inst); | 855 | set_exception_table_evt(0x820, do_illegal_slot_inst); |
856 | #elif defined(CONFIG_SH_FPU) | 856 | #elif defined(CONFIG_SH_FPU) |
857 | #ifdef CONFIG_CPU_SUBTYPE_SHX3 | ||
858 | set_exception_table_evt(0xd80, do_fpu_state_restore); | ||
859 | set_exception_table_evt(0xda0, do_fpu_state_restore); | ||
860 | #else | ||
857 | set_exception_table_evt(0x800, do_fpu_state_restore); | 861 | set_exception_table_evt(0x800, do_fpu_state_restore); |
858 | set_exception_table_evt(0x820, do_fpu_state_restore); | 862 | set_exception_table_evt(0x820, do_fpu_state_restore); |
859 | #endif | 863 | #endif |
864 | #endif | ||
860 | 865 | ||
861 | #ifdef CONFIG_CPU_SH2 | 866 | #ifdef CONFIG_CPU_SH2 |
862 | set_exception_table_vec(TRAP_ADDRESS_ERROR, address_error_handler); | 867 | set_exception_table_vec(TRAP_ADDRESS_ERROR, address_error_handler); |
diff --git a/arch/sh/mm/Makefile b/arch/sh/mm/Makefile index d677d7f3afc1..4061e89d84d0 100644 --- a/arch/sh/mm/Makefile +++ b/arch/sh/mm/Makefile | |||
@@ -8,7 +8,9 @@ obj-$(CONFIG_CPU_SH2) += cache-sh2.o | |||
8 | obj-$(CONFIG_CPU_SH3) += cache-sh3.o | 8 | obj-$(CONFIG_CPU_SH3) += cache-sh3.o |
9 | obj-$(CONFIG_CPU_SH4) += cache-sh4.o | 9 | obj-$(CONFIG_CPU_SH4) += cache-sh4.o |
10 | 10 | ||
11 | mmu-y := fault-nommu.o tlb-nommu.o pg-nommu.o | 11 | mmu-y := tlb-nommu.o pg-nommu.o |
12 | mmu-$(CONFIG_CPU_SH3) += fault-nommu.o | ||
13 | mmu-$(CONFIG_CPU_SH4) += fault-nommu.o | ||
12 | mmu-$(CONFIG_MMU) := fault.o clear_page.o copy_page.o tlb-flush.o \ | 14 | mmu-$(CONFIG_MMU) := fault.o clear_page.o copy_page.o tlb-flush.o \ |
13 | ioremap.o | 15 | ioremap.o |
14 | 16 | ||
diff --git a/arch/sh/mm/fault-nommu.c b/arch/sh/mm/fault-nommu.c index 923cb456819b..c6f5b51ec2c7 100644 --- a/arch/sh/mm/fault-nommu.c +++ b/arch/sh/mm/fault-nommu.c | |||
@@ -1,47 +1,33 @@ | |||
1 | /* | 1 | /* |
2 | * arch/sh/mm/fault-nommu.c | 2 | * arch/sh/mm/fault-nommu.c |
3 | * | 3 | * |
4 | * Copyright (C) 2002 Paul Mundt | 4 | * Copyright (C) 2002 - 2007 Paul Mundt |
5 | * | 5 | * |
6 | * Based on linux/arch/sh/mm/fault.c: | 6 | * Based on linux/arch/sh/mm/fault.c: |
7 | * Copyright (C) 1999 Niibe Yutaka | 7 | * Copyright (C) 1999 Niibe Yutaka |
8 | * | 8 | * |
9 | * Released under the terms of the GNU GPL v2.0. | 9 | * Released under the terms of the GNU GPL v2.0. |
10 | */ | 10 | */ |
11 | |||
12 | #include <linux/signal.h> | ||
13 | #include <linux/sched.h> | ||
14 | #include <linux/kernel.h> | 11 | #include <linux/kernel.h> |
15 | #include <linux/errno.h> | ||
16 | #include <linux/string.h> | ||
17 | #include <linux/types.h> | ||
18 | #include <linux/ptrace.h> | ||
19 | #include <linux/mman.h> | ||
20 | #include <linux/mm.h> | 12 | #include <linux/mm.h> |
21 | #include <linux/smp.h> | 13 | #include <linux/hardirq.h> |
22 | #include <linux/interrupt.h> | 14 | #include <linux/kprobes.h> |
23 | |||
24 | #include <asm/system.h> | 15 | #include <asm/system.h> |
25 | #include <asm/io.h> | 16 | #include <asm/ptrace.h> |
26 | #include <asm/uaccess.h> | ||
27 | #include <asm/pgalloc.h> | ||
28 | #include <asm/mmu_context.h> | ||
29 | #include <asm/cacheflush.h> | ||
30 | |||
31 | #if defined(CONFIG_SH_KGDB) | ||
32 | #include <asm/kgdb.h> | 17 | #include <asm/kgdb.h> |
33 | #endif | ||
34 | |||
35 | extern void die(const char *,struct pt_regs *,long); | ||
36 | 18 | ||
37 | /* | 19 | /* |
38 | * This routine handles page faults. It determines the address, | 20 | * This routine handles page faults. It determines the address, |
39 | * and the problem, and then passes it off to one of the appropriate | 21 | * and the problem, and then passes it off to one of the appropriate |
40 | * routines. | 22 | * routines. |
41 | */ | 23 | */ |
42 | asmlinkage void do_page_fault(struct pt_regs *regs, unsigned long writeaccess, | 24 | asmlinkage void __kprobes do_page_fault(struct pt_regs *regs, |
43 | unsigned long address) | 25 | unsigned long writeaccess, |
26 | unsigned long address) | ||
44 | { | 27 | { |
28 | trace_hardirqs_on(); | ||
29 | local_irq_enable(); | ||
30 | |||
45 | #if defined(CONFIG_SH_KGDB) | 31 | #if defined(CONFIG_SH_KGDB) |
46 | if (kgdb_nofault && kgdb_bus_err_hook) | 32 | if (kgdb_nofault && kgdb_bus_err_hook) |
47 | kgdb_bus_err_hook(); | 33 | kgdb_bus_err_hook(); |
@@ -65,17 +51,14 @@ asmlinkage void do_page_fault(struct pt_regs *regs, unsigned long writeaccess, | |||
65 | do_exit(SIGKILL); | 51 | do_exit(SIGKILL); |
66 | } | 52 | } |
67 | 53 | ||
68 | asmlinkage int __do_page_fault(struct pt_regs *regs, unsigned long writeaccess, | 54 | asmlinkage int __kprobes __do_page_fault(struct pt_regs *regs, |
69 | unsigned long address) | 55 | unsigned long writeaccess, |
56 | unsigned long address) | ||
70 | { | 57 | { |
71 | #if defined(CONFIG_SH_KGDB) | 58 | #if defined(CONFIG_SH_KGDB) |
72 | if (kgdb_nofault && kgdb_bus_err_hook) | 59 | if (kgdb_nofault && kgdb_bus_err_hook) |
73 | kgdb_bus_err_hook(); | 60 | kgdb_bus_err_hook(); |
74 | #endif | 61 | #endif |
75 | 62 | ||
76 | if (address >= TASK_SIZE) | 63 | return (address >= TASK_SIZE); |
77 | return 1; | ||
78 | |||
79 | return 0; | ||
80 | } | 64 | } |
81 | |||
diff --git a/arch/sh/mm/fault.c b/arch/sh/mm/fault.c index 964c6767dc73..04a39aa7f1f9 100644 --- a/arch/sh/mm/fault.c +++ b/arch/sh/mm/fault.c | |||
@@ -184,8 +184,7 @@ no_context: | |||
184 | printk(KERN_ALERT "pc = %08lx\n", regs->pc); | 184 | printk(KERN_ALERT "pc = %08lx\n", regs->pc); |
185 | page = (unsigned long)get_TTB(); | 185 | page = (unsigned long)get_TTB(); |
186 | if (page) { | 186 | if (page) { |
187 | page = ((__typeof__(page) *) __va(page))[address >> | 187 | page = ((__typeof__(page) *)page)[address >> PGDIR_SHIFT]; |
188 | PGDIR_SHIFT]; | ||
189 | printk(KERN_ALERT "*pde = %08lx\n", page); | 188 | printk(KERN_ALERT "*pde = %08lx\n", page); |
190 | if (page & _PAGE_PRESENT) { | 189 | if (page & _PAGE_PRESENT) { |
191 | page &= PAGE_MASK; | 190 | page &= PAGE_MASK; |
diff --git a/include/asm-sh/rts7751r2d.h b/include/asm-sh/rts7751r2d.h index 10565ac7966a..5d7800aa31b5 100644 --- a/include/asm-sh/rts7751r2d.h +++ b/include/asm-sh/rts7751r2d.h | |||
@@ -37,7 +37,7 @@ | |||
37 | #define PA_VERREG 0xa4000032 /* FPGA Version Register */ | 37 | #define PA_VERREG 0xa4000032 /* FPGA Version Register */ |
38 | #define PA_INPORT 0xa4000034 /* KEY Input Port control */ | 38 | #define PA_INPORT 0xa4000034 /* KEY Input Port control */ |
39 | #define PA_OUTPORT 0xa4000036 /* LED control */ | 39 | #define PA_OUTPORT 0xa4000036 /* LED control */ |
40 | #define PA_DMPORT 0xa4000038 /* DM270 Output Port control */ | 40 | #define PA_BVERREG 0xa4000038 /* Board Revision Register */ |
41 | 41 | ||
42 | #define PA_AX88796L 0xaa000400 /* AX88796L Area */ | 42 | #define PA_AX88796L 0xaa000400 /* AX88796L Area */ |
43 | #define PA_VOYAGER 0xab000000 /* VOYAGER GX Area */ | 43 | #define PA_VOYAGER 0xab000000 /* VOYAGER GX Area */ |