aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sh
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-06-18 17:07:35 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2009-06-18 17:07:35 -0400
commit15fc204afc6feb915c400159546f646eca8ba1d9 (patch)
tree51bec0710be2a0cb0bedbccbea7813f17fbc61ea /arch/sh
parentd2aa4550379f92e929af7ed1dd4f55e6a1e331f8 (diff)
parent944557116908cbe835be41bfbd39d9706da9fd71 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (56 commits) sh: Fix declaration of __kernel_sigreturn and __kernel_rt_sigreturn sh: Enable soc-camera in ap325rxa/migor/se7724 defconfigs. sh: remove stray markers. sh: defconfig updates. sh: pci: Initial PCI-Express support for SH7786 Urquell board. sh: Generic HAVE_PERF_COUNTER support. SH: convert migor to soc-camera as platform-device SH: convert ap325rxa to soc-camera as platform-device soc-camera: unify i2c camera device platform data sh: add platform data for r8a66597-hcd in setup-sh7723 sh: add platform data for r8a66597-hcd in setup-sh7366 sh: x3proto: add platform data for r8a66597-hcd sh: highlander: add platform data for r8a66597-hcd sh: sh7785lcr: add platform data for r8a66597-hcd sh: turn off irqs when disabling CMT/TMU timers sh: use kzalloc() for cpg clocks sh: unbreak WARN_ON() sh: Use generic atomic64_t implementation. sh: Revised clock function in highlander sh: Update r7780mp defconfig ...
Diffstat (limited to 'arch/sh')
-rw-r--r--arch/sh/Kconfig6
-rw-r--r--arch/sh/Kconfig.debug1
-rw-r--r--arch/sh/boards/Kconfig1
-rw-r--r--arch/sh/boards/board-ap325rxa.c52
-rw-r--r--arch/sh/boards/board-sh7785lcr.c14
-rw-r--r--arch/sh/boards/board-urquell.c7
-rw-r--r--arch/sh/boards/mach-highlander/setup.c64
-rw-r--r--arch/sh/boards/mach-migor/setup.c79
-rw-r--r--arch/sh/boards/mach-rsk/devices-rsk7203.c8
-rw-r--r--arch/sh/boards/mach-se/7780/irq.c1
-rw-r--r--arch/sh/boards/mach-x3proto/setup.c12
-rw-r--r--arch/sh/configs/ap325rxa_defconfig70
-rw-r--r--arch/sh/configs/cayman_defconfig165
-rw-r--r--arch/sh/configs/dreamcast_defconfig78
-rw-r--r--arch/sh/configs/edosk7705_defconfig62
-rw-r--r--arch/sh/configs/edosk7760_defconfig79
-rw-r--r--arch/sh/configs/espt_defconfig78
-rw-r--r--arch/sh/configs/hp6xx_defconfig70
-rw-r--r--arch/sh/configs/landisk_defconfig136
-rw-r--r--arch/sh/configs/lboxre2_defconfig83
-rw-r--r--arch/sh/configs/magicpanelr2_defconfig75
-rw-r--r--arch/sh/configs/microdev_defconfig76
-rw-r--r--arch/sh/configs/migor_defconfig78
-rw-r--r--arch/sh/configs/polaris_defconfig67
-rw-r--r--arch/sh/configs/r7780mp_defconfig183
-rw-r--r--arch/sh/configs/r7785rp_defconfig89
-rw-r--r--arch/sh/configs/rsk7201_defconfig77
-rw-r--r--arch/sh/configs/rsk7203_defconfig141
-rw-r--r--arch/sh/configs/rts7751r2d1_defconfig106
-rw-r--r--arch/sh/configs/rts7751r2dplus_defconfig107
-rw-r--r--arch/sh/configs/sdk7780_defconfig88
-rw-r--r--arch/sh/configs/se7206_defconfig93
-rw-r--r--arch/sh/configs/se7343_defconfig219
-rw-r--r--arch/sh/configs/se7619_defconfig70
-rw-r--r--arch/sh/configs/se7705_defconfig74
-rw-r--r--arch/sh/configs/se7712_defconfig78
-rw-r--r--arch/sh/configs/se7721_defconfig87
-rw-r--r--arch/sh/configs/se7722_defconfig80
-rw-r--r--arch/sh/configs/se7724_defconfig71
-rw-r--r--arch/sh/configs/se7750_defconfig80
-rw-r--r--arch/sh/configs/se7751_defconfig75
-rw-r--r--arch/sh/configs/se7780_defconfig90
-rw-r--r--arch/sh/configs/sh03_defconfig90
-rw-r--r--arch/sh/configs/sh7710voipgw_defconfig75
-rw-r--r--arch/sh/configs/sh7724_generic_defconfig72
-rw-r--r--arch/sh/configs/sh7763rdp_defconfig84
-rw-r--r--arch/sh/configs/sh7770_generic_defconfig66
-rw-r--r--arch/sh/configs/sh7785lcr_32bit_defconfig85
-rw-r--r--arch/sh/configs/sh7785lcr_defconfig85
-rw-r--r--arch/sh/configs/shmin_defconfig74
-rw-r--r--arch/sh/configs/shx3_defconfig125
-rw-r--r--arch/sh/configs/snapgear_defconfig76
-rw-r--r--arch/sh/configs/systemh_defconfig66
-rw-r--r--arch/sh/configs/titan_defconfig91
-rw-r--r--arch/sh/configs/ul2_defconfig79
-rw-r--r--arch/sh/configs/urquell_defconfig584
-rw-r--r--arch/sh/drivers/pci/Makefile2
-rw-r--r--arch/sh/drivers/pci/ops-dreamcast.c1
-rw-r--r--arch/sh/drivers/pci/ops-sh7786.c134
-rw-r--r--arch/sh/drivers/pci/pci.c14
-rw-r--r--arch/sh/drivers/pci/pcie-sh7786.c355
-rw-r--r--arch/sh/drivers/pci/pcie-sh7786.h589
-rw-r--r--arch/sh/include/asm/atomic-irq.h24
-rw-r--r--arch/sh/include/asm/atomic.h2
-rw-r--r--arch/sh/include/asm/checksum.h2
-rw-r--r--arch/sh/include/asm/checksum_64.h78
-rw-r--r--arch/sh/include/asm/current.h21
-rw-r--r--arch/sh/include/asm/dma.h10
-rw-r--r--arch/sh/include/asm/ipcbuf.h30
-rw-r--r--arch/sh/include/asm/irq.h2
-rw-r--r--arch/sh/include/asm/mman.h18
-rw-r--r--arch/sh/include/asm/mmu_context.h22
-rw-r--r--arch/sh/include/asm/module.h12
-rw-r--r--arch/sh/include/asm/msgbuf.h32
-rw-r--r--arch/sh/include/asm/param.h23
-rw-r--r--arch/sh/include/asm/parport.h17
-rw-r--r--arch/sh/include/asm/perf_counter.h7
-rw-r--r--arch/sh/include/asm/posix_types_32.h119
-rw-r--r--arch/sh/include/asm/posix_types_64.h127
-rw-r--r--arch/sh/include/asm/scatterlist.h24
-rw-r--r--arch/sh/include/asm/sembuf.h26
-rw-r--r--arch/sh/include/asm/serial.h20
-rw-r--r--arch/sh/include/asm/setup.h2
-rw-r--r--arch/sh/include/asm/shmbuf.h43
-rw-r--r--arch/sh/include/asm/signal.h147
-rw-r--r--arch/sh/include/asm/smp.h3
-rw-r--r--arch/sh/include/asm/socket.h61
-rw-r--r--arch/sh/include/asm/swab.h3
-rw-r--r--arch/sh/include/asm/termbits.h199
-rw-r--r--arch/sh/include/asm/termios.h91
-rw-r--r--arch/sh/include/asm/timex.h7
-rw-r--r--arch/sh/include/asm/topology.h3
-rw-r--r--arch/sh/include/asm/types.h16
-rw-r--r--arch/sh/include/asm/ucontext.h13
-rw-r--r--arch/sh/include/asm/unaligned.h14
-rw-r--r--arch/sh/include/asm/unistd_32.h3
-rw-r--r--arch/sh/include/asm/unistd_64.h3
-rw-r--r--arch/sh/include/mach-common/mach/highlander.h3
-rw-r--r--arch/sh/kernel/cpu/clock-cpg.c16
-rw-r--r--arch/sh/kernel/cpu/sh4a/setup-sh7366.c10
-rw-r--r--arch/sh/kernel/cpu/sh4a/setup-sh7723.c9
-rw-r--r--arch/sh/kernel/cpu/sh4a/smp-shx3.c5
-rw-r--r--arch/sh/kernel/ftrace.c60
-rw-r--r--arch/sh/kernel/process_32.c2
-rw-r--r--arch/sh/kernel/process_64.c7
-rw-r--r--arch/sh/kernel/sh_ksyms_64.c7
-rw-r--r--arch/sh/kernel/signal_32.c4
-rw-r--r--arch/sh/kernel/smp.c10
-rw-r--r--arch/sh/kernel/sys_sh.c2
-rw-r--r--arch/sh/kernel/syscalls_32.S1
-rw-r--r--arch/sh/kernel/syscalls_64.S1
-rw-r--r--arch/sh/kernel/time.c27
-rw-r--r--arch/sh/kernel/traps.c1
-rw-r--r--arch/sh/lib64/Makefile2
-rw-r--r--arch/sh/lib64/c-checksum.c214
-rw-r--r--arch/sh/mm/fault_32.c4
116 files changed, 3805 insertions, 3721 deletions
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index 586cd045e2db..ac1c620d1c7d 100644
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -15,7 +15,9 @@ config SUPERH
15 select HAVE_IOREMAP_PROT if MMU 15 select HAVE_IOREMAP_PROT if MMU
16 select HAVE_ARCH_TRACEHOOK 16 select HAVE_ARCH_TRACEHOOK
17 select HAVE_DMA_API_DEBUG 17 select HAVE_DMA_API_DEBUG
18 select HAVE_PERF_COUNTER
18 select RTC_LIB 19 select RTC_LIB
20 select GENERIC_ATOMIC64
19 help 21 help
20 The SuperH is a RISC processor targeted for use in embedded systems 22 The SuperH is a RISC processor targeted for use in embedded systems
21 and consumer electronics; it was also used in the Sega Dreamcast 23 and consumer electronics; it was also used in the Sega Dreamcast
@@ -50,6 +52,10 @@ config GENERIC_BUG
50 def_bool y 52 def_bool y
51 depends on BUG && SUPERH32 53 depends on BUG && SUPERH32
52 54
55config GENERIC_CSUM
56 def_bool y
57 depends on SUPERH64
58
53config GENERIC_FIND_NEXT_BIT 59config GENERIC_FIND_NEXT_BIT
54 def_bool y 60 def_bool y
55 61
diff --git a/arch/sh/Kconfig.debug b/arch/sh/Kconfig.debug
index 8179cc9be9a4..8ece0b5bd028 100644
--- a/arch/sh/Kconfig.debug
+++ b/arch/sh/Kconfig.debug
@@ -39,6 +39,7 @@ config EARLY_SCIF_CONSOLE_PORT
39 CPU_SUBTYPE_SH7722 || CPU_SUBTYPE_SH7366 || \ 39 CPU_SUBTYPE_SH7722 || CPU_SUBTYPE_SH7366 || \
40 CPU_SUBTYPE_SH7343 40 CPU_SUBTYPE_SH7343
41 default "0xffea0000" if CPU_SUBTYPE_SH7785 41 default "0xffea0000" if CPU_SUBTYPE_SH7785
42 default "0xffeb0000" if CPU_SUBTYPE_SH7786
42 default "0xfffe8000" if CPU_SUBTYPE_SH7203 43 default "0xfffe8000" if CPU_SUBTYPE_SH7203
43 default "0xfffe9800" if CPU_SUBTYPE_SH7206 || CPU_SUBTYPE_SH7263 44 default "0xfffe9800" if CPU_SUBTYPE_SH7206 || CPU_SUBTYPE_SH7263
44 default "0xffe80000" if CPU_SH4 45 default "0xffe80000" if CPU_SH4
diff --git a/arch/sh/boards/Kconfig b/arch/sh/boards/Kconfig
index 1c91b1f565d5..2b1af0eefa6a 100644
--- a/arch/sh/boards/Kconfig
+++ b/arch/sh/boards/Kconfig
@@ -175,6 +175,7 @@ config SH_URQUELL
175 bool "Urquell" 175 bool "Urquell"
176 depends on CPU_SUBTYPE_SH7786 176 depends on CPU_SUBTYPE_SH7786
177 select ARCH_REQUIRE_GPIOLIB 177 select ARCH_REQUIRE_GPIOLIB
178 select SYS_SUPPORTS_PCI
178 179
179config SH_MIGOR 180config SH_MIGOR
180 bool "Migo-R" 181 bool "Migo-R"
diff --git a/arch/sh/boards/board-ap325rxa.c b/arch/sh/boards/board-ap325rxa.c
index 1c4d83ef2a47..7ffd1b4315bd 100644
--- a/arch/sh/boards/board-ap325rxa.c
+++ b/arch/sh/boards/board-ap325rxa.c
@@ -349,15 +349,6 @@ static int ov7725_power(struct device *dev, int mode)
349 return 0; 349 return 0;
350} 350}
351 351
352static struct ov772x_camera_info ov7725_info = {
353 .buswidth = SOCAM_DATAWIDTH_8,
354 .flags = OV772X_FLAG_VFLIP | OV772X_FLAG_HFLIP,
355 .edgectrl = OV772X_AUTO_EDGECTRL(0xf, 0),
356 .link = {
357 .power = ov7725_power,
358 },
359};
360
361static struct sh_mobile_ceu_info sh_mobile_ceu_info = { 352static struct sh_mobile_ceu_info sh_mobile_ceu_info = {
362 .flags = SH_CEU_FLAG_USE_8BIT_BUS, 353 .flags = SH_CEU_FLAG_USE_8BIT_BUS,
363}; 354};
@@ -402,25 +393,48 @@ static struct platform_device sdcard_cn3_device = {
402 }, 393 },
403}; 394};
404 395
405static struct platform_device *ap325rxa_devices[] __initdata = {
406 &smsc9118_device,
407 &ap325rxa_nor_flash_device,
408 &lcdc_device,
409 &ceu_device,
410 &nand_flash_device,
411 &sdcard_cn3_device,
412};
413
414static struct i2c_board_info __initdata ap325rxa_i2c_devices[] = { 396static struct i2c_board_info __initdata ap325rxa_i2c_devices[] = {
415 { 397 {
416 I2C_BOARD_INFO("pcf8563", 0x51), 398 I2C_BOARD_INFO("pcf8563", 0x51),
417 }, 399 },
400};
401
402static struct i2c_board_info ap325rxa_i2c_camera[] = {
418 { 403 {
419 I2C_BOARD_INFO("ov772x", 0x21), 404 I2C_BOARD_INFO("ov772x", 0x21),
420 .platform_data = &ov7725_info,
421 }, 405 },
422}; 406};
423 407
408static struct ov772x_camera_info ov7725_info = {
409 .buswidth = SOCAM_DATAWIDTH_8,
410 .flags = OV772X_FLAG_VFLIP | OV772X_FLAG_HFLIP,
411 .edgectrl = OV772X_AUTO_EDGECTRL(0xf, 0),
412 .link = {
413 .power = ov7725_power,
414 .board_info = &ap325rxa_i2c_camera[0],
415 .i2c_adapter_id = 0,
416 .module_name = "ov772x",
417 },
418};
419
420static struct platform_device ap325rxa_camera = {
421 .name = "soc-camera-pdrv",
422 .id = 0,
423 .dev = {
424 .platform_data = &ov7725_info.link,
425 },
426};
427
428static struct platform_device *ap325rxa_devices[] __initdata = {
429 &smsc9118_device,
430 &ap325rxa_nor_flash_device,
431 &lcdc_device,
432 &ceu_device,
433 &nand_flash_device,
434 &sdcard_cn3_device,
435 &ap325rxa_camera,
436};
437
424static struct spi_board_info ap325rxa_spi_devices[] = { 438static struct spi_board_info ap325rxa_spi_devices[] = {
425 { 439 {
426 .modalias = "mmc_spi", 440 .modalias = "mmc_spi",
diff --git a/arch/sh/boards/board-sh7785lcr.c b/arch/sh/boards/board-sh7785lcr.c
index 7be56fb06c1f..42410a15d255 100644
--- a/arch/sh/boards/board-sh7785lcr.c
+++ b/arch/sh/boards/board-sh7785lcr.c
@@ -15,16 +15,18 @@
15#include <linux/fb.h> 15#include <linux/fb.h>
16#include <linux/mtd/physmap.h> 16#include <linux/mtd/physmap.h>
17#include <linux/delay.h> 17#include <linux/delay.h>
18#include <linux/interrupt.h>
18#include <linux/i2c.h> 19#include <linux/i2c.h>
19#include <linux/i2c-pca-platform.h> 20#include <linux/i2c-pca-platform.h>
20#include <linux/i2c-algo-pca.h> 21#include <linux/i2c-algo-pca.h>
22#include <linux/usb/r8a66597.h>
21#include <linux/irq.h> 23#include <linux/irq.h>
22#include <linux/clk.h> 24#include <linux/clk.h>
23#include <linux/errno.h> 25#include <linux/errno.h>
24#include <mach/sh7785lcr.h> 26#include <mach/sh7785lcr.h>
27#include <cpu/sh7785.h>
25#include <asm/heartbeat.h> 28#include <asm/heartbeat.h>
26#include <asm/clock.h> 29#include <asm/clock.h>
27#include <cpu/sh7785.h>
28 30
29/* 31/*
30 * NOTE: This board has 2 physical memory maps. 32 * NOTE: This board has 2 physical memory maps.
@@ -98,18 +100,21 @@ static struct platform_device nor_flash_device = {
98 .resource = nor_flash_resources, 100 .resource = nor_flash_resources,
99}; 101};
100 102
103static struct r8a66597_platdata r8a66597_data = {
104 .xtal = R8A66597_PLATDATA_XTAL_12MHZ,
105 .vif = 1,
106};
107
101static struct resource r8a66597_usb_host_resources[] = { 108static struct resource r8a66597_usb_host_resources[] = {
102 [0] = { 109 [0] = {
103 .name = "r8a66597_hcd",
104 .start = R8A66597_ADDR, 110 .start = R8A66597_ADDR,
105 .end = R8A66597_ADDR + R8A66597_SIZE - 1, 111 .end = R8A66597_ADDR + R8A66597_SIZE - 1,
106 .flags = IORESOURCE_MEM, 112 .flags = IORESOURCE_MEM,
107 }, 113 },
108 [1] = { 114 [1] = {
109 .name = "r8a66597_hcd",
110 .start = 2, 115 .start = 2,
111 .end = 2, 116 .end = 2,
112 .flags = IORESOURCE_IRQ, 117 .flags = IORESOURCE_IRQ | IRQF_TRIGGER_LOW,
113 }, 118 },
114}; 119};
115 120
@@ -119,6 +124,7 @@ static struct platform_device r8a66597_usb_host_device = {
119 .dev = { 124 .dev = {
120 .dma_mask = NULL, 125 .dma_mask = NULL,
121 .coherent_dma_mask = 0xffffffff, 126 .coherent_dma_mask = 0xffffffff,
127 .platform_data = &r8a66597_data,
122 }, 128 },
123 .num_resources = ARRAY_SIZE(r8a66597_usb_host_resources), 129 .num_resources = ARRAY_SIZE(r8a66597_usb_host_resources),
124 .resource = r8a66597_usb_host_resources, 130 .resource = r8a66597_usb_host_resources,
diff --git a/arch/sh/boards/board-urquell.c b/arch/sh/boards/board-urquell.c
index beb88c4da2c1..36b8bac9b124 100644
--- a/arch/sh/boards/board-urquell.c
+++ b/arch/sh/boards/board-urquell.c
@@ -2,6 +2,7 @@
2 * Renesas Technology Corp. SH7786 Urquell Support. 2 * Renesas Technology Corp. SH7786 Urquell Support.
3 * 3 *
4 * Copyright (C) 2008 Kuninori Morimoto <morimoto.kuninori@renesas.com> 4 * Copyright (C) 2008 Kuninori Morimoto <morimoto.kuninori@renesas.com>
5 * Copyright (C) 2009 Paul Mundt
5 * 6 *
6 * Based on board-sh7785lcr.c 7 * Based on board-sh7785lcr.c
7 * Copyright (C) 2008 Yoshihiro Shimoda 8 * Copyright (C) 2008 Yoshihiro Shimoda
@@ -178,6 +179,11 @@ static void __init urquell_init_irq(void)
178 plat_irq_setup_pins(IRQ_MODE_IRL3210_MASK); 179 plat_irq_setup_pins(IRQ_MODE_IRL3210_MASK);
179} 180}
180 181
182static int urquell_mode_pins(void)
183{
184 return __raw_readw(UBOARDREG(MDSWMR));
185}
186
181/* Initialize the board */ 187/* Initialize the board */
182static void __init urquell_setup(char **cmdline_p) 188static void __init urquell_setup(char **cmdline_p)
183{ 189{
@@ -193,4 +199,5 @@ static struct sh_machine_vector mv_urquell __initmv = {
193 .mv_name = "Urquell", 199 .mv_name = "Urquell",
194 .mv_setup = urquell_setup, 200 .mv_setup = urquell_setup,
195 .mv_init_irq = urquell_init_irq, 201 .mv_init_irq = urquell_init_irq,
202 .mv_mode_pins = urquell_mode_pins,
196}; 203};
diff --git a/arch/sh/boards/mach-highlander/setup.c b/arch/sh/boards/mach-highlander/setup.c
index 20fe72c515d5..1639f8915000 100644
--- a/arch/sh/boards/mach-highlander/setup.c
+++ b/arch/sh/boards/mach-highlander/setup.c
@@ -17,8 +17,11 @@
17#include <linux/platform_device.h> 17#include <linux/platform_device.h>
18#include <linux/ata_platform.h> 18#include <linux/ata_platform.h>
19#include <linux/types.h> 19#include <linux/types.h>
20#include <linux/mtd/physmap.h>
20#include <linux/i2c.h> 21#include <linux/i2c.h>
21#include <linux/irq.h> 22#include <linux/irq.h>
23#include <linux/interrupt.h>
24#include <linux/usb/r8a66597.h>
22#include <net/ax88796.h> 25#include <net/ax88796.h>
23#include <asm/machvec.h> 26#include <asm/machvec.h>
24#include <mach/highlander.h> 27#include <mach/highlander.h>
@@ -27,18 +30,21 @@
27#include <asm/io.h> 30#include <asm/io.h>
28#include <asm/io_trapped.h> 31#include <asm/io_trapped.h>
29 32
33static struct r8a66597_platdata r8a66597_data = {
34 .xtal = R8A66597_PLATDATA_XTAL_12MHZ,
35 .vif = 1,
36};
37
30static struct resource r8a66597_usb_host_resources[] = { 38static struct resource r8a66597_usb_host_resources[] = {
31 [0] = { 39 [0] = {
32 .name = "r8a66597_hcd",
33 .start = 0xA4200000, 40 .start = 0xA4200000,
34 .end = 0xA42000FF, 41 .end = 0xA42000FF,
35 .flags = IORESOURCE_MEM, 42 .flags = IORESOURCE_MEM,
36 }, 43 },
37 [1] = { 44 [1] = {
38 .name = "r8a66597_hcd",
39 .start = IRQ_EXT1, /* irq number */ 45 .start = IRQ_EXT1, /* irq number */
40 .end = IRQ_EXT1, 46 .end = IRQ_EXT1,
41 .flags = IORESOURCE_IRQ, 47 .flags = IORESOURCE_IRQ | IRQF_TRIGGER_LOW,
42 }, 48 },
43}; 49};
44 50
@@ -48,6 +54,7 @@ static struct platform_device r8a66597_usb_host_device = {
48 .dev = { 54 .dev = {
49 .dma_mask = NULL, /* don't use dma */ 55 .dma_mask = NULL, /* don't use dma */
50 .coherent_dma_mask = 0xffffffff, 56 .coherent_dma_mask = 0xffffffff,
57 .platform_data = &r8a66597_data,
51 }, 58 },
52 .num_resources = ARRAY_SIZE(r8a66597_usb_host_resources), 59 .num_resources = ARRAY_SIZE(r8a66597_usb_host_resources),
53 .resource = r8a66597_usb_host_resources, 60 .resource = r8a66597_usb_host_resources,
@@ -178,6 +185,53 @@ static struct platform_device ax88796_device = {
178 .resource = ax88796_resources, 185 .resource = ax88796_resources,
179}; 186};
180 187
188static struct mtd_partition nor_flash_partitions[] = {
189 {
190 .name = "loader",
191 .offset = 0x00000000,
192 .size = 512 * 1024,
193 },
194 {
195 .name = "bootenv",
196 .offset = MTDPART_OFS_APPEND,
197 .size = 512 * 1024,
198 },
199 {
200 .name = "kernel",
201 .offset = MTDPART_OFS_APPEND,
202 .size = 4 * 1024 * 1024,
203 },
204 {
205 .name = "data",
206 .offset = MTDPART_OFS_APPEND,
207 .size = MTDPART_SIZ_FULL,
208 },
209};
210
211static struct physmap_flash_data nor_flash_data = {
212 .width = 4,
213 .parts = nor_flash_partitions,
214 .nr_parts = ARRAY_SIZE(nor_flash_partitions),
215};
216
217/* This config is flash board for mass production. */
218static struct resource nor_flash_resources[] = {
219 [0] = {
220 .start = PA_NORFLASH_ADDR,
221 .end = PA_NORFLASH_ADDR + PA_NORFLASH_SIZE - 1,
222 .flags = IORESOURCE_MEM,
223 }
224};
225
226static struct platform_device nor_flash_device = {
227 .name = "physmap-flash",
228 .dev = {
229 .platform_data = &nor_flash_data,
230 },
231 .num_resources = ARRAY_SIZE(nor_flash_resources),
232 .resource = nor_flash_resources,
233};
234
181static struct resource smbus_resources[] = { 235static struct resource smbus_resources[] = {
182 [0] = { 236 [0] = {
183 .start = PA_SMCR, 237 .start = PA_SMCR,
@@ -209,6 +263,7 @@ static struct platform_device *r7780rp_devices[] __initdata = {
209 &m66592_usb_peripheral_device, 263 &m66592_usb_peripheral_device,
210 &heartbeat_device, 264 &heartbeat_device,
211 &smbus_device, 265 &smbus_device,
266 &nor_flash_device,
212#ifndef CONFIG_SH_R7780RP 267#ifndef CONFIG_SH_R7780RP
213 &ax88796_device, 268 &ax88796_device,
214#endif 269#endif
@@ -247,9 +302,10 @@ device_initcall(r7780rp_devices_setup);
247/* 302/*
248 * Platform specific clocks 303 * Platform specific clocks
249 */ 304 */
250static void ivdr_clk_enable(struct clk *clk) 305static int ivdr_clk_enable(struct clk *clk)
251{ 306{
252 ctrl_outw(ctrl_inw(PA_IVDRCTL) | (1 << IVDR_CK_ON), PA_IVDRCTL); 307 ctrl_outw(ctrl_inw(PA_IVDRCTL) | (1 << IVDR_CK_ON), PA_IVDRCTL);
308 return 0;
253} 309}
254 310
255static void ivdr_clk_disable(struct clk *clk) 311static void ivdr_clk_disable(struct clk *clk)
diff --git a/arch/sh/boards/mach-migor/setup.c b/arch/sh/boards/mach-migor/setup.c
index 6ed401cd3156..f70f4644deb4 100644
--- a/arch/sh/boards/mach-migor/setup.c
+++ b/arch/sh/boards/mach-migor/setup.c
@@ -381,21 +381,6 @@ static struct platform_device migor_ceu_device = {
381 }, 381 },
382}; 382};
383 383
384static struct ov772x_camera_info ov7725_info = {
385 .buswidth = SOCAM_DATAWIDTH_8,
386 .link = {
387 .power = ov7725_power,
388 },
389};
390
391static struct tw9910_video_info tw9910_info = {
392 .buswidth = SOCAM_DATAWIDTH_8,
393 .mpout = TW9910_MPO_FIELD,
394 .link = {
395 .power = tw9910_power,
396 }
397};
398
399struct spi_gpio_platform_data sdcard_cn9_platform_data = { 384struct spi_gpio_platform_data sdcard_cn9_platform_data = {
400 .sck = GPIO_PTD0, 385 .sck = GPIO_PTD0,
401 .mosi = GPIO_PTD1, 386 .mosi = GPIO_PTD1,
@@ -410,16 +395,6 @@ static struct platform_device sdcard_cn9_device = {
410 }, 395 },
411}; 396};
412 397
413static struct platform_device *migor_devices[] __initdata = {
414 &smc91x_eth_device,
415 &sh_keysc_device,
416 &migor_lcdc_device,
417 &migor_ceu_device,
418 &migor_nor_flash_device,
419 &migor_nand_flash_device,
420 &sdcard_cn9_device,
421};
422
423static struct i2c_board_info migor_i2c_devices[] = { 398static struct i2c_board_info migor_i2c_devices[] = {
424 { 399 {
425 I2C_BOARD_INFO("rs5c372b", 0x32), 400 I2C_BOARD_INFO("rs5c372b", 0x32),
@@ -428,16 +403,66 @@ static struct i2c_board_info migor_i2c_devices[] = {
428 I2C_BOARD_INFO("migor_ts", 0x51), 403 I2C_BOARD_INFO("migor_ts", 0x51),
429 .irq = 38, /* IRQ6 */ 404 .irq = 38, /* IRQ6 */
430 }, 405 },
406};
407
408static struct i2c_board_info migor_i2c_camera[] = {
431 { 409 {
432 I2C_BOARD_INFO("ov772x", 0x21), 410 I2C_BOARD_INFO("ov772x", 0x21),
433 .platform_data = &ov7725_info,
434 }, 411 },
435 { 412 {
436 I2C_BOARD_INFO("tw9910", 0x45), 413 I2C_BOARD_INFO("tw9910", 0x45),
437 .platform_data = &tw9910_info,
438 }, 414 },
439}; 415};
440 416
417static struct ov772x_camera_info ov7725_info = {
418 .buswidth = SOCAM_DATAWIDTH_8,
419 .link = {
420 .power = ov7725_power,
421 .board_info = &migor_i2c_camera[0],
422 .i2c_adapter_id = 0,
423 .module_name = "ov772x",
424 },
425};
426
427static struct tw9910_video_info tw9910_info = {
428 .buswidth = SOCAM_DATAWIDTH_8,
429 .mpout = TW9910_MPO_FIELD,
430 .link = {
431 .power = tw9910_power,
432 .board_info = &migor_i2c_camera[1],
433 .i2c_adapter_id = 0,
434 .module_name = "tw9910",
435 }
436};
437
438static struct platform_device migor_camera[] = {
439 {
440 .name = "soc-camera-pdrv",
441 .id = 0,
442 .dev = {
443 .platform_data = &ov7725_info.link,
444 },
445 }, {
446 .name = "soc-camera-pdrv",
447 .id = 1,
448 .dev = {
449 .platform_data = &tw9910_info.link,
450 },
451 },
452};
453
454static struct platform_device *migor_devices[] __initdata = {
455 &smc91x_eth_device,
456 &sh_keysc_device,
457 &migor_lcdc_device,
458 &migor_ceu_device,
459 &migor_nor_flash_device,
460 &migor_nand_flash_device,
461 &sdcard_cn9_device,
462 &migor_camera[0],
463 &migor_camera[1],
464};
465
441static struct spi_board_info migor_spi_devices[] = { 466static struct spi_board_info migor_spi_devices[] = {
442 { 467 {
443 .modalias = "mmc_spi", 468 .modalias = "mmc_spi",
diff --git a/arch/sh/boards/mach-rsk/devices-rsk7203.c b/arch/sh/boards/mach-rsk/devices-rsk7203.c
index d8a65ea91665..4af3a771c058 100644
--- a/arch/sh/boards/mach-rsk/devices-rsk7203.c
+++ b/arch/sh/boards/mach-rsk/devices-rsk7203.c
@@ -26,13 +26,13 @@ static struct smsc911x_platform_config smsc911x_config = {
26 .phy_interface = PHY_INTERFACE_MODE_MII, 26 .phy_interface = PHY_INTERFACE_MODE_MII,
27 .irq_polarity = SMSC911X_IRQ_POLARITY_ACTIVE_LOW, 27 .irq_polarity = SMSC911X_IRQ_POLARITY_ACTIVE_LOW,
28 .irq_type = SMSC911X_IRQ_TYPE_OPEN_DRAIN, 28 .irq_type = SMSC911X_IRQ_TYPE_OPEN_DRAIN,
29 .flags = SMSC911X_USE_16BIT, 29 .flags = SMSC911X_USE_32BIT | SMSC911X_SWAP_FIFO,
30}; 30};
31 31
32static struct resource smsc911x_resources[] = { 32static struct resource smsc911x_resources[] = {
33 [0] = { 33 [0] = {
34 .start = 0x24000000, 34 .start = 0x24000000,
35 .end = 0x24000000 + 0x100, 35 .end = 0x240000ff,
36 .flags = IORESOURCE_MEM, 36 .flags = IORESOURCE_MEM,
37 }, 37 },
38 [1] = { 38 [1] = {
@@ -99,6 +99,10 @@ static int __init rsk7203_devices_setup(void)
99 gpio_request(GPIO_FN_TXD0, NULL); 99 gpio_request(GPIO_FN_TXD0, NULL);
100 gpio_request(GPIO_FN_RXD0, NULL); 100 gpio_request(GPIO_FN_RXD0, NULL);
101 101
102 /* Setup LAN9118: CS1 in 16-bit Big Endian Mode, IRQ0 at Port B */
103 ctrl_outl(0x36db0400, 0xfffc0008); /* CS1BCR */
104 gpio_request(GPIO_FN_IRQ0_PB, NULL);
105
102 return platform_add_devices(rsk7203_devices, 106 return platform_add_devices(rsk7203_devices,
103 ARRAY_SIZE(rsk7203_devices)); 107 ARRAY_SIZE(rsk7203_devices));
104} 108}
diff --git a/arch/sh/boards/mach-se/7780/irq.c b/arch/sh/boards/mach-se/7780/irq.c
index b8d43b638fcf..121744c08714 100644
--- a/arch/sh/boards/mach-se/7780/irq.c
+++ b/arch/sh/boards/mach-se/7780/irq.c
@@ -12,7 +12,6 @@
12#include <linux/init.h> 12#include <linux/init.h>
13#include <linux/irq.h> 13#include <linux/irq.h>
14#include <linux/interrupt.h> 14#include <linux/interrupt.h>
15#include <linux/irq.h>
16#include <linux/io.h> 15#include <linux/io.h>
17#include <mach-se/mach/se7780.h> 16#include <mach-se/mach/se7780.h>
18 17
diff --git a/arch/sh/boards/mach-x3proto/setup.c b/arch/sh/boards/mach-x3proto/setup.c
index a340492087fa..8913ae39a802 100644
--- a/arch/sh/boards/mach-x3proto/setup.c
+++ b/arch/sh/boards/mach-x3proto/setup.c
@@ -15,6 +15,8 @@
15#include <linux/io.h> 15#include <linux/io.h>
16#include <linux/smc91x.h> 16#include <linux/smc91x.h>
17#include <linux/irq.h> 17#include <linux/irq.h>
18#include <linux/interrupt.h>
19#include <linux/usb/r8a66597.h>
18#include <asm/ilsel.h> 20#include <asm/ilsel.h>
19 21
20static struct resource heartbeat_resources[] = { 22static struct resource heartbeat_resources[] = {
@@ -58,17 +60,20 @@ static struct platform_device smc91x_device = {
58 }, 60 },
59}; 61};
60 62
63static struct r8a66597_platdata r8a66597_data = {
64 .xtal = R8A66597_PLATDATA_XTAL_12MHZ,
65 .vif = 1,
66};
67
61static struct resource r8a66597_usb_host_resources[] = { 68static struct resource r8a66597_usb_host_resources[] = {
62 [0] = { 69 [0] = {
63 .name = "r8a66597_hcd",
64 .start = 0x18040000, 70 .start = 0x18040000,
65 .end = 0x18080000 - 1, 71 .end = 0x18080000 - 1,
66 .flags = IORESOURCE_MEM, 72 .flags = IORESOURCE_MEM,
67 }, 73 },
68 [1] = { 74 [1] = {
69 .name = "r8a66597_hcd",
70 /* Filled in by ilsel */ 75 /* Filled in by ilsel */
71 .flags = IORESOURCE_IRQ, 76 .flags = IORESOURCE_IRQ | IRQF_TRIGGER_LOW,
72 }, 77 },
73}; 78};
74 79
@@ -78,6 +83,7 @@ static struct platform_device r8a66597_usb_host_device = {
78 .dev = { 83 .dev = {
79 .dma_mask = NULL, /* don't use dma */ 84 .dma_mask = NULL, /* don't use dma */
80 .coherent_dma_mask = 0xffffffff, 85 .coherent_dma_mask = 0xffffffff,
86 .platform_data = &r8a66597_data,
81 }, 87 },
82 .num_resources = ARRAY_SIZE(r8a66597_usb_host_resources), 88 .num_resources = ARRAY_SIZE(r8a66597_usb_host_resources),
83 .resource = r8a66597_usb_host_resources, 89 .resource = r8a66597_usb_host_resources,
diff --git a/arch/sh/configs/ap325rxa_defconfig b/arch/sh/configs/ap325rxa_defconfig
index 022f70e0ea03..6c38a43594fc 100644
--- a/arch/sh/configs/ap325rxa_defconfig
+++ b/arch/sh/configs/ap325rxa_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.30-rc3 3# Linux kernel version: 2.6.30
4# Mon Apr 27 12:42:06 2009 4# Thu Jun 18 16:04:11 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -20,6 +20,7 @@ CONFIG_GENERIC_CLOCKEVENTS=y
20CONFIG_ARCH_SUSPEND_POSSIBLE=y 20CONFIG_ARCH_SUSPEND_POSSIBLE=y
21CONFIG_ARCH_HIBERNATION_POSSIBLE=y 21CONFIG_ARCH_HIBERNATION_POSSIBLE=y
22CONFIG_SYS_SUPPORTS_CMT=y 22CONFIG_SYS_SUPPORTS_CMT=y
23CONFIG_SYS_SUPPORTS_TMU=y
23CONFIG_STACKTRACE_SUPPORT=y 24CONFIG_STACKTRACE_SUPPORT=y
24CONFIG_LOCKDEP_SUPPORT=y 25CONFIG_LOCKDEP_SUPPORT=y
25CONFIG_HAVE_LATENCYTOP_SUPPORT=y 26CONFIG_HAVE_LATENCYTOP_SUPPORT=y
@@ -75,7 +76,6 @@ CONFIG_EMBEDDED=y
75CONFIG_UID16=y 76CONFIG_UID16=y
76CONFIG_SYSCTL_SYSCALL=y 77CONFIG_SYSCTL_SYSCALL=y
77# CONFIG_KALLSYMS is not set 78# CONFIG_KALLSYMS is not set
78# CONFIG_STRIP_ASM_SYMS is not set
79CONFIG_HOTPLUG=y 79CONFIG_HOTPLUG=y
80CONFIG_PRINTK=y 80CONFIG_PRINTK=y
81CONFIG_BUG=y 81CONFIG_BUG=y
@@ -88,7 +88,12 @@ CONFIG_TIMERFD=y
88CONFIG_EVENTFD=y 88CONFIG_EVENTFD=y
89CONFIG_SHMEM=y 89CONFIG_SHMEM=y
90CONFIG_AIO=y 90CONFIG_AIO=y
91
92#
93# Performance Counters
94#
91CONFIG_VM_EVENT_COUNTERS=y 95CONFIG_VM_EVENT_COUNTERS=y
96# CONFIG_STRIP_ASM_SYMS is not set
92CONFIG_COMPAT_BRK=y 97CONFIG_COMPAT_BRK=y
93CONFIG_SLAB=y 98CONFIG_SLAB=y
94# CONFIG_SLUB is not set 99# CONFIG_SLUB is not set
@@ -180,6 +185,7 @@ CONFIG_CPU_SUBTYPE_SH7723=y
180CONFIG_QUICKLIST=y 185CONFIG_QUICKLIST=y
181CONFIG_MMU=y 186CONFIG_MMU=y
182CONFIG_PAGE_OFFSET=0x80000000 187CONFIG_PAGE_OFFSET=0x80000000
188CONFIG_FORCE_MAX_ZONEORDER=11
183CONFIG_MEMORY_START=0x08000000 189CONFIG_MEMORY_START=0x08000000
184CONFIG_MEMORY_SIZE=0x08000000 190CONFIG_MEMORY_SIZE=0x08000000
185CONFIG_29BIT=y 191CONFIG_29BIT=y
@@ -195,7 +201,6 @@ CONFIG_PAGE_SIZE_4KB=y
195# CONFIG_PAGE_SIZE_8KB is not set 201# CONFIG_PAGE_SIZE_8KB is not set
196# CONFIG_PAGE_SIZE_16KB is not set 202# CONFIG_PAGE_SIZE_16KB is not set
197# CONFIG_PAGE_SIZE_64KB is not set 203# CONFIG_PAGE_SIZE_64KB is not set
198CONFIG_ENTRY_OFFSET=0x00001000
199CONFIG_SELECT_MEMORY_MODEL=y 204CONFIG_SELECT_MEMORY_MODEL=y
200CONFIG_FLATMEM_MANUAL=y 205CONFIG_FLATMEM_MANUAL=y
201# CONFIG_DISCONTIGMEM_MANUAL is not set 206# CONFIG_DISCONTIGMEM_MANUAL is not set
@@ -208,9 +213,9 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
208# CONFIG_PHYS_ADDR_T_64BIT is not set 213# CONFIG_PHYS_ADDR_T_64BIT is not set
209CONFIG_ZONE_DMA_FLAG=0 214CONFIG_ZONE_DMA_FLAG=0
210CONFIG_NR_QUICK=2 215CONFIG_NR_QUICK=2
211CONFIG_UNEVICTABLE_LRU=y
212CONFIG_HAVE_MLOCK=y 216CONFIG_HAVE_MLOCK=y
213CONFIG_HAVE_MLOCKED_PAGE_BIT=y 217CONFIG_HAVE_MLOCKED_PAGE_BIT=y
218CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
214 219
215# 220#
216# Cache configuration 221# Cache configuration
@@ -228,7 +233,6 @@ CONFIG_SH_FPU=y
228# CONFIG_SH_STORE_QUEUES is not set 233# CONFIG_SH_STORE_QUEUES is not set
229CONFIG_CPU_HAS_INTEVT=y 234CONFIG_CPU_HAS_INTEVT=y
230CONFIG_CPU_HAS_SR_RB=y 235CONFIG_CPU_HAS_SR_RB=y
231CONFIG_CPU_HAS_PTEA=y
232CONFIG_CPU_HAS_FPU=y 236CONFIG_CPU_HAS_FPU=y
233 237
234# 238#
@@ -239,10 +243,10 @@ CONFIG_SH_AP325RXA=y
239# 243#
240# Timer and clock configuration 244# Timer and clock configuration
241# 245#
242CONFIG_SH_TMU=y 246CONFIG_SH_TIMER_TMU=y
243# CONFIG_SH_TIMER_CMT is not set 247# CONFIG_SH_TIMER_CMT is not set
244CONFIG_SH_TIMER_IRQ=16
245CONFIG_SH_PCLK_FREQ=33333333 248CONFIG_SH_PCLK_FREQ=33333333
249CONFIG_SH_CLK_CPG=y
246CONFIG_TICK_ONESHOT=y 250CONFIG_TICK_ONESHOT=y
247# CONFIG_NO_HZ is not set 251# CONFIG_NO_HZ is not set
248CONFIG_HIGH_RES_TIMERS=y 252CONFIG_HIGH_RES_TIMERS=y
@@ -284,12 +288,14 @@ CONFIG_SECCOMP=y
284# CONFIG_PREEMPT_VOLUNTARY is not set 288# CONFIG_PREEMPT_VOLUNTARY is not set
285CONFIG_PREEMPT=y 289CONFIG_PREEMPT=y
286CONFIG_GUSA=y 290CONFIG_GUSA=y
291# CONFIG_SPARSE_IRQ is not set
287 292
288# 293#
289# Boot options 294# Boot options
290# 295#
291CONFIG_ZERO_PAGE_OFFSET=0x00001000 296CONFIG_ZERO_PAGE_OFFSET=0x00001000
292CONFIG_BOOT_LINK_OFFSET=0x00800000 297CONFIG_BOOT_LINK_OFFSET=0x00800000
298CONFIG_ENTRY_OFFSET=0x00001000
293CONFIG_CMDLINE_BOOL=y 299CONFIG_CMDLINE_BOOL=y
294CONFIG_CMDLINE="console=tty1 console=ttySC5,38400 root=/dev/nfs ip=dhcp" 300CONFIG_CMDLINE="console=tty1 console=ttySC5,38400 root=/dev/nfs ip=dhcp"
295 301
@@ -372,6 +378,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
372# CONFIG_ECONET is not set 378# CONFIG_ECONET is not set
373# CONFIG_WAN_ROUTER is not set 379# CONFIG_WAN_ROUTER is not set
374# CONFIG_PHONET is not set 380# CONFIG_PHONET is not set
381# CONFIG_IEEE802154 is not set
375# CONFIG_NET_SCHED is not set 382# CONFIG_NET_SCHED is not set
376# CONFIG_DCB is not set 383# CONFIG_DCB is not set
377 384
@@ -389,7 +396,11 @@ CONFIG_WIRELESS=y
389# CONFIG_WIRELESS_OLD_REGULATORY is not set 396# CONFIG_WIRELESS_OLD_REGULATORY is not set
390# CONFIG_WIRELESS_EXT is not set 397# CONFIG_WIRELESS_EXT is not set
391# CONFIG_LIB80211 is not set 398# CONFIG_LIB80211 is not set
392# CONFIG_MAC80211 is not set 399
400#
401# CFG80211 needs to be enabled for MAC80211
402#
403CONFIG_MAC80211_DEFAULT_PS_VALUE=0
393# CONFIG_WIMAX is not set 404# CONFIG_WIMAX is not set
394# CONFIG_RFKILL is not set 405# CONFIG_RFKILL is not set
395# CONFIG_NET_9P is not set 406# CONFIG_NET_9P is not set
@@ -532,6 +543,7 @@ CONFIG_MISC_DEVICES=y
532# CONFIG_EEPROM_AT24 is not set 543# CONFIG_EEPROM_AT24 is not set
533# CONFIG_EEPROM_AT25 is not set 544# CONFIG_EEPROM_AT25 is not set
534# CONFIG_EEPROM_LEGACY is not set 545# CONFIG_EEPROM_LEGACY is not set
546# CONFIG_EEPROM_MAX6875 is not set
535# CONFIG_EEPROM_93CX6 is not set 547# CONFIG_EEPROM_93CX6 is not set
536CONFIG_HAVE_IDE=y 548CONFIG_HAVE_IDE=y
537# CONFIG_IDE is not set 549# CONFIG_IDE is not set
@@ -555,10 +567,6 @@ CONFIG_BLK_DEV_SD=y
555# CONFIG_BLK_DEV_SR is not set 567# CONFIG_BLK_DEV_SR is not set
556# CONFIG_CHR_DEV_SG is not set 568# CONFIG_CHR_DEV_SG is not set
557# CONFIG_CHR_DEV_SCH is not set 569# CONFIG_CHR_DEV_SCH is not set
558
559#
560# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
561#
562# CONFIG_SCSI_MULTI_LUN is not set 570# CONFIG_SCSI_MULTI_LUN is not set
563# CONFIG_SCSI_CONSTANTS is not set 571# CONFIG_SCSI_CONSTANTS is not set
564# CONFIG_SCSI_LOGGING is not set 572# CONFIG_SCSI_LOGGING is not set
@@ -575,6 +583,7 @@ CONFIG_SCSI_WAIT_SCAN=m
575# CONFIG_SCSI_SRP_ATTRS is not set 583# CONFIG_SCSI_SRP_ATTRS is not set
576CONFIG_SCSI_LOWLEVEL=y 584CONFIG_SCSI_LOWLEVEL=y
577# CONFIG_ISCSI_TCP is not set 585# CONFIG_ISCSI_TCP is not set
586# CONFIG_SCSI_BNX2_ISCSI is not set
578# CONFIG_LIBFC is not set 587# CONFIG_LIBFC is not set
579# CONFIG_LIBFCOE is not set 588# CONFIG_LIBFCOE is not set
580# CONFIG_SCSI_DEBUG is not set 589# CONFIG_SCSI_DEBUG is not set
@@ -583,7 +592,6 @@ CONFIG_SCSI_LOWLEVEL=y
583# CONFIG_ATA is not set 592# CONFIG_ATA is not set
584# CONFIG_MD is not set 593# CONFIG_MD is not set
585CONFIG_NETDEVICES=y 594CONFIG_NETDEVICES=y
586CONFIG_COMPAT_NET_DEV_OPS=y
587# CONFIG_DUMMY is not set 595# CONFIG_DUMMY is not set
588# CONFIG_BONDING is not set 596# CONFIG_BONDING is not set
589# CONFIG_MACVLAN is not set 597# CONFIG_MACVLAN is not set
@@ -628,6 +636,7 @@ CONFIG_SMSC911X=y
628# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set 636# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
629# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set 637# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
630# CONFIG_B44 is not set 638# CONFIG_B44 is not set
639# CONFIG_KS8842 is not set
631# CONFIG_NETDEV_1000 is not set 640# CONFIG_NETDEV_1000 is not set
632# CONFIG_NETDEV_10000 is not set 641# CONFIG_NETDEV_10000 is not set
633 642
@@ -751,7 +760,6 @@ CONFIG_I2C_SH_MOBILE=y
751# CONFIG_SENSORS_PCF8574 is not set 760# CONFIG_SENSORS_PCF8574 is not set
752# CONFIG_PCF8575 is not set 761# CONFIG_PCF8575 is not set
753# CONFIG_SENSORS_PCA9539 is not set 762# CONFIG_SENSORS_PCA9539 is not set
754# CONFIG_SENSORS_MAX6875 is not set
755# CONFIG_SENSORS_TSL2550 is not set 763# CONFIG_SENSORS_TSL2550 is not set
756# CONFIG_I2C_DEBUG_CORE is not set 764# CONFIG_I2C_DEBUG_CORE is not set
757# CONFIG_I2C_DEBUG_ALGO is not set 765# CONFIG_I2C_DEBUG_ALGO is not set
@@ -823,10 +831,7 @@ CONFIG_SSB_POSSIBLE=y
823# CONFIG_MFD_WM8350_I2C is not set 831# CONFIG_MFD_WM8350_I2C is not set
824# CONFIG_MFD_PCF50633 is not set 832# CONFIG_MFD_PCF50633 is not set
825# CONFIG_REGULATOR is not set 833# CONFIG_REGULATOR is not set
826 834CONFIG_MEDIA_SUPPORT=y
827#
828# Multimedia devices
829#
830 835
831# 836#
832# Multimedia core support 837# Multimedia core support
@@ -1017,6 +1022,7 @@ CONFIG_RTC_DRV_PCF8563=y
1017# on-CPU RTC drivers 1022# on-CPU RTC drivers
1018# 1023#
1019# CONFIG_RTC_DRV_SH is not set 1024# CONFIG_RTC_DRV_SH is not set
1025# CONFIG_RTC_DRV_GENERIC is not set
1020# CONFIG_DMADEVICES is not set 1026# CONFIG_DMADEVICES is not set
1021# CONFIG_AUXDISPLAY is not set 1027# CONFIG_AUXDISPLAY is not set
1022CONFIG_UIO=y 1028CONFIG_UIO=y
@@ -1024,6 +1030,10 @@ CONFIG_UIO=y
1024CONFIG_UIO_PDRV_GENIRQ=y 1030CONFIG_UIO_PDRV_GENIRQ=y
1025# CONFIG_UIO_SMX is not set 1031# CONFIG_UIO_SMX is not set
1026# CONFIG_UIO_SERCOS3 is not set 1032# CONFIG_UIO_SERCOS3 is not set
1033
1034#
1035# TI VLYNQ
1036#
1027# CONFIG_STAGING is not set 1037# CONFIG_STAGING is not set
1028 1038
1029# 1039#
@@ -1045,10 +1055,11 @@ CONFIG_FS_MBCACHE=y
1045# CONFIG_REISERFS_FS is not set 1055# CONFIG_REISERFS_FS is not set
1046# CONFIG_JFS_FS is not set 1056# CONFIG_JFS_FS is not set
1047CONFIG_FS_POSIX_ACL=y 1057CONFIG_FS_POSIX_ACL=y
1048CONFIG_FILE_LOCKING=y
1049# CONFIG_XFS_FS is not set 1058# CONFIG_XFS_FS is not set
1050# CONFIG_OCFS2_FS is not set 1059# CONFIG_OCFS2_FS is not set
1051# CONFIG_BTRFS_FS is not set 1060# CONFIG_BTRFS_FS is not set
1061CONFIG_FILE_LOCKING=y
1062CONFIG_FSNOTIFY=y
1052CONFIG_DNOTIFY=y 1063CONFIG_DNOTIFY=y
1053CONFIG_INOTIFY=y 1064CONFIG_INOTIFY=y
1054CONFIG_INOTIFY_USER=y 1065CONFIG_INOTIFY_USER=y
@@ -1204,28 +1215,12 @@ CONFIG_HAVE_FUNCTION_TRACER=y
1204CONFIG_HAVE_DYNAMIC_FTRACE=y 1215CONFIG_HAVE_DYNAMIC_FTRACE=y
1205CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 1216CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1206CONFIG_TRACING_SUPPORT=y 1217CONFIG_TRACING_SUPPORT=y
1207 1218# CONFIG_FTRACE is not set
1208#
1209# Tracers
1210#
1211# CONFIG_FUNCTION_TRACER is not set
1212# CONFIG_IRQSOFF_TRACER is not set
1213# CONFIG_PREEMPT_TRACER is not set
1214# CONFIG_SCHED_TRACER is not set
1215# CONFIG_CONTEXT_SWITCH_TRACER is not set
1216# CONFIG_EVENT_TRACER is not set
1217# CONFIG_BOOT_TRACER is not set
1218# CONFIG_TRACE_BRANCH_PROFILING is not set
1219# CONFIG_STACK_TRACER is not set
1220# CONFIG_KMEMTRACE is not set
1221# CONFIG_WORKQUEUE_TRACER is not set
1222# CONFIG_BLK_DEV_IO_TRACE is not set
1223# CONFIG_DMA_API_DEBUG is not set 1219# CONFIG_DMA_API_DEBUG is not set
1224# CONFIG_SAMPLES is not set 1220# CONFIG_SAMPLES is not set
1225CONFIG_HAVE_ARCH_KGDB=y 1221CONFIG_HAVE_ARCH_KGDB=y
1226# CONFIG_SH_STANDARD_BIOS is not set 1222# CONFIG_SH_STANDARD_BIOS is not set
1227# CONFIG_EARLY_SCIF_CONSOLE is not set 1223# CONFIG_EARLY_SCIF_CONSOLE is not set
1228# CONFIG_MORE_COMPILE_OPTIONS is not set
1229 1224
1230# 1225#
1231# Security options 1226# Security options
@@ -1347,3 +1342,4 @@ CONFIG_HAS_IOMEM=y
1347CONFIG_HAS_IOPORT=y 1342CONFIG_HAS_IOPORT=y
1348CONFIG_HAS_DMA=y 1343CONFIG_HAS_DMA=y
1349CONFIG_NLATTR=y 1344CONFIG_NLATTR=y
1345CONFIG_GENERIC_ATOMIC64=y
diff --git a/arch/sh/configs/cayman_defconfig b/arch/sh/configs/cayman_defconfig
index 40301f86a45c..6b863cb1e248 100644
--- a/arch/sh/configs/cayman_defconfig
+++ b/arch/sh/configs/cayman_defconfig
@@ -1,24 +1,26 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.30-rc3 3# Linux kernel version: 2.6.30
4# Mon Apr 27 13:42:53 2009 4# Thu Jun 18 12:21:54 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7# CONFIG_SUPERH32 is not set 7# CONFIG_SUPERH32 is not set
8CONFIG_SUPERH64=y 8CONFIG_SUPERH64=y
9CONFIG_ARCH_DEFCONFIG="arch/sh/configs/cayman_defconfig" 9CONFIG_ARCH_DEFCONFIG="arch/sh/configs/cayman_defconfig"
10CONFIG_RWSEM_GENERIC_SPINLOCK=y 10CONFIG_RWSEM_GENERIC_SPINLOCK=y
11CONFIG_GENERIC_CSUM=y
11CONFIG_GENERIC_FIND_NEXT_BIT=y 12CONFIG_GENERIC_FIND_NEXT_BIT=y
12CONFIG_GENERIC_HWEIGHT=y 13CONFIG_GENERIC_HWEIGHT=y
13CONFIG_GENERIC_HARDIRQS=y 14CONFIG_GENERIC_HARDIRQS=y
14CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
15CONFIG_GENERIC_IRQ_PROBE=y 16CONFIG_GENERIC_IRQ_PROBE=y
16# CONFIG_GENERIC_GPIO is not set 17# CONFIG_GENERIC_GPIO is not set
17# CONFIG_GENERIC_TIME is not set 18CONFIG_GENERIC_TIME=y
18# CONFIG_GENERIC_CLOCKEVENTS is not set 19CONFIG_GENERIC_CLOCKEVENTS=y
19# CONFIG_ARCH_SUSPEND_POSSIBLE is not set 20# CONFIG_ARCH_SUSPEND_POSSIBLE is not set
20# CONFIG_ARCH_HIBERNATION_POSSIBLE is not set 21# CONFIG_ARCH_HIBERNATION_POSSIBLE is not set
21CONFIG_SYS_SUPPORTS_PCI=y 22CONFIG_SYS_SUPPORTS_PCI=y
23CONFIG_SYS_SUPPORTS_TMU=y
22CONFIG_STACKTRACE_SUPPORT=y 24CONFIG_STACKTRACE_SUPPORT=y
23CONFIG_LOCKDEP_SUPPORT=y 25CONFIG_LOCKDEP_SUPPORT=y
24CONFIG_HAVE_LATENCYTOP_SUPPORT=y 26CONFIG_HAVE_LATENCYTOP_SUPPORT=y
@@ -71,7 +73,6 @@ CONFIG_SYSCTL_SYSCALL=y
71CONFIG_KALLSYMS=y 73CONFIG_KALLSYMS=y
72# CONFIG_KALLSYMS_ALL is not set 74# CONFIG_KALLSYMS_ALL is not set
73# CONFIG_KALLSYMS_EXTRA_PASS is not set 75# CONFIG_KALLSYMS_EXTRA_PASS is not set
74# CONFIG_STRIP_ASM_SYMS is not set
75CONFIG_HOTPLUG=y 76CONFIG_HOTPLUG=y
76CONFIG_PRINTK=y 77CONFIG_PRINTK=y
77CONFIG_BUG=y 78CONFIG_BUG=y
@@ -84,8 +85,13 @@ CONFIG_TIMERFD=y
84CONFIG_EVENTFD=y 85CONFIG_EVENTFD=y
85CONFIG_SHMEM=y 86CONFIG_SHMEM=y
86CONFIG_AIO=y 87CONFIG_AIO=y
88
89#
90# Performance Counters
91#
87CONFIG_VM_EVENT_COUNTERS=y 92CONFIG_VM_EVENT_COUNTERS=y
88CONFIG_PCI_QUIRKS=y 93CONFIG_PCI_QUIRKS=y
94# CONFIG_STRIP_ASM_SYMS is not set
89CONFIG_COMPAT_BRK=y 95CONFIG_COMPAT_BRK=y
90CONFIG_SLAB=y 96CONFIG_SLAB=y
91# CONFIG_SLUB is not set 97# CONFIG_SLUB is not set
@@ -140,6 +146,7 @@ CONFIG_CPU_SUBTYPE_SH5_101=y
140CONFIG_QUICKLIST=y 146CONFIG_QUICKLIST=y
141CONFIG_MMU=y 147CONFIG_MMU=y
142CONFIG_PAGE_OFFSET=0x20000000 148CONFIG_PAGE_OFFSET=0x20000000
149CONFIG_FORCE_MAX_ZONEORDER=11
143CONFIG_MEMORY_START=0x80000000 150CONFIG_MEMORY_START=0x80000000
144CONFIG_MEMORY_SIZE=0x00400000 151CONFIG_MEMORY_SIZE=0x00400000
145CONFIG_32BIT=y 152CONFIG_32BIT=y
@@ -153,7 +160,6 @@ CONFIG_PAGE_SIZE_4KB=y
153# CONFIG_PAGE_SIZE_8KB is not set 160# CONFIG_PAGE_SIZE_8KB is not set
154# CONFIG_PAGE_SIZE_16KB is not set 161# CONFIG_PAGE_SIZE_16KB is not set
155# CONFIG_PAGE_SIZE_64KB is not set 162# CONFIG_PAGE_SIZE_64KB is not set
156CONFIG_ENTRY_OFFSET=0x00001000
157CONFIG_HUGETLB_PAGE_SIZE_64K=y 163CONFIG_HUGETLB_PAGE_SIZE_64K=y
158# CONFIG_HUGETLB_PAGE_SIZE_256K is not set 164# CONFIG_HUGETLB_PAGE_SIZE_256K is not set
159# CONFIG_HUGETLB_PAGE_SIZE_1MB is not set 165# CONFIG_HUGETLB_PAGE_SIZE_1MB is not set
@@ -172,9 +178,9 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
172# CONFIG_PHYS_ADDR_T_64BIT is not set 178# CONFIG_PHYS_ADDR_T_64BIT is not set
173CONFIG_ZONE_DMA_FLAG=0 179CONFIG_ZONE_DMA_FLAG=0
174CONFIG_NR_QUICK=2 180CONFIG_NR_QUICK=2
175CONFIG_UNEVICTABLE_LRU=y
176CONFIG_HAVE_MLOCK=y 181CONFIG_HAVE_MLOCK=y
177CONFIG_HAVE_MLOCKED_PAGE_BIT=y 182CONFIG_HAVE_MLOCKED_PAGE_BIT=y
183CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
178 184
179# 185#
180# Cache configuration 186# Cache configuration
@@ -190,7 +196,6 @@ CONFIG_CPU_LITTLE_ENDIAN=y
190# CONFIG_CPU_BIG_ENDIAN is not set 196# CONFIG_CPU_BIG_ENDIAN is not set
191CONFIG_SH_FPU=y 197CONFIG_SH_FPU=y
192# CONFIG_SH64_FPU_DENORM_FLUSH is not set 198# CONFIG_SH64_FPU_DENORM_FLUSH is not set
193CONFIG_SH64_USER_MISALIGNED_FIXUP=y
194CONFIG_SH64_ID2815_WORKAROUND=y 199CONFIG_SH64_ID2815_WORKAROUND=y
195CONFIG_CPU_HAS_FPU=y 200CONFIG_CPU_HAS_FPU=y
196 201
@@ -202,8 +207,13 @@ CONFIG_SH_CAYMAN=y
202# 207#
203# Timer and clock configuration 208# Timer and clock configuration
204# 209#
205CONFIG_SH_TIMER_IRQ=16 210CONFIG_SH_TIMER_TMU=y
206CONFIG_SH_PCLK_FREQ=50000000 211CONFIG_SH_PCLK_FREQ=50000000
212CONFIG_SH_CLK_CPG=y
213CONFIG_SH_CLK_CPG_LEGACY=y
214# CONFIG_NO_HZ is not set
215# CONFIG_HIGH_RES_TIMERS is not set
216CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
207 217
208# 218#
209# CPU Frequency scaling 219# CPU Frequency scaling
@@ -237,12 +247,14 @@ CONFIG_HZ=250
237# CONFIG_PREEMPT_NONE is not set 247# CONFIG_PREEMPT_NONE is not set
238# CONFIG_PREEMPT_VOLUNTARY is not set 248# CONFIG_PREEMPT_VOLUNTARY is not set
239CONFIG_PREEMPT=y 249CONFIG_PREEMPT=y
250# CONFIG_SPARSE_IRQ is not set
240 251
241# 252#
242# Boot options 253# Boot options
243# 254#
244CONFIG_ZERO_PAGE_OFFSET=0x00001000 255CONFIG_ZERO_PAGE_OFFSET=0x00001000
245CONFIG_BOOT_LINK_OFFSET=0x00800000 256CONFIG_BOOT_LINK_OFFSET=0x00400000
257CONFIG_ENTRY_OFFSET=0x00001000
246# CONFIG_CMDLINE_BOOL is not set 258# CONFIG_CMDLINE_BOOL is not set
247 259
248# 260#
@@ -332,6 +344,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
332# CONFIG_ECONET is not set 344# CONFIG_ECONET is not set
333# CONFIG_WAN_ROUTER is not set 345# CONFIG_WAN_ROUTER is not set
334# CONFIG_PHONET is not set 346# CONFIG_PHONET is not set
347# CONFIG_IEEE802154 is not set
335# CONFIG_NET_SCHED is not set 348# CONFIG_NET_SCHED is not set
336# CONFIG_DCB is not set 349# CONFIG_DCB is not set
337 350
@@ -349,7 +362,11 @@ CONFIG_WIRELESS=y
349# CONFIG_WIRELESS_OLD_REGULATORY is not set 362# CONFIG_WIRELESS_OLD_REGULATORY is not set
350# CONFIG_WIRELESS_EXT is not set 363# CONFIG_WIRELESS_EXT is not set
351# CONFIG_LIB80211 is not set 364# CONFIG_LIB80211 is not set
352# CONFIG_MAC80211 is not set 365
366#
367# CFG80211 needs to be enabled for MAC80211
368#
369CONFIG_MAC80211_DEFAULT_PS_VALUE=0
353# CONFIG_WIMAX is not set 370# CONFIG_WIMAX is not set
354# CONFIG_RFKILL is not set 371# CONFIG_RFKILL is not set
355# CONFIG_NET_9P is not set 372# CONFIG_NET_9P is not set
@@ -402,7 +419,9 @@ CONFIG_MISC_DEVICES=y
402# 419#
403# CONFIG_EEPROM_AT24 is not set 420# CONFIG_EEPROM_AT24 is not set
404# CONFIG_EEPROM_LEGACY is not set 421# CONFIG_EEPROM_LEGACY is not set
422# CONFIG_EEPROM_MAX6875 is not set
405# CONFIG_EEPROM_93CX6 is not set 423# CONFIG_EEPROM_93CX6 is not set
424# CONFIG_CB710_CORE is not set
406CONFIG_HAVE_IDE=y 425CONFIG_HAVE_IDE=y
407# CONFIG_IDE is not set 426# CONFIG_IDE is not set
408 427
@@ -425,10 +444,6 @@ CONFIG_BLK_DEV_SD=y
425# CONFIG_BLK_DEV_SR is not set 444# CONFIG_BLK_DEV_SR is not set
426# CONFIG_CHR_DEV_SG is not set 445# CONFIG_CHR_DEV_SG is not set
427# CONFIG_CHR_DEV_SCH is not set 446# CONFIG_CHR_DEV_SCH is not set
428
429#
430# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
431#
432CONFIG_SCSI_MULTI_LUN=y 447CONFIG_SCSI_MULTI_LUN=y
433# CONFIG_SCSI_CONSTANTS is not set 448# CONFIG_SCSI_CONSTANTS is not set
434# CONFIG_SCSI_LOGGING is not set 449# CONFIG_SCSI_LOGGING is not set
@@ -446,6 +461,7 @@ CONFIG_SCSI_SPI_ATTRS=y
446CONFIG_SCSI_LOWLEVEL=y 461CONFIG_SCSI_LOWLEVEL=y
447# CONFIG_ISCSI_TCP is not set 462# CONFIG_ISCSI_TCP is not set
448# CONFIG_SCSI_CXGB3_ISCSI is not set 463# CONFIG_SCSI_CXGB3_ISCSI is not set
464# CONFIG_SCSI_BNX2_ISCSI is not set
449# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 465# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
450# CONFIG_SCSI_3W_9XXX is not set 466# CONFIG_SCSI_3W_9XXX is not set
451# CONFIG_SCSI_ACARD is not set 467# CONFIG_SCSI_ACARD is not set
@@ -454,6 +470,7 @@ CONFIG_SCSI_LOWLEVEL=y
454# CONFIG_SCSI_AIC7XXX_OLD is not set 470# CONFIG_SCSI_AIC7XXX_OLD is not set
455# CONFIG_SCSI_AIC79XX is not set 471# CONFIG_SCSI_AIC79XX is not set
456# CONFIG_SCSI_AIC94XX is not set 472# CONFIG_SCSI_AIC94XX is not set
473# CONFIG_SCSI_MVSAS is not set
457# CONFIG_SCSI_ARCMSR is not set 474# CONFIG_SCSI_ARCMSR is not set
458# CONFIG_MEGARAID_NEWGEN is not set 475# CONFIG_MEGARAID_NEWGEN is not set
459# CONFIG_MEGARAID_LEGACY is not set 476# CONFIG_MEGARAID_LEGACY is not set
@@ -468,7 +485,6 @@ CONFIG_SCSI_LOWLEVEL=y
468# CONFIG_SCSI_IPS is not set 485# CONFIG_SCSI_IPS is not set
469# CONFIG_SCSI_INITIO is not set 486# CONFIG_SCSI_INITIO is not set
470# CONFIG_SCSI_INIA100 is not set 487# CONFIG_SCSI_INIA100 is not set
471# CONFIG_SCSI_MVSAS is not set
472# CONFIG_SCSI_STEX is not set 488# CONFIG_SCSI_STEX is not set
473# CONFIG_SCSI_SYM53C8XX_2 is not set 489# CONFIG_SCSI_SYM53C8XX_2 is not set
474# CONFIG_SCSI_QLOGIC_1280 is not set 490# CONFIG_SCSI_QLOGIC_1280 is not set
@@ -497,7 +513,6 @@ CONFIG_SCSI_LOWLEVEL=y
497# CONFIG_IEEE1394 is not set 513# CONFIG_IEEE1394 is not set
498# CONFIG_I2O is not set 514# CONFIG_I2O is not set
499CONFIG_NETDEVICES=y 515CONFIG_NETDEVICES=y
500CONFIG_COMPAT_NET_DEV_OPS=y
501# CONFIG_DUMMY is not set 516# CONFIG_DUMMY is not set
502# CONFIG_BONDING is not set 517# CONFIG_BONDING is not set
503# CONFIG_MACVLAN is not set 518# CONFIG_MACVLAN is not set
@@ -530,6 +545,7 @@ CONFIG_NET_ETHERNET=y
530# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set 545# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
531# CONFIG_NET_PCI is not set 546# CONFIG_NET_PCI is not set
532# CONFIG_B44 is not set 547# CONFIG_B44 is not set
548# CONFIG_KS8842 is not set
533# CONFIG_ATL2 is not set 549# CONFIG_ATL2 is not set
534CONFIG_NETDEV_1000=y 550CONFIG_NETDEV_1000=y
535# CONFIG_ACENIC is not set 551# CONFIG_ACENIC is not set
@@ -722,7 +738,6 @@ CONFIG_I2C_HELPER_AUTO=y
722# CONFIG_SENSORS_PCF8574 is not set 738# CONFIG_SENSORS_PCF8574 is not set
723# CONFIG_PCF8575 is not set 739# CONFIG_PCF8575 is not set
724# CONFIG_SENSORS_PCA9539 is not set 740# CONFIG_SENSORS_PCA9539 is not set
725# CONFIG_SENSORS_MAX6875 is not set
726# CONFIG_SENSORS_TSL2550 is not set 741# CONFIG_SENSORS_TSL2550 is not set
727# CONFIG_I2C_DEBUG_CORE is not set 742# CONFIG_I2C_DEBUG_CORE is not set
728# CONFIG_I2C_DEBUG_ALGO is not set 743# CONFIG_I2C_DEBUG_ALGO is not set
@@ -781,6 +796,7 @@ CONFIG_HWMON=y
781# CONFIG_SENSORS_SMSC47B397 is not set 796# CONFIG_SENSORS_SMSC47B397 is not set
782# CONFIG_SENSORS_ADS7828 is not set 797# CONFIG_SENSORS_ADS7828 is not set
783# CONFIG_SENSORS_THMC50 is not set 798# CONFIG_SENSORS_THMC50 is not set
799# CONFIG_SENSORS_TMP401 is not set
784# CONFIG_SENSORS_VIA686A is not set 800# CONFIG_SENSORS_VIA686A is not set
785# CONFIG_SENSORS_VT1211 is not set 801# CONFIG_SENSORS_VT1211 is not set
786# CONFIG_SENSORS_VT8231 is not set 802# CONFIG_SENSORS_VT8231 is not set
@@ -827,92 +843,7 @@ CONFIG_SSB_POSSIBLE=y
827# CONFIG_MFD_WM8350_I2C is not set 843# CONFIG_MFD_WM8350_I2C is not set
828# CONFIG_MFD_PCF50633 is not set 844# CONFIG_MFD_PCF50633 is not set
829# CONFIG_REGULATOR is not set 845# CONFIG_REGULATOR is not set
830 846# CONFIG_MEDIA_SUPPORT is not set
831#
832# Multimedia devices
833#
834
835#
836# Multimedia core support
837#
838CONFIG_VIDEO_DEV=m
839CONFIG_VIDEO_V4L2_COMMON=m
840CONFIG_VIDEO_ALLOW_V4L1=y
841CONFIG_VIDEO_V4L1_COMPAT=y
842CONFIG_DVB_CORE=y
843CONFIG_VIDEO_MEDIA=m
844
845#
846# Multimedia drivers
847#
848# CONFIG_MEDIA_ATTACH is not set
849CONFIG_MEDIA_TUNER=m
850# CONFIG_MEDIA_TUNER_CUSTOMISE is not set
851CONFIG_MEDIA_TUNER_SIMPLE=m
852CONFIG_MEDIA_TUNER_TDA8290=m
853CONFIG_MEDIA_TUNER_TDA9887=m
854CONFIG_MEDIA_TUNER_TEA5761=m
855CONFIG_MEDIA_TUNER_TEA5767=m
856CONFIG_MEDIA_TUNER_MT20XX=m
857CONFIG_MEDIA_TUNER_XC2028=m
858CONFIG_MEDIA_TUNER_XC5000=m
859CONFIG_MEDIA_TUNER_MC44S803=m
860CONFIG_VIDEO_V4L2=m
861CONFIG_VIDEO_V4L1=m
862CONFIG_VIDEO_CAPTURE_DRIVERS=y
863# CONFIG_VIDEO_ADV_DEBUG is not set
864# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
865CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
866# CONFIG_VIDEO_VIVI is not set
867# CONFIG_VIDEO_BT848 is not set
868# CONFIG_VIDEO_CPIA is not set
869# CONFIG_VIDEO_SAA5246A is not set
870# CONFIG_VIDEO_SAA5249 is not set
871# CONFIG_VIDEO_SAA7134 is not set
872# CONFIG_VIDEO_MXB is not set
873# CONFIG_VIDEO_HEXIUM_ORION is not set
874# CONFIG_VIDEO_HEXIUM_GEMINI is not set
875# CONFIG_VIDEO_CX88 is not set
876# CONFIG_VIDEO_CX23885 is not set
877# CONFIG_VIDEO_IVTV is not set
878# CONFIG_VIDEO_CX18 is not set
879# CONFIG_VIDEO_CAFE_CCIC is not set
880# CONFIG_SOC_CAMERA is not set
881# CONFIG_RADIO_ADAPTERS is not set
882# CONFIG_DVB_DYNAMIC_MINORS is not set
883CONFIG_DVB_CAPTURE_DRIVERS=y
884
885#
886# Supported SAA7146 based PCI Adapters
887#
888# CONFIG_TTPCI_EEPROM is not set
889# CONFIG_DVB_AV7110 is not set
890# CONFIG_DVB_BUDGET_CORE is not set
891
892#
893# Supported FlexCopII (B2C2) Adapters
894#
895# CONFIG_DVB_B2C2_FLEXCOP is not set
896
897#
898# Supported BT878 Adapters
899#
900
901#
902# Supported Pluto2 Adapters
903#
904# CONFIG_DVB_PLUTO2 is not set
905
906#
907# Supported SDMC DM1105 Adapters
908#
909# CONFIG_DVB_DM1105 is not set
910
911#
912# Supported DVB Frontends
913#
914# CONFIG_DVB_FE_CUSTOMISE is not set
915CONFIG_DAB=y
916 847
917# 848#
918# Graphics support 849# Graphics support
@@ -1041,10 +972,15 @@ CONFIG_USB_ARCH_HAS_EHCI=y
1041# CONFIG_NEW_LEDS is not set 972# CONFIG_NEW_LEDS is not set
1042# CONFIG_ACCESSIBILITY is not set 973# CONFIG_ACCESSIBILITY is not set
1043# CONFIG_INFINIBAND is not set 974# CONFIG_INFINIBAND is not set
975CONFIG_RTC_LIB=y
1044# CONFIG_RTC_CLASS is not set 976# CONFIG_RTC_CLASS is not set
1045# CONFIG_DMADEVICES is not set 977# CONFIG_DMADEVICES is not set
1046# CONFIG_AUXDISPLAY is not set 978# CONFIG_AUXDISPLAY is not set
1047# CONFIG_UIO is not set 979# CONFIG_UIO is not set
980
981#
982# TI VLYNQ
983#
1048# CONFIG_STAGING is not set 984# CONFIG_STAGING is not set
1049 985
1050# 986#
@@ -1065,10 +1001,11 @@ CONFIG_FS_MBCACHE=y
1065# CONFIG_REISERFS_FS is not set 1001# CONFIG_REISERFS_FS is not set
1066# CONFIG_JFS_FS is not set 1002# CONFIG_JFS_FS is not set
1067# CONFIG_FS_POSIX_ACL is not set 1003# CONFIG_FS_POSIX_ACL is not set
1068CONFIG_FILE_LOCKING=y
1069# CONFIG_XFS_FS is not set 1004# CONFIG_XFS_FS is not set
1070# CONFIG_OCFS2_FS is not set 1005# CONFIG_OCFS2_FS is not set
1071# CONFIG_BTRFS_FS is not set 1006# CONFIG_BTRFS_FS is not set
1007CONFIG_FILE_LOCKING=y
1008CONFIG_FSNOTIFY=y
1072CONFIG_DNOTIFY=y 1009CONFIG_DNOTIFY=y
1073CONFIG_INOTIFY=y 1010CONFIG_INOTIFY=y
1074CONFIG_INOTIFY_USER=y 1011CONFIG_INOTIFY_USER=y
@@ -1228,29 +1165,28 @@ CONFIG_FRAME_POINTER=y
1228# CONFIG_SYSCTL_SYSCALL_CHECK is not set 1165# CONFIG_SYSCTL_SYSCALL_CHECK is not set
1229# CONFIG_PAGE_POISONING is not set 1166# CONFIG_PAGE_POISONING is not set
1230CONFIG_TRACING_SUPPORT=y 1167CONFIG_TRACING_SUPPORT=y
1231 1168CONFIG_FTRACE=y
1232# 1169# CONFIG_IRQSOFF_TRACER is not set
1233# Tracers 1170# CONFIG_PREEMPT_TRACER is not set
1234#
1235# CONFIG_SCHED_TRACER is not set 1171# CONFIG_SCHED_TRACER is not set
1236# CONFIG_CONTEXT_SWITCH_TRACER is not set 1172# CONFIG_ENABLE_DEFAULT_TRACERS is not set
1237# CONFIG_EVENT_TRACER is not set
1238# CONFIG_BOOT_TRACER is not set 1173# CONFIG_BOOT_TRACER is not set
1239# CONFIG_TRACE_BRANCH_PROFILING is not set 1174CONFIG_BRANCH_PROFILE_NONE=y
1175# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
1176# CONFIG_PROFILE_ALL_BRANCHES is not set
1240# CONFIG_KMEMTRACE is not set 1177# CONFIG_KMEMTRACE is not set
1241# CONFIG_WORKQUEUE_TRACER is not set 1178# CONFIG_WORKQUEUE_TRACER is not set
1242# CONFIG_BLK_DEV_IO_TRACE is not set 1179# CONFIG_BLK_DEV_IO_TRACE is not set
1243# CONFIG_DYNAMIC_DEBUG is not set 1180# CONFIG_DYNAMIC_DEBUG is not set
1244# CONFIG_DMA_API_DEBUG is not set 1181# CONFIG_DMA_API_DEBUG is not set
1245# CONFIG_SAMPLES is not set 1182# CONFIG_SAMPLES is not set
1183# CONFIG_KMEMCHECK is not set
1246# CONFIG_EARLY_SCIF_CONSOLE is not set 1184# CONFIG_EARLY_SCIF_CONSOLE is not set
1247# CONFIG_DEBUG_BOOTMEM is not set 1185# CONFIG_DEBUG_BOOTMEM is not set
1248# CONFIG_DEBUG_STACK_USAGE is not set 1186# CONFIG_DEBUG_STACK_USAGE is not set
1249# CONFIG_4KSTACKS is not set 1187# CONFIG_4KSTACKS is not set
1250# CONFIG_SH_NO_BSS_INIT is not set 1188# CONFIG_SH_NO_BSS_INIT is not set
1251# CONFIG_MORE_COMPILE_OPTIONS is not set
1252CONFIG_SH64_SR_WATCH=y 1189CONFIG_SH64_SR_WATCH=y
1253# CONFIG_POOR_MANS_STRACE is not set
1254 1190
1255# 1191#
1256# Security options 1192# Security options
@@ -1364,3 +1300,4 @@ CONFIG_HAS_IOMEM=y
1364CONFIG_HAS_IOPORT=y 1300CONFIG_HAS_IOPORT=y
1365CONFIG_HAS_DMA=y 1301CONFIG_HAS_DMA=y
1366CONFIG_NLATTR=y 1302CONFIG_NLATTR=y
1303CONFIG_GENERIC_ATOMIC64=y
diff --git a/arch/sh/configs/dreamcast_defconfig b/arch/sh/configs/dreamcast_defconfig
index 1f3cc98330bf..95717a041ed6 100644
--- a/arch/sh/configs/dreamcast_defconfig
+++ b/arch/sh/configs/dreamcast_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.30-rc3 3# Linux kernel version: 2.6.30
4# Mon Apr 27 12:44:27 2009 4# Thu Jun 18 12:24:48 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -17,9 +17,11 @@ CONFIG_GENERIC_IRQ_PROBE=y
17# CONFIG_GENERIC_GPIO is not set 17# CONFIG_GENERIC_GPIO is not set
18CONFIG_GENERIC_TIME=y 18CONFIG_GENERIC_TIME=y
19CONFIG_GENERIC_CLOCKEVENTS=y 19CONFIG_GENERIC_CLOCKEVENTS=y
20CONFIG_GENERIC_CMOS_UPDATE=y
20# CONFIG_ARCH_SUSPEND_POSSIBLE is not set 21# CONFIG_ARCH_SUSPEND_POSSIBLE is not set
21CONFIG_ARCH_HIBERNATION_POSSIBLE=y 22CONFIG_ARCH_HIBERNATION_POSSIBLE=y
22CONFIG_SYS_SUPPORTS_PCI=y 23CONFIG_SYS_SUPPORTS_PCI=y
24CONFIG_SYS_SUPPORTS_TMU=y
23CONFIG_STACKTRACE_SUPPORT=y 25CONFIG_STACKTRACE_SUPPORT=y
24CONFIG_LOCKDEP_SUPPORT=y 26CONFIG_LOCKDEP_SUPPORT=y
25CONFIG_HAVE_LATENCYTOP_SUPPORT=y 27CONFIG_HAVE_LATENCYTOP_SUPPORT=y
@@ -72,7 +74,6 @@ CONFIG_UID16=y
72# CONFIG_SYSCTL_SYSCALL is not set 74# CONFIG_SYSCTL_SYSCALL is not set
73CONFIG_KALLSYMS=y 75CONFIG_KALLSYMS=y
74# CONFIG_KALLSYMS_EXTRA_PASS is not set 76# CONFIG_KALLSYMS_EXTRA_PASS is not set
75# CONFIG_STRIP_ASM_SYMS is not set
76CONFIG_HOTPLUG=y 77CONFIG_HOTPLUG=y
77CONFIG_PRINTK=y 78CONFIG_PRINTK=y
78CONFIG_BUG=y 79CONFIG_BUG=y
@@ -85,8 +86,13 @@ CONFIG_TIMERFD=y
85CONFIG_EVENTFD=y 86CONFIG_EVENTFD=y
86CONFIG_SHMEM=y 87CONFIG_SHMEM=y
87CONFIG_AIO=y 88CONFIG_AIO=y
89
90#
91# Performance Counters
92#
88CONFIG_VM_EVENT_COUNTERS=y 93CONFIG_VM_EVENT_COUNTERS=y
89CONFIG_PCI_QUIRKS=y 94CONFIG_PCI_QUIRKS=y
95# CONFIG_STRIP_ASM_SYMS is not set
90CONFIG_COMPAT_BRK=y 96CONFIG_COMPAT_BRK=y
91CONFIG_SLAB=y 97CONFIG_SLAB=y
92# CONFIG_SLUB is not set 98# CONFIG_SLUB is not set
@@ -177,6 +183,7 @@ CONFIG_CPU_SUBTYPE_SH7091=y
177CONFIG_QUICKLIST=y 183CONFIG_QUICKLIST=y
178CONFIG_MMU=y 184CONFIG_MMU=y
179CONFIG_PAGE_OFFSET=0x80000000 185CONFIG_PAGE_OFFSET=0x80000000
186CONFIG_FORCE_MAX_ZONEORDER=11
180CONFIG_MEMORY_START=0x0c000000 187CONFIG_MEMORY_START=0x0c000000
181CONFIG_MEMORY_SIZE=0x01000000 188CONFIG_MEMORY_SIZE=0x01000000
182CONFIG_29BIT=y 189CONFIG_29BIT=y
@@ -191,7 +198,6 @@ CONFIG_PAGE_SIZE_4KB=y
191# CONFIG_PAGE_SIZE_8KB is not set 198# CONFIG_PAGE_SIZE_8KB is not set
192# CONFIG_PAGE_SIZE_16KB is not set 199# CONFIG_PAGE_SIZE_16KB is not set
193# CONFIG_PAGE_SIZE_64KB is not set 200# CONFIG_PAGE_SIZE_64KB is not set
194CONFIG_ENTRY_OFFSET=0x00001000
195CONFIG_HUGETLB_PAGE_SIZE_64K=y 201CONFIG_HUGETLB_PAGE_SIZE_64K=y
196# CONFIG_HUGETLB_PAGE_SIZE_256K is not set 202# CONFIG_HUGETLB_PAGE_SIZE_256K is not set
197# CONFIG_HUGETLB_PAGE_SIZE_1MB is not set 203# CONFIG_HUGETLB_PAGE_SIZE_1MB is not set
@@ -210,9 +216,9 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
210# CONFIG_PHYS_ADDR_T_64BIT is not set 216# CONFIG_PHYS_ADDR_T_64BIT is not set
211CONFIG_ZONE_DMA_FLAG=0 217CONFIG_ZONE_DMA_FLAG=0
212CONFIG_NR_QUICK=2 218CONFIG_NR_QUICK=2
213CONFIG_UNEVICTABLE_LRU=y
214CONFIG_HAVE_MLOCK=y 219CONFIG_HAVE_MLOCK=y
215CONFIG_HAVE_MLOCKED_PAGE_BIT=y 220CONFIG_HAVE_MLOCKED_PAGE_BIT=y
221CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
216 222
217# 223#
218# Cache configuration 224# Cache configuration
@@ -230,7 +236,6 @@ CONFIG_SH_FPU=y
230CONFIG_SH_STORE_QUEUES=y 236CONFIG_SH_STORE_QUEUES=y
231CONFIG_CPU_HAS_INTEVT=y 237CONFIG_CPU_HAS_INTEVT=y
232CONFIG_CPU_HAS_SR_RB=y 238CONFIG_CPU_HAS_SR_RB=y
233CONFIG_CPU_HAS_PTEA=y
234CONFIG_CPU_HAS_FPU=y 239CONFIG_CPU_HAS_FPU=y
235 240
236# 241#
@@ -241,9 +246,10 @@ CONFIG_SH_DREAMCAST=y
241# 246#
242# Timer and clock configuration 247# Timer and clock configuration
243# 248#
244CONFIG_SH_TMU=y 249CONFIG_SH_TIMER_TMU=y
245CONFIG_SH_TIMER_IRQ=16
246CONFIG_SH_PCLK_FREQ=49876504 250CONFIG_SH_PCLK_FREQ=49876504
251CONFIG_SH_CLK_CPG=y
252CONFIG_SH_CLK_CPG_LEGACY=y
247# CONFIG_NO_HZ is not set 253# CONFIG_NO_HZ is not set
248# CONFIG_HIGH_RES_TIMERS is not set 254# CONFIG_HIGH_RES_TIMERS is not set
249CONFIG_GENERIC_CLOCKEVENTS_BUILD=y 255CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
@@ -307,12 +313,14 @@ CONFIG_SECCOMP=y
307CONFIG_PREEMPT=y 313CONFIG_PREEMPT=y
308CONFIG_GUSA=y 314CONFIG_GUSA=y
309# CONFIG_GUSA_RB is not set 315# CONFIG_GUSA_RB is not set
316# CONFIG_SPARSE_IRQ is not set
310 317
311# 318#
312# Boot options 319# Boot options
313# 320#
314CONFIG_ZERO_PAGE_OFFSET=0x00001000 321CONFIG_ZERO_PAGE_OFFSET=0x00001000
315CONFIG_BOOT_LINK_OFFSET=0x00800000 322CONFIG_BOOT_LINK_OFFSET=0x00800000
323CONFIG_ENTRY_OFFSET=0x00001000
316# CONFIG_UBC_WAKEUP is not set 324# CONFIG_UBC_WAKEUP is not set
317CONFIG_CMDLINE_BOOL=y 325CONFIG_CMDLINE_BOOL=y
318CONFIG_CMDLINE="console=ttySC1,115200 panic=3" 326CONFIG_CMDLINE="console=ttySC1,115200 panic=3"
@@ -401,6 +409,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
401# CONFIG_ECONET is not set 409# CONFIG_ECONET is not set
402# CONFIG_WAN_ROUTER is not set 410# CONFIG_WAN_ROUTER is not set
403# CONFIG_PHONET is not set 411# CONFIG_PHONET is not set
412# CONFIG_IEEE802154 is not set
404# CONFIG_NET_SCHED is not set 413# CONFIG_NET_SCHED is not set
405# CONFIG_DCB is not set 414# CONFIG_DCB is not set
406 415
@@ -418,7 +427,11 @@ CONFIG_WIRELESS=y
418# CONFIG_WIRELESS_OLD_REGULATORY is not set 427# CONFIG_WIRELESS_OLD_REGULATORY is not set
419# CONFIG_WIRELESS_EXT is not set 428# CONFIG_WIRELESS_EXT is not set
420# CONFIG_LIB80211 is not set 429# CONFIG_LIB80211 is not set
421# CONFIG_MAC80211 is not set 430
431#
432# CFG80211 needs to be enabled for MAC80211
433#
434CONFIG_MAC80211_DEFAULT_PS_VALUE=0
422# CONFIG_WIMAX is not set 435# CONFIG_WIMAX is not set
423# CONFIG_RFKILL is not set 436# CONFIG_RFKILL is not set
424# CONFIG_NET_9P is not set 437# CONFIG_NET_9P is not set
@@ -463,6 +476,7 @@ CONFIG_MISC_DEVICES=y
463# EEPROM support 476# EEPROM support
464# 477#
465# CONFIG_EEPROM_93CX6 is not set 478# CONFIG_EEPROM_93CX6 is not set
479# CONFIG_CB710_CORE is not set
466CONFIG_HAVE_IDE=y 480CONFIG_HAVE_IDE=y
467# CONFIG_IDE is not set 481# CONFIG_IDE is not set
468 482
@@ -488,7 +502,6 @@ CONFIG_HAVE_IDE=y
488# CONFIG_IEEE1394 is not set 502# CONFIG_IEEE1394 is not set
489# CONFIG_I2O is not set 503# CONFIG_I2O is not set
490CONFIG_NETDEVICES=y 504CONFIG_NETDEVICES=y
491CONFIG_COMPAT_NET_DEV_OPS=y
492# CONFIG_DUMMY is not set 505# CONFIG_DUMMY is not set
493# CONFIG_BONDING is not set 506# CONFIG_BONDING is not set
494# CONFIG_MACVLAN is not set 507# CONFIG_MACVLAN is not set
@@ -541,6 +554,7 @@ CONFIG_8139TOO=y
541# CONFIG_SMSC9420 is not set 554# CONFIG_SMSC9420 is not set
542# CONFIG_SUNDANCE is not set 555# CONFIG_SUNDANCE is not set
543# CONFIG_TLAN is not set 556# CONFIG_TLAN is not set
557# CONFIG_KS8842 is not set
544# CONFIG_VIA_RHINE is not set 558# CONFIG_VIA_RHINE is not set
545# CONFIG_SC92031 is not set 559# CONFIG_SC92031 is not set
546# CONFIG_ATL2 is not set 560# CONFIG_ATL2 is not set
@@ -697,22 +711,7 @@ CONFIG_SSB_POSSIBLE=y
697# CONFIG_HTC_PASIC3 is not set 711# CONFIG_HTC_PASIC3 is not set
698# CONFIG_MFD_TMIO is not set 712# CONFIG_MFD_TMIO is not set
699# CONFIG_REGULATOR is not set 713# CONFIG_REGULATOR is not set
700 714# CONFIG_MEDIA_SUPPORT is not set
701#
702# Multimedia devices
703#
704
705#
706# Multimedia core support
707#
708# CONFIG_VIDEO_DEV is not set
709# CONFIG_DVB_CORE is not set
710# CONFIG_VIDEO_MEDIA is not set
711
712#
713# Multimedia drivers
714#
715# CONFIG_DAB is not set
716 715
717# 716#
718# Graphics support 717# Graphics support
@@ -841,10 +840,15 @@ CONFIG_USB_ARCH_HAS_EHCI=y
841# CONFIG_NEW_LEDS is not set 840# CONFIG_NEW_LEDS is not set
842# CONFIG_ACCESSIBILITY is not set 841# CONFIG_ACCESSIBILITY is not set
843# CONFIG_INFINIBAND is not set 842# CONFIG_INFINIBAND is not set
843CONFIG_RTC_LIB=y
844# CONFIG_RTC_CLASS is not set 844# CONFIG_RTC_CLASS is not set
845# CONFIG_DMADEVICES is not set 845# CONFIG_DMADEVICES is not set
846# CONFIG_AUXDISPLAY is not set 846# CONFIG_AUXDISPLAY is not set
847# CONFIG_UIO is not set 847# CONFIG_UIO is not set
848
849#
850# TI VLYNQ
851#
848# CONFIG_STAGING is not set 852# CONFIG_STAGING is not set
849 853
850# 854#
@@ -856,10 +860,11 @@ CONFIG_USB_ARCH_HAS_EHCI=y
856# CONFIG_REISERFS_FS is not set 860# CONFIG_REISERFS_FS is not set
857# CONFIG_JFS_FS is not set 861# CONFIG_JFS_FS is not set
858# CONFIG_FS_POSIX_ACL is not set 862# CONFIG_FS_POSIX_ACL is not set
859CONFIG_FILE_LOCKING=y
860# CONFIG_XFS_FS is not set 863# CONFIG_XFS_FS is not set
861# CONFIG_OCFS2_FS is not set 864# CONFIG_OCFS2_FS is not set
862# CONFIG_BTRFS_FS is not set 865# CONFIG_BTRFS_FS is not set
866CONFIG_FILE_LOCKING=y
867CONFIG_FSNOTIFY=y
863# CONFIG_DNOTIFY is not set 868# CONFIG_DNOTIFY is not set
864CONFIG_INOTIFY=y 869CONFIG_INOTIFY=y
865CONFIG_INOTIFY_USER=y 870CONFIG_INOTIFY_USER=y
@@ -956,28 +961,12 @@ CONFIG_HAVE_FUNCTION_TRACER=y
956CONFIG_HAVE_DYNAMIC_FTRACE=y 961CONFIG_HAVE_DYNAMIC_FTRACE=y
957CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 962CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
958CONFIG_TRACING_SUPPORT=y 963CONFIG_TRACING_SUPPORT=y
959 964# CONFIG_FTRACE is not set
960#
961# Tracers
962#
963# CONFIG_FUNCTION_TRACER is not set
964# CONFIG_IRQSOFF_TRACER is not set
965# CONFIG_PREEMPT_TRACER is not set
966# CONFIG_SCHED_TRACER is not set
967# CONFIG_CONTEXT_SWITCH_TRACER is not set
968# CONFIG_EVENT_TRACER is not set
969# CONFIG_BOOT_TRACER is not set
970# CONFIG_TRACE_BRANCH_PROFILING is not set
971# CONFIG_STACK_TRACER is not set
972# CONFIG_KMEMTRACE is not set
973# CONFIG_WORKQUEUE_TRACER is not set
974# CONFIG_BLK_DEV_IO_TRACE is not set
975# CONFIG_DMA_API_DEBUG is not set 965# CONFIG_DMA_API_DEBUG is not set
976# CONFIG_SAMPLES is not set 966# CONFIG_SAMPLES is not set
977CONFIG_HAVE_ARCH_KGDB=y 967CONFIG_HAVE_ARCH_KGDB=y
978# CONFIG_SH_STANDARD_BIOS is not set 968# CONFIG_SH_STANDARD_BIOS is not set
979# CONFIG_EARLY_SCIF_CONSOLE is not set 969# CONFIG_EARLY_SCIF_CONSOLE is not set
980# CONFIG_MORE_COMPILE_OPTIONS is not set
981 970
982# 971#
983# Security options 972# Security options
@@ -1091,3 +1080,4 @@ CONFIG_HAS_IOMEM=y
1091CONFIG_HAS_IOPORT=y 1080CONFIG_HAS_IOPORT=y
1092CONFIG_HAS_DMA=y 1081CONFIG_HAS_DMA=y
1093CONFIG_NLATTR=y 1082CONFIG_NLATTR=y
1083CONFIG_GENERIC_ATOMIC64=y
diff --git a/arch/sh/configs/edosk7705_defconfig b/arch/sh/configs/edosk7705_defconfig
index d7092457ddc7..497414c439f4 100644
--- a/arch/sh/configs/edosk7705_defconfig
+++ b/arch/sh/configs/edosk7705_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.30-rc3 3# Linux kernel version: 2.6.30
4# Mon Apr 27 12:45:04 2009 4# Thu Jun 18 12:25:35 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -18,6 +18,7 @@ CONFIG_GENERIC_TIME=y
18CONFIG_GENERIC_CLOCKEVENTS=y 18CONFIG_GENERIC_CLOCKEVENTS=y
19# CONFIG_ARCH_SUSPEND_POSSIBLE is not set 19# CONFIG_ARCH_SUSPEND_POSSIBLE is not set
20CONFIG_ARCH_HIBERNATION_POSSIBLE=y 20CONFIG_ARCH_HIBERNATION_POSSIBLE=y
21CONFIG_SYS_SUPPORTS_TMU=y
21CONFIG_STACKTRACE_SUPPORT=y 22CONFIG_STACKTRACE_SUPPORT=y
22CONFIG_LOCKDEP_SUPPORT=y 23CONFIG_LOCKDEP_SUPPORT=y
23CONFIG_HAVE_LATENCYTOP_SUPPORT=y 24CONFIG_HAVE_LATENCYTOP_SUPPORT=y
@@ -57,7 +58,6 @@ CONFIG_EMBEDDED=y
57# CONFIG_UID16 is not set 58# CONFIG_UID16 is not set
58# CONFIG_SYSCTL_SYSCALL is not set 59# CONFIG_SYSCTL_SYSCALL is not set
59# CONFIG_KALLSYMS is not set 60# CONFIG_KALLSYMS is not set
60# CONFIG_STRIP_ASM_SYMS is not set
61# CONFIG_HOTPLUG is not set 61# CONFIG_HOTPLUG is not set
62# CONFIG_PRINTK is not set 62# CONFIG_PRINTK is not set
63# CONFIG_BUG is not set 63# CONFIG_BUG is not set
@@ -70,7 +70,12 @@ CONFIG_EMBEDDED=y
70# CONFIG_EVENTFD is not set 70# CONFIG_EVENTFD is not set
71CONFIG_SHMEM=y 71CONFIG_SHMEM=y
72# CONFIG_AIO is not set 72# CONFIG_AIO is not set
73
74#
75# Performance Counters
76#
73# CONFIG_VM_EVENT_COUNTERS is not set 77# CONFIG_VM_EVENT_COUNTERS is not set
78# CONFIG_STRIP_ASM_SYMS is not set
74# CONFIG_COMPAT_BRK is not set 79# CONFIG_COMPAT_BRK is not set
75# CONFIG_SLAB is not set 80# CONFIG_SLAB is not set
76CONFIG_SLUB=y 81CONFIG_SLUB=y
@@ -136,6 +141,7 @@ CONFIG_CPU_SUBTYPE_SH7705=y
136CONFIG_QUICKLIST=y 141CONFIG_QUICKLIST=y
137CONFIG_MMU=y 142CONFIG_MMU=y
138CONFIG_PAGE_OFFSET=0x80000000 143CONFIG_PAGE_OFFSET=0x80000000
144CONFIG_FORCE_MAX_ZONEORDER=11
139CONFIG_MEMORY_START=0x08000000 145CONFIG_MEMORY_START=0x08000000
140CONFIG_MEMORY_SIZE=0x04000000 146CONFIG_MEMORY_SIZE=0x04000000
141CONFIG_29BIT=y 147CONFIG_29BIT=y
@@ -152,7 +158,6 @@ CONFIG_PAGE_SIZE_4KB=y
152# CONFIG_PAGE_SIZE_8KB is not set 158# CONFIG_PAGE_SIZE_8KB is not set
153# CONFIG_PAGE_SIZE_16KB is not set 159# CONFIG_PAGE_SIZE_16KB is not set
154# CONFIG_PAGE_SIZE_64KB is not set 160# CONFIG_PAGE_SIZE_64KB is not set
155CONFIG_ENTRY_OFFSET=0x00001000
156CONFIG_SELECT_MEMORY_MODEL=y 161CONFIG_SELECT_MEMORY_MODEL=y
157# CONFIG_FLATMEM_MANUAL is not set 162# CONFIG_FLATMEM_MANUAL is not set
158# CONFIG_DISCONTIGMEM_MANUAL is not set 163# CONFIG_DISCONTIGMEM_MANUAL is not set
@@ -166,9 +171,9 @@ CONFIG_MIGRATION=y
166# CONFIG_PHYS_ADDR_T_64BIT is not set 171# CONFIG_PHYS_ADDR_T_64BIT is not set
167CONFIG_ZONE_DMA_FLAG=0 172CONFIG_ZONE_DMA_FLAG=0
168CONFIG_NR_QUICK=2 173CONFIG_NR_QUICK=2
169CONFIG_UNEVICTABLE_LRU=y
170CONFIG_HAVE_MLOCK=y 174CONFIG_HAVE_MLOCK=y
171CONFIG_HAVE_MLOCKED_PAGE_BIT=y 175CONFIG_HAVE_MLOCKED_PAGE_BIT=y
176CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
172 177
173# 178#
174# Cache configuration 179# Cache configuration
@@ -196,9 +201,10 @@ CONFIG_SH_EDOSK7705=y
196# 201#
197# Timer and clock configuration 202# Timer and clock configuration
198# 203#
199CONFIG_SH_TMU=y 204CONFIG_SH_TIMER_TMU=y
200CONFIG_SH_TIMER_IRQ=16
201CONFIG_SH_PCLK_FREQ=31250000 205CONFIG_SH_PCLK_FREQ=31250000
206CONFIG_SH_CLK_CPG=y
207CONFIG_SH_CLK_CPG_LEGACY=y
202# CONFIG_NO_HZ is not set 208# CONFIG_NO_HZ is not set
203# CONFIG_HIGH_RES_TIMERS is not set 209# CONFIG_HIGH_RES_TIMERS is not set
204CONFIG_GENERIC_CLOCKEVENTS_BUILD=y 210CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
@@ -243,6 +249,7 @@ CONFIG_GUSA=y
243# 249#
244CONFIG_ZERO_PAGE_OFFSET=0x00001000 250CONFIG_ZERO_PAGE_OFFSET=0x00001000
245CONFIG_BOOT_LINK_OFFSET=0x00800000 251CONFIG_BOOT_LINK_OFFSET=0x00800000
252CONFIG_ENTRY_OFFSET=0x00001000
246# CONFIG_CMDLINE_BOOL is not set 253# CONFIG_CMDLINE_BOOL is not set
247 254
248# 255#
@@ -335,21 +342,7 @@ CONFIG_SSB_POSSIBLE=y
335# CONFIG_HTC_PASIC3 is not set 342# CONFIG_HTC_PASIC3 is not set
336# CONFIG_MFD_TMIO is not set 343# CONFIG_MFD_TMIO is not set
337# CONFIG_REGULATOR is not set 344# CONFIG_REGULATOR is not set
338 345# CONFIG_MEDIA_SUPPORT is not set
339#
340# Multimedia devices
341#
342
343#
344# Multimedia core support
345#
346# CONFIG_VIDEO_DEV is not set
347# CONFIG_VIDEO_MEDIA is not set
348
349#
350# Multimedia drivers
351#
352# CONFIG_DAB is not set
353 346
354# 347#
355# Graphics support 348# Graphics support
@@ -369,17 +362,25 @@ CONFIG_SSB_POSSIBLE=y
369# CONFIG_MEMSTICK is not set 362# CONFIG_MEMSTICK is not set
370# CONFIG_NEW_LEDS is not set 363# CONFIG_NEW_LEDS is not set
371# CONFIG_ACCESSIBILITY is not set 364# CONFIG_ACCESSIBILITY is not set
365CONFIG_RTC_LIB=y
372# CONFIG_RTC_CLASS is not set 366# CONFIG_RTC_CLASS is not set
373# CONFIG_DMADEVICES is not set 367# CONFIG_DMADEVICES is not set
374# CONFIG_AUXDISPLAY is not set 368# CONFIG_AUXDISPLAY is not set
375# CONFIG_UIO is not set 369# CONFIG_UIO is not set
370
371#
372# TI VLYNQ
373#
376# CONFIG_STAGING is not set 374# CONFIG_STAGING is not set
377 375
378# 376#
379# File systems 377# File systems
380# 378#
379CONFIG_FILE_LOCKING=y
380CONFIG_FSNOTIFY=y
381# CONFIG_DNOTIFY is not set 381# CONFIG_DNOTIFY is not set
382# CONFIG_INOTIFY is not set 382# CONFIG_INOTIFY is not set
383CONFIG_INOTIFY_USER=y
383# CONFIG_QUOTA is not set 384# CONFIG_QUOTA is not set
384# CONFIG_AUTOFS_FS is not set 385# CONFIG_AUTOFS_FS is not set
385# CONFIG_AUTOFS4_FS is not set 386# CONFIG_AUTOFS4_FS is not set
@@ -418,26 +419,12 @@ CONFIG_HAVE_FUNCTION_TRACER=y
418CONFIG_HAVE_DYNAMIC_FTRACE=y 419CONFIG_HAVE_DYNAMIC_FTRACE=y
419CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 420CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
420CONFIG_TRACING_SUPPORT=y 421CONFIG_TRACING_SUPPORT=y
421 422# CONFIG_FTRACE is not set
422#
423# Tracers
424#
425# CONFIG_FUNCTION_TRACER is not set
426# CONFIG_IRQSOFF_TRACER is not set
427# CONFIG_SCHED_TRACER is not set
428# CONFIG_CONTEXT_SWITCH_TRACER is not set
429# CONFIG_EVENT_TRACER is not set
430# CONFIG_BOOT_TRACER is not set
431# CONFIG_TRACE_BRANCH_PROFILING is not set
432# CONFIG_STACK_TRACER is not set
433# CONFIG_KMEMTRACE is not set
434# CONFIG_WORKQUEUE_TRACER is not set
435# CONFIG_DMA_API_DEBUG is not set 423# CONFIG_DMA_API_DEBUG is not set
436# CONFIG_SAMPLES is not set 424# CONFIG_SAMPLES is not set
437CONFIG_HAVE_ARCH_KGDB=y 425CONFIG_HAVE_ARCH_KGDB=y
438# CONFIG_SH_STANDARD_BIOS is not set 426# CONFIG_SH_STANDARD_BIOS is not set
439# CONFIG_EARLY_SCIF_CONSOLE is not set 427# CONFIG_EARLY_SCIF_CONSOLE is not set
440# CONFIG_MORE_COMPILE_OPTIONS is not set
441 428
442# 429#
443# Security options 430# Security options
@@ -462,3 +449,4 @@ CONFIG_GENERIC_FIND_LAST_BIT=y
462CONFIG_HAS_IOMEM=y 449CONFIG_HAS_IOMEM=y
463CONFIG_HAS_IOPORT=y 450CONFIG_HAS_IOPORT=y
464CONFIG_HAS_DMA=y 451CONFIG_HAS_DMA=y
452CONFIG_GENERIC_ATOMIC64=y
diff --git a/arch/sh/configs/edosk7760_defconfig b/arch/sh/configs/edosk7760_defconfig
index a822b1d8c116..77684ed91270 100644
--- a/arch/sh/configs/edosk7760_defconfig
+++ b/arch/sh/configs/edosk7760_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.30-rc3 3# Linux kernel version: 2.6.30
4# Mon Apr 27 12:45:25 2009 4# Thu Jun 18 12:25:55 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -19,6 +19,7 @@ CONFIG_GENERIC_TIME=y
19CONFIG_GENERIC_CLOCKEVENTS=y 19CONFIG_GENERIC_CLOCKEVENTS=y
20# CONFIG_ARCH_SUSPEND_POSSIBLE is not set 20# CONFIG_ARCH_SUSPEND_POSSIBLE is not set
21CONFIG_ARCH_HIBERNATION_POSSIBLE=y 21CONFIG_ARCH_HIBERNATION_POSSIBLE=y
22CONFIG_SYS_SUPPORTS_TMU=y
22CONFIG_STACKTRACE_SUPPORT=y 23CONFIG_STACKTRACE_SUPPORT=y
23CONFIG_LOCKDEP_SUPPORT=y 24CONFIG_LOCKDEP_SUPPORT=y
24CONFIG_HAVE_LATENCYTOP_SUPPORT=y 25CONFIG_HAVE_LATENCYTOP_SUPPORT=y
@@ -78,7 +79,6 @@ CONFIG_SYSCTL_SYSCALL=y
78CONFIG_KALLSYMS=y 79CONFIG_KALLSYMS=y
79CONFIG_KALLSYMS_ALL=y 80CONFIG_KALLSYMS_ALL=y
80# CONFIG_KALLSYMS_EXTRA_PASS is not set 81# CONFIG_KALLSYMS_EXTRA_PASS is not set
81# CONFIG_STRIP_ASM_SYMS is not set
82CONFIG_HOTPLUG=y 82CONFIG_HOTPLUG=y
83CONFIG_PRINTK=y 83CONFIG_PRINTK=y
84CONFIG_BUG=y 84CONFIG_BUG=y
@@ -91,8 +91,13 @@ CONFIG_TIMERFD=y
91CONFIG_EVENTFD=y 91CONFIG_EVENTFD=y
92CONFIG_SHMEM=y 92CONFIG_SHMEM=y
93CONFIG_AIO=y 93CONFIG_AIO=y
94
95#
96# Performance Counters
97#
94CONFIG_VM_EVENT_COUNTERS=y 98CONFIG_VM_EVENT_COUNTERS=y
95CONFIG_SLUB_DEBUG=y 99CONFIG_SLUB_DEBUG=y
100# CONFIG_STRIP_ASM_SYMS is not set
96CONFIG_COMPAT_BRK=y 101CONFIG_COMPAT_BRK=y
97# CONFIG_SLAB is not set 102# CONFIG_SLAB is not set
98CONFIG_SLUB=y 103CONFIG_SLUB=y
@@ -182,6 +187,7 @@ CONFIG_CPU_SUBTYPE_SH7760=y
182CONFIG_QUICKLIST=y 187CONFIG_QUICKLIST=y
183CONFIG_MMU=y 188CONFIG_MMU=y
184CONFIG_PAGE_OFFSET=0x80000000 189CONFIG_PAGE_OFFSET=0x80000000
190CONFIG_FORCE_MAX_ZONEORDER=11
185CONFIG_MEMORY_START=0x0c000000 191CONFIG_MEMORY_START=0x0c000000
186CONFIG_MEMORY_SIZE=0x04000000 192CONFIG_MEMORY_SIZE=0x04000000
187CONFIG_29BIT=y 193CONFIG_29BIT=y
@@ -196,7 +202,6 @@ CONFIG_PAGE_SIZE_4KB=y
196# CONFIG_PAGE_SIZE_8KB is not set 202# CONFIG_PAGE_SIZE_8KB is not set
197# CONFIG_PAGE_SIZE_16KB is not set 203# CONFIG_PAGE_SIZE_16KB is not set
198# CONFIG_PAGE_SIZE_64KB is not set 204# CONFIG_PAGE_SIZE_64KB is not set
199CONFIG_ENTRY_OFFSET=0x00001000
200CONFIG_SELECT_MEMORY_MODEL=y 205CONFIG_SELECT_MEMORY_MODEL=y
201CONFIG_FLATMEM_MANUAL=y 206CONFIG_FLATMEM_MANUAL=y
202# CONFIG_DISCONTIGMEM_MANUAL is not set 207# CONFIG_DISCONTIGMEM_MANUAL is not set
@@ -209,9 +214,9 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
209# CONFIG_PHYS_ADDR_T_64BIT is not set 214# CONFIG_PHYS_ADDR_T_64BIT is not set
210CONFIG_ZONE_DMA_FLAG=0 215CONFIG_ZONE_DMA_FLAG=0
211CONFIG_NR_QUICK=2 216CONFIG_NR_QUICK=2
212CONFIG_UNEVICTABLE_LRU=y
213CONFIG_HAVE_MLOCK=y 217CONFIG_HAVE_MLOCK=y
214CONFIG_HAVE_MLOCKED_PAGE_BIT=y 218CONFIG_HAVE_MLOCKED_PAGE_BIT=y
219CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
215 220
216# 221#
217# Cache configuration 222# Cache configuration
@@ -229,7 +234,6 @@ CONFIG_SH_FPU=y
229CONFIG_SH_STORE_QUEUES=y 234CONFIG_SH_STORE_QUEUES=y
230CONFIG_CPU_HAS_INTEVT=y 235CONFIG_CPU_HAS_INTEVT=y
231CONFIG_CPU_HAS_SR_RB=y 236CONFIG_CPU_HAS_SR_RB=y
232CONFIG_CPU_HAS_PTEA=y
233CONFIG_CPU_HAS_FPU=y 237CONFIG_CPU_HAS_FPU=y
234 238
235# 239#
@@ -240,9 +244,10 @@ CONFIG_SH_EDOSK7760=y
240# 244#
241# Timer and clock configuration 245# Timer and clock configuration
242# 246#
243CONFIG_SH_TMU=y 247CONFIG_SH_TIMER_TMU=y
244CONFIG_SH_TIMER_IRQ=16
245CONFIG_SH_PCLK_FREQ=33333333 248CONFIG_SH_PCLK_FREQ=33333333
249CONFIG_SH_CLK_CPG=y
250CONFIG_SH_CLK_CPG_LEGACY=y
246CONFIG_TICK_ONESHOT=y 251CONFIG_TICK_ONESHOT=y
247# CONFIG_NO_HZ is not set 252# CONFIG_NO_HZ is not set
248CONFIG_HIGH_RES_TIMERS=y 253CONFIG_HIGH_RES_TIMERS=y
@@ -258,6 +263,7 @@ CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
258# 263#
259CONFIG_SH_DMA_API=y 264CONFIG_SH_DMA_API=y
260CONFIG_SH_DMA=y 265CONFIG_SH_DMA=y
266CONFIG_SH_DMA_IRQ_MULTI=y
261CONFIG_NR_ONCHIP_DMA_CHANNELS=8 267CONFIG_NR_ONCHIP_DMA_CHANNELS=8
262# CONFIG_NR_DMA_CHANNELS_BOOL is not set 268# CONFIG_NR_DMA_CHANNELS_BOOL is not set
263# CONFIG_SH_DMABRG is not set 269# CONFIG_SH_DMABRG is not set
@@ -289,12 +295,14 @@ CONFIG_SCHED_HRTICK=y
289CONFIG_PREEMPT=y 295CONFIG_PREEMPT=y
290CONFIG_GUSA=y 296CONFIG_GUSA=y
291# CONFIG_GUSA_RB is not set 297# CONFIG_GUSA_RB is not set
298# CONFIG_SPARSE_IRQ is not set
292 299
293# 300#
294# Boot options 301# Boot options
295# 302#
296CONFIG_ZERO_PAGE_OFFSET=0x00001000 303CONFIG_ZERO_PAGE_OFFSET=0x00001000
297CONFIG_BOOT_LINK_OFFSET=0x02000000 304CONFIG_BOOT_LINK_OFFSET=0x02000000
305CONFIG_ENTRY_OFFSET=0x00001000
298# CONFIG_UBC_WAKEUP is not set 306# CONFIG_UBC_WAKEUP is not set
299CONFIG_CMDLINE_BOOL=y 307CONFIG_CMDLINE_BOOL=y
300CONFIG_CMDLINE="mem=64M console=ttySC2,115200 root=/dev/nfs rw nfsroot=192.168.0.3:/scripts/filesys ip=192.168.0.4" 308CONFIG_CMDLINE="mem=64M console=ttySC2,115200 root=/dev/nfs rw nfsroot=192.168.0.3:/scripts/filesys ip=192.168.0.4"
@@ -373,6 +381,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
373# CONFIG_ECONET is not set 381# CONFIG_ECONET is not set
374# CONFIG_WAN_ROUTER is not set 382# CONFIG_WAN_ROUTER is not set
375# CONFIG_PHONET is not set 383# CONFIG_PHONET is not set
384# CONFIG_IEEE802154 is not set
376# CONFIG_NET_SCHED is not set 385# CONFIG_NET_SCHED is not set
377# CONFIG_DCB is not set 386# CONFIG_DCB is not set
378 387
@@ -390,7 +399,11 @@ CONFIG_WIRELESS=y
390# CONFIG_WIRELESS_OLD_REGULATORY is not set 399# CONFIG_WIRELESS_OLD_REGULATORY is not set
391# CONFIG_WIRELESS_EXT is not set 400# CONFIG_WIRELESS_EXT is not set
392# CONFIG_LIB80211 is not set 401# CONFIG_LIB80211 is not set
393# CONFIG_MAC80211 is not set 402
403#
404# CFG80211 needs to be enabled for MAC80211
405#
406CONFIG_MAC80211_DEFAULT_PS_VALUE=0
394# CONFIG_WIMAX is not set 407# CONFIG_WIMAX is not set
395# CONFIG_RFKILL is not set 408# CONFIG_RFKILL is not set
396# CONFIG_NET_9P is not set 409# CONFIG_NET_9P is not set
@@ -523,7 +536,6 @@ CONFIG_HAVE_IDE=y
523# CONFIG_ATA is not set 536# CONFIG_ATA is not set
524# CONFIG_MD is not set 537# CONFIG_MD is not set
525CONFIG_NETDEVICES=y 538CONFIG_NETDEVICES=y
526CONFIG_COMPAT_NET_DEV_OPS=y
527# CONFIG_DUMMY is not set 539# CONFIG_DUMMY is not set
528# CONFIG_BONDING is not set 540# CONFIG_BONDING is not set
529# CONFIG_MACVLAN is not set 541# CONFIG_MACVLAN is not set
@@ -548,6 +560,7 @@ CONFIG_SMC91X=y
548# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set 560# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
549# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set 561# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
550# CONFIG_B44 is not set 562# CONFIG_B44 is not set
563# CONFIG_KS8842 is not set
551# CONFIG_NETDEV_1000 is not set 564# CONFIG_NETDEV_1000 is not set
552# CONFIG_NETDEV_10000 is not set 565# CONFIG_NETDEV_10000 is not set
553 566
@@ -670,7 +683,6 @@ CONFIG_I2C_SH7760=y
670# CONFIG_SENSORS_PCF8574 is not set 683# CONFIG_SENSORS_PCF8574 is not set
671# CONFIG_PCF8575 is not set 684# CONFIG_PCF8575 is not set
672# CONFIG_SENSORS_PCA9539 is not set 685# CONFIG_SENSORS_PCA9539 is not set
673# CONFIG_SENSORS_MAX6875 is not set
674# CONFIG_SENSORS_TSL2550 is not set 686# CONFIG_SENSORS_TSL2550 is not set
675CONFIG_I2C_DEBUG_CORE=y 687CONFIG_I2C_DEBUG_CORE=y
676CONFIG_I2C_DEBUG_ALGO=y 688CONFIG_I2C_DEBUG_ALGO=y
@@ -703,22 +715,7 @@ CONFIG_SSB_POSSIBLE=y
703# CONFIG_MFD_WM8350_I2C is not set 715# CONFIG_MFD_WM8350_I2C is not set
704# CONFIG_MFD_PCF50633 is not set 716# CONFIG_MFD_PCF50633 is not set
705# CONFIG_REGULATOR is not set 717# CONFIG_REGULATOR is not set
706 718# CONFIG_MEDIA_SUPPORT is not set
707#
708# Multimedia devices
709#
710
711#
712# Multimedia core support
713#
714# CONFIG_VIDEO_DEV is not set
715# CONFIG_DVB_CORE is not set
716# CONFIG_VIDEO_MEDIA is not set
717
718#
719# Multimedia drivers
720#
721# CONFIG_DAB is not set
722 719
723# 720#
724# Graphics support 721# Graphics support
@@ -783,6 +780,11 @@ CONFIG_SND_JACK=y
783# CONFIG_SND_VERBOSE_PROCFS is not set 780# CONFIG_SND_VERBOSE_PROCFS is not set
784CONFIG_SND_VERBOSE_PRINTK=y 781CONFIG_SND_VERBOSE_PRINTK=y
785# CONFIG_SND_DEBUG is not set 782# CONFIG_SND_DEBUG is not set
783# CONFIG_SND_RAWMIDI_SEQ is not set
784# CONFIG_SND_OPL3_LIB_SEQ is not set
785# CONFIG_SND_OPL4_LIB_SEQ is not set
786# CONFIG_SND_SBAWE_SEQ is not set
787# CONFIG_SND_EMU10K1_SEQ is not set
786CONFIG_SND_DRIVERS=y 788CONFIG_SND_DRIVERS=y
787# CONFIG_SND_DUMMY is not set 789# CONFIG_SND_DUMMY is not set
788# CONFIG_SND_MTPAV is not set 790# CONFIG_SND_MTPAV is not set
@@ -803,10 +805,15 @@ CONFIG_SND_SOC_I2C_AND_SPI=y
803# CONFIG_MEMSTICK is not set 805# CONFIG_MEMSTICK is not set
804# CONFIG_NEW_LEDS is not set 806# CONFIG_NEW_LEDS is not set
805# CONFIG_ACCESSIBILITY is not set 807# CONFIG_ACCESSIBILITY is not set
808CONFIG_RTC_LIB=y
806# CONFIG_RTC_CLASS is not set 809# CONFIG_RTC_CLASS is not set
807# CONFIG_DMADEVICES is not set 810# CONFIG_DMADEVICES is not set
808# CONFIG_AUXDISPLAY is not set 811# CONFIG_AUXDISPLAY is not set
809# CONFIG_UIO is not set 812# CONFIG_UIO is not set
813
814#
815# TI VLYNQ
816#
810# CONFIG_STAGING is not set 817# CONFIG_STAGING is not set
811 818
812# 819#
@@ -829,10 +836,11 @@ CONFIG_FS_MBCACHE=y
829# CONFIG_REISERFS_FS is not set 836# CONFIG_REISERFS_FS is not set
830# CONFIG_JFS_FS is not set 837# CONFIG_JFS_FS is not set
831CONFIG_FS_POSIX_ACL=y 838CONFIG_FS_POSIX_ACL=y
832CONFIG_FILE_LOCKING=y
833# CONFIG_XFS_FS is not set 839# CONFIG_XFS_FS is not set
834# CONFIG_OCFS2_FS is not set 840# CONFIG_OCFS2_FS is not set
835# CONFIG_BTRFS_FS is not set 841# CONFIG_BTRFS_FS is not set
842CONFIG_FILE_LOCKING=y
843CONFIG_FSNOTIFY=y
836CONFIG_DNOTIFY=y 844CONFIG_DNOTIFY=y
837CONFIG_INOTIFY=y 845CONFIG_INOTIFY=y
838CONFIG_INOTIFY_USER=y 846CONFIG_INOTIFY_USER=y
@@ -1015,18 +1023,16 @@ CONFIG_HAVE_FUNCTION_TRACER=y
1015CONFIG_HAVE_DYNAMIC_FTRACE=y 1023CONFIG_HAVE_DYNAMIC_FTRACE=y
1016CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 1024CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1017CONFIG_TRACING_SUPPORT=y 1025CONFIG_TRACING_SUPPORT=y
1018 1026CONFIG_FTRACE=y
1019#
1020# Tracers
1021#
1022# CONFIG_FUNCTION_TRACER is not set 1027# CONFIG_FUNCTION_TRACER is not set
1023# CONFIG_IRQSOFF_TRACER is not set 1028# CONFIG_IRQSOFF_TRACER is not set
1024# CONFIG_PREEMPT_TRACER is not set 1029# CONFIG_PREEMPT_TRACER is not set
1025# CONFIG_SCHED_TRACER is not set 1030# CONFIG_SCHED_TRACER is not set
1026# CONFIG_CONTEXT_SWITCH_TRACER is not set 1031# CONFIG_ENABLE_DEFAULT_TRACERS is not set
1027# CONFIG_EVENT_TRACER is not set
1028# CONFIG_BOOT_TRACER is not set 1032# CONFIG_BOOT_TRACER is not set
1029# CONFIG_TRACE_BRANCH_PROFILING is not set 1033CONFIG_BRANCH_PROFILE_NONE=y
1034# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
1035# CONFIG_PROFILE_ALL_BRANCHES is not set
1030# CONFIG_STACK_TRACER is not set 1036# CONFIG_STACK_TRACER is not set
1031# CONFIG_KMEMTRACE is not set 1037# CONFIG_KMEMTRACE is not set
1032# CONFIG_WORKQUEUE_TRACER is not set 1038# CONFIG_WORKQUEUE_TRACER is not set
@@ -1043,10 +1049,8 @@ CONFIG_EARLY_PRINTK=y
1043CONFIG_DEBUG_STACKOVERFLOW=y 1049CONFIG_DEBUG_STACKOVERFLOW=y
1044# CONFIG_DEBUG_STACK_USAGE is not set 1050# CONFIG_DEBUG_STACK_USAGE is not set
1045# CONFIG_4KSTACKS is not set 1051# CONFIG_4KSTACKS is not set
1046# CONFIG_IRQSTACKS is not set
1047CONFIG_DUMP_CODE=y 1052CONFIG_DUMP_CODE=y
1048# CONFIG_SH_NO_BSS_INIT is not set 1053# CONFIG_SH_NO_BSS_INIT is not set
1049# CONFIG_MORE_COMPILE_OPTIONS is not set
1050 1054
1051# 1055#
1052# Security options 1056# Security options
@@ -1165,3 +1169,4 @@ CONFIG_HAS_IOMEM=y
1165CONFIG_HAS_IOPORT=y 1169CONFIG_HAS_IOPORT=y
1166CONFIG_HAS_DMA=y 1170CONFIG_HAS_DMA=y
1167CONFIG_NLATTR=y 1171CONFIG_NLATTR=y
1172CONFIG_GENERIC_ATOMIC64=y
diff --git a/arch/sh/configs/espt_defconfig b/arch/sh/configs/espt_defconfig
index c5b50077913d..881128eeab35 100644
--- a/arch/sh/configs/espt_defconfig
+++ b/arch/sh/configs/espt_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.30-rc3 3# Linux kernel version: 2.6.30
4# Mon Apr 27 12:46:26 2009 4# Thu Jun 18 12:27:21 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -19,6 +19,7 @@ CONFIG_GENERIC_TIME=y
19CONFIG_GENERIC_CLOCKEVENTS=y 19CONFIG_GENERIC_CLOCKEVENTS=y
20# CONFIG_ARCH_SUSPEND_POSSIBLE is not set 20# CONFIG_ARCH_SUSPEND_POSSIBLE is not set
21CONFIG_ARCH_HIBERNATION_POSSIBLE=y 21CONFIG_ARCH_HIBERNATION_POSSIBLE=y
22CONFIG_SYS_SUPPORTS_TMU=y
22CONFIG_STACKTRACE_SUPPORT=y 23CONFIG_STACKTRACE_SUPPORT=y
23CONFIG_LOCKDEP_SUPPORT=y 24CONFIG_LOCKDEP_SUPPORT=y
24CONFIG_HAVE_LATENCYTOP_SUPPORT=y 25CONFIG_HAVE_LATENCYTOP_SUPPORT=y
@@ -79,7 +80,6 @@ CONFIG_UID16=y
79# CONFIG_SYSCTL_SYSCALL is not set 80# CONFIG_SYSCTL_SYSCALL is not set
80CONFIG_KALLSYMS=y 81CONFIG_KALLSYMS=y
81# CONFIG_KALLSYMS_EXTRA_PASS is not set 82# CONFIG_KALLSYMS_EXTRA_PASS is not set
82# CONFIG_STRIP_ASM_SYMS is not set
83CONFIG_HOTPLUG=y 83CONFIG_HOTPLUG=y
84CONFIG_PRINTK=y 84CONFIG_PRINTK=y
85CONFIG_BUG=y 85CONFIG_BUG=y
@@ -92,14 +92,19 @@ CONFIG_TIMERFD=y
92CONFIG_EVENTFD=y 92CONFIG_EVENTFD=y
93CONFIG_SHMEM=y 93CONFIG_SHMEM=y
94CONFIG_AIO=y 94CONFIG_AIO=y
95
96#
97# Performance Counters
98#
95CONFIG_VM_EVENT_COUNTERS=y 99CONFIG_VM_EVENT_COUNTERS=y
100# CONFIG_STRIP_ASM_SYMS is not set
96CONFIG_COMPAT_BRK=y 101CONFIG_COMPAT_BRK=y
97CONFIG_SLAB=y 102CONFIG_SLAB=y
98# CONFIG_SLUB is not set 103# CONFIG_SLUB is not set
99# CONFIG_SLOB is not set 104# CONFIG_SLOB is not set
100CONFIG_PROFILING=y 105CONFIG_PROFILING=y
101CONFIG_TRACEPOINTS=y 106CONFIG_TRACEPOINTS=y
102# CONFIG_MARKERS is not set 107CONFIG_MARKERS=y
103CONFIG_OPROFILE=y 108CONFIG_OPROFILE=y
104CONFIG_HAVE_OPROFILE=y 109CONFIG_HAVE_OPROFILE=y
105# CONFIG_KPROBES is not set 110# CONFIG_KPROBES is not set
@@ -184,6 +189,7 @@ CONFIG_CPU_SUBTYPE_SH7763=y
184CONFIG_QUICKLIST=y 189CONFIG_QUICKLIST=y
185CONFIG_MMU=y 190CONFIG_MMU=y
186CONFIG_PAGE_OFFSET=0x80000000 191CONFIG_PAGE_OFFSET=0x80000000
192CONFIG_FORCE_MAX_ZONEORDER=11
187CONFIG_MEMORY_START=0x0c000000 193CONFIG_MEMORY_START=0x0c000000
188CONFIG_MEMORY_SIZE=0x04000000 194CONFIG_MEMORY_SIZE=0x04000000
189CONFIG_29BIT=y 195CONFIG_29BIT=y
@@ -200,7 +206,6 @@ CONFIG_PAGE_SIZE_4KB=y
200# CONFIG_PAGE_SIZE_8KB is not set 206# CONFIG_PAGE_SIZE_8KB is not set
201# CONFIG_PAGE_SIZE_16KB is not set 207# CONFIG_PAGE_SIZE_16KB is not set
202# CONFIG_PAGE_SIZE_64KB is not set 208# CONFIG_PAGE_SIZE_64KB is not set
203CONFIG_ENTRY_OFFSET=0x00001000
204CONFIG_SELECT_MEMORY_MODEL=y 209CONFIG_SELECT_MEMORY_MODEL=y
205# CONFIG_FLATMEM_MANUAL is not set 210# CONFIG_FLATMEM_MANUAL is not set
206# CONFIG_DISCONTIGMEM_MANUAL is not set 211# CONFIG_DISCONTIGMEM_MANUAL is not set
@@ -215,9 +220,9 @@ CONFIG_MIGRATION=y
215# CONFIG_PHYS_ADDR_T_64BIT is not set 220# CONFIG_PHYS_ADDR_T_64BIT is not set
216CONFIG_ZONE_DMA_FLAG=0 221CONFIG_ZONE_DMA_FLAG=0
217CONFIG_NR_QUICK=2 222CONFIG_NR_QUICK=2
218CONFIG_UNEVICTABLE_LRU=y
219CONFIG_HAVE_MLOCK=y 223CONFIG_HAVE_MLOCK=y
220CONFIG_HAVE_MLOCKED_PAGE_BIT=y 224CONFIG_HAVE_MLOCKED_PAGE_BIT=y
225CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
221 226
222# 227#
223# Cache configuration 228# Cache configuration
@@ -246,9 +251,10 @@ CONFIG_SH_ESPT=y
246# 251#
247# Timer and clock configuration 252# Timer and clock configuration
248# 253#
249CONFIG_SH_TMU=y 254CONFIG_SH_TIMER_TMU=y
250CONFIG_SH_TIMER_IRQ=28
251CONFIG_SH_PCLK_FREQ=66666666 255CONFIG_SH_PCLK_FREQ=66666666
256CONFIG_SH_CLK_CPG=y
257CONFIG_SH_CLK_CPG_LEGACY=y
252# CONFIG_NO_HZ is not set 258# CONFIG_NO_HZ is not set
253# CONFIG_HIGH_RES_TIMERS is not set 259# CONFIG_HIGH_RES_TIMERS is not set
254CONFIG_GENERIC_CLOCKEVENTS_BUILD=y 260CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
@@ -289,12 +295,14 @@ CONFIG_PREEMPT_NONE=y
289# CONFIG_PREEMPT_VOLUNTARY is not set 295# CONFIG_PREEMPT_VOLUNTARY is not set
290# CONFIG_PREEMPT is not set 296# CONFIG_PREEMPT is not set
291CONFIG_GUSA=y 297CONFIG_GUSA=y
298# CONFIG_SPARSE_IRQ is not set
292 299
293# 300#
294# Boot options 301# Boot options
295# 302#
296CONFIG_ZERO_PAGE_OFFSET=0x00001000 303CONFIG_ZERO_PAGE_OFFSET=0x00001000
297CONFIG_BOOT_LINK_OFFSET=0x00800000 304CONFIG_BOOT_LINK_OFFSET=0x00800000
305CONFIG_ENTRY_OFFSET=0x00001000
298CONFIG_CMDLINE_BOOL=y 306CONFIG_CMDLINE_BOOL=y
299CONFIG_CMDLINE="console=ttySC0,115200 root=/dev/nfs ip=bootp" 307CONFIG_CMDLINE="console=ttySC0,115200 root=/dev/nfs ip=bootp"
300 308
@@ -377,6 +385,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
377# CONFIG_ECONET is not set 385# CONFIG_ECONET is not set
378# CONFIG_WAN_ROUTER is not set 386# CONFIG_WAN_ROUTER is not set
379# CONFIG_PHONET is not set 387# CONFIG_PHONET is not set
388# CONFIG_IEEE802154 is not set
380# CONFIG_NET_SCHED is not set 389# CONFIG_NET_SCHED is not set
381# CONFIG_DCB is not set 390# CONFIG_DCB is not set
382 391
@@ -529,10 +538,6 @@ CONFIG_BLK_DEV_SD=y
529# CONFIG_BLK_DEV_SR is not set 538# CONFIG_BLK_DEV_SR is not set
530# CONFIG_CHR_DEV_SG is not set 539# CONFIG_CHR_DEV_SG is not set
531# CONFIG_CHR_DEV_SCH is not set 540# CONFIG_CHR_DEV_SCH is not set
532
533#
534# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
535#
536# CONFIG_SCSI_MULTI_LUN is not set 541# CONFIG_SCSI_MULTI_LUN is not set
537# CONFIG_SCSI_CONSTANTS is not set 542# CONFIG_SCSI_CONSTANTS is not set
538# CONFIG_SCSI_LOGGING is not set 543# CONFIG_SCSI_LOGGING is not set
@@ -549,6 +554,7 @@ CONFIG_SCSI_WAIT_SCAN=m
549# CONFIG_SCSI_SRP_ATTRS is not set 554# CONFIG_SCSI_SRP_ATTRS is not set
550CONFIG_SCSI_LOWLEVEL=y 555CONFIG_SCSI_LOWLEVEL=y
551# CONFIG_ISCSI_TCP is not set 556# CONFIG_ISCSI_TCP is not set
557# CONFIG_SCSI_BNX2_ISCSI is not set
552# CONFIG_LIBFC is not set 558# CONFIG_LIBFC is not set
553# CONFIG_LIBFCOE is not set 559# CONFIG_LIBFCOE is not set
554# CONFIG_SCSI_DEBUG is not set 560# CONFIG_SCSI_DEBUG is not set
@@ -557,7 +563,6 @@ CONFIG_SCSI_LOWLEVEL=y
557# CONFIG_ATA is not set 563# CONFIG_ATA is not set
558# CONFIG_MD is not set 564# CONFIG_MD is not set
559CONFIG_NETDEVICES=y 565CONFIG_NETDEVICES=y
560CONFIG_COMPAT_NET_DEV_OPS=y
561# CONFIG_DUMMY is not set 566# CONFIG_DUMMY is not set
562# CONFIG_BONDING is not set 567# CONFIG_BONDING is not set
563# CONFIG_MACVLAN is not set 568# CONFIG_MACVLAN is not set
@@ -602,6 +607,7 @@ CONFIG_SH_ETH=y
602# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set 607# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
603# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set 608# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
604# CONFIG_B44 is not set 609# CONFIG_B44 is not set
610# CONFIG_KS8842 is not set
605# CONFIG_NETDEV_1000 is not set 611# CONFIG_NETDEV_1000 is not set
606# CONFIG_NETDEV_10000 is not set 612# CONFIG_NETDEV_10000 is not set
607 613
@@ -720,22 +726,7 @@ CONFIG_SSB_POSSIBLE=y
720# CONFIG_HTC_PASIC3 is not set 726# CONFIG_HTC_PASIC3 is not set
721# CONFIG_MFD_TMIO is not set 727# CONFIG_MFD_TMIO is not set
722# CONFIG_REGULATOR is not set 728# CONFIG_REGULATOR is not set
723 729# CONFIG_MEDIA_SUPPORT is not set
724#
725# Multimedia devices
726#
727
728#
729# Multimedia core support
730#
731# CONFIG_VIDEO_DEV is not set
732# CONFIG_DVB_CORE is not set
733# CONFIG_VIDEO_MEDIA is not set
734
735#
736# Multimedia drivers
737#
738# CONFIG_DAB is not set
739 730
740# 731#
741# Graphics support 732# Graphics support
@@ -909,10 +900,15 @@ CONFIG_USB_STORAGE=y
909# CONFIG_MEMSTICK is not set 900# CONFIG_MEMSTICK is not set
910# CONFIG_NEW_LEDS is not set 901# CONFIG_NEW_LEDS is not set
911# CONFIG_ACCESSIBILITY is not set 902# CONFIG_ACCESSIBILITY is not set
903CONFIG_RTC_LIB=y
912# CONFIG_RTC_CLASS is not set 904# CONFIG_RTC_CLASS is not set
913# CONFIG_DMADEVICES is not set 905# CONFIG_DMADEVICES is not set
914# CONFIG_AUXDISPLAY is not set 906# CONFIG_AUXDISPLAY is not set
915# CONFIG_UIO is not set 907# CONFIG_UIO is not set
908
909#
910# TI VLYNQ
911#
916# CONFIG_STAGING is not set 912# CONFIG_STAGING is not set
917 913
918# 914#
@@ -933,10 +929,11 @@ CONFIG_FS_MBCACHE=y
933# CONFIG_REISERFS_FS is not set 929# CONFIG_REISERFS_FS is not set
934# CONFIG_JFS_FS is not set 930# CONFIG_JFS_FS is not set
935CONFIG_FS_POSIX_ACL=y 931CONFIG_FS_POSIX_ACL=y
936CONFIG_FILE_LOCKING=y
937# CONFIG_XFS_FS is not set 932# CONFIG_XFS_FS is not set
938# CONFIG_OCFS2_FS is not set 933# CONFIG_OCFS2_FS is not set
939# CONFIG_BTRFS_FS is not set 934# CONFIG_BTRFS_FS is not set
935CONFIG_FILE_LOCKING=y
936CONFIG_FSNOTIFY=y
940CONFIG_DNOTIFY=y 937CONFIG_DNOTIFY=y
941CONFIG_INOTIFY=y 938CONFIG_INOTIFY=y
942CONFIG_INOTIFY_USER=y 939CONFIG_INOTIFY_USER=y
@@ -1088,31 +1085,17 @@ CONFIG_HAVE_FUNCTION_TRACER=y
1088CONFIG_HAVE_DYNAMIC_FTRACE=y 1085CONFIG_HAVE_DYNAMIC_FTRACE=y
1089CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 1086CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1090CONFIG_RING_BUFFER=y 1087CONFIG_RING_BUFFER=y
1088CONFIG_EVENT_TRACING=y
1089CONFIG_CONTEXT_SWITCH_TRACER=y
1091CONFIG_TRACING=y 1090CONFIG_TRACING=y
1092CONFIG_TRACING_SUPPORT=y 1091CONFIG_TRACING_SUPPORT=y
1093 1092# CONFIG_FTRACE is not set
1094#
1095# Tracers
1096#
1097# CONFIG_FUNCTION_TRACER is not set
1098# CONFIG_IRQSOFF_TRACER is not set
1099# CONFIG_SCHED_TRACER is not set
1100# CONFIG_CONTEXT_SWITCH_TRACER is not set
1101# CONFIG_EVENT_TRACER is not set
1102# CONFIG_BOOT_TRACER is not set
1103# CONFIG_TRACE_BRANCH_PROFILING is not set
1104# CONFIG_STACK_TRACER is not set
1105# CONFIG_KMEMTRACE is not set
1106# CONFIG_WORKQUEUE_TRACER is not set
1107# CONFIG_BLK_DEV_IO_TRACE is not set
1108# CONFIG_FTRACE_STARTUP_TEST is not set
1109# CONFIG_DYNAMIC_DEBUG is not set 1093# CONFIG_DYNAMIC_DEBUG is not set
1110# CONFIG_DMA_API_DEBUG is not set 1094# CONFIG_DMA_API_DEBUG is not set
1111# CONFIG_SAMPLES is not set 1095# CONFIG_SAMPLES is not set
1112CONFIG_HAVE_ARCH_KGDB=y 1096CONFIG_HAVE_ARCH_KGDB=y
1113# CONFIG_SH_STANDARD_BIOS is not set 1097# CONFIG_SH_STANDARD_BIOS is not set
1114# CONFIG_EARLY_SCIF_CONSOLE is not set 1098# CONFIG_EARLY_SCIF_CONSOLE is not set
1115# CONFIG_MORE_COMPILE_OPTIONS is not set
1116 1099
1117# 1100#
1118# Security options 1101# Security options
@@ -1226,3 +1209,4 @@ CONFIG_HAS_IOMEM=y
1226CONFIG_HAS_IOPORT=y 1209CONFIG_HAS_IOPORT=y
1227CONFIG_HAS_DMA=y 1210CONFIG_HAS_DMA=y
1228CONFIG_NLATTR=y 1211CONFIG_NLATTR=y
1212CONFIG_GENERIC_ATOMIC64=y
diff --git a/arch/sh/configs/hp6xx_defconfig b/arch/sh/configs/hp6xx_defconfig
index 8e13027eecc3..3249d46fdc13 100644
--- a/arch/sh/configs/hp6xx_defconfig
+++ b/arch/sh/configs/hp6xx_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.30-rc3 3# Linux kernel version: 2.6.30
4# Mon Apr 27 12:47:15 2009 4# Thu Jun 18 12:28:12 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -20,6 +20,7 @@ CONFIG_GENERIC_CLOCKEVENTS=y
20CONFIG_ARCH_SUSPEND_POSSIBLE=y 20CONFIG_ARCH_SUSPEND_POSSIBLE=y
21CONFIG_ARCH_HIBERNATION_POSSIBLE=y 21CONFIG_ARCH_HIBERNATION_POSSIBLE=y
22CONFIG_SYS_SUPPORTS_APM_EMULATION=y 22CONFIG_SYS_SUPPORTS_APM_EMULATION=y
23CONFIG_SYS_SUPPORTS_TMU=y
23CONFIG_STACKTRACE_SUPPORT=y 24CONFIG_STACKTRACE_SUPPORT=y
24CONFIG_LOCKDEP_SUPPORT=y 25CONFIG_LOCKDEP_SUPPORT=y
25CONFIG_HAVE_LATENCYTOP_SUPPORT=y 26CONFIG_HAVE_LATENCYTOP_SUPPORT=y
@@ -68,7 +69,6 @@ CONFIG_UID16=y
68# CONFIG_SYSCTL_SYSCALL is not set 69# CONFIG_SYSCTL_SYSCALL is not set
69CONFIG_KALLSYMS=y 70CONFIG_KALLSYMS=y
70# CONFIG_KALLSYMS_EXTRA_PASS is not set 71# CONFIG_KALLSYMS_EXTRA_PASS is not set
71# CONFIG_STRIP_ASM_SYMS is not set
72CONFIG_HOTPLUG=y 72CONFIG_HOTPLUG=y
73CONFIG_PRINTK=y 73CONFIG_PRINTK=y
74CONFIG_BUG=y 74CONFIG_BUG=y
@@ -81,7 +81,12 @@ CONFIG_TIMERFD=y
81CONFIG_EVENTFD=y 81CONFIG_EVENTFD=y
82CONFIG_SHMEM=y 82CONFIG_SHMEM=y
83CONFIG_AIO=y 83CONFIG_AIO=y
84
85#
86# Performance Counters
87#
84CONFIG_VM_EVENT_COUNTERS=y 88CONFIG_VM_EVENT_COUNTERS=y
89# CONFIG_STRIP_ASM_SYMS is not set
85CONFIG_COMPAT_BRK=y 90CONFIG_COMPAT_BRK=y
86CONFIG_SLAB=y 91CONFIG_SLAB=y
87# CONFIG_SLUB is not set 92# CONFIG_SLUB is not set
@@ -165,6 +170,7 @@ CONFIG_CPU_SUBTYPE_SH7709=y
165CONFIG_QUICKLIST=y 170CONFIG_QUICKLIST=y
166CONFIG_MMU=y 171CONFIG_MMU=y
167CONFIG_PAGE_OFFSET=0x80000000 172CONFIG_PAGE_OFFSET=0x80000000
173CONFIG_FORCE_MAX_ZONEORDER=11
168CONFIG_MEMORY_START=0x0d000000 174CONFIG_MEMORY_START=0x0d000000
169CONFIG_MEMORY_SIZE=0x00400000 175CONFIG_MEMORY_SIZE=0x00400000
170CONFIG_29BIT=y 176CONFIG_29BIT=y
@@ -179,7 +185,6 @@ CONFIG_PAGE_SIZE_4KB=y
179# CONFIG_PAGE_SIZE_8KB is not set 185# CONFIG_PAGE_SIZE_8KB is not set
180# CONFIG_PAGE_SIZE_16KB is not set 186# CONFIG_PAGE_SIZE_16KB is not set
181# CONFIG_PAGE_SIZE_64KB is not set 187# CONFIG_PAGE_SIZE_64KB is not set
182CONFIG_ENTRY_OFFSET=0x00001000
183CONFIG_SELECT_MEMORY_MODEL=y 188CONFIG_SELECT_MEMORY_MODEL=y
184CONFIG_FLATMEM_MANUAL=y 189CONFIG_FLATMEM_MANUAL=y
185# CONFIG_DISCONTIGMEM_MANUAL is not set 190# CONFIG_DISCONTIGMEM_MANUAL is not set
@@ -192,9 +197,9 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
192# CONFIG_PHYS_ADDR_T_64BIT is not set 197# CONFIG_PHYS_ADDR_T_64BIT is not set
193CONFIG_ZONE_DMA_FLAG=0 198CONFIG_ZONE_DMA_FLAG=0
194CONFIG_NR_QUICK=2 199CONFIG_NR_QUICK=2
195CONFIG_UNEVICTABLE_LRU=y
196CONFIG_HAVE_MLOCK=y 200CONFIG_HAVE_MLOCK=y
197CONFIG_HAVE_MLOCKED_PAGE_BIT=y 201CONFIG_HAVE_MLOCKED_PAGE_BIT=y
202CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
198 203
199# 204#
200# Cache configuration 205# Cache configuration
@@ -223,9 +228,10 @@ CONFIG_SH_HP6XX=y
223# 228#
224# Timer and clock configuration 229# Timer and clock configuration
225# 230#
226CONFIG_SH_TMU=y 231CONFIG_SH_TIMER_TMU=y
227CONFIG_SH_TIMER_IRQ=16
228CONFIG_SH_PCLK_FREQ=22110000 232CONFIG_SH_PCLK_FREQ=22110000
233CONFIG_SH_CLK_CPG=y
234CONFIG_SH_CLK_CPG_LEGACY=y
229# CONFIG_NO_HZ is not set 235# CONFIG_NO_HZ is not set
230# CONFIG_HIGH_RES_TIMERS is not set 236# CONFIG_HIGH_RES_TIMERS is not set
231CONFIG_GENERIC_CLOCKEVENTS_BUILD=y 237CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
@@ -249,7 +255,6 @@ CONFIG_NR_ONCHIP_DMA_CHANNELS=6
249CONFIG_HD6446X_SERIES=y 255CONFIG_HD6446X_SERIES=y
250CONFIG_HD64461=y 256CONFIG_HD64461=y
251CONFIG_HD64461_IRQ=36 257CONFIG_HD64461_IRQ=36
252CONFIG_HD64461_IOBASE=0xb0000000
253CONFIG_HD64461_ENABLER=y 258CONFIG_HD64461_ENABLER=y
254 259
255# 260#
@@ -275,12 +280,14 @@ CONFIG_PREEMPT_NONE=y
275# CONFIG_PREEMPT is not set 280# CONFIG_PREEMPT is not set
276CONFIG_GUSA=y 281CONFIG_GUSA=y
277# CONFIG_GUSA_RB is not set 282# CONFIG_GUSA_RB is not set
283# CONFIG_SPARSE_IRQ is not set
278 284
279# 285#
280# Boot options 286# Boot options
281# 287#
282CONFIG_ZERO_PAGE_OFFSET=0x00001000 288CONFIG_ZERO_PAGE_OFFSET=0x00001000
283CONFIG_BOOT_LINK_OFFSET=0x00800000 289CONFIG_BOOT_LINK_OFFSET=0x00800000
290CONFIG_ENTRY_OFFSET=0x00001000
284# CONFIG_CMDLINE_BOOL is not set 291# CONFIG_CMDLINE_BOOL is not set
285 292
286# 293#
@@ -370,10 +377,6 @@ CONFIG_BLK_DEV_SD=y
370# CONFIG_BLK_DEV_SR is not set 377# CONFIG_BLK_DEV_SR is not set
371# CONFIG_CHR_DEV_SG is not set 378# CONFIG_CHR_DEV_SG is not set
372# CONFIG_CHR_DEV_SCH is not set 379# CONFIG_CHR_DEV_SCH is not set
373
374#
375# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
376#
377# CONFIG_SCSI_MULTI_LUN is not set 380# CONFIG_SCSI_MULTI_LUN is not set
378# CONFIG_SCSI_CONSTANTS is not set 381# CONFIG_SCSI_CONSTANTS is not set
379# CONFIG_SCSI_LOGGING is not set 382# CONFIG_SCSI_LOGGING is not set
@@ -387,6 +390,7 @@ CONFIG_BLK_DEV_SD=y
387# CONFIG_SCSI_SAS_LIBSAS is not set 390# CONFIG_SCSI_SAS_LIBSAS is not set
388# CONFIG_SCSI_SRP_ATTRS is not set 391# CONFIG_SCSI_SRP_ATTRS is not set
389CONFIG_SCSI_LOWLEVEL=y 392CONFIG_SCSI_LOWLEVEL=y
393# CONFIG_SCSI_BNX2_ISCSI is not set
390# CONFIG_LIBFC is not set 394# CONFIG_LIBFC is not set
391# CONFIG_LIBFCOE is not set 395# CONFIG_LIBFCOE is not set
392# CONFIG_SCSI_DEBUG is not set 396# CONFIG_SCSI_DEBUG is not set
@@ -524,21 +528,7 @@ CONFIG_SSB_POSSIBLE=y
524# CONFIG_HTC_PASIC3 is not set 528# CONFIG_HTC_PASIC3 is not set
525# CONFIG_MFD_TMIO is not set 529# CONFIG_MFD_TMIO is not set
526# CONFIG_REGULATOR is not set 530# CONFIG_REGULATOR is not set
527 531# CONFIG_MEDIA_SUPPORT is not set
528#
529# Multimedia devices
530#
531
532#
533# Multimedia core support
534#
535# CONFIG_VIDEO_DEV is not set
536# CONFIG_VIDEO_MEDIA is not set
537
538#
539# Multimedia drivers
540#
541# CONFIG_DAB is not set
542 532
543# 533#
544# Graphics support 534# Graphics support
@@ -651,9 +641,14 @@ CONFIG_RTC_INTF_DEV=y
651# on-CPU RTC drivers 641# on-CPU RTC drivers
652# 642#
653CONFIG_RTC_DRV_SH=y 643CONFIG_RTC_DRV_SH=y
644# CONFIG_RTC_DRV_GENERIC is not set
654# CONFIG_DMADEVICES is not set 645# CONFIG_DMADEVICES is not set
655# CONFIG_AUXDISPLAY is not set 646# CONFIG_AUXDISPLAY is not set
656# CONFIG_UIO is not set 647# CONFIG_UIO is not set
648
649#
650# TI VLYNQ
651#
657# CONFIG_STAGING is not set 652# CONFIG_STAGING is not set
658 653
659# 654#
@@ -667,9 +662,10 @@ CONFIG_EXT2_FS=y
667# CONFIG_REISERFS_FS is not set 662# CONFIG_REISERFS_FS is not set
668# CONFIG_JFS_FS is not set 663# CONFIG_JFS_FS is not set
669# CONFIG_FS_POSIX_ACL is not set 664# CONFIG_FS_POSIX_ACL is not set
670CONFIG_FILE_LOCKING=y
671# CONFIG_XFS_FS is not set 665# CONFIG_XFS_FS is not set
672# CONFIG_BTRFS_FS is not set 666# CONFIG_BTRFS_FS is not set
667CONFIG_FILE_LOCKING=y
668CONFIG_FSNOTIFY=y
673CONFIG_DNOTIFY=y 669CONFIG_DNOTIFY=y
674CONFIG_INOTIFY=y 670CONFIG_INOTIFY=y
675CONFIG_INOTIFY_USER=y 671CONFIG_INOTIFY_USER=y
@@ -798,27 +794,12 @@ CONFIG_HAVE_FUNCTION_TRACER=y
798CONFIG_HAVE_DYNAMIC_FTRACE=y 794CONFIG_HAVE_DYNAMIC_FTRACE=y
799CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 795CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
800CONFIG_TRACING_SUPPORT=y 796CONFIG_TRACING_SUPPORT=y
801 797# CONFIG_FTRACE is not set
802#
803# Tracers
804#
805# CONFIG_FUNCTION_TRACER is not set
806# CONFIG_IRQSOFF_TRACER is not set
807# CONFIG_SCHED_TRACER is not set
808# CONFIG_CONTEXT_SWITCH_TRACER is not set
809# CONFIG_EVENT_TRACER is not set
810# CONFIG_BOOT_TRACER is not set
811# CONFIG_TRACE_BRANCH_PROFILING is not set
812# CONFIG_STACK_TRACER is not set
813# CONFIG_KMEMTRACE is not set
814# CONFIG_WORKQUEUE_TRACER is not set
815# CONFIG_BLK_DEV_IO_TRACE is not set
816# CONFIG_DMA_API_DEBUG is not set 798# CONFIG_DMA_API_DEBUG is not set
817# CONFIG_SAMPLES is not set 799# CONFIG_SAMPLES is not set
818CONFIG_HAVE_ARCH_KGDB=y 800CONFIG_HAVE_ARCH_KGDB=y
819# CONFIG_SH_STANDARD_BIOS is not set 801# CONFIG_SH_STANDARD_BIOS is not set
820# CONFIG_EARLY_SCIF_CONSOLE is not set 802# CONFIG_EARLY_SCIF_CONSOLE is not set
821# CONFIG_MORE_COMPILE_OPTIONS is not set
822 803
823# 804#
824# Security options 805# Security options
@@ -939,3 +920,4 @@ CONFIG_CRC32=y
939CONFIG_HAS_IOMEM=y 920CONFIG_HAS_IOMEM=y
940CONFIG_HAS_IOPORT=y 921CONFIG_HAS_IOPORT=y
941CONFIG_HAS_DMA=y 922CONFIG_HAS_DMA=y
923CONFIG_GENERIC_ATOMIC64=y
diff --git a/arch/sh/configs/landisk_defconfig b/arch/sh/configs/landisk_defconfig
index 7f549aef0dfd..ba05739fda21 100644
--- a/arch/sh/configs/landisk_defconfig
+++ b/arch/sh/configs/landisk_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.30-rc3 3# Linux kernel version: 2.6.30
4# Mon Apr 27 12:47:48 2009 4# Thu Jun 18 12:28:45 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -20,6 +20,7 @@ CONFIG_GENERIC_CLOCKEVENTS=y
20# CONFIG_ARCH_SUSPEND_POSSIBLE is not set 20# CONFIG_ARCH_SUSPEND_POSSIBLE is not set
21CONFIG_ARCH_HIBERNATION_POSSIBLE=y 21CONFIG_ARCH_HIBERNATION_POSSIBLE=y
22CONFIG_SYS_SUPPORTS_PCI=y 22CONFIG_SYS_SUPPORTS_PCI=y
23CONFIG_SYS_SUPPORTS_TMU=y
23CONFIG_STACKTRACE_SUPPORT=y 24CONFIG_STACKTRACE_SUPPORT=y
24CONFIG_LOCKDEP_SUPPORT=y 25CONFIG_LOCKDEP_SUPPORT=y
25CONFIG_HAVE_LATENCYTOP_SUPPORT=y 26CONFIG_HAVE_LATENCYTOP_SUPPORT=y
@@ -70,7 +71,6 @@ CONFIG_UID16=y
70# CONFIG_SYSCTL_SYSCALL is not set 71# CONFIG_SYSCTL_SYSCALL is not set
71CONFIG_KALLSYMS=y 72CONFIG_KALLSYMS=y
72CONFIG_KALLSYMS_EXTRA_PASS=y 73CONFIG_KALLSYMS_EXTRA_PASS=y
73# CONFIG_STRIP_ASM_SYMS is not set
74CONFIG_HOTPLUG=y 74CONFIG_HOTPLUG=y
75CONFIG_PRINTK=y 75CONFIG_PRINTK=y
76CONFIG_BUG=y 76CONFIG_BUG=y
@@ -83,8 +83,13 @@ CONFIG_TIMERFD=y
83CONFIG_EVENTFD=y 83CONFIG_EVENTFD=y
84CONFIG_SHMEM=y 84CONFIG_SHMEM=y
85CONFIG_AIO=y 85CONFIG_AIO=y
86
87#
88# Performance Counters
89#
86CONFIG_VM_EVENT_COUNTERS=y 90CONFIG_VM_EVENT_COUNTERS=y
87CONFIG_PCI_QUIRKS=y 91CONFIG_PCI_QUIRKS=y
92# CONFIG_STRIP_ASM_SYMS is not set
88CONFIG_COMPAT_BRK=y 93CONFIG_COMPAT_BRK=y
89CONFIG_SLAB=y 94CONFIG_SLAB=y
90# CONFIG_SLUB is not set 95# CONFIG_SLUB is not set
@@ -174,6 +179,7 @@ CONFIG_CPU_SUBTYPE_SH7751R=y
174CONFIG_QUICKLIST=y 179CONFIG_QUICKLIST=y
175CONFIG_MMU=y 180CONFIG_MMU=y
176CONFIG_PAGE_OFFSET=0x80000000 181CONFIG_PAGE_OFFSET=0x80000000
182CONFIG_FORCE_MAX_ZONEORDER=11
177CONFIG_MEMORY_START=0x0c000000 183CONFIG_MEMORY_START=0x0c000000
178CONFIG_MEMORY_SIZE=0x04000000 184CONFIG_MEMORY_SIZE=0x04000000
179CONFIG_29BIT=y 185CONFIG_29BIT=y
@@ -188,7 +194,6 @@ CONFIG_PAGE_SIZE_4KB=y
188# CONFIG_PAGE_SIZE_8KB is not set 194# CONFIG_PAGE_SIZE_8KB is not set
189# CONFIG_PAGE_SIZE_16KB is not set 195# CONFIG_PAGE_SIZE_16KB is not set
190# CONFIG_PAGE_SIZE_64KB is not set 196# CONFIG_PAGE_SIZE_64KB is not set
191CONFIG_ENTRY_OFFSET=0x00001000
192CONFIG_SELECT_MEMORY_MODEL=y 197CONFIG_SELECT_MEMORY_MODEL=y
193CONFIG_FLATMEM_MANUAL=y 198CONFIG_FLATMEM_MANUAL=y
194# CONFIG_DISCONTIGMEM_MANUAL is not set 199# CONFIG_DISCONTIGMEM_MANUAL is not set
@@ -201,9 +206,9 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
201# CONFIG_PHYS_ADDR_T_64BIT is not set 206# CONFIG_PHYS_ADDR_T_64BIT is not set
202CONFIG_ZONE_DMA_FLAG=0 207CONFIG_ZONE_DMA_FLAG=0
203CONFIG_NR_QUICK=2 208CONFIG_NR_QUICK=2
204CONFIG_UNEVICTABLE_LRU=y
205CONFIG_HAVE_MLOCK=y 209CONFIG_HAVE_MLOCK=y
206CONFIG_HAVE_MLOCKED_PAGE_BIT=y 210CONFIG_HAVE_MLOCKED_PAGE_BIT=y
211CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
207 212
208# 213#
209# Cache configuration 214# Cache configuration
@@ -221,7 +226,6 @@ CONFIG_SH_FPU=y
221# CONFIG_SH_STORE_QUEUES is not set 226# CONFIG_SH_STORE_QUEUES is not set
222CONFIG_CPU_HAS_INTEVT=y 227CONFIG_CPU_HAS_INTEVT=y
223CONFIG_CPU_HAS_SR_RB=y 228CONFIG_CPU_HAS_SR_RB=y
224CONFIG_CPU_HAS_PTEA=y
225CONFIG_CPU_HAS_FPU=y 229CONFIG_CPU_HAS_FPU=y
226 230
227# 231#
@@ -237,9 +241,10 @@ CONFIG_SH_LANDISK=y
237# 241#
238# Timer and clock configuration 242# Timer and clock configuration
239# 243#
240CONFIG_SH_TMU=y 244CONFIG_SH_TIMER_TMU=y
241CONFIG_SH_TIMER_IRQ=16
242CONFIG_SH_PCLK_FREQ=33333333 245CONFIG_SH_PCLK_FREQ=33333333
246CONFIG_SH_CLK_CPG=y
247CONFIG_SH_CLK_CPG_LEGACY=y
243# CONFIG_NO_HZ is not set 248# CONFIG_NO_HZ is not set
244# CONFIG_HIGH_RES_TIMERS is not set 249# CONFIG_HIGH_RES_TIMERS is not set
245CONFIG_GENERIC_CLOCKEVENTS_BUILD=y 250CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
@@ -281,12 +286,14 @@ CONFIG_PREEMPT_NONE=y
281# CONFIG_PREEMPT is not set 286# CONFIG_PREEMPT is not set
282CONFIG_GUSA=y 287CONFIG_GUSA=y
283# CONFIG_GUSA_RB is not set 288# CONFIG_GUSA_RB is not set
289# CONFIG_SPARSE_IRQ is not set
284 290
285# 291#
286# Boot options 292# Boot options
287# 293#
288CONFIG_ZERO_PAGE_OFFSET=0x00001000 294CONFIG_ZERO_PAGE_OFFSET=0x00001000
289CONFIG_BOOT_LINK_OFFSET=0x00800000 295CONFIG_BOOT_LINK_OFFSET=0x00800000
296CONFIG_ENTRY_OFFSET=0x00001000
290# CONFIG_UBC_WAKEUP is not set 297# CONFIG_UBC_WAKEUP is not set
291# CONFIG_CMDLINE_BOOL is not set 298# CONFIG_CMDLINE_BOOL is not set
292 299
@@ -420,6 +427,7 @@ CONFIG_ATALK=m
420# CONFIG_ECONET is not set 427# CONFIG_ECONET is not set
421# CONFIG_WAN_ROUTER is not set 428# CONFIG_WAN_ROUTER is not set
422# CONFIG_PHONET is not set 429# CONFIG_PHONET is not set
430# CONFIG_IEEE802154 is not set
423# CONFIG_NET_SCHED is not set 431# CONFIG_NET_SCHED is not set
424# CONFIG_DCB is not set 432# CONFIG_DCB is not set
425 433
@@ -437,7 +445,11 @@ CONFIG_WIRELESS=y
437# CONFIG_WIRELESS_OLD_REGULATORY is not set 445# CONFIG_WIRELESS_OLD_REGULATORY is not set
438# CONFIG_WIRELESS_EXT is not set 446# CONFIG_WIRELESS_EXT is not set
439# CONFIG_LIB80211 is not set 447# CONFIG_LIB80211 is not set
440# CONFIG_MAC80211 is not set 448
449#
450# CFG80211 needs to be enabled for MAC80211
451#
452CONFIG_MAC80211_DEFAULT_PS_VALUE=0
441# CONFIG_WIMAX is not set 453# CONFIG_WIMAX is not set
442# CONFIG_RFKILL is not set 454# CONFIG_RFKILL is not set
443# CONFIG_NET_9P is not set 455# CONFIG_NET_9P is not set
@@ -488,6 +500,7 @@ CONFIG_MISC_DEVICES=y
488# EEPROM support 500# EEPROM support
489# 501#
490# CONFIG_EEPROM_93CX6 is not set 502# CONFIG_EEPROM_93CX6 is not set
503# CONFIG_CB710_CORE is not set
491CONFIG_HAVE_IDE=y 504CONFIG_HAVE_IDE=y
492CONFIG_IDE=y 505CONFIG_IDE=y
493 506
@@ -567,10 +580,6 @@ CONFIG_BLK_DEV_SD=y
567# CONFIG_BLK_DEV_SR is not set 580# CONFIG_BLK_DEV_SR is not set
568# CONFIG_CHR_DEV_SG is not set 581# CONFIG_CHR_DEV_SG is not set
569# CONFIG_CHR_DEV_SCH is not set 582# CONFIG_CHR_DEV_SCH is not set
570
571#
572# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
573#
574CONFIG_SCSI_MULTI_LUN=y 583CONFIG_SCSI_MULTI_LUN=y
575# CONFIG_SCSI_CONSTANTS is not set 584# CONFIG_SCSI_CONSTANTS is not set
576# CONFIG_SCSI_LOGGING is not set 585# CONFIG_SCSI_LOGGING is not set
@@ -588,6 +597,7 @@ CONFIG_SCSI_WAIT_SCAN=m
588CONFIG_SCSI_LOWLEVEL=y 597CONFIG_SCSI_LOWLEVEL=y
589# CONFIG_ISCSI_TCP is not set 598# CONFIG_ISCSI_TCP is not set
590# CONFIG_SCSI_CXGB3_ISCSI is not set 599# CONFIG_SCSI_CXGB3_ISCSI is not set
600# CONFIG_SCSI_BNX2_ISCSI is not set
591# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 601# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
592# CONFIG_SCSI_3W_9XXX is not set 602# CONFIG_SCSI_3W_9XXX is not set
593# CONFIG_SCSI_ACARD is not set 603# CONFIG_SCSI_ACARD is not set
@@ -596,6 +606,7 @@ CONFIG_SCSI_LOWLEVEL=y
596# CONFIG_SCSI_AIC7XXX_OLD is not set 606# CONFIG_SCSI_AIC7XXX_OLD is not set
597# CONFIG_SCSI_AIC79XX is not set 607# CONFIG_SCSI_AIC79XX is not set
598# CONFIG_SCSI_AIC94XX is not set 608# CONFIG_SCSI_AIC94XX is not set
609# CONFIG_SCSI_MVSAS is not set
599# CONFIG_SCSI_ARCMSR is not set 610# CONFIG_SCSI_ARCMSR is not set
600# CONFIG_MEGARAID_NEWGEN is not set 611# CONFIG_MEGARAID_NEWGEN is not set
601# CONFIG_MEGARAID_LEGACY is not set 612# CONFIG_MEGARAID_LEGACY is not set
@@ -610,7 +621,6 @@ CONFIG_SCSI_LOWLEVEL=y
610# CONFIG_SCSI_IPS is not set 621# CONFIG_SCSI_IPS is not set
611# CONFIG_SCSI_INITIO is not set 622# CONFIG_SCSI_INITIO is not set
612# CONFIG_SCSI_INIA100 is not set 623# CONFIG_SCSI_INIA100 is not set
613# CONFIG_SCSI_MVSAS is not set
614# CONFIG_SCSI_STEX is not set 624# CONFIG_SCSI_STEX is not set
615# CONFIG_SCSI_SYM53C8XX_2 is not set 625# CONFIG_SCSI_SYM53C8XX_2 is not set
616# CONFIG_SCSI_QLOGIC_1280 is not set 626# CONFIG_SCSI_QLOGIC_1280 is not set
@@ -649,7 +659,6 @@ CONFIG_MD_RAID1=m
649# CONFIG_IEEE1394 is not set 659# CONFIG_IEEE1394 is not set
650# CONFIG_I2O is not set 660# CONFIG_I2O is not set
651CONFIG_NETDEVICES=y 661CONFIG_NETDEVICES=y
652CONFIG_COMPAT_NET_DEV_OPS=y
653# CONFIG_DUMMY is not set 662# CONFIG_DUMMY is not set
654# CONFIG_BONDING is not set 663# CONFIG_BONDING is not set
655# CONFIG_MACVLAN is not set 664# CONFIG_MACVLAN is not set
@@ -698,6 +707,7 @@ CONFIG_8139CP=y
698# CONFIG_SMSC9420 is not set 707# CONFIG_SMSC9420 is not set
699# CONFIG_SUNDANCE is not set 708# CONFIG_SUNDANCE is not set
700# CONFIG_TLAN is not set 709# CONFIG_TLAN is not set
710# CONFIG_KS8842 is not set
701# CONFIG_VIA_RHINE is not set 711# CONFIG_VIA_RHINE is not set
702# CONFIG_SC92031 is not set 712# CONFIG_SC92031 is not set
703# CONFIG_ATL2 is not set 713# CONFIG_ATL2 is not set
@@ -895,65 +905,7 @@ CONFIG_SSB_POSSIBLE=y
895# CONFIG_HTC_PASIC3 is not set 905# CONFIG_HTC_PASIC3 is not set
896# CONFIG_MFD_TMIO is not set 906# CONFIG_MFD_TMIO is not set
897# CONFIG_REGULATOR is not set 907# CONFIG_REGULATOR is not set
898 908# CONFIG_MEDIA_SUPPORT is not set
899#
900# Multimedia devices
901#
902
903#
904# Multimedia core support
905#
906CONFIG_VIDEO_DEV=m
907CONFIG_VIDEO_V4L2_COMMON=m
908CONFIG_VIDEO_ALLOW_V4L1=y
909CONFIG_VIDEO_V4L1_COMPAT=y
910# CONFIG_DVB_CORE is not set
911CONFIG_VIDEO_MEDIA=m
912
913#
914# Multimedia drivers
915#
916# CONFIG_MEDIA_ATTACH is not set
917CONFIG_VIDEO_V4L2=m
918CONFIG_VIDEO_V4L1=m
919CONFIG_VIDEO_CAPTURE_DRIVERS=y
920# CONFIG_VIDEO_ADV_DEBUG is not set
921# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
922CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
923# CONFIG_VIDEO_VIVI is not set
924# CONFIG_VIDEO_CPIA is not set
925# CONFIG_VIDEO_CPIA2 is not set
926# CONFIG_SOC_CAMERA is not set
927CONFIG_V4L_USB_DRIVERS=y
928# CONFIG_USB_VIDEO_CLASS is not set
929CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
930# CONFIG_USB_GSPCA is not set
931# CONFIG_VIDEO_HDPVR is not set
932CONFIG_VIDEO_USBVIDEO=m
933CONFIG_USB_VICAM=m
934CONFIG_USB_IBMCAM=m
935CONFIG_USB_KONICAWC=m
936# CONFIG_USB_QUICKCAM_MESSENGER is not set
937# CONFIG_USB_ET61X251 is not set
938CONFIG_USB_OV511=m
939CONFIG_USB_SE401=m
940CONFIG_USB_SN9C102=m
941CONFIG_USB_STV680=m
942# CONFIG_USB_ZC0301 is not set
943CONFIG_USB_PWC=m
944# CONFIG_USB_PWC_DEBUG is not set
945CONFIG_USB_PWC_INPUT_EVDEV=y
946# CONFIG_USB_ZR364XX is not set
947# CONFIG_USB_STKWEBCAM is not set
948# CONFIG_USB_S2255 is not set
949CONFIG_RADIO_ADAPTERS=y
950# CONFIG_RADIO_GEMTEK_PCI is not set
951# CONFIG_RADIO_MAXIRADIO is not set
952# CONFIG_RADIO_MAESTRO is not set
953CONFIG_USB_DSBR=m
954# CONFIG_USB_SI470X is not set
955# CONFIG_USB_MR800 is not set
956# CONFIG_DAB is not set
957 909
958# 910#
959# Graphics support 911# Graphics support
@@ -1005,7 +957,7 @@ CONFIG_HID_BELKIN=m
1005CONFIG_HID_CHERRY=m 957CONFIG_HID_CHERRY=m
1006CONFIG_HID_CHICONY=m 958CONFIG_HID_CHICONY=m
1007CONFIG_HID_CYPRESS=m 959CONFIG_HID_CYPRESS=m
1008# CONFIG_DRAGONRISE_FF is not set 960# CONFIG_HID_DRAGONRISE is not set
1009CONFIG_HID_EZKEY=m 961CONFIG_HID_EZKEY=m
1010# CONFIG_HID_KYE is not set 962# CONFIG_HID_KYE is not set
1011CONFIG_HID_GYRATION=m 963CONFIG_HID_GYRATION=m
@@ -1022,10 +974,11 @@ CONFIG_HID_PETALYNX=m
1022CONFIG_HID_SAMSUNG=m 974CONFIG_HID_SAMSUNG=m
1023CONFIG_HID_SONY=m 975CONFIG_HID_SONY=m
1024CONFIG_HID_SUNPLUS=m 976CONFIG_HID_SUNPLUS=m
1025# CONFIG_GREENASIA_FF is not set 977# CONFIG_HID_GREENASIA is not set
978# CONFIG_HID_SMARTJOYPLUS is not set
1026# CONFIG_HID_TOPSEED is not set 979# CONFIG_HID_TOPSEED is not set
1027CONFIG_THRUSTMASTER_FF=m 980# CONFIG_HID_THRUSTMASTER is not set
1028CONFIG_ZEROPLUS_FF=m 981# CONFIG_HID_ZEROPLUS is not set
1029CONFIG_USB_SUPPORT=y 982CONFIG_USB_SUPPORT=y
1030CONFIG_USB_ARCH_HAS_HCD=y 983CONFIG_USB_ARCH_HAS_HCD=y
1031CONFIG_USB_ARCH_HAS_OHCI=y 984CONFIG_USB_ARCH_HAS_OHCI=y
@@ -1051,6 +1004,7 @@ CONFIG_USB_MON=y
1051# USB Host Controller Drivers 1004# USB Host Controller Drivers
1052# 1005#
1053# CONFIG_USB_C67X00_HCD is not set 1006# CONFIG_USB_C67X00_HCD is not set
1007# CONFIG_USB_XHCI_HCD is not set
1054CONFIG_USB_EHCI_HCD=y 1008CONFIG_USB_EHCI_HCD=y
1055# CONFIG_USB_EHCI_ROOT_HUB_TT is not set 1009# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
1056# CONFIG_USB_EHCI_TT_NEWSCHED is not set 1010# CONFIG_USB_EHCI_TT_NEWSCHED is not set
@@ -1191,10 +1145,15 @@ CONFIG_USB_SISUSBVGA_CON=y
1191# CONFIG_NEW_LEDS is not set 1145# CONFIG_NEW_LEDS is not set
1192# CONFIG_ACCESSIBILITY is not set 1146# CONFIG_ACCESSIBILITY is not set
1193# CONFIG_INFINIBAND is not set 1147# CONFIG_INFINIBAND is not set
1148CONFIG_RTC_LIB=y
1194# CONFIG_RTC_CLASS is not set 1149# CONFIG_RTC_CLASS is not set
1195# CONFIG_DMADEVICES is not set 1150# CONFIG_DMADEVICES is not set
1196# CONFIG_AUXDISPLAY is not set 1151# CONFIG_AUXDISPLAY is not set
1197# CONFIG_UIO is not set 1152# CONFIG_UIO is not set
1153
1154#
1155# TI VLYNQ
1156#
1198# CONFIG_STAGING is not set 1157# CONFIG_STAGING is not set
1199 1158
1200# 1159#
@@ -1217,10 +1176,11 @@ CONFIG_REISERFS_FS=y
1217# CONFIG_REISERFS_FS_XATTR is not set 1176# CONFIG_REISERFS_FS_XATTR is not set
1218# CONFIG_JFS_FS is not set 1177# CONFIG_JFS_FS is not set
1219# CONFIG_FS_POSIX_ACL is not set 1178# CONFIG_FS_POSIX_ACL is not set
1220CONFIG_FILE_LOCKING=y
1221# CONFIG_XFS_FS is not set 1179# CONFIG_XFS_FS is not set
1222# CONFIG_OCFS2_FS is not set 1180# CONFIG_OCFS2_FS is not set
1223# CONFIG_BTRFS_FS is not set 1181# CONFIG_BTRFS_FS is not set
1182CONFIG_FILE_LOCKING=y
1183CONFIG_FSNOTIFY=y
1224CONFIG_DNOTIFY=y 1184CONFIG_DNOTIFY=y
1225CONFIG_INOTIFY=y 1185CONFIG_INOTIFY=y
1226CONFIG_INOTIFY_USER=y 1186CONFIG_INOTIFY_USER=y
@@ -1383,28 +1343,13 @@ CONFIG_HAVE_FUNCTION_TRACER=y
1383CONFIG_HAVE_DYNAMIC_FTRACE=y 1343CONFIG_HAVE_DYNAMIC_FTRACE=y
1384CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 1344CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1385CONFIG_TRACING_SUPPORT=y 1345CONFIG_TRACING_SUPPORT=y
1386 1346# CONFIG_FTRACE is not set
1387#
1388# Tracers
1389#
1390# CONFIG_FUNCTION_TRACER is not set
1391# CONFIG_IRQSOFF_TRACER is not set
1392# CONFIG_SCHED_TRACER is not set
1393# CONFIG_CONTEXT_SWITCH_TRACER is not set
1394# CONFIG_EVENT_TRACER is not set
1395# CONFIG_BOOT_TRACER is not set
1396# CONFIG_TRACE_BRANCH_PROFILING is not set
1397# CONFIG_STACK_TRACER is not set
1398# CONFIG_KMEMTRACE is not set
1399# CONFIG_WORKQUEUE_TRACER is not set
1400# CONFIG_BLK_DEV_IO_TRACE is not set
1401# CONFIG_DMA_API_DEBUG is not set 1347# CONFIG_DMA_API_DEBUG is not set
1402# CONFIG_SAMPLES is not set 1348# CONFIG_SAMPLES is not set
1403CONFIG_HAVE_ARCH_KGDB=y 1349CONFIG_HAVE_ARCH_KGDB=y
1404CONFIG_SH_STANDARD_BIOS=y 1350CONFIG_SH_STANDARD_BIOS=y
1405# CONFIG_EARLY_SCIF_CONSOLE is not set 1351# CONFIG_EARLY_SCIF_CONSOLE is not set
1406# CONFIG_EARLY_PRINTK is not set 1352# CONFIG_EARLY_PRINTK is not set
1407# CONFIG_MORE_COMPILE_OPTIONS is not set
1408 1353
1409# 1354#
1410# Security options 1355# Security options
@@ -1518,3 +1463,4 @@ CONFIG_HAS_IOMEM=y
1518CONFIG_HAS_IOPORT=y 1463CONFIG_HAS_IOPORT=y
1519CONFIG_HAS_DMA=y 1464CONFIG_HAS_DMA=y
1520CONFIG_NLATTR=y 1465CONFIG_NLATTR=y
1466CONFIG_GENERIC_ATOMIC64=y
diff --git a/arch/sh/configs/lboxre2_defconfig b/arch/sh/configs/lboxre2_defconfig
index a7db539f2800..c0bc2fd033b9 100644
--- a/arch/sh/configs/lboxre2_defconfig
+++ b/arch/sh/configs/lboxre2_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.30-rc3 3# Linux kernel version: 2.6.30
4# Mon Apr 27 12:48:54 2009 4# Thu Jun 18 12:29:50 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -20,6 +20,7 @@ CONFIG_GENERIC_CLOCKEVENTS=y
20# CONFIG_ARCH_SUSPEND_POSSIBLE is not set 20# CONFIG_ARCH_SUSPEND_POSSIBLE is not set
21CONFIG_ARCH_HIBERNATION_POSSIBLE=y 21CONFIG_ARCH_HIBERNATION_POSSIBLE=y
22CONFIG_SYS_SUPPORTS_PCI=y 22CONFIG_SYS_SUPPORTS_PCI=y
23CONFIG_SYS_SUPPORTS_TMU=y
23CONFIG_STACKTRACE_SUPPORT=y 24CONFIG_STACKTRACE_SUPPORT=y
24CONFIG_LOCKDEP_SUPPORT=y 25CONFIG_LOCKDEP_SUPPORT=y
25CONFIG_HAVE_LATENCYTOP_SUPPORT=y 26CONFIG_HAVE_LATENCYTOP_SUPPORT=y
@@ -70,7 +71,6 @@ CONFIG_UID16=y
70# CONFIG_SYSCTL_SYSCALL is not set 71# CONFIG_SYSCTL_SYSCALL is not set
71CONFIG_KALLSYMS=y 72CONFIG_KALLSYMS=y
72CONFIG_KALLSYMS_EXTRA_PASS=y 73CONFIG_KALLSYMS_EXTRA_PASS=y
73# CONFIG_STRIP_ASM_SYMS is not set
74CONFIG_HOTPLUG=y 74CONFIG_HOTPLUG=y
75CONFIG_PRINTK=y 75CONFIG_PRINTK=y
76CONFIG_BUG=y 76CONFIG_BUG=y
@@ -83,8 +83,13 @@ CONFIG_TIMERFD=y
83CONFIG_EVENTFD=y 83CONFIG_EVENTFD=y
84CONFIG_SHMEM=y 84CONFIG_SHMEM=y
85CONFIG_AIO=y 85CONFIG_AIO=y
86
87#
88# Performance Counters
89#
86CONFIG_VM_EVENT_COUNTERS=y 90CONFIG_VM_EVENT_COUNTERS=y
87CONFIG_PCI_QUIRKS=y 91CONFIG_PCI_QUIRKS=y
92# CONFIG_STRIP_ASM_SYMS is not set
88CONFIG_COMPAT_BRK=y 93CONFIG_COMPAT_BRK=y
89CONFIG_SLAB=y 94CONFIG_SLAB=y
90# CONFIG_SLUB is not set 95# CONFIG_SLUB is not set
@@ -174,6 +179,7 @@ CONFIG_CPU_SUBTYPE_SH7751R=y
174CONFIG_QUICKLIST=y 179CONFIG_QUICKLIST=y
175CONFIG_MMU=y 180CONFIG_MMU=y
176CONFIG_PAGE_OFFSET=0x80000000 181CONFIG_PAGE_OFFSET=0x80000000
182CONFIG_FORCE_MAX_ZONEORDER=11
177CONFIG_MEMORY_START=0x0c000000 183CONFIG_MEMORY_START=0x0c000000
178CONFIG_MEMORY_SIZE=0x04000000 184CONFIG_MEMORY_SIZE=0x04000000
179CONFIG_29BIT=y 185CONFIG_29BIT=y
@@ -188,7 +194,6 @@ CONFIG_PAGE_SIZE_4KB=y
188# CONFIG_PAGE_SIZE_8KB is not set 194# CONFIG_PAGE_SIZE_8KB is not set
189# CONFIG_PAGE_SIZE_16KB is not set 195# CONFIG_PAGE_SIZE_16KB is not set
190# CONFIG_PAGE_SIZE_64KB is not set 196# CONFIG_PAGE_SIZE_64KB is not set
191CONFIG_ENTRY_OFFSET=0x00001000
192CONFIG_SELECT_MEMORY_MODEL=y 197CONFIG_SELECT_MEMORY_MODEL=y
193CONFIG_FLATMEM_MANUAL=y 198CONFIG_FLATMEM_MANUAL=y
194# CONFIG_DISCONTIGMEM_MANUAL is not set 199# CONFIG_DISCONTIGMEM_MANUAL is not set
@@ -201,9 +206,9 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
201# CONFIG_PHYS_ADDR_T_64BIT is not set 206# CONFIG_PHYS_ADDR_T_64BIT is not set
202CONFIG_ZONE_DMA_FLAG=0 207CONFIG_ZONE_DMA_FLAG=0
203CONFIG_NR_QUICK=2 208CONFIG_NR_QUICK=2
204CONFIG_UNEVICTABLE_LRU=y
205CONFIG_HAVE_MLOCK=y 209CONFIG_HAVE_MLOCK=y
206CONFIG_HAVE_MLOCKED_PAGE_BIT=y 210CONFIG_HAVE_MLOCKED_PAGE_BIT=y
211CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
207 212
208# 213#
209# Cache configuration 214# Cache configuration
@@ -221,7 +226,6 @@ CONFIG_SH_FPU=y
221# CONFIG_SH_STORE_QUEUES is not set 226# CONFIG_SH_STORE_QUEUES is not set
222CONFIG_CPU_HAS_INTEVT=y 227CONFIG_CPU_HAS_INTEVT=y
223CONFIG_CPU_HAS_SR_RB=y 228CONFIG_CPU_HAS_SR_RB=y
224CONFIG_CPU_HAS_PTEA=y
225CONFIG_CPU_HAS_FPU=y 229CONFIG_CPU_HAS_FPU=y
226 230
227# 231#
@@ -237,9 +241,10 @@ CONFIG_SH_LBOX_RE2=y
237# 241#
238# Timer and clock configuration 242# Timer and clock configuration
239# 243#
240CONFIG_SH_TMU=y 244CONFIG_SH_TIMER_TMU=y
241CONFIG_SH_TIMER_IRQ=16
242CONFIG_SH_PCLK_FREQ=40000000 245CONFIG_SH_PCLK_FREQ=40000000
246CONFIG_SH_CLK_CPG=y
247CONFIG_SH_CLK_CPG_LEGACY=y
243# CONFIG_NO_HZ is not set 248# CONFIG_NO_HZ is not set
244# CONFIG_HIGH_RES_TIMERS is not set 249# CONFIG_HIGH_RES_TIMERS is not set
245CONFIG_GENERIC_CLOCKEVENTS_BUILD=y 250CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
@@ -281,12 +286,14 @@ CONFIG_PREEMPT_NONE=y
281# CONFIG_PREEMPT is not set 286# CONFIG_PREEMPT is not set
282CONFIG_GUSA=y 287CONFIG_GUSA=y
283# CONFIG_GUSA_RB is not set 288# CONFIG_GUSA_RB is not set
289# CONFIG_SPARSE_IRQ is not set
284 290
285# 291#
286# Boot options 292# Boot options
287# 293#
288CONFIG_ZERO_PAGE_OFFSET=0x00001000 294CONFIG_ZERO_PAGE_OFFSET=0x00001000
289CONFIG_BOOT_LINK_OFFSET=0x00800000 295CONFIG_BOOT_LINK_OFFSET=0x00800000
296CONFIG_ENTRY_OFFSET=0x00001000
290# CONFIG_UBC_WAKEUP is not set 297# CONFIG_UBC_WAKEUP is not set
291CONFIG_CMDLINE_BOOL=y 298CONFIG_CMDLINE_BOOL=y
292CONFIG_CMDLINE="console=ttySC1,115200 root=/dev/sda1" 299CONFIG_CMDLINE="console=ttySC1,115200 root=/dev/sda1"
@@ -418,6 +425,7 @@ CONFIG_NETFILTER_ADVANCED=y
418# CONFIG_ECONET is not set 425# CONFIG_ECONET is not set
419# CONFIG_WAN_ROUTER is not set 426# CONFIG_WAN_ROUTER is not set
420# CONFIG_PHONET is not set 427# CONFIG_PHONET is not set
428# CONFIG_IEEE802154 is not set
421# CONFIG_NET_SCHED is not set 429# CONFIG_NET_SCHED is not set
422# CONFIG_DCB is not set 430# CONFIG_DCB is not set
423 431
@@ -435,7 +443,11 @@ CONFIG_WIRELESS=y
435# CONFIG_WIRELESS_OLD_REGULATORY is not set 443# CONFIG_WIRELESS_OLD_REGULATORY is not set
436# CONFIG_WIRELESS_EXT is not set 444# CONFIG_WIRELESS_EXT is not set
437# CONFIG_LIB80211 is not set 445# CONFIG_LIB80211 is not set
438# CONFIG_MAC80211 is not set 446
447#
448# CFG80211 needs to be enabled for MAC80211
449#
450CONFIG_MAC80211_DEFAULT_PS_VALUE=0
439# CONFIG_WIMAX is not set 451# CONFIG_WIMAX is not set
440# CONFIG_RFKILL is not set 452# CONFIG_RFKILL is not set
441# CONFIG_NET_9P is not set 453# CONFIG_NET_9P is not set
@@ -485,6 +497,7 @@ CONFIG_MISC_DEVICES=y
485# EEPROM support 497# EEPROM support
486# 498#
487# CONFIG_EEPROM_93CX6 is not set 499# CONFIG_EEPROM_93CX6 is not set
500# CONFIG_CB710_CORE is not set
488CONFIG_HAVE_IDE=y 501CONFIG_HAVE_IDE=y
489# CONFIG_IDE is not set 502# CONFIG_IDE is not set
490 503
@@ -507,10 +520,6 @@ CONFIG_BLK_DEV_SD=y
507# CONFIG_BLK_DEV_SR is not set 520# CONFIG_BLK_DEV_SR is not set
508# CONFIG_CHR_DEV_SG is not set 521# CONFIG_CHR_DEV_SG is not set
509# CONFIG_CHR_DEV_SCH is not set 522# CONFIG_CHR_DEV_SCH is not set
510
511#
512# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
513#
514# CONFIG_SCSI_MULTI_LUN is not set 523# CONFIG_SCSI_MULTI_LUN is not set
515# CONFIG_SCSI_CONSTANTS is not set 524# CONFIG_SCSI_CONSTANTS is not set
516# CONFIG_SCSI_LOGGING is not set 525# CONFIG_SCSI_LOGGING is not set
@@ -528,6 +537,7 @@ CONFIG_SCSI_WAIT_SCAN=m
528CONFIG_SCSI_LOWLEVEL=y 537CONFIG_SCSI_LOWLEVEL=y
529# CONFIG_ISCSI_TCP is not set 538# CONFIG_ISCSI_TCP is not set
530# CONFIG_SCSI_CXGB3_ISCSI is not set 539# CONFIG_SCSI_CXGB3_ISCSI is not set
540# CONFIG_SCSI_BNX2_ISCSI is not set
531# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 541# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
532# CONFIG_SCSI_3W_9XXX is not set 542# CONFIG_SCSI_3W_9XXX is not set
533# CONFIG_SCSI_ACARD is not set 543# CONFIG_SCSI_ACARD is not set
@@ -536,6 +546,7 @@ CONFIG_SCSI_LOWLEVEL=y
536# CONFIG_SCSI_AIC7XXX_OLD is not set 546# CONFIG_SCSI_AIC7XXX_OLD is not set
537# CONFIG_SCSI_AIC79XX is not set 547# CONFIG_SCSI_AIC79XX is not set
538# CONFIG_SCSI_AIC94XX is not set 548# CONFIG_SCSI_AIC94XX is not set
549# CONFIG_SCSI_MVSAS is not set
539# CONFIG_SCSI_ARCMSR is not set 550# CONFIG_SCSI_ARCMSR is not set
540# CONFIG_MEGARAID_NEWGEN is not set 551# CONFIG_MEGARAID_NEWGEN is not set
541# CONFIG_MEGARAID_LEGACY is not set 552# CONFIG_MEGARAID_LEGACY is not set
@@ -550,7 +561,6 @@ CONFIG_SCSI_LOWLEVEL=y
550# CONFIG_SCSI_IPS is not set 561# CONFIG_SCSI_IPS is not set
551# CONFIG_SCSI_INITIO is not set 562# CONFIG_SCSI_INITIO is not set
552# CONFIG_SCSI_INIA100 is not set 563# CONFIG_SCSI_INIA100 is not set
553# CONFIG_SCSI_MVSAS is not set
554# CONFIG_SCSI_STEX is not set 564# CONFIG_SCSI_STEX is not set
555# CONFIG_SCSI_SYM53C8XX_2 is not set 565# CONFIG_SCSI_SYM53C8XX_2 is not set
556# CONFIG_SCSI_IPR is not set 566# CONFIG_SCSI_IPR is not set
@@ -641,7 +651,6 @@ CONFIG_PATA_PLATFORM=y
641# CONFIG_IEEE1394 is not set 651# CONFIG_IEEE1394 is not set
642# CONFIG_I2O is not set 652# CONFIG_I2O is not set
643CONFIG_NETDEVICES=y 653CONFIG_NETDEVICES=y
644CONFIG_COMPAT_NET_DEV_OPS=y
645# CONFIG_DUMMY is not set 654# CONFIG_DUMMY is not set
646# CONFIG_BONDING is not set 655# CONFIG_BONDING is not set
647# CONFIG_MACVLAN is not set 656# CONFIG_MACVLAN is not set
@@ -694,6 +703,7 @@ CONFIG_8139TOO_TUNE_TWISTER=y
694# CONFIG_SMSC9420 is not set 703# CONFIG_SMSC9420 is not set
695# CONFIG_SUNDANCE is not set 704# CONFIG_SUNDANCE is not set
696# CONFIG_TLAN is not set 705# CONFIG_TLAN is not set
706# CONFIG_KS8842 is not set
697# CONFIG_VIA_RHINE is not set 707# CONFIG_VIA_RHINE is not set
698# CONFIG_SC92031 is not set 708# CONFIG_SC92031 is not set
699# CONFIG_ATL2 is not set 709# CONFIG_ATL2 is not set
@@ -890,22 +900,7 @@ CONFIG_SSB_POSSIBLE=y
890# CONFIG_HTC_PASIC3 is not set 900# CONFIG_HTC_PASIC3 is not set
891# CONFIG_MFD_TMIO is not set 901# CONFIG_MFD_TMIO is not set
892# CONFIG_REGULATOR is not set 902# CONFIG_REGULATOR is not set
893 903# CONFIG_MEDIA_SUPPORT is not set
894#
895# Multimedia devices
896#
897
898#
899# Multimedia core support
900#
901# CONFIG_VIDEO_DEV is not set
902# CONFIG_DVB_CORE is not set
903# CONFIG_VIDEO_MEDIA is not set
904
905#
906# Multimedia drivers
907#
908# CONFIG_DAB is not set
909 904
910# 905#
911# Graphics support 906# Graphics support
@@ -998,9 +993,14 @@ CONFIG_RTC_INTF_DEV=y
998# on-CPU RTC drivers 993# on-CPU RTC drivers
999# 994#
1000# CONFIG_RTC_DRV_SH is not set 995# CONFIG_RTC_DRV_SH is not set
996# CONFIG_RTC_DRV_GENERIC is not set
1001# CONFIG_DMADEVICES is not set 997# CONFIG_DMADEVICES is not set
1002# CONFIG_AUXDISPLAY is not set 998# CONFIG_AUXDISPLAY is not set
1003# CONFIG_UIO is not set 999# CONFIG_UIO is not set
1000
1001#
1002# TI VLYNQ
1003#
1004# CONFIG_STAGING is not set 1004# CONFIG_STAGING is not set
1005 1005
1006# 1006#
@@ -1020,10 +1020,11 @@ CONFIG_FS_MBCACHE=y
1020# CONFIG_REISERFS_FS is not set 1020# CONFIG_REISERFS_FS is not set
1021# CONFIG_JFS_FS is not set 1021# CONFIG_JFS_FS is not set
1022# CONFIG_FS_POSIX_ACL is not set 1022# CONFIG_FS_POSIX_ACL is not set
1023CONFIG_FILE_LOCKING=y
1024# CONFIG_XFS_FS is not set 1023# CONFIG_XFS_FS is not set
1025# CONFIG_OCFS2_FS is not set 1024# CONFIG_OCFS2_FS is not set
1026# CONFIG_BTRFS_FS is not set 1025# CONFIG_BTRFS_FS is not set
1026CONFIG_FILE_LOCKING=y
1027CONFIG_FSNOTIFY=y
1027CONFIG_DNOTIFY=y 1028CONFIG_DNOTIFY=y
1028CONFIG_INOTIFY=y 1029CONFIG_INOTIFY=y
1029CONFIG_INOTIFY_USER=y 1030CONFIG_INOTIFY_USER=y
@@ -1166,28 +1167,13 @@ CONFIG_HAVE_FUNCTION_TRACER=y
1166CONFIG_HAVE_DYNAMIC_FTRACE=y 1167CONFIG_HAVE_DYNAMIC_FTRACE=y
1167CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 1168CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1168CONFIG_TRACING_SUPPORT=y 1169CONFIG_TRACING_SUPPORT=y
1169 1170# CONFIG_FTRACE is not set
1170#
1171# Tracers
1172#
1173# CONFIG_FUNCTION_TRACER is not set
1174# CONFIG_IRQSOFF_TRACER is not set
1175# CONFIG_SCHED_TRACER is not set
1176# CONFIG_CONTEXT_SWITCH_TRACER is not set
1177# CONFIG_EVENT_TRACER is not set
1178# CONFIG_BOOT_TRACER is not set
1179# CONFIG_TRACE_BRANCH_PROFILING is not set
1180# CONFIG_STACK_TRACER is not set
1181# CONFIG_KMEMTRACE is not set
1182# CONFIG_WORKQUEUE_TRACER is not set
1183# CONFIG_BLK_DEV_IO_TRACE is not set
1184# CONFIG_DMA_API_DEBUG is not set 1171# CONFIG_DMA_API_DEBUG is not set
1185# CONFIG_SAMPLES is not set 1172# CONFIG_SAMPLES is not set
1186CONFIG_HAVE_ARCH_KGDB=y 1173CONFIG_HAVE_ARCH_KGDB=y
1187CONFIG_SH_STANDARD_BIOS=y 1174CONFIG_SH_STANDARD_BIOS=y
1188# CONFIG_EARLY_SCIF_CONSOLE is not set 1175# CONFIG_EARLY_SCIF_CONSOLE is not set
1189# CONFIG_EARLY_PRINTK is not set 1176# CONFIG_EARLY_PRINTK is not set
1190# CONFIG_MORE_COMPILE_OPTIONS is not set
1191 1177
1192# 1178#
1193# Security options 1179# Security options
@@ -1301,3 +1287,4 @@ CONFIG_HAS_IOMEM=y
1301CONFIG_HAS_IOPORT=y 1287CONFIG_HAS_IOPORT=y
1302CONFIG_HAS_DMA=y 1288CONFIG_HAS_DMA=y
1303CONFIG_NLATTR=y 1289CONFIG_NLATTR=y
1290CONFIG_GENERIC_ATOMIC64=y
diff --git a/arch/sh/configs/magicpanelr2_defconfig b/arch/sh/configs/magicpanelr2_defconfig
index 58bec61506fa..c5859e82d916 100644
--- a/arch/sh/configs/magicpanelr2_defconfig
+++ b/arch/sh/configs/magicpanelr2_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.30-rc3 3# Linux kernel version: 2.6.30
4# Mon Apr 27 12:49:32 2009 4# Thu Jun 18 12:30:31 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -19,6 +19,8 @@ CONFIG_GENERIC_TIME=y
19CONFIG_GENERIC_CLOCKEVENTS=y 19CONFIG_GENERIC_CLOCKEVENTS=y
20# CONFIG_ARCH_SUSPEND_POSSIBLE is not set 20# CONFIG_ARCH_SUSPEND_POSSIBLE is not set
21CONFIG_ARCH_HIBERNATION_POSSIBLE=y 21CONFIG_ARCH_HIBERNATION_POSSIBLE=y
22CONFIG_SYS_SUPPORTS_CMT=y
23CONFIG_SYS_SUPPORTS_TMU=y
22CONFIG_STACKTRACE_SUPPORT=y 24CONFIG_STACKTRACE_SUPPORT=y
23CONFIG_LOCKDEP_SUPPORT=y 25CONFIG_LOCKDEP_SUPPORT=y
24CONFIG_HAVE_LATENCYTOP_SUPPORT=y 26CONFIG_HAVE_LATENCYTOP_SUPPORT=y
@@ -77,7 +79,6 @@ CONFIG_SYSCTL_SYSCALL=y
77CONFIG_KALLSYMS=y 79CONFIG_KALLSYMS=y
78CONFIG_KALLSYMS_ALL=y 80CONFIG_KALLSYMS_ALL=y
79# CONFIG_KALLSYMS_EXTRA_PASS is not set 81# CONFIG_KALLSYMS_EXTRA_PASS is not set
80# CONFIG_STRIP_ASM_SYMS is not set
81CONFIG_HOTPLUG=y 82CONFIG_HOTPLUG=y
82CONFIG_PRINTK=y 83CONFIG_PRINTK=y
83CONFIG_BUG=y 84CONFIG_BUG=y
@@ -90,7 +91,12 @@ CONFIG_TIMERFD=y
90CONFIG_EVENTFD=y 91CONFIG_EVENTFD=y
91CONFIG_SHMEM=y 92CONFIG_SHMEM=y
92CONFIG_AIO=y 93CONFIG_AIO=y
94
95#
96# Performance Counters
97#
93CONFIG_VM_EVENT_COUNTERS=y 98CONFIG_VM_EVENT_COUNTERS=y
99# CONFIG_STRIP_ASM_SYMS is not set
94CONFIG_COMPAT_BRK=y 100CONFIG_COMPAT_BRK=y
95CONFIG_SLAB=y 101CONFIG_SLAB=y
96# CONFIG_SLUB is not set 102# CONFIG_SLUB is not set
@@ -180,6 +186,7 @@ CONFIG_CPU_SUBTYPE_SH7720=y
180CONFIG_QUICKLIST=y 186CONFIG_QUICKLIST=y
181CONFIG_MMU=y 187CONFIG_MMU=y
182CONFIG_PAGE_OFFSET=0x80000000 188CONFIG_PAGE_OFFSET=0x80000000
189CONFIG_FORCE_MAX_ZONEORDER=11
183CONFIG_MEMORY_START=0x0C000000 190CONFIG_MEMORY_START=0x0C000000
184CONFIG_MEMORY_SIZE=0x03F00000 191CONFIG_MEMORY_SIZE=0x03F00000
185CONFIG_29BIT=y 192CONFIG_29BIT=y
@@ -194,7 +201,6 @@ CONFIG_PAGE_SIZE_4KB=y
194# CONFIG_PAGE_SIZE_8KB is not set 201# CONFIG_PAGE_SIZE_8KB is not set
195# CONFIG_PAGE_SIZE_16KB is not set 202# CONFIG_PAGE_SIZE_16KB is not set
196# CONFIG_PAGE_SIZE_64KB is not set 203# CONFIG_PAGE_SIZE_64KB is not set
197CONFIG_ENTRY_OFFSET=0x00001000
198CONFIG_SELECT_MEMORY_MODEL=y 204CONFIG_SELECT_MEMORY_MODEL=y
199CONFIG_FLATMEM_MANUAL=y 205CONFIG_FLATMEM_MANUAL=y
200# CONFIG_DISCONTIGMEM_MANUAL is not set 206# CONFIG_DISCONTIGMEM_MANUAL is not set
@@ -207,9 +213,9 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
207# CONFIG_PHYS_ADDR_T_64BIT is not set 213# CONFIG_PHYS_ADDR_T_64BIT is not set
208CONFIG_ZONE_DMA_FLAG=0 214CONFIG_ZONE_DMA_FLAG=0
209CONFIG_NR_QUICK=2 215CONFIG_NR_QUICK=2
210CONFIG_UNEVICTABLE_LRU=y
211CONFIG_HAVE_MLOCK=y 216CONFIG_HAVE_MLOCK=y
212CONFIG_HAVE_MLOCKED_PAGE_BIT=y 217CONFIG_HAVE_MLOCKED_PAGE_BIT=y
218CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
213 219
214# 220#
215# Cache configuration 221# Cache configuration
@@ -243,9 +249,11 @@ CONFIG_SH_MAGIC_PANEL_R2_VERSION=3
243# 249#
244# Timer and clock configuration 250# Timer and clock configuration
245# 251#
246CONFIG_SH_TMU=y 252CONFIG_SH_TIMER_TMU=y
247CONFIG_SH_TIMER_IRQ=16 253CONFIG_SH_TIMER_CMT=y
248CONFIG_SH_PCLK_FREQ=24000000 254CONFIG_SH_PCLK_FREQ=24000000
255CONFIG_SH_CLK_CPG=y
256CONFIG_SH_CLK_CPG_LEGACY=y
249# CONFIG_NO_HZ is not set 257# CONFIG_NO_HZ is not set
250# CONFIG_HIGH_RES_TIMERS is not set 258# CONFIG_HIGH_RES_TIMERS is not set
251CONFIG_GENERIC_CLOCKEVENTS_BUILD=y 259CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
@@ -290,12 +298,14 @@ CONFIG_PREEMPT_NONE=y
290# CONFIG_PREEMPT is not set 298# CONFIG_PREEMPT is not set
291CONFIG_GUSA=y 299CONFIG_GUSA=y
292# CONFIG_GUSA_RB is not set 300# CONFIG_GUSA_RB is not set
301# CONFIG_SPARSE_IRQ is not set
293 302
294# 303#
295# Boot options 304# Boot options
296# 305#
297CONFIG_ZERO_PAGE_OFFSET=0x00001000 306CONFIG_ZERO_PAGE_OFFSET=0x00001000
298CONFIG_BOOT_LINK_OFFSET=0x00800000 307CONFIG_BOOT_LINK_OFFSET=0x00800000
308CONFIG_ENTRY_OFFSET=0x00001000
299# CONFIG_CMDLINE_BOOL is not set 309# CONFIG_CMDLINE_BOOL is not set
300 310
301# 311#
@@ -372,6 +382,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
372# CONFIG_ECONET is not set 382# CONFIG_ECONET is not set
373# CONFIG_WAN_ROUTER is not set 383# CONFIG_WAN_ROUTER is not set
374# CONFIG_PHONET is not set 384# CONFIG_PHONET is not set
385# CONFIG_IEEE802154 is not set
375# CONFIG_NET_SCHED is not set 386# CONFIG_NET_SCHED is not set
376# CONFIG_DCB is not set 387# CONFIG_DCB is not set
377 388
@@ -389,7 +400,11 @@ CONFIG_WIRELESS=y
389# CONFIG_WIRELESS_OLD_REGULATORY is not set 400# CONFIG_WIRELESS_OLD_REGULATORY is not set
390# CONFIG_WIRELESS_EXT is not set 401# CONFIG_WIRELESS_EXT is not set
391# CONFIG_LIB80211 is not set 402# CONFIG_LIB80211 is not set
392# CONFIG_MAC80211 is not set 403
404#
405# CFG80211 needs to be enabled for MAC80211
406#
407CONFIG_MAC80211_DEFAULT_PS_VALUE=0
393# CONFIG_WIMAX is not set 408# CONFIG_WIMAX is not set
394# CONFIG_RFKILL is not set 409# CONFIG_RFKILL is not set
395# CONFIG_NET_9P is not set 410# CONFIG_NET_9P is not set
@@ -528,7 +543,6 @@ CONFIG_HAVE_IDE=y
528# CONFIG_ATA is not set 543# CONFIG_ATA is not set
529# CONFIG_MD is not set 544# CONFIG_MD is not set
530CONFIG_NETDEVICES=y 545CONFIG_NETDEVICES=y
531CONFIG_COMPAT_NET_DEV_OPS=y
532# CONFIG_DUMMY is not set 546# CONFIG_DUMMY is not set
533# CONFIG_BONDING is not set 547# CONFIG_BONDING is not set
534# CONFIG_MACVLAN is not set 548# CONFIG_MACVLAN is not set
@@ -572,6 +586,7 @@ CONFIG_SMSC911X=y
572# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set 586# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
573# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set 587# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
574# CONFIG_B44 is not set 588# CONFIG_B44 is not set
589# CONFIG_KS8842 is not set
575# CONFIG_NETDEV_1000 is not set 590# CONFIG_NETDEV_1000 is not set
576# CONFIG_NETDEV_10000 is not set 591# CONFIG_NETDEV_10000 is not set
577 592
@@ -727,22 +742,7 @@ CONFIG_SSB_POSSIBLE=y
727# CONFIG_HTC_PASIC3 is not set 742# CONFIG_HTC_PASIC3 is not set
728# CONFIG_MFD_TMIO is not set 743# CONFIG_MFD_TMIO is not set
729# CONFIG_REGULATOR is not set 744# CONFIG_REGULATOR is not set
730 745# CONFIG_MEDIA_SUPPORT is not set
731#
732# Multimedia devices
733#
734
735#
736# Multimedia core support
737#
738# CONFIG_VIDEO_DEV is not set
739# CONFIG_DVB_CORE is not set
740# CONFIG_VIDEO_MEDIA is not set
741
742#
743# Multimedia drivers
744#
745CONFIG_DAB=y
746 746
747# 747#
748# Graphics support 748# Graphics support
@@ -804,9 +804,14 @@ CONFIG_RTC_INTF_DEV=y
804# on-CPU RTC drivers 804# on-CPU RTC drivers
805# 805#
806CONFIG_RTC_DRV_SH=y 806CONFIG_RTC_DRV_SH=y
807# CONFIG_RTC_DRV_GENERIC is not set
807# CONFIG_DMADEVICES is not set 808# CONFIG_DMADEVICES is not set
808# CONFIG_AUXDISPLAY is not set 809# CONFIG_AUXDISPLAY is not set
809# CONFIG_UIO is not set 810# CONFIG_UIO is not set
811
812#
813# TI VLYNQ
814#
810# CONFIG_STAGING is not set 815# CONFIG_STAGING is not set
811 816
812# 817#
@@ -823,12 +828,14 @@ CONFIG_JBD=y
823# CONFIG_REISERFS_FS is not set 828# CONFIG_REISERFS_FS is not set
824# CONFIG_JFS_FS is not set 829# CONFIG_JFS_FS is not set
825# CONFIG_FS_POSIX_ACL is not set 830# CONFIG_FS_POSIX_ACL is not set
826CONFIG_FILE_LOCKING=y
827# CONFIG_XFS_FS is not set 831# CONFIG_XFS_FS is not set
828# CONFIG_OCFS2_FS is not set 832# CONFIG_OCFS2_FS is not set
829# CONFIG_BTRFS_FS is not set 833# CONFIG_BTRFS_FS is not set
834CONFIG_FILE_LOCKING=y
835CONFIG_FSNOTIFY=y
830# CONFIG_DNOTIFY is not set 836# CONFIG_DNOTIFY is not set
831# CONFIG_INOTIFY is not set 837# CONFIG_INOTIFY is not set
838CONFIG_INOTIFY_USER=y
832# CONFIG_QUOTA is not set 839# CONFIG_QUOTA is not set
833# CONFIG_AUTOFS_FS is not set 840# CONFIG_AUTOFS_FS is not set
834# CONFIG_AUTOFS4_FS is not set 841# CONFIG_AUTOFS4_FS is not set
@@ -1012,17 +1019,15 @@ CONFIG_HAVE_FUNCTION_TRACER=y
1012CONFIG_HAVE_DYNAMIC_FTRACE=y 1019CONFIG_HAVE_DYNAMIC_FTRACE=y
1013CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 1020CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1014CONFIG_TRACING_SUPPORT=y 1021CONFIG_TRACING_SUPPORT=y
1015 1022CONFIG_FTRACE=y
1016#
1017# Tracers
1018#
1019# CONFIG_FUNCTION_TRACER is not set 1023# CONFIG_FUNCTION_TRACER is not set
1020# CONFIG_IRQSOFF_TRACER is not set 1024# CONFIG_IRQSOFF_TRACER is not set
1021# CONFIG_SCHED_TRACER is not set 1025# CONFIG_SCHED_TRACER is not set
1022# CONFIG_CONTEXT_SWITCH_TRACER is not set 1026# CONFIG_ENABLE_DEFAULT_TRACERS is not set
1023# CONFIG_EVENT_TRACER is not set
1024# CONFIG_BOOT_TRACER is not set 1027# CONFIG_BOOT_TRACER is not set
1025# CONFIG_TRACE_BRANCH_PROFILING is not set 1028CONFIG_BRANCH_PROFILE_NONE=y
1029# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
1030# CONFIG_PROFILE_ALL_BRANCHES is not set
1026# CONFIG_STACK_TRACER is not set 1031# CONFIG_STACK_TRACER is not set
1027# CONFIG_KMEMTRACE is not set 1032# CONFIG_KMEMTRACE is not set
1028# CONFIG_WORKQUEUE_TRACER is not set 1033# CONFIG_WORKQUEUE_TRACER is not set
@@ -1031,6 +1036,7 @@ CONFIG_TRACING_SUPPORT=y
1031# CONFIG_SAMPLES is not set 1036# CONFIG_SAMPLES is not set
1032CONFIG_HAVE_ARCH_KGDB=y 1037CONFIG_HAVE_ARCH_KGDB=y
1033# CONFIG_KGDB is not set 1038# CONFIG_KGDB is not set
1039# CONFIG_KMEMCHECK is not set
1034# CONFIG_SH_STANDARD_BIOS is not set 1040# CONFIG_SH_STANDARD_BIOS is not set
1035CONFIG_EARLY_SCIF_CONSOLE=y 1041CONFIG_EARLY_SCIF_CONSOLE=y
1036CONFIG_EARLY_SCIF_CONSOLE_PORT=0xa4430000 1042CONFIG_EARLY_SCIF_CONSOLE_PORT=0xa4430000
@@ -1039,10 +1045,8 @@ CONFIG_EARLY_PRINTK=y
1039# CONFIG_DEBUG_STACKOVERFLOW is not set 1045# CONFIG_DEBUG_STACKOVERFLOW is not set
1040# CONFIG_DEBUG_STACK_USAGE is not set 1046# CONFIG_DEBUG_STACK_USAGE is not set
1041# CONFIG_4KSTACKS is not set 1047# CONFIG_4KSTACKS is not set
1042# CONFIG_IRQSTACKS is not set
1043CONFIG_DUMP_CODE=y 1048CONFIG_DUMP_CODE=y
1044# CONFIG_SH_NO_BSS_INIT is not set 1049# CONFIG_SH_NO_BSS_INIT is not set
1045# CONFIG_MORE_COMPILE_OPTIONS is not set
1046 1050
1047# 1051#
1048# Security options 1052# Security options
@@ -1074,3 +1078,4 @@ CONFIG_HAS_IOMEM=y
1074CONFIG_HAS_IOPORT=y 1078CONFIG_HAS_IOPORT=y
1075CONFIG_HAS_DMA=y 1079CONFIG_HAS_DMA=y
1076CONFIG_NLATTR=y 1080CONFIG_NLATTR=y
1081CONFIG_GENERIC_ATOMIC64=y
diff --git a/arch/sh/configs/microdev_defconfig b/arch/sh/configs/microdev_defconfig
index 2886fc84bc1c..e5a21e1d625c 100644
--- a/arch/sh/configs/microdev_defconfig
+++ b/arch/sh/configs/microdev_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.30-rc3 3# Linux kernel version: 2.6.30
4# Mon Apr 27 12:50:51 2009 4# Thu Jun 18 12:31:56 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -19,6 +19,7 @@ CONFIG_GENERIC_TIME=y
19CONFIG_GENERIC_CLOCKEVENTS=y 19CONFIG_GENERIC_CLOCKEVENTS=y
20# CONFIG_ARCH_SUSPEND_POSSIBLE is not set 20# CONFIG_ARCH_SUSPEND_POSSIBLE is not set
21CONFIG_ARCH_HIBERNATION_POSSIBLE=y 21CONFIG_ARCH_HIBERNATION_POSSIBLE=y
22CONFIG_SYS_SUPPORTS_TMU=y
22CONFIG_STACKTRACE_SUPPORT=y 23CONFIG_STACKTRACE_SUPPORT=y
23CONFIG_LOCKDEP_SUPPORT=y 24CONFIG_LOCKDEP_SUPPORT=y
24CONFIG_HAVE_LATENCYTOP_SUPPORT=y 25CONFIG_HAVE_LATENCYTOP_SUPPORT=y
@@ -74,7 +75,6 @@ CONFIG_UID16=y
74# CONFIG_SYSCTL_SYSCALL is not set 75# CONFIG_SYSCTL_SYSCALL is not set
75CONFIG_KALLSYMS=y 76CONFIG_KALLSYMS=y
76# CONFIG_KALLSYMS_EXTRA_PASS is not set 77# CONFIG_KALLSYMS_EXTRA_PASS is not set
77# CONFIG_STRIP_ASM_SYMS is not set
78CONFIG_HOTPLUG=y 78CONFIG_HOTPLUG=y
79CONFIG_PRINTK=y 79CONFIG_PRINTK=y
80CONFIG_BUG=y 80CONFIG_BUG=y
@@ -87,7 +87,12 @@ CONFIG_TIMERFD=y
87CONFIG_EVENTFD=y 87CONFIG_EVENTFD=y
88CONFIG_SHMEM=y 88CONFIG_SHMEM=y
89CONFIG_AIO=y 89CONFIG_AIO=y
90
91#
92# Performance Counters
93#
90CONFIG_VM_EVENT_COUNTERS=y 94CONFIG_VM_EVENT_COUNTERS=y
95# CONFIG_STRIP_ASM_SYMS is not set
91CONFIG_COMPAT_BRK=y 96CONFIG_COMPAT_BRK=y
92CONFIG_SLAB=y 97CONFIG_SLAB=y
93# CONFIG_SLUB is not set 98# CONFIG_SLUB is not set
@@ -171,6 +176,7 @@ CONFIG_CPU_SUBTYPE_SH4_202=y
171CONFIG_QUICKLIST=y 176CONFIG_QUICKLIST=y
172CONFIG_MMU=y 177CONFIG_MMU=y
173CONFIG_PAGE_OFFSET=0x80000000 178CONFIG_PAGE_OFFSET=0x80000000
179CONFIG_FORCE_MAX_ZONEORDER=11
174CONFIG_MEMORY_START=0x08000000 180CONFIG_MEMORY_START=0x08000000
175CONFIG_MEMORY_SIZE=0x04000000 181CONFIG_MEMORY_SIZE=0x04000000
176CONFIG_29BIT=y 182CONFIG_29BIT=y
@@ -185,7 +191,6 @@ CONFIG_PAGE_SIZE_4KB=y
185# CONFIG_PAGE_SIZE_8KB is not set 191# CONFIG_PAGE_SIZE_8KB is not set
186# CONFIG_PAGE_SIZE_16KB is not set 192# CONFIG_PAGE_SIZE_16KB is not set
187# CONFIG_PAGE_SIZE_64KB is not set 193# CONFIG_PAGE_SIZE_64KB is not set
188CONFIG_ENTRY_OFFSET=0x00001000
189CONFIG_HUGETLB_PAGE_SIZE_64K=y 194CONFIG_HUGETLB_PAGE_SIZE_64K=y
190# CONFIG_HUGETLB_PAGE_SIZE_256K is not set 195# CONFIG_HUGETLB_PAGE_SIZE_256K is not set
191# CONFIG_HUGETLB_PAGE_SIZE_1MB is not set 196# CONFIG_HUGETLB_PAGE_SIZE_1MB is not set
@@ -204,9 +209,9 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
204# CONFIG_PHYS_ADDR_T_64BIT is not set 209# CONFIG_PHYS_ADDR_T_64BIT is not set
205CONFIG_ZONE_DMA_FLAG=0 210CONFIG_ZONE_DMA_FLAG=0
206CONFIG_NR_QUICK=2 211CONFIG_NR_QUICK=2
207CONFIG_UNEVICTABLE_LRU=y
208CONFIG_HAVE_MLOCK=y 212CONFIG_HAVE_MLOCK=y
209CONFIG_HAVE_MLOCKED_PAGE_BIT=y 213CONFIG_HAVE_MLOCKED_PAGE_BIT=y
214CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
210 215
211# 216#
212# Cache configuration 217# Cache configuration
@@ -224,7 +229,6 @@ CONFIG_SH_FPU=y
224# CONFIG_SH_STORE_QUEUES is not set 229# CONFIG_SH_STORE_QUEUES is not set
225CONFIG_CPU_HAS_INTEVT=y 230CONFIG_CPU_HAS_INTEVT=y
226CONFIG_CPU_HAS_SR_RB=y 231CONFIG_CPU_HAS_SR_RB=y
227CONFIG_CPU_HAS_PTEA=y
228CONFIG_CPU_HAS_FPU=y 232CONFIG_CPU_HAS_FPU=y
229 233
230# 234#
@@ -235,9 +239,10 @@ CONFIG_SH_SH4202_MICRODEV=y
235# 239#
236# Timer and clock configuration 240# Timer and clock configuration
237# 241#
238CONFIG_SH_TMU=y 242CONFIG_SH_TIMER_TMU=y
239CONFIG_SH_TIMER_IRQ=16
240CONFIG_SH_PCLK_FREQ=66000000 243CONFIG_SH_PCLK_FREQ=66000000
244CONFIG_SH_CLK_CPG=y
245CONFIG_SH_CLK_CPG_LEGACY=y
241# CONFIG_NO_HZ is not set 246# CONFIG_NO_HZ is not set
242# CONFIG_HIGH_RES_TIMERS is not set 247# CONFIG_HIGH_RES_TIMERS is not set
243CONFIG_GENERIC_CLOCKEVENTS_BUILD=y 248CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
@@ -282,12 +287,14 @@ CONFIG_HZ=250
282CONFIG_PREEMPT=y 287CONFIG_PREEMPT=y
283CONFIG_GUSA=y 288CONFIG_GUSA=y
284# CONFIG_GUSA_RB is not set 289# CONFIG_GUSA_RB is not set
290# CONFIG_SPARSE_IRQ is not set
285 291
286# 292#
287# Boot options 293# Boot options
288# 294#
289CONFIG_ZERO_PAGE_OFFSET=0x00001000 295CONFIG_ZERO_PAGE_OFFSET=0x00001000
290CONFIG_BOOT_LINK_OFFSET=0x00800000 296CONFIG_BOOT_LINK_OFFSET=0x00800000
297CONFIG_ENTRY_OFFSET=0x00001000
291# CONFIG_UBC_WAKEUP is not set 298# CONFIG_UBC_WAKEUP is not set
292CONFIG_CMDLINE_BOOL=y 299CONFIG_CMDLINE_BOOL=y
293CONFIG_CMDLINE="console=ttySC0,115200 root=/dev/hda1" 300CONFIG_CMDLINE="console=ttySC0,115200 root=/dev/hda1"
@@ -371,6 +378,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
371# CONFIG_ECONET is not set 378# CONFIG_ECONET is not set
372# CONFIG_WAN_ROUTER is not set 379# CONFIG_WAN_ROUTER is not set
373# CONFIG_PHONET is not set 380# CONFIG_PHONET is not set
381# CONFIG_IEEE802154 is not set
374# CONFIG_NET_SCHED is not set 382# CONFIG_NET_SCHED is not set
375# CONFIG_DCB is not set 383# CONFIG_DCB is not set
376 384
@@ -388,7 +396,11 @@ CONFIG_WIRELESS=y
388# CONFIG_WIRELESS_OLD_REGULATORY is not set 396# CONFIG_WIRELESS_OLD_REGULATORY is not set
389# CONFIG_WIRELESS_EXT is not set 397# CONFIG_WIRELESS_EXT is not set
390# CONFIG_LIB80211 is not set 398# CONFIG_LIB80211 is not set
391# CONFIG_MAC80211 is not set 399
400#
401# CFG80211 needs to be enabled for MAC80211
402#
403CONFIG_MAC80211_DEFAULT_PS_VALUE=0
392# CONFIG_WIMAX is not set 404# CONFIG_WIMAX is not set
393# CONFIG_RFKILL is not set 405# CONFIG_RFKILL is not set
394# CONFIG_NET_9P is not set 406# CONFIG_NET_9P is not set
@@ -460,7 +472,6 @@ CONFIG_IDE_PROC_FS=y
460# CONFIG_ATA is not set 472# CONFIG_ATA is not set
461# CONFIG_MD is not set 473# CONFIG_MD is not set
462CONFIG_NETDEVICES=y 474CONFIG_NETDEVICES=y
463CONFIG_COMPAT_NET_DEV_OPS=y
464# CONFIG_DUMMY is not set 475# CONFIG_DUMMY is not set
465# CONFIG_BONDING is not set 476# CONFIG_BONDING is not set
466# CONFIG_MACVLAN is not set 477# CONFIG_MACVLAN is not set
@@ -485,6 +496,7 @@ CONFIG_SMC91X=y
485# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set 496# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
486# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set 497# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
487# CONFIG_B44 is not set 498# CONFIG_B44 is not set
499# CONFIG_KS8842 is not set
488CONFIG_NETDEV_1000=y 500CONFIG_NETDEV_1000=y
489CONFIG_NETDEV_10000=y 501CONFIG_NETDEV_10000=y
490 502
@@ -582,22 +594,7 @@ CONFIG_SSB_POSSIBLE=y
582# CONFIG_HTC_PASIC3 is not set 594# CONFIG_HTC_PASIC3 is not set
583# CONFIG_MFD_TMIO is not set 595# CONFIG_MFD_TMIO is not set
584# CONFIG_REGULATOR is not set 596# CONFIG_REGULATOR is not set
585 597# CONFIG_MEDIA_SUPPORT is not set
586#
587# Multimedia devices
588#
589
590#
591# Multimedia core support
592#
593# CONFIG_VIDEO_DEV is not set
594# CONFIG_DVB_CORE is not set
595# CONFIG_VIDEO_MEDIA is not set
596
597#
598# Multimedia drivers
599#
600# CONFIG_DAB is not set
601 598
602# 599#
603# Graphics support 600# Graphics support
@@ -636,10 +633,15 @@ CONFIG_USB_ARCH_HAS_HCD=y
636# CONFIG_MEMSTICK is not set 633# CONFIG_MEMSTICK is not set
637# CONFIG_NEW_LEDS is not set 634# CONFIG_NEW_LEDS is not set
638# CONFIG_ACCESSIBILITY is not set 635# CONFIG_ACCESSIBILITY is not set
636CONFIG_RTC_LIB=y
639# CONFIG_RTC_CLASS is not set 637# CONFIG_RTC_CLASS is not set
640# CONFIG_DMADEVICES is not set 638# CONFIG_DMADEVICES is not set
641# CONFIG_AUXDISPLAY is not set 639# CONFIG_AUXDISPLAY is not set
642# CONFIG_UIO is not set 640# CONFIG_UIO is not set
641
642#
643# TI VLYNQ
644#
643# CONFIG_STAGING is not set 645# CONFIG_STAGING is not set
644 646
645# 647#
@@ -659,10 +661,11 @@ CONFIG_FS_MBCACHE=y
659# CONFIG_REISERFS_FS is not set 661# CONFIG_REISERFS_FS is not set
660# CONFIG_JFS_FS is not set 662# CONFIG_JFS_FS is not set
661# CONFIG_FS_POSIX_ACL is not set 663# CONFIG_FS_POSIX_ACL is not set
662CONFIG_FILE_LOCKING=y
663# CONFIG_XFS_FS is not set 664# CONFIG_XFS_FS is not set
664# CONFIG_OCFS2_FS is not set 665# CONFIG_OCFS2_FS is not set
665# CONFIG_BTRFS_FS is not set 666# CONFIG_BTRFS_FS is not set
667CONFIG_FILE_LOCKING=y
668CONFIG_FSNOTIFY=y
666CONFIG_DNOTIFY=y 669CONFIG_DNOTIFY=y
667CONFIG_INOTIFY=y 670CONFIG_INOTIFY=y
668CONFIG_INOTIFY_USER=y 671CONFIG_INOTIFY_USER=y
@@ -812,28 +815,12 @@ CONFIG_HAVE_FUNCTION_TRACER=y
812CONFIG_HAVE_DYNAMIC_FTRACE=y 815CONFIG_HAVE_DYNAMIC_FTRACE=y
813CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 816CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
814CONFIG_TRACING_SUPPORT=y 817CONFIG_TRACING_SUPPORT=y
815 818# CONFIG_FTRACE is not set
816#
817# Tracers
818#
819# CONFIG_FUNCTION_TRACER is not set
820# CONFIG_IRQSOFF_TRACER is not set
821# CONFIG_PREEMPT_TRACER is not set
822# CONFIG_SCHED_TRACER is not set
823# CONFIG_CONTEXT_SWITCH_TRACER is not set
824# CONFIG_EVENT_TRACER is not set
825# CONFIG_BOOT_TRACER is not set
826# CONFIG_TRACE_BRANCH_PROFILING is not set
827# CONFIG_STACK_TRACER is not set
828# CONFIG_KMEMTRACE is not set
829# CONFIG_WORKQUEUE_TRACER is not set
830# CONFIG_BLK_DEV_IO_TRACE is not set
831# CONFIG_DMA_API_DEBUG is not set 819# CONFIG_DMA_API_DEBUG is not set
832# CONFIG_SAMPLES is not set 820# CONFIG_SAMPLES is not set
833CONFIG_HAVE_ARCH_KGDB=y 821CONFIG_HAVE_ARCH_KGDB=y
834# CONFIG_SH_STANDARD_BIOS is not set 822# CONFIG_SH_STANDARD_BIOS is not set
835# CONFIG_EARLY_SCIF_CONSOLE is not set 823# CONFIG_EARLY_SCIF_CONSOLE is not set
836# CONFIG_MORE_COMPILE_OPTIONS is not set
837 824
838# 825#
839# Security options 826# Security options
@@ -957,3 +944,4 @@ CONFIG_HAS_IOMEM=y
957CONFIG_HAS_IOPORT=y 944CONFIG_HAS_IOPORT=y
958CONFIG_HAS_DMA=y 945CONFIG_HAS_DMA=y
959CONFIG_NLATTR=y 946CONFIG_NLATTR=y
947CONFIG_GENERIC_ATOMIC64=y
diff --git a/arch/sh/configs/migor_defconfig b/arch/sh/configs/migor_defconfig
index 8ecceb4bf27e..da627d22c009 100644
--- a/arch/sh/configs/migor_defconfig
+++ b/arch/sh/configs/migor_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.30-rc3 3# Linux kernel version: 2.6.30
4# Mon Apr 27 12:51:34 2009 4# Thu Jun 18 16:06:48 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -21,6 +21,7 @@ CONFIG_ARCH_SUSPEND_POSSIBLE=y
21CONFIG_ARCH_HIBERNATION_POSSIBLE=y 21CONFIG_ARCH_HIBERNATION_POSSIBLE=y
22CONFIG_SYS_SUPPORTS_NUMA=y 22CONFIG_SYS_SUPPORTS_NUMA=y
23CONFIG_SYS_SUPPORTS_CMT=y 23CONFIG_SYS_SUPPORTS_CMT=y
24CONFIG_SYS_SUPPORTS_TMU=y
24CONFIG_STACKTRACE_SUPPORT=y 25CONFIG_STACKTRACE_SUPPORT=y
25CONFIG_LOCKDEP_SUPPORT=y 26CONFIG_LOCKDEP_SUPPORT=y
26CONFIG_HAVE_LATENCYTOP_SUPPORT=y 27CONFIG_HAVE_LATENCYTOP_SUPPORT=y
@@ -76,7 +77,6 @@ CONFIG_UID16=y
76# CONFIG_SYSCTL_SYSCALL is not set 77# CONFIG_SYSCTL_SYSCALL is not set
77CONFIG_KALLSYMS=y 78CONFIG_KALLSYMS=y
78# CONFIG_KALLSYMS_EXTRA_PASS is not set 79# CONFIG_KALLSYMS_EXTRA_PASS is not set
79# CONFIG_STRIP_ASM_SYMS is not set
80CONFIG_HOTPLUG=y 80CONFIG_HOTPLUG=y
81CONFIG_PRINTK=y 81CONFIG_PRINTK=y
82CONFIG_BUG=y 82CONFIG_BUG=y
@@ -89,14 +89,19 @@ CONFIG_TIMERFD=y
89CONFIG_EVENTFD=y 89CONFIG_EVENTFD=y
90CONFIG_SHMEM=y 90CONFIG_SHMEM=y
91CONFIG_AIO=y 91CONFIG_AIO=y
92
93#
94# Performance Counters
95#
92CONFIG_VM_EVENT_COUNTERS=y 96CONFIG_VM_EVENT_COUNTERS=y
97# CONFIG_STRIP_ASM_SYMS is not set
93CONFIG_COMPAT_BRK=y 98CONFIG_COMPAT_BRK=y
94CONFIG_SLAB=y 99CONFIG_SLAB=y
95# CONFIG_SLUB is not set 100# CONFIG_SLUB is not set
96# CONFIG_SLOB is not set 101# CONFIG_SLOB is not set
97CONFIG_PROFILING=y 102CONFIG_PROFILING=y
98CONFIG_TRACEPOINTS=y 103CONFIG_TRACEPOINTS=y
99# CONFIG_MARKERS is not set 104CONFIG_MARKERS=y
100CONFIG_OPROFILE=y 105CONFIG_OPROFILE=y
101CONFIG_HAVE_OPROFILE=y 106CONFIG_HAVE_OPROFILE=y
102# CONFIG_KPROBES is not set 107# CONFIG_KPROBES is not set
@@ -184,6 +189,7 @@ CONFIG_CPU_SUBTYPE_SH7722=y
184CONFIG_QUICKLIST=y 189CONFIG_QUICKLIST=y
185CONFIG_MMU=y 190CONFIG_MMU=y
186CONFIG_PAGE_OFFSET=0x80000000 191CONFIG_PAGE_OFFSET=0x80000000
192CONFIG_FORCE_MAX_ZONEORDER=11
187CONFIG_MEMORY_START=0x0c000000 193CONFIG_MEMORY_START=0x0c000000
188CONFIG_MEMORY_SIZE=0x04000000 194CONFIG_MEMORY_SIZE=0x04000000
189CONFIG_29BIT=y 195CONFIG_29BIT=y
@@ -202,7 +208,6 @@ CONFIG_PAGE_SIZE_4KB=y
202# CONFIG_PAGE_SIZE_8KB is not set 208# CONFIG_PAGE_SIZE_8KB is not set
203# CONFIG_PAGE_SIZE_16KB is not set 209# CONFIG_PAGE_SIZE_16KB is not set
204# CONFIG_PAGE_SIZE_64KB is not set 210# CONFIG_PAGE_SIZE_64KB is not set
205CONFIG_ENTRY_OFFSET=0x00001000
206CONFIG_SELECT_MEMORY_MODEL=y 211CONFIG_SELECT_MEMORY_MODEL=y
207# CONFIG_FLATMEM_MANUAL is not set 212# CONFIG_FLATMEM_MANUAL is not set
208# CONFIG_DISCONTIGMEM_MANUAL is not set 213# CONFIG_DISCONTIGMEM_MANUAL is not set
@@ -217,9 +222,9 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
217# CONFIG_PHYS_ADDR_T_64BIT is not set 222# CONFIG_PHYS_ADDR_T_64BIT is not set
218CONFIG_ZONE_DMA_FLAG=0 223CONFIG_ZONE_DMA_FLAG=0
219CONFIG_NR_QUICK=2 224CONFIG_NR_QUICK=2
220CONFIG_UNEVICTABLE_LRU=y
221CONFIG_HAVE_MLOCK=y 225CONFIG_HAVE_MLOCK=y
222CONFIG_HAVE_MLOCKED_PAGE_BIT=y 226CONFIG_HAVE_MLOCKED_PAGE_BIT=y
227CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
223 228
224# 229#
225# Cache configuration 230# Cache configuration
@@ -238,7 +243,6 @@ CONFIG_SH_DSP=y
238# CONFIG_SH_STORE_QUEUES is not set 243# CONFIG_SH_STORE_QUEUES is not set
239CONFIG_CPU_HAS_INTEVT=y 244CONFIG_CPU_HAS_INTEVT=y
240CONFIG_CPU_HAS_SR_RB=y 245CONFIG_CPU_HAS_SR_RB=y
241CONFIG_CPU_HAS_PTEA=y
242CONFIG_CPU_HAS_DSP=y 246CONFIG_CPU_HAS_DSP=y
243 247
244# 248#
@@ -252,10 +256,10 @@ CONFIG_SH_MIGOR_QVGA=y
252# 256#
253# Timer and clock configuration 257# Timer and clock configuration
254# 258#
255CONFIG_SH_TMU=y 259CONFIG_SH_TIMER_TMU=y
256# CONFIG_SH_TIMER_CMT is not set 260# CONFIG_SH_TIMER_CMT is not set
257CONFIG_SH_TIMER_IRQ=16
258CONFIG_SH_PCLK_FREQ=33333333 261CONFIG_SH_PCLK_FREQ=33333333
262CONFIG_SH_CLK_CPG=y
259# CONFIG_NO_HZ is not set 263# CONFIG_NO_HZ is not set
260# CONFIG_HIGH_RES_TIMERS is not set 264# CONFIG_HIGH_RES_TIMERS is not set
261CONFIG_GENERIC_CLOCKEVENTS_BUILD=y 265CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
@@ -296,12 +300,14 @@ CONFIG_PREEMPT_NONE=y
296# CONFIG_PREEMPT_VOLUNTARY is not set 300# CONFIG_PREEMPT_VOLUNTARY is not set
297# CONFIG_PREEMPT is not set 301# CONFIG_PREEMPT is not set
298CONFIG_GUSA=y 302CONFIG_GUSA=y
303# CONFIG_SPARSE_IRQ is not set
299 304
300# 305#
301# Boot options 306# Boot options
302# 307#
303CONFIG_ZERO_PAGE_OFFSET=0x00001000 308CONFIG_ZERO_PAGE_OFFSET=0x00001000
304CONFIG_BOOT_LINK_OFFSET=0x00800000 309CONFIG_BOOT_LINK_OFFSET=0x00800000
310CONFIG_ENTRY_OFFSET=0x00001000
305CONFIG_CMDLINE_BOOL=y 311CONFIG_CMDLINE_BOOL=y
306CONFIG_CMDLINE="console=ttySC0,115200 earlyprintk=serial ip=on root=/dev/nfs ip=dhcp" 312CONFIG_CMDLINE="console=ttySC0,115200 earlyprintk=serial ip=on root=/dev/nfs ip=dhcp"
307 313
@@ -384,6 +390,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
384# CONFIG_ECONET is not set 390# CONFIG_ECONET is not set
385# CONFIG_WAN_ROUTER is not set 391# CONFIG_WAN_ROUTER is not set
386# CONFIG_PHONET is not set 392# CONFIG_PHONET is not set
393# CONFIG_IEEE802154 is not set
387# CONFIG_NET_SCHED is not set 394# CONFIG_NET_SCHED is not set
388# CONFIG_DCB is not set 395# CONFIG_DCB is not set
389 396
@@ -403,7 +410,11 @@ CONFIG_WIRELESS=y
403CONFIG_WIRELESS_EXT=y 410CONFIG_WIRELESS_EXT=y
404CONFIG_WIRELESS_EXT_SYSFS=y 411CONFIG_WIRELESS_EXT_SYSFS=y
405# CONFIG_LIB80211 is not set 412# CONFIG_LIB80211 is not set
406# CONFIG_MAC80211 is not set 413
414#
415# CFG80211 needs to be enabled for MAC80211
416#
417CONFIG_MAC80211_DEFAULT_PS_VALUE=0
407# CONFIG_WIMAX is not set 418# CONFIG_WIMAX is not set
408# CONFIG_RFKILL is not set 419# CONFIG_RFKILL is not set
409# CONFIG_NET_9P is not set 420# CONFIG_NET_9P is not set
@@ -534,6 +545,7 @@ CONFIG_MISC_DEVICES=y
534# 545#
535# CONFIG_EEPROM_AT24 is not set 546# CONFIG_EEPROM_AT24 is not set
536# CONFIG_EEPROM_LEGACY is not set 547# CONFIG_EEPROM_LEGACY is not set
548# CONFIG_EEPROM_MAX6875 is not set
537# CONFIG_EEPROM_93CX6 is not set 549# CONFIG_EEPROM_93CX6 is not set
538CONFIG_HAVE_IDE=y 550CONFIG_HAVE_IDE=y
539# CONFIG_IDE is not set 551# CONFIG_IDE is not set
@@ -557,10 +569,6 @@ CONFIG_BLK_DEV_SD=y
557# CONFIG_BLK_DEV_SR is not set 569# CONFIG_BLK_DEV_SR is not set
558# CONFIG_CHR_DEV_SG is not set 570# CONFIG_CHR_DEV_SG is not set
559# CONFIG_CHR_DEV_SCH is not set 571# CONFIG_CHR_DEV_SCH is not set
560
561#
562# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
563#
564# CONFIG_SCSI_MULTI_LUN is not set 572# CONFIG_SCSI_MULTI_LUN is not set
565# CONFIG_SCSI_CONSTANTS is not set 573# CONFIG_SCSI_CONSTANTS is not set
566# CONFIG_SCSI_LOGGING is not set 574# CONFIG_SCSI_LOGGING is not set
@@ -577,6 +585,7 @@ CONFIG_SCSI_WAIT_SCAN=m
577# CONFIG_SCSI_SRP_ATTRS is not set 585# CONFIG_SCSI_SRP_ATTRS is not set
578CONFIG_SCSI_LOWLEVEL=y 586CONFIG_SCSI_LOWLEVEL=y
579# CONFIG_ISCSI_TCP is not set 587# CONFIG_ISCSI_TCP is not set
588# CONFIG_SCSI_BNX2_ISCSI is not set
580# CONFIG_LIBFC is not set 589# CONFIG_LIBFC is not set
581# CONFIG_LIBFCOE is not set 590# CONFIG_LIBFCOE is not set
582# CONFIG_SCSI_DEBUG is not set 591# CONFIG_SCSI_DEBUG is not set
@@ -585,7 +594,6 @@ CONFIG_SCSI_LOWLEVEL=y
585# CONFIG_ATA is not set 594# CONFIG_ATA is not set
586# CONFIG_MD is not set 595# CONFIG_MD is not set
587CONFIG_NETDEVICES=y 596CONFIG_NETDEVICES=y
588CONFIG_COMPAT_NET_DEV_OPS=y
589# CONFIG_DUMMY is not set 597# CONFIG_DUMMY is not set
590# CONFIG_BONDING is not set 598# CONFIG_BONDING is not set
591# CONFIG_MACVLAN is not set 599# CONFIG_MACVLAN is not set
@@ -610,6 +618,7 @@ CONFIG_SMC91X=y
610# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set 618# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
611# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set 619# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
612# CONFIG_B44 is not set 620# CONFIG_B44 is not set
621# CONFIG_KS8842 is not set
613# CONFIG_NETDEV_1000 is not set 622# CONFIG_NETDEV_1000 is not set
614# CONFIG_NETDEV_10000 is not set 623# CONFIG_NETDEV_10000 is not set
615 624
@@ -740,7 +749,6 @@ CONFIG_I2C_SH_MOBILE=y
740# CONFIG_SENSORS_PCF8574 is not set 749# CONFIG_SENSORS_PCF8574 is not set
741# CONFIG_PCF8575 is not set 750# CONFIG_PCF8575 is not set
742# CONFIG_SENSORS_PCA9539 is not set 751# CONFIG_SENSORS_PCA9539 is not set
743# CONFIG_SENSORS_MAX6875 is not set
744# CONFIG_SENSORS_TSL2550 is not set 752# CONFIG_SENSORS_TSL2550 is not set
745# CONFIG_I2C_DEBUG_CORE is not set 753# CONFIG_I2C_DEBUG_CORE is not set
746# CONFIG_I2C_DEBUG_ALGO is not set 754# CONFIG_I2C_DEBUG_ALGO is not set
@@ -796,10 +804,7 @@ CONFIG_SSB_POSSIBLE=y
796# CONFIG_MFD_WM8350_I2C is not set 804# CONFIG_MFD_WM8350_I2C is not set
797# CONFIG_MFD_PCF50633 is not set 805# CONFIG_MFD_PCF50633 is not set
798# CONFIG_REGULATOR is not set 806# CONFIG_REGULATOR is not set
799 807CONFIG_MEDIA_SUPPORT=y
800#
801# Multimedia devices
802#
803 808
804# 809#
805# Multimedia core support 810# Multimedia core support
@@ -899,6 +904,7 @@ CONFIG_USB_GADGET_SELECTED=y
899# CONFIG_USB_GADGET_OMAP is not set 904# CONFIG_USB_GADGET_OMAP is not set
900# CONFIG_USB_GADGET_PXA25X is not set 905# CONFIG_USB_GADGET_PXA25X is not set
901# CONFIG_USB_GADGET_PXA27X is not set 906# CONFIG_USB_GADGET_PXA27X is not set
907# CONFIG_USB_GADGET_S3C_HSOTG is not set
902# CONFIG_USB_GADGET_S3C2410 is not set 908# CONFIG_USB_GADGET_S3C2410 is not set
903# CONFIG_USB_GADGET_IMX is not set 909# CONFIG_USB_GADGET_IMX is not set
904CONFIG_USB_GADGET_M66592=y 910CONFIG_USB_GADGET_M66592=y
@@ -909,9 +915,11 @@ CONFIG_SUPERH_BUILT_IN_M66592=y
909# CONFIG_USB_GADGET_CI13XXX is not set 915# CONFIG_USB_GADGET_CI13XXX is not set
910# CONFIG_USB_GADGET_NET2280 is not set 916# CONFIG_USB_GADGET_NET2280 is not set
911# CONFIG_USB_GADGET_GOKU is not set 917# CONFIG_USB_GADGET_GOKU is not set
918# CONFIG_USB_GADGET_LANGWELL is not set
912# CONFIG_USB_GADGET_DUMMY_HCD is not set 919# CONFIG_USB_GADGET_DUMMY_HCD is not set
913CONFIG_USB_GADGET_DUALSPEED=y 920CONFIG_USB_GADGET_DUALSPEED=y
914# CONFIG_USB_ZERO is not set 921# CONFIG_USB_ZERO is not set
922# CONFIG_USB_AUDIO is not set
915# CONFIG_USB_ETH is not set 923# CONFIG_USB_ETH is not set
916# CONFIG_USB_GADGETFS is not set 924# CONFIG_USB_GADGETFS is not set
917# CONFIG_USB_FILE_STORAGE is not set 925# CONFIG_USB_FILE_STORAGE is not set
@@ -983,6 +991,7 @@ CONFIG_RTC_DRV_RS5C372=y
983# on-CPU RTC drivers 991# on-CPU RTC drivers
984# 992#
985CONFIG_RTC_DRV_SH=y 993CONFIG_RTC_DRV_SH=y
994# CONFIG_RTC_DRV_GENERIC is not set
986# CONFIG_DMADEVICES is not set 995# CONFIG_DMADEVICES is not set
987# CONFIG_AUXDISPLAY is not set 996# CONFIG_AUXDISPLAY is not set
988CONFIG_UIO=y 997CONFIG_UIO=y
@@ -990,6 +999,10 @@ CONFIG_UIO=y
990CONFIG_UIO_PDRV_GENIRQ=y 999CONFIG_UIO_PDRV_GENIRQ=y
991# CONFIG_UIO_SMX is not set 1000# CONFIG_UIO_SMX is not set
992# CONFIG_UIO_SERCOS3 is not set 1001# CONFIG_UIO_SERCOS3 is not set
1002
1003#
1004# TI VLYNQ
1005#
993# CONFIG_STAGING is not set 1006# CONFIG_STAGING is not set
994 1007
995# 1008#
@@ -1001,12 +1014,14 @@ CONFIG_UIO_PDRV_GENIRQ=y
1001# CONFIG_REISERFS_FS is not set 1014# CONFIG_REISERFS_FS is not set
1002# CONFIG_JFS_FS is not set 1015# CONFIG_JFS_FS is not set
1003# CONFIG_FS_POSIX_ACL is not set 1016# CONFIG_FS_POSIX_ACL is not set
1004CONFIG_FILE_LOCKING=y
1005# CONFIG_XFS_FS is not set 1017# CONFIG_XFS_FS is not set
1006# CONFIG_OCFS2_FS is not set 1018# CONFIG_OCFS2_FS is not set
1007# CONFIG_BTRFS_FS is not set 1019# CONFIG_BTRFS_FS is not set
1020CONFIG_FILE_LOCKING=y
1021CONFIG_FSNOTIFY=y
1008# CONFIG_DNOTIFY is not set 1022# CONFIG_DNOTIFY is not set
1009# CONFIG_INOTIFY is not set 1023# CONFIG_INOTIFY is not set
1024CONFIG_INOTIFY_USER=y
1010# CONFIG_QUOTA is not set 1025# CONFIG_QUOTA is not set
1011# CONFIG_AUTOFS_FS is not set 1026# CONFIG_AUTOFS_FS is not set
1012# CONFIG_AUTOFS4_FS is not set 1027# CONFIG_AUTOFS4_FS is not set
@@ -1111,24 +1126,11 @@ CONFIG_HAVE_FUNCTION_TRACER=y
1111CONFIG_HAVE_DYNAMIC_FTRACE=y 1126CONFIG_HAVE_DYNAMIC_FTRACE=y
1112CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 1127CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1113CONFIG_RING_BUFFER=y 1128CONFIG_RING_BUFFER=y
1129CONFIG_EVENT_TRACING=y
1130CONFIG_CONTEXT_SWITCH_TRACER=y
1114CONFIG_TRACING=y 1131CONFIG_TRACING=y
1115CONFIG_TRACING_SUPPORT=y 1132CONFIG_TRACING_SUPPORT=y
1116 1133# CONFIG_FTRACE is not set
1117#
1118# Tracers
1119#
1120# CONFIG_FUNCTION_TRACER is not set
1121# CONFIG_IRQSOFF_TRACER is not set
1122# CONFIG_SCHED_TRACER is not set
1123# CONFIG_CONTEXT_SWITCH_TRACER is not set
1124# CONFIG_EVENT_TRACER is not set
1125# CONFIG_BOOT_TRACER is not set
1126# CONFIG_TRACE_BRANCH_PROFILING is not set
1127# CONFIG_STACK_TRACER is not set
1128# CONFIG_KMEMTRACE is not set
1129# CONFIG_WORKQUEUE_TRACER is not set
1130# CONFIG_BLK_DEV_IO_TRACE is not set
1131# CONFIG_FTRACE_STARTUP_TEST is not set
1132# CONFIG_DYNAMIC_DEBUG is not set 1134# CONFIG_DYNAMIC_DEBUG is not set
1133# CONFIG_DMA_API_DEBUG is not set 1135# CONFIG_DMA_API_DEBUG is not set
1134# CONFIG_SAMPLES is not set 1136# CONFIG_SAMPLES is not set
@@ -1137,7 +1139,6 @@ CONFIG_HAVE_ARCH_KGDB=y
1137CONFIG_EARLY_SCIF_CONSOLE=y 1139CONFIG_EARLY_SCIF_CONSOLE=y
1138CONFIG_EARLY_SCIF_CONSOLE_PORT=0xffe00000 1140CONFIG_EARLY_SCIF_CONSOLE_PORT=0xffe00000
1139CONFIG_EARLY_PRINTK=y 1141CONFIG_EARLY_PRINTK=y
1140# CONFIG_MORE_COMPILE_OPTIONS is not set
1141 1142
1142# 1143#
1143# Security options 1144# Security options
@@ -1259,3 +1260,4 @@ CONFIG_HAS_IOMEM=y
1259CONFIG_HAS_IOPORT=y 1260CONFIG_HAS_IOPORT=y
1260CONFIG_HAS_DMA=y 1261CONFIG_HAS_DMA=y
1261CONFIG_NLATTR=y 1262CONFIG_NLATTR=y
1263CONFIG_GENERIC_ATOMIC64=y
diff --git a/arch/sh/configs/polaris_defconfig b/arch/sh/configs/polaris_defconfig
index 2b9507286182..67edd3f3f9ba 100644
--- a/arch/sh/configs/polaris_defconfig
+++ b/arch/sh/configs/polaris_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.30-rc3 3# Linux kernel version: 2.6.30
4# Mon Apr 27 12:52:19 2009 4# Thu Jun 18 12:33:28 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -19,6 +19,7 @@ CONFIG_GENERIC_TIME=y
19CONFIG_GENERIC_CLOCKEVENTS=y 19CONFIG_GENERIC_CLOCKEVENTS=y
20# CONFIG_ARCH_SUSPEND_POSSIBLE is not set 20# CONFIG_ARCH_SUSPEND_POSSIBLE is not set
21CONFIG_ARCH_HIBERNATION_POSSIBLE=y 21CONFIG_ARCH_HIBERNATION_POSSIBLE=y
22CONFIG_SYS_SUPPORTS_TMU=y
22CONFIG_STACKTRACE_SUPPORT=y 23CONFIG_STACKTRACE_SUPPORT=y
23CONFIG_LOCKDEP_SUPPORT=y 24CONFIG_LOCKDEP_SUPPORT=y
24CONFIG_HAVE_LATENCYTOP_SUPPORT=y 25CONFIG_HAVE_LATENCYTOP_SUPPORT=y
@@ -78,7 +79,6 @@ CONFIG_SYSCTL_SYSCALL=y
78CONFIG_KALLSYMS=y 79CONFIG_KALLSYMS=y
79CONFIG_KALLSYMS_ALL=y 80CONFIG_KALLSYMS_ALL=y
80# CONFIG_KALLSYMS_EXTRA_PASS is not set 81# CONFIG_KALLSYMS_EXTRA_PASS is not set
81# CONFIG_STRIP_ASM_SYMS is not set
82CONFIG_HOTPLUG=y 82CONFIG_HOTPLUG=y
83CONFIG_PRINTK=y 83CONFIG_PRINTK=y
84CONFIG_BUG=y 84CONFIG_BUG=y
@@ -91,7 +91,12 @@ CONFIG_TIMERFD=y
91CONFIG_EVENTFD=y 91CONFIG_EVENTFD=y
92CONFIG_SHMEM=y 92CONFIG_SHMEM=y
93CONFIG_AIO=y 93CONFIG_AIO=y
94
95#
96# Performance Counters
97#
94CONFIG_VM_EVENT_COUNTERS=y 98CONFIG_VM_EVENT_COUNTERS=y
99# CONFIG_STRIP_ASM_SYMS is not set
95CONFIG_COMPAT_BRK=y 100CONFIG_COMPAT_BRK=y
96CONFIG_SLAB=y 101CONFIG_SLAB=y
97# CONFIG_SLUB is not set 102# CONFIG_SLUB is not set
@@ -181,6 +186,7 @@ CONFIG_CPU_SUBTYPE_SH7709=y
181CONFIG_QUICKLIST=y 186CONFIG_QUICKLIST=y
182CONFIG_MMU=y 187CONFIG_MMU=y
183CONFIG_PAGE_OFFSET=0x80000000 188CONFIG_PAGE_OFFSET=0x80000000
189CONFIG_FORCE_MAX_ZONEORDER=11
184CONFIG_MEMORY_START=0x0C000000 190CONFIG_MEMORY_START=0x0C000000
185CONFIG_MEMORY_SIZE=0x04000000 191CONFIG_MEMORY_SIZE=0x04000000
186CONFIG_29BIT=y 192CONFIG_29BIT=y
@@ -195,7 +201,6 @@ CONFIG_PAGE_SIZE_4KB=y
195# CONFIG_PAGE_SIZE_8KB is not set 201# CONFIG_PAGE_SIZE_8KB is not set
196# CONFIG_PAGE_SIZE_16KB is not set 202# CONFIG_PAGE_SIZE_16KB is not set
197# CONFIG_PAGE_SIZE_64KB is not set 203# CONFIG_PAGE_SIZE_64KB is not set
198CONFIG_ENTRY_OFFSET=0x00001000
199CONFIG_SELECT_MEMORY_MODEL=y 204CONFIG_SELECT_MEMORY_MODEL=y
200CONFIG_FLATMEM_MANUAL=y 205CONFIG_FLATMEM_MANUAL=y
201# CONFIG_DISCONTIGMEM_MANUAL is not set 206# CONFIG_DISCONTIGMEM_MANUAL is not set
@@ -208,9 +213,9 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
208# CONFIG_PHYS_ADDR_T_64BIT is not set 213# CONFIG_PHYS_ADDR_T_64BIT is not set
209CONFIG_ZONE_DMA_FLAG=0 214CONFIG_ZONE_DMA_FLAG=0
210CONFIG_NR_QUICK=2 215CONFIG_NR_QUICK=2
211CONFIG_UNEVICTABLE_LRU=y
212CONFIG_HAVE_MLOCK=y 216CONFIG_HAVE_MLOCK=y
213CONFIG_HAVE_MLOCKED_PAGE_BIT=y 217CONFIG_HAVE_MLOCKED_PAGE_BIT=y
218CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
214 219
215# 220#
216# Cache configuration 221# Cache configuration
@@ -240,9 +245,10 @@ CONFIG_SH_POLARIS=y
240# 245#
241# Timer and clock configuration 246# Timer and clock configuration
242# 247#
243CONFIG_SH_TMU=y 248CONFIG_SH_TIMER_TMU=y
244CONFIG_SH_TIMER_IRQ=16
245CONFIG_SH_PCLK_FREQ=33000000 249CONFIG_SH_PCLK_FREQ=33000000
250CONFIG_SH_CLK_CPG=y
251CONFIG_SH_CLK_CPG_LEGACY=y
246CONFIG_TICK_ONESHOT=y 252CONFIG_TICK_ONESHOT=y
247CONFIG_NO_HZ=y 253CONFIG_NO_HZ=y
248CONFIG_HIGH_RES_TIMERS=y 254CONFIG_HIGH_RES_TIMERS=y
@@ -288,12 +294,14 @@ CONFIG_SCHED_HRTICK=y
288CONFIG_PREEMPT=y 294CONFIG_PREEMPT=y
289CONFIG_GUSA=y 295CONFIG_GUSA=y
290# CONFIG_GUSA_RB is not set 296# CONFIG_GUSA_RB is not set
297# CONFIG_SPARSE_IRQ is not set
291 298
292# 299#
293# Boot options 300# Boot options
294# 301#
295CONFIG_ZERO_PAGE_OFFSET=0x00001000 302CONFIG_ZERO_PAGE_OFFSET=0x00001000
296CONFIG_BOOT_LINK_OFFSET=0x00800000 303CONFIG_BOOT_LINK_OFFSET=0x00800000
304CONFIG_ENTRY_OFFSET=0x00001000
297CONFIG_CMDLINE_BOOL=y 305CONFIG_CMDLINE_BOOL=y
298CONFIG_CMDLINE="console=ttySC1,115200 root=/dev/mtdblock2 rootfstype=jffs2 mem=63M mtdparts=physmap-flash.0:0x00100000(bootloader)ro,0x00500000(Kernel)ro,0x00A00000(Filesystem)" 306CONFIG_CMDLINE="console=ttySC1,115200 root=/dev/mtdblock2 rootfstype=jffs2 mem=63M mtdparts=physmap-flash.0:0x00100000(bootloader)ro,0x00500000(Kernel)ro,0x00A00000(Filesystem)"
299 307
@@ -369,6 +377,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
369# CONFIG_ECONET is not set 377# CONFIG_ECONET is not set
370# CONFIG_WAN_ROUTER is not set 378# CONFIG_WAN_ROUTER is not set
371# CONFIG_PHONET is not set 379# CONFIG_PHONET is not set
380# CONFIG_IEEE802154 is not set
372# CONFIG_NET_SCHED is not set 381# CONFIG_NET_SCHED is not set
373# CONFIG_DCB is not set 382# CONFIG_DCB is not set
374 383
@@ -522,7 +531,6 @@ CONFIG_HAVE_IDE=y
522# CONFIG_ATA is not set 531# CONFIG_ATA is not set
523# CONFIG_MD is not set 532# CONFIG_MD is not set
524CONFIG_NETDEVICES=y 533CONFIG_NETDEVICES=y
525CONFIG_COMPAT_NET_DEV_OPS=y
526# CONFIG_DUMMY is not set 534# CONFIG_DUMMY is not set
527# CONFIG_BONDING is not set 535# CONFIG_BONDING is not set
528# CONFIG_MACVLAN is not set 536# CONFIG_MACVLAN is not set
@@ -566,6 +574,7 @@ CONFIG_SMSC911X=y
566# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set 574# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
567# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set 575# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
568# CONFIG_B44 is not set 576# CONFIG_B44 is not set
577# CONFIG_KS8842 is not set
569# CONFIG_NETDEV_1000 is not set 578# CONFIG_NETDEV_1000 is not set
570# CONFIG_NETDEV_10000 is not set 579# CONFIG_NETDEV_10000 is not set
571 580
@@ -678,22 +687,7 @@ CONFIG_SSB_POSSIBLE=y
678# CONFIG_HTC_PASIC3 is not set 687# CONFIG_HTC_PASIC3 is not set
679# CONFIG_MFD_TMIO is not set 688# CONFIG_MFD_TMIO is not set
680# CONFIG_REGULATOR is not set 689# CONFIG_REGULATOR is not set
681 690# CONFIG_MEDIA_SUPPORT is not set
682#
683# Multimedia devices
684#
685
686#
687# Multimedia core support
688#
689# CONFIG_VIDEO_DEV is not set
690# CONFIG_DVB_CORE is not set
691# CONFIG_VIDEO_MEDIA is not set
692
693#
694# Multimedia drivers
695#
696# CONFIG_DAB is not set
697 691
698# 692#
699# Graphics support 693# Graphics support
@@ -756,9 +750,14 @@ CONFIG_RTC_INTF_DEV=y
756# on-CPU RTC drivers 750# on-CPU RTC drivers
757# 751#
758CONFIG_RTC_DRV_SH=y 752CONFIG_RTC_DRV_SH=y
753# CONFIG_RTC_DRV_GENERIC is not set
759# CONFIG_DMADEVICES is not set 754# CONFIG_DMADEVICES is not set
760# CONFIG_AUXDISPLAY is not set 755# CONFIG_AUXDISPLAY is not set
761# CONFIG_UIO is not set 756# CONFIG_UIO is not set
757
758#
759# TI VLYNQ
760#
762# CONFIG_STAGING is not set 761# CONFIG_STAGING is not set
763 762
764# 763#
@@ -770,12 +769,14 @@ CONFIG_RTC_DRV_SH=y
770# CONFIG_REISERFS_FS is not set 769# CONFIG_REISERFS_FS is not set
771# CONFIG_JFS_FS is not set 770# CONFIG_JFS_FS is not set
772# CONFIG_FS_POSIX_ACL is not set 771# CONFIG_FS_POSIX_ACL is not set
773CONFIG_FILE_LOCKING=y
774# CONFIG_XFS_FS is not set 772# CONFIG_XFS_FS is not set
775# CONFIG_OCFS2_FS is not set 773# CONFIG_OCFS2_FS is not set
776# CONFIG_BTRFS_FS is not set 774# CONFIG_BTRFS_FS is not set
775CONFIG_FILE_LOCKING=y
776CONFIG_FSNOTIFY=y
777# CONFIG_DNOTIFY is not set 777# CONFIG_DNOTIFY is not set
778# CONFIG_INOTIFY is not set 778# CONFIG_INOTIFY is not set
779CONFIG_INOTIFY_USER=y
779# CONFIG_QUOTA is not set 780# CONFIG_QUOTA is not set
780# CONFIG_AUTOFS_FS is not set 781# CONFIG_AUTOFS_FS is not set
781# CONFIG_AUTOFS4_FS is not set 782# CONFIG_AUTOFS4_FS is not set
@@ -928,18 +929,16 @@ CONFIG_HAVE_FUNCTION_TRACER=y
928CONFIG_HAVE_DYNAMIC_FTRACE=y 929CONFIG_HAVE_DYNAMIC_FTRACE=y
929CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 930CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
930CONFIG_TRACING_SUPPORT=y 931CONFIG_TRACING_SUPPORT=y
931 932CONFIG_FTRACE=y
932#
933# Tracers
934#
935# CONFIG_FUNCTION_TRACER is not set 933# CONFIG_FUNCTION_TRACER is not set
936# CONFIG_IRQSOFF_TRACER is not set 934# CONFIG_IRQSOFF_TRACER is not set
937# CONFIG_PREEMPT_TRACER is not set 935# CONFIG_PREEMPT_TRACER is not set
938# CONFIG_SCHED_TRACER is not set 936# CONFIG_SCHED_TRACER is not set
939# CONFIG_CONTEXT_SWITCH_TRACER is not set 937# CONFIG_ENABLE_DEFAULT_TRACERS is not set
940# CONFIG_EVENT_TRACER is not set
941# CONFIG_BOOT_TRACER is not set 938# CONFIG_BOOT_TRACER is not set
942# CONFIG_TRACE_BRANCH_PROFILING is not set 939CONFIG_BRANCH_PROFILE_NONE=y
940# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
941# CONFIG_PROFILE_ALL_BRANCHES is not set
943# CONFIG_STACK_TRACER is not set 942# CONFIG_STACK_TRACER is not set
944# CONFIG_KMEMTRACE is not set 943# CONFIG_KMEMTRACE is not set
945# CONFIG_WORKQUEUE_TRACER is not set 944# CONFIG_WORKQUEUE_TRACER is not set
@@ -948,6 +947,7 @@ CONFIG_TRACING_SUPPORT=y
948# CONFIG_SAMPLES is not set 947# CONFIG_SAMPLES is not set
949CONFIG_HAVE_ARCH_KGDB=y 948CONFIG_HAVE_ARCH_KGDB=y
950# CONFIG_KGDB is not set 949# CONFIG_KGDB is not set
950# CONFIG_KMEMCHECK is not set
951# CONFIG_SH_STANDARD_BIOS is not set 951# CONFIG_SH_STANDARD_BIOS is not set
952CONFIG_EARLY_SCIF_CONSOLE=y 952CONFIG_EARLY_SCIF_CONSOLE=y
953CONFIG_EARLY_SCIF_CONSOLE_PORT=0x00000000 953CONFIG_EARLY_SCIF_CONSOLE_PORT=0x00000000
@@ -956,10 +956,8 @@ CONFIG_EARLY_PRINTK=y
956# CONFIG_DEBUG_STACKOVERFLOW is not set 956# CONFIG_DEBUG_STACKOVERFLOW is not set
957# CONFIG_DEBUG_STACK_USAGE is not set 957# CONFIG_DEBUG_STACK_USAGE is not set
958# CONFIG_4KSTACKS is not set 958# CONFIG_4KSTACKS is not set
959# CONFIG_IRQSTACKS is not set
960CONFIG_DUMP_CODE=y 959CONFIG_DUMP_CODE=y
961# CONFIG_SH_NO_BSS_INIT is not set 960# CONFIG_SH_NO_BSS_INIT is not set
962# CONFIG_MORE_COMPILE_OPTIONS is not set
963 961
964# 962#
965# Security options 963# Security options
@@ -990,3 +988,4 @@ CONFIG_HAS_IOMEM=y
990CONFIG_HAS_IOPORT=y 988CONFIG_HAS_IOPORT=y
991CONFIG_HAS_DMA=y 989CONFIG_HAS_DMA=y
992CONFIG_NLATTR=y 990CONFIG_NLATTR=y
991CONFIG_GENERIC_ATOMIC64=y
diff --git a/arch/sh/configs/r7780mp_defconfig b/arch/sh/configs/r7780mp_defconfig
index 943da63a3852..107a8e337ecc 100644
--- a/arch/sh/configs/r7780mp_defconfig
+++ b/arch/sh/configs/r7780mp_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.30-rc3 3# Linux kernel version: 2.6.30
4# Mon Apr 27 12:53:28 2009 4# Thu Jun 18 12:34:44 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -20,6 +20,7 @@ CONFIG_GENERIC_CLOCKEVENTS=y
20# CONFIG_ARCH_SUSPEND_POSSIBLE is not set 20# CONFIG_ARCH_SUSPEND_POSSIBLE is not set
21CONFIG_ARCH_HIBERNATION_POSSIBLE=y 21CONFIG_ARCH_HIBERNATION_POSSIBLE=y
22CONFIG_SYS_SUPPORTS_PCI=y 22CONFIG_SYS_SUPPORTS_PCI=y
23CONFIG_SYS_SUPPORTS_TMU=y
23CONFIG_STACKTRACE_SUPPORT=y 24CONFIG_STACKTRACE_SUPPORT=y
24CONFIG_LOCKDEP_SUPPORT=y 25CONFIG_LOCKDEP_SUPPORT=y
25CONFIG_HAVE_LATENCYTOP_SUPPORT=y 26CONFIG_HAVE_LATENCYTOP_SUPPORT=y
@@ -79,7 +80,6 @@ CONFIG_UID16=y
79CONFIG_KALLSYMS=y 80CONFIG_KALLSYMS=y
80# CONFIG_KALLSYMS_ALL is not set 81# CONFIG_KALLSYMS_ALL is not set
81# CONFIG_KALLSYMS_EXTRA_PASS is not set 82# CONFIG_KALLSYMS_EXTRA_PASS is not set
82# CONFIG_STRIP_ASM_SYMS is not set
83CONFIG_HOTPLUG=y 83CONFIG_HOTPLUG=y
84CONFIG_PRINTK=y 84CONFIG_PRINTK=y
85CONFIG_BUG=y 85CONFIG_BUG=y
@@ -92,15 +92,20 @@ CONFIG_TIMERFD=y
92CONFIG_EVENTFD=y 92CONFIG_EVENTFD=y
93CONFIG_SHMEM=y 93CONFIG_SHMEM=y
94CONFIG_AIO=y 94CONFIG_AIO=y
95
96#
97# Performance Counters
98#
95CONFIG_VM_EVENT_COUNTERS=y 99CONFIG_VM_EVENT_COUNTERS=y
96CONFIG_PCI_QUIRKS=y 100CONFIG_PCI_QUIRKS=y
101# CONFIG_STRIP_ASM_SYMS is not set
97CONFIG_COMPAT_BRK=y 102CONFIG_COMPAT_BRK=y
98CONFIG_SLAB=y 103CONFIG_SLAB=y
99# CONFIG_SLUB is not set 104# CONFIG_SLUB is not set
100# CONFIG_SLOB is not set 105# CONFIG_SLOB is not set
101CONFIG_PROFILING=y 106CONFIG_PROFILING=y
102CONFIG_TRACEPOINTS=y 107CONFIG_TRACEPOINTS=y
103# CONFIG_MARKERS is not set 108CONFIG_MARKERS=y
104CONFIG_OPROFILE=m 109CONFIG_OPROFILE=m
105CONFIG_HAVE_OPROFILE=y 110CONFIG_HAVE_OPROFILE=y
106# CONFIG_KPROBES is not set 111# CONFIG_KPROBES is not set
@@ -185,6 +190,7 @@ CONFIG_CPU_SUBTYPE_SH7780=y
185CONFIG_QUICKLIST=y 190CONFIG_QUICKLIST=y
186CONFIG_MMU=y 191CONFIG_MMU=y
187CONFIG_PAGE_OFFSET=0x80000000 192CONFIG_PAGE_OFFSET=0x80000000
193CONFIG_FORCE_MAX_ZONEORDER=11
188CONFIG_MEMORY_START=0x08000000 194CONFIG_MEMORY_START=0x08000000
189CONFIG_MEMORY_SIZE=0x08000000 195CONFIG_MEMORY_SIZE=0x08000000
190# CONFIG_29BIT is not set 196# CONFIG_29BIT is not set
@@ -203,7 +209,6 @@ CONFIG_PAGE_SIZE_4KB=y
203# CONFIG_PAGE_SIZE_8KB is not set 209# CONFIG_PAGE_SIZE_8KB is not set
204# CONFIG_PAGE_SIZE_16KB is not set 210# CONFIG_PAGE_SIZE_16KB is not set
205# CONFIG_PAGE_SIZE_64KB is not set 211# CONFIG_PAGE_SIZE_64KB is not set
206CONFIG_ENTRY_OFFSET=0x00001000
207CONFIG_HUGETLB_PAGE_SIZE_64K=y 212CONFIG_HUGETLB_PAGE_SIZE_64K=y
208# CONFIG_HUGETLB_PAGE_SIZE_256K is not set 213# CONFIG_HUGETLB_PAGE_SIZE_256K is not set
209# CONFIG_HUGETLB_PAGE_SIZE_1MB is not set 214# CONFIG_HUGETLB_PAGE_SIZE_1MB is not set
@@ -222,9 +227,9 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
222# CONFIG_PHYS_ADDR_T_64BIT is not set 227# CONFIG_PHYS_ADDR_T_64BIT is not set
223CONFIG_ZONE_DMA_FLAG=0 228CONFIG_ZONE_DMA_FLAG=0
224CONFIG_NR_QUICK=2 229CONFIG_NR_QUICK=2
225CONFIG_UNEVICTABLE_LRU=y
226CONFIG_HAVE_MLOCK=y 230CONFIG_HAVE_MLOCK=y
227CONFIG_HAVE_MLOCKED_PAGE_BIT=y 231CONFIG_HAVE_MLOCKED_PAGE_BIT=y
232CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
228 233
229# 234#
230# Cache configuration 235# Cache configuration
@@ -258,9 +263,10 @@ CONFIG_SH_R7780MP=y
258# 263#
259# Timer and clock configuration 264# Timer and clock configuration
260# 265#
261CONFIG_SH_TMU=y 266CONFIG_SH_TIMER_TMU=y
262CONFIG_SH_TIMER_IRQ=28
263CONFIG_SH_PCLK_FREQ=33333333 267CONFIG_SH_PCLK_FREQ=33333333
268CONFIG_SH_CLK_CPG=y
269CONFIG_SH_CLK_CPG_LEGACY=y
264# CONFIG_NO_HZ is not set 270# CONFIG_NO_HZ is not set
265# CONFIG_HIGH_RES_TIMERS is not set 271# CONFIG_HIGH_RES_TIMERS is not set
266CONFIG_GENERIC_CLOCKEVENTS_BUILD=y 272CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
@@ -301,12 +307,14 @@ CONFIG_KEXEC=y
301# CONFIG_PREEMPT_VOLUNTARY is not set 307# CONFIG_PREEMPT_VOLUNTARY is not set
302CONFIG_PREEMPT=y 308CONFIG_PREEMPT=y
303CONFIG_GUSA=y 309CONFIG_GUSA=y
310# CONFIG_SPARSE_IRQ is not set
304 311
305# 312#
306# Boot options 313# Boot options
307# 314#
308CONFIG_ZERO_PAGE_OFFSET=0x00001000 315CONFIG_ZERO_PAGE_OFFSET=0x00001000
309CONFIG_BOOT_LINK_OFFSET=0x00800000 316CONFIG_BOOT_LINK_OFFSET=0x00800000
317CONFIG_ENTRY_OFFSET=0x00001000
310CONFIG_CMDLINE_BOOL=y 318CONFIG_CMDLINE_BOOL=y
311CONFIG_CMDLINE="console=ttySC0,115200 root=/dev/sda1" 319CONFIG_CMDLINE="console=ttySC0,115200 root=/dev/sda1"
312 320
@@ -404,6 +412,7 @@ CONFIG_LLC=m
404# CONFIG_ECONET is not set 412# CONFIG_ECONET is not set
405# CONFIG_WAN_ROUTER is not set 413# CONFIG_WAN_ROUTER is not set
406# CONFIG_PHONET is not set 414# CONFIG_PHONET is not set
415# CONFIG_IEEE802154 is not set
407# CONFIG_NET_SCHED is not set 416# CONFIG_NET_SCHED is not set
408# CONFIG_DCB is not set 417# CONFIG_DCB is not set
409 418
@@ -423,7 +432,11 @@ CONFIG_WIRELESS=y
423CONFIG_WIRELESS_EXT=y 432CONFIG_WIRELESS_EXT=y
424CONFIG_WIRELESS_EXT_SYSFS=y 433CONFIG_WIRELESS_EXT_SYSFS=y
425# CONFIG_LIB80211 is not set 434# CONFIG_LIB80211 is not set
426# CONFIG_MAC80211 is not set 435
436#
437# CFG80211 needs to be enabled for MAC80211
438#
439CONFIG_MAC80211_DEFAULT_PS_VALUE=0
427# CONFIG_WIMAX is not set 440# CONFIG_WIMAX is not set
428# CONFIG_RFKILL is not set 441# CONFIG_RFKILL is not set
429# CONFIG_NET_9P is not set 442# CONFIG_NET_9P is not set
@@ -445,7 +458,91 @@ CONFIG_EXTRA_FIRMWARE=""
445# CONFIG_DEBUG_DEVRES is not set 458# CONFIG_DEBUG_DEVRES is not set
446# CONFIG_SYS_HYPERVISOR is not set 459# CONFIG_SYS_HYPERVISOR is not set
447# CONFIG_CONNECTOR is not set 460# CONFIG_CONNECTOR is not set
448# CONFIG_MTD is not set 461CONFIG_MTD=y
462# CONFIG_MTD_DEBUG is not set
463# CONFIG_MTD_CONCAT is not set
464CONFIG_MTD_PARTITIONS=y
465# CONFIG_MTD_TESTS is not set
466# CONFIG_MTD_REDBOOT_PARTS is not set
467# CONFIG_MTD_CMDLINE_PARTS is not set
468# CONFIG_MTD_AR7_PARTS is not set
469
470#
471# User Modules And Translation Layers
472#
473# CONFIG_MTD_CHAR is not set
474# CONFIG_MTD_BLKDEVS is not set
475# CONFIG_MTD_BLOCK is not set
476# CONFIG_MTD_BLOCK_RO is not set
477# CONFIG_FTL is not set
478# CONFIG_NFTL is not set
479# CONFIG_INFTL is not set
480# CONFIG_RFD_FTL is not set
481# CONFIG_SSFDC is not set
482# CONFIG_MTD_OOPS is not set
483
484#
485# RAM/ROM/Flash chip drivers
486#
487CONFIG_MTD_CFI=y
488# CONFIG_MTD_JEDECPROBE is not set
489CONFIG_MTD_GEN_PROBE=y
490# CONFIG_MTD_CFI_ADV_OPTIONS is not set
491CONFIG_MTD_MAP_BANK_WIDTH_1=y
492CONFIG_MTD_MAP_BANK_WIDTH_2=y
493CONFIG_MTD_MAP_BANK_WIDTH_4=y
494# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
495# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
496# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
497CONFIG_MTD_CFI_I1=y
498CONFIG_MTD_CFI_I2=y
499# CONFIG_MTD_CFI_I4 is not set
500# CONFIG_MTD_CFI_I8 is not set
501# CONFIG_MTD_CFI_INTELEXT is not set
502CONFIG_MTD_CFI_AMDSTD=y
503# CONFIG_MTD_CFI_STAA is not set
504CONFIG_MTD_CFI_UTIL=y
505# CONFIG_MTD_RAM is not set
506# CONFIG_MTD_ROM is not set
507# CONFIG_MTD_ABSENT is not set
508
509#
510# Mapping drivers for chip access
511#
512CONFIG_MTD_COMPLEX_MAPPINGS=y
513CONFIG_MTD_PHYSMAP=y
514# CONFIG_MTD_PHYSMAP_COMPAT is not set
515# CONFIG_MTD_PCI is not set
516# CONFIG_MTD_INTEL_VR_NOR is not set
517# CONFIG_MTD_PLATRAM is not set
518
519#
520# Self-contained MTD device drivers
521#
522# CONFIG_MTD_PMC551 is not set
523# CONFIG_MTD_SLRAM is not set
524# CONFIG_MTD_PHRAM is not set
525# CONFIG_MTD_MTDRAM is not set
526# CONFIG_MTD_BLOCK2MTD is not set
527
528#
529# Disk-On-Chip Device Drivers
530#
531# CONFIG_MTD_DOC2000 is not set
532# CONFIG_MTD_DOC2001 is not set
533# CONFIG_MTD_DOC2001PLUS is not set
534# CONFIG_MTD_NAND is not set
535# CONFIG_MTD_ONENAND is not set
536
537#
538# LPDDR flash memory drivers
539#
540# CONFIG_MTD_LPDDR is not set
541
542#
543# UBI - Unsorted block images
544#
545# CONFIG_MTD_UBI is not set
449# CONFIG_PARPORT is not set 546# CONFIG_PARPORT is not set
450CONFIG_BLK_DEV=y 547CONFIG_BLK_DEV=y
451# CONFIG_BLK_CPQ_CISS_DA is not set 548# CONFIG_BLK_CPQ_CISS_DA is not set
@@ -477,7 +574,9 @@ CONFIG_MISC_DEVICES=y
477# 574#
478# CONFIG_EEPROM_AT24 is not set 575# CONFIG_EEPROM_AT24 is not set
479# CONFIG_EEPROM_LEGACY is not set 576# CONFIG_EEPROM_LEGACY is not set
577# CONFIG_EEPROM_MAX6875 is not set
480CONFIG_EEPROM_93CX6=y 578CONFIG_EEPROM_93CX6=y
579# CONFIG_CB710_CORE is not set
481CONFIG_HAVE_IDE=y 580CONFIG_HAVE_IDE=y
482# CONFIG_IDE is not set 581# CONFIG_IDE is not set
483 582
@@ -500,10 +599,6 @@ CONFIG_BLK_DEV_SD=y
500# CONFIG_BLK_DEV_SR is not set 599# CONFIG_BLK_DEV_SR is not set
501CONFIG_CHR_DEV_SG=m 600CONFIG_CHR_DEV_SG=m
502# CONFIG_CHR_DEV_SCH is not set 601# CONFIG_CHR_DEV_SCH is not set
503
504#
505# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
506#
507# CONFIG_SCSI_MULTI_LUN is not set 602# CONFIG_SCSI_MULTI_LUN is not set
508# CONFIG_SCSI_CONSTANTS is not set 603# CONFIG_SCSI_CONSTANTS is not set
509# CONFIG_SCSI_LOGGING is not set 604# CONFIG_SCSI_LOGGING is not set
@@ -521,6 +616,7 @@ CONFIG_SCSI_WAIT_SCAN=m
521CONFIG_SCSI_LOWLEVEL=y 616CONFIG_SCSI_LOWLEVEL=y
522# CONFIG_ISCSI_TCP is not set 617# CONFIG_ISCSI_TCP is not set
523# CONFIG_SCSI_CXGB3_ISCSI is not set 618# CONFIG_SCSI_CXGB3_ISCSI is not set
619# CONFIG_SCSI_BNX2_ISCSI is not set
524# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 620# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
525# CONFIG_SCSI_3W_9XXX is not set 621# CONFIG_SCSI_3W_9XXX is not set
526# CONFIG_SCSI_ACARD is not set 622# CONFIG_SCSI_ACARD is not set
@@ -529,6 +625,7 @@ CONFIG_SCSI_LOWLEVEL=y
529# CONFIG_SCSI_AIC7XXX_OLD is not set 625# CONFIG_SCSI_AIC7XXX_OLD is not set
530# CONFIG_SCSI_AIC79XX is not set 626# CONFIG_SCSI_AIC79XX is not set
531# CONFIG_SCSI_AIC94XX is not set 627# CONFIG_SCSI_AIC94XX is not set
628# CONFIG_SCSI_MVSAS is not set
532# CONFIG_SCSI_ARCMSR is not set 629# CONFIG_SCSI_ARCMSR is not set
533# CONFIG_MEGARAID_NEWGEN is not set 630# CONFIG_MEGARAID_NEWGEN is not set
534# CONFIG_MEGARAID_LEGACY is not set 631# CONFIG_MEGARAID_LEGACY is not set
@@ -543,7 +640,6 @@ CONFIG_SCSI_LOWLEVEL=y
543# CONFIG_SCSI_IPS is not set 640# CONFIG_SCSI_IPS is not set
544# CONFIG_SCSI_INITIO is not set 641# CONFIG_SCSI_INITIO is not set
545# CONFIG_SCSI_INIA100 is not set 642# CONFIG_SCSI_INIA100 is not set
546# CONFIG_SCSI_MVSAS is not set
547# CONFIG_SCSI_STEX is not set 643# CONFIG_SCSI_STEX is not set
548# CONFIG_SCSI_SYM53C8XX_2 is not set 644# CONFIG_SCSI_SYM53C8XX_2 is not set
549# CONFIG_SCSI_IPR is not set 645# CONFIG_SCSI_IPR is not set
@@ -632,7 +728,6 @@ CONFIG_PATA_PLATFORM=y
632# CONFIG_IEEE1394 is not set 728# CONFIG_IEEE1394 is not set
633# CONFIG_I2O is not set 729# CONFIG_I2O is not set
634CONFIG_NETDEVICES=y 730CONFIG_NETDEVICES=y
635CONFIG_COMPAT_NET_DEV_OPS=y
636# CONFIG_DUMMY is not set 731# CONFIG_DUMMY is not set
637# CONFIG_BONDING is not set 732# CONFIG_BONDING is not set
638# CONFIG_MACVLAN is not set 733# CONFIG_MACVLAN is not set
@@ -686,6 +781,7 @@ CONFIG_8139TOO_8129=y
686# CONFIG_SMSC9420 is not set 781# CONFIG_SMSC9420 is not set
687# CONFIG_SUNDANCE is not set 782# CONFIG_SUNDANCE is not set
688# CONFIG_TLAN is not set 783# CONFIG_TLAN is not set
784# CONFIG_KS8842 is not set
689CONFIG_VIA_RHINE=m 785CONFIG_VIA_RHINE=m
690CONFIG_VIA_RHINE_MMIO=y 786CONFIG_VIA_RHINE_MMIO=y
691# CONFIG_SC92031 is not set 787# CONFIG_SC92031 is not set
@@ -894,7 +990,6 @@ CONFIG_I2C_HIGHLANDER=y
894# CONFIG_SENSORS_PCF8574 is not set 990# CONFIG_SENSORS_PCF8574 is not set
895# CONFIG_PCF8575 is not set 991# CONFIG_PCF8575 is not set
896# CONFIG_SENSORS_PCA9539 is not set 992# CONFIG_SENSORS_PCA9539 is not set
897# CONFIG_SENSORS_MAX6875 is not set
898# CONFIG_SENSORS_TSL2550 is not set 993# CONFIG_SENSORS_TSL2550 is not set
899# CONFIG_I2C_DEBUG_CORE is not set 994# CONFIG_I2C_DEBUG_CORE is not set
900# CONFIG_I2C_DEBUG_ALGO is not set 995# CONFIG_I2C_DEBUG_ALGO is not set
@@ -953,6 +1048,7 @@ CONFIG_HWMON=y
953# CONFIG_SENSORS_SMSC47B397 is not set 1048# CONFIG_SENSORS_SMSC47B397 is not set
954# CONFIG_SENSORS_ADS7828 is not set 1049# CONFIG_SENSORS_ADS7828 is not set
955# CONFIG_SENSORS_THMC50 is not set 1050# CONFIG_SENSORS_THMC50 is not set
1051# CONFIG_SENSORS_TMP401 is not set
956# CONFIG_SENSORS_VIA686A is not set 1052# CONFIG_SENSORS_VIA686A is not set
957# CONFIG_SENSORS_VT1211 is not set 1053# CONFIG_SENSORS_VT1211 is not set
958# CONFIG_SENSORS_VT8231 is not set 1054# CONFIG_SENSORS_VT8231 is not set
@@ -988,22 +1084,7 @@ CONFIG_SSB_POSSIBLE=y
988# CONFIG_MFD_WM8350_I2C is not set 1084# CONFIG_MFD_WM8350_I2C is not set
989# CONFIG_MFD_PCF50633 is not set 1085# CONFIG_MFD_PCF50633 is not set
990# CONFIG_REGULATOR is not set 1086# CONFIG_REGULATOR is not set
991 1087# CONFIG_MEDIA_SUPPORT is not set
992#
993# Multimedia devices
994#
995
996#
997# Multimedia core support
998#
999# CONFIG_VIDEO_DEV is not set
1000# CONFIG_DVB_CORE is not set
1001# CONFIG_VIDEO_MEDIA is not set
1002
1003#
1004# Multimedia drivers
1005#
1006CONFIG_DAB=y
1007 1088
1008# 1089#
1009# Graphics support 1090# Graphics support
@@ -1111,9 +1192,14 @@ CONFIG_RTC_DRV_RS5C372=y
1111# on-CPU RTC drivers 1192# on-CPU RTC drivers
1112# 1193#
1113CONFIG_RTC_DRV_SH=y 1194CONFIG_RTC_DRV_SH=y
1195# CONFIG_RTC_DRV_GENERIC is not set
1114# CONFIG_DMADEVICES is not set 1196# CONFIG_DMADEVICES is not set
1115# CONFIG_AUXDISPLAY is not set 1197# CONFIG_AUXDISPLAY is not set
1116# CONFIG_UIO is not set 1198# CONFIG_UIO is not set
1199
1200#
1201# TI VLYNQ
1202#
1117# CONFIG_STAGING is not set 1203# CONFIG_STAGING is not set
1118 1204
1119# 1205#
@@ -1134,10 +1220,11 @@ CONFIG_FS_MBCACHE=y
1134# CONFIG_REISERFS_FS is not set 1220# CONFIG_REISERFS_FS is not set
1135# CONFIG_JFS_FS is not set 1221# CONFIG_JFS_FS is not set
1136CONFIG_FS_POSIX_ACL=y 1222CONFIG_FS_POSIX_ACL=y
1137CONFIG_FILE_LOCKING=y
1138# CONFIG_XFS_FS is not set 1223# CONFIG_XFS_FS is not set
1139# CONFIG_OCFS2_FS is not set 1224# CONFIG_OCFS2_FS is not set
1140# CONFIG_BTRFS_FS is not set 1225# CONFIG_BTRFS_FS is not set
1226CONFIG_FILE_LOCKING=y
1227CONFIG_FSNOTIFY=y
1141CONFIG_DNOTIFY=y 1228CONFIG_DNOTIFY=y
1142CONFIG_INOTIFY=y 1229CONFIG_INOTIFY=y
1143CONFIG_INOTIFY_USER=y 1230CONFIG_INOTIFY_USER=y
@@ -1145,6 +1232,7 @@ CONFIG_INOTIFY_USER=y
1145# CONFIG_AUTOFS_FS is not set 1232# CONFIG_AUTOFS_FS is not set
1146# CONFIG_AUTOFS4_FS is not set 1233# CONFIG_AUTOFS4_FS is not set
1147CONFIG_FUSE_FS=m 1234CONFIG_FUSE_FS=m
1235# CONFIG_CUSE is not set
1148 1236
1149# 1237#
1150# Caches 1238# Caches
@@ -1190,6 +1278,7 @@ CONFIG_MISC_FILESYSTEMS=y
1190# CONFIG_BEFS_FS is not set 1278# CONFIG_BEFS_FS is not set
1191# CONFIG_BFS_FS is not set 1279# CONFIG_BFS_FS is not set
1192# CONFIG_EFS_FS is not set 1280# CONFIG_EFS_FS is not set
1281# CONFIG_JFFS2_FS is not set
1193# CONFIG_CRAMFS is not set 1282# CONFIG_CRAMFS is not set
1194# CONFIG_SQUASHFS is not set 1283# CONFIG_SQUASHFS is not set
1195# CONFIG_VXFS_FS is not set 1284# CONFIG_VXFS_FS is not set
@@ -1328,41 +1417,40 @@ CONFIG_HAVE_FUNCTION_TRACER=y
1328CONFIG_HAVE_DYNAMIC_FTRACE=y 1417CONFIG_HAVE_DYNAMIC_FTRACE=y
1329CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 1418CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1330CONFIG_RING_BUFFER=y 1419CONFIG_RING_BUFFER=y
1420CONFIG_EVENT_TRACING=y
1421CONFIG_CONTEXT_SWITCH_TRACER=y
1331CONFIG_TRACING=y 1422CONFIG_TRACING=y
1332CONFIG_TRACING_SUPPORT=y 1423CONFIG_TRACING_SUPPORT=y
1333 1424CONFIG_FTRACE=y
1334#
1335# Tracers
1336#
1337# CONFIG_FUNCTION_TRACER is not set 1425# CONFIG_FUNCTION_TRACER is not set
1338# CONFIG_IRQSOFF_TRACER is not set 1426# CONFIG_IRQSOFF_TRACER is not set
1339# CONFIG_PREEMPT_TRACER is not set 1427# CONFIG_PREEMPT_TRACER is not set
1340# CONFIG_SCHED_TRACER is not set 1428# CONFIG_SCHED_TRACER is not set
1341# CONFIG_CONTEXT_SWITCH_TRACER is not set 1429# CONFIG_ENABLE_DEFAULT_TRACERS is not set
1342# CONFIG_EVENT_TRACER is not set
1343# CONFIG_BOOT_TRACER is not set 1430# CONFIG_BOOT_TRACER is not set
1344# CONFIG_TRACE_BRANCH_PROFILING is not set 1431CONFIG_BRANCH_PROFILE_NONE=y
1432# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
1433# CONFIG_PROFILE_ALL_BRANCHES is not set
1345# CONFIG_STACK_TRACER is not set 1434# CONFIG_STACK_TRACER is not set
1346# CONFIG_KMEMTRACE is not set 1435# CONFIG_KMEMTRACE is not set
1347# CONFIG_WORKQUEUE_TRACER is not set 1436# CONFIG_WORKQUEUE_TRACER is not set
1348# CONFIG_BLK_DEV_IO_TRACE is not set 1437# CONFIG_BLK_DEV_IO_TRACE is not set
1349# CONFIG_FTRACE_STARTUP_TEST is not set 1438# CONFIG_RING_BUFFER_BENCHMARK is not set
1350# CONFIG_DYNAMIC_DEBUG is not set 1439# CONFIG_DYNAMIC_DEBUG is not set
1351# CONFIG_DMA_API_DEBUG is not set 1440# CONFIG_DMA_API_DEBUG is not set
1352# CONFIG_SAMPLES is not set 1441# CONFIG_SAMPLES is not set
1353CONFIG_HAVE_ARCH_KGDB=y 1442CONFIG_HAVE_ARCH_KGDB=y
1354# CONFIG_KGDB is not set 1443# CONFIG_KGDB is not set
1355CONFIG_SH_STANDARD_BIOS=y 1444# CONFIG_SH_STANDARD_BIOS is not set
1356# CONFIG_EARLY_SCIF_CONSOLE is not set 1445CONFIG_EARLY_SCIF_CONSOLE=y
1357CONFIG_EARLY_PRINTK=y 1446CONFIG_EARLY_SCIF_CONSOLE_PORT=0xffe00000
1447# CONFIG_EARLY_PRINTK is not set
1358# CONFIG_DEBUG_BOOTMEM is not set 1448# CONFIG_DEBUG_BOOTMEM is not set
1359CONFIG_DEBUG_STACKOVERFLOW=y 1449CONFIG_DEBUG_STACKOVERFLOW=y
1360# CONFIG_DEBUG_STACK_USAGE is not set 1450# CONFIG_DEBUG_STACK_USAGE is not set
1361# CONFIG_4KSTACKS is not set 1451# CONFIG_4KSTACKS is not set
1362# CONFIG_IRQSTACKS is not set
1363CONFIG_DUMP_CODE=y 1452CONFIG_DUMP_CODE=y
1364# CONFIG_SH_NO_BSS_INIT is not set 1453# CONFIG_SH_NO_BSS_INIT is not set
1365# CONFIG_MORE_COMPILE_OPTIONS is not set
1366 1454
1367# 1455#
1368# Security options 1456# Security options
@@ -1486,3 +1574,4 @@ CONFIG_HAS_IOMEM=y
1486CONFIG_HAS_IOPORT=y 1574CONFIG_HAS_IOPORT=y
1487CONFIG_HAS_DMA=y 1575CONFIG_HAS_DMA=y
1488CONFIG_NLATTR=y 1576CONFIG_NLATTR=y
1577CONFIG_GENERIC_ATOMIC64=y
diff --git a/arch/sh/configs/r7785rp_defconfig b/arch/sh/configs/r7785rp_defconfig
index 82658f672398..8a3dc300db4a 100644
--- a/arch/sh/configs/r7785rp_defconfig
+++ b/arch/sh/configs/r7785rp_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.30-rc3 3# Linux kernel version: 2.6.30
4# Mon Apr 27 12:55:10 2009 4# Thu Jun 18 12:37:20 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -21,6 +21,7 @@ CONFIG_GENERIC_CLOCKEVENTS=y
21CONFIG_ARCH_HIBERNATION_POSSIBLE=y 21CONFIG_ARCH_HIBERNATION_POSSIBLE=y
22CONFIG_SYS_SUPPORTS_NUMA=y 22CONFIG_SYS_SUPPORTS_NUMA=y
23CONFIG_SYS_SUPPORTS_PCI=y 23CONFIG_SYS_SUPPORTS_PCI=y
24CONFIG_SYS_SUPPORTS_TMU=y
24CONFIG_STACKTRACE_SUPPORT=y 25CONFIG_STACKTRACE_SUPPORT=y
25CONFIG_LOCKDEP_SUPPORT=y 26CONFIG_LOCKDEP_SUPPORT=y
26CONFIG_HAVE_LATENCYTOP_SUPPORT=y 27CONFIG_HAVE_LATENCYTOP_SUPPORT=y
@@ -80,7 +81,6 @@ CONFIG_UID16=y
80CONFIG_KALLSYMS=y 81CONFIG_KALLSYMS=y
81CONFIG_KALLSYMS_ALL=y 82CONFIG_KALLSYMS_ALL=y
82# CONFIG_KALLSYMS_EXTRA_PASS is not set 83# CONFIG_KALLSYMS_EXTRA_PASS is not set
83# CONFIG_STRIP_ASM_SYMS is not set
84CONFIG_HOTPLUG=y 84CONFIG_HOTPLUG=y
85CONFIG_PRINTK=y 85CONFIG_PRINTK=y
86CONFIG_BUG=y 86CONFIG_BUG=y
@@ -93,15 +93,20 @@ CONFIG_TIMERFD=y
93CONFIG_EVENTFD=y 93CONFIG_EVENTFD=y
94CONFIG_SHMEM=y 94CONFIG_SHMEM=y
95CONFIG_AIO=y 95CONFIG_AIO=y
96
97#
98# Performance Counters
99#
96CONFIG_VM_EVENT_COUNTERS=y 100CONFIG_VM_EVENT_COUNTERS=y
97CONFIG_PCI_QUIRKS=y 101CONFIG_PCI_QUIRKS=y
102# CONFIG_STRIP_ASM_SYMS is not set
98CONFIG_COMPAT_BRK=y 103CONFIG_COMPAT_BRK=y
99CONFIG_SLAB=y 104CONFIG_SLAB=y
100# CONFIG_SLUB is not set 105# CONFIG_SLUB is not set
101# CONFIG_SLOB is not set 106# CONFIG_SLOB is not set
102CONFIG_PROFILING=y 107CONFIG_PROFILING=y
103CONFIG_TRACEPOINTS=y 108CONFIG_TRACEPOINTS=y
104# CONFIG_MARKERS is not set 109CONFIG_MARKERS=y
105CONFIG_OPROFILE=y 110CONFIG_OPROFILE=y
106CONFIG_HAVE_OPROFILE=y 111CONFIG_HAVE_OPROFILE=y
107CONFIG_KPROBES=y 112CONFIG_KPROBES=y
@@ -189,6 +194,7 @@ CONFIG_CPU_SUBTYPE_SH7785=y
189CONFIG_QUICKLIST=y 194CONFIG_QUICKLIST=y
190CONFIG_MMU=y 195CONFIG_MMU=y
191CONFIG_PAGE_OFFSET=0x80000000 196CONFIG_PAGE_OFFSET=0x80000000
197CONFIG_FORCE_MAX_ZONEORDER=11
192CONFIG_MEMORY_START=0x08000000 198CONFIG_MEMORY_START=0x08000000
193CONFIG_MEMORY_SIZE=0x08000000 199CONFIG_MEMORY_SIZE=0x08000000
194# CONFIG_29BIT is not set 200# CONFIG_29BIT is not set
@@ -211,7 +217,6 @@ CONFIG_PAGE_SIZE_4KB=y
211# CONFIG_PAGE_SIZE_8KB is not set 217# CONFIG_PAGE_SIZE_8KB is not set
212# CONFIG_PAGE_SIZE_16KB is not set 218# CONFIG_PAGE_SIZE_16KB is not set
213# CONFIG_PAGE_SIZE_64KB is not set 219# CONFIG_PAGE_SIZE_64KB is not set
214CONFIG_ENTRY_OFFSET=0x00001000
215# CONFIG_HUGETLB_PAGE_SIZE_64K is not set 220# CONFIG_HUGETLB_PAGE_SIZE_64K is not set
216# CONFIG_HUGETLB_PAGE_SIZE_256K is not set 221# CONFIG_HUGETLB_PAGE_SIZE_256K is not set
217CONFIG_HUGETLB_PAGE_SIZE_1MB=y 222CONFIG_HUGETLB_PAGE_SIZE_1MB=y
@@ -232,9 +237,9 @@ CONFIG_MIGRATION=y
232# CONFIG_PHYS_ADDR_T_64BIT is not set 237# CONFIG_PHYS_ADDR_T_64BIT is not set
233CONFIG_ZONE_DMA_FLAG=0 238CONFIG_ZONE_DMA_FLAG=0
234CONFIG_NR_QUICK=2 239CONFIG_NR_QUICK=2
235CONFIG_UNEVICTABLE_LRU=y
236CONFIG_HAVE_MLOCK=y 240CONFIG_HAVE_MLOCK=y
237CONFIG_HAVE_MLOCKED_PAGE_BIT=y 241CONFIG_HAVE_MLOCKED_PAGE_BIT=y
242CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
238 243
239# 244#
240# Cache configuration 245# Cache configuration
@@ -252,7 +257,6 @@ CONFIG_SH_FPU=y
252CONFIG_SH_STORE_QUEUES=y 257CONFIG_SH_STORE_QUEUES=y
253CONFIG_CPU_HAS_INTEVT=y 258CONFIG_CPU_HAS_INTEVT=y
254CONFIG_CPU_HAS_SR_RB=y 259CONFIG_CPU_HAS_SR_RB=y
255CONFIG_CPU_HAS_PTEA=y
256CONFIG_CPU_HAS_FPU=y 260CONFIG_CPU_HAS_FPU=y
257 261
258# 262#
@@ -267,9 +271,9 @@ CONFIG_SH_R7785RP=y
267# 271#
268# Timer and clock configuration 272# Timer and clock configuration
269# 273#
270CONFIG_SH_TMU=y 274CONFIG_SH_TIMER_TMU=y
271CONFIG_SH_TIMER_IRQ=28
272CONFIG_SH_PCLK_FREQ=33333333 275CONFIG_SH_PCLK_FREQ=33333333
276CONFIG_SH_CLK_CPG=y
273CONFIG_TICK_ONESHOT=y 277CONFIG_TICK_ONESHOT=y
274CONFIG_NO_HZ=y 278CONFIG_NO_HZ=y
275CONFIG_HIGH_RES_TIMERS=y 279CONFIG_HIGH_RES_TIMERS=y
@@ -326,12 +330,14 @@ CONFIG_KEXEC=y
326# CONFIG_PREEMPT_VOLUNTARY is not set 330# CONFIG_PREEMPT_VOLUNTARY is not set
327CONFIG_PREEMPT=y 331CONFIG_PREEMPT=y
328CONFIG_GUSA=y 332CONFIG_GUSA=y
333# CONFIG_SPARSE_IRQ is not set
329 334
330# 335#
331# Boot options 336# Boot options
332# 337#
333CONFIG_ZERO_PAGE_OFFSET=0x00001000 338CONFIG_ZERO_PAGE_OFFSET=0x00001000
334CONFIG_BOOT_LINK_OFFSET=0x00800000 339CONFIG_BOOT_LINK_OFFSET=0x00800000
340CONFIG_ENTRY_OFFSET=0x00001000
335CONFIG_CMDLINE_BOOL=y 341CONFIG_CMDLINE_BOOL=y
336CONFIG_CMDLINE="console=ttySC0,115200 root=/dev/sda1" 342CONFIG_CMDLINE="console=ttySC0,115200 root=/dev/sda1"
337 343
@@ -429,6 +435,7 @@ CONFIG_LLC=m
429# CONFIG_ECONET is not set 435# CONFIG_ECONET is not set
430# CONFIG_WAN_ROUTER is not set 436# CONFIG_WAN_ROUTER is not set
431# CONFIG_PHONET is not set 437# CONFIG_PHONET is not set
438# CONFIG_IEEE802154 is not set
432# CONFIG_NET_SCHED is not set 439# CONFIG_NET_SCHED is not set
433# CONFIG_DCB is not set 440# CONFIG_DCB is not set
434 441
@@ -449,7 +456,11 @@ CONFIG_WIRELESS=y
449CONFIG_WIRELESS_EXT=y 456CONFIG_WIRELESS_EXT=y
450CONFIG_WIRELESS_EXT_SYSFS=y 457CONFIG_WIRELESS_EXT_SYSFS=y
451# CONFIG_LIB80211 is not set 458# CONFIG_LIB80211 is not set
452# CONFIG_MAC80211 is not set 459
460#
461# CFG80211 needs to be enabled for MAC80211
462#
463CONFIG_MAC80211_DEFAULT_PS_VALUE=0
453# CONFIG_WIMAX is not set 464# CONFIG_WIMAX is not set
454# CONFIG_RFKILL is not set 465# CONFIG_RFKILL is not set
455# CONFIG_NET_9P is not set 466# CONFIG_NET_9P is not set
@@ -503,7 +514,9 @@ CONFIG_MISC_DEVICES=y
503# 514#
504# CONFIG_EEPROM_AT24 is not set 515# CONFIG_EEPROM_AT24 is not set
505# CONFIG_EEPROM_LEGACY is not set 516# CONFIG_EEPROM_LEGACY is not set
517# CONFIG_EEPROM_MAX6875 is not set
506CONFIG_EEPROM_93CX6=y 518CONFIG_EEPROM_93CX6=y
519# CONFIG_CB710_CORE is not set
507CONFIG_HAVE_IDE=y 520CONFIG_HAVE_IDE=y
508# CONFIG_IDE is not set 521# CONFIG_IDE is not set
509 522
@@ -526,10 +539,6 @@ CONFIG_BLK_DEV_SD=y
526# CONFIG_BLK_DEV_SR is not set 539# CONFIG_BLK_DEV_SR is not set
527CONFIG_CHR_DEV_SG=m 540CONFIG_CHR_DEV_SG=m
528# CONFIG_CHR_DEV_SCH is not set 541# CONFIG_CHR_DEV_SCH is not set
529
530#
531# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
532#
533# CONFIG_SCSI_MULTI_LUN is not set 542# CONFIG_SCSI_MULTI_LUN is not set
534# CONFIG_SCSI_CONSTANTS is not set 543# CONFIG_SCSI_CONSTANTS is not set
535# CONFIG_SCSI_LOGGING is not set 544# CONFIG_SCSI_LOGGING is not set
@@ -547,6 +556,7 @@ CONFIG_SCSI_WAIT_SCAN=m
547CONFIG_SCSI_LOWLEVEL=y 556CONFIG_SCSI_LOWLEVEL=y
548# CONFIG_ISCSI_TCP is not set 557# CONFIG_ISCSI_TCP is not set
549# CONFIG_SCSI_CXGB3_ISCSI is not set 558# CONFIG_SCSI_CXGB3_ISCSI is not set
559# CONFIG_SCSI_BNX2_ISCSI is not set
550# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 560# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
551# CONFIG_SCSI_3W_9XXX is not set 561# CONFIG_SCSI_3W_9XXX is not set
552# CONFIG_SCSI_ACARD is not set 562# CONFIG_SCSI_ACARD is not set
@@ -555,6 +565,7 @@ CONFIG_SCSI_LOWLEVEL=y
555# CONFIG_SCSI_AIC7XXX_OLD is not set 565# CONFIG_SCSI_AIC7XXX_OLD is not set
556# CONFIG_SCSI_AIC79XX is not set 566# CONFIG_SCSI_AIC79XX is not set
557# CONFIG_SCSI_AIC94XX is not set 567# CONFIG_SCSI_AIC94XX is not set
568# CONFIG_SCSI_MVSAS is not set
558# CONFIG_SCSI_ARCMSR is not set 569# CONFIG_SCSI_ARCMSR is not set
559# CONFIG_MEGARAID_NEWGEN is not set 570# CONFIG_MEGARAID_NEWGEN is not set
560# CONFIG_MEGARAID_LEGACY is not set 571# CONFIG_MEGARAID_LEGACY is not set
@@ -569,7 +580,6 @@ CONFIG_SCSI_LOWLEVEL=y
569# CONFIG_SCSI_IPS is not set 580# CONFIG_SCSI_IPS is not set
570# CONFIG_SCSI_INITIO is not set 581# CONFIG_SCSI_INITIO is not set
571# CONFIG_SCSI_INIA100 is not set 582# CONFIG_SCSI_INIA100 is not set
572# CONFIG_SCSI_MVSAS is not set
573# CONFIG_SCSI_STEX is not set 583# CONFIG_SCSI_STEX is not set
574# CONFIG_SCSI_SYM53C8XX_2 is not set 584# CONFIG_SCSI_SYM53C8XX_2 is not set
575# CONFIG_SCSI_IPR is not set 585# CONFIG_SCSI_IPR is not set
@@ -658,7 +668,6 @@ CONFIG_PATA_PLATFORM=y
658# CONFIG_IEEE1394 is not set 668# CONFIG_IEEE1394 is not set
659# CONFIG_I2O is not set 669# CONFIG_I2O is not set
660CONFIG_NETDEVICES=y 670CONFIG_NETDEVICES=y
661CONFIG_COMPAT_NET_DEV_OPS=y
662# CONFIG_DUMMY is not set 671# CONFIG_DUMMY is not set
663# CONFIG_BONDING is not set 672# CONFIG_BONDING is not set
664# CONFIG_MACVLAN is not set 673# CONFIG_MACVLAN is not set
@@ -692,6 +701,7 @@ CONFIG_AX88796_93CX6=y
692# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set 701# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
693# CONFIG_NET_PCI is not set 702# CONFIG_NET_PCI is not set
694# CONFIG_B44 is not set 703# CONFIG_B44 is not set
704# CONFIG_KS8842 is not set
695# CONFIG_ATL2 is not set 705# CONFIG_ATL2 is not set
696CONFIG_NETDEV_1000=y 706CONFIG_NETDEV_1000=y
697# CONFIG_ACENIC is not set 707# CONFIG_ACENIC is not set
@@ -899,7 +909,6 @@ CONFIG_I2C_HIGHLANDER=y
899# CONFIG_SENSORS_PCF8574 is not set 909# CONFIG_SENSORS_PCF8574 is not set
900# CONFIG_PCF8575 is not set 910# CONFIG_PCF8575 is not set
901# CONFIG_SENSORS_PCA9539 is not set 911# CONFIG_SENSORS_PCA9539 is not set
902# CONFIG_SENSORS_MAX6875 is not set
903# CONFIG_SENSORS_TSL2550 is not set 912# CONFIG_SENSORS_TSL2550 is not set
904# CONFIG_I2C_DEBUG_CORE is not set 913# CONFIG_I2C_DEBUG_CORE is not set
905# CONFIG_I2C_DEBUG_ALGO is not set 914# CONFIG_I2C_DEBUG_ALGO is not set
@@ -983,6 +992,7 @@ CONFIG_HWMON=y
983# CONFIG_SENSORS_SMSC47B397 is not set 992# CONFIG_SENSORS_SMSC47B397 is not set
984# CONFIG_SENSORS_ADS7828 is not set 993# CONFIG_SENSORS_ADS7828 is not set
985# CONFIG_SENSORS_THMC50 is not set 994# CONFIG_SENSORS_THMC50 is not set
995# CONFIG_SENSORS_TMP401 is not set
986# CONFIG_SENSORS_VIA686A is not set 996# CONFIG_SENSORS_VIA686A is not set
987# CONFIG_SENSORS_VT1211 is not set 997# CONFIG_SENSORS_VT1211 is not set
988# CONFIG_SENSORS_VT8231 is not set 998# CONFIG_SENSORS_VT8231 is not set
@@ -1019,22 +1029,7 @@ CONFIG_SSB_POSSIBLE=y
1019# CONFIG_MFD_WM8350_I2C is not set 1029# CONFIG_MFD_WM8350_I2C is not set
1020# CONFIG_MFD_PCF50633 is not set 1030# CONFIG_MFD_PCF50633 is not set
1021# CONFIG_REGULATOR is not set 1031# CONFIG_REGULATOR is not set
1022 1032# CONFIG_MEDIA_SUPPORT is not set
1023#
1024# Multimedia devices
1025#
1026
1027#
1028# Multimedia core support
1029#
1030# CONFIG_VIDEO_DEV is not set
1031# CONFIG_DVB_CORE is not set
1032# CONFIG_VIDEO_MEDIA is not set
1033
1034#
1035# Multimedia drivers
1036#
1037# CONFIG_DAB is not set
1038 1033
1039# 1034#
1040# Graphics support 1035# Graphics support
@@ -1195,9 +1190,14 @@ CONFIG_RTC_DRV_RS5C372=y
1195# on-CPU RTC drivers 1190# on-CPU RTC drivers
1196# 1191#
1197CONFIG_RTC_DRV_SH=y 1192CONFIG_RTC_DRV_SH=y
1193# CONFIG_RTC_DRV_GENERIC is not set
1198# CONFIG_DMADEVICES is not set 1194# CONFIG_DMADEVICES is not set
1199# CONFIG_AUXDISPLAY is not set 1195# CONFIG_AUXDISPLAY is not set
1200# CONFIG_UIO is not set 1196# CONFIG_UIO is not set
1197
1198#
1199# TI VLYNQ
1200#
1201# CONFIG_STAGING is not set 1201# CONFIG_STAGING is not set
1202 1202
1203# 1203#
@@ -1218,10 +1218,11 @@ CONFIG_FS_MBCACHE=y
1218# CONFIG_REISERFS_FS is not set 1218# CONFIG_REISERFS_FS is not set
1219# CONFIG_JFS_FS is not set 1219# CONFIG_JFS_FS is not set
1220CONFIG_FS_POSIX_ACL=y 1220CONFIG_FS_POSIX_ACL=y
1221CONFIG_FILE_LOCKING=y
1222# CONFIG_XFS_FS is not set 1221# CONFIG_XFS_FS is not set
1223# CONFIG_OCFS2_FS is not set 1222# CONFIG_OCFS2_FS is not set
1224# CONFIG_BTRFS_FS is not set 1223# CONFIG_BTRFS_FS is not set
1224CONFIG_FILE_LOCKING=y
1225CONFIG_FSNOTIFY=y
1225CONFIG_DNOTIFY=y 1226CONFIG_DNOTIFY=y
1226CONFIG_INOTIFY=y 1227CONFIG_INOTIFY=y
1227CONFIG_INOTIFY_USER=y 1228CONFIG_INOTIFY_USER=y
@@ -1229,6 +1230,7 @@ CONFIG_INOTIFY_USER=y
1229# CONFIG_AUTOFS_FS is not set 1230# CONFIG_AUTOFS_FS is not set
1230# CONFIG_AUTOFS4_FS is not set 1231# CONFIG_AUTOFS4_FS is not set
1231CONFIG_FUSE_FS=m 1232CONFIG_FUSE_FS=m
1233# CONFIG_CUSE is not set
1232 1234
1233# 1235#
1234# Caches 1236# Caches
@@ -1413,25 +1415,25 @@ CONFIG_HAVE_FUNCTION_TRACER=y
1413CONFIG_HAVE_DYNAMIC_FTRACE=y 1415CONFIG_HAVE_DYNAMIC_FTRACE=y
1414CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 1416CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1415CONFIG_RING_BUFFER=y 1417CONFIG_RING_BUFFER=y
1418CONFIG_EVENT_TRACING=y
1419CONFIG_CONTEXT_SWITCH_TRACER=y
1416CONFIG_TRACING=y 1420CONFIG_TRACING=y
1417CONFIG_TRACING_SUPPORT=y 1421CONFIG_TRACING_SUPPORT=y
1418 1422CONFIG_FTRACE=y
1419#
1420# Tracers
1421#
1422# CONFIG_FUNCTION_TRACER is not set 1423# CONFIG_FUNCTION_TRACER is not set
1423# CONFIG_IRQSOFF_TRACER is not set 1424# CONFIG_IRQSOFF_TRACER is not set
1424# CONFIG_PREEMPT_TRACER is not set 1425# CONFIG_PREEMPT_TRACER is not set
1425# CONFIG_SCHED_TRACER is not set 1426# CONFIG_SCHED_TRACER is not set
1426# CONFIG_CONTEXT_SWITCH_TRACER is not set 1427# CONFIG_ENABLE_DEFAULT_TRACERS is not set
1427# CONFIG_EVENT_TRACER is not set
1428# CONFIG_BOOT_TRACER is not set 1428# CONFIG_BOOT_TRACER is not set
1429# CONFIG_TRACE_BRANCH_PROFILING is not set 1429CONFIG_BRANCH_PROFILE_NONE=y
1430# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
1431# CONFIG_PROFILE_ALL_BRANCHES is not set
1430# CONFIG_STACK_TRACER is not set 1432# CONFIG_STACK_TRACER is not set
1431# CONFIG_KMEMTRACE is not set 1433# CONFIG_KMEMTRACE is not set
1432# CONFIG_WORKQUEUE_TRACER is not set 1434# CONFIG_WORKQUEUE_TRACER is not set
1433# CONFIG_BLK_DEV_IO_TRACE is not set 1435# CONFIG_BLK_DEV_IO_TRACE is not set
1434# CONFIG_FTRACE_STARTUP_TEST is not set 1436# CONFIG_RING_BUFFER_BENCHMARK is not set
1435# CONFIG_DYNAMIC_DEBUG is not set 1437# CONFIG_DYNAMIC_DEBUG is not set
1436# CONFIG_DMA_API_DEBUG is not set 1438# CONFIG_DMA_API_DEBUG is not set
1437# CONFIG_SAMPLES is not set 1439# CONFIG_SAMPLES is not set
@@ -1444,10 +1446,8 @@ CONFIG_EARLY_PRINTK=y
1444CONFIG_DEBUG_STACKOVERFLOW=y 1446CONFIG_DEBUG_STACKOVERFLOW=y
1445CONFIG_DEBUG_STACK_USAGE=y 1447CONFIG_DEBUG_STACK_USAGE=y
1446CONFIG_4KSTACKS=y 1448CONFIG_4KSTACKS=y
1447# CONFIG_IRQSTACKS is not set
1448CONFIG_DUMP_CODE=y 1449CONFIG_DUMP_CODE=y
1449# CONFIG_SH_NO_BSS_INIT is not set 1450# CONFIG_SH_NO_BSS_INIT is not set
1450# CONFIG_MORE_COMPILE_OPTIONS is not set
1451 1451
1452# 1452#
1453# Security options 1453# Security options
@@ -1572,3 +1572,4 @@ CONFIG_HAS_IOMEM=y
1572CONFIG_HAS_IOPORT=y 1572CONFIG_HAS_IOPORT=y
1573CONFIG_HAS_DMA=y 1573CONFIG_HAS_DMA=y
1574CONFIG_NLATTR=y 1574CONFIG_NLATTR=y
1575CONFIG_GENERIC_ATOMIC64=y
diff --git a/arch/sh/configs/rsk7201_defconfig b/arch/sh/configs/rsk7201_defconfig
index fa4395768d19..55c3656a75c1 100644
--- a/arch/sh/configs/rsk7201_defconfig
+++ b/arch/sh/configs/rsk7201_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.30-rc3 3# Linux kernel version: 2.6.30
4# Mon Apr 27 12:56:29 2009 4# Thu Jun 18 12:39:54 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -15,10 +15,11 @@ CONFIG_GENERIC_HARDIRQS=y
15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
16CONFIG_GENERIC_IRQ_PROBE=y 16CONFIG_GENERIC_IRQ_PROBE=y
17# CONFIG_GENERIC_GPIO is not set 17# CONFIG_GENERIC_GPIO is not set
18# CONFIG_GENERIC_TIME is not set 18CONFIG_GENERIC_TIME=y
19# CONFIG_GENERIC_CLOCKEVENTS is not set 19CONFIG_GENERIC_CLOCKEVENTS=y
20# CONFIG_ARCH_SUSPEND_POSSIBLE is not set 20# CONFIG_ARCH_SUSPEND_POSSIBLE is not set
21# CONFIG_ARCH_HIBERNATION_POSSIBLE is not set 21# CONFIG_ARCH_HIBERNATION_POSSIBLE is not set
22CONFIG_SYS_SUPPORTS_MTU2=y
22CONFIG_STACKTRACE_SUPPORT=y 23CONFIG_STACKTRACE_SUPPORT=y
23CONFIG_LOCKDEP_SUPPORT=y 24CONFIG_LOCKDEP_SUPPORT=y
24CONFIG_HAVE_LATENCYTOP_SUPPORT=y 25CONFIG_HAVE_LATENCYTOP_SUPPORT=y
@@ -74,7 +75,6 @@ CONFIG_UID16=y
74CONFIG_SYSCTL_SYSCALL=y 75CONFIG_SYSCTL_SYSCALL=y
75CONFIG_KALLSYMS=y 76CONFIG_KALLSYMS=y
76# CONFIG_KALLSYMS_EXTRA_PASS is not set 77# CONFIG_KALLSYMS_EXTRA_PASS is not set
77# CONFIG_STRIP_ASM_SYMS is not set
78CONFIG_HOTPLUG=y 78CONFIG_HOTPLUG=y
79CONFIG_PRINTK=y 79CONFIG_PRINTK=y
80CONFIG_BUG=y 80CONFIG_BUG=y
@@ -86,14 +86,19 @@ CONFIG_SIGNALFD=y
86CONFIG_TIMERFD=y 86CONFIG_TIMERFD=y
87CONFIG_EVENTFD=y 87CONFIG_EVENTFD=y
88# CONFIG_AIO is not set 88# CONFIG_AIO is not set
89
90#
91# Performance Counters
92#
89CONFIG_VM_EVENT_COUNTERS=y 93CONFIG_VM_EVENT_COUNTERS=y
94# CONFIG_STRIP_ASM_SYMS is not set
90CONFIG_COMPAT_BRK=y 95CONFIG_COMPAT_BRK=y
91# CONFIG_SLAB is not set 96# CONFIG_SLAB is not set
92# CONFIG_SLUB is not set 97# CONFIG_SLUB is not set
93CONFIG_SLOB=y 98CONFIG_SLOB=y
94CONFIG_PROFILING=y 99CONFIG_PROFILING=y
95CONFIG_TRACEPOINTS=y 100CONFIG_TRACEPOINTS=y
96# CONFIG_MARKERS is not set 101CONFIG_MARKERS=y
97CONFIG_OPROFILE=y 102CONFIG_OPROFILE=y
98CONFIG_HAVE_OPROFILE=y 103CONFIG_HAVE_OPROFILE=y
99# CONFIG_KPROBES is not set 104# CONFIG_KPROBES is not set
@@ -175,6 +180,7 @@ CONFIG_CPU_SUBTYPE_SH7201=y
175# 180#
176CONFIG_QUICKLIST=y 181CONFIG_QUICKLIST=y
177CONFIG_PAGE_OFFSET=0x00000000 182CONFIG_PAGE_OFFSET=0x00000000
183CONFIG_FORCE_MAX_ZONEORDER=14
178CONFIG_MEMORY_START=0x08000000 184CONFIG_MEMORY_START=0x08000000
179CONFIG_MEMORY_SIZE=0x01000000 185CONFIG_MEMORY_SIZE=0x01000000
180CONFIG_29BIT=y 186CONFIG_29BIT=y
@@ -188,7 +194,6 @@ CONFIG_PAGE_SIZE_4KB=y
188# CONFIG_PAGE_SIZE_8KB is not set 194# CONFIG_PAGE_SIZE_8KB is not set
189# CONFIG_PAGE_SIZE_16KB is not set 195# CONFIG_PAGE_SIZE_16KB is not set
190# CONFIG_PAGE_SIZE_64KB is not set 196# CONFIG_PAGE_SIZE_64KB is not set
191CONFIG_ENTRY_OFFSET=0x00001000
192CONFIG_SELECT_MEMORY_MODEL=y 197CONFIG_SELECT_MEMORY_MODEL=y
193CONFIG_FLATMEM_MANUAL=y 198CONFIG_FLATMEM_MANUAL=y
194# CONFIG_DISCONTIGMEM_MANUAL is not set 199# CONFIG_DISCONTIGMEM_MANUAL is not set
@@ -201,7 +206,8 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
201# CONFIG_PHYS_ADDR_T_64BIT is not set 206# CONFIG_PHYS_ADDR_T_64BIT is not set
202CONFIG_ZONE_DMA_FLAG=0 207CONFIG_ZONE_DMA_FLAG=0
203CONFIG_NR_QUICK=2 208CONFIG_NR_QUICK=2
204CONFIG_UNEVICTABLE_LRU=y 209CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
210CONFIG_NOMMU_INITIAL_TRIM_EXCESS=1
205 211
206# 212#
207# Cache configuration 213# Cache configuration
@@ -228,10 +234,14 @@ CONFIG_SH_RSK7201=y
228# 234#
229# Timer and clock configuration 235# Timer and clock configuration
230# 236#
231CONFIG_SH_MTU2=y 237CONFIG_SH_TIMER_MTU2=y
232CONFIG_SH_TIMER_IRQ=16
233CONFIG_SH_PCLK_FREQ=40000000 238CONFIG_SH_PCLK_FREQ=40000000
239CONFIG_SH_CLK_CPG=y
240CONFIG_SH_CLK_CPG_LEGACY=y
234CONFIG_SH_CLK_MD=0 241CONFIG_SH_CLK_MD=0
242# CONFIG_NO_HZ is not set
243# CONFIG_HIGH_RES_TIMERS is not set
244CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
235 245
236# 246#
237# CPU Frequency scaling 247# CPU Frequency scaling
@@ -267,12 +277,14 @@ CONFIG_PREEMPT_NONE=y
267# CONFIG_PREEMPT_VOLUNTARY is not set 277# CONFIG_PREEMPT_VOLUNTARY is not set
268# CONFIG_PREEMPT is not set 278# CONFIG_PREEMPT is not set
269CONFIG_GUSA=y 279CONFIG_GUSA=y
280# CONFIG_SPARSE_IRQ is not set
270 281
271# 282#
272# Boot options 283# Boot options
273# 284#
274CONFIG_ZERO_PAGE_OFFSET=0x00001000 285CONFIG_ZERO_PAGE_OFFSET=0x00001000
275CONFIG_BOOT_LINK_OFFSET=0x00800000 286CONFIG_BOOT_LINK_OFFSET=0x00800000
287CONFIG_ENTRY_OFFSET=0x00001000
276CONFIG_CMDLINE_BOOL=y 288CONFIG_CMDLINE_BOOL=y
277CONFIG_CMDLINE="console=ttySC0,115200 earlyprintk=serial ignore_loglevel" 289CONFIG_CMDLINE="console=ttySC0,115200 earlyprintk=serial ignore_loglevel"
278 290
@@ -506,21 +518,7 @@ CONFIG_SSB_POSSIBLE=y
506# CONFIG_HTC_PASIC3 is not set 518# CONFIG_HTC_PASIC3 is not set
507# CONFIG_MFD_TMIO is not set 519# CONFIG_MFD_TMIO is not set
508# CONFIG_REGULATOR is not set 520# CONFIG_REGULATOR is not set
509 521# CONFIG_MEDIA_SUPPORT is not set
510#
511# Multimedia devices
512#
513
514#
515# Multimedia core support
516#
517# CONFIG_VIDEO_DEV is not set
518# CONFIG_VIDEO_MEDIA is not set
519
520#
521# Multimedia drivers
522#
523CONFIG_DAB=y
524 522
525# 523#
526# Graphics support 524# Graphics support
@@ -578,9 +576,14 @@ CONFIG_RTC_INTF_DEV=y
578# on-CPU RTC drivers 576# on-CPU RTC drivers
579# 577#
580CONFIG_RTC_DRV_SH=y 578CONFIG_RTC_DRV_SH=y
579# CONFIG_RTC_DRV_GENERIC is not set
581# CONFIG_DMADEVICES is not set 580# CONFIG_DMADEVICES is not set
582# CONFIG_AUXDISPLAY is not set 581# CONFIG_AUXDISPLAY is not set
583# CONFIG_UIO is not set 582# CONFIG_UIO is not set
583
584#
585# TI VLYNQ
586#
584# CONFIG_STAGING is not set 587# CONFIG_STAGING is not set
585 588
586# 589#
@@ -593,11 +596,13 @@ CONFIG_EXT2_FS=y
593# CONFIG_REISERFS_FS is not set 596# CONFIG_REISERFS_FS is not set
594# CONFIG_JFS_FS is not set 597# CONFIG_JFS_FS is not set
595# CONFIG_FS_POSIX_ACL is not set 598# CONFIG_FS_POSIX_ACL is not set
596# CONFIG_FILE_LOCKING is not set
597# CONFIG_XFS_FS is not set 599# CONFIG_XFS_FS is not set
598# CONFIG_BTRFS_FS is not set 600# CONFIG_BTRFS_FS is not set
601# CONFIG_FILE_LOCKING is not set
602CONFIG_FSNOTIFY=y
599# CONFIG_DNOTIFY is not set 603# CONFIG_DNOTIFY is not set
600# CONFIG_INOTIFY is not set 604# CONFIG_INOTIFY is not set
605CONFIG_INOTIFY_USER=y
601# CONFIG_QUOTA is not set 606# CONFIG_QUOTA is not set
602# CONFIG_AUTOFS_FS is not set 607# CONFIG_AUTOFS_FS is not set
603# CONFIG_AUTOFS4_FS is not set 608# CONFIG_AUTOFS4_FS is not set
@@ -696,30 +701,17 @@ CONFIG_HAVE_FUNCTION_TRACER=y
696CONFIG_HAVE_DYNAMIC_FTRACE=y 701CONFIG_HAVE_DYNAMIC_FTRACE=y
697CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 702CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
698CONFIG_RING_BUFFER=y 703CONFIG_RING_BUFFER=y
704CONFIG_EVENT_TRACING=y
705CONFIG_CONTEXT_SWITCH_TRACER=y
699CONFIG_TRACING=y 706CONFIG_TRACING=y
700CONFIG_TRACING_SUPPORT=y 707CONFIG_TRACING_SUPPORT=y
701 708# CONFIG_FTRACE is not set
702#
703# Tracers
704#
705# CONFIG_FUNCTION_TRACER is not set
706# CONFIG_SCHED_TRACER is not set
707# CONFIG_CONTEXT_SWITCH_TRACER is not set
708# CONFIG_EVENT_TRACER is not set
709# CONFIG_BOOT_TRACER is not set
710# CONFIG_TRACE_BRANCH_PROFILING is not set
711# CONFIG_STACK_TRACER is not set
712# CONFIG_KMEMTRACE is not set
713# CONFIG_WORKQUEUE_TRACER is not set
714# CONFIG_BLK_DEV_IO_TRACE is not set
715# CONFIG_FTRACE_STARTUP_TEST is not set
716# CONFIG_DYNAMIC_DEBUG is not set 709# CONFIG_DYNAMIC_DEBUG is not set
717# CONFIG_DMA_API_DEBUG is not set 710# CONFIG_DMA_API_DEBUG is not set
718# CONFIG_SAMPLES is not set 711# CONFIG_SAMPLES is not set
719CONFIG_HAVE_ARCH_KGDB=y 712CONFIG_HAVE_ARCH_KGDB=y
720# CONFIG_SH_STANDARD_BIOS is not set 713# CONFIG_SH_STANDARD_BIOS is not set
721# CONFIG_EARLY_SCIF_CONSOLE is not set 714# CONFIG_EARLY_SCIF_CONSOLE is not set
722# CONFIG_MORE_COMPILE_OPTIONS is not set
723 715
724# 716#
725# Security options 717# Security options
@@ -749,3 +741,4 @@ CONFIG_DECOMPRESS_GZIP=y
749CONFIG_HAS_IOMEM=y 741CONFIG_HAS_IOMEM=y
750CONFIG_HAS_IOPORT=y 742CONFIG_HAS_IOPORT=y
751CONFIG_HAS_DMA=y 743CONFIG_HAS_DMA=y
744CONFIG_GENERIC_ATOMIC64=y
diff --git a/arch/sh/configs/rsk7203_defconfig b/arch/sh/configs/rsk7203_defconfig
index e3a65f819f0a..69e619967b7b 100644
--- a/arch/sh/configs/rsk7203_defconfig
+++ b/arch/sh/configs/rsk7203_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.30-rc3 3# Linux kernel version: 2.6.30
4# Mon Apr 27 12:57:06 2009 4# Thu Jun 18 12:40:44 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -15,11 +15,12 @@ CONFIG_GENERIC_HARDIRQS=y
15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
16CONFIG_GENERIC_IRQ_PROBE=y 16CONFIG_GENERIC_IRQ_PROBE=y
17CONFIG_GENERIC_GPIO=y 17CONFIG_GENERIC_GPIO=y
18# CONFIG_GENERIC_TIME is not set 18CONFIG_GENERIC_TIME=y
19# CONFIG_GENERIC_CLOCKEVENTS is not set 19CONFIG_GENERIC_CLOCKEVENTS=y
20# CONFIG_ARCH_SUSPEND_POSSIBLE is not set 20# CONFIG_ARCH_SUSPEND_POSSIBLE is not set
21# CONFIG_ARCH_HIBERNATION_POSSIBLE is not set 21# CONFIG_ARCH_HIBERNATION_POSSIBLE is not set
22CONFIG_SYS_SUPPORTS_CMT=y 22CONFIG_SYS_SUPPORTS_CMT=y
23CONFIG_SYS_SUPPORTS_MTU2=y
23CONFIG_STACKTRACE_SUPPORT=y 24CONFIG_STACKTRACE_SUPPORT=y
24CONFIG_LOCKDEP_SUPPORT=y 25CONFIG_LOCKDEP_SUPPORT=y
25CONFIG_HAVE_LATENCYTOP_SUPPORT=y 26CONFIG_HAVE_LATENCYTOP_SUPPORT=y
@@ -81,7 +82,6 @@ CONFIG_SYSCTL_SYSCALL=y
81CONFIG_KALLSYMS=y 82CONFIG_KALLSYMS=y
82CONFIG_KALLSYMS_ALL=y 83CONFIG_KALLSYMS_ALL=y
83# CONFIG_KALLSYMS_EXTRA_PASS is not set 84# CONFIG_KALLSYMS_EXTRA_PASS is not set
84# CONFIG_STRIP_ASM_SYMS is not set
85CONFIG_HOTPLUG=y 85CONFIG_HOTPLUG=y
86CONFIG_PRINTK=y 86CONFIG_PRINTK=y
87CONFIG_BUG=y 87CONFIG_BUG=y
@@ -93,14 +93,19 @@ CONFIG_SIGNALFD=y
93CONFIG_TIMERFD=y 93CONFIG_TIMERFD=y
94CONFIG_EVENTFD=y 94CONFIG_EVENTFD=y
95CONFIG_AIO=y 95CONFIG_AIO=y
96
97#
98# Performance Counters
99#
96CONFIG_VM_EVENT_COUNTERS=y 100CONFIG_VM_EVENT_COUNTERS=y
101# CONFIG_STRIP_ASM_SYMS is not set
97CONFIG_COMPAT_BRK=y 102CONFIG_COMPAT_BRK=y
98# CONFIG_SLAB is not set 103# CONFIG_SLAB is not set
99# CONFIG_SLUB is not set 104# CONFIG_SLUB is not set
100CONFIG_SLOB=y 105CONFIG_SLOB=y
101CONFIG_PROFILING=y 106CONFIG_PROFILING=y
102CONFIG_TRACEPOINTS=y 107CONFIG_TRACEPOINTS=y
103# CONFIG_MARKERS is not set 108CONFIG_MARKERS=y
104CONFIG_OPROFILE=y 109CONFIG_OPROFILE=y
105CONFIG_HAVE_OPROFILE=y 110CONFIG_HAVE_OPROFILE=y
106# CONFIG_KPROBES is not set 111# CONFIG_KPROBES is not set
@@ -182,6 +187,7 @@ CONFIG_CPU_SUBTYPE_SH7203=y
182# 187#
183CONFIG_QUICKLIST=y 188CONFIG_QUICKLIST=y
184CONFIG_PAGE_OFFSET=0x00000000 189CONFIG_PAGE_OFFSET=0x00000000
190CONFIG_FORCE_MAX_ZONEORDER=14
185CONFIG_MEMORY_START=0x0c000000 191CONFIG_MEMORY_START=0x0c000000
186CONFIG_MEMORY_SIZE=0x01000000 192CONFIG_MEMORY_SIZE=0x01000000
187CONFIG_29BIT=y 193CONFIG_29BIT=y
@@ -195,7 +201,6 @@ CONFIG_PAGE_SIZE_4KB=y
195# CONFIG_PAGE_SIZE_8KB is not set 201# CONFIG_PAGE_SIZE_8KB is not set
196# CONFIG_PAGE_SIZE_16KB is not set 202# CONFIG_PAGE_SIZE_16KB is not set
197# CONFIG_PAGE_SIZE_64KB is not set 203# CONFIG_PAGE_SIZE_64KB is not set
198CONFIG_ENTRY_OFFSET=0x00001000
199CONFIG_SELECT_MEMORY_MODEL=y 204CONFIG_SELECT_MEMORY_MODEL=y
200CONFIG_FLATMEM_MANUAL=y 205CONFIG_FLATMEM_MANUAL=y
201# CONFIG_DISCONTIGMEM_MANUAL is not set 206# CONFIG_DISCONTIGMEM_MANUAL is not set
@@ -208,7 +213,8 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
208# CONFIG_PHYS_ADDR_T_64BIT is not set 213# CONFIG_PHYS_ADDR_T_64BIT is not set
209CONFIG_ZONE_DMA_FLAG=0 214CONFIG_ZONE_DMA_FLAG=0
210CONFIG_NR_QUICK=2 215CONFIG_NR_QUICK=2
211CONFIG_UNEVICTABLE_LRU=y 216CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
217CONFIG_NOMMU_INITIAL_TRIM_EXCESS=1
212 218
213# 219#
214# Cache configuration 220# Cache configuration
@@ -235,11 +241,15 @@ CONFIG_SH_RSK7203=y
235# 241#
236# Timer and clock configuration 242# Timer and clock configuration
237# 243#
238CONFIG_SH_CMT=y 244CONFIG_SH_TIMER_CMT=y
239# CONFIG_SH_MTU2 is not set 245CONFIG_SH_TIMER_MTU2=y
240CONFIG_SH_TIMER_IRQ=142
241CONFIG_SH_PCLK_FREQ=16670800 246CONFIG_SH_PCLK_FREQ=16670800
247CONFIG_SH_CLK_CPG=y
248CONFIG_SH_CLK_CPG_LEGACY=y
242CONFIG_SH_CLK_MD=0 249CONFIG_SH_CLK_MD=0
250# CONFIG_NO_HZ is not set
251# CONFIG_HIGH_RES_TIMERS is not set
252CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
243 253
244# 254#
245# CPU Frequency scaling 255# CPU Frequency scaling
@@ -290,12 +300,14 @@ CONFIG_PREEMPT_NONE=y
290# CONFIG_PREEMPT_VOLUNTARY is not set 300# CONFIG_PREEMPT_VOLUNTARY is not set
291# CONFIG_PREEMPT is not set 301# CONFIG_PREEMPT is not set
292CONFIG_GUSA=y 302CONFIG_GUSA=y
303# CONFIG_SPARSE_IRQ is not set
293 304
294# 305#
295# Boot options 306# Boot options
296# 307#
297CONFIG_ZERO_PAGE_OFFSET=0x00001000 308CONFIG_ZERO_PAGE_OFFSET=0x00001000
298CONFIG_BOOT_LINK_OFFSET=0x00800000 309CONFIG_BOOT_LINK_OFFSET=0x00800000
310CONFIG_ENTRY_OFFSET=0x00001000
299CONFIG_CMDLINE_BOOL=y 311CONFIG_CMDLINE_BOOL=y
300CONFIG_CMDLINE="console=ttySC0,115200 earlyprintk=serial ignore_loglevel" 312CONFIG_CMDLINE="console=ttySC0,115200 earlyprintk=serial ignore_loglevel"
301 313
@@ -375,6 +387,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
375# CONFIG_ECONET is not set 387# CONFIG_ECONET is not set
376# CONFIG_WAN_ROUTER is not set 388# CONFIG_WAN_ROUTER is not set
377# CONFIG_PHONET is not set 389# CONFIG_PHONET is not set
390# CONFIG_IEEE802154 is not set
378# CONFIG_NET_SCHED is not set 391# CONFIG_NET_SCHED is not set
379# CONFIG_DCB is not set 392# CONFIG_DCB is not set
380 393
@@ -393,7 +406,11 @@ CONFIG_WIRELESS=y
393# CONFIG_WIRELESS_OLD_REGULATORY is not set 406# CONFIG_WIRELESS_OLD_REGULATORY is not set
394# CONFIG_WIRELESS_EXT is not set 407# CONFIG_WIRELESS_EXT is not set
395# CONFIG_LIB80211 is not set 408# CONFIG_LIB80211 is not set
396# CONFIG_MAC80211 is not set 409
410#
411# CFG80211 needs to be enabled for MAC80211
412#
413CONFIG_MAC80211_DEFAULT_PS_VALUE=0
397# CONFIG_WIMAX is not set 414# CONFIG_WIMAX is not set
398# CONFIG_RFKILL is not set 415# CONFIG_RFKILL is not set
399# CONFIG_NET_9P is not set 416# CONFIG_NET_9P is not set
@@ -528,7 +545,6 @@ CONFIG_HAVE_IDE=y
528# CONFIG_ATA is not set 545# CONFIG_ATA is not set
529# CONFIG_MD is not set 546# CONFIG_MD is not set
530CONFIG_NETDEVICES=y 547CONFIG_NETDEVICES=y
531CONFIG_COMPAT_NET_DEV_OPS=y
532# CONFIG_DUMMY is not set 548# CONFIG_DUMMY is not set
533# CONFIG_BONDING is not set 549# CONFIG_BONDING is not set
534# CONFIG_MACVLAN is not set 550# CONFIG_MACVLAN is not set
@@ -572,6 +588,7 @@ CONFIG_SMSC911X=y
572# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set 588# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
573# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set 589# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
574# CONFIG_B44 is not set 590# CONFIG_B44 is not set
591# CONFIG_KS8842 is not set
575# CONFIG_NETDEV_1000 is not set 592# CONFIG_NETDEV_1000 is not set
576# CONFIG_NETDEV_10000 is not set 593# CONFIG_NETDEV_10000 is not set
577 594
@@ -705,24 +722,9 @@ CONFIG_REGULATOR=y
705# CONFIG_REGULATOR_DEBUG is not set 722# CONFIG_REGULATOR_DEBUG is not set
706# CONFIG_REGULATOR_FIXED_VOLTAGE is not set 723# CONFIG_REGULATOR_FIXED_VOLTAGE is not set
707# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set 724# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
725# CONFIG_REGULATOR_USERSPACE_CONSUMER is not set
708# CONFIG_REGULATOR_BQ24022 is not set 726# CONFIG_REGULATOR_BQ24022 is not set
709 727# CONFIG_MEDIA_SUPPORT is not set
710#
711# Multimedia devices
712#
713
714#
715# Multimedia core support
716#
717# CONFIG_VIDEO_DEV is not set
718# CONFIG_DVB_CORE is not set
719# CONFIG_VIDEO_MEDIA is not set
720
721#
722# Multimedia drivers
723#
724CONFIG_DAB=y
725# CONFIG_USB_DABUSB is not set
726 728
727# 729#
728# Graphics support 730# Graphics support
@@ -758,7 +760,7 @@ CONFIG_HID_BELKIN=y
758CONFIG_HID_CHERRY=y 760CONFIG_HID_CHERRY=y
759CONFIG_HID_CHICONY=y 761CONFIG_HID_CHICONY=y
760CONFIG_HID_CYPRESS=y 762CONFIG_HID_CYPRESS=y
761# CONFIG_DRAGONRISE_FF is not set 763# CONFIG_HID_DRAGONRISE is not set
762CONFIG_HID_EZKEY=y 764CONFIG_HID_EZKEY=y
763# CONFIG_HID_KYE is not set 765# CONFIG_HID_KYE is not set
764CONFIG_HID_GYRATION=y 766CONFIG_HID_GYRATION=y
@@ -775,10 +777,11 @@ CONFIG_HID_PETALYNX=y
775CONFIG_HID_SAMSUNG=y 777CONFIG_HID_SAMSUNG=y
776CONFIG_HID_SONY=y 778CONFIG_HID_SONY=y
777CONFIG_HID_SUNPLUS=y 779CONFIG_HID_SUNPLUS=y
778# CONFIG_GREENASIA_FF is not set 780# CONFIG_HID_GREENASIA is not set
781# CONFIG_HID_SMARTJOYPLUS is not set
779# CONFIG_HID_TOPSEED is not set 782# CONFIG_HID_TOPSEED is not set
780CONFIG_THRUSTMASTER_FF=m 783# CONFIG_HID_THRUSTMASTER is not set
781CONFIG_ZEROPLUS_FF=m 784# CONFIG_HID_ZEROPLUS is not set
782CONFIG_USB_SUPPORT=y 785CONFIG_USB_SUPPORT=y
783CONFIG_USB_ARCH_HAS_HCD=y 786CONFIG_USB_ARCH_HAS_HCD=y
784# CONFIG_USB_ARCH_HAS_OHCI is not set 787# CONFIG_USB_ARCH_HAS_OHCI is not set
@@ -931,9 +934,14 @@ CONFIG_RTC_INTF_DEV=y
931# on-CPU RTC drivers 934# on-CPU RTC drivers
932# 935#
933CONFIG_RTC_DRV_SH=y 936CONFIG_RTC_DRV_SH=y
937# CONFIG_RTC_DRV_GENERIC is not set
934# CONFIG_DMADEVICES is not set 938# CONFIG_DMADEVICES is not set
935# CONFIG_AUXDISPLAY is not set 939# CONFIG_AUXDISPLAY is not set
936# CONFIG_UIO is not set 940# CONFIG_UIO is not set
941
942#
943# TI VLYNQ
944#
937# CONFIG_STAGING is not set 945# CONFIG_STAGING is not set
938 946
939# 947#
@@ -945,12 +953,14 @@ CONFIG_RTC_DRV_SH=y
945# CONFIG_REISERFS_FS is not set 953# CONFIG_REISERFS_FS is not set
946# CONFIG_JFS_FS is not set 954# CONFIG_JFS_FS is not set
947# CONFIG_FS_POSIX_ACL is not set 955# CONFIG_FS_POSIX_ACL is not set
948CONFIG_FILE_LOCKING=y
949# CONFIG_XFS_FS is not set 956# CONFIG_XFS_FS is not set
950# CONFIG_OCFS2_FS is not set 957# CONFIG_OCFS2_FS is not set
951# CONFIG_BTRFS_FS is not set 958# CONFIG_BTRFS_FS is not set
959CONFIG_FILE_LOCKING=y
960CONFIG_FSNOTIFY=y
952# CONFIG_DNOTIFY is not set 961# CONFIG_DNOTIFY is not set
953# CONFIG_INOTIFY is not set 962# CONFIG_INOTIFY is not set
963CONFIG_INOTIFY_USER=y
954# CONFIG_QUOTA is not set 964# CONFIG_QUOTA is not set
955# CONFIG_AUTOFS_FS is not set 965# CONFIG_AUTOFS_FS is not set
956# CONFIG_AUTOFS4_FS is not set 966# CONFIG_AUTOFS4_FS is not set
@@ -1029,7 +1039,46 @@ CONFIG_SUNRPC=y
1029# 1039#
1030# CONFIG_PARTITION_ADVANCED is not set 1040# CONFIG_PARTITION_ADVANCED is not set
1031CONFIG_MSDOS_PARTITION=y 1041CONFIG_MSDOS_PARTITION=y
1032# CONFIG_NLS is not set 1042CONFIG_NLS=y
1043CONFIG_NLS_DEFAULT="iso8859-1"
1044# CONFIG_NLS_CODEPAGE_437 is not set
1045# CONFIG_NLS_CODEPAGE_737 is not set
1046# CONFIG_NLS_CODEPAGE_775 is not set
1047# CONFIG_NLS_CODEPAGE_850 is not set
1048# CONFIG_NLS_CODEPAGE_852 is not set
1049# CONFIG_NLS_CODEPAGE_855 is not set
1050# CONFIG_NLS_CODEPAGE_857 is not set
1051# CONFIG_NLS_CODEPAGE_860 is not set
1052# CONFIG_NLS_CODEPAGE_861 is not set
1053# CONFIG_NLS_CODEPAGE_862 is not set
1054# CONFIG_NLS_CODEPAGE_863 is not set
1055# CONFIG_NLS_CODEPAGE_864 is not set
1056# CONFIG_NLS_CODEPAGE_865 is not set
1057# CONFIG_NLS_CODEPAGE_866 is not set
1058# CONFIG_NLS_CODEPAGE_869 is not set
1059# CONFIG_NLS_CODEPAGE_936 is not set
1060# CONFIG_NLS_CODEPAGE_950 is not set
1061# CONFIG_NLS_CODEPAGE_932 is not set
1062# CONFIG_NLS_CODEPAGE_949 is not set
1063# CONFIG_NLS_CODEPAGE_874 is not set
1064# CONFIG_NLS_ISO8859_8 is not set
1065# CONFIG_NLS_CODEPAGE_1250 is not set
1066# CONFIG_NLS_CODEPAGE_1251 is not set
1067# CONFIG_NLS_ASCII is not set
1068# CONFIG_NLS_ISO8859_1 is not set
1069# CONFIG_NLS_ISO8859_2 is not set
1070# CONFIG_NLS_ISO8859_3 is not set
1071# CONFIG_NLS_ISO8859_4 is not set
1072# CONFIG_NLS_ISO8859_5 is not set
1073# CONFIG_NLS_ISO8859_6 is not set
1074# CONFIG_NLS_ISO8859_7 is not set
1075# CONFIG_NLS_ISO8859_9 is not set
1076# CONFIG_NLS_ISO8859_13 is not set
1077# CONFIG_NLS_ISO8859_14 is not set
1078# CONFIG_NLS_ISO8859_15 is not set
1079# CONFIG_NLS_KOI8_R is not set
1080# CONFIG_NLS_KOI8_U is not set
1081# CONFIG_NLS_UTF8 is not set
1033# CONFIG_DLM is not set 1082# CONFIG_DLM is not set
1034 1083
1035# 1084#
@@ -1094,23 +1143,24 @@ CONFIG_HAVE_FUNCTION_TRACER=y
1094CONFIG_HAVE_DYNAMIC_FTRACE=y 1143CONFIG_HAVE_DYNAMIC_FTRACE=y
1095CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 1144CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1096CONFIG_RING_BUFFER=y 1145CONFIG_RING_BUFFER=y
1146CONFIG_EVENT_TRACING=y
1147CONFIG_CONTEXT_SWITCH_TRACER=y
1097CONFIG_TRACING=y 1148CONFIG_TRACING=y
1098CONFIG_TRACING_SUPPORT=y 1149CONFIG_TRACING_SUPPORT=y
1099 1150CONFIG_FTRACE=y
1100#
1101# Tracers
1102#
1103# CONFIG_FUNCTION_TRACER is not set 1151# CONFIG_FUNCTION_TRACER is not set
1152# CONFIG_IRQSOFF_TRACER is not set
1104# CONFIG_SCHED_TRACER is not set 1153# CONFIG_SCHED_TRACER is not set
1105# CONFIG_CONTEXT_SWITCH_TRACER is not set 1154# CONFIG_ENABLE_DEFAULT_TRACERS is not set
1106# CONFIG_EVENT_TRACER is not set
1107# CONFIG_BOOT_TRACER is not set 1155# CONFIG_BOOT_TRACER is not set
1108# CONFIG_TRACE_BRANCH_PROFILING is not set 1156CONFIG_BRANCH_PROFILE_NONE=y
1157# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
1158# CONFIG_PROFILE_ALL_BRANCHES is not set
1109# CONFIG_STACK_TRACER is not set 1159# CONFIG_STACK_TRACER is not set
1110# CONFIG_KMEMTRACE is not set 1160# CONFIG_KMEMTRACE is not set
1111# CONFIG_WORKQUEUE_TRACER is not set 1161# CONFIG_WORKQUEUE_TRACER is not set
1112# CONFIG_BLK_DEV_IO_TRACE is not set 1162# CONFIG_BLK_DEV_IO_TRACE is not set
1113# CONFIG_FTRACE_STARTUP_TEST is not set 1163# CONFIG_RING_BUFFER_BENCHMARK is not set
1114# CONFIG_DYNAMIC_DEBUG is not set 1164# CONFIG_DYNAMIC_DEBUG is not set
1115# CONFIG_DMA_API_DEBUG is not set 1165# CONFIG_DMA_API_DEBUG is not set
1116# CONFIG_SAMPLES is not set 1166# CONFIG_SAMPLES is not set
@@ -1123,10 +1173,8 @@ CONFIG_EARLY_PRINTK=y
1123CONFIG_DEBUG_BOOTMEM=y 1173CONFIG_DEBUG_BOOTMEM=y
1124CONFIG_DEBUG_STACKOVERFLOW=y 1174CONFIG_DEBUG_STACKOVERFLOW=y
1125CONFIG_DEBUG_STACK_USAGE=y 1175CONFIG_DEBUG_STACK_USAGE=y
1126# CONFIG_IRQSTACKS is not set
1127CONFIG_DUMP_CODE=y 1176CONFIG_DUMP_CODE=y
1128# CONFIG_SH_NO_BSS_INIT is not set 1177# CONFIG_SH_NO_BSS_INIT is not set
1129# CONFIG_MORE_COMPILE_OPTIONS is not set
1130 1178
1131# 1179#
1132# Security options 1180# Security options
@@ -1156,3 +1204,4 @@ CONFIG_HAS_IOMEM=y
1156CONFIG_HAS_IOPORT=y 1204CONFIG_HAS_IOPORT=y
1157CONFIG_HAS_DMA=y 1205CONFIG_HAS_DMA=y
1158CONFIG_NLATTR=y 1206CONFIG_NLATTR=y
1207CONFIG_GENERIC_ATOMIC64=y
diff --git a/arch/sh/configs/rts7751r2d1_defconfig b/arch/sh/configs/rts7751r2d1_defconfig
index a4a59f6205ab..c6e9b1c0fa3e 100644
--- a/arch/sh/configs/rts7751r2d1_defconfig
+++ b/arch/sh/configs/rts7751r2d1_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.30-rc3 3# Linux kernel version: 2.6.30
4# Mon Apr 27 12:58:13 2009 4# Thu Jun 18 12:42:26 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -20,6 +20,7 @@ CONFIG_GENERIC_CLOCKEVENTS=y
20# CONFIG_ARCH_SUSPEND_POSSIBLE is not set 20# CONFIG_ARCH_SUSPEND_POSSIBLE is not set
21CONFIG_ARCH_HIBERNATION_POSSIBLE=y 21CONFIG_ARCH_HIBERNATION_POSSIBLE=y
22CONFIG_SYS_SUPPORTS_PCI=y 22CONFIG_SYS_SUPPORTS_PCI=y
23CONFIG_SYS_SUPPORTS_TMU=y
23CONFIG_STACKTRACE_SUPPORT=y 24CONFIG_STACKTRACE_SUPPORT=y
24CONFIG_LOCKDEP_SUPPORT=y 25CONFIG_LOCKDEP_SUPPORT=y
25CONFIG_HAVE_LATENCYTOP_SUPPORT=y 26CONFIG_HAVE_LATENCYTOP_SUPPORT=y
@@ -71,7 +72,6 @@ CONFIG_UID16=y
71# CONFIG_SYSCTL_SYSCALL is not set 72# CONFIG_SYSCTL_SYSCALL is not set
72CONFIG_KALLSYMS=y 73CONFIG_KALLSYMS=y
73# CONFIG_KALLSYMS_EXTRA_PASS is not set 74# CONFIG_KALLSYMS_EXTRA_PASS is not set
74# CONFIG_STRIP_ASM_SYMS is not set
75CONFIG_HOTPLUG=y 75CONFIG_HOTPLUG=y
76CONFIG_PRINTK=y 76CONFIG_PRINTK=y
77CONFIG_BUG=y 77CONFIG_BUG=y
@@ -84,15 +84,20 @@ CONFIG_TIMERFD=y
84CONFIG_EVENTFD=y 84CONFIG_EVENTFD=y
85CONFIG_SHMEM=y 85CONFIG_SHMEM=y
86CONFIG_AIO=y 86CONFIG_AIO=y
87
88#
89# Performance Counters
90#
87CONFIG_VM_EVENT_COUNTERS=y 91CONFIG_VM_EVENT_COUNTERS=y
88CONFIG_PCI_QUIRKS=y 92CONFIG_PCI_QUIRKS=y
93# CONFIG_STRIP_ASM_SYMS is not set
89CONFIG_COMPAT_BRK=y 94CONFIG_COMPAT_BRK=y
90CONFIG_SLAB=y 95CONFIG_SLAB=y
91# CONFIG_SLUB is not set 96# CONFIG_SLUB is not set
92# CONFIG_SLOB is not set 97# CONFIG_SLOB is not set
93CONFIG_PROFILING=y 98CONFIG_PROFILING=y
94CONFIG_TRACEPOINTS=y 99CONFIG_TRACEPOINTS=y
95# CONFIG_MARKERS is not set 100CONFIG_MARKERS=y
96CONFIG_OPROFILE=y 101CONFIG_OPROFILE=y
97CONFIG_HAVE_OPROFILE=y 102CONFIG_HAVE_OPROFILE=y
98# CONFIG_KPROBES is not set 103# CONFIG_KPROBES is not set
@@ -176,6 +181,7 @@ CONFIG_CPU_SUBTYPE_SH7751R=y
176CONFIG_QUICKLIST=y 181CONFIG_QUICKLIST=y
177CONFIG_MMU=y 182CONFIG_MMU=y
178CONFIG_PAGE_OFFSET=0x80000000 183CONFIG_PAGE_OFFSET=0x80000000
184CONFIG_FORCE_MAX_ZONEORDER=11
179CONFIG_MEMORY_START=0x0c000000 185CONFIG_MEMORY_START=0x0c000000
180CONFIG_MEMORY_SIZE=0x04000000 186CONFIG_MEMORY_SIZE=0x04000000
181CONFIG_29BIT=y 187CONFIG_29BIT=y
@@ -190,7 +196,6 @@ CONFIG_PAGE_SIZE_4KB=y
190# CONFIG_PAGE_SIZE_8KB is not set 196# CONFIG_PAGE_SIZE_8KB is not set
191# CONFIG_PAGE_SIZE_16KB is not set 197# CONFIG_PAGE_SIZE_16KB is not set
192# CONFIG_PAGE_SIZE_64KB is not set 198# CONFIG_PAGE_SIZE_64KB is not set
193CONFIG_ENTRY_OFFSET=0x00001000
194CONFIG_SELECT_MEMORY_MODEL=y 199CONFIG_SELECT_MEMORY_MODEL=y
195CONFIG_FLATMEM_MANUAL=y 200CONFIG_FLATMEM_MANUAL=y
196# CONFIG_DISCONTIGMEM_MANUAL is not set 201# CONFIG_DISCONTIGMEM_MANUAL is not set
@@ -203,9 +208,9 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
203# CONFIG_PHYS_ADDR_T_64BIT is not set 208# CONFIG_PHYS_ADDR_T_64BIT is not set
204CONFIG_ZONE_DMA_FLAG=0 209CONFIG_ZONE_DMA_FLAG=0
205CONFIG_NR_QUICK=2 210CONFIG_NR_QUICK=2
206CONFIG_UNEVICTABLE_LRU=y
207CONFIG_HAVE_MLOCK=y 211CONFIG_HAVE_MLOCK=y
208CONFIG_HAVE_MLOCKED_PAGE_BIT=y 212CONFIG_HAVE_MLOCKED_PAGE_BIT=y
213CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
209 214
210# 215#
211# Cache configuration 216# Cache configuration
@@ -223,7 +228,6 @@ CONFIG_SH_FPU=y
223# CONFIG_SH_STORE_QUEUES is not set 228# CONFIG_SH_STORE_QUEUES is not set
224CONFIG_CPU_HAS_INTEVT=y 229CONFIG_CPU_HAS_INTEVT=y
225CONFIG_CPU_HAS_SR_RB=y 230CONFIG_CPU_HAS_SR_RB=y
226CONFIG_CPU_HAS_PTEA=y
227CONFIG_CPU_HAS_FPU=y 231CONFIG_CPU_HAS_FPU=y
228 232
229# 233#
@@ -245,9 +249,10 @@ CONFIG_RTS7751R2D_1=y
245# 249#
246# Timer and clock configuration 250# Timer and clock configuration
247# 251#
248CONFIG_SH_TMU=y 252CONFIG_SH_TIMER_TMU=y
249CONFIG_SH_TIMER_IRQ=16
250CONFIG_SH_PCLK_FREQ=60000000 253CONFIG_SH_PCLK_FREQ=60000000
254CONFIG_SH_CLK_CPG=y
255CONFIG_SH_CLK_CPG_LEGACY=y
251# CONFIG_NO_HZ is not set 256# CONFIG_NO_HZ is not set
252# CONFIG_HIGH_RES_TIMERS is not set 257# CONFIG_HIGH_RES_TIMERS is not set
253CONFIG_GENERIC_CLOCKEVENTS_BUILD=y 258CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
@@ -289,12 +294,14 @@ CONFIG_PREEMPT_NONE=y
289# CONFIG_PREEMPT is not set 294# CONFIG_PREEMPT is not set
290CONFIG_GUSA=y 295CONFIG_GUSA=y
291# CONFIG_GUSA_RB is not set 296# CONFIG_GUSA_RB is not set
297# CONFIG_SPARSE_IRQ is not set
292 298
293# 299#
294# Boot options 300# Boot options
295# 301#
296CONFIG_ZERO_PAGE_OFFSET=0x00010000 302CONFIG_ZERO_PAGE_OFFSET=0x00010000
297CONFIG_BOOT_LINK_OFFSET=0x00800000 303CONFIG_BOOT_LINK_OFFSET=0x00800000
304CONFIG_ENTRY_OFFSET=0x00001000
298# CONFIG_UBC_WAKEUP is not set 305# CONFIG_UBC_WAKEUP is not set
299CONFIG_CMDLINE_BOOL=y 306CONFIG_CMDLINE_BOOL=y
300CONFIG_CMDLINE="console=tty0 console=ttySC0,115200 root=/dev/sda1 earlyprintk=serial" 307CONFIG_CMDLINE="console=tty0 console=ttySC0,115200 root=/dev/sda1 earlyprintk=serial"
@@ -385,6 +392,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
385# CONFIG_ECONET is not set 392# CONFIG_ECONET is not set
386# CONFIG_WAN_ROUTER is not set 393# CONFIG_WAN_ROUTER is not set
387# CONFIG_PHONET is not set 394# CONFIG_PHONET is not set
395# CONFIG_IEEE802154 is not set
388# CONFIG_NET_SCHED is not set 396# CONFIG_NET_SCHED is not set
389# CONFIG_DCB is not set 397# CONFIG_DCB is not set
390 398
@@ -404,7 +412,11 @@ CONFIG_WIRELESS=y
404CONFIG_WIRELESS_EXT=y 412CONFIG_WIRELESS_EXT=y
405CONFIG_WIRELESS_EXT_SYSFS=y 413CONFIG_WIRELESS_EXT_SYSFS=y
406# CONFIG_LIB80211 is not set 414# CONFIG_LIB80211 is not set
407# CONFIG_MAC80211 is not set 415
416#
417# CFG80211 needs to be enabled for MAC80211
418#
419CONFIG_MAC80211_DEFAULT_PS_VALUE=0
408# CONFIG_WIMAX is not set 420# CONFIG_WIMAX is not set
409# CONFIG_RFKILL is not set 421# CONFIG_RFKILL is not set
410# CONFIG_NET_9P is not set 422# CONFIG_NET_9P is not set
@@ -455,6 +467,7 @@ CONFIG_MISC_DEVICES=y
455# 467#
456# CONFIG_EEPROM_AT25 is not set 468# CONFIG_EEPROM_AT25 is not set
457# CONFIG_EEPROM_93CX6 is not set 469# CONFIG_EEPROM_93CX6 is not set
470# CONFIG_CB710_CORE is not set
458CONFIG_HAVE_IDE=y 471CONFIG_HAVE_IDE=y
459# CONFIG_IDE is not set 472# CONFIG_IDE is not set
460 473
@@ -477,10 +490,6 @@ CONFIG_BLK_DEV_SD=y
477# CONFIG_BLK_DEV_SR is not set 490# CONFIG_BLK_DEV_SR is not set
478# CONFIG_CHR_DEV_SG is not set 491# CONFIG_CHR_DEV_SG is not set
479# CONFIG_CHR_DEV_SCH is not set 492# CONFIG_CHR_DEV_SCH is not set
480
481#
482# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
483#
484# CONFIG_SCSI_MULTI_LUN is not set 493# CONFIG_SCSI_MULTI_LUN is not set
485# CONFIG_SCSI_CONSTANTS is not set 494# CONFIG_SCSI_CONSTANTS is not set
486# CONFIG_SCSI_LOGGING is not set 495# CONFIG_SCSI_LOGGING is not set
@@ -498,6 +507,7 @@ CONFIG_SCSI_WAIT_SCAN=m
498CONFIG_SCSI_LOWLEVEL=y 507CONFIG_SCSI_LOWLEVEL=y
499# CONFIG_ISCSI_TCP is not set 508# CONFIG_ISCSI_TCP is not set
500# CONFIG_SCSI_CXGB3_ISCSI is not set 509# CONFIG_SCSI_CXGB3_ISCSI is not set
510# CONFIG_SCSI_BNX2_ISCSI is not set
501# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 511# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
502# CONFIG_SCSI_3W_9XXX is not set 512# CONFIG_SCSI_3W_9XXX is not set
503# CONFIG_SCSI_ACARD is not set 513# CONFIG_SCSI_ACARD is not set
@@ -506,6 +516,7 @@ CONFIG_SCSI_LOWLEVEL=y
506# CONFIG_SCSI_AIC7XXX_OLD is not set 516# CONFIG_SCSI_AIC7XXX_OLD is not set
507# CONFIG_SCSI_AIC79XX is not set 517# CONFIG_SCSI_AIC79XX is not set
508# CONFIG_SCSI_AIC94XX is not set 518# CONFIG_SCSI_AIC94XX is not set
519# CONFIG_SCSI_MVSAS is not set
509# CONFIG_SCSI_ARCMSR is not set 520# CONFIG_SCSI_ARCMSR is not set
510# CONFIG_MEGARAID_NEWGEN is not set 521# CONFIG_MEGARAID_NEWGEN is not set
511# CONFIG_MEGARAID_LEGACY is not set 522# CONFIG_MEGARAID_LEGACY is not set
@@ -520,7 +531,6 @@ CONFIG_SCSI_LOWLEVEL=y
520# CONFIG_SCSI_IPS is not set 531# CONFIG_SCSI_IPS is not set
521# CONFIG_SCSI_INITIO is not set 532# CONFIG_SCSI_INITIO is not set
522# CONFIG_SCSI_INIA100 is not set 533# CONFIG_SCSI_INIA100 is not set
523# CONFIG_SCSI_MVSAS is not set
524# CONFIG_SCSI_STEX is not set 534# CONFIG_SCSI_STEX is not set
525# CONFIG_SCSI_SYM53C8XX_2 is not set 535# CONFIG_SCSI_SYM53C8XX_2 is not set
526# CONFIG_SCSI_IPR is not set 536# CONFIG_SCSI_IPR is not set
@@ -609,7 +619,6 @@ CONFIG_PATA_PLATFORM=y
609# CONFIG_IEEE1394 is not set 619# CONFIG_IEEE1394 is not set
610# CONFIG_I2O is not set 620# CONFIG_I2O is not set
611CONFIG_NETDEVICES=y 621CONFIG_NETDEVICES=y
612CONFIG_COMPAT_NET_DEV_OPS=y
613# CONFIG_DUMMY is not set 622# CONFIG_DUMMY is not set
614# CONFIG_BONDING is not set 623# CONFIG_BONDING is not set
615# CONFIG_MACVLAN is not set 624# CONFIG_MACVLAN is not set
@@ -663,6 +672,7 @@ CONFIG_8139TOO=y
663# CONFIG_SMSC9420 is not set 672# CONFIG_SMSC9420 is not set
664# CONFIG_SUNDANCE is not set 673# CONFIG_SUNDANCE is not set
665# CONFIG_TLAN is not set 674# CONFIG_TLAN is not set
675# CONFIG_KS8842 is not set
666# CONFIG_VIA_RHINE is not set 676# CONFIG_VIA_RHINE is not set
667# CONFIG_SC92031 is not set 677# CONFIG_SC92031 is not set
668# CONFIG_ATL2 is not set 678# CONFIG_ATL2 is not set
@@ -871,23 +881,7 @@ CONFIG_MFD_SM501=y
871# CONFIG_HTC_PASIC3 is not set 881# CONFIG_HTC_PASIC3 is not set
872# CONFIG_MFD_TMIO is not set 882# CONFIG_MFD_TMIO is not set
873# CONFIG_REGULATOR is not set 883# CONFIG_REGULATOR is not set
874 884# CONFIG_MEDIA_SUPPORT is not set
875#
876# Multimedia devices
877#
878
879#
880# Multimedia core support
881#
882# CONFIG_VIDEO_DEV is not set
883# CONFIG_DVB_CORE is not set
884# CONFIG_VIDEO_MEDIA is not set
885
886#
887# Multimedia drivers
888#
889CONFIG_DAB=y
890# CONFIG_USB_DABUSB is not set
891 885
892# 886#
893# Graphics support 887# Graphics support
@@ -989,6 +983,11 @@ CONFIG_SND_VERBOSE_PROCFS=y
989# CONFIG_SND_VERBOSE_PRINTK is not set 983# CONFIG_SND_VERBOSE_PRINTK is not set
990# CONFIG_SND_DEBUG is not set 984# CONFIG_SND_DEBUG is not set
991CONFIG_SND_VMASTER=y 985CONFIG_SND_VMASTER=y
986# CONFIG_SND_RAWMIDI_SEQ is not set
987# CONFIG_SND_OPL3_LIB_SEQ is not set
988# CONFIG_SND_OPL4_LIB_SEQ is not set
989# CONFIG_SND_SBAWE_SEQ is not set
990# CONFIG_SND_EMU10K1_SEQ is not set
992CONFIG_SND_MPU401_UART=m 991CONFIG_SND_MPU401_UART=m
993CONFIG_SND_OPL3_LIB=m 992CONFIG_SND_OPL3_LIB=m
994CONFIG_SND_AC97_CODEC=m 993CONFIG_SND_AC97_CODEC=m
@@ -1015,6 +1014,7 @@ CONFIG_SND_PCI=y
1015# CONFIG_SND_OXYGEN is not set 1014# CONFIG_SND_OXYGEN is not set
1016# CONFIG_SND_CS4281 is not set 1015# CONFIG_SND_CS4281 is not set
1017# CONFIG_SND_CS46XX is not set 1016# CONFIG_SND_CS46XX is not set
1017# CONFIG_SND_CTXFI is not set
1018# CONFIG_SND_DARLA20 is not set 1018# CONFIG_SND_DARLA20 is not set
1019# CONFIG_SND_GINA20 is not set 1019# CONFIG_SND_GINA20 is not set
1020# CONFIG_SND_LAYLA20 is not set 1020# CONFIG_SND_LAYLA20 is not set
@@ -1045,6 +1045,7 @@ CONFIG_SND_PCI=y
1045# CONFIG_SND_INTEL8X0 is not set 1045# CONFIG_SND_INTEL8X0 is not set
1046# CONFIG_SND_INTEL8X0M is not set 1046# CONFIG_SND_INTEL8X0M is not set
1047# CONFIG_SND_KORG1212 is not set 1047# CONFIG_SND_KORG1212 is not set
1048# CONFIG_SND_LX6464ES is not set
1048# CONFIG_SND_MAESTRO3 is not set 1049# CONFIG_SND_MAESTRO3 is not set
1049# CONFIG_SND_MIXART is not set 1050# CONFIG_SND_MIXART is not set
1050# CONFIG_SND_NM256 is not set 1051# CONFIG_SND_NM256 is not set
@@ -1089,7 +1090,7 @@ CONFIG_HID_BELKIN=y
1089CONFIG_HID_CHERRY=y 1090CONFIG_HID_CHERRY=y
1090CONFIG_HID_CHICONY=y 1091CONFIG_HID_CHICONY=y
1091CONFIG_HID_CYPRESS=y 1092CONFIG_HID_CYPRESS=y
1092# CONFIG_DRAGONRISE_FF is not set 1093# CONFIG_HID_DRAGONRISE is not set
1093CONFIG_HID_EZKEY=y 1094CONFIG_HID_EZKEY=y
1094# CONFIG_HID_KYE is not set 1095# CONFIG_HID_KYE is not set
1095CONFIG_HID_GYRATION=y 1096CONFIG_HID_GYRATION=y
@@ -1106,10 +1107,11 @@ CONFIG_HID_PETALYNX=y
1106CONFIG_HID_SAMSUNG=y 1107CONFIG_HID_SAMSUNG=y
1107CONFIG_HID_SONY=y 1108CONFIG_HID_SONY=y
1108CONFIG_HID_SUNPLUS=y 1109CONFIG_HID_SUNPLUS=y
1109# CONFIG_GREENASIA_FF is not set 1110# CONFIG_HID_GREENASIA is not set
1111# CONFIG_HID_SMARTJOYPLUS is not set
1110# CONFIG_HID_TOPSEED is not set 1112# CONFIG_HID_TOPSEED is not set
1111CONFIG_THRUSTMASTER_FF=m 1113# CONFIG_HID_THRUSTMASTER is not set
1112CONFIG_ZEROPLUS_FF=m 1114# CONFIG_HID_ZEROPLUS is not set
1113CONFIG_USB_SUPPORT=y 1115CONFIG_USB_SUPPORT=y
1114CONFIG_USB_ARCH_HAS_HCD=y 1116CONFIG_USB_ARCH_HAS_HCD=y
1115CONFIG_USB_ARCH_HAS_OHCI=y 1117CONFIG_USB_ARCH_HAS_OHCI=y
@@ -1135,6 +1137,7 @@ CONFIG_USB_DEVICE_CLASS=y
1135# USB Host Controller Drivers 1137# USB Host Controller Drivers
1136# 1138#
1137# CONFIG_USB_C67X00_HCD is not set 1139# CONFIG_USB_C67X00_HCD is not set
1140# CONFIG_USB_XHCI_HCD is not set
1138# CONFIG_USB_EHCI_HCD is not set 1141# CONFIG_USB_EHCI_HCD is not set
1139# CONFIG_USB_OXU210HP_HCD is not set 1142# CONFIG_USB_OXU210HP_HCD is not set
1140# CONFIG_USB_ISP116X_HCD is not set 1143# CONFIG_USB_ISP116X_HCD is not set
@@ -1268,9 +1271,14 @@ CONFIG_RTC_DRV_R9701=y
1268# on-CPU RTC drivers 1271# on-CPU RTC drivers
1269# 1272#
1270# CONFIG_RTC_DRV_SH is not set 1273# CONFIG_RTC_DRV_SH is not set
1274# CONFIG_RTC_DRV_GENERIC is not set
1271# CONFIG_DMADEVICES is not set 1275# CONFIG_DMADEVICES is not set
1272# CONFIG_AUXDISPLAY is not set 1276# CONFIG_AUXDISPLAY is not set
1273# CONFIG_UIO is not set 1277# CONFIG_UIO is not set
1278
1279#
1280# TI VLYNQ
1281#
1274# CONFIG_STAGING is not set 1282# CONFIG_STAGING is not set
1275 1283
1276# 1284#
@@ -1284,10 +1292,11 @@ CONFIG_EXT2_FS=y
1284# CONFIG_REISERFS_FS is not set 1292# CONFIG_REISERFS_FS is not set
1285# CONFIG_JFS_FS is not set 1293# CONFIG_JFS_FS is not set
1286# CONFIG_FS_POSIX_ACL is not set 1294# CONFIG_FS_POSIX_ACL is not set
1287CONFIG_FILE_LOCKING=y
1288# CONFIG_XFS_FS is not set 1295# CONFIG_XFS_FS is not set
1289# CONFIG_OCFS2_FS is not set 1296# CONFIG_OCFS2_FS is not set
1290# CONFIG_BTRFS_FS is not set 1297# CONFIG_BTRFS_FS is not set
1298CONFIG_FILE_LOCKING=y
1299CONFIG_FSNOTIFY=y
1291CONFIG_DNOTIFY=y 1300CONFIG_DNOTIFY=y
1292CONFIG_INOTIFY=y 1301CONFIG_INOTIFY=y
1293CONFIG_INOTIFY_USER=y 1302CONFIG_INOTIFY_USER=y
@@ -1428,24 +1437,11 @@ CONFIG_HAVE_FUNCTION_TRACER=y
1428CONFIG_HAVE_DYNAMIC_FTRACE=y 1437CONFIG_HAVE_DYNAMIC_FTRACE=y
1429CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 1438CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1430CONFIG_RING_BUFFER=y 1439CONFIG_RING_BUFFER=y
1440CONFIG_EVENT_TRACING=y
1441CONFIG_CONTEXT_SWITCH_TRACER=y
1431CONFIG_TRACING=y 1442CONFIG_TRACING=y
1432CONFIG_TRACING_SUPPORT=y 1443CONFIG_TRACING_SUPPORT=y
1433 1444# CONFIG_FTRACE is not set
1434#
1435# Tracers
1436#
1437# CONFIG_FUNCTION_TRACER is not set
1438# CONFIG_IRQSOFF_TRACER is not set
1439# CONFIG_SCHED_TRACER is not set
1440# CONFIG_CONTEXT_SWITCH_TRACER is not set
1441# CONFIG_EVENT_TRACER is not set
1442# CONFIG_BOOT_TRACER is not set
1443# CONFIG_TRACE_BRANCH_PROFILING is not set
1444# CONFIG_STACK_TRACER is not set
1445# CONFIG_KMEMTRACE is not set
1446# CONFIG_WORKQUEUE_TRACER is not set
1447# CONFIG_BLK_DEV_IO_TRACE is not set
1448# CONFIG_FTRACE_STARTUP_TEST is not set
1449# CONFIG_DYNAMIC_DEBUG is not set 1445# CONFIG_DYNAMIC_DEBUG is not set
1450# CONFIG_DMA_API_DEBUG is not set 1446# CONFIG_DMA_API_DEBUG is not set
1451# CONFIG_SAMPLES is not set 1447# CONFIG_SAMPLES is not set
@@ -1454,7 +1450,6 @@ CONFIG_HAVE_ARCH_KGDB=y
1454CONFIG_EARLY_SCIF_CONSOLE=y 1450CONFIG_EARLY_SCIF_CONSOLE=y
1455CONFIG_EARLY_SCIF_CONSOLE_PORT=0xffe80000 1451CONFIG_EARLY_SCIF_CONSOLE_PORT=0xffe80000
1456CONFIG_EARLY_PRINTK=y 1452CONFIG_EARLY_PRINTK=y
1457# CONFIG_MORE_COMPILE_OPTIONS is not set
1458 1453
1459# 1454#
1460# Security options 1455# Security options
@@ -1568,3 +1563,4 @@ CONFIG_HAS_IOMEM=y
1568CONFIG_HAS_IOPORT=y 1563CONFIG_HAS_IOPORT=y
1569CONFIG_HAS_DMA=y 1564CONFIG_HAS_DMA=y
1570CONFIG_NLATTR=y 1565CONFIG_NLATTR=y
1566CONFIG_GENERIC_ATOMIC64=y
diff --git a/arch/sh/configs/rts7751r2dplus_defconfig b/arch/sh/configs/rts7751r2dplus_defconfig
index a860435b8847..bc10469d31f0 100644
--- a/arch/sh/configs/rts7751r2dplus_defconfig
+++ b/arch/sh/configs/rts7751r2dplus_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.30-rc3 3# Linux kernel version: 2.6.30
4# Mon Apr 27 12:59:01 2009 4# Thu Jun 18 12:43:19 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -20,6 +20,7 @@ CONFIG_GENERIC_CLOCKEVENTS=y
20# CONFIG_ARCH_SUSPEND_POSSIBLE is not set 20# CONFIG_ARCH_SUSPEND_POSSIBLE is not set
21CONFIG_ARCH_HIBERNATION_POSSIBLE=y 21CONFIG_ARCH_HIBERNATION_POSSIBLE=y
22CONFIG_SYS_SUPPORTS_PCI=y 22CONFIG_SYS_SUPPORTS_PCI=y
23CONFIG_SYS_SUPPORTS_TMU=y
23CONFIG_STACKTRACE_SUPPORT=y 24CONFIG_STACKTRACE_SUPPORT=y
24CONFIG_LOCKDEP_SUPPORT=y 25CONFIG_LOCKDEP_SUPPORT=y
25CONFIG_HAVE_LATENCYTOP_SUPPORT=y 26CONFIG_HAVE_LATENCYTOP_SUPPORT=y
@@ -71,7 +72,6 @@ CONFIG_UID16=y
71# CONFIG_SYSCTL_SYSCALL is not set 72# CONFIG_SYSCTL_SYSCALL is not set
72CONFIG_KALLSYMS=y 73CONFIG_KALLSYMS=y
73# CONFIG_KALLSYMS_EXTRA_PASS is not set 74# CONFIG_KALLSYMS_EXTRA_PASS is not set
74# CONFIG_STRIP_ASM_SYMS is not set
75CONFIG_HOTPLUG=y 75CONFIG_HOTPLUG=y
76CONFIG_PRINTK=y 76CONFIG_PRINTK=y
77CONFIG_BUG=y 77CONFIG_BUG=y
@@ -84,15 +84,20 @@ CONFIG_TIMERFD=y
84CONFIG_EVENTFD=y 84CONFIG_EVENTFD=y
85CONFIG_SHMEM=y 85CONFIG_SHMEM=y
86CONFIG_AIO=y 86CONFIG_AIO=y
87
88#
89# Performance Counters
90#
87CONFIG_VM_EVENT_COUNTERS=y 91CONFIG_VM_EVENT_COUNTERS=y
88CONFIG_PCI_QUIRKS=y 92CONFIG_PCI_QUIRKS=y
93# CONFIG_STRIP_ASM_SYMS is not set
89CONFIG_COMPAT_BRK=y 94CONFIG_COMPAT_BRK=y
90CONFIG_SLAB=y 95CONFIG_SLAB=y
91# CONFIG_SLUB is not set 96# CONFIG_SLUB is not set
92# CONFIG_SLOB is not set 97# CONFIG_SLOB is not set
93CONFIG_PROFILING=y 98CONFIG_PROFILING=y
94CONFIG_TRACEPOINTS=y 99CONFIG_TRACEPOINTS=y
95# CONFIG_MARKERS is not set 100CONFIG_MARKERS=y
96CONFIG_OPROFILE=y 101CONFIG_OPROFILE=y
97CONFIG_HAVE_OPROFILE=y 102CONFIG_HAVE_OPROFILE=y
98# CONFIG_KPROBES is not set 103# CONFIG_KPROBES is not set
@@ -176,6 +181,7 @@ CONFIG_CPU_SUBTYPE_SH7751R=y
176CONFIG_QUICKLIST=y 181CONFIG_QUICKLIST=y
177CONFIG_MMU=y 182CONFIG_MMU=y
178CONFIG_PAGE_OFFSET=0x80000000 183CONFIG_PAGE_OFFSET=0x80000000
184CONFIG_FORCE_MAX_ZONEORDER=11
179CONFIG_MEMORY_START=0x0c000000 185CONFIG_MEMORY_START=0x0c000000
180CONFIG_MEMORY_SIZE=0x04000000 186CONFIG_MEMORY_SIZE=0x04000000
181CONFIG_29BIT=y 187CONFIG_29BIT=y
@@ -190,7 +196,6 @@ CONFIG_PAGE_SIZE_4KB=y
190# CONFIG_PAGE_SIZE_8KB is not set 196# CONFIG_PAGE_SIZE_8KB is not set
191# CONFIG_PAGE_SIZE_16KB is not set 197# CONFIG_PAGE_SIZE_16KB is not set
192# CONFIG_PAGE_SIZE_64KB is not set 198# CONFIG_PAGE_SIZE_64KB is not set
193CONFIG_ENTRY_OFFSET=0x00001000
194CONFIG_SELECT_MEMORY_MODEL=y 199CONFIG_SELECT_MEMORY_MODEL=y
195CONFIG_FLATMEM_MANUAL=y 200CONFIG_FLATMEM_MANUAL=y
196# CONFIG_DISCONTIGMEM_MANUAL is not set 201# CONFIG_DISCONTIGMEM_MANUAL is not set
@@ -203,9 +208,9 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
203# CONFIG_PHYS_ADDR_T_64BIT is not set 208# CONFIG_PHYS_ADDR_T_64BIT is not set
204CONFIG_ZONE_DMA_FLAG=0 209CONFIG_ZONE_DMA_FLAG=0
205CONFIG_NR_QUICK=2 210CONFIG_NR_QUICK=2
206CONFIG_UNEVICTABLE_LRU=y
207CONFIG_HAVE_MLOCK=y 211CONFIG_HAVE_MLOCK=y
208CONFIG_HAVE_MLOCKED_PAGE_BIT=y 212CONFIG_HAVE_MLOCKED_PAGE_BIT=y
213CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
209 214
210# 215#
211# Cache configuration 216# Cache configuration
@@ -223,7 +228,6 @@ CONFIG_SH_FPU=y
223# CONFIG_SH_STORE_QUEUES is not set 228# CONFIG_SH_STORE_QUEUES is not set
224CONFIG_CPU_HAS_INTEVT=y 229CONFIG_CPU_HAS_INTEVT=y
225CONFIG_CPU_HAS_SR_RB=y 230CONFIG_CPU_HAS_SR_RB=y
226CONFIG_CPU_HAS_PTEA=y
227CONFIG_CPU_HAS_FPU=y 231CONFIG_CPU_HAS_FPU=y
228 232
229# 233#
@@ -245,9 +249,10 @@ CONFIG_RTS7751R2D_PLUS=y
245# 249#
246# Timer and clock configuration 250# Timer and clock configuration
247# 251#
248CONFIG_SH_TMU=y 252CONFIG_SH_TIMER_TMU=y
249CONFIG_SH_TIMER_IRQ=16
250CONFIG_SH_PCLK_FREQ=60000000 253CONFIG_SH_PCLK_FREQ=60000000
254CONFIG_SH_CLK_CPG=y
255CONFIG_SH_CLK_CPG_LEGACY=y
251# CONFIG_NO_HZ is not set 256# CONFIG_NO_HZ is not set
252# CONFIG_HIGH_RES_TIMERS is not set 257# CONFIG_HIGH_RES_TIMERS is not set
253CONFIG_GENERIC_CLOCKEVENTS_BUILD=y 258CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
@@ -289,12 +294,14 @@ CONFIG_PREEMPT_NONE=y
289# CONFIG_PREEMPT is not set 294# CONFIG_PREEMPT is not set
290CONFIG_GUSA=y 295CONFIG_GUSA=y
291# CONFIG_GUSA_RB is not set 296# CONFIG_GUSA_RB is not set
297# CONFIG_SPARSE_IRQ is not set
292 298
293# 299#
294# Boot options 300# Boot options
295# 301#
296CONFIG_ZERO_PAGE_OFFSET=0x00010000 302CONFIG_ZERO_PAGE_OFFSET=0x00010000
297CONFIG_BOOT_LINK_OFFSET=0x00800000 303CONFIG_BOOT_LINK_OFFSET=0x00800000
304CONFIG_ENTRY_OFFSET=0x00001000
298# CONFIG_UBC_WAKEUP is not set 305# CONFIG_UBC_WAKEUP is not set
299CONFIG_CMDLINE_BOOL=y 306CONFIG_CMDLINE_BOOL=y
300CONFIG_CMDLINE="console=tty0 console=ttySC0,115200 root=/dev/sda1 earlyprintk=serial" 307CONFIG_CMDLINE="console=tty0 console=ttySC0,115200 root=/dev/sda1 earlyprintk=serial"
@@ -385,6 +392,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
385# CONFIG_ECONET is not set 392# CONFIG_ECONET is not set
386# CONFIG_WAN_ROUTER is not set 393# CONFIG_WAN_ROUTER is not set
387# CONFIG_PHONET is not set 394# CONFIG_PHONET is not set
395# CONFIG_IEEE802154 is not set
388# CONFIG_NET_SCHED is not set 396# CONFIG_NET_SCHED is not set
389# CONFIG_DCB is not set 397# CONFIG_DCB is not set
390 398
@@ -404,7 +412,11 @@ CONFIG_WIRELESS=y
404CONFIG_WIRELESS_EXT=y 412CONFIG_WIRELESS_EXT=y
405CONFIG_WIRELESS_EXT_SYSFS=y 413CONFIG_WIRELESS_EXT_SYSFS=y
406# CONFIG_LIB80211 is not set 414# CONFIG_LIB80211 is not set
407# CONFIG_MAC80211 is not set 415
416#
417# CFG80211 needs to be enabled for MAC80211
418#
419CONFIG_MAC80211_DEFAULT_PS_VALUE=0
408# CONFIG_WIMAX is not set 420# CONFIG_WIMAX is not set
409# CONFIG_RFKILL is not set 421# CONFIG_RFKILL is not set
410# CONFIG_NET_9P is not set 422# CONFIG_NET_9P is not set
@@ -540,6 +552,7 @@ CONFIG_MISC_DEVICES=y
540# 552#
541# CONFIG_EEPROM_AT25 is not set 553# CONFIG_EEPROM_AT25 is not set
542# CONFIG_EEPROM_93CX6 is not set 554# CONFIG_EEPROM_93CX6 is not set
555# CONFIG_CB710_CORE is not set
543CONFIG_HAVE_IDE=y 556CONFIG_HAVE_IDE=y
544# CONFIG_IDE is not set 557# CONFIG_IDE is not set
545 558
@@ -562,10 +575,6 @@ CONFIG_BLK_DEV_SD=y
562# CONFIG_BLK_DEV_SR is not set 575# CONFIG_BLK_DEV_SR is not set
563# CONFIG_CHR_DEV_SG is not set 576# CONFIG_CHR_DEV_SG is not set
564# CONFIG_CHR_DEV_SCH is not set 577# CONFIG_CHR_DEV_SCH is not set
565
566#
567# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
568#
569# CONFIG_SCSI_MULTI_LUN is not set 578# CONFIG_SCSI_MULTI_LUN is not set
570# CONFIG_SCSI_CONSTANTS is not set 579# CONFIG_SCSI_CONSTANTS is not set
571# CONFIG_SCSI_LOGGING is not set 580# CONFIG_SCSI_LOGGING is not set
@@ -583,6 +592,7 @@ CONFIG_SCSI_WAIT_SCAN=m
583CONFIG_SCSI_LOWLEVEL=y 592CONFIG_SCSI_LOWLEVEL=y
584# CONFIG_ISCSI_TCP is not set 593# CONFIG_ISCSI_TCP is not set
585# CONFIG_SCSI_CXGB3_ISCSI is not set 594# CONFIG_SCSI_CXGB3_ISCSI is not set
595# CONFIG_SCSI_BNX2_ISCSI is not set
586# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 596# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
587# CONFIG_SCSI_3W_9XXX is not set 597# CONFIG_SCSI_3W_9XXX is not set
588# CONFIG_SCSI_ACARD is not set 598# CONFIG_SCSI_ACARD is not set
@@ -591,6 +601,7 @@ CONFIG_SCSI_LOWLEVEL=y
591# CONFIG_SCSI_AIC7XXX_OLD is not set 601# CONFIG_SCSI_AIC7XXX_OLD is not set
592# CONFIG_SCSI_AIC79XX is not set 602# CONFIG_SCSI_AIC79XX is not set
593# CONFIG_SCSI_AIC94XX is not set 603# CONFIG_SCSI_AIC94XX is not set
604# CONFIG_SCSI_MVSAS is not set
594# CONFIG_SCSI_ARCMSR is not set 605# CONFIG_SCSI_ARCMSR is not set
595# CONFIG_MEGARAID_NEWGEN is not set 606# CONFIG_MEGARAID_NEWGEN is not set
596# CONFIG_MEGARAID_LEGACY is not set 607# CONFIG_MEGARAID_LEGACY is not set
@@ -605,7 +616,6 @@ CONFIG_SCSI_LOWLEVEL=y
605# CONFIG_SCSI_IPS is not set 616# CONFIG_SCSI_IPS is not set
606# CONFIG_SCSI_INITIO is not set 617# CONFIG_SCSI_INITIO is not set
607# CONFIG_SCSI_INIA100 is not set 618# CONFIG_SCSI_INIA100 is not set
608# CONFIG_SCSI_MVSAS is not set
609# CONFIG_SCSI_STEX is not set 619# CONFIG_SCSI_STEX is not set
610# CONFIG_SCSI_SYM53C8XX_2 is not set 620# CONFIG_SCSI_SYM53C8XX_2 is not set
611# CONFIG_SCSI_IPR is not set 621# CONFIG_SCSI_IPR is not set
@@ -694,7 +704,6 @@ CONFIG_PATA_PLATFORM=y
694# CONFIG_IEEE1394 is not set 704# CONFIG_IEEE1394 is not set
695# CONFIG_I2O is not set 705# CONFIG_I2O is not set
696CONFIG_NETDEVICES=y 706CONFIG_NETDEVICES=y
697CONFIG_COMPAT_NET_DEV_OPS=y
698# CONFIG_DUMMY is not set 707# CONFIG_DUMMY is not set
699# CONFIG_BONDING is not set 708# CONFIG_BONDING is not set
700# CONFIG_MACVLAN is not set 709# CONFIG_MACVLAN is not set
@@ -748,6 +757,7 @@ CONFIG_8139TOO=y
748# CONFIG_SMSC9420 is not set 757# CONFIG_SMSC9420 is not set
749# CONFIG_SUNDANCE is not set 758# CONFIG_SUNDANCE is not set
750# CONFIG_TLAN is not set 759# CONFIG_TLAN is not set
760# CONFIG_KS8842 is not set
751# CONFIG_VIA_RHINE is not set 761# CONFIG_VIA_RHINE is not set
752# CONFIG_SC92031 is not set 762# CONFIG_SC92031 is not set
753# CONFIG_ATL2 is not set 763# CONFIG_ATL2 is not set
@@ -956,23 +966,7 @@ CONFIG_MFD_SM501=y
956# CONFIG_HTC_PASIC3 is not set 966# CONFIG_HTC_PASIC3 is not set
957# CONFIG_MFD_TMIO is not set 967# CONFIG_MFD_TMIO is not set
958# CONFIG_REGULATOR is not set 968# CONFIG_REGULATOR is not set
959 969# CONFIG_MEDIA_SUPPORT is not set
960#
961# Multimedia devices
962#
963
964#
965# Multimedia core support
966#
967# CONFIG_VIDEO_DEV is not set
968# CONFIG_DVB_CORE is not set
969# CONFIG_VIDEO_MEDIA is not set
970
971#
972# Multimedia drivers
973#
974CONFIG_DAB=y
975# CONFIG_USB_DABUSB is not set
976 970
977# 971#
978# Graphics support 972# Graphics support
@@ -1074,6 +1068,11 @@ CONFIG_SND_VERBOSE_PROCFS=y
1074# CONFIG_SND_VERBOSE_PRINTK is not set 1068# CONFIG_SND_VERBOSE_PRINTK is not set
1075# CONFIG_SND_DEBUG is not set 1069# CONFIG_SND_DEBUG is not set
1076CONFIG_SND_VMASTER=y 1070CONFIG_SND_VMASTER=y
1071# CONFIG_SND_RAWMIDI_SEQ is not set
1072# CONFIG_SND_OPL3_LIB_SEQ is not set
1073# CONFIG_SND_OPL4_LIB_SEQ is not set
1074# CONFIG_SND_SBAWE_SEQ is not set
1075# CONFIG_SND_EMU10K1_SEQ is not set
1077CONFIG_SND_MPU401_UART=m 1076CONFIG_SND_MPU401_UART=m
1078CONFIG_SND_OPL3_LIB=m 1077CONFIG_SND_OPL3_LIB=m
1079CONFIG_SND_AC97_CODEC=m 1078CONFIG_SND_AC97_CODEC=m
@@ -1100,6 +1099,7 @@ CONFIG_SND_PCI=y
1100# CONFIG_SND_OXYGEN is not set 1099# CONFIG_SND_OXYGEN is not set
1101# CONFIG_SND_CS4281 is not set 1100# CONFIG_SND_CS4281 is not set
1102# CONFIG_SND_CS46XX is not set 1101# CONFIG_SND_CS46XX is not set
1102# CONFIG_SND_CTXFI is not set
1103# CONFIG_SND_DARLA20 is not set 1103# CONFIG_SND_DARLA20 is not set
1104# CONFIG_SND_GINA20 is not set 1104# CONFIG_SND_GINA20 is not set
1105# CONFIG_SND_LAYLA20 is not set 1105# CONFIG_SND_LAYLA20 is not set
@@ -1130,6 +1130,7 @@ CONFIG_SND_PCI=y
1130# CONFIG_SND_INTEL8X0 is not set 1130# CONFIG_SND_INTEL8X0 is not set
1131# CONFIG_SND_INTEL8X0M is not set 1131# CONFIG_SND_INTEL8X0M is not set
1132# CONFIG_SND_KORG1212 is not set 1132# CONFIG_SND_KORG1212 is not set
1133# CONFIG_SND_LX6464ES is not set
1133# CONFIG_SND_MAESTRO3 is not set 1134# CONFIG_SND_MAESTRO3 is not set
1134# CONFIG_SND_MIXART is not set 1135# CONFIG_SND_MIXART is not set
1135# CONFIG_SND_NM256 is not set 1136# CONFIG_SND_NM256 is not set
@@ -1174,7 +1175,7 @@ CONFIG_HID_BELKIN=y
1174CONFIG_HID_CHERRY=y 1175CONFIG_HID_CHERRY=y
1175CONFIG_HID_CHICONY=y 1176CONFIG_HID_CHICONY=y
1176CONFIG_HID_CYPRESS=y 1177CONFIG_HID_CYPRESS=y
1177# CONFIG_DRAGONRISE_FF is not set 1178# CONFIG_HID_DRAGONRISE is not set
1178CONFIG_HID_EZKEY=y 1179CONFIG_HID_EZKEY=y
1179# CONFIG_HID_KYE is not set 1180# CONFIG_HID_KYE is not set
1180CONFIG_HID_GYRATION=y 1181CONFIG_HID_GYRATION=y
@@ -1191,10 +1192,11 @@ CONFIG_HID_PETALYNX=y
1191CONFIG_HID_SAMSUNG=y 1192CONFIG_HID_SAMSUNG=y
1192CONFIG_HID_SONY=y 1193CONFIG_HID_SONY=y
1193CONFIG_HID_SUNPLUS=y 1194CONFIG_HID_SUNPLUS=y
1194# CONFIG_GREENASIA_FF is not set 1195# CONFIG_HID_GREENASIA is not set
1196# CONFIG_HID_SMARTJOYPLUS is not set
1195# CONFIG_HID_TOPSEED is not set 1197# CONFIG_HID_TOPSEED is not set
1196CONFIG_THRUSTMASTER_FF=m 1198# CONFIG_HID_THRUSTMASTER is not set
1197CONFIG_ZEROPLUS_FF=m 1199# CONFIG_HID_ZEROPLUS is not set
1198CONFIG_USB_SUPPORT=y 1200CONFIG_USB_SUPPORT=y
1199CONFIG_USB_ARCH_HAS_HCD=y 1201CONFIG_USB_ARCH_HAS_HCD=y
1200CONFIG_USB_ARCH_HAS_OHCI=y 1202CONFIG_USB_ARCH_HAS_OHCI=y
@@ -1220,6 +1222,7 @@ CONFIG_USB_DEVICE_CLASS=y
1220# USB Host Controller Drivers 1222# USB Host Controller Drivers
1221# 1223#
1222# CONFIG_USB_C67X00_HCD is not set 1224# CONFIG_USB_C67X00_HCD is not set
1225# CONFIG_USB_XHCI_HCD is not set
1223# CONFIG_USB_EHCI_HCD is not set 1226# CONFIG_USB_EHCI_HCD is not set
1224# CONFIG_USB_OXU210HP_HCD is not set 1227# CONFIG_USB_OXU210HP_HCD is not set
1225# CONFIG_USB_ISP116X_HCD is not set 1228# CONFIG_USB_ISP116X_HCD is not set
@@ -1353,9 +1356,14 @@ CONFIG_RTC_DRV_R9701=y
1353# on-CPU RTC drivers 1356# on-CPU RTC drivers
1354# 1357#
1355# CONFIG_RTC_DRV_SH is not set 1358# CONFIG_RTC_DRV_SH is not set
1359# CONFIG_RTC_DRV_GENERIC is not set
1356# CONFIG_DMADEVICES is not set 1360# CONFIG_DMADEVICES is not set
1357# CONFIG_AUXDISPLAY is not set 1361# CONFIG_AUXDISPLAY is not set
1358# CONFIG_UIO is not set 1362# CONFIG_UIO is not set
1363
1364#
1365# TI VLYNQ
1366#
1359# CONFIG_STAGING is not set 1367# CONFIG_STAGING is not set
1360 1368
1361# 1369#
@@ -1369,10 +1377,11 @@ CONFIG_EXT2_FS=y
1369# CONFIG_REISERFS_FS is not set 1377# CONFIG_REISERFS_FS is not set
1370# CONFIG_JFS_FS is not set 1378# CONFIG_JFS_FS is not set
1371# CONFIG_FS_POSIX_ACL is not set 1379# CONFIG_FS_POSIX_ACL is not set
1372CONFIG_FILE_LOCKING=y
1373# CONFIG_XFS_FS is not set 1380# CONFIG_XFS_FS is not set
1374# CONFIG_OCFS2_FS is not set 1381# CONFIG_OCFS2_FS is not set
1375# CONFIG_BTRFS_FS is not set 1382# CONFIG_BTRFS_FS is not set
1383CONFIG_FILE_LOCKING=y
1384CONFIG_FSNOTIFY=y
1376CONFIG_DNOTIFY=y 1385CONFIG_DNOTIFY=y
1377CONFIG_INOTIFY=y 1386CONFIG_INOTIFY=y
1378CONFIG_INOTIFY_USER=y 1387CONFIG_INOTIFY_USER=y
@@ -1423,6 +1432,7 @@ CONFIG_MISC_FILESYSTEMS=y
1423# CONFIG_BEFS_FS is not set 1432# CONFIG_BEFS_FS is not set
1424# CONFIG_BFS_FS is not set 1433# CONFIG_BFS_FS is not set
1425# CONFIG_EFS_FS is not set 1434# CONFIG_EFS_FS is not set
1435# CONFIG_JFFS2_FS is not set
1426# CONFIG_CRAMFS is not set 1436# CONFIG_CRAMFS is not set
1427# CONFIG_SQUASHFS is not set 1437# CONFIG_SQUASHFS is not set
1428# CONFIG_VXFS_FS is not set 1438# CONFIG_VXFS_FS is not set
@@ -1513,24 +1523,11 @@ CONFIG_HAVE_FUNCTION_TRACER=y
1513CONFIG_HAVE_DYNAMIC_FTRACE=y 1523CONFIG_HAVE_DYNAMIC_FTRACE=y
1514CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 1524CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1515CONFIG_RING_BUFFER=y 1525CONFIG_RING_BUFFER=y
1526CONFIG_EVENT_TRACING=y
1527CONFIG_CONTEXT_SWITCH_TRACER=y
1516CONFIG_TRACING=y 1528CONFIG_TRACING=y
1517CONFIG_TRACING_SUPPORT=y 1529CONFIG_TRACING_SUPPORT=y
1518 1530# CONFIG_FTRACE is not set
1519#
1520# Tracers
1521#
1522# CONFIG_FUNCTION_TRACER is not set
1523# CONFIG_IRQSOFF_TRACER is not set
1524# CONFIG_SCHED_TRACER is not set
1525# CONFIG_CONTEXT_SWITCH_TRACER is not set
1526# CONFIG_EVENT_TRACER is not set
1527# CONFIG_BOOT_TRACER is not set
1528# CONFIG_TRACE_BRANCH_PROFILING is not set
1529# CONFIG_STACK_TRACER is not set
1530# CONFIG_KMEMTRACE is not set
1531# CONFIG_WORKQUEUE_TRACER is not set
1532# CONFIG_BLK_DEV_IO_TRACE is not set
1533# CONFIG_FTRACE_STARTUP_TEST is not set
1534# CONFIG_DYNAMIC_DEBUG is not set 1531# CONFIG_DYNAMIC_DEBUG is not set
1535# CONFIG_DMA_API_DEBUG is not set 1532# CONFIG_DMA_API_DEBUG is not set
1536# CONFIG_SAMPLES is not set 1533# CONFIG_SAMPLES is not set
@@ -1539,7 +1536,6 @@ CONFIG_HAVE_ARCH_KGDB=y
1539CONFIG_EARLY_SCIF_CONSOLE=y 1536CONFIG_EARLY_SCIF_CONSOLE=y
1540CONFIG_EARLY_SCIF_CONSOLE_PORT=0xffe80000 1537CONFIG_EARLY_SCIF_CONSOLE_PORT=0xffe80000
1541CONFIG_EARLY_PRINTK=y 1538CONFIG_EARLY_PRINTK=y
1542# CONFIG_MORE_COMPILE_OPTIONS is not set
1543 1539
1544# 1540#
1545# Security options 1541# Security options
@@ -1653,3 +1649,4 @@ CONFIG_HAS_IOMEM=y
1653CONFIG_HAS_IOPORT=y 1649CONFIG_HAS_IOPORT=y
1654CONFIG_HAS_DMA=y 1650CONFIG_HAS_DMA=y
1655CONFIG_NLATTR=y 1651CONFIG_NLATTR=y
1652CONFIG_GENERIC_ATOMIC64=y
diff --git a/arch/sh/configs/sdk7780_defconfig b/arch/sh/configs/sdk7780_defconfig
index a629b79a1844..753fb276e9f5 100644
--- a/arch/sh/configs/sdk7780_defconfig
+++ b/arch/sh/configs/sdk7780_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.30-rc3 3# Linux kernel version: 2.6.30
4# Mon Apr 27 12:59:32 2009 4# Thu Jun 18 12:43:54 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -20,6 +20,7 @@ CONFIG_GENERIC_CLOCKEVENTS=y
20# CONFIG_ARCH_SUSPEND_POSSIBLE is not set 20# CONFIG_ARCH_SUSPEND_POSSIBLE is not set
21CONFIG_ARCH_HIBERNATION_POSSIBLE=y 21CONFIG_ARCH_HIBERNATION_POSSIBLE=y
22CONFIG_SYS_SUPPORTS_PCI=y 22CONFIG_SYS_SUPPORTS_PCI=y
23CONFIG_SYS_SUPPORTS_TMU=y
23CONFIG_STACKTRACE_SUPPORT=y 24CONFIG_STACKTRACE_SUPPORT=y
24CONFIG_LOCKDEP_SUPPORT=y 25CONFIG_LOCKDEP_SUPPORT=y
25CONFIG_HAVE_LATENCYTOP_SUPPORT=y 26CONFIG_HAVE_LATENCYTOP_SUPPORT=y
@@ -75,7 +76,6 @@ CONFIG_SYSCTL_SYSCALL=y
75CONFIG_KALLSYMS=y 76CONFIG_KALLSYMS=y
76CONFIG_KALLSYMS_ALL=y 77CONFIG_KALLSYMS_ALL=y
77# CONFIG_KALLSYMS_EXTRA_PASS is not set 78# CONFIG_KALLSYMS_EXTRA_PASS is not set
78# CONFIG_STRIP_ASM_SYMS is not set
79CONFIG_HOTPLUG=y 79CONFIG_HOTPLUG=y
80CONFIG_PRINTK=y 80CONFIG_PRINTK=y
81CONFIG_BUG=y 81CONFIG_BUG=y
@@ -88,9 +88,14 @@ CONFIG_TIMERFD=y
88CONFIG_EVENTFD=y 88CONFIG_EVENTFD=y
89CONFIG_SHMEM=y 89CONFIG_SHMEM=y
90CONFIG_AIO=y 90CONFIG_AIO=y
91
92#
93# Performance Counters
94#
91CONFIG_VM_EVENT_COUNTERS=y 95CONFIG_VM_EVENT_COUNTERS=y
92CONFIG_PCI_QUIRKS=y 96CONFIG_PCI_QUIRKS=y
93CONFIG_SLUB_DEBUG=y 97CONFIG_SLUB_DEBUG=y
98# CONFIG_STRIP_ASM_SYMS is not set
94CONFIG_COMPAT_BRK=y 99CONFIG_COMPAT_BRK=y
95# CONFIG_SLAB is not set 100# CONFIG_SLAB is not set
96CONFIG_SLUB=y 101CONFIG_SLUB=y
@@ -181,6 +186,7 @@ CONFIG_CPU_SUBTYPE_SH7780=y
181CONFIG_QUICKLIST=y 186CONFIG_QUICKLIST=y
182CONFIG_MMU=y 187CONFIG_MMU=y
183CONFIG_PAGE_OFFSET=0x80000000 188CONFIG_PAGE_OFFSET=0x80000000
189CONFIG_FORCE_MAX_ZONEORDER=11
184CONFIG_MEMORY_START=0x08000000 190CONFIG_MEMORY_START=0x08000000
185CONFIG_MEMORY_SIZE=0x08000000 191CONFIG_MEMORY_SIZE=0x08000000
186# CONFIG_29BIT is not set 192# CONFIG_29BIT is not set
@@ -199,7 +205,6 @@ CONFIG_PAGE_SIZE_4KB=y
199# CONFIG_PAGE_SIZE_8KB is not set 205# CONFIG_PAGE_SIZE_8KB is not set
200# CONFIG_PAGE_SIZE_16KB is not set 206# CONFIG_PAGE_SIZE_16KB is not set
201# CONFIG_PAGE_SIZE_64KB is not set 207# CONFIG_PAGE_SIZE_64KB is not set
202CONFIG_ENTRY_OFFSET=0x00001000
203CONFIG_HUGETLB_PAGE_SIZE_64K=y 208CONFIG_HUGETLB_PAGE_SIZE_64K=y
204# CONFIG_HUGETLB_PAGE_SIZE_256K is not set 209# CONFIG_HUGETLB_PAGE_SIZE_256K is not set
205# CONFIG_HUGETLB_PAGE_SIZE_1MB is not set 210# CONFIG_HUGETLB_PAGE_SIZE_1MB is not set
@@ -218,9 +223,9 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
218# CONFIG_PHYS_ADDR_T_64BIT is not set 223# CONFIG_PHYS_ADDR_T_64BIT is not set
219CONFIG_ZONE_DMA_FLAG=0 224CONFIG_ZONE_DMA_FLAG=0
220CONFIG_NR_QUICK=2 225CONFIG_NR_QUICK=2
221CONFIG_UNEVICTABLE_LRU=y
222CONFIG_HAVE_MLOCK=y 226CONFIG_HAVE_MLOCK=y
223CONFIG_HAVE_MLOCKED_PAGE_BIT=y 227CONFIG_HAVE_MLOCKED_PAGE_BIT=y
228CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
224 229
225# 230#
226# Cache configuration 231# Cache configuration
@@ -252,9 +257,10 @@ CONFIG_SH_SDK7780_BASE=y
252# 257#
253# Timer and clock configuration 258# Timer and clock configuration
254# 259#
255CONFIG_SH_TMU=y 260CONFIG_SH_TIMER_TMU=y
256CONFIG_SH_TIMER_IRQ=28
257CONFIG_SH_PCLK_FREQ=33333333 261CONFIG_SH_PCLK_FREQ=33333333
262CONFIG_SH_CLK_CPG=y
263CONFIG_SH_CLK_CPG_LEGACY=y
258CONFIG_TICK_ONESHOT=y 264CONFIG_TICK_ONESHOT=y
259# CONFIG_NO_HZ is not set 265# CONFIG_NO_HZ is not set
260CONFIG_HIGH_RES_TIMERS=y 266CONFIG_HIGH_RES_TIMERS=y
@@ -300,12 +306,14 @@ CONFIG_SCHED_HRTICK=y
300# CONFIG_PREEMPT_VOLUNTARY is not set 306# CONFIG_PREEMPT_VOLUNTARY is not set
301CONFIG_PREEMPT=y 307CONFIG_PREEMPT=y
302CONFIG_GUSA=y 308CONFIG_GUSA=y
309# CONFIG_SPARSE_IRQ is not set
303 310
304# 311#
305# Boot options 312# Boot options
306# 313#
307CONFIG_ZERO_PAGE_OFFSET=0x00001000 314CONFIG_ZERO_PAGE_OFFSET=0x00001000
308CONFIG_BOOT_LINK_OFFSET=0x01800000 315CONFIG_BOOT_LINK_OFFSET=0x01800000
316CONFIG_ENTRY_OFFSET=0x00001000
309CONFIG_CMDLINE_BOOL=y 317CONFIG_CMDLINE_BOOL=y
310CONFIG_CMDLINE="mem=128M console=tty0 console=ttySC0,115200 ip=bootp root=/dev/nfs nfsroot=192.168.0.1:/home/rootfs" 318CONFIG_CMDLINE="mem=128M console=tty0 console=ttySC0,115200 ip=bootp root=/dev/nfs nfsroot=192.168.0.1:/home/rootfs"
311 319
@@ -441,6 +449,7 @@ CONFIG_IPV6_NDISC_NODETYPE=y
441# CONFIG_ECONET is not set 449# CONFIG_ECONET is not set
442# CONFIG_WAN_ROUTER is not set 450# CONFIG_WAN_ROUTER is not set
443# CONFIG_PHONET is not set 451# CONFIG_PHONET is not set
452# CONFIG_IEEE802154 is not set
444CONFIG_NET_SCHED=y 453CONFIG_NET_SCHED=y
445 454
446# 455#
@@ -490,7 +499,11 @@ CONFIG_WIRELESS=y
490# CONFIG_WIRELESS_OLD_REGULATORY is not set 499# CONFIG_WIRELESS_OLD_REGULATORY is not set
491# CONFIG_WIRELESS_EXT is not set 500# CONFIG_WIRELESS_EXT is not set
492# CONFIG_LIB80211 is not set 501# CONFIG_LIB80211 is not set
493# CONFIG_MAC80211 is not set 502
503#
504# CFG80211 needs to be enabled for MAC80211
505#
506CONFIG_MAC80211_DEFAULT_PS_VALUE=0
494# CONFIG_WIMAX is not set 507# CONFIG_WIMAX is not set
495# CONFIG_RFKILL is not set 508# CONFIG_RFKILL is not set
496# CONFIG_NET_9P is not set 509# CONFIG_NET_9P is not set
@@ -613,10 +626,6 @@ CONFIG_BLK_DEV_SR=y
613# CONFIG_BLK_DEV_SR_VENDOR is not set 626# CONFIG_BLK_DEV_SR_VENDOR is not set
614CONFIG_CHR_DEV_SG=y 627CONFIG_CHR_DEV_SG=y
615# CONFIG_CHR_DEV_SCH is not set 628# CONFIG_CHR_DEV_SCH is not set
616
617#
618# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
619#
620# CONFIG_SCSI_MULTI_LUN is not set 629# CONFIG_SCSI_MULTI_LUN is not set
621# CONFIG_SCSI_CONSTANTS is not set 630# CONFIG_SCSI_CONSTANTS is not set
622# CONFIG_SCSI_LOGGING is not set 631# CONFIG_SCSI_LOGGING is not set
@@ -633,6 +642,7 @@ CONFIG_SCSI_FC_ATTRS=y
633# CONFIG_SCSI_SRP_ATTRS is not set 642# CONFIG_SCSI_SRP_ATTRS is not set
634CONFIG_SCSI_LOWLEVEL=y 643CONFIG_SCSI_LOWLEVEL=y
635# CONFIG_ISCSI_TCP is not set 644# CONFIG_ISCSI_TCP is not set
645# CONFIG_SCSI_BNX2_ISCSI is not set
636# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 646# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
637# CONFIG_SCSI_3W_9XXX is not set 647# CONFIG_SCSI_3W_9XXX is not set
638# CONFIG_SCSI_ACARD is not set 648# CONFIG_SCSI_ACARD is not set
@@ -641,6 +651,7 @@ CONFIG_SCSI_LOWLEVEL=y
641# CONFIG_SCSI_AIC7XXX_OLD is not set 651# CONFIG_SCSI_AIC7XXX_OLD is not set
642# CONFIG_SCSI_AIC79XX is not set 652# CONFIG_SCSI_AIC79XX is not set
643# CONFIG_SCSI_AIC94XX is not set 653# CONFIG_SCSI_AIC94XX is not set
654# CONFIG_SCSI_MVSAS is not set
644# CONFIG_SCSI_ARCMSR is not set 655# CONFIG_SCSI_ARCMSR is not set
645# CONFIG_MEGARAID_NEWGEN is not set 656# CONFIG_MEGARAID_NEWGEN is not set
646# CONFIG_MEGARAID_LEGACY is not set 657# CONFIG_MEGARAID_LEGACY is not set
@@ -655,7 +666,6 @@ CONFIG_SCSI_LOWLEVEL=y
655# CONFIG_SCSI_IPS is not set 666# CONFIG_SCSI_IPS is not set
656# CONFIG_SCSI_INITIO is not set 667# CONFIG_SCSI_INITIO is not set
657# CONFIG_SCSI_INIA100 is not set 668# CONFIG_SCSI_INIA100 is not set
658# CONFIG_SCSI_MVSAS is not set
659# CONFIG_SCSI_STEX is not set 669# CONFIG_SCSI_STEX is not set
660# CONFIG_SCSI_SYM53C8XX_2 is not set 670# CONFIG_SCSI_SYM53C8XX_2 is not set
661# CONFIG_SCSI_IPR is not set 671# CONFIG_SCSI_IPR is not set
@@ -756,7 +766,6 @@ CONFIG_BLK_DEV_DM=y
756# CONFIG_IEEE1394 is not set 766# CONFIG_IEEE1394 is not set
757# CONFIG_I2O is not set 767# CONFIG_I2O is not set
758CONFIG_NETDEVICES=y 768CONFIG_NETDEVICES=y
759CONFIG_COMPAT_NET_DEV_OPS=y
760# CONFIG_DUMMY is not set 769# CONFIG_DUMMY is not set
761# CONFIG_BONDING is not set 770# CONFIG_BONDING is not set
762# CONFIG_MACVLAN is not set 771# CONFIG_MACVLAN is not set
@@ -789,6 +798,7 @@ CONFIG_SMC91X=y
789# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set 798# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
790# CONFIG_NET_PCI is not set 799# CONFIG_NET_PCI is not set
791# CONFIG_B44 is not set 800# CONFIG_B44 is not set
801# CONFIG_KS8842 is not set
792# CONFIG_NET_POCKET is not set 802# CONFIG_NET_POCKET is not set
793# CONFIG_ATL2 is not set 803# CONFIG_ATL2 is not set
794# CONFIG_NETDEV_1000 is not set 804# CONFIG_NETDEV_1000 is not set
@@ -971,22 +981,7 @@ CONFIG_SSB_DRIVER_PCICORE=y
971# CONFIG_HTC_PASIC3 is not set 981# CONFIG_HTC_PASIC3 is not set
972# CONFIG_MFD_TMIO is not set 982# CONFIG_MFD_TMIO is not set
973# CONFIG_REGULATOR is not set 983# CONFIG_REGULATOR is not set
974 984# CONFIG_MEDIA_SUPPORT is not set
975#
976# Multimedia devices
977#
978
979#
980# Multimedia core support
981#
982# CONFIG_VIDEO_DEV is not set
983# CONFIG_DVB_CORE is not set
984# CONFIG_VIDEO_MEDIA is not set
985
986#
987# Multimedia drivers
988#
989# CONFIG_DAB is not set
990 985
991# 986#
992# Graphics support 987# Graphics support
@@ -1100,7 +1095,7 @@ CONFIG_HID_BELKIN=y
1100CONFIG_HID_CHERRY=y 1095CONFIG_HID_CHERRY=y
1101CONFIG_HID_CHICONY=y 1096CONFIG_HID_CHICONY=y
1102CONFIG_HID_CYPRESS=y 1097CONFIG_HID_CYPRESS=y
1103# CONFIG_DRAGONRISE_FF is not set 1098# CONFIG_HID_DRAGONRISE is not set
1104CONFIG_HID_EZKEY=y 1099CONFIG_HID_EZKEY=y
1105# CONFIG_HID_KYE is not set 1100# CONFIG_HID_KYE is not set
1106CONFIG_HID_GYRATION=y 1101CONFIG_HID_GYRATION=y
@@ -1117,10 +1112,11 @@ CONFIG_HID_PETALYNX=y
1117CONFIG_HID_SAMSUNG=y 1112CONFIG_HID_SAMSUNG=y
1118CONFIG_HID_SONY=y 1113CONFIG_HID_SONY=y
1119CONFIG_HID_SUNPLUS=y 1114CONFIG_HID_SUNPLUS=y
1120# CONFIG_GREENASIA_FF is not set 1115# CONFIG_HID_GREENASIA is not set
1116# CONFIG_HID_SMARTJOYPLUS is not set
1121# CONFIG_HID_TOPSEED is not set 1117# CONFIG_HID_TOPSEED is not set
1122CONFIG_THRUSTMASTER_FF=m 1118# CONFIG_HID_THRUSTMASTER is not set
1123CONFIG_ZEROPLUS_FF=m 1119# CONFIG_HID_ZEROPLUS is not set
1124CONFIG_USB_SUPPORT=y 1120CONFIG_USB_SUPPORT=y
1125CONFIG_USB_ARCH_HAS_HCD=y 1121CONFIG_USB_ARCH_HAS_HCD=y
1126CONFIG_USB_ARCH_HAS_OHCI=y 1122CONFIG_USB_ARCH_HAS_OHCI=y
@@ -1146,6 +1142,7 @@ CONFIG_USB_MON=y
1146# USB Host Controller Drivers 1142# USB Host Controller Drivers
1147# 1143#
1148# CONFIG_USB_C67X00_HCD is not set 1144# CONFIG_USB_C67X00_HCD is not set
1145# CONFIG_USB_XHCI_HCD is not set
1149CONFIG_USB_EHCI_HCD=y 1146CONFIG_USB_EHCI_HCD=y
1150# CONFIG_USB_EHCI_ROOT_HUB_TT is not set 1147# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
1151# CONFIG_USB_EHCI_TT_NEWSCHED is not set 1148# CONFIG_USB_EHCI_TT_NEWSCHED is not set
@@ -1247,10 +1244,15 @@ CONFIG_LEDS_CLASS=y
1247# CONFIG_LEDS_TRIGGERS is not set 1244# CONFIG_LEDS_TRIGGERS is not set
1248# CONFIG_ACCESSIBILITY is not set 1245# CONFIG_ACCESSIBILITY is not set
1249# CONFIG_INFINIBAND is not set 1246# CONFIG_INFINIBAND is not set
1247CONFIG_RTC_LIB=y
1250# CONFIG_RTC_CLASS is not set 1248# CONFIG_RTC_CLASS is not set
1251# CONFIG_DMADEVICES is not set 1249# CONFIG_DMADEVICES is not set
1252# CONFIG_AUXDISPLAY is not set 1250# CONFIG_AUXDISPLAY is not set
1253# CONFIG_UIO is not set 1251# CONFIG_UIO is not set
1252
1253#
1254# TI VLYNQ
1255#
1254# CONFIG_STAGING is not set 1256# CONFIG_STAGING is not set
1255 1257
1256# 1258#
@@ -1272,11 +1274,12 @@ CONFIG_FS_MBCACHE=y
1272# CONFIG_REISERFS_FS is not set 1274# CONFIG_REISERFS_FS is not set
1273# CONFIG_JFS_FS is not set 1275# CONFIG_JFS_FS is not set
1274CONFIG_FS_POSIX_ACL=y 1276CONFIG_FS_POSIX_ACL=y
1275CONFIG_FILE_LOCKING=y
1276# CONFIG_XFS_FS is not set 1277# CONFIG_XFS_FS is not set
1277# CONFIG_GFS2_FS is not set 1278# CONFIG_GFS2_FS is not set
1278# CONFIG_OCFS2_FS is not set 1279# CONFIG_OCFS2_FS is not set
1279# CONFIG_BTRFS_FS is not set 1280# CONFIG_BTRFS_FS is not set
1281CONFIG_FILE_LOCKING=y
1282CONFIG_FSNOTIFY=y
1280CONFIG_DNOTIFY=y 1283CONFIG_DNOTIFY=y
1281CONFIG_INOTIFY=y 1284CONFIG_INOTIFY=y
1282CONFIG_INOTIFY_USER=y 1285CONFIG_INOTIFY_USER=y
@@ -1471,18 +1474,16 @@ CONFIG_HAVE_FUNCTION_TRACER=y
1471CONFIG_HAVE_DYNAMIC_FTRACE=y 1474CONFIG_HAVE_DYNAMIC_FTRACE=y
1472CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 1475CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1473CONFIG_TRACING_SUPPORT=y 1476CONFIG_TRACING_SUPPORT=y
1474 1477CONFIG_FTRACE=y
1475#
1476# Tracers
1477#
1478# CONFIG_FUNCTION_TRACER is not set 1478# CONFIG_FUNCTION_TRACER is not set
1479# CONFIG_IRQSOFF_TRACER is not set 1479# CONFIG_IRQSOFF_TRACER is not set
1480# CONFIG_PREEMPT_TRACER is not set 1480# CONFIG_PREEMPT_TRACER is not set
1481# CONFIG_SCHED_TRACER is not set 1481# CONFIG_SCHED_TRACER is not set
1482# CONFIG_CONTEXT_SWITCH_TRACER is not set 1482# CONFIG_ENABLE_DEFAULT_TRACERS is not set
1483# CONFIG_EVENT_TRACER is not set
1484# CONFIG_BOOT_TRACER is not set 1483# CONFIG_BOOT_TRACER is not set
1485# CONFIG_TRACE_BRANCH_PROFILING is not set 1484CONFIG_BRANCH_PROFILE_NONE=y
1485# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
1486# CONFIG_PROFILE_ALL_BRANCHES is not set
1486# CONFIG_STACK_TRACER is not set 1487# CONFIG_STACK_TRACER is not set
1487# CONFIG_KMEMTRACE is not set 1488# CONFIG_KMEMTRACE is not set
1488# CONFIG_WORKQUEUE_TRACER is not set 1489# CONFIG_WORKQUEUE_TRACER is not set
@@ -1498,10 +1499,8 @@ CONFIG_SH_STANDARD_BIOS=y
1498CONFIG_DEBUG_STACKOVERFLOW=y 1499CONFIG_DEBUG_STACKOVERFLOW=y
1499# CONFIG_DEBUG_STACK_USAGE is not set 1500# CONFIG_DEBUG_STACK_USAGE is not set
1500# CONFIG_4KSTACKS is not set 1501# CONFIG_4KSTACKS is not set
1501# CONFIG_IRQSTACKS is not set
1502CONFIG_DUMP_CODE=y 1502CONFIG_DUMP_CODE=y
1503# CONFIG_SH_NO_BSS_INIT is not set 1503# CONFIG_SH_NO_BSS_INIT is not set
1504# CONFIG_MORE_COMPILE_OPTIONS is not set
1505 1504
1506# 1505#
1507# Security options 1506# Security options
@@ -1619,3 +1618,4 @@ CONFIG_HAS_IOMEM=y
1619CONFIG_HAS_IOPORT=y 1618CONFIG_HAS_IOPORT=y
1620CONFIG_HAS_DMA=y 1619CONFIG_HAS_DMA=y
1621CONFIG_NLATTR=y 1620CONFIG_NLATTR=y
1621CONFIG_GENERIC_ATOMIC64=y
diff --git a/arch/sh/configs/se7206_defconfig b/arch/sh/configs/se7206_defconfig
index 5caf85a3312d..8dd2f130e491 100644
--- a/arch/sh/configs/se7206_defconfig
+++ b/arch/sh/configs/se7206_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.30-rc3 3# Linux kernel version: 2.6.30
4# Mon Apr 27 13:01:02 2009 4# Thu Jun 18 12:46:15 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -15,11 +15,12 @@ CONFIG_GENERIC_HARDIRQS=y
15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
16CONFIG_GENERIC_IRQ_PROBE=y 16CONFIG_GENERIC_IRQ_PROBE=y
17# CONFIG_GENERIC_GPIO is not set 17# CONFIG_GENERIC_GPIO is not set
18# CONFIG_GENERIC_TIME is not set 18CONFIG_GENERIC_TIME=y
19# CONFIG_GENERIC_CLOCKEVENTS is not set 19CONFIG_GENERIC_CLOCKEVENTS=y
20# CONFIG_ARCH_SUSPEND_POSSIBLE is not set 20# CONFIG_ARCH_SUSPEND_POSSIBLE is not set
21# CONFIG_ARCH_HIBERNATION_POSSIBLE is not set 21# CONFIG_ARCH_HIBERNATION_POSSIBLE is not set
22CONFIG_SYS_SUPPORTS_CMT=y 22CONFIG_SYS_SUPPORTS_CMT=y
23CONFIG_SYS_SUPPORTS_MTU2=y
23CONFIG_STACKTRACE_SUPPORT=y 24CONFIG_STACKTRACE_SUPPORT=y
24CONFIG_LOCKDEP_SUPPORT=y 25CONFIG_LOCKDEP_SUPPORT=y
25CONFIG_HAVE_LATENCYTOP_SUPPORT=y 26CONFIG_HAVE_LATENCYTOP_SUPPORT=y
@@ -47,6 +48,7 @@ CONFIG_BSD_PROCESS_ACCT=y
47# CONFIG_TASKSTATS is not set 48# CONFIG_TASKSTATS is not set
48CONFIG_AUDIT=y 49CONFIG_AUDIT=y
49CONFIG_AUDITSYSCALL=y 50CONFIG_AUDITSYSCALL=y
51CONFIG_AUDIT_TREE=y
50 52
51# 53#
52# RCU Subsystem 54# RCU Subsystem
@@ -92,7 +94,6 @@ CONFIG_EMBEDDED=y
92CONFIG_KALLSYMS=y 94CONFIG_KALLSYMS=y
93CONFIG_KALLSYMS_ALL=y 95CONFIG_KALLSYMS_ALL=y
94# CONFIG_KALLSYMS_EXTRA_PASS is not set 96# CONFIG_KALLSYMS_EXTRA_PASS is not set
95# CONFIG_STRIP_ASM_SYMS is not set
96CONFIG_HOTPLUG=y 97CONFIG_HOTPLUG=y
97CONFIG_PRINTK=y 98CONFIG_PRINTK=y
98CONFIG_BUG=y 99CONFIG_BUG=y
@@ -104,14 +105,19 @@ CONFIG_SIGNALFD=y
104CONFIG_TIMERFD=y 105CONFIG_TIMERFD=y
105CONFIG_EVENTFD=y 106CONFIG_EVENTFD=y
106CONFIG_AIO=y 107CONFIG_AIO=y
108
109#
110# Performance Counters
111#
107CONFIG_VM_EVENT_COUNTERS=y 112CONFIG_VM_EVENT_COUNTERS=y
113# CONFIG_STRIP_ASM_SYMS is not set
108# CONFIG_COMPAT_BRK is not set 114# CONFIG_COMPAT_BRK is not set
109# CONFIG_SLAB is not set 115# CONFIG_SLAB is not set
110# CONFIG_SLUB is not set 116# CONFIG_SLUB is not set
111CONFIG_SLOB=y 117CONFIG_SLOB=y
112CONFIG_PROFILING=y 118CONFIG_PROFILING=y
113CONFIG_TRACEPOINTS=y 119CONFIG_TRACEPOINTS=y
114# CONFIG_MARKERS is not set 120CONFIG_MARKERS=y
115CONFIG_OPROFILE=y 121CONFIG_OPROFILE=y
116CONFIG_HAVE_OPROFILE=y 122CONFIG_HAVE_OPROFILE=y
117# CONFIG_KPROBES is not set 123# CONFIG_KPROBES is not set
@@ -194,6 +200,7 @@ CONFIG_CPU_SUBTYPE_SH7206=y
194# 200#
195CONFIG_QUICKLIST=y 201CONFIG_QUICKLIST=y
196CONFIG_PAGE_OFFSET=0x00000000 202CONFIG_PAGE_OFFSET=0x00000000
203CONFIG_FORCE_MAX_ZONEORDER=14
197CONFIG_MEMORY_START=0x0c000000 204CONFIG_MEMORY_START=0x0c000000
198CONFIG_MEMORY_SIZE=0x04000000 205CONFIG_MEMORY_SIZE=0x04000000
199CONFIG_29BIT=y 206CONFIG_29BIT=y
@@ -207,7 +214,6 @@ CONFIG_PAGE_SIZE_4KB=y
207# CONFIG_PAGE_SIZE_8KB is not set 214# CONFIG_PAGE_SIZE_8KB is not set
208# CONFIG_PAGE_SIZE_16KB is not set 215# CONFIG_PAGE_SIZE_16KB is not set
209# CONFIG_PAGE_SIZE_64KB is not set 216# CONFIG_PAGE_SIZE_64KB is not set
210CONFIG_ENTRY_OFFSET=0x00001000
211CONFIG_SELECT_MEMORY_MODEL=y 217CONFIG_SELECT_MEMORY_MODEL=y
212CONFIG_FLATMEM_MANUAL=y 218CONFIG_FLATMEM_MANUAL=y
213# CONFIG_DISCONTIGMEM_MANUAL is not set 219# CONFIG_DISCONTIGMEM_MANUAL is not set
@@ -220,7 +226,8 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
220# CONFIG_PHYS_ADDR_T_64BIT is not set 226# CONFIG_PHYS_ADDR_T_64BIT is not set
221CONFIG_ZONE_DMA_FLAG=0 227CONFIG_ZONE_DMA_FLAG=0
222CONFIG_NR_QUICK=2 228CONFIG_NR_QUICK=2
223CONFIG_UNEVICTABLE_LRU=y 229CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
230CONFIG_NOMMU_INITIAL_TRIM_EXCESS=1
224 231
225# 232#
226# Cache configuration 233# Cache configuration
@@ -245,11 +252,15 @@ CONFIG_SH_7206_SOLUTION_ENGINE=y
245# 252#
246# Timer and clock configuration 253# Timer and clock configuration
247# 254#
248CONFIG_SH_CMT=y 255CONFIG_SH_TIMER_CMT=y
249# CONFIG_SH_MTU2 is not set 256CONFIG_SH_TIMER_MTU2=y
250CONFIG_SH_TIMER_IRQ=140
251CONFIG_SH_PCLK_FREQ=33333333 257CONFIG_SH_PCLK_FREQ=33333333
258CONFIG_SH_CLK_CPG=y
259CONFIG_SH_CLK_CPG_LEGACY=y
252CONFIG_SH_CLK_MD=6 260CONFIG_SH_CLK_MD=6
261# CONFIG_NO_HZ is not set
262# CONFIG_HIGH_RES_TIMERS is not set
263CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
253 264
254# 265#
255# CPU Frequency scaling 266# CPU Frequency scaling
@@ -300,12 +311,14 @@ CONFIG_HZ=1000
300# CONFIG_PREEMPT_VOLUNTARY is not set 311# CONFIG_PREEMPT_VOLUNTARY is not set
301CONFIG_PREEMPT=y 312CONFIG_PREEMPT=y
302CONFIG_GUSA=y 313CONFIG_GUSA=y
314# CONFIG_SPARSE_IRQ is not set
303 315
304# 316#
305# Boot options 317# Boot options
306# 318#
307CONFIG_ZERO_PAGE_OFFSET=0x00001000 319CONFIG_ZERO_PAGE_OFFSET=0x00001000
308CONFIG_BOOT_LINK_OFFSET=0x00800000 320CONFIG_BOOT_LINK_OFFSET=0x00800000
321CONFIG_ENTRY_OFFSET=0x00001000
309CONFIG_CMDLINE_BOOL=y 322CONFIG_CMDLINE_BOOL=y
310CONFIG_CMDLINE="console=ttySC3,115200 ignore_loglevel earlyprintk=serial" 323CONFIG_CMDLINE="console=ttySC3,115200 ignore_loglevel earlyprintk=serial"
311 324
@@ -390,6 +403,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
390# CONFIG_ECONET is not set 403# CONFIG_ECONET is not set
391# CONFIG_WAN_ROUTER is not set 404# CONFIG_WAN_ROUTER is not set
392# CONFIG_PHONET is not set 405# CONFIG_PHONET is not set
406# CONFIG_IEEE802154 is not set
393# CONFIG_NET_SCHED is not set 407# CONFIG_NET_SCHED is not set
394# CONFIG_DCB is not set 408# CONFIG_DCB is not set
395 409
@@ -408,7 +422,11 @@ CONFIG_WIRELESS=y
408# CONFIG_WIRELESS_OLD_REGULATORY is not set 422# CONFIG_WIRELESS_OLD_REGULATORY is not set
409# CONFIG_WIRELESS_EXT is not set 423# CONFIG_WIRELESS_EXT is not set
410# CONFIG_LIB80211 is not set 424# CONFIG_LIB80211 is not set
411# CONFIG_MAC80211 is not set 425
426#
427# CFG80211 needs to be enabled for MAC80211
428#
429CONFIG_MAC80211_DEFAULT_PS_VALUE=0
412# CONFIG_WIMAX is not set 430# CONFIG_WIMAX is not set
413# CONFIG_RFKILL is not set 431# CONFIG_RFKILL is not set
414# CONFIG_NET_9P is not set 432# CONFIG_NET_9P is not set
@@ -543,7 +561,6 @@ CONFIG_HAVE_IDE=y
543# CONFIG_ATA is not set 561# CONFIG_ATA is not set
544# CONFIG_MD is not set 562# CONFIG_MD is not set
545CONFIG_NETDEVICES=y 563CONFIG_NETDEVICES=y
546CONFIG_COMPAT_NET_DEV_OPS=y
547# CONFIG_DUMMY is not set 564# CONFIG_DUMMY is not set
548# CONFIG_BONDING is not set 565# CONFIG_BONDING is not set
549# CONFIG_MACVLAN is not set 566# CONFIG_MACVLAN is not set
@@ -568,6 +585,7 @@ CONFIG_SMC91X=y
568# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set 585# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
569# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set 586# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
570# CONFIG_B44 is not set 587# CONFIG_B44 is not set
588# CONFIG_KS8842 is not set
571# CONFIG_NETDEV_1000 is not set 589# CONFIG_NETDEV_1000 is not set
572# CONFIG_NETDEV_10000 is not set 590# CONFIG_NETDEV_10000 is not set
573 591
@@ -650,22 +668,7 @@ CONFIG_SSB_POSSIBLE=y
650# CONFIG_HTC_PASIC3 is not set 668# CONFIG_HTC_PASIC3 is not set
651# CONFIG_MFD_TMIO is not set 669# CONFIG_MFD_TMIO is not set
652# CONFIG_REGULATOR is not set 670# CONFIG_REGULATOR is not set
653 671# CONFIG_MEDIA_SUPPORT is not set
654#
655# Multimedia devices
656#
657
658#
659# Multimedia core support
660#
661# CONFIG_VIDEO_DEV is not set
662# CONFIG_DVB_CORE is not set
663# CONFIG_VIDEO_MEDIA is not set
664
665#
666# Multimedia drivers
667#
668# CONFIG_DAB is not set
669 672
670# 673#
671# Graphics support 674# Graphics support
@@ -722,9 +725,14 @@ CONFIG_RTC_INTF_DEV=y
722# on-CPU RTC drivers 725# on-CPU RTC drivers
723# 726#
724CONFIG_RTC_DRV_SH=y 727CONFIG_RTC_DRV_SH=y
728# CONFIG_RTC_DRV_GENERIC is not set
725# CONFIG_DMADEVICES is not set 729# CONFIG_DMADEVICES is not set
726# CONFIG_AUXDISPLAY is not set 730# CONFIG_AUXDISPLAY is not set
727# CONFIG_UIO is not set 731# CONFIG_UIO is not set
732
733#
734# TI VLYNQ
735#
728# CONFIG_STAGING is not set 736# CONFIG_STAGING is not set
729 737
730# 738#
@@ -737,12 +745,14 @@ CONFIG_EXT2_FS=y
737# CONFIG_REISERFS_FS is not set 745# CONFIG_REISERFS_FS is not set
738# CONFIG_JFS_FS is not set 746# CONFIG_JFS_FS is not set
739# CONFIG_FS_POSIX_ACL is not set 747# CONFIG_FS_POSIX_ACL is not set
740CONFIG_FILE_LOCKING=y
741# CONFIG_XFS_FS is not set 748# CONFIG_XFS_FS is not set
742# CONFIG_OCFS2_FS is not set 749# CONFIG_OCFS2_FS is not set
743# CONFIG_BTRFS_FS is not set 750# CONFIG_BTRFS_FS is not set
751CONFIG_FILE_LOCKING=y
752CONFIG_FSNOTIFY=y
744# CONFIG_DNOTIFY is not set 753# CONFIG_DNOTIFY is not set
745# CONFIG_INOTIFY is not set 754CONFIG_INOTIFY=y
755CONFIG_INOTIFY_USER=y
746# CONFIG_QUOTA is not set 756# CONFIG_QUOTA is not set
747# CONFIG_AUTOFS_FS is not set 757# CONFIG_AUTOFS_FS is not set
748# CONFIG_AUTOFS4_FS is not set 758# CONFIG_AUTOFS4_FS is not set
@@ -884,23 +894,25 @@ CONFIG_HAVE_FUNCTION_TRACER=y
884CONFIG_HAVE_DYNAMIC_FTRACE=y 894CONFIG_HAVE_DYNAMIC_FTRACE=y
885CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 895CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
886CONFIG_RING_BUFFER=y 896CONFIG_RING_BUFFER=y
897CONFIG_EVENT_TRACING=y
898CONFIG_CONTEXT_SWITCH_TRACER=y
887CONFIG_TRACING=y 899CONFIG_TRACING=y
888CONFIG_TRACING_SUPPORT=y 900CONFIG_TRACING_SUPPORT=y
889 901CONFIG_FTRACE=y
890#
891# Tracers
892#
893# CONFIG_FUNCTION_TRACER is not set 902# CONFIG_FUNCTION_TRACER is not set
903# CONFIG_IRQSOFF_TRACER is not set
904# CONFIG_PREEMPT_TRACER is not set
894# CONFIG_SCHED_TRACER is not set 905# CONFIG_SCHED_TRACER is not set
895# CONFIG_CONTEXT_SWITCH_TRACER is not set 906# CONFIG_ENABLE_DEFAULT_TRACERS is not set
896# CONFIG_EVENT_TRACER is not set
897# CONFIG_BOOT_TRACER is not set 907# CONFIG_BOOT_TRACER is not set
898# CONFIG_TRACE_BRANCH_PROFILING is not set 908CONFIG_BRANCH_PROFILE_NONE=y
909# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
910# CONFIG_PROFILE_ALL_BRANCHES is not set
899# CONFIG_STACK_TRACER is not set 911# CONFIG_STACK_TRACER is not set
900# CONFIG_KMEMTRACE is not set 912# CONFIG_KMEMTRACE is not set
901# CONFIG_WORKQUEUE_TRACER is not set 913# CONFIG_WORKQUEUE_TRACER is not set
902# CONFIG_BLK_DEV_IO_TRACE is not set 914# CONFIG_BLK_DEV_IO_TRACE is not set
903# CONFIG_FTRACE_STARTUP_TEST is not set 915# CONFIG_RING_BUFFER_BENCHMARK is not set
904# CONFIG_DYNAMIC_DEBUG is not set 916# CONFIG_DYNAMIC_DEBUG is not set
905# CONFIG_DMA_API_DEBUG is not set 917# CONFIG_DMA_API_DEBUG is not set
906# CONFIG_SAMPLES is not set 918# CONFIG_SAMPLES is not set
@@ -911,10 +923,8 @@ CONFIG_HAVE_ARCH_KGDB=y
911# CONFIG_DEBUG_BOOTMEM is not set 923# CONFIG_DEBUG_BOOTMEM is not set
912CONFIG_DEBUG_STACKOVERFLOW=y 924CONFIG_DEBUG_STACKOVERFLOW=y
913CONFIG_DEBUG_STACK_USAGE=y 925CONFIG_DEBUG_STACK_USAGE=y
914# CONFIG_IRQSTACKS is not set
915CONFIG_DUMP_CODE=y 926CONFIG_DUMP_CODE=y
916# CONFIG_SH_NO_BSS_INIT is not set 927# CONFIG_SH_NO_BSS_INIT is not set
917# CONFIG_MORE_COMPILE_OPTIONS is not set
918 928
919# 929#
920# Security options 930# Security options
@@ -1037,3 +1047,4 @@ CONFIG_HAS_IOMEM=y
1037CONFIG_HAS_IOPORT=y 1047CONFIG_HAS_IOPORT=y
1038CONFIG_HAS_DMA=y 1048CONFIG_HAS_DMA=y
1039CONFIG_NLATTR=y 1049CONFIG_NLATTR=y
1050CONFIG_GENERIC_ATOMIC64=y
diff --git a/arch/sh/configs/se7343_defconfig b/arch/sh/configs/se7343_defconfig
index 004d531716dc..18f46debf92a 100644
--- a/arch/sh/configs/se7343_defconfig
+++ b/arch/sh/configs/se7343_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.30-rc3 3# Linux kernel version: 2.6.30
4# Mon Apr 27 13:01:44 2009 4# Thu Jun 18 12:47:07 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -20,6 +20,7 @@ CONFIG_GENERIC_CLOCKEVENTS=y
20CONFIG_ARCH_SUSPEND_POSSIBLE=y 20CONFIG_ARCH_SUSPEND_POSSIBLE=y
21CONFIG_ARCH_HIBERNATION_POSSIBLE=y 21CONFIG_ARCH_HIBERNATION_POSSIBLE=y
22CONFIG_SYS_SUPPORTS_CMT=y 22CONFIG_SYS_SUPPORTS_CMT=y
23CONFIG_SYS_SUPPORTS_TMU=y
23CONFIG_STACKTRACE_SUPPORT=y 24CONFIG_STACKTRACE_SUPPORT=y
24CONFIG_LOCKDEP_SUPPORT=y 25CONFIG_LOCKDEP_SUPPORT=y
25CONFIG_HAVE_LATENCYTOP_SUPPORT=y 26CONFIG_HAVE_LATENCYTOP_SUPPORT=y
@@ -75,7 +76,6 @@ CONFIG_UID16=y
75# CONFIG_SYSCTL_SYSCALL is not set 76# CONFIG_SYSCTL_SYSCALL is not set
76CONFIG_KALLSYMS=y 77CONFIG_KALLSYMS=y
77# CONFIG_KALLSYMS_EXTRA_PASS is not set 78# CONFIG_KALLSYMS_EXTRA_PASS is not set
78# CONFIG_STRIP_ASM_SYMS is not set
79CONFIG_HOTPLUG=y 79CONFIG_HOTPLUG=y
80CONFIG_PRINTK=y 80CONFIG_PRINTK=y
81CONFIG_BUG=y 81CONFIG_BUG=y
@@ -88,7 +88,12 @@ CONFIG_TIMERFD=y
88CONFIG_EVENTFD=y 88CONFIG_EVENTFD=y
89# CONFIG_SHMEM is not set 89# CONFIG_SHMEM is not set
90CONFIG_AIO=y 90CONFIG_AIO=y
91
92#
93# Performance Counters
94#
91CONFIG_VM_EVENT_COUNTERS=y 95CONFIG_VM_EVENT_COUNTERS=y
96# CONFIG_STRIP_ASM_SYMS is not set
92CONFIG_COMPAT_BRK=y 97CONFIG_COMPAT_BRK=y
93CONFIG_SLAB=y 98CONFIG_SLAB=y
94# CONFIG_SLUB is not set 99# CONFIG_SLUB is not set
@@ -180,6 +185,7 @@ CONFIG_CPU_SUBTYPE_SH7343=y
180CONFIG_QUICKLIST=y 185CONFIG_QUICKLIST=y
181CONFIG_MMU=y 186CONFIG_MMU=y
182CONFIG_PAGE_OFFSET=0x80000000 187CONFIG_PAGE_OFFSET=0x80000000
188CONFIG_FORCE_MAX_ZONEORDER=11
183CONFIG_MEMORY_START=0x0c000000 189CONFIG_MEMORY_START=0x0c000000
184CONFIG_MEMORY_SIZE=0x01000000 190CONFIG_MEMORY_SIZE=0x01000000
185CONFIG_29BIT=y 191CONFIG_29BIT=y
@@ -194,7 +200,6 @@ CONFIG_PAGE_SIZE_4KB=y
194# CONFIG_PAGE_SIZE_8KB is not set 200# CONFIG_PAGE_SIZE_8KB is not set
195# CONFIG_PAGE_SIZE_16KB is not set 201# CONFIG_PAGE_SIZE_16KB is not set
196# CONFIG_PAGE_SIZE_64KB is not set 202# CONFIG_PAGE_SIZE_64KB is not set
197CONFIG_ENTRY_OFFSET=0x00001000
198CONFIG_SELECT_MEMORY_MODEL=y 203CONFIG_SELECT_MEMORY_MODEL=y
199CONFIG_FLATMEM_MANUAL=y 204CONFIG_FLATMEM_MANUAL=y
200# CONFIG_DISCONTIGMEM_MANUAL is not set 205# CONFIG_DISCONTIGMEM_MANUAL is not set
@@ -207,9 +212,9 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
207# CONFIG_PHYS_ADDR_T_64BIT is not set 212# CONFIG_PHYS_ADDR_T_64BIT is not set
208CONFIG_ZONE_DMA_FLAG=0 213CONFIG_ZONE_DMA_FLAG=0
209CONFIG_NR_QUICK=2 214CONFIG_NR_QUICK=2
210CONFIG_UNEVICTABLE_LRU=y
211CONFIG_HAVE_MLOCK=y 215CONFIG_HAVE_MLOCK=y
212CONFIG_HAVE_MLOCKED_PAGE_BIT=y 216CONFIG_HAVE_MLOCKED_PAGE_BIT=y
217CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
213 218
214# 219#
215# Cache configuration 220# Cache configuration
@@ -239,10 +244,10 @@ CONFIG_SH_7343_SOLUTION_ENGINE=y
239# 244#
240# Timer and clock configuration 245# Timer and clock configuration
241# 246#
242CONFIG_SH_TMU=y 247CONFIG_SH_TIMER_TMU=y
243# CONFIG_SH_TIMER_CMT is not set 248# CONFIG_SH_TIMER_CMT is not set
244CONFIG_SH_TIMER_IRQ=16
245CONFIG_SH_PCLK_FREQ=33333333 249CONFIG_SH_PCLK_FREQ=33333333
250CONFIG_SH_CLK_CPG=y
246# CONFIG_NO_HZ is not set 251# CONFIG_NO_HZ is not set
247# CONFIG_HIGH_RES_TIMERS is not set 252# CONFIG_HIGH_RES_TIMERS is not set
248CONFIG_GENERIC_CLOCKEVENTS_BUILD=y 253CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
@@ -283,12 +288,14 @@ CONFIG_PREEMPT_NONE=y
283# CONFIG_PREEMPT_VOLUNTARY is not set 288# CONFIG_PREEMPT_VOLUNTARY is not set
284# CONFIG_PREEMPT is not set 289# CONFIG_PREEMPT is not set
285CONFIG_GUSA=y 290CONFIG_GUSA=y
291# CONFIG_SPARSE_IRQ is not set
286 292
287# 293#
288# Boot options 294# Boot options
289# 295#
290CONFIG_ZERO_PAGE_OFFSET=0x00001000 296CONFIG_ZERO_PAGE_OFFSET=0x00001000
291CONFIG_BOOT_LINK_OFFSET=0x00800000 297CONFIG_BOOT_LINK_OFFSET=0x00800000
298CONFIG_ENTRY_OFFSET=0x00001000
292CONFIG_CMDLINE_BOOL=y 299CONFIG_CMDLINE_BOOL=y
293CONFIG_CMDLINE="console=ttySC0,115200" 300CONFIG_CMDLINE="console=ttySC0,115200"
294 301
@@ -367,6 +374,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
367# CONFIG_ECONET is not set 374# CONFIG_ECONET is not set
368# CONFIG_WAN_ROUTER is not set 375# CONFIG_WAN_ROUTER is not set
369# CONFIG_PHONET is not set 376# CONFIG_PHONET is not set
377# CONFIG_IEEE802154 is not set
370# CONFIG_NET_SCHED is not set 378# CONFIG_NET_SCHED is not set
371# CONFIG_DCB is not set 379# CONFIG_DCB is not set
372 380
@@ -384,7 +392,11 @@ CONFIG_WIRELESS=y
384# CONFIG_WIRELESS_OLD_REGULATORY is not set 392# CONFIG_WIRELESS_OLD_REGULATORY is not set
385# CONFIG_WIRELESS_EXT is not set 393# CONFIG_WIRELESS_EXT is not set
386# CONFIG_LIB80211 is not set 394# CONFIG_LIB80211 is not set
387# CONFIG_MAC80211 is not set 395
396#
397# CFG80211 needs to be enabled for MAC80211
398#
399CONFIG_MAC80211_DEFAULT_PS_VALUE=0
388# CONFIG_WIMAX is not set 400# CONFIG_WIMAX is not set
389# CONFIG_RFKILL is not set 401# CONFIG_RFKILL is not set
390# CONFIG_NET_9P is not set 402# CONFIG_NET_9P is not set
@@ -518,10 +530,6 @@ CONFIG_SCSI_PROC_FS=y
518# CONFIG_BLK_DEV_SR is not set 530# CONFIG_BLK_DEV_SR is not set
519# CONFIG_CHR_DEV_SG is not set 531# CONFIG_CHR_DEV_SG is not set
520# CONFIG_CHR_DEV_SCH is not set 532# CONFIG_CHR_DEV_SCH is not set
521
522#
523# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
524#
525CONFIG_SCSI_MULTI_LUN=y 533CONFIG_SCSI_MULTI_LUN=y
526# CONFIG_SCSI_CONSTANTS is not set 534# CONFIG_SCSI_CONSTANTS is not set
527# CONFIG_SCSI_LOGGING is not set 535# CONFIG_SCSI_LOGGING is not set
@@ -542,7 +550,6 @@ CONFIG_SCSI_WAIT_SCAN=m
542# CONFIG_ATA is not set 550# CONFIG_ATA is not set
543# CONFIG_MD is not set 551# CONFIG_MD is not set
544CONFIG_NETDEVICES=y 552CONFIG_NETDEVICES=y
545CONFIG_COMPAT_NET_DEV_OPS=y
546# CONFIG_DUMMY is not set 553# CONFIG_DUMMY is not set
547# CONFIG_BONDING is not set 554# CONFIG_BONDING is not set
548# CONFIG_MACVLAN is not set 555# CONFIG_MACVLAN is not set
@@ -574,6 +581,7 @@ CONFIG_MII=y
574CONFIG_USB_USBNET=y 581CONFIG_USB_USBNET=y
575# CONFIG_USB_NET_AX8817X is not set 582# CONFIG_USB_NET_AX8817X is not set
576CONFIG_USB_NET_CDCETHER=y 583CONFIG_USB_NET_CDCETHER=y
584# CONFIG_USB_NET_CDC_EEM is not set
577CONFIG_USB_NET_DM9601=y 585CONFIG_USB_NET_DM9601=y
578# CONFIG_USB_NET_SMSC95XX is not set 586# CONFIG_USB_NET_SMSC95XX is not set
579# CONFIG_USB_NET_GL620A is not set 587# CONFIG_USB_NET_GL620A is not set
@@ -583,6 +591,7 @@ CONFIG_USB_NET_DM9601=y
583# CONFIG_USB_NET_RNDIS_HOST is not set 591# CONFIG_USB_NET_RNDIS_HOST is not set
584# CONFIG_USB_NET_CDC_SUBSET is not set 592# CONFIG_USB_NET_CDC_SUBSET is not set
585# CONFIG_USB_NET_ZAURUS is not set 593# CONFIG_USB_NET_ZAURUS is not set
594# CONFIG_USB_NET_INT51X1 is not set
586# CONFIG_WAN is not set 595# CONFIG_WAN is not set
587# CONFIG_PPP is not set 596# CONFIG_PPP is not set
588# CONFIG_SLIP is not set 597# CONFIG_SLIP is not set
@@ -696,7 +705,6 @@ CONFIG_I2C_SH_MOBILE=y
696# CONFIG_SENSORS_PCF8574 is not set 705# CONFIG_SENSORS_PCF8574 is not set
697# CONFIG_PCF8575 is not set 706# CONFIG_PCF8575 is not set
698# CONFIG_SENSORS_PCA9539 is not set 707# CONFIG_SENSORS_PCA9539 is not set
699# CONFIG_SENSORS_MAX6875 is not set
700# CONFIG_SENSORS_TSL2550 is not set 708# CONFIG_SENSORS_TSL2550 is not set
701# CONFIG_I2C_DEBUG_CORE is not set 709# CONFIG_I2C_DEBUG_CORE is not set
702# CONFIG_I2C_DEBUG_ALGO is not set 710# CONFIG_I2C_DEBUG_ALGO is not set
@@ -729,106 +737,7 @@ CONFIG_SSB_POSSIBLE=y
729# CONFIG_MFD_WM8350_I2C is not set 737# CONFIG_MFD_WM8350_I2C is not set
730# CONFIG_MFD_PCF50633 is not set 738# CONFIG_MFD_PCF50633 is not set
731# CONFIG_REGULATOR is not set 739# CONFIG_REGULATOR is not set
732 740# CONFIG_MEDIA_SUPPORT is not set
733#
734# Multimedia devices
735#
736
737#
738# Multimedia core support
739#
740CONFIG_VIDEO_DEV=y
741CONFIG_VIDEO_V4L2_COMMON=y
742CONFIG_VIDEO_ALLOW_V4L1=y
743CONFIG_VIDEO_V4L1_COMPAT=y
744# CONFIG_DVB_CORE is not set
745CONFIG_VIDEO_MEDIA=y
746
747#
748# Multimedia drivers
749#
750# CONFIG_MEDIA_ATTACH is not set
751CONFIG_MEDIA_TUNER=y
752# CONFIG_MEDIA_TUNER_CUSTOMISE is not set
753CONFIG_MEDIA_TUNER_SIMPLE=y
754CONFIG_MEDIA_TUNER_TDA8290=y
755CONFIG_MEDIA_TUNER_TDA9887=y
756CONFIG_MEDIA_TUNER_TEA5761=y
757CONFIG_MEDIA_TUNER_TEA5767=y
758CONFIG_MEDIA_TUNER_MT20XX=y
759CONFIG_MEDIA_TUNER_XC2028=y
760CONFIG_MEDIA_TUNER_XC5000=y
761CONFIG_MEDIA_TUNER_MC44S803=y
762CONFIG_VIDEO_V4L2=y
763CONFIG_VIDEO_V4L1=y
764CONFIG_VIDEO_CAPTURE_DRIVERS=y
765# CONFIG_VIDEO_ADV_DEBUG is not set
766# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
767CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
768# CONFIG_VIDEO_VIVI is not set
769# CONFIG_VIDEO_CPIA is not set
770# CONFIG_VIDEO_CPIA2 is not set
771# CONFIG_VIDEO_SAA5246A is not set
772# CONFIG_VIDEO_SAA5249 is not set
773# CONFIG_SOC_CAMERA is not set
774CONFIG_V4L_USB_DRIVERS=y
775# CONFIG_USB_VIDEO_CLASS is not set
776CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
777CONFIG_USB_GSPCA=m
778# CONFIG_USB_M5602 is not set
779# CONFIG_USB_STV06XX is not set
780# CONFIG_USB_GSPCA_CONEX is not set
781# CONFIG_USB_GSPCA_ETOMS is not set
782# CONFIG_USB_GSPCA_FINEPIX is not set
783# CONFIG_USB_GSPCA_MARS is not set
784# CONFIG_USB_GSPCA_MR97310A is not set
785# CONFIG_USB_GSPCA_OV519 is not set
786# CONFIG_USB_GSPCA_OV534 is not set
787# CONFIG_USB_GSPCA_PAC207 is not set
788# CONFIG_USB_GSPCA_PAC7311 is not set
789# CONFIG_USB_GSPCA_SONIXB is not set
790# CONFIG_USB_GSPCA_SONIXJ is not set
791# CONFIG_USB_GSPCA_SPCA500 is not set
792# CONFIG_USB_GSPCA_SPCA501 is not set
793# CONFIG_USB_GSPCA_SPCA505 is not set
794# CONFIG_USB_GSPCA_SPCA506 is not set
795# CONFIG_USB_GSPCA_SPCA508 is not set
796# CONFIG_USB_GSPCA_SPCA561 is not set
797# CONFIG_USB_GSPCA_SQ905 is not set
798# CONFIG_USB_GSPCA_SQ905C is not set
799# CONFIG_USB_GSPCA_STK014 is not set
800# CONFIG_USB_GSPCA_SUNPLUS is not set
801# CONFIG_USB_GSPCA_T613 is not set
802# CONFIG_USB_GSPCA_TV8532 is not set
803# CONFIG_USB_GSPCA_VC032X is not set
804# CONFIG_USB_GSPCA_ZC3XX is not set
805# CONFIG_VIDEO_PVRUSB2 is not set
806# CONFIG_VIDEO_HDPVR is not set
807# CONFIG_VIDEO_EM28XX is not set
808# CONFIG_VIDEO_CX231XX is not set
809# CONFIG_VIDEO_USBVISION is not set
810# CONFIG_USB_VICAM is not set
811# CONFIG_USB_IBMCAM is not set
812# CONFIG_USB_KONICAWC is not set
813# CONFIG_USB_QUICKCAM_MESSENGER is not set
814# CONFIG_USB_ET61X251 is not set
815# CONFIG_VIDEO_OVCAMCHIP is not set
816# CONFIG_USB_OV511 is not set
817# CONFIG_USB_SE401 is not set
818# CONFIG_USB_SN9C102 is not set
819# CONFIG_USB_STV680 is not set
820# CONFIG_USB_ZC0301 is not set
821# CONFIG_USB_PWC is not set
822CONFIG_USB_PWC_INPUT_EVDEV=y
823# CONFIG_USB_ZR364XX is not set
824# CONFIG_USB_STKWEBCAM is not set
825# CONFIG_USB_S2255 is not set
826CONFIG_RADIO_ADAPTERS=y
827# CONFIG_USB_DSBR is not set
828# CONFIG_USB_SI470X is not set
829# CONFIG_USB_MR800 is not set
830# CONFIG_RADIO_TEA5764 is not set
831# CONFIG_DAB is not set
832 741
833# 742#
834# Graphics support 743# Graphics support
@@ -894,6 +803,11 @@ CONFIG_SND_SUPPORT_OLD_API=y
894CONFIG_SND_VERBOSE_PROCFS=y 803CONFIG_SND_VERBOSE_PROCFS=y
895# CONFIG_SND_VERBOSE_PRINTK is not set 804# CONFIG_SND_VERBOSE_PRINTK is not set
896# CONFIG_SND_DEBUG is not set 805# CONFIG_SND_DEBUG is not set
806# CONFIG_SND_RAWMIDI_SEQ is not set
807# CONFIG_SND_OPL3_LIB_SEQ is not set
808# CONFIG_SND_OPL4_LIB_SEQ is not set
809# CONFIG_SND_SBAWE_SEQ is not set
810# CONFIG_SND_EMU10K1_SEQ is not set
897CONFIG_SND_DRIVERS=y 811CONFIG_SND_DRIVERS=y
898# CONFIG_SND_DUMMY is not set 812# CONFIG_SND_DUMMY is not set
899# CONFIG_SND_VIRMIDI is not set 813# CONFIG_SND_VIRMIDI is not set
@@ -927,7 +841,7 @@ CONFIG_HID_BELKIN=y
927CONFIG_HID_CHERRY=y 841CONFIG_HID_CHERRY=y
928CONFIG_HID_CHICONY=y 842CONFIG_HID_CHICONY=y
929CONFIG_HID_CYPRESS=y 843CONFIG_HID_CYPRESS=y
930# CONFIG_DRAGONRISE_FF is not set 844# CONFIG_HID_DRAGONRISE is not set
931CONFIG_HID_EZKEY=y 845CONFIG_HID_EZKEY=y
932# CONFIG_HID_KYE is not set 846# CONFIG_HID_KYE is not set
933CONFIG_HID_GYRATION=y 847CONFIG_HID_GYRATION=y
@@ -944,10 +858,11 @@ CONFIG_HID_PETALYNX=y
944CONFIG_HID_SAMSUNG=y 858CONFIG_HID_SAMSUNG=y
945CONFIG_HID_SONY=y 859CONFIG_HID_SONY=y
946CONFIG_HID_SUNPLUS=y 860CONFIG_HID_SUNPLUS=y
947# CONFIG_GREENASIA_FF is not set 861# CONFIG_HID_GREENASIA is not set
862# CONFIG_HID_SMARTJOYPLUS is not set
948# CONFIG_HID_TOPSEED is not set 863# CONFIG_HID_TOPSEED is not set
949# CONFIG_THRUSTMASTER_FF is not set 864# CONFIG_HID_THRUSTMASTER is not set
950# CONFIG_ZEROPLUS_FF is not set 865# CONFIG_HID_ZEROPLUS is not set
951CONFIG_USB_SUPPORT=y 866CONFIG_USB_SUPPORT=y
952CONFIG_USB_ARCH_HAS_HCD=y 867CONFIG_USB_ARCH_HAS_HCD=y
953# CONFIG_USB_ARCH_HAS_OHCI is not set 868# CONFIG_USB_ARCH_HAS_OHCI is not set
@@ -1042,6 +957,7 @@ CONFIG_USB_ISP116X_HCD=y
1042# CONFIG_MEMSTICK is not set 957# CONFIG_MEMSTICK is not set
1043# CONFIG_NEW_LEDS is not set 958# CONFIG_NEW_LEDS is not set
1044# CONFIG_ACCESSIBILITY is not set 959# CONFIG_ACCESSIBILITY is not set
960CONFIG_RTC_LIB=y
1045# CONFIG_RTC_CLASS is not set 961# CONFIG_RTC_CLASS is not set
1046# CONFIG_DMADEVICES is not set 962# CONFIG_DMADEVICES is not set
1047# CONFIG_AUXDISPLAY is not set 963# CONFIG_AUXDISPLAY is not set
@@ -1050,6 +966,10 @@ CONFIG_UIO=y
1050# CONFIG_UIO_PDRV_GENIRQ is not set 966# CONFIG_UIO_PDRV_GENIRQ is not set
1051# CONFIG_UIO_SMX is not set 967# CONFIG_UIO_SMX is not set
1052# CONFIG_UIO_SERCOS3 is not set 968# CONFIG_UIO_SERCOS3 is not set
969
970#
971# TI VLYNQ
972#
1053# CONFIG_STAGING is not set 973# CONFIG_STAGING is not set
1054 974
1055# 975#
@@ -1069,12 +989,14 @@ CONFIG_FS_MBCACHE=y
1069# CONFIG_REISERFS_FS is not set 989# CONFIG_REISERFS_FS is not set
1070# CONFIG_JFS_FS is not set 990# CONFIG_JFS_FS is not set
1071# CONFIG_FS_POSIX_ACL is not set 991# CONFIG_FS_POSIX_ACL is not set
1072CONFIG_FILE_LOCKING=y
1073# CONFIG_XFS_FS is not set 992# CONFIG_XFS_FS is not set
1074# CONFIG_OCFS2_FS is not set 993# CONFIG_OCFS2_FS is not set
1075# CONFIG_BTRFS_FS is not set 994# CONFIG_BTRFS_FS is not set
995CONFIG_FILE_LOCKING=y
996CONFIG_FSNOTIFY=y
1076# CONFIG_DNOTIFY is not set 997# CONFIG_DNOTIFY is not set
1077# CONFIG_INOTIFY is not set 998# CONFIG_INOTIFY is not set
999CONFIG_INOTIFY_USER=y
1078# CONFIG_QUOTA is not set 1000# CONFIG_QUOTA is not set
1079# CONFIG_AUTOFS_FS is not set 1001# CONFIG_AUTOFS_FS is not set
1080# CONFIG_AUTOFS4_FS is not set 1002# CONFIG_AUTOFS4_FS is not set
@@ -1167,7 +1089,46 @@ CONFIG_SUNRPC=y
1167# 1089#
1168# CONFIG_PARTITION_ADVANCED is not set 1090# CONFIG_PARTITION_ADVANCED is not set
1169CONFIG_MSDOS_PARTITION=y 1091CONFIG_MSDOS_PARTITION=y
1170# CONFIG_NLS is not set 1092CONFIG_NLS=y
1093CONFIG_NLS_DEFAULT="iso8859-1"
1094# CONFIG_NLS_CODEPAGE_437 is not set
1095# CONFIG_NLS_CODEPAGE_737 is not set
1096# CONFIG_NLS_CODEPAGE_775 is not set
1097# CONFIG_NLS_CODEPAGE_850 is not set
1098# CONFIG_NLS_CODEPAGE_852 is not set
1099# CONFIG_NLS_CODEPAGE_855 is not set
1100# CONFIG_NLS_CODEPAGE_857 is not set
1101# CONFIG_NLS_CODEPAGE_860 is not set
1102# CONFIG_NLS_CODEPAGE_861 is not set
1103# CONFIG_NLS_CODEPAGE_862 is not set
1104# CONFIG_NLS_CODEPAGE_863 is not set
1105# CONFIG_NLS_CODEPAGE_864 is not set
1106# CONFIG_NLS_CODEPAGE_865 is not set
1107# CONFIG_NLS_CODEPAGE_866 is not set
1108# CONFIG_NLS_CODEPAGE_869 is not set
1109# CONFIG_NLS_CODEPAGE_936 is not set
1110# CONFIG_NLS_CODEPAGE_950 is not set
1111# CONFIG_NLS_CODEPAGE_932 is not set
1112# CONFIG_NLS_CODEPAGE_949 is not set
1113# CONFIG_NLS_CODEPAGE_874 is not set
1114# CONFIG_NLS_ISO8859_8 is not set
1115# CONFIG_NLS_CODEPAGE_1250 is not set
1116# CONFIG_NLS_CODEPAGE_1251 is not set
1117# CONFIG_NLS_ASCII is not set
1118# CONFIG_NLS_ISO8859_1 is not set
1119# CONFIG_NLS_ISO8859_2 is not set
1120# CONFIG_NLS_ISO8859_3 is not set
1121# CONFIG_NLS_ISO8859_4 is not set
1122# CONFIG_NLS_ISO8859_5 is not set
1123# CONFIG_NLS_ISO8859_6 is not set
1124# CONFIG_NLS_ISO8859_7 is not set
1125# CONFIG_NLS_ISO8859_9 is not set
1126# CONFIG_NLS_ISO8859_13 is not set
1127# CONFIG_NLS_ISO8859_14 is not set
1128# CONFIG_NLS_ISO8859_15 is not set
1129# CONFIG_NLS_KOI8_R is not set
1130# CONFIG_NLS_KOI8_U is not set
1131# CONFIG_NLS_UTF8 is not set
1171# CONFIG_DLM is not set 1132# CONFIG_DLM is not set
1172 1133
1173# 1134#
@@ -1191,21 +1152,7 @@ CONFIG_HAVE_FUNCTION_TRACER=y
1191CONFIG_HAVE_DYNAMIC_FTRACE=y 1152CONFIG_HAVE_DYNAMIC_FTRACE=y
1192CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 1153CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1193CONFIG_TRACING_SUPPORT=y 1154CONFIG_TRACING_SUPPORT=y
1194 1155# CONFIG_FTRACE is not set
1195#
1196# Tracers
1197#
1198# CONFIG_FUNCTION_TRACER is not set
1199# CONFIG_IRQSOFF_TRACER is not set
1200# CONFIG_SCHED_TRACER is not set
1201# CONFIG_CONTEXT_SWITCH_TRACER is not set
1202# CONFIG_EVENT_TRACER is not set
1203# CONFIG_BOOT_TRACER is not set
1204# CONFIG_TRACE_BRANCH_PROFILING is not set
1205# CONFIG_STACK_TRACER is not set
1206# CONFIG_KMEMTRACE is not set
1207# CONFIG_WORKQUEUE_TRACER is not set
1208# CONFIG_BLK_DEV_IO_TRACE is not set
1209# CONFIG_DMA_API_DEBUG is not set 1156# CONFIG_DMA_API_DEBUG is not set
1210# CONFIG_SAMPLES is not set 1157# CONFIG_SAMPLES is not set
1211CONFIG_HAVE_ARCH_KGDB=y 1158CONFIG_HAVE_ARCH_KGDB=y
@@ -1213,7 +1160,6 @@ CONFIG_HAVE_ARCH_KGDB=y
1213CONFIG_EARLY_SCIF_CONSOLE=y 1160CONFIG_EARLY_SCIF_CONSOLE=y
1214CONFIG_EARLY_SCIF_CONSOLE_PORT=0xffe00000 1161CONFIG_EARLY_SCIF_CONSOLE_PORT=0xffe00000
1215CONFIG_EARLY_PRINTK=y 1162CONFIG_EARLY_PRINTK=y
1216# CONFIG_MORE_COMPILE_OPTIONS is not set
1217 1163
1218# 1164#
1219# Security options 1165# Security options
@@ -1328,3 +1274,4 @@ CONFIG_HAS_IOMEM=y
1328CONFIG_HAS_IOPORT=y 1274CONFIG_HAS_IOPORT=y
1329CONFIG_HAS_DMA=y 1275CONFIG_HAS_DMA=y
1330CONFIG_NLATTR=y 1276CONFIG_NLATTR=y
1277CONFIG_GENERIC_ATOMIC64=y
diff --git a/arch/sh/configs/se7619_defconfig b/arch/sh/configs/se7619_defconfig
index edbece52afc1..724bb77c9dc9 100644
--- a/arch/sh/configs/se7619_defconfig
+++ b/arch/sh/configs/se7619_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.30-rc3 3# Linux kernel version: 2.6.30
4# Mon Apr 27 13:02:32 2009 4# Thu Jun 18 12:47:56 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -15,8 +15,8 @@ CONFIG_GENERIC_HARDIRQS=y
15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y 15CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
16CONFIG_GENERIC_IRQ_PROBE=y 16CONFIG_GENERIC_IRQ_PROBE=y
17# CONFIG_GENERIC_GPIO is not set 17# CONFIG_GENERIC_GPIO is not set
18# CONFIG_GENERIC_TIME is not set 18CONFIG_GENERIC_TIME=y
19# CONFIG_GENERIC_CLOCKEVENTS is not set 19CONFIG_GENERIC_CLOCKEVENTS=y
20# CONFIG_ARCH_SUSPEND_POSSIBLE is not set 20# CONFIG_ARCH_SUSPEND_POSSIBLE is not set
21# CONFIG_ARCH_HIBERNATION_POSSIBLE is not set 21# CONFIG_ARCH_HIBERNATION_POSSIBLE is not set
22CONFIG_SYS_SUPPORTS_CMT=y 22CONFIG_SYS_SUPPORTS_CMT=y
@@ -62,7 +62,6 @@ CONFIG_EMBEDDED=y
62# CONFIG_UID16 is not set 62# CONFIG_UID16 is not set
63# CONFIG_SYSCTL_SYSCALL is not set 63# CONFIG_SYSCTL_SYSCALL is not set
64# CONFIG_KALLSYMS is not set 64# CONFIG_KALLSYMS is not set
65# CONFIG_STRIP_ASM_SYMS is not set
66# CONFIG_HOTPLUG is not set 65# CONFIG_HOTPLUG is not set
67CONFIG_PRINTK=y 66CONFIG_PRINTK=y
68CONFIG_BUG=y 67CONFIG_BUG=y
@@ -74,7 +73,12 @@ CONFIG_SIGNALFD=y
74CONFIG_TIMERFD=y 73CONFIG_TIMERFD=y
75CONFIG_EVENTFD=y 74CONFIG_EVENTFD=y
76CONFIG_AIO=y 75CONFIG_AIO=y
76
77#
78# Performance Counters
79#
77# CONFIG_VM_EVENT_COUNTERS is not set 80# CONFIG_VM_EVENT_COUNTERS is not set
81# CONFIG_STRIP_ASM_SYMS is not set
78CONFIG_COMPAT_BRK=y 82CONFIG_COMPAT_BRK=y
79CONFIG_SLAB=y 83CONFIG_SLAB=y
80# CONFIG_SLUB is not set 84# CONFIG_SLUB is not set
@@ -155,6 +159,7 @@ CONFIG_CPU_SUBTYPE_SH7619=y
155# 159#
156CONFIG_QUICKLIST=y 160CONFIG_QUICKLIST=y
157CONFIG_PAGE_OFFSET=0x00000000 161CONFIG_PAGE_OFFSET=0x00000000
162CONFIG_FORCE_MAX_ZONEORDER=14
158CONFIG_MEMORY_START=0x0c000000 163CONFIG_MEMORY_START=0x0c000000
159CONFIG_MEMORY_SIZE=0x04000000 164CONFIG_MEMORY_SIZE=0x04000000
160CONFIG_29BIT=y 165CONFIG_29BIT=y
@@ -168,7 +173,6 @@ CONFIG_PAGE_SIZE_4KB=y
168# CONFIG_PAGE_SIZE_8KB is not set 173# CONFIG_PAGE_SIZE_8KB is not set
169# CONFIG_PAGE_SIZE_16KB is not set 174# CONFIG_PAGE_SIZE_16KB is not set
170# CONFIG_PAGE_SIZE_64KB is not set 175# CONFIG_PAGE_SIZE_64KB is not set
171CONFIG_ENTRY_OFFSET=0x00001000
172CONFIG_SELECT_MEMORY_MODEL=y 176CONFIG_SELECT_MEMORY_MODEL=y
173CONFIG_FLATMEM_MANUAL=y 177CONFIG_FLATMEM_MANUAL=y
174# CONFIG_DISCONTIGMEM_MANUAL is not set 178# CONFIG_DISCONTIGMEM_MANUAL is not set
@@ -181,7 +185,8 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
181# CONFIG_PHYS_ADDR_T_64BIT is not set 185# CONFIG_PHYS_ADDR_T_64BIT is not set
182CONFIG_ZONE_DMA_FLAG=0 186CONFIG_ZONE_DMA_FLAG=0
183CONFIG_NR_QUICK=2 187CONFIG_NR_QUICK=2
184CONFIG_UNEVICTABLE_LRU=y 188CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
189CONFIG_NOMMU_INITIAL_TRIM_EXCESS=1
185 190
186# 191#
187# Cache configuration 192# Cache configuration
@@ -206,10 +211,14 @@ CONFIG_SH_7619_SOLUTION_ENGINE=y
206# 211#
207# Timer and clock configuration 212# Timer and clock configuration
208# 213#
209CONFIG_SH_CMT=y 214CONFIG_SH_TIMER_CMT=y
210CONFIG_SH_TIMER_IRQ=86
211CONFIG_SH_PCLK_FREQ=31250000 215CONFIG_SH_PCLK_FREQ=31250000
216CONFIG_SH_CLK_CPG=y
217CONFIG_SH_CLK_CPG_LEGACY=y
212CONFIG_SH_CLK_MD=5 218CONFIG_SH_CLK_MD=5
219# CONFIG_NO_HZ is not set
220# CONFIG_HIGH_RES_TIMERS is not set
221CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
213 222
214# 223#
215# CPU Frequency scaling 224# CPU Frequency scaling
@@ -245,12 +254,14 @@ CONFIG_PREEMPT_NONE=y
245# CONFIG_PREEMPT_VOLUNTARY is not set 254# CONFIG_PREEMPT_VOLUNTARY is not set
246# CONFIG_PREEMPT is not set 255# CONFIG_PREEMPT is not set
247CONFIG_GUSA=y 256CONFIG_GUSA=y
257# CONFIG_SPARSE_IRQ is not set
248 258
249# 259#
250# Boot options 260# Boot options
251# 261#
252CONFIG_ZERO_PAGE_OFFSET=0x00001000 262CONFIG_ZERO_PAGE_OFFSET=0x00001000
253CONFIG_BOOT_LINK_OFFSET=0x00800000 263CONFIG_BOOT_LINK_OFFSET=0x00800000
264CONFIG_ENTRY_OFFSET=0x00001000
254# CONFIG_CMDLINE_BOOL is not set 265# CONFIG_CMDLINE_BOOL is not set
255 266
256# 267#
@@ -479,21 +490,7 @@ CONFIG_SSB_POSSIBLE=y
479# CONFIG_HTC_PASIC3 is not set 490# CONFIG_HTC_PASIC3 is not set
480# CONFIG_MFD_TMIO is not set 491# CONFIG_MFD_TMIO is not set
481# CONFIG_REGULATOR is not set 492# CONFIG_REGULATOR is not set
482 493# CONFIG_MEDIA_SUPPORT is not set
483#
484# Multimedia devices
485#
486
487#
488# Multimedia core support
489#
490# CONFIG_VIDEO_DEV is not set
491# CONFIG_VIDEO_MEDIA is not set
492
493#
494# Multimedia drivers
495#
496CONFIG_DAB=y
497 494
498# 495#
499# Graphics support 496# Graphics support
@@ -541,10 +538,15 @@ CONFIG_USB_ARCH_HAS_HCD=y
541# CONFIG_MEMSTICK is not set 538# CONFIG_MEMSTICK is not set
542# CONFIG_NEW_LEDS is not set 539# CONFIG_NEW_LEDS is not set
543# CONFIG_ACCESSIBILITY is not set 540# CONFIG_ACCESSIBILITY is not set
541CONFIG_RTC_LIB=y
544# CONFIG_RTC_CLASS is not set 542# CONFIG_RTC_CLASS is not set
545# CONFIG_DMADEVICES is not set 543# CONFIG_DMADEVICES is not set
546# CONFIG_AUXDISPLAY is not set 544# CONFIG_AUXDISPLAY is not set
547# CONFIG_UIO is not set 545# CONFIG_UIO is not set
546
547#
548# TI VLYNQ
549#
548# CONFIG_STAGING is not set 550# CONFIG_STAGING is not set
549 551
550# 552#
@@ -556,11 +558,13 @@ CONFIG_USB_ARCH_HAS_HCD=y
556# CONFIG_REISERFS_FS is not set 558# CONFIG_REISERFS_FS is not set
557# CONFIG_JFS_FS is not set 559# CONFIG_JFS_FS is not set
558# CONFIG_FS_POSIX_ACL is not set 560# CONFIG_FS_POSIX_ACL is not set
559CONFIG_FILE_LOCKING=y
560# CONFIG_XFS_FS is not set 561# CONFIG_XFS_FS is not set
561# CONFIG_BTRFS_FS is not set 562# CONFIG_BTRFS_FS is not set
563CONFIG_FILE_LOCKING=y
564CONFIG_FSNOTIFY=y
562# CONFIG_DNOTIFY is not set 565# CONFIG_DNOTIFY is not set
563# CONFIG_INOTIFY is not set 566# CONFIG_INOTIFY is not set
567CONFIG_INOTIFY_USER=y
564# CONFIG_QUOTA is not set 568# CONFIG_QUOTA is not set
565# CONFIG_AUTOFS_FS is not set 569# CONFIG_AUTOFS_FS is not set
566# CONFIG_AUTOFS4_FS is not set 570# CONFIG_AUTOFS4_FS is not set
@@ -644,25 +648,12 @@ CONFIG_HAVE_FUNCTION_TRACER=y
644CONFIG_HAVE_DYNAMIC_FTRACE=y 648CONFIG_HAVE_DYNAMIC_FTRACE=y
645CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 649CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
646CONFIG_TRACING_SUPPORT=y 650CONFIG_TRACING_SUPPORT=y
647 651# CONFIG_FTRACE is not set
648#
649# Tracers
650#
651# CONFIG_FUNCTION_TRACER is not set
652# CONFIG_SCHED_TRACER is not set
653# CONFIG_CONTEXT_SWITCH_TRACER is not set
654# CONFIG_EVENT_TRACER is not set
655# CONFIG_BOOT_TRACER is not set
656# CONFIG_TRACE_BRANCH_PROFILING is not set
657# CONFIG_STACK_TRACER is not set
658# CONFIG_KMEMTRACE is not set
659# CONFIG_WORKQUEUE_TRACER is not set
660# CONFIG_DMA_API_DEBUG is not set 652# CONFIG_DMA_API_DEBUG is not set
661# CONFIG_SAMPLES is not set 653# CONFIG_SAMPLES is not set
662CONFIG_HAVE_ARCH_KGDB=y 654CONFIG_HAVE_ARCH_KGDB=y
663# CONFIG_SH_STANDARD_BIOS is not set 655# CONFIG_SH_STANDARD_BIOS is not set
664# CONFIG_EARLY_SCIF_CONSOLE is not set 656# CONFIG_EARLY_SCIF_CONSOLE is not set
665# CONFIG_MORE_COMPILE_OPTIONS is not set
666 657
667# 658#
668# Security options 659# Security options
@@ -689,3 +680,4 @@ CONFIG_ZLIB_INFLATE=y
689CONFIG_HAS_IOMEM=y 680CONFIG_HAS_IOMEM=y
690CONFIG_HAS_IOPORT=y 681CONFIG_HAS_IOPORT=y
691CONFIG_HAS_DMA=y 682CONFIG_HAS_DMA=y
683CONFIG_GENERIC_ATOMIC64=y
diff --git a/arch/sh/configs/se7705_defconfig b/arch/sh/configs/se7705_defconfig
index bae161c66835..6ca6a2fc06e9 100644
--- a/arch/sh/configs/se7705_defconfig
+++ b/arch/sh/configs/se7705_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.30-rc3 3# Linux kernel version: 2.6.30
4# Mon Apr 27 13:02:52 2009 4# Thu Jun 18 12:48:18 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -19,6 +19,7 @@ CONFIG_GENERIC_TIME=y
19CONFIG_GENERIC_CLOCKEVENTS=y 19CONFIG_GENERIC_CLOCKEVENTS=y
20# CONFIG_ARCH_SUSPEND_POSSIBLE is not set 20# CONFIG_ARCH_SUSPEND_POSSIBLE is not set
21CONFIG_ARCH_HIBERNATION_POSSIBLE=y 21CONFIG_ARCH_HIBERNATION_POSSIBLE=y
22CONFIG_SYS_SUPPORTS_TMU=y
22CONFIG_STACKTRACE_SUPPORT=y 23CONFIG_STACKTRACE_SUPPORT=y
23CONFIG_LOCKDEP_SUPPORT=y 24CONFIG_LOCKDEP_SUPPORT=y
24CONFIG_HAVE_LATENCYTOP_SUPPORT=y 25CONFIG_HAVE_LATENCYTOP_SUPPORT=y
@@ -70,7 +71,6 @@ CONFIG_EMBEDDED=y
70CONFIG_UID16=y 71CONFIG_UID16=y
71# CONFIG_SYSCTL_SYSCALL is not set 72# CONFIG_SYSCTL_SYSCALL is not set
72# CONFIG_KALLSYMS is not set 73# CONFIG_KALLSYMS is not set
73# CONFIG_STRIP_ASM_SYMS is not set
74# CONFIG_HOTPLUG is not set 74# CONFIG_HOTPLUG is not set
75CONFIG_PRINTK=y 75CONFIG_PRINTK=y
76CONFIG_BUG=y 76CONFIG_BUG=y
@@ -83,7 +83,12 @@ CONFIG_TIMERFD=y
83CONFIG_EVENTFD=y 83CONFIG_EVENTFD=y
84CONFIG_SHMEM=y 84CONFIG_SHMEM=y
85CONFIG_AIO=y 85CONFIG_AIO=y
86
87#
88# Performance Counters
89#
86CONFIG_VM_EVENT_COUNTERS=y 90CONFIG_VM_EVENT_COUNTERS=y
91# CONFIG_STRIP_ASM_SYMS is not set
87CONFIG_COMPAT_BRK=y 92CONFIG_COMPAT_BRK=y
88CONFIG_SLAB=y 93CONFIG_SLAB=y
89# CONFIG_SLUB is not set 94# CONFIG_SLUB is not set
@@ -171,6 +176,7 @@ CONFIG_CPU_SUBTYPE_SH7705=y
171CONFIG_QUICKLIST=y 176CONFIG_QUICKLIST=y
172CONFIG_MMU=y 177CONFIG_MMU=y
173CONFIG_PAGE_OFFSET=0x80000000 178CONFIG_PAGE_OFFSET=0x80000000
179CONFIG_FORCE_MAX_ZONEORDER=11
174CONFIG_MEMORY_START=0x0c000000 180CONFIG_MEMORY_START=0x0c000000
175CONFIG_MEMORY_SIZE=0x02000000 181CONFIG_MEMORY_SIZE=0x02000000
176CONFIG_29BIT=y 182CONFIG_29BIT=y
@@ -185,7 +191,6 @@ CONFIG_PAGE_SIZE_4KB=y
185# CONFIG_PAGE_SIZE_8KB is not set 191# CONFIG_PAGE_SIZE_8KB is not set
186# CONFIG_PAGE_SIZE_16KB is not set 192# CONFIG_PAGE_SIZE_16KB is not set
187# CONFIG_PAGE_SIZE_64KB is not set 193# CONFIG_PAGE_SIZE_64KB is not set
188CONFIG_ENTRY_OFFSET=0x00001000
189CONFIG_SELECT_MEMORY_MODEL=y 194CONFIG_SELECT_MEMORY_MODEL=y
190CONFIG_FLATMEM_MANUAL=y 195CONFIG_FLATMEM_MANUAL=y
191# CONFIG_DISCONTIGMEM_MANUAL is not set 196# CONFIG_DISCONTIGMEM_MANUAL is not set
@@ -198,9 +203,9 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
198# CONFIG_PHYS_ADDR_T_64BIT is not set 203# CONFIG_PHYS_ADDR_T_64BIT is not set
199CONFIG_ZONE_DMA_FLAG=0 204CONFIG_ZONE_DMA_FLAG=0
200CONFIG_NR_QUICK=2 205CONFIG_NR_QUICK=2
201CONFIG_UNEVICTABLE_LRU=y
202CONFIG_HAVE_MLOCK=y 206CONFIG_HAVE_MLOCK=y
203CONFIG_HAVE_MLOCKED_PAGE_BIT=y 207CONFIG_HAVE_MLOCKED_PAGE_BIT=y
208CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
204 209
205# 210#
206# Cache configuration 211# Cache configuration
@@ -231,9 +236,10 @@ CONFIG_SH_SOLUTION_ENGINE=y
231# 236#
232# Timer and clock configuration 237# Timer and clock configuration
233# 238#
234CONFIG_SH_TMU=y 239CONFIG_SH_TIMER_TMU=y
235CONFIG_SH_TIMER_IRQ=16
236CONFIG_SH_PCLK_FREQ=33333333 240CONFIG_SH_PCLK_FREQ=33333333
241CONFIG_SH_CLK_CPG=y
242CONFIG_SH_CLK_CPG_LEGACY=y
237# CONFIG_NO_HZ is not set 243# CONFIG_NO_HZ is not set
238# CONFIG_HIGH_RES_TIMERS is not set 244# CONFIG_HIGH_RES_TIMERS is not set
239CONFIG_GENERIC_CLOCKEVENTS_BUILD=y 245CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
@@ -275,12 +281,14 @@ CONFIG_HZ=250
275CONFIG_PREEMPT=y 281CONFIG_PREEMPT=y
276CONFIG_GUSA=y 282CONFIG_GUSA=y
277# CONFIG_GUSA_RB is not set 283# CONFIG_GUSA_RB is not set
284# CONFIG_SPARSE_IRQ is not set
278 285
279# 286#
280# Boot options 287# Boot options
281# 288#
282CONFIG_ZERO_PAGE_OFFSET=0x00001000 289CONFIG_ZERO_PAGE_OFFSET=0x00001000
283CONFIG_BOOT_LINK_OFFSET=0x00800000 290CONFIG_BOOT_LINK_OFFSET=0x00800000
291CONFIG_ENTRY_OFFSET=0x00001000
284# CONFIG_CMDLINE_BOOL is not set 292# CONFIG_CMDLINE_BOOL is not set
285 293
286# 294#
@@ -361,6 +369,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
361# CONFIG_ECONET is not set 369# CONFIG_ECONET is not set
362# CONFIG_WAN_ROUTER is not set 370# CONFIG_WAN_ROUTER is not set
363# CONFIG_PHONET is not set 371# CONFIG_PHONET is not set
372# CONFIG_IEEE802154 is not set
364# CONFIG_NET_SCHED is not set 373# CONFIG_NET_SCHED is not set
365# CONFIG_DCB is not set 374# CONFIG_DCB is not set
366 375
@@ -378,7 +387,11 @@ CONFIG_WIRELESS=y
378# CONFIG_WIRELESS_OLD_REGULATORY is not set 387# CONFIG_WIRELESS_OLD_REGULATORY is not set
379# CONFIG_WIRELESS_EXT is not set 388# CONFIG_WIRELESS_EXT is not set
380# CONFIG_LIB80211 is not set 389# CONFIG_LIB80211 is not set
381# CONFIG_MAC80211 is not set 390
391#
392# CFG80211 needs to be enabled for MAC80211
393#
394CONFIG_MAC80211_DEFAULT_PS_VALUE=0
382# CONFIG_WIMAX is not set 395# CONFIG_WIMAX is not set
383# CONFIG_RFKILL is not set 396# CONFIG_RFKILL is not set
384# CONFIG_NET_9P is not set 397# CONFIG_NET_9P is not set
@@ -507,7 +520,6 @@ CONFIG_HAVE_IDE=y
507# CONFIG_ATA is not set 520# CONFIG_ATA is not set
508# CONFIG_MD is not set 521# CONFIG_MD is not set
509CONFIG_NETDEVICES=y 522CONFIG_NETDEVICES=y
510CONFIG_COMPAT_NET_DEV_OPS=y
511# CONFIG_DUMMY is not set 523# CONFIG_DUMMY is not set
512# CONFIG_BONDING is not set 524# CONFIG_BONDING is not set
513# CONFIG_MACVLAN is not set 525# CONFIG_MACVLAN is not set
@@ -532,6 +544,7 @@ CONFIG_STNIC=y
532# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set 544# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
533# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set 545# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
534# CONFIG_B44 is not set 546# CONFIG_B44 is not set
547# CONFIG_KS8842 is not set
535CONFIG_NETDEV_1000=y 548CONFIG_NETDEV_1000=y
536CONFIG_NETDEV_10000=y 549CONFIG_NETDEV_10000=y
537 550
@@ -662,22 +675,7 @@ CONFIG_SSB_POSSIBLE=y
662# CONFIG_HTC_PASIC3 is not set 675# CONFIG_HTC_PASIC3 is not set
663# CONFIG_MFD_TMIO is not set 676# CONFIG_MFD_TMIO is not set
664# CONFIG_REGULATOR is not set 677# CONFIG_REGULATOR is not set
665 678# CONFIG_MEDIA_SUPPORT is not set
666#
667# Multimedia devices
668#
669
670#
671# Multimedia core support
672#
673# CONFIG_VIDEO_DEV is not set
674# CONFIG_DVB_CORE is not set
675# CONFIG_VIDEO_MEDIA is not set
676
677#
678# Multimedia drivers
679#
680# CONFIG_DAB is not set
681 679
682# 680#
683# Graphics support 681# Graphics support
@@ -725,10 +723,15 @@ CONFIG_USB_ARCH_HAS_HCD=y
725# CONFIG_MEMSTICK is not set 723# CONFIG_MEMSTICK is not set
726# CONFIG_NEW_LEDS is not set 724# CONFIG_NEW_LEDS is not set
727# CONFIG_ACCESSIBILITY is not set 725# CONFIG_ACCESSIBILITY is not set
726CONFIG_RTC_LIB=y
728# CONFIG_RTC_CLASS is not set 727# CONFIG_RTC_CLASS is not set
729# CONFIG_DMADEVICES is not set 728# CONFIG_DMADEVICES is not set
730# CONFIG_AUXDISPLAY is not set 729# CONFIG_AUXDISPLAY is not set
731# CONFIG_UIO is not set 730# CONFIG_UIO is not set
731
732#
733# TI VLYNQ
734#
732# CONFIG_STAGING is not set 735# CONFIG_STAGING is not set
733 736
734# 737#
@@ -742,9 +745,10 @@ CONFIG_EXT2_FS=y
742# CONFIG_REISERFS_FS is not set 745# CONFIG_REISERFS_FS is not set
743# CONFIG_JFS_FS is not set 746# CONFIG_JFS_FS is not set
744# CONFIG_FS_POSIX_ACL is not set 747# CONFIG_FS_POSIX_ACL is not set
745CONFIG_FILE_LOCKING=y
746# CONFIG_XFS_FS is not set 748# CONFIG_XFS_FS is not set
747# CONFIG_BTRFS_FS is not set 749# CONFIG_BTRFS_FS is not set
750CONFIG_FILE_LOCKING=y
751CONFIG_FSNOTIFY=y
748CONFIG_DNOTIFY=y 752CONFIG_DNOTIFY=y
749CONFIG_INOTIFY=y 753CONFIG_INOTIFY=y
750CONFIG_INOTIFY_USER=y 754CONFIG_INOTIFY_USER=y
@@ -856,27 +860,12 @@ CONFIG_HAVE_FUNCTION_TRACER=y
856CONFIG_HAVE_DYNAMIC_FTRACE=y 860CONFIG_HAVE_DYNAMIC_FTRACE=y
857CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 861CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
858CONFIG_TRACING_SUPPORT=y 862CONFIG_TRACING_SUPPORT=y
859 863# CONFIG_FTRACE is not set
860#
861# Tracers
862#
863# CONFIG_FUNCTION_TRACER is not set
864# CONFIG_IRQSOFF_TRACER is not set
865# CONFIG_PREEMPT_TRACER is not set
866# CONFIG_SCHED_TRACER is not set
867# CONFIG_CONTEXT_SWITCH_TRACER is not set
868# CONFIG_EVENT_TRACER is not set
869# CONFIG_BOOT_TRACER is not set
870# CONFIG_TRACE_BRANCH_PROFILING is not set
871# CONFIG_STACK_TRACER is not set
872# CONFIG_KMEMTRACE is not set
873# CONFIG_WORKQUEUE_TRACER is not set
874# CONFIG_DMA_API_DEBUG is not set 864# CONFIG_DMA_API_DEBUG is not set
875# CONFIG_SAMPLES is not set 865# CONFIG_SAMPLES is not set
876CONFIG_HAVE_ARCH_KGDB=y 866CONFIG_HAVE_ARCH_KGDB=y
877# CONFIG_SH_STANDARD_BIOS is not set 867# CONFIG_SH_STANDARD_BIOS is not set
878# CONFIG_EARLY_SCIF_CONSOLE is not set 868# CONFIG_EARLY_SCIF_CONSOLE is not set
879# CONFIG_MORE_COMPILE_OPTIONS is not set
880 869
881# 870#
882# Security options 871# Security options
@@ -991,3 +980,4 @@ CONFIG_HAS_IOMEM=y
991CONFIG_HAS_IOPORT=y 980CONFIG_HAS_IOPORT=y
992CONFIG_HAS_DMA=y 981CONFIG_HAS_DMA=y
993CONFIG_NLATTR=y 982CONFIG_NLATTR=y
983CONFIG_GENERIC_ATOMIC64=y
diff --git a/arch/sh/configs/se7712_defconfig b/arch/sh/configs/se7712_defconfig
index 330043f3c316..b8aae11bc8fa 100644
--- a/arch/sh/configs/se7712_defconfig
+++ b/arch/sh/configs/se7712_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.30-rc3 3# Linux kernel version: 2.6.30
4# Mon Apr 27 13:03:27 2009 4# Thu Jun 18 12:49:00 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -18,6 +18,7 @@ CONFIG_GENERIC_TIME=y
18CONFIG_GENERIC_CLOCKEVENTS=y 18CONFIG_GENERIC_CLOCKEVENTS=y
19# CONFIG_ARCH_SUSPEND_POSSIBLE is not set 19# CONFIG_ARCH_SUSPEND_POSSIBLE is not set
20CONFIG_ARCH_HIBERNATION_POSSIBLE=y 20CONFIG_ARCH_HIBERNATION_POSSIBLE=y
21CONFIG_SYS_SUPPORTS_TMU=y
21CONFIG_STACKTRACE_SUPPORT=y 22CONFIG_STACKTRACE_SUPPORT=y
22CONFIG_LOCKDEP_SUPPORT=y 23CONFIG_LOCKDEP_SUPPORT=y
23CONFIG_HAVE_LATENCYTOP_SUPPORT=y 24CONFIG_HAVE_LATENCYTOP_SUPPORT=y
@@ -71,7 +72,6 @@ CONFIG_SYSCTL_SYSCALL=y
71CONFIG_KALLSYMS=y 72CONFIG_KALLSYMS=y
72CONFIG_KALLSYMS_ALL=y 73CONFIG_KALLSYMS_ALL=y
73# CONFIG_KALLSYMS_EXTRA_PASS is not set 74# CONFIG_KALLSYMS_EXTRA_PASS is not set
74# CONFIG_STRIP_ASM_SYMS is not set
75CONFIG_HOTPLUG=y 75CONFIG_HOTPLUG=y
76CONFIG_PRINTK=y 76CONFIG_PRINTK=y
77# CONFIG_BUG is not set 77# CONFIG_BUG is not set
@@ -84,7 +84,12 @@ CONFIG_TIMERFD=y
84CONFIG_EVENTFD=y 84CONFIG_EVENTFD=y
85# CONFIG_SHMEM is not set 85# CONFIG_SHMEM is not set
86CONFIG_AIO=y 86CONFIG_AIO=y
87
88#
89# Performance Counters
90#
87CONFIG_VM_EVENT_COUNTERS=y 91CONFIG_VM_EVENT_COUNTERS=y
92# CONFIG_STRIP_ASM_SYMS is not set
88CONFIG_COMPAT_BRK=y 93CONFIG_COMPAT_BRK=y
89CONFIG_SLAB=y 94CONFIG_SLAB=y
90# CONFIG_SLUB is not set 95# CONFIG_SLUB is not set
@@ -173,6 +178,7 @@ CONFIG_CPU_SUBTYPE_SH7712=y
173CONFIG_QUICKLIST=y 178CONFIG_QUICKLIST=y
174CONFIG_MMU=y 179CONFIG_MMU=y
175CONFIG_PAGE_OFFSET=0x80000000 180CONFIG_PAGE_OFFSET=0x80000000
181CONFIG_FORCE_MAX_ZONEORDER=11
176CONFIG_MEMORY_START=0x0c000000 182CONFIG_MEMORY_START=0x0c000000
177CONFIG_MEMORY_SIZE=0x02000000 183CONFIG_MEMORY_SIZE=0x02000000
178CONFIG_29BIT=y 184CONFIG_29BIT=y
@@ -187,7 +193,6 @@ CONFIG_PAGE_SIZE_4KB=y
187# CONFIG_PAGE_SIZE_8KB is not set 193# CONFIG_PAGE_SIZE_8KB is not set
188# CONFIG_PAGE_SIZE_16KB is not set 194# CONFIG_PAGE_SIZE_16KB is not set
189# CONFIG_PAGE_SIZE_64KB is not set 195# CONFIG_PAGE_SIZE_64KB is not set
190CONFIG_ENTRY_OFFSET=0x00001000
191CONFIG_SELECT_MEMORY_MODEL=y 196CONFIG_SELECT_MEMORY_MODEL=y
192CONFIG_FLATMEM_MANUAL=y 197CONFIG_FLATMEM_MANUAL=y
193# CONFIG_DISCONTIGMEM_MANUAL is not set 198# CONFIG_DISCONTIGMEM_MANUAL is not set
@@ -200,9 +205,9 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
200# CONFIG_PHYS_ADDR_T_64BIT is not set 205# CONFIG_PHYS_ADDR_T_64BIT is not set
201CONFIG_ZONE_DMA_FLAG=0 206CONFIG_ZONE_DMA_FLAG=0
202CONFIG_NR_QUICK=2 207CONFIG_NR_QUICK=2
203CONFIG_UNEVICTABLE_LRU=y
204CONFIG_HAVE_MLOCK=y 208CONFIG_HAVE_MLOCK=y
205CONFIG_HAVE_MLOCKED_PAGE_BIT=y 209CONFIG_HAVE_MLOCKED_PAGE_BIT=y
210CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
206 211
207# 212#
208# Cache configuration 213# Cache configuration
@@ -233,9 +238,10 @@ CONFIG_SH_SOLUTION_ENGINE=y
233# 238#
234# Timer and clock configuration 239# Timer and clock configuration
235# 240#
236CONFIG_SH_TMU=y 241CONFIG_SH_TIMER_TMU=y
237CONFIG_SH_TIMER_IRQ=16
238CONFIG_SH_PCLK_FREQ=66666666 242CONFIG_SH_PCLK_FREQ=66666666
243CONFIG_SH_CLK_CPG=y
244CONFIG_SH_CLK_CPG_LEGACY=y
239# CONFIG_NO_HZ is not set 245# CONFIG_NO_HZ is not set
240# CONFIG_HIGH_RES_TIMERS is not set 246# CONFIG_HIGH_RES_TIMERS is not set
241CONFIG_GENERIC_CLOCKEVENTS_BUILD=y 247CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
@@ -277,12 +283,14 @@ CONFIG_PREEMPT_VOLUNTARY=y
277# CONFIG_PREEMPT is not set 283# CONFIG_PREEMPT is not set
278CONFIG_GUSA=y 284CONFIG_GUSA=y
279# CONFIG_GUSA_RB is not set 285# CONFIG_GUSA_RB is not set
286# CONFIG_SPARSE_IRQ is not set
280 287
281# 288#
282# Boot options 289# Boot options
283# 290#
284CONFIG_ZERO_PAGE_OFFSET=0x00001000 291CONFIG_ZERO_PAGE_OFFSET=0x00001000
285CONFIG_BOOT_LINK_OFFSET=0x00800000 292CONFIG_BOOT_LINK_OFFSET=0x00800000
293CONFIG_ENTRY_OFFSET=0x00001000
286CONFIG_CMDLINE_BOOL=y 294CONFIG_CMDLINE_BOOL=y
287CONFIG_CMDLINE="console=ttySC0,115200 root=/dev/sda1" 295CONFIG_CMDLINE="console=ttySC0,115200 root=/dev/sda1"
288 296
@@ -374,6 +382,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
374# CONFIG_ECONET is not set 382# CONFIG_ECONET is not set
375# CONFIG_WAN_ROUTER is not set 383# CONFIG_WAN_ROUTER is not set
376# CONFIG_PHONET is not set 384# CONFIG_PHONET is not set
385# CONFIG_IEEE802154 is not set
377CONFIG_NET_SCHED=y 386CONFIG_NET_SCHED=y
378 387
379# 388#
@@ -427,7 +436,11 @@ CONFIG_WIRELESS=y
427# CONFIG_WIRELESS_OLD_REGULATORY is not set 436# CONFIG_WIRELESS_OLD_REGULATORY is not set
428# CONFIG_WIRELESS_EXT is not set 437# CONFIG_WIRELESS_EXT is not set
429# CONFIG_LIB80211 is not set 438# CONFIG_LIB80211 is not set
430# CONFIG_MAC80211 is not set 439
440#
441# CFG80211 needs to be enabled for MAC80211
442#
443CONFIG_MAC80211_DEFAULT_PS_VALUE=0
431# CONFIG_WIMAX is not set 444# CONFIG_WIMAX is not set
432# CONFIG_RFKILL is not set 445# CONFIG_RFKILL is not set
433# CONFIG_NET_9P is not set 446# CONFIG_NET_9P is not set
@@ -568,10 +581,6 @@ CONFIG_BLK_DEV_SD=y
568# CONFIG_BLK_DEV_SR is not set 581# CONFIG_BLK_DEV_SR is not set
569# CONFIG_CHR_DEV_SG is not set 582# CONFIG_CHR_DEV_SG is not set
570# CONFIG_CHR_DEV_SCH is not set 583# CONFIG_CHR_DEV_SCH is not set
571
572#
573# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
574#
575# CONFIG_SCSI_MULTI_LUN is not set 584# CONFIG_SCSI_MULTI_LUN is not set
576# CONFIG_SCSI_CONSTANTS is not set 585# CONFIG_SCSI_CONSTANTS is not set
577# CONFIG_SCSI_LOGGING is not set 586# CONFIG_SCSI_LOGGING is not set
@@ -588,6 +597,7 @@ CONFIG_SCSI_WAIT_SCAN=m
588# CONFIG_SCSI_SRP_ATTRS is not set 597# CONFIG_SCSI_SRP_ATTRS is not set
589CONFIG_SCSI_LOWLEVEL=y 598CONFIG_SCSI_LOWLEVEL=y
590# CONFIG_ISCSI_TCP is not set 599# CONFIG_ISCSI_TCP is not set
600# CONFIG_SCSI_BNX2_ISCSI is not set
591# CONFIG_LIBFC is not set 601# CONFIG_LIBFC is not set
592# CONFIG_LIBFCOE is not set 602# CONFIG_LIBFCOE is not set
593# CONFIG_SCSI_DEBUG is not set 603# CONFIG_SCSI_DEBUG is not set
@@ -601,7 +611,6 @@ CONFIG_ATA_SFF=y
601CONFIG_PATA_PLATFORM=y 611CONFIG_PATA_PLATFORM=y
602# CONFIG_MD is not set 612# CONFIG_MD is not set
603CONFIG_NETDEVICES=y 613CONFIG_NETDEVICES=y
604CONFIG_COMPAT_NET_DEV_OPS=y
605# CONFIG_DUMMY is not set 614# CONFIG_DUMMY is not set
606# CONFIG_BONDING is not set 615# CONFIG_BONDING is not set
607# CONFIG_MACVLAN is not set 616# CONFIG_MACVLAN is not set
@@ -646,6 +655,7 @@ CONFIG_SH_ETH=y
646# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set 655# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
647# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set 656# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
648# CONFIG_B44 is not set 657# CONFIG_B44 is not set
658# CONFIG_KS8842 is not set
649CONFIG_NETDEV_1000=y 659CONFIG_NETDEV_1000=y
650CONFIG_NETDEV_10000=y 660CONFIG_NETDEV_10000=y
651 661
@@ -730,22 +740,7 @@ CONFIG_SSB_POSSIBLE=y
730# CONFIG_HTC_PASIC3 is not set 740# CONFIG_HTC_PASIC3 is not set
731# CONFIG_MFD_TMIO is not set 741# CONFIG_MFD_TMIO is not set
732# CONFIG_REGULATOR is not set 742# CONFIG_REGULATOR is not set
733 743# CONFIG_MEDIA_SUPPORT is not set
734#
735# Multimedia devices
736#
737
738#
739# Multimedia core support
740#
741# CONFIG_VIDEO_DEV is not set
742# CONFIG_DVB_CORE is not set
743# CONFIG_VIDEO_MEDIA is not set
744
745#
746# Multimedia drivers
747#
748# CONFIG_DAB is not set
749 744
750# 745#
751# Graphics support 746# Graphics support
@@ -802,10 +797,15 @@ CONFIG_LEDS_TRIGGERS=y
802# iptables trigger is under Netfilter config (LED target) 797# iptables trigger is under Netfilter config (LED target)
803# 798#
804# CONFIG_ACCESSIBILITY is not set 799# CONFIG_ACCESSIBILITY is not set
800CONFIG_RTC_LIB=y
805# CONFIG_RTC_CLASS is not set 801# CONFIG_RTC_CLASS is not set
806# CONFIG_DMADEVICES is not set 802# CONFIG_DMADEVICES is not set
807# CONFIG_AUXDISPLAY is not set 803# CONFIG_AUXDISPLAY is not set
808# CONFIG_UIO is not set 804# CONFIG_UIO is not set
805
806#
807# TI VLYNQ
808#
809# CONFIG_STAGING is not set 809# CONFIG_STAGING is not set
810 810
811# 811#
@@ -827,12 +827,14 @@ CONFIG_FS_MBCACHE=y
827# CONFIG_REISERFS_FS is not set 827# CONFIG_REISERFS_FS is not set
828# CONFIG_JFS_FS is not set 828# CONFIG_JFS_FS is not set
829CONFIG_FS_POSIX_ACL=y 829CONFIG_FS_POSIX_ACL=y
830CONFIG_FILE_LOCKING=y
831# CONFIG_XFS_FS is not set 830# CONFIG_XFS_FS is not set
832# CONFIG_OCFS2_FS is not set 831# CONFIG_OCFS2_FS is not set
833# CONFIG_BTRFS_FS is not set 832# CONFIG_BTRFS_FS is not set
833CONFIG_FILE_LOCKING=y
834CONFIG_FSNOTIFY=y
834# CONFIG_DNOTIFY is not set 835# CONFIG_DNOTIFY is not set
835# CONFIG_INOTIFY is not set 836# CONFIG_INOTIFY is not set
837CONFIG_INOTIFY_USER=y
836# CONFIG_QUOTA is not set 838# CONFIG_QUOTA is not set
837# CONFIG_AUTOFS_FS is not set 839# CONFIG_AUTOFS_FS is not set
838# CONFIG_AUTOFS4_FS is not set 840# CONFIG_AUTOFS4_FS is not set
@@ -975,17 +977,15 @@ CONFIG_HAVE_FUNCTION_TRACER=y
975CONFIG_HAVE_DYNAMIC_FTRACE=y 977CONFIG_HAVE_DYNAMIC_FTRACE=y
976CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 978CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
977CONFIG_TRACING_SUPPORT=y 979CONFIG_TRACING_SUPPORT=y
978 980CONFIG_FTRACE=y
979#
980# Tracers
981#
982# CONFIG_FUNCTION_TRACER is not set 981# CONFIG_FUNCTION_TRACER is not set
983# CONFIG_IRQSOFF_TRACER is not set 982# CONFIG_IRQSOFF_TRACER is not set
984# CONFIG_SCHED_TRACER is not set 983# CONFIG_SCHED_TRACER is not set
985# CONFIG_CONTEXT_SWITCH_TRACER is not set 984# CONFIG_ENABLE_DEFAULT_TRACERS is not set
986# CONFIG_EVENT_TRACER is not set
987# CONFIG_BOOT_TRACER is not set 985# CONFIG_BOOT_TRACER is not set
988# CONFIG_TRACE_BRANCH_PROFILING is not set 986CONFIG_BRANCH_PROFILE_NONE=y
987# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
988# CONFIG_PROFILE_ALL_BRANCHES is not set
989# CONFIG_STACK_TRACER is not set 989# CONFIG_STACK_TRACER is not set
990# CONFIG_KMEMTRACE is not set 990# CONFIG_KMEMTRACE is not set
991# CONFIG_WORKQUEUE_TRACER is not set 991# CONFIG_WORKQUEUE_TRACER is not set
@@ -994,16 +994,15 @@ CONFIG_TRACING_SUPPORT=y
994# CONFIG_SAMPLES is not set 994# CONFIG_SAMPLES is not set
995CONFIG_HAVE_ARCH_KGDB=y 995CONFIG_HAVE_ARCH_KGDB=y
996# CONFIG_KGDB is not set 996# CONFIG_KGDB is not set
997# CONFIG_KMEMCHECK is not set
997# CONFIG_SH_STANDARD_BIOS is not set 998# CONFIG_SH_STANDARD_BIOS is not set
998# CONFIG_EARLY_SCIF_CONSOLE is not set 999# CONFIG_EARLY_SCIF_CONSOLE is not set
999# CONFIG_DEBUG_BOOTMEM is not set 1000# CONFIG_DEBUG_BOOTMEM is not set
1000# CONFIG_DEBUG_STACKOVERFLOW is not set 1001# CONFIG_DEBUG_STACKOVERFLOW is not set
1001# CONFIG_DEBUG_STACK_USAGE is not set 1002# CONFIG_DEBUG_STACK_USAGE is not set
1002# CONFIG_4KSTACKS is not set 1003# CONFIG_4KSTACKS is not set
1003# CONFIG_IRQSTACKS is not set
1004# CONFIG_DUMP_CODE is not set 1004# CONFIG_DUMP_CODE is not set
1005# CONFIG_SH_NO_BSS_INIT is not set 1005# CONFIG_SH_NO_BSS_INIT is not set
1006# CONFIG_MORE_COMPILE_OPTIONS is not set
1007 1006
1008# 1007#
1009# Security options 1008# Security options
@@ -1129,3 +1128,4 @@ CONFIG_HAS_IOMEM=y
1129CONFIG_HAS_IOPORT=y 1128CONFIG_HAS_IOPORT=y
1130CONFIG_HAS_DMA=y 1129CONFIG_HAS_DMA=y
1131CONFIG_NLATTR=y 1130CONFIG_NLATTR=y
1131CONFIG_GENERIC_ATOMIC64=y
diff --git a/arch/sh/configs/se7721_defconfig b/arch/sh/configs/se7721_defconfig
index 56478918440d..306e21c4253d 100644
--- a/arch/sh/configs/se7721_defconfig
+++ b/arch/sh/configs/se7721_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.30-rc3 3# Linux kernel version: 2.6.30
4# Mon Apr 27 13:04:19 2009 4# Thu Jun 18 12:50:49 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -18,6 +18,8 @@ CONFIG_GENERIC_TIME=y
18CONFIG_GENERIC_CLOCKEVENTS=y 18CONFIG_GENERIC_CLOCKEVENTS=y
19# CONFIG_ARCH_SUSPEND_POSSIBLE is not set 19# CONFIG_ARCH_SUSPEND_POSSIBLE is not set
20CONFIG_ARCH_HIBERNATION_POSSIBLE=y 20CONFIG_ARCH_HIBERNATION_POSSIBLE=y
21CONFIG_SYS_SUPPORTS_CMT=y
22CONFIG_SYS_SUPPORTS_TMU=y
21CONFIG_STACKTRACE_SUPPORT=y 23CONFIG_STACKTRACE_SUPPORT=y
22CONFIG_LOCKDEP_SUPPORT=y 24CONFIG_LOCKDEP_SUPPORT=y
23CONFIG_HAVE_LATENCYTOP_SUPPORT=y 25CONFIG_HAVE_LATENCYTOP_SUPPORT=y
@@ -75,7 +77,6 @@ CONFIG_SYSCTL_SYSCALL=y
75CONFIG_KALLSYMS=y 77CONFIG_KALLSYMS=y
76CONFIG_KALLSYMS_ALL=y 78CONFIG_KALLSYMS_ALL=y
77# CONFIG_KALLSYMS_EXTRA_PASS is not set 79# CONFIG_KALLSYMS_EXTRA_PASS is not set
78# CONFIG_STRIP_ASM_SYMS is not set
79CONFIG_HOTPLUG=y 80CONFIG_HOTPLUG=y
80CONFIG_PRINTK=y 81CONFIG_PRINTK=y
81# CONFIG_BUG is not set 82# CONFIG_BUG is not set
@@ -88,7 +89,12 @@ CONFIG_TIMERFD=y
88CONFIG_EVENTFD=y 89CONFIG_EVENTFD=y
89# CONFIG_SHMEM is not set 90# CONFIG_SHMEM is not set
90CONFIG_AIO=y 91CONFIG_AIO=y
92
93#
94# Performance Counters
95#
91CONFIG_VM_EVENT_COUNTERS=y 96CONFIG_VM_EVENT_COUNTERS=y
97# CONFIG_STRIP_ASM_SYMS is not set
92CONFIG_COMPAT_BRK=y 98CONFIG_COMPAT_BRK=y
93CONFIG_SLAB=y 99CONFIG_SLAB=y
94# CONFIG_SLUB is not set 100# CONFIG_SLUB is not set
@@ -177,6 +183,7 @@ CONFIG_CPU_SUBTYPE_SH7721=y
177CONFIG_QUICKLIST=y 183CONFIG_QUICKLIST=y
178CONFIG_MMU=y 184CONFIG_MMU=y
179CONFIG_PAGE_OFFSET=0x80000000 185CONFIG_PAGE_OFFSET=0x80000000
186CONFIG_FORCE_MAX_ZONEORDER=11
180CONFIG_MEMORY_START=0x0c000000 187CONFIG_MEMORY_START=0x0c000000
181CONFIG_MEMORY_SIZE=0x02000000 188CONFIG_MEMORY_SIZE=0x02000000
182CONFIG_29BIT=y 189CONFIG_29BIT=y
@@ -191,7 +198,6 @@ CONFIG_PAGE_SIZE_4KB=y
191# CONFIG_PAGE_SIZE_8KB is not set 198# CONFIG_PAGE_SIZE_8KB is not set
192# CONFIG_PAGE_SIZE_16KB is not set 199# CONFIG_PAGE_SIZE_16KB is not set
193# CONFIG_PAGE_SIZE_64KB is not set 200# CONFIG_PAGE_SIZE_64KB is not set
194CONFIG_ENTRY_OFFSET=0x00001000
195CONFIG_SELECT_MEMORY_MODEL=y 201CONFIG_SELECT_MEMORY_MODEL=y
196CONFIG_FLATMEM_MANUAL=y 202CONFIG_FLATMEM_MANUAL=y
197# CONFIG_DISCONTIGMEM_MANUAL is not set 203# CONFIG_DISCONTIGMEM_MANUAL is not set
@@ -204,9 +210,9 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
204# CONFIG_PHYS_ADDR_T_64BIT is not set 210# CONFIG_PHYS_ADDR_T_64BIT is not set
205CONFIG_ZONE_DMA_FLAG=0 211CONFIG_ZONE_DMA_FLAG=0
206CONFIG_NR_QUICK=2 212CONFIG_NR_QUICK=2
207CONFIG_UNEVICTABLE_LRU=y
208CONFIG_HAVE_MLOCK=y 213CONFIG_HAVE_MLOCK=y
209CONFIG_HAVE_MLOCKED_PAGE_BIT=y 214CONFIG_HAVE_MLOCKED_PAGE_BIT=y
215CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
210 216
211# 217#
212# Cache configuration 218# Cache configuration
@@ -236,9 +242,11 @@ CONFIG_SH_7721_SOLUTION_ENGINE=y
236# 242#
237# Timer and clock configuration 243# Timer and clock configuration
238# 244#
239CONFIG_SH_TMU=y 245CONFIG_SH_TIMER_TMU=y
240CONFIG_SH_TIMER_IRQ=16 246CONFIG_SH_TIMER_CMT=y
241CONFIG_SH_PCLK_FREQ=33333333 247CONFIG_SH_PCLK_FREQ=33333333
248CONFIG_SH_CLK_CPG=y
249CONFIG_SH_CLK_CPG_LEGACY=y
242# CONFIG_NO_HZ is not set 250# CONFIG_NO_HZ is not set
243# CONFIG_HIGH_RES_TIMERS is not set 251# CONFIG_HIGH_RES_TIMERS is not set
244CONFIG_GENERIC_CLOCKEVENTS_BUILD=y 252CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
@@ -280,12 +288,14 @@ CONFIG_PREEMPT_VOLUNTARY=y
280# CONFIG_PREEMPT is not set 288# CONFIG_PREEMPT is not set
281CONFIG_GUSA=y 289CONFIG_GUSA=y
282# CONFIG_GUSA_RB is not set 290# CONFIG_GUSA_RB is not set
291# CONFIG_SPARSE_IRQ is not set
283 292
284# 293#
285# Boot options 294# Boot options
286# 295#
287CONFIG_ZERO_PAGE_OFFSET=0x00001000 296CONFIG_ZERO_PAGE_OFFSET=0x00001000
288CONFIG_BOOT_LINK_OFFSET=0x00800000 297CONFIG_BOOT_LINK_OFFSET=0x00800000
298CONFIG_ENTRY_OFFSET=0x00001000
289CONFIG_CMDLINE_BOOL=y 299CONFIG_CMDLINE_BOOL=y
290CONFIG_CMDLINE="console=ttySC0,115200 root=/dev/sda2" 300CONFIG_CMDLINE="console=ttySC0,115200 root=/dev/sda2"
291 301
@@ -377,6 +387,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
377# CONFIG_ECONET is not set 387# CONFIG_ECONET is not set
378# CONFIG_WAN_ROUTER is not set 388# CONFIG_WAN_ROUTER is not set
379# CONFIG_PHONET is not set 389# CONFIG_PHONET is not set
390# CONFIG_IEEE802154 is not set
380CONFIG_NET_SCHED=y 391CONFIG_NET_SCHED=y
381 392
382# 393#
@@ -430,7 +441,11 @@ CONFIG_WIRELESS=y
430# CONFIG_WIRELESS_OLD_REGULATORY is not set 441# CONFIG_WIRELESS_OLD_REGULATORY is not set
431# CONFIG_WIRELESS_EXT is not set 442# CONFIG_WIRELESS_EXT is not set
432# CONFIG_LIB80211 is not set 443# CONFIG_LIB80211 is not set
433# CONFIG_MAC80211 is not set 444
445#
446# CFG80211 needs to be enabled for MAC80211
447#
448CONFIG_MAC80211_DEFAULT_PS_VALUE=0
434# CONFIG_WIMAX is not set 449# CONFIG_WIMAX is not set
435# CONFIG_RFKILL is not set 450# CONFIG_RFKILL is not set
436# CONFIG_NET_9P is not set 451# CONFIG_NET_9P is not set
@@ -572,10 +587,6 @@ CONFIG_BLK_DEV_SD=y
572# CONFIG_BLK_DEV_SR is not set 587# CONFIG_BLK_DEV_SR is not set
573# CONFIG_CHR_DEV_SG is not set 588# CONFIG_CHR_DEV_SG is not set
574# CONFIG_CHR_DEV_SCH is not set 589# CONFIG_CHR_DEV_SCH is not set
575
576#
577# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
578#
579CONFIG_SCSI_MULTI_LUN=y 590CONFIG_SCSI_MULTI_LUN=y
580# CONFIG_SCSI_CONSTANTS is not set 591# CONFIG_SCSI_CONSTANTS is not set
581# CONFIG_SCSI_LOGGING is not set 592# CONFIG_SCSI_LOGGING is not set
@@ -601,7 +612,6 @@ CONFIG_ATA_SFF=y
601CONFIG_PATA_PLATFORM=y 612CONFIG_PATA_PLATFORM=y
602# CONFIG_MD is not set 613# CONFIG_MD is not set
603CONFIG_NETDEVICES=y 614CONFIG_NETDEVICES=y
604CONFIG_COMPAT_NET_DEV_OPS=y
605# CONFIG_DUMMY is not set 615# CONFIG_DUMMY is not set
606# CONFIG_BONDING is not set 616# CONFIG_BONDING is not set
607# CONFIG_MACVLAN is not set 617# CONFIG_MACVLAN is not set
@@ -735,22 +745,7 @@ CONFIG_SSB_POSSIBLE=y
735# CONFIG_HTC_PASIC3 is not set 745# CONFIG_HTC_PASIC3 is not set
736# CONFIG_MFD_TMIO is not set 746# CONFIG_MFD_TMIO is not set
737# CONFIG_REGULATOR is not set 747# CONFIG_REGULATOR is not set
738 748# CONFIG_MEDIA_SUPPORT is not set
739#
740# Multimedia devices
741#
742
743#
744# Multimedia core support
745#
746# CONFIG_VIDEO_DEV is not set
747# CONFIG_DVB_CORE is not set
748# CONFIG_VIDEO_MEDIA is not set
749
750#
751# Multimedia drivers
752#
753# CONFIG_DAB is not set
754 749
755# 750#
756# Graphics support 751# Graphics support
@@ -786,7 +781,7 @@ CONFIG_HID_BELKIN=y
786CONFIG_HID_CHERRY=y 781CONFIG_HID_CHERRY=y
787CONFIG_HID_CHICONY=y 782CONFIG_HID_CHICONY=y
788CONFIG_HID_CYPRESS=y 783CONFIG_HID_CYPRESS=y
789# CONFIG_DRAGONRISE_FF is not set 784# CONFIG_HID_DRAGONRISE is not set
790CONFIG_HID_EZKEY=y 785CONFIG_HID_EZKEY=y
791# CONFIG_HID_KYE is not set 786# CONFIG_HID_KYE is not set
792CONFIG_HID_GYRATION=y 787CONFIG_HID_GYRATION=y
@@ -803,10 +798,11 @@ CONFIG_HID_PETALYNX=y
803CONFIG_HID_SAMSUNG=y 798CONFIG_HID_SAMSUNG=y
804CONFIG_HID_SONY=y 799CONFIG_HID_SONY=y
805CONFIG_HID_SUNPLUS=y 800CONFIG_HID_SUNPLUS=y
806# CONFIG_GREENASIA_FF is not set 801# CONFIG_HID_GREENASIA is not set
802# CONFIG_HID_SMARTJOYPLUS is not set
807# CONFIG_HID_TOPSEED is not set 803# CONFIG_HID_TOPSEED is not set
808CONFIG_THRUSTMASTER_FF=m 804# CONFIG_HID_THRUSTMASTER is not set
809CONFIG_ZEROPLUS_FF=m 805# CONFIG_HID_ZEROPLUS is not set
810CONFIG_USB_SUPPORT=y 806CONFIG_USB_SUPPORT=y
811CONFIG_USB_ARCH_HAS_HCD=y 807CONFIG_USB_ARCH_HAS_HCD=y
812CONFIG_USB_ARCH_HAS_OHCI=y 808CONFIG_USB_ARCH_HAS_OHCI=y
@@ -934,10 +930,15 @@ CONFIG_LEDS_TRIGGERS=y
934# iptables trigger is under Netfilter config (LED target) 930# iptables trigger is under Netfilter config (LED target)
935# 931#
936# CONFIG_ACCESSIBILITY is not set 932# CONFIG_ACCESSIBILITY is not set
933CONFIG_RTC_LIB=y
937# CONFIG_RTC_CLASS is not set 934# CONFIG_RTC_CLASS is not set
938# CONFIG_DMADEVICES is not set 935# CONFIG_DMADEVICES is not set
939# CONFIG_AUXDISPLAY is not set 936# CONFIG_AUXDISPLAY is not set
940# CONFIG_UIO is not set 937# CONFIG_UIO is not set
938
939#
940# TI VLYNQ
941#
941# CONFIG_STAGING is not set 942# CONFIG_STAGING is not set
942 943
943# 944#
@@ -959,12 +960,14 @@ CONFIG_FS_MBCACHE=y
959# CONFIG_REISERFS_FS is not set 960# CONFIG_REISERFS_FS is not set
960# CONFIG_JFS_FS is not set 961# CONFIG_JFS_FS is not set
961CONFIG_FS_POSIX_ACL=y 962CONFIG_FS_POSIX_ACL=y
962CONFIG_FILE_LOCKING=y
963# CONFIG_XFS_FS is not set 963# CONFIG_XFS_FS is not set
964# CONFIG_OCFS2_FS is not set 964# CONFIG_OCFS2_FS is not set
965# CONFIG_BTRFS_FS is not set 965# CONFIG_BTRFS_FS is not set
966CONFIG_FILE_LOCKING=y
967CONFIG_FSNOTIFY=y
966# CONFIG_DNOTIFY is not set 968# CONFIG_DNOTIFY is not set
967# CONFIG_INOTIFY is not set 969# CONFIG_INOTIFY is not set
970CONFIG_INOTIFY_USER=y
968# CONFIG_QUOTA is not set 971# CONFIG_QUOTA is not set
969# CONFIG_AUTOFS_FS is not set 972# CONFIG_AUTOFS_FS is not set
970# CONFIG_AUTOFS4_FS is not set 973# CONFIG_AUTOFS4_FS is not set
@@ -1134,17 +1137,15 @@ CONFIG_HAVE_FUNCTION_TRACER=y
1134CONFIG_HAVE_DYNAMIC_FTRACE=y 1137CONFIG_HAVE_DYNAMIC_FTRACE=y
1135CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 1138CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1136CONFIG_TRACING_SUPPORT=y 1139CONFIG_TRACING_SUPPORT=y
1137 1140CONFIG_FTRACE=y
1138#
1139# Tracers
1140#
1141# CONFIG_FUNCTION_TRACER is not set 1141# CONFIG_FUNCTION_TRACER is not set
1142# CONFIG_IRQSOFF_TRACER is not set 1142# CONFIG_IRQSOFF_TRACER is not set
1143# CONFIG_SCHED_TRACER is not set 1143# CONFIG_SCHED_TRACER is not set
1144# CONFIG_CONTEXT_SWITCH_TRACER is not set 1144# CONFIG_ENABLE_DEFAULT_TRACERS is not set
1145# CONFIG_EVENT_TRACER is not set
1146# CONFIG_BOOT_TRACER is not set 1145# CONFIG_BOOT_TRACER is not set
1147# CONFIG_TRACE_BRANCH_PROFILING is not set 1146CONFIG_BRANCH_PROFILE_NONE=y
1147# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
1148# CONFIG_PROFILE_ALL_BRANCHES is not set
1148# CONFIG_STACK_TRACER is not set 1149# CONFIG_STACK_TRACER is not set
1149# CONFIG_KMEMTRACE is not set 1150# CONFIG_KMEMTRACE is not set
1150# CONFIG_WORKQUEUE_TRACER is not set 1151# CONFIG_WORKQUEUE_TRACER is not set
@@ -1153,16 +1154,15 @@ CONFIG_TRACING_SUPPORT=y
1153# CONFIG_SAMPLES is not set 1154# CONFIG_SAMPLES is not set
1154CONFIG_HAVE_ARCH_KGDB=y 1155CONFIG_HAVE_ARCH_KGDB=y
1155# CONFIG_KGDB is not set 1156# CONFIG_KGDB is not set
1157# CONFIG_KMEMCHECK is not set
1156# CONFIG_SH_STANDARD_BIOS is not set 1158# CONFIG_SH_STANDARD_BIOS is not set
1157# CONFIG_EARLY_SCIF_CONSOLE is not set 1159# CONFIG_EARLY_SCIF_CONSOLE is not set
1158# CONFIG_DEBUG_BOOTMEM is not set 1160# CONFIG_DEBUG_BOOTMEM is not set
1159# CONFIG_DEBUG_STACKOVERFLOW is not set 1161# CONFIG_DEBUG_STACKOVERFLOW is not set
1160# CONFIG_DEBUG_STACK_USAGE is not set 1162# CONFIG_DEBUG_STACK_USAGE is not set
1161# CONFIG_4KSTACKS is not set 1163# CONFIG_4KSTACKS is not set
1162# CONFIG_IRQSTACKS is not set
1163# CONFIG_DUMP_CODE is not set 1164# CONFIG_DUMP_CODE is not set
1164# CONFIG_SH_NO_BSS_INIT is not set 1165# CONFIG_SH_NO_BSS_INIT is not set
1165# CONFIG_MORE_COMPILE_OPTIONS is not set
1166 1166
1167# 1167#
1168# Security options 1168# Security options
@@ -1288,3 +1288,4 @@ CONFIG_HAS_IOMEM=y
1288CONFIG_HAS_IOPORT=y 1288CONFIG_HAS_IOPORT=y
1289CONFIG_HAS_DMA=y 1289CONFIG_HAS_DMA=y
1290CONFIG_NLATTR=y 1290CONFIG_NLATTR=y
1291CONFIG_GENERIC_ATOMIC64=y
diff --git a/arch/sh/configs/se7722_defconfig b/arch/sh/configs/se7722_defconfig
index 726fdbdb2807..619438299847 100644
--- a/arch/sh/configs/se7722_defconfig
+++ b/arch/sh/configs/se7722_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.30-rc3 3# Linux kernel version: 2.6.30
4# Mon Apr 27 13:05:29 2009 4# Thu Jun 18 12:54:24 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -21,6 +21,7 @@ CONFIG_ARCH_SUSPEND_POSSIBLE=y
21CONFIG_ARCH_HIBERNATION_POSSIBLE=y 21CONFIG_ARCH_HIBERNATION_POSSIBLE=y
22CONFIG_SYS_SUPPORTS_NUMA=y 22CONFIG_SYS_SUPPORTS_NUMA=y
23CONFIG_SYS_SUPPORTS_CMT=y 23CONFIG_SYS_SUPPORTS_CMT=y
24CONFIG_SYS_SUPPORTS_TMU=y
24CONFIG_STACKTRACE_SUPPORT=y 25CONFIG_STACKTRACE_SUPPORT=y
25CONFIG_LOCKDEP_SUPPORT=y 26CONFIG_LOCKDEP_SUPPORT=y
26CONFIG_HAVE_LATENCYTOP_SUPPORT=y 27CONFIG_HAVE_LATENCYTOP_SUPPORT=y
@@ -78,7 +79,6 @@ CONFIG_UID16=y
78CONFIG_SYSCTL_SYSCALL=y 79CONFIG_SYSCTL_SYSCALL=y
79CONFIG_KALLSYMS=y 80CONFIG_KALLSYMS=y
80# CONFIG_KALLSYMS_EXTRA_PASS is not set 81# CONFIG_KALLSYMS_EXTRA_PASS is not set
81# CONFIG_STRIP_ASM_SYMS is not set
82CONFIG_HOTPLUG=y 82CONFIG_HOTPLUG=y
83CONFIG_PRINTK=y 83CONFIG_PRINTK=y
84CONFIG_BUG=y 84CONFIG_BUG=y
@@ -91,8 +91,13 @@ CONFIG_TIMERFD=y
91CONFIG_EVENTFD=y 91CONFIG_EVENTFD=y
92CONFIG_SHMEM=y 92CONFIG_SHMEM=y
93CONFIG_AIO=y 93CONFIG_AIO=y
94
95#
96# Performance Counters
97#
94CONFIG_VM_EVENT_COUNTERS=y 98CONFIG_VM_EVENT_COUNTERS=y
95CONFIG_SLUB_DEBUG=y 99CONFIG_SLUB_DEBUG=y
100# CONFIG_STRIP_ASM_SYMS is not set
96CONFIG_COMPAT_BRK=y 101CONFIG_COMPAT_BRK=y
97# CONFIG_SLAB is not set 102# CONFIG_SLAB is not set
98CONFIG_SLUB=y 103CONFIG_SLUB=y
@@ -187,6 +192,7 @@ CONFIG_CPU_SUBTYPE_SH7722=y
187CONFIG_QUICKLIST=y 192CONFIG_QUICKLIST=y
188CONFIG_MMU=y 193CONFIG_MMU=y
189CONFIG_PAGE_OFFSET=0x80000000 194CONFIG_PAGE_OFFSET=0x80000000
195CONFIG_FORCE_MAX_ZONEORDER=11
190CONFIG_MEMORY_START=0x0c000000 196CONFIG_MEMORY_START=0x0c000000
191CONFIG_MEMORY_SIZE=0x04000000 197CONFIG_MEMORY_SIZE=0x04000000
192CONFIG_29BIT=y 198CONFIG_29BIT=y
@@ -205,7 +211,6 @@ CONFIG_PAGE_SIZE_4KB=y
205# CONFIG_PAGE_SIZE_8KB is not set 211# CONFIG_PAGE_SIZE_8KB is not set
206# CONFIG_PAGE_SIZE_16KB is not set 212# CONFIG_PAGE_SIZE_16KB is not set
207# CONFIG_PAGE_SIZE_64KB is not set 213# CONFIG_PAGE_SIZE_64KB is not set
208CONFIG_ENTRY_OFFSET=0x00001000
209CONFIG_HUGETLB_PAGE_SIZE_64K=y 214CONFIG_HUGETLB_PAGE_SIZE_64K=y
210# CONFIG_HUGETLB_PAGE_SIZE_256K is not set 215# CONFIG_HUGETLB_PAGE_SIZE_256K is not set
211# CONFIG_HUGETLB_PAGE_SIZE_1MB is not set 216# CONFIG_HUGETLB_PAGE_SIZE_1MB is not set
@@ -226,9 +231,9 @@ CONFIG_MIGRATION=y
226# CONFIG_PHYS_ADDR_T_64BIT is not set 231# CONFIG_PHYS_ADDR_T_64BIT is not set
227CONFIG_ZONE_DMA_FLAG=0 232CONFIG_ZONE_DMA_FLAG=0
228CONFIG_NR_QUICK=2 233CONFIG_NR_QUICK=2
229CONFIG_UNEVICTABLE_LRU=y
230CONFIG_HAVE_MLOCK=y 234CONFIG_HAVE_MLOCK=y
231CONFIG_HAVE_MLOCKED_PAGE_BIT=y 235CONFIG_HAVE_MLOCKED_PAGE_BIT=y
236CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
232 237
233# 238#
234# Cache configuration 239# Cache configuration
@@ -247,7 +252,6 @@ CONFIG_SH_DSP=y
247CONFIG_SH_STORE_QUEUES=y 252CONFIG_SH_STORE_QUEUES=y
248CONFIG_CPU_HAS_INTEVT=y 253CONFIG_CPU_HAS_INTEVT=y
249CONFIG_CPU_HAS_SR_RB=y 254CONFIG_CPU_HAS_SR_RB=y
250CONFIG_CPU_HAS_PTEA=y
251CONFIG_CPU_HAS_DSP=y 255CONFIG_CPU_HAS_DSP=y
252 256
253# 257#
@@ -260,10 +264,10 @@ CONFIG_SH_7722_SOLUTION_ENGINE=y
260# 264#
261# Timer and clock configuration 265# Timer and clock configuration
262# 266#
263CONFIG_SH_TMU=y 267CONFIG_SH_TIMER_TMU=y
264# CONFIG_SH_TIMER_CMT is not set 268# CONFIG_SH_TIMER_CMT is not set
265CONFIG_SH_TIMER_IRQ=16
266CONFIG_SH_PCLK_FREQ=33333333 269CONFIG_SH_PCLK_FREQ=33333333
270CONFIG_SH_CLK_CPG=y
267CONFIG_TICK_ONESHOT=y 271CONFIG_TICK_ONESHOT=y
268CONFIG_NO_HZ=y 272CONFIG_NO_HZ=y
269CONFIG_HIGH_RES_TIMERS=y 273CONFIG_HIGH_RES_TIMERS=y
@@ -305,12 +309,14 @@ CONFIG_KEXEC=y
305# CONFIG_PREEMPT_VOLUNTARY is not set 309# CONFIG_PREEMPT_VOLUNTARY is not set
306CONFIG_PREEMPT=y 310CONFIG_PREEMPT=y
307CONFIG_GUSA=y 311CONFIG_GUSA=y
312# CONFIG_SPARSE_IRQ is not set
308 313
309# 314#
310# Boot options 315# Boot options
311# 316#
312CONFIG_ZERO_PAGE_OFFSET=0x00001000 317CONFIG_ZERO_PAGE_OFFSET=0x00001000
313CONFIG_BOOT_LINK_OFFSET=0x00800000 318CONFIG_BOOT_LINK_OFFSET=0x00800000
319CONFIG_ENTRY_OFFSET=0x00001000
314# CONFIG_CMDLINE_BOOL is not set 320# CONFIG_CMDLINE_BOOL is not set
315 321
316# 322#
@@ -389,6 +395,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
389# CONFIG_ECONET is not set 395# CONFIG_ECONET is not set
390# CONFIG_WAN_ROUTER is not set 396# CONFIG_WAN_ROUTER is not set
391# CONFIG_PHONET is not set 397# CONFIG_PHONET is not set
398# CONFIG_IEEE802154 is not set
392# CONFIG_NET_SCHED is not set 399# CONFIG_NET_SCHED is not set
393# CONFIG_DCB is not set 400# CONFIG_DCB is not set
394 401
@@ -406,7 +413,11 @@ CONFIG_WIRELESS=y
406# CONFIG_WIRELESS_OLD_REGULATORY is not set 413# CONFIG_WIRELESS_OLD_REGULATORY is not set
407# CONFIG_WIRELESS_EXT is not set 414# CONFIG_WIRELESS_EXT is not set
408# CONFIG_LIB80211 is not set 415# CONFIG_LIB80211 is not set
409# CONFIG_MAC80211 is not set 416
417#
418# CFG80211 needs to be enabled for MAC80211
419#
420CONFIG_MAC80211_DEFAULT_PS_VALUE=0
410# CONFIG_WIMAX is not set 421# CONFIG_WIMAX is not set
411# CONFIG_RFKILL is not set 422# CONFIG_RFKILL is not set
412# CONFIG_NET_9P is not set 423# CONFIG_NET_9P is not set
@@ -467,10 +478,6 @@ CONFIG_BLK_DEV_SD=y
467# CONFIG_BLK_DEV_SR is not set 478# CONFIG_BLK_DEV_SR is not set
468# CONFIG_CHR_DEV_SG is not set 479# CONFIG_CHR_DEV_SG is not set
469# CONFIG_CHR_DEV_SCH is not set 480# CONFIG_CHR_DEV_SCH is not set
470
471#
472# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
473#
474# CONFIG_SCSI_MULTI_LUN is not set 481# CONFIG_SCSI_MULTI_LUN is not set
475# CONFIG_SCSI_CONSTANTS is not set 482# CONFIG_SCSI_CONSTANTS is not set
476# CONFIG_SCSI_LOGGING is not set 483# CONFIG_SCSI_LOGGING is not set
@@ -487,6 +494,7 @@ CONFIG_SCSI_WAIT_SCAN=m
487# CONFIG_SCSI_SRP_ATTRS is not set 494# CONFIG_SCSI_SRP_ATTRS is not set
488CONFIG_SCSI_LOWLEVEL=y 495CONFIG_SCSI_LOWLEVEL=y
489# CONFIG_ISCSI_TCP is not set 496# CONFIG_ISCSI_TCP is not set
497# CONFIG_SCSI_BNX2_ISCSI is not set
490# CONFIG_LIBFC is not set 498# CONFIG_LIBFC is not set
491# CONFIG_LIBFCOE is not set 499# CONFIG_LIBFCOE is not set
492# CONFIG_SCSI_DEBUG is not set 500# CONFIG_SCSI_DEBUG is not set
@@ -500,7 +508,6 @@ CONFIG_ATA_SFF=y
500CONFIG_PATA_PLATFORM=y 508CONFIG_PATA_PLATFORM=y
501# CONFIG_MD is not set 509# CONFIG_MD is not set
502CONFIG_NETDEVICES=y 510CONFIG_NETDEVICES=y
503CONFIG_COMPAT_NET_DEV_OPS=y
504# CONFIG_DUMMY is not set 511# CONFIG_DUMMY is not set
505# CONFIG_BONDING is not set 512# CONFIG_BONDING is not set
506# CONFIG_MACVLAN is not set 513# CONFIG_MACVLAN is not set
@@ -525,6 +532,7 @@ CONFIG_SMC91X=y
525# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set 532# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
526# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set 533# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
527# CONFIG_B44 is not set 534# CONFIG_B44 is not set
535# CONFIG_KS8842 is not set
528CONFIG_NETDEV_1000=y 536CONFIG_NETDEV_1000=y
529CONFIG_NETDEV_10000=y 537CONFIG_NETDEV_10000=y
530 538
@@ -656,22 +664,7 @@ CONFIG_SSB_POSSIBLE=y
656# CONFIG_HTC_PASIC3 is not set 664# CONFIG_HTC_PASIC3 is not set
657# CONFIG_MFD_TMIO is not set 665# CONFIG_MFD_TMIO is not set
658# CONFIG_REGULATOR is not set 666# CONFIG_REGULATOR is not set
659 667# CONFIG_MEDIA_SUPPORT is not set
660#
661# Multimedia devices
662#
663
664#
665# Multimedia core support
666#
667# CONFIG_VIDEO_DEV is not set
668# CONFIG_DVB_CORE is not set
669# CONFIG_VIDEO_MEDIA is not set
670
671#
672# Multimedia drivers
673#
674CONFIG_DAB=y
675 668
676# 669#
677# Graphics support 670# Graphics support
@@ -756,9 +749,14 @@ CONFIG_RTC_INTF_DEV=y
756# on-CPU RTC drivers 749# on-CPU RTC drivers
757# 750#
758CONFIG_RTC_DRV_SH=y 751CONFIG_RTC_DRV_SH=y
752# CONFIG_RTC_DRV_GENERIC is not set
759# CONFIG_DMADEVICES is not set 753# CONFIG_DMADEVICES is not set
760# CONFIG_AUXDISPLAY is not set 754# CONFIG_AUXDISPLAY is not set
761# CONFIG_UIO is not set 755# CONFIG_UIO is not set
756
757#
758# TI VLYNQ
759#
762# CONFIG_STAGING is not set 760# CONFIG_STAGING is not set
763 761
764# 762#
@@ -779,10 +777,11 @@ CONFIG_FS_MBCACHE=y
779# CONFIG_REISERFS_FS is not set 777# CONFIG_REISERFS_FS is not set
780# CONFIG_JFS_FS is not set 778# CONFIG_JFS_FS is not set
781# CONFIG_FS_POSIX_ACL is not set 779# CONFIG_FS_POSIX_ACL is not set
782CONFIG_FILE_LOCKING=y
783# CONFIG_XFS_FS is not set 780# CONFIG_XFS_FS is not set
784# CONFIG_OCFS2_FS is not set 781# CONFIG_OCFS2_FS is not set
785# CONFIG_BTRFS_FS is not set 782# CONFIG_BTRFS_FS is not set
783CONFIG_FILE_LOCKING=y
784CONFIG_FSNOTIFY=y
786CONFIG_DNOTIFY=y 785CONFIG_DNOTIFY=y
787CONFIG_INOTIFY=y 786CONFIG_INOTIFY=y
788CONFIG_INOTIFY_USER=y 787CONFIG_INOTIFY_USER=y
@@ -882,22 +881,7 @@ CONFIG_HAVE_FUNCTION_TRACER=y
882CONFIG_HAVE_DYNAMIC_FTRACE=y 881CONFIG_HAVE_DYNAMIC_FTRACE=y
883CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 882CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
884CONFIG_TRACING_SUPPORT=y 883CONFIG_TRACING_SUPPORT=y
885 884# CONFIG_FTRACE is not set
886#
887# Tracers
888#
889# CONFIG_FUNCTION_TRACER is not set
890# CONFIG_IRQSOFF_TRACER is not set
891# CONFIG_PREEMPT_TRACER is not set
892# CONFIG_SCHED_TRACER is not set
893# CONFIG_CONTEXT_SWITCH_TRACER is not set
894# CONFIG_EVENT_TRACER is not set
895# CONFIG_BOOT_TRACER is not set
896# CONFIG_TRACE_BRANCH_PROFILING is not set
897# CONFIG_STACK_TRACER is not set
898# CONFIG_KMEMTRACE is not set
899# CONFIG_WORKQUEUE_TRACER is not set
900# CONFIG_BLK_DEV_IO_TRACE is not set
901# CONFIG_DYNAMIC_DEBUG is not set 885# CONFIG_DYNAMIC_DEBUG is not set
902# CONFIG_DMA_API_DEBUG is not set 886# CONFIG_DMA_API_DEBUG is not set
903# CONFIG_SAMPLES is not set 887# CONFIG_SAMPLES is not set
@@ -905,7 +889,6 @@ CONFIG_HAVE_ARCH_KGDB=y
905CONFIG_SH_STANDARD_BIOS=y 889CONFIG_SH_STANDARD_BIOS=y
906# CONFIG_EARLY_SCIF_CONSOLE is not set 890# CONFIG_EARLY_SCIF_CONSOLE is not set
907# CONFIG_EARLY_PRINTK is not set 891# CONFIG_EARLY_PRINTK is not set
908# CONFIG_MORE_COMPILE_OPTIONS is not set
909 892
910# 893#
911# Security options 894# Security options
@@ -1020,3 +1003,4 @@ CONFIG_HAS_IOMEM=y
1020CONFIG_HAS_IOPORT=y 1003CONFIG_HAS_IOPORT=y
1021CONFIG_HAS_DMA=y 1004CONFIG_HAS_DMA=y
1022CONFIG_NLATTR=y 1005CONFIG_NLATTR=y
1006CONFIG_GENERIC_ATOMIC64=y
diff --git a/arch/sh/configs/se7724_defconfig b/arch/sh/configs/se7724_defconfig
index 96d2587467e6..3840270283e4 100644
--- a/arch/sh/configs/se7724_defconfig
+++ b/arch/sh/configs/se7724_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.30-rc6 3# Linux kernel version: 2.6.30
4# Tue May 26 13:18:09 2009 4# Thu Jun 18 16:09:05 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -76,7 +76,6 @@ CONFIG_EMBEDDED=y
76CONFIG_UID16=y 76CONFIG_UID16=y
77CONFIG_SYSCTL_SYSCALL=y 77CONFIG_SYSCTL_SYSCALL=y
78# CONFIG_KALLSYMS is not set 78# CONFIG_KALLSYMS is not set
79# CONFIG_STRIP_ASM_SYMS is not set
80CONFIG_HOTPLUG=y 79CONFIG_HOTPLUG=y
81CONFIG_PRINTK=y 80CONFIG_PRINTK=y
82CONFIG_BUG=y 81CONFIG_BUG=y
@@ -89,7 +88,12 @@ CONFIG_TIMERFD=y
89CONFIG_EVENTFD=y 88CONFIG_EVENTFD=y
90CONFIG_SHMEM=y 89CONFIG_SHMEM=y
91CONFIG_AIO=y 90CONFIG_AIO=y
91
92#
93# Performance Counters
94#
92CONFIG_VM_EVENT_COUNTERS=y 95CONFIG_VM_EVENT_COUNTERS=y
96# CONFIG_STRIP_ASM_SYMS is not set
93CONFIG_COMPAT_BRK=y 97CONFIG_COMPAT_BRK=y
94CONFIG_SLAB=y 98CONFIG_SLAB=y
95# CONFIG_SLUB is not set 99# CONFIG_SLUB is not set
@@ -209,9 +213,9 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
209# CONFIG_PHYS_ADDR_T_64BIT is not set 213# CONFIG_PHYS_ADDR_T_64BIT is not set
210CONFIG_ZONE_DMA_FLAG=0 214CONFIG_ZONE_DMA_FLAG=0
211CONFIG_NR_QUICK=2 215CONFIG_NR_QUICK=2
212CONFIG_UNEVICTABLE_LRU=y
213CONFIG_HAVE_MLOCK=y 216CONFIG_HAVE_MLOCK=y
214CONFIG_HAVE_MLOCKED_PAGE_BIT=y 217CONFIG_HAVE_MLOCKED_PAGE_BIT=y
218CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
215 219
216# 220#
217# Cache configuration 221# Cache configuration
@@ -229,7 +233,6 @@ CONFIG_SH_FPU=y
229# CONFIG_SH_STORE_QUEUES is not set 233# CONFIG_SH_STORE_QUEUES is not set
230CONFIG_CPU_HAS_INTEVT=y 234CONFIG_CPU_HAS_INTEVT=y
231CONFIG_CPU_HAS_SR_RB=y 235CONFIG_CPU_HAS_SR_RB=y
232CONFIG_CPU_HAS_PTEA=y
233CONFIG_CPU_HAS_FPU=y 236CONFIG_CPU_HAS_FPU=y
234 237
235# 238#
@@ -244,6 +247,7 @@ CONFIG_SH_7724_SOLUTION_ENGINE=y
244CONFIG_SH_TIMER_TMU=y 247CONFIG_SH_TIMER_TMU=y
245# CONFIG_SH_TIMER_CMT is not set 248# CONFIG_SH_TIMER_CMT is not set
246CONFIG_SH_PCLK_FREQ=33333333 249CONFIG_SH_PCLK_FREQ=33333333
250CONFIG_SH_CLK_CPG=y
247# CONFIG_NO_HZ is not set 251# CONFIG_NO_HZ is not set
248# CONFIG_HIGH_RES_TIMERS is not set 252# CONFIG_HIGH_RES_TIMERS is not set
249CONFIG_GENERIC_CLOCKEVENTS_BUILD=y 253CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
@@ -284,6 +288,7 @@ CONFIG_SECCOMP=y
284# CONFIG_PREEMPT_VOLUNTARY is not set 288# CONFIG_PREEMPT_VOLUNTARY is not set
285CONFIG_PREEMPT=y 289CONFIG_PREEMPT=y
286CONFIG_GUSA=y 290CONFIG_GUSA=y
291# CONFIG_SPARSE_IRQ is not set
287 292
288# 293#
289# Boot options 294# Boot options
@@ -373,6 +378,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
373# CONFIG_ECONET is not set 378# CONFIG_ECONET is not set
374# CONFIG_WAN_ROUTER is not set 379# CONFIG_WAN_ROUTER is not set
375# CONFIG_PHONET is not set 380# CONFIG_PHONET is not set
381# CONFIG_IEEE802154 is not set
376# CONFIG_NET_SCHED is not set 382# CONFIG_NET_SCHED is not set
377# CONFIG_DCB is not set 383# CONFIG_DCB is not set
378 384
@@ -390,7 +396,11 @@ CONFIG_WIRELESS=y
390# CONFIG_WIRELESS_OLD_REGULATORY is not set 396# CONFIG_WIRELESS_OLD_REGULATORY is not set
391# CONFIG_WIRELESS_EXT is not set 397# CONFIG_WIRELESS_EXT is not set
392# CONFIG_LIB80211 is not set 398# CONFIG_LIB80211 is not set
393# CONFIG_MAC80211 is not set 399
400#
401# CFG80211 needs to be enabled for MAC80211
402#
403CONFIG_MAC80211_DEFAULT_PS_VALUE=0
394# CONFIG_WIMAX is not set 404# CONFIG_WIMAX is not set
395# CONFIG_RFKILL is not set 405# CONFIG_RFKILL is not set
396# CONFIG_NET_9P is not set 406# CONFIG_NET_9P is not set
@@ -534,6 +544,7 @@ CONFIG_MISC_DEVICES=y
534# CONFIG_EEPROM_AT24 is not set 544# CONFIG_EEPROM_AT24 is not set
535# CONFIG_EEPROM_AT25 is not set 545# CONFIG_EEPROM_AT25 is not set
536# CONFIG_EEPROM_LEGACY is not set 546# CONFIG_EEPROM_LEGACY is not set
547# CONFIG_EEPROM_MAX6875 is not set
537# CONFIG_EEPROM_93CX6 is not set 548# CONFIG_EEPROM_93CX6 is not set
538CONFIG_HAVE_IDE=y 549CONFIG_HAVE_IDE=y
539# CONFIG_IDE is not set 550# CONFIG_IDE is not set
@@ -557,10 +568,6 @@ CONFIG_BLK_DEV_SD=y
557# CONFIG_BLK_DEV_SR is not set 568# CONFIG_BLK_DEV_SR is not set
558# CONFIG_CHR_DEV_SG is not set 569# CONFIG_CHR_DEV_SG is not set
559# CONFIG_CHR_DEV_SCH is not set 570# CONFIG_CHR_DEV_SCH is not set
560
561#
562# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
563#
564# CONFIG_SCSI_MULTI_LUN is not set 571# CONFIG_SCSI_MULTI_LUN is not set
565# CONFIG_SCSI_CONSTANTS is not set 572# CONFIG_SCSI_CONSTANTS is not set
566# CONFIG_SCSI_LOGGING is not set 573# CONFIG_SCSI_LOGGING is not set
@@ -577,6 +584,7 @@ CONFIG_SCSI_WAIT_SCAN=m
577# CONFIG_SCSI_SRP_ATTRS is not set 584# CONFIG_SCSI_SRP_ATTRS is not set
578CONFIG_SCSI_LOWLEVEL=y 585CONFIG_SCSI_LOWLEVEL=y
579# CONFIG_ISCSI_TCP is not set 586# CONFIG_ISCSI_TCP is not set
587# CONFIG_SCSI_BNX2_ISCSI is not set
580# CONFIG_LIBFC is not set 588# CONFIG_LIBFC is not set
581# CONFIG_LIBFCOE is not set 589# CONFIG_LIBFCOE is not set
582# CONFIG_SCSI_DEBUG is not set 590# CONFIG_SCSI_DEBUG is not set
@@ -585,7 +593,6 @@ CONFIG_SCSI_LOWLEVEL=y
585# CONFIG_ATA is not set 593# CONFIG_ATA is not set
586# CONFIG_MD is not set 594# CONFIG_MD is not set
587CONFIG_NETDEVICES=y 595CONFIG_NETDEVICES=y
588CONFIG_COMPAT_NET_DEV_OPS=y
589# CONFIG_DUMMY is not set 596# CONFIG_DUMMY is not set
590# CONFIG_BONDING is not set 597# CONFIG_BONDING is not set
591# CONFIG_MACVLAN is not set 598# CONFIG_MACVLAN is not set
@@ -617,6 +624,7 @@ CONFIG_NET_ETHERNET=y
617CONFIG_MII=y 624CONFIG_MII=y
618# CONFIG_AX88796 is not set 625# CONFIG_AX88796 is not set
619# CONFIG_STNIC is not set 626# CONFIG_STNIC is not set
627# CONFIG_SH_ETH is not set
620CONFIG_SMC91X=y 628CONFIG_SMC91X=y
621# CONFIG_ENC28J60 is not set 629# CONFIG_ENC28J60 is not set
622# CONFIG_ETHOC is not set 630# CONFIG_ETHOC is not set
@@ -631,6 +639,7 @@ CONFIG_SMC91X=y
631# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set 639# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
632# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set 640# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
633# CONFIG_B44 is not set 641# CONFIG_B44 is not set
642# CONFIG_KS8842 is not set
634# CONFIG_NETDEV_1000 is not set 643# CONFIG_NETDEV_1000 is not set
635# CONFIG_NETDEV_10000 is not set 644# CONFIG_NETDEV_10000 is not set
636 645
@@ -772,7 +781,6 @@ CONFIG_I2C_SH_MOBILE=y
772# CONFIG_SENSORS_PCF8574 is not set 781# CONFIG_SENSORS_PCF8574 is not set
773# CONFIG_PCF8575 is not set 782# CONFIG_PCF8575 is not set
774# CONFIG_SENSORS_PCA9539 is not set 783# CONFIG_SENSORS_PCA9539 is not set
775# CONFIG_SENSORS_MAX6875 is not set
776# CONFIG_SENSORS_TSL2550 is not set 784# CONFIG_SENSORS_TSL2550 is not set
777# CONFIG_I2C_DEBUG_CORE is not set 785# CONFIG_I2C_DEBUG_CORE is not set
778# CONFIG_I2C_DEBUG_ALGO is not set 786# CONFIG_I2C_DEBUG_ALGO is not set
@@ -844,10 +852,7 @@ CONFIG_SSB_POSSIBLE=y
844# CONFIG_MFD_WM8350_I2C is not set 852# CONFIG_MFD_WM8350_I2C is not set
845# CONFIG_MFD_PCF50633 is not set 853# CONFIG_MFD_PCF50633 is not set
846# CONFIG_REGULATOR is not set 854# CONFIG_REGULATOR is not set
847 855CONFIG_MEDIA_SUPPORT=y
848#
849# Multimedia devices
850#
851 856
852# 857#
853# Multimedia core support 858# Multimedia core support
@@ -1019,7 +1024,7 @@ CONFIG_USB_HID=y
1019# CONFIG_HID_CHERRY is not set 1024# CONFIG_HID_CHERRY is not set
1020# CONFIG_HID_CHICONY is not set 1025# CONFIG_HID_CHICONY is not set
1021# CONFIG_HID_CYPRESS is not set 1026# CONFIG_HID_CYPRESS is not set
1022# CONFIG_DRAGONRISE_FF is not set 1027# CONFIG_HID_DRAGONRISE is not set
1023# CONFIG_HID_EZKEY is not set 1028# CONFIG_HID_EZKEY is not set
1024# CONFIG_HID_KYE is not set 1029# CONFIG_HID_KYE is not set
1025# CONFIG_HID_GYRATION is not set 1030# CONFIG_HID_GYRATION is not set
@@ -1033,10 +1038,11 @@ CONFIG_USB_HID=y
1033# CONFIG_HID_SAMSUNG is not set 1038# CONFIG_HID_SAMSUNG is not set
1034# CONFIG_HID_SONY is not set 1039# CONFIG_HID_SONY is not set
1035# CONFIG_HID_SUNPLUS is not set 1040# CONFIG_HID_SUNPLUS is not set
1036# CONFIG_GREENASIA_FF is not set 1041# CONFIG_HID_GREENASIA is not set
1042# CONFIG_HID_SMARTJOYPLUS is not set
1037# CONFIG_HID_TOPSEED is not set 1043# CONFIG_HID_TOPSEED is not set
1038# CONFIG_THRUSTMASTER_FF is not set 1044# CONFIG_HID_THRUSTMASTER is not set
1039# CONFIG_ZEROPLUS_FF is not set 1045# CONFIG_HID_ZEROPLUS is not set
1040CONFIG_USB_SUPPORT=y 1046CONFIG_USB_SUPPORT=y
1041CONFIG_USB_ARCH_HAS_HCD=y 1047CONFIG_USB_ARCH_HAS_HCD=y
1042# CONFIG_USB_ARCH_HAS_OHCI is not set 1048# CONFIG_USB_ARCH_HAS_OHCI is not set
@@ -1228,6 +1234,10 @@ CONFIG_UIO=y
1228CONFIG_UIO_PDRV_GENIRQ=y 1234CONFIG_UIO_PDRV_GENIRQ=y
1229# CONFIG_UIO_SMX is not set 1235# CONFIG_UIO_SMX is not set
1230# CONFIG_UIO_SERCOS3 is not set 1236# CONFIG_UIO_SERCOS3 is not set
1237
1238#
1239# TI VLYNQ
1240#
1231# CONFIG_STAGING is not set 1241# CONFIG_STAGING is not set
1232 1242
1233# 1243#
@@ -1249,10 +1259,11 @@ CONFIG_FS_MBCACHE=y
1249# CONFIG_REISERFS_FS is not set 1259# CONFIG_REISERFS_FS is not set
1250# CONFIG_JFS_FS is not set 1260# CONFIG_JFS_FS is not set
1251CONFIG_FS_POSIX_ACL=y 1261CONFIG_FS_POSIX_ACL=y
1252CONFIG_FILE_LOCKING=y
1253# CONFIG_XFS_FS is not set 1262# CONFIG_XFS_FS is not set
1254# CONFIG_OCFS2_FS is not set 1263# CONFIG_OCFS2_FS is not set
1255# CONFIG_BTRFS_FS is not set 1264# CONFIG_BTRFS_FS is not set
1265CONFIG_FILE_LOCKING=y
1266CONFIG_FSNOTIFY=y
1256CONFIG_DNOTIFY=y 1267CONFIG_DNOTIFY=y
1257CONFIG_INOTIFY=y 1268CONFIG_INOTIFY=y
1258CONFIG_INOTIFY_USER=y 1269CONFIG_INOTIFY_USER=y
@@ -1408,22 +1419,7 @@ CONFIG_HAVE_FUNCTION_TRACER=y
1408CONFIG_HAVE_DYNAMIC_FTRACE=y 1419CONFIG_HAVE_DYNAMIC_FTRACE=y
1409CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 1420CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1410CONFIG_TRACING_SUPPORT=y 1421CONFIG_TRACING_SUPPORT=y
1411 1422# CONFIG_FTRACE is not set
1412#
1413# Tracers
1414#
1415# CONFIG_FUNCTION_TRACER is not set
1416# CONFIG_IRQSOFF_TRACER is not set
1417# CONFIG_PREEMPT_TRACER is not set
1418# CONFIG_SCHED_TRACER is not set
1419# CONFIG_CONTEXT_SWITCH_TRACER is not set
1420# CONFIG_EVENT_TRACER is not set
1421# CONFIG_BOOT_TRACER is not set
1422# CONFIG_TRACE_BRANCH_PROFILING is not set
1423# CONFIG_STACK_TRACER is not set
1424# CONFIG_KMEMTRACE is not set
1425# CONFIG_WORKQUEUE_TRACER is not set
1426# CONFIG_BLK_DEV_IO_TRACE is not set
1427# CONFIG_DMA_API_DEBUG is not set 1423# CONFIG_DMA_API_DEBUG is not set
1428# CONFIG_SAMPLES is not set 1424# CONFIG_SAMPLES is not set
1429CONFIG_HAVE_ARCH_KGDB=y 1425CONFIG_HAVE_ARCH_KGDB=y
@@ -1550,3 +1546,4 @@ CONFIG_HAS_IOMEM=y
1550CONFIG_HAS_IOPORT=y 1546CONFIG_HAS_IOPORT=y
1551CONFIG_HAS_DMA=y 1547CONFIG_HAS_DMA=y
1552CONFIG_NLATTR=y 1548CONFIG_NLATTR=y
1549CONFIG_GENERIC_ATOMIC64=y
diff --git a/arch/sh/configs/se7750_defconfig b/arch/sh/configs/se7750_defconfig
index ed1a1230f636..564bf7bdce6b 100644
--- a/arch/sh/configs/se7750_defconfig
+++ b/arch/sh/configs/se7750_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.30-rc3 3# Linux kernel version: 2.6.30
4# Mon Apr 27 13:06:02 2009 4# Thu Jun 18 13:00:01 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -19,6 +19,7 @@ CONFIG_GENERIC_TIME=y
19CONFIG_GENERIC_CLOCKEVENTS=y 19CONFIG_GENERIC_CLOCKEVENTS=y
20# CONFIG_ARCH_SUSPEND_POSSIBLE is not set 20# CONFIG_ARCH_SUSPEND_POSSIBLE is not set
21CONFIG_ARCH_HIBERNATION_POSSIBLE=y 21CONFIG_ARCH_HIBERNATION_POSSIBLE=y
22CONFIG_SYS_SUPPORTS_TMU=y
22CONFIG_STACKTRACE_SUPPORT=y 23CONFIG_STACKTRACE_SUPPORT=y
23CONFIG_LOCKDEP_SUPPORT=y 24CONFIG_LOCKDEP_SUPPORT=y
24CONFIG_HAVE_LATENCYTOP_SUPPORT=y 25CONFIG_HAVE_LATENCYTOP_SUPPORT=y
@@ -71,7 +72,6 @@ CONFIG_UID16=y
71# CONFIG_SYSCTL_SYSCALL is not set 72# CONFIG_SYSCTL_SYSCALL is not set
72CONFIG_KALLSYMS=y 73CONFIG_KALLSYMS=y
73# CONFIG_KALLSYMS_EXTRA_PASS is not set 74# CONFIG_KALLSYMS_EXTRA_PASS is not set
74# CONFIG_STRIP_ASM_SYMS is not set
75# CONFIG_HOTPLUG is not set 75# CONFIG_HOTPLUG is not set
76CONFIG_PRINTK=y 76CONFIG_PRINTK=y
77CONFIG_BUG=y 77CONFIG_BUG=y
@@ -84,7 +84,12 @@ CONFIG_TIMERFD=y
84CONFIG_EVENTFD=y 84CONFIG_EVENTFD=y
85CONFIG_SHMEM=y 85CONFIG_SHMEM=y
86CONFIG_AIO=y 86CONFIG_AIO=y
87
88#
89# Performance Counters
90#
87CONFIG_VM_EVENT_COUNTERS=y 91CONFIG_VM_EVENT_COUNTERS=y
92# CONFIG_STRIP_ASM_SYMS is not set
88CONFIG_COMPAT_BRK=y 93CONFIG_COMPAT_BRK=y
89CONFIG_SLAB=y 94CONFIG_SLAB=y
90# CONFIG_SLUB is not set 95# CONFIG_SLUB is not set
@@ -173,6 +178,7 @@ CONFIG_CPU_SUBTYPE_SH7750=y
173CONFIG_QUICKLIST=y 178CONFIG_QUICKLIST=y
174CONFIG_MMU=y 179CONFIG_MMU=y
175CONFIG_PAGE_OFFSET=0x80000000 180CONFIG_PAGE_OFFSET=0x80000000
181CONFIG_FORCE_MAX_ZONEORDER=11
176CONFIG_MEMORY_START=0x0c000000 182CONFIG_MEMORY_START=0x0c000000
177CONFIG_MEMORY_SIZE=0x02000000 183CONFIG_MEMORY_SIZE=0x02000000
178CONFIG_29BIT=y 184CONFIG_29BIT=y
@@ -187,7 +193,6 @@ CONFIG_PAGE_SIZE_4KB=y
187# CONFIG_PAGE_SIZE_8KB is not set 193# CONFIG_PAGE_SIZE_8KB is not set
188# CONFIG_PAGE_SIZE_16KB is not set 194# CONFIG_PAGE_SIZE_16KB is not set
189# CONFIG_PAGE_SIZE_64KB is not set 195# CONFIG_PAGE_SIZE_64KB is not set
190CONFIG_ENTRY_OFFSET=0x00001000
191CONFIG_SELECT_MEMORY_MODEL=y 196CONFIG_SELECT_MEMORY_MODEL=y
192CONFIG_FLATMEM_MANUAL=y 197CONFIG_FLATMEM_MANUAL=y
193# CONFIG_DISCONTIGMEM_MANUAL is not set 198# CONFIG_DISCONTIGMEM_MANUAL is not set
@@ -200,9 +205,9 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
200# CONFIG_PHYS_ADDR_T_64BIT is not set 205# CONFIG_PHYS_ADDR_T_64BIT is not set
201CONFIG_ZONE_DMA_FLAG=0 206CONFIG_ZONE_DMA_FLAG=0
202CONFIG_NR_QUICK=2 207CONFIG_NR_QUICK=2
203CONFIG_UNEVICTABLE_LRU=y
204CONFIG_HAVE_MLOCK=y 208CONFIG_HAVE_MLOCK=y
205CONFIG_HAVE_MLOCKED_PAGE_BIT=y 209CONFIG_HAVE_MLOCKED_PAGE_BIT=y
210CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
206 211
207# 212#
208# Cache configuration 213# Cache configuration
@@ -221,7 +226,6 @@ CONFIG_SH_FPU=y
221CONFIG_CPU_HAS_INTEVT=y 226CONFIG_CPU_HAS_INTEVT=y
222CONFIG_CPU_HAS_IPR_IRQ=y 227CONFIG_CPU_HAS_IPR_IRQ=y
223CONFIG_CPU_HAS_SR_RB=y 228CONFIG_CPU_HAS_SR_RB=y
224CONFIG_CPU_HAS_PTEA=y
225CONFIG_CPU_HAS_FPU=y 229CONFIG_CPU_HAS_FPU=y
226 230
227# 231#
@@ -233,9 +237,10 @@ CONFIG_SH_SOLUTION_ENGINE=y
233# 237#
234# Timer and clock configuration 238# Timer and clock configuration
235# 239#
236CONFIG_SH_TMU=y 240CONFIG_SH_TIMER_TMU=y
237CONFIG_SH_TIMER_IRQ=16
238CONFIG_SH_PCLK_FREQ=33333333 241CONFIG_SH_PCLK_FREQ=33333333
242CONFIG_SH_CLK_CPG=y
243CONFIG_SH_CLK_CPG_LEGACY=y
239# CONFIG_NO_HZ is not set 244# CONFIG_NO_HZ is not set
240# CONFIG_HIGH_RES_TIMERS is not set 245# CONFIG_HIGH_RES_TIMERS is not set
241CONFIG_GENERIC_CLOCKEVENTS_BUILD=y 246CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
@@ -277,12 +282,14 @@ CONFIG_PREEMPT_NONE=y
277# CONFIG_PREEMPT is not set 282# CONFIG_PREEMPT is not set
278CONFIG_GUSA=y 283CONFIG_GUSA=y
279# CONFIG_GUSA_RB is not set 284# CONFIG_GUSA_RB is not set
285# CONFIG_SPARSE_IRQ is not set
280 286
281# 287#
282# Boot options 288# Boot options
283# 289#
284CONFIG_ZERO_PAGE_OFFSET=0x00001000 290CONFIG_ZERO_PAGE_OFFSET=0x00001000
285CONFIG_BOOT_LINK_OFFSET=0x00800000 291CONFIG_BOOT_LINK_OFFSET=0x00800000
292CONFIG_ENTRY_OFFSET=0x00001000
286# CONFIG_UBC_WAKEUP is not set 293# CONFIG_UBC_WAKEUP is not set
287# CONFIG_CMDLINE_BOOL is not set 294# CONFIG_CMDLINE_BOOL is not set
288 295
@@ -365,6 +372,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
365# CONFIG_ECONET is not set 372# CONFIG_ECONET is not set
366# CONFIG_WAN_ROUTER is not set 373# CONFIG_WAN_ROUTER is not set
367# CONFIG_PHONET is not set 374# CONFIG_PHONET is not set
375# CONFIG_IEEE802154 is not set
368# CONFIG_NET_SCHED is not set 376# CONFIG_NET_SCHED is not set
369# CONFIG_DCB is not set 377# CONFIG_DCB is not set
370 378
@@ -382,7 +390,11 @@ CONFIG_WIRELESS=y
382# CONFIG_WIRELESS_OLD_REGULATORY is not set 390# CONFIG_WIRELESS_OLD_REGULATORY is not set
383# CONFIG_WIRELESS_EXT is not set 391# CONFIG_WIRELESS_EXT is not set
384# CONFIG_LIB80211 is not set 392# CONFIG_LIB80211 is not set
385# CONFIG_MAC80211 is not set 393
394#
395# CFG80211 needs to be enabled for MAC80211
396#
397CONFIG_MAC80211_DEFAULT_PS_VALUE=0
386# CONFIG_WIMAX is not set 398# CONFIG_WIMAX is not set
387# CONFIG_RFKILL is not set 399# CONFIG_RFKILL is not set
388# CONFIG_NET_9P is not set 400# CONFIG_NET_9P is not set
@@ -535,10 +547,6 @@ CONFIG_SCSI_PROC_FS=y
535# CONFIG_BLK_DEV_SR is not set 547# CONFIG_BLK_DEV_SR is not set
536# CONFIG_CHR_DEV_SG is not set 548# CONFIG_CHR_DEV_SG is not set
537# CONFIG_CHR_DEV_SCH is not set 549# CONFIG_CHR_DEV_SCH is not set
538
539#
540# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
541#
542# CONFIG_SCSI_MULTI_LUN is not set 550# CONFIG_SCSI_MULTI_LUN is not set
543# CONFIG_SCSI_CONSTANTS is not set 551# CONFIG_SCSI_CONSTANTS is not set
544# CONFIG_SCSI_LOGGING is not set 552# CONFIG_SCSI_LOGGING is not set
@@ -555,6 +563,7 @@ CONFIG_SCSI_WAIT_SCAN=m
555# CONFIG_SCSI_SRP_ATTRS is not set 563# CONFIG_SCSI_SRP_ATTRS is not set
556CONFIG_SCSI_LOWLEVEL=y 564CONFIG_SCSI_LOWLEVEL=y
557# CONFIG_ISCSI_TCP is not set 565# CONFIG_ISCSI_TCP is not set
566# CONFIG_SCSI_BNX2_ISCSI is not set
558# CONFIG_LIBFC is not set 567# CONFIG_LIBFC is not set
559# CONFIG_LIBFCOE is not set 568# CONFIG_LIBFCOE is not set
560# CONFIG_SCSI_DEBUG is not set 569# CONFIG_SCSI_DEBUG is not set
@@ -563,7 +572,6 @@ CONFIG_SCSI_LOWLEVEL=y
563# CONFIG_ATA is not set 572# CONFIG_ATA is not set
564# CONFIG_MD is not set 573# CONFIG_MD is not set
565CONFIG_NETDEVICES=y 574CONFIG_NETDEVICES=y
566CONFIG_COMPAT_NET_DEV_OPS=y
567# CONFIG_DUMMY is not set 575# CONFIG_DUMMY is not set
568# CONFIG_BONDING is not set 576# CONFIG_BONDING is not set
569# CONFIG_MACVLAN is not set 577# CONFIG_MACVLAN is not set
@@ -588,6 +596,7 @@ CONFIG_STNIC=y
588# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set 596# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
589# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set 597# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
590# CONFIG_B44 is not set 598# CONFIG_B44 is not set
599# CONFIG_KS8842 is not set
591CONFIG_NETDEV_1000=y 600CONFIG_NETDEV_1000=y
592CONFIG_NETDEV_10000=y 601CONFIG_NETDEV_10000=y
593 602
@@ -697,22 +706,7 @@ CONFIG_SSB_POSSIBLE=y
697# CONFIG_HTC_PASIC3 is not set 706# CONFIG_HTC_PASIC3 is not set
698# CONFIG_MFD_TMIO is not set 707# CONFIG_MFD_TMIO is not set
699# CONFIG_REGULATOR is not set 708# CONFIG_REGULATOR is not set
700 709# CONFIG_MEDIA_SUPPORT is not set
701#
702# Multimedia devices
703#
704
705#
706# Multimedia core support
707#
708# CONFIG_VIDEO_DEV is not set
709# CONFIG_DVB_CORE is not set
710# CONFIG_VIDEO_MEDIA is not set
711
712#
713# Multimedia drivers
714#
715# CONFIG_DAB is not set
716 710
717# 711#
718# Graphics support 712# Graphics support
@@ -751,10 +745,15 @@ CONFIG_USB_ARCH_HAS_HCD=y
751# CONFIG_MEMSTICK is not set 745# CONFIG_MEMSTICK is not set
752# CONFIG_NEW_LEDS is not set 746# CONFIG_NEW_LEDS is not set
753# CONFIG_ACCESSIBILITY is not set 747# CONFIG_ACCESSIBILITY is not set
748CONFIG_RTC_LIB=y
754# CONFIG_RTC_CLASS is not set 749# CONFIG_RTC_CLASS is not set
755# CONFIG_DMADEVICES is not set 750# CONFIG_DMADEVICES is not set
756# CONFIG_AUXDISPLAY is not set 751# CONFIG_AUXDISPLAY is not set
757# CONFIG_UIO is not set 752# CONFIG_UIO is not set
753
754#
755# TI VLYNQ
756#
758# CONFIG_STAGING is not set 757# CONFIG_STAGING is not set
759 758
760# 759#
@@ -766,10 +765,11 @@ CONFIG_USB_ARCH_HAS_HCD=y
766# CONFIG_REISERFS_FS is not set 765# CONFIG_REISERFS_FS is not set
767# CONFIG_JFS_FS is not set 766# CONFIG_JFS_FS is not set
768# CONFIG_FS_POSIX_ACL is not set 767# CONFIG_FS_POSIX_ACL is not set
769CONFIG_FILE_LOCKING=y
770# CONFIG_XFS_FS is not set 768# CONFIG_XFS_FS is not set
771# CONFIG_OCFS2_FS is not set 769# CONFIG_OCFS2_FS is not set
772# CONFIG_BTRFS_FS is not set 770# CONFIG_BTRFS_FS is not set
771CONFIG_FILE_LOCKING=y
772CONFIG_FSNOTIFY=y
773CONFIG_DNOTIFY=y 773CONFIG_DNOTIFY=y
774CONFIG_INOTIFY=y 774CONFIG_INOTIFY=y
775CONFIG_INOTIFY_USER=y 775CONFIG_INOTIFY_USER=y
@@ -897,27 +897,12 @@ CONFIG_HAVE_FUNCTION_TRACER=y
897CONFIG_HAVE_DYNAMIC_FTRACE=y 897CONFIG_HAVE_DYNAMIC_FTRACE=y
898CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 898CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
899CONFIG_TRACING_SUPPORT=y 899CONFIG_TRACING_SUPPORT=y
900 900# CONFIG_FTRACE is not set
901#
902# Tracers
903#
904# CONFIG_FUNCTION_TRACER is not set
905# CONFIG_IRQSOFF_TRACER is not set
906# CONFIG_SCHED_TRACER is not set
907# CONFIG_CONTEXT_SWITCH_TRACER is not set
908# CONFIG_EVENT_TRACER is not set
909# CONFIG_BOOT_TRACER is not set
910# CONFIG_TRACE_BRANCH_PROFILING is not set
911# CONFIG_STACK_TRACER is not set
912# CONFIG_KMEMTRACE is not set
913# CONFIG_WORKQUEUE_TRACER is not set
914# CONFIG_BLK_DEV_IO_TRACE is not set
915# CONFIG_DMA_API_DEBUG is not set 901# CONFIG_DMA_API_DEBUG is not set
916# CONFIG_SAMPLES is not set 902# CONFIG_SAMPLES is not set
917CONFIG_HAVE_ARCH_KGDB=y 903CONFIG_HAVE_ARCH_KGDB=y
918# CONFIG_SH_STANDARD_BIOS is not set 904# CONFIG_SH_STANDARD_BIOS is not set
919# CONFIG_EARLY_SCIF_CONSOLE is not set 905# CONFIG_EARLY_SCIF_CONSOLE is not set
920# CONFIG_MORE_COMPILE_OPTIONS is not set
921 906
922# 907#
923# Security options 908# Security options
@@ -1032,3 +1017,4 @@ CONFIG_HAS_IOMEM=y
1032CONFIG_HAS_IOPORT=y 1017CONFIG_HAS_IOPORT=y
1033CONFIG_HAS_DMA=y 1018CONFIG_HAS_DMA=y
1034CONFIG_NLATTR=y 1019CONFIG_NLATTR=y
1020CONFIG_GENERIC_ATOMIC64=y
diff --git a/arch/sh/configs/se7751_defconfig b/arch/sh/configs/se7751_defconfig
index 55f3b788e0cb..eb431c43e994 100644
--- a/arch/sh/configs/se7751_defconfig
+++ b/arch/sh/configs/se7751_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.30-rc3 3# Linux kernel version: 2.6.30
4# Mon Apr 27 13:06:44 2009 4# Thu Jun 18 13:02:26 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -19,6 +19,7 @@ CONFIG_GENERIC_TIME=y
19CONFIG_GENERIC_CLOCKEVENTS=y 19CONFIG_GENERIC_CLOCKEVENTS=y
20# CONFIG_ARCH_SUSPEND_POSSIBLE is not set 20# CONFIG_ARCH_SUSPEND_POSSIBLE is not set
21CONFIG_ARCH_HIBERNATION_POSSIBLE=y 21CONFIG_ARCH_HIBERNATION_POSSIBLE=y
22CONFIG_SYS_SUPPORTS_TMU=y
22CONFIG_STACKTRACE_SUPPORT=y 23CONFIG_STACKTRACE_SUPPORT=y
23CONFIG_LOCKDEP_SUPPORT=y 24CONFIG_LOCKDEP_SUPPORT=y
24CONFIG_HAVE_LATENCYTOP_SUPPORT=y 25CONFIG_HAVE_LATENCYTOP_SUPPORT=y
@@ -74,7 +75,6 @@ CONFIG_UID16=y
74# CONFIG_SYSCTL_SYSCALL is not set 75# CONFIG_SYSCTL_SYSCALL is not set
75CONFIG_KALLSYMS=y 76CONFIG_KALLSYMS=y
76# CONFIG_KALLSYMS_EXTRA_PASS is not set 77# CONFIG_KALLSYMS_EXTRA_PASS is not set
77# CONFIG_STRIP_ASM_SYMS is not set
78# CONFIG_HOTPLUG is not set 78# CONFIG_HOTPLUG is not set
79CONFIG_PRINTK=y 79CONFIG_PRINTK=y
80CONFIG_BUG=y 80CONFIG_BUG=y
@@ -87,7 +87,12 @@ CONFIG_TIMERFD=y
87CONFIG_EVENTFD=y 87CONFIG_EVENTFD=y
88CONFIG_SHMEM=y 88CONFIG_SHMEM=y
89CONFIG_AIO=y 89CONFIG_AIO=y
90
91#
92# Performance Counters
93#
90CONFIG_VM_EVENT_COUNTERS=y 94CONFIG_VM_EVENT_COUNTERS=y
95# CONFIG_STRIP_ASM_SYMS is not set
91CONFIG_COMPAT_BRK=y 96CONFIG_COMPAT_BRK=y
92CONFIG_SLAB=y 97CONFIG_SLAB=y
93# CONFIG_SLUB is not set 98# CONFIG_SLUB is not set
@@ -176,6 +181,7 @@ CONFIG_CPU_SUBTYPE_SH7751=y
176CONFIG_QUICKLIST=y 181CONFIG_QUICKLIST=y
177CONFIG_MMU=y 182CONFIG_MMU=y
178CONFIG_PAGE_OFFSET=0x80000000 183CONFIG_PAGE_OFFSET=0x80000000
184CONFIG_FORCE_MAX_ZONEORDER=11
179CONFIG_MEMORY_START=0x0c000000 185CONFIG_MEMORY_START=0x0c000000
180CONFIG_MEMORY_SIZE=0x04000000 186CONFIG_MEMORY_SIZE=0x04000000
181CONFIG_29BIT=y 187CONFIG_29BIT=y
@@ -190,7 +196,6 @@ CONFIG_PAGE_SIZE_4KB=y
190# CONFIG_PAGE_SIZE_8KB is not set 196# CONFIG_PAGE_SIZE_8KB is not set
191# CONFIG_PAGE_SIZE_16KB is not set 197# CONFIG_PAGE_SIZE_16KB is not set
192# CONFIG_PAGE_SIZE_64KB is not set 198# CONFIG_PAGE_SIZE_64KB is not set
193CONFIG_ENTRY_OFFSET=0x00001000
194CONFIG_SELECT_MEMORY_MODEL=y 199CONFIG_SELECT_MEMORY_MODEL=y
195CONFIG_FLATMEM_MANUAL=y 200CONFIG_FLATMEM_MANUAL=y
196# CONFIG_DISCONTIGMEM_MANUAL is not set 201# CONFIG_DISCONTIGMEM_MANUAL is not set
@@ -203,9 +208,9 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
203# CONFIG_PHYS_ADDR_T_64BIT is not set 208# CONFIG_PHYS_ADDR_T_64BIT is not set
204CONFIG_ZONE_DMA_FLAG=0 209CONFIG_ZONE_DMA_FLAG=0
205CONFIG_NR_QUICK=2 210CONFIG_NR_QUICK=2
206CONFIG_UNEVICTABLE_LRU=y
207CONFIG_HAVE_MLOCK=y 211CONFIG_HAVE_MLOCK=y
208CONFIG_HAVE_MLOCKED_PAGE_BIT=y 212CONFIG_HAVE_MLOCKED_PAGE_BIT=y
213CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
209 214
210# 215#
211# Cache configuration 216# Cache configuration
@@ -224,7 +229,6 @@ CONFIG_SH_FPU=y
224CONFIG_CPU_HAS_INTEVT=y 229CONFIG_CPU_HAS_INTEVT=y
225CONFIG_CPU_HAS_IPR_IRQ=y 230CONFIG_CPU_HAS_IPR_IRQ=y
226CONFIG_CPU_HAS_SR_RB=y 231CONFIG_CPU_HAS_SR_RB=y
227CONFIG_CPU_HAS_PTEA=y
228CONFIG_CPU_HAS_FPU=y 232CONFIG_CPU_HAS_FPU=y
229 233
230# 234#
@@ -237,9 +241,10 @@ CONFIG_SH_7751_SOLUTION_ENGINE=y
237# 241#
238# Timer and clock configuration 242# Timer and clock configuration
239# 243#
240CONFIG_SH_TMU=y 244CONFIG_SH_TIMER_TMU=y
241CONFIG_SH_TIMER_IRQ=16
242CONFIG_SH_PCLK_FREQ=60000000 245CONFIG_SH_PCLK_FREQ=60000000
246CONFIG_SH_CLK_CPG=y
247CONFIG_SH_CLK_CPG_LEGACY=y
243# CONFIG_NO_HZ is not set 248# CONFIG_NO_HZ is not set
244# CONFIG_HIGH_RES_TIMERS is not set 249# CONFIG_HIGH_RES_TIMERS is not set
245CONFIG_GENERIC_CLOCKEVENTS_BUILD=y 250CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
@@ -281,12 +286,14 @@ CONFIG_PREEMPT_NONE=y
281# CONFIG_PREEMPT is not set 286# CONFIG_PREEMPT is not set
282CONFIG_GUSA=y 287CONFIG_GUSA=y
283# CONFIG_GUSA_RB is not set 288# CONFIG_GUSA_RB is not set
289# CONFIG_SPARSE_IRQ is not set
284 290
285# 291#
286# Boot options 292# Boot options
287# 293#
288CONFIG_ZERO_PAGE_OFFSET=0x00010000 294CONFIG_ZERO_PAGE_OFFSET=0x00010000
289CONFIG_BOOT_LINK_OFFSET=0x00800000 295CONFIG_BOOT_LINK_OFFSET=0x00800000
296CONFIG_ENTRY_OFFSET=0x00001000
290# CONFIG_UBC_WAKEUP is not set 297# CONFIG_UBC_WAKEUP is not set
291CONFIG_CMDLINE_BOOL=y 298CONFIG_CMDLINE_BOOL=y
292CONFIG_CMDLINE="console=ttySC1,38400" 299CONFIG_CMDLINE="console=ttySC1,38400"
@@ -389,6 +396,7 @@ CONFIG_IP_NF_QUEUE=y
389# CONFIG_ECONET is not set 396# CONFIG_ECONET is not set
390# CONFIG_WAN_ROUTER is not set 397# CONFIG_WAN_ROUTER is not set
391# CONFIG_PHONET is not set 398# CONFIG_PHONET is not set
399# CONFIG_IEEE802154 is not set
392# CONFIG_NET_SCHED is not set 400# CONFIG_NET_SCHED is not set
393# CONFIG_DCB is not set 401# CONFIG_DCB is not set
394 402
@@ -406,7 +414,11 @@ CONFIG_WIRELESS=y
406# CONFIG_WIRELESS_OLD_REGULATORY is not set 414# CONFIG_WIRELESS_OLD_REGULATORY is not set
407# CONFIG_WIRELESS_EXT is not set 415# CONFIG_WIRELESS_EXT is not set
408# CONFIG_LIB80211 is not set 416# CONFIG_LIB80211 is not set
409# CONFIG_MAC80211 is not set 417
418#
419# CFG80211 needs to be enabled for MAC80211
420#
421CONFIG_MAC80211_DEFAULT_PS_VALUE=0
410# CONFIG_WIMAX is not set 422# CONFIG_WIMAX is not set
411# CONFIG_RFKILL is not set 423# CONFIG_RFKILL is not set
412# CONFIG_NET_9P is not set 424# CONFIG_NET_9P is not set
@@ -535,7 +547,6 @@ CONFIG_HAVE_IDE=y
535# CONFIG_ATA is not set 547# CONFIG_ATA is not set
536# CONFIG_MD is not set 548# CONFIG_MD is not set
537CONFIG_NETDEVICES=y 549CONFIG_NETDEVICES=y
538CONFIG_COMPAT_NET_DEV_OPS=y
539# CONFIG_DUMMY is not set 550# CONFIG_DUMMY is not set
540# CONFIG_BONDING is not set 551# CONFIG_BONDING is not set
541# CONFIG_MACVLAN is not set 552# CONFIG_MACVLAN is not set
@@ -560,6 +571,7 @@ CONFIG_MII=y
560# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set 571# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
561# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set 572# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
562# CONFIG_B44 is not set 573# CONFIG_B44 is not set
574# CONFIG_KS8842 is not set
563CONFIG_NETDEV_1000=y 575CONFIG_NETDEV_1000=y
564CONFIG_NETDEV_10000=y 576CONFIG_NETDEV_10000=y
565 577
@@ -660,22 +672,7 @@ CONFIG_SSB_POSSIBLE=y
660# CONFIG_HTC_PASIC3 is not set 672# CONFIG_HTC_PASIC3 is not set
661# CONFIG_MFD_TMIO is not set 673# CONFIG_MFD_TMIO is not set
662# CONFIG_REGULATOR is not set 674# CONFIG_REGULATOR is not set
663 675# CONFIG_MEDIA_SUPPORT is not set
664#
665# Multimedia devices
666#
667
668#
669# Multimedia core support
670#
671# CONFIG_VIDEO_DEV is not set
672# CONFIG_DVB_CORE is not set
673# CONFIG_VIDEO_MEDIA is not set
674
675#
676# Multimedia drivers
677#
678# CONFIG_DAB is not set
679 676
680# 677#
681# Graphics support 678# Graphics support
@@ -714,10 +711,15 @@ CONFIG_USB_ARCH_HAS_HCD=y
714# CONFIG_MEMSTICK is not set 711# CONFIG_MEMSTICK is not set
715# CONFIG_NEW_LEDS is not set 712# CONFIG_NEW_LEDS is not set
716# CONFIG_ACCESSIBILITY is not set 713# CONFIG_ACCESSIBILITY is not set
714CONFIG_RTC_LIB=y
717# CONFIG_RTC_CLASS is not set 715# CONFIG_RTC_CLASS is not set
718# CONFIG_DMADEVICES is not set 716# CONFIG_DMADEVICES is not set
719# CONFIG_AUXDISPLAY is not set 717# CONFIG_AUXDISPLAY is not set
720# CONFIG_UIO is not set 718# CONFIG_UIO is not set
719
720#
721# TI VLYNQ
722#
721# CONFIG_STAGING is not set 723# CONFIG_STAGING is not set
722 724
723# 725#
@@ -731,10 +733,11 @@ CONFIG_EXT2_FS=y
731# CONFIG_REISERFS_FS is not set 733# CONFIG_REISERFS_FS is not set
732# CONFIG_JFS_FS is not set 734# CONFIG_JFS_FS is not set
733# CONFIG_FS_POSIX_ACL is not set 735# CONFIG_FS_POSIX_ACL is not set
734CONFIG_FILE_LOCKING=y
735# CONFIG_XFS_FS is not set 736# CONFIG_XFS_FS is not set
736# CONFIG_OCFS2_FS is not set 737# CONFIG_OCFS2_FS is not set
737# CONFIG_BTRFS_FS is not set 738# CONFIG_BTRFS_FS is not set
739CONFIG_FILE_LOCKING=y
740CONFIG_FSNOTIFY=y
738CONFIG_DNOTIFY=y 741CONFIG_DNOTIFY=y
739CONFIG_INOTIFY=y 742CONFIG_INOTIFY=y
740CONFIG_INOTIFY_USER=y 743CONFIG_INOTIFY_USER=y
@@ -842,27 +845,12 @@ CONFIG_HAVE_FUNCTION_TRACER=y
842CONFIG_HAVE_DYNAMIC_FTRACE=y 845CONFIG_HAVE_DYNAMIC_FTRACE=y
843CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 846CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
844CONFIG_TRACING_SUPPORT=y 847CONFIG_TRACING_SUPPORT=y
845 848# CONFIG_FTRACE is not set
846#
847# Tracers
848#
849# CONFIG_FUNCTION_TRACER is not set
850# CONFIG_IRQSOFF_TRACER is not set
851# CONFIG_SCHED_TRACER is not set
852# CONFIG_CONTEXT_SWITCH_TRACER is not set
853# CONFIG_EVENT_TRACER is not set
854# CONFIG_BOOT_TRACER is not set
855# CONFIG_TRACE_BRANCH_PROFILING is not set
856# CONFIG_STACK_TRACER is not set
857# CONFIG_KMEMTRACE is not set
858# CONFIG_WORKQUEUE_TRACER is not set
859# CONFIG_BLK_DEV_IO_TRACE is not set
860# CONFIG_DMA_API_DEBUG is not set 849# CONFIG_DMA_API_DEBUG is not set
861# CONFIG_SAMPLES is not set 850# CONFIG_SAMPLES is not set
862CONFIG_HAVE_ARCH_KGDB=y 851CONFIG_HAVE_ARCH_KGDB=y
863# CONFIG_SH_STANDARD_BIOS is not set 852# CONFIG_SH_STANDARD_BIOS is not set
864# CONFIG_EARLY_SCIF_CONSOLE is not set 853# CONFIG_EARLY_SCIF_CONSOLE is not set
865# CONFIG_MORE_COMPILE_OPTIONS is not set
866 854
867# 855#
868# Security options 856# Security options
@@ -978,3 +966,4 @@ CONFIG_HAS_IOMEM=y
978CONFIG_HAS_IOPORT=y 966CONFIG_HAS_IOPORT=y
979CONFIG_HAS_DMA=y 967CONFIG_HAS_DMA=y
980CONFIG_NLATTR=y 968CONFIG_NLATTR=y
969CONFIG_GENERIC_ATOMIC64=y
diff --git a/arch/sh/configs/se7780_defconfig b/arch/sh/configs/se7780_defconfig
index c4f0af32efa9..756beec5fb28 100644
--- a/arch/sh/configs/se7780_defconfig
+++ b/arch/sh/configs/se7780_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.30-rc3 3# Linux kernel version: 2.6.30
4# Mon Apr 27 13:07:14 2009 4# Thu Jun 18 13:03:56 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -20,6 +20,7 @@ CONFIG_GENERIC_CLOCKEVENTS=y
20# CONFIG_ARCH_SUSPEND_POSSIBLE is not set 20# CONFIG_ARCH_SUSPEND_POSSIBLE is not set
21CONFIG_ARCH_HIBERNATION_POSSIBLE=y 21CONFIG_ARCH_HIBERNATION_POSSIBLE=y
22CONFIG_SYS_SUPPORTS_PCI=y 22CONFIG_SYS_SUPPORTS_PCI=y
23CONFIG_SYS_SUPPORTS_TMU=y
23CONFIG_STACKTRACE_SUPPORT=y 24CONFIG_STACKTRACE_SUPPORT=y
24CONFIG_LOCKDEP_SUPPORT=y 25CONFIG_LOCKDEP_SUPPORT=y
25CONFIG_HAVE_LATENCYTOP_SUPPORT=y 26CONFIG_HAVE_LATENCYTOP_SUPPORT=y
@@ -68,7 +69,6 @@ CONFIG_EMBEDDED=y
68CONFIG_UID16=y 69CONFIG_UID16=y
69CONFIG_SYSCTL_SYSCALL=y 70CONFIG_SYSCTL_SYSCALL=y
70# CONFIG_KALLSYMS is not set 71# CONFIG_KALLSYMS is not set
71# CONFIG_STRIP_ASM_SYMS is not set
72# CONFIG_HOTPLUG is not set 72# CONFIG_HOTPLUG is not set
73CONFIG_PRINTK=y 73CONFIG_PRINTK=y
74CONFIG_BUG=y 74CONFIG_BUG=y
@@ -81,8 +81,13 @@ CONFIG_TIMERFD=y
81CONFIG_EVENTFD=y 81CONFIG_EVENTFD=y
82CONFIG_SHMEM=y 82CONFIG_SHMEM=y
83CONFIG_AIO=y 83CONFIG_AIO=y
84
85#
86# Performance Counters
87#
84CONFIG_VM_EVENT_COUNTERS=y 88CONFIG_VM_EVENT_COUNTERS=y
85CONFIG_PCI_QUIRKS=y 89CONFIG_PCI_QUIRKS=y
90# CONFIG_STRIP_ASM_SYMS is not set
86CONFIG_COMPAT_BRK=y 91CONFIG_COMPAT_BRK=y
87CONFIG_SLAB=y 92CONFIG_SLAB=y
88# CONFIG_SLUB is not set 93# CONFIG_SLUB is not set
@@ -170,6 +175,7 @@ CONFIG_CPU_SUBTYPE_SH7780=y
170CONFIG_QUICKLIST=y 175CONFIG_QUICKLIST=y
171CONFIG_MMU=y 176CONFIG_MMU=y
172CONFIG_PAGE_OFFSET=0x80000000 177CONFIG_PAGE_OFFSET=0x80000000
178CONFIG_FORCE_MAX_ZONEORDER=11
173CONFIG_MEMORY_START=0x08000000 179CONFIG_MEMORY_START=0x08000000
174CONFIG_MEMORY_SIZE=0x08000000 180CONFIG_MEMORY_SIZE=0x08000000
175CONFIG_29BIT=y 181CONFIG_29BIT=y
@@ -186,7 +192,6 @@ CONFIG_PAGE_SIZE_4KB=y
186# CONFIG_PAGE_SIZE_8KB is not set 192# CONFIG_PAGE_SIZE_8KB is not set
187# CONFIG_PAGE_SIZE_16KB is not set 193# CONFIG_PAGE_SIZE_16KB is not set
188# CONFIG_PAGE_SIZE_64KB is not set 194# CONFIG_PAGE_SIZE_64KB is not set
189CONFIG_ENTRY_OFFSET=0x00001000
190CONFIG_SELECT_MEMORY_MODEL=y 195CONFIG_SELECT_MEMORY_MODEL=y
191# CONFIG_FLATMEM_MANUAL is not set 196# CONFIG_FLATMEM_MANUAL is not set
192# CONFIG_DISCONTIGMEM_MANUAL is not set 197# CONFIG_DISCONTIGMEM_MANUAL is not set
@@ -200,9 +205,9 @@ CONFIG_MIGRATION=y
200# CONFIG_PHYS_ADDR_T_64BIT is not set 205# CONFIG_PHYS_ADDR_T_64BIT is not set
201CONFIG_ZONE_DMA_FLAG=0 206CONFIG_ZONE_DMA_FLAG=0
202CONFIG_NR_QUICK=2 207CONFIG_NR_QUICK=2
203CONFIG_UNEVICTABLE_LRU=y
204CONFIG_HAVE_MLOCK=y 208CONFIG_HAVE_MLOCK=y
205CONFIG_HAVE_MLOCKED_PAGE_BIT=y 209CONFIG_HAVE_MLOCKED_PAGE_BIT=y
210CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
206 211
207# 212#
208# Cache configuration 213# Cache configuration
@@ -233,9 +238,10 @@ CONFIG_SH_7780_SOLUTION_ENGINE=y
233# 238#
234# Timer and clock configuration 239# Timer and clock configuration
235# 240#
236CONFIG_SH_TMU=y 241CONFIG_SH_TIMER_TMU=y
237CONFIG_SH_TIMER_IRQ=28
238CONFIG_SH_PCLK_FREQ=33333333 242CONFIG_SH_PCLK_FREQ=33333333
243CONFIG_SH_CLK_CPG=y
244CONFIG_SH_CLK_CPG_LEGACY=y
239# CONFIG_NO_HZ is not set 245# CONFIG_NO_HZ is not set
240# CONFIG_HIGH_RES_TIMERS is not set 246# CONFIG_HIGH_RES_TIMERS is not set
241CONFIG_GENERIC_CLOCKEVENTS_BUILD=y 247CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
@@ -280,6 +286,7 @@ CONFIG_GUSA=y
280# 286#
281CONFIG_ZERO_PAGE_OFFSET=0x00001000 287CONFIG_ZERO_PAGE_OFFSET=0x00001000
282CONFIG_BOOT_LINK_OFFSET=0x00810000 288CONFIG_BOOT_LINK_OFFSET=0x00810000
289CONFIG_ENTRY_OFFSET=0x00001000
283CONFIG_CMDLINE_BOOL=y 290CONFIG_CMDLINE_BOOL=y
284CONFIG_CMDLINE="console=ttySC0.115200 root=/dev/sda1" 291CONFIG_CMDLINE="console=ttySC0.115200 root=/dev/sda1"
285 292
@@ -323,6 +330,7 @@ CONFIG_IP_PNP=y
323# CONFIG_NET_IPIP is not set 330# CONFIG_NET_IPIP is not set
324# CONFIG_NET_IPGRE is not set 331# CONFIG_NET_IPGRE is not set
325# CONFIG_IP_MROUTE is not set 332# CONFIG_IP_MROUTE is not set
333# CONFIG_ARPD is not set
326# CONFIG_SYN_COOKIES is not set 334# CONFIG_SYN_COOKIES is not set
327# CONFIG_INET_AH is not set 335# CONFIG_INET_AH is not set
328# CONFIG_INET_ESP is not set 336# CONFIG_INET_ESP is not set
@@ -377,7 +385,11 @@ CONFIG_WIRELESS=y
377# CONFIG_WIRELESS_OLD_REGULATORY is not set 385# CONFIG_WIRELESS_OLD_REGULATORY is not set
378# CONFIG_WIRELESS_EXT is not set 386# CONFIG_WIRELESS_EXT is not set
379# CONFIG_LIB80211 is not set 387# CONFIG_LIB80211 is not set
380# CONFIG_MAC80211 is not set 388
389#
390# CFG80211 needs to be enabled for MAC80211
391#
392CONFIG_MAC80211_DEFAULT_PS_VALUE=0
381# CONFIG_WIMAX is not set 393# CONFIG_WIMAX is not set
382# CONFIG_RFKILL is not set 394# CONFIG_RFKILL is not set
383 395
@@ -503,6 +515,7 @@ CONFIG_MISC_DEVICES=y
503# EEPROM support 515# EEPROM support
504# 516#
505# CONFIG_EEPROM_93CX6 is not set 517# CONFIG_EEPROM_93CX6 is not set
518# CONFIG_CB710_CORE is not set
506CONFIG_HAVE_IDE=y 519CONFIG_HAVE_IDE=y
507# CONFIG_IDE is not set 520# CONFIG_IDE is not set
508 521
@@ -524,10 +537,6 @@ CONFIG_BLK_DEV_SD=y
524# CONFIG_BLK_DEV_SR is not set 537# CONFIG_BLK_DEV_SR is not set
525CONFIG_CHR_DEV_SG=y 538CONFIG_CHR_DEV_SG=y
526# CONFIG_CHR_DEV_SCH is not set 539# CONFIG_CHR_DEV_SCH is not set
527
528#
529# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
530#
531# CONFIG_SCSI_MULTI_LUN is not set 540# CONFIG_SCSI_MULTI_LUN is not set
532# CONFIG_SCSI_CONSTANTS is not set 541# CONFIG_SCSI_CONSTANTS is not set
533# CONFIG_SCSI_LOGGING is not set 542# CONFIG_SCSI_LOGGING is not set
@@ -544,6 +553,7 @@ CONFIG_SCSI_WAIT_SCAN=m
544# CONFIG_SCSI_SRP_ATTRS is not set 553# CONFIG_SCSI_SRP_ATTRS is not set
545CONFIG_SCSI_LOWLEVEL=y 554CONFIG_SCSI_LOWLEVEL=y
546# CONFIG_ISCSI_TCP is not set 555# CONFIG_ISCSI_TCP is not set
556# CONFIG_SCSI_BNX2_ISCSI is not set
547# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 557# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
548# CONFIG_SCSI_3W_9XXX is not set 558# CONFIG_SCSI_3W_9XXX is not set
549# CONFIG_SCSI_ACARD is not set 559# CONFIG_SCSI_ACARD is not set
@@ -552,6 +562,7 @@ CONFIG_SCSI_LOWLEVEL=y
552# CONFIG_SCSI_AIC7XXX_OLD is not set 562# CONFIG_SCSI_AIC7XXX_OLD is not set
553# CONFIG_SCSI_AIC79XX is not set 563# CONFIG_SCSI_AIC79XX is not set
554# CONFIG_SCSI_AIC94XX is not set 564# CONFIG_SCSI_AIC94XX is not set
565# CONFIG_SCSI_MVSAS is not set
555# CONFIG_SCSI_ARCMSR is not set 566# CONFIG_SCSI_ARCMSR is not set
556# CONFIG_MEGARAID_NEWGEN is not set 567# CONFIG_MEGARAID_NEWGEN is not set
557# CONFIG_MEGARAID_LEGACY is not set 568# CONFIG_MEGARAID_LEGACY is not set
@@ -566,7 +577,6 @@ CONFIG_SCSI_LOWLEVEL=y
566# CONFIG_SCSI_IPS is not set 577# CONFIG_SCSI_IPS is not set
567# CONFIG_SCSI_INITIO is not set 578# CONFIG_SCSI_INITIO is not set
568# CONFIG_SCSI_INIA100 is not set 579# CONFIG_SCSI_INIA100 is not set
569# CONFIG_SCSI_MVSAS is not set
570# CONFIG_SCSI_STEX is not set 580# CONFIG_SCSI_STEX is not set
571# CONFIG_SCSI_SYM53C8XX_2 is not set 581# CONFIG_SCSI_SYM53C8XX_2 is not set
572# CONFIG_SCSI_IPR is not set 582# CONFIG_SCSI_IPR is not set
@@ -643,7 +653,6 @@ CONFIG_SATA_SIL=y
643# CONFIG_IEEE1394 is not set 653# CONFIG_IEEE1394 is not set
644# CONFIG_I2O is not set 654# CONFIG_I2O is not set
645CONFIG_NETDEVICES=y 655CONFIG_NETDEVICES=y
646CONFIG_COMPAT_NET_DEV_OPS=y
647# CONFIG_DUMMY is not set 656# CONFIG_DUMMY is not set
648# CONFIG_BONDING is not set 657# CONFIG_BONDING is not set
649# CONFIG_EQUALIZER is not set 658# CONFIG_EQUALIZER is not set
@@ -709,6 +718,7 @@ CONFIG_NET_PCI=y
709# CONFIG_SMSC9420 is not set 718# CONFIG_SMSC9420 is not set
710# CONFIG_SUNDANCE is not set 719# CONFIG_SUNDANCE is not set
711# CONFIG_TLAN is not set 720# CONFIG_TLAN is not set
721# CONFIG_KS8842 is not set
712# CONFIG_VIA_RHINE is not set 722# CONFIG_VIA_RHINE is not set
713# CONFIG_ATL2 is not set 723# CONFIG_ATL2 is not set
714# CONFIG_NETDEV_1000 is not set 724# CONFIG_NETDEV_1000 is not set
@@ -842,22 +852,7 @@ CONFIG_SSB_POSSIBLE=y
842# CONFIG_HTC_PASIC3 is not set 852# CONFIG_HTC_PASIC3 is not set
843# CONFIG_MFD_TMIO is not set 853# CONFIG_MFD_TMIO is not set
844# CONFIG_REGULATOR is not set 854# CONFIG_REGULATOR is not set
845 855# CONFIG_MEDIA_SUPPORT is not set
846#
847# Multimedia devices
848#
849
850#
851# Multimedia core support
852#
853# CONFIG_VIDEO_DEV is not set
854# CONFIG_DVB_CORE is not set
855# CONFIG_VIDEO_MEDIA is not set
856
857#
858# Multimedia drivers
859#
860# CONFIG_DAB is not set
861 856
862# 857#
863# Graphics support 858# Graphics support
@@ -965,7 +960,7 @@ CONFIG_HID_BELKIN=y
965CONFIG_HID_CHERRY=y 960CONFIG_HID_CHERRY=y
966CONFIG_HID_CHICONY=y 961CONFIG_HID_CHICONY=y
967CONFIG_HID_CYPRESS=y 962CONFIG_HID_CYPRESS=y
968# CONFIG_DRAGONRISE_FF is not set 963# CONFIG_HID_DRAGONRISE is not set
969CONFIG_HID_EZKEY=y 964CONFIG_HID_EZKEY=y
970# CONFIG_HID_KYE is not set 965# CONFIG_HID_KYE is not set
971CONFIG_HID_GYRATION=y 966CONFIG_HID_GYRATION=y
@@ -982,10 +977,11 @@ CONFIG_HID_PETALYNX=y
982CONFIG_HID_SAMSUNG=y 977CONFIG_HID_SAMSUNG=y
983CONFIG_HID_SONY=y 978CONFIG_HID_SONY=y
984CONFIG_HID_SUNPLUS=y 979CONFIG_HID_SUNPLUS=y
985# CONFIG_GREENASIA_FF is not set 980# CONFIG_HID_GREENASIA is not set
981# CONFIG_HID_SMARTJOYPLUS is not set
986# CONFIG_HID_TOPSEED is not set 982# CONFIG_HID_TOPSEED is not set
987CONFIG_THRUSTMASTER_FF=m 983# CONFIG_HID_THRUSTMASTER is not set
988CONFIG_ZEROPLUS_FF=m 984# CONFIG_HID_ZEROPLUS is not set
989CONFIG_USB_SUPPORT=y 985CONFIG_USB_SUPPORT=y
990CONFIG_USB_ARCH_HAS_HCD=y 986CONFIG_USB_ARCH_HAS_HCD=y
991CONFIG_USB_ARCH_HAS_OHCI=y 987CONFIG_USB_ARCH_HAS_OHCI=y
@@ -1097,10 +1093,15 @@ CONFIG_USB_STORAGE=y
1097# CONFIG_NEW_LEDS is not set 1093# CONFIG_NEW_LEDS is not set
1098# CONFIG_ACCESSIBILITY is not set 1094# CONFIG_ACCESSIBILITY is not set
1099# CONFIG_INFINIBAND is not set 1095# CONFIG_INFINIBAND is not set
1096CONFIG_RTC_LIB=y
1100# CONFIG_RTC_CLASS is not set 1097# CONFIG_RTC_CLASS is not set
1101# CONFIG_DMADEVICES is not set 1098# CONFIG_DMADEVICES is not set
1102# CONFIG_AUXDISPLAY is not set 1099# CONFIG_AUXDISPLAY is not set
1103# CONFIG_UIO is not set 1100# CONFIG_UIO is not set
1101
1102#
1103# TI VLYNQ
1104#
1104# CONFIG_STAGING is not set 1105# CONFIG_STAGING is not set
1105 1106
1106# 1107#
@@ -1114,9 +1115,10 @@ CONFIG_EXT2_FS=y
1114# CONFIG_REISERFS_FS is not set 1115# CONFIG_REISERFS_FS is not set
1115# CONFIG_JFS_FS is not set 1116# CONFIG_JFS_FS is not set
1116# CONFIG_FS_POSIX_ACL is not set 1117# CONFIG_FS_POSIX_ACL is not set
1117CONFIG_FILE_LOCKING=y
1118# CONFIG_XFS_FS is not set 1118# CONFIG_XFS_FS is not set
1119# CONFIG_OCFS2_FS is not set 1119# CONFIG_OCFS2_FS is not set
1120CONFIG_FILE_LOCKING=y
1121CONFIG_FSNOTIFY=y
1120# CONFIG_DNOTIFY is not set 1122# CONFIG_DNOTIFY is not set
1121CONFIG_INOTIFY=y 1123CONFIG_INOTIFY=y
1122CONFIG_INOTIFY_USER=y 1124CONFIG_INOTIFY_USER=y
@@ -1254,28 +1256,13 @@ CONFIG_HAVE_FUNCTION_TRACER=y
1254CONFIG_HAVE_DYNAMIC_FTRACE=y 1256CONFIG_HAVE_DYNAMIC_FTRACE=y
1255CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 1257CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1256CONFIG_TRACING_SUPPORT=y 1258CONFIG_TRACING_SUPPORT=y
1257 1259# CONFIG_FTRACE is not set
1258#
1259# Tracers
1260#
1261# CONFIG_FUNCTION_TRACER is not set
1262# CONFIG_IRQSOFF_TRACER is not set
1263# CONFIG_SCHED_TRACER is not set
1264# CONFIG_CONTEXT_SWITCH_TRACER is not set
1265# CONFIG_EVENT_TRACER is not set
1266# CONFIG_BOOT_TRACER is not set
1267# CONFIG_TRACE_BRANCH_PROFILING is not set
1268# CONFIG_STACK_TRACER is not set
1269# CONFIG_KMEMTRACE is not set
1270# CONFIG_WORKQUEUE_TRACER is not set
1271# CONFIG_BLK_DEV_IO_TRACE is not set
1272# CONFIG_DYNAMIC_DEBUG is not set 1260# CONFIG_DYNAMIC_DEBUG is not set
1273# CONFIG_DMA_API_DEBUG is not set 1261# CONFIG_DMA_API_DEBUG is not set
1274# CONFIG_SAMPLES is not set 1262# CONFIG_SAMPLES is not set
1275CONFIG_HAVE_ARCH_KGDB=y 1263CONFIG_HAVE_ARCH_KGDB=y
1276# CONFIG_SH_STANDARD_BIOS is not set 1264# CONFIG_SH_STANDARD_BIOS is not set
1277# CONFIG_EARLY_SCIF_CONSOLE is not set 1265# CONFIG_EARLY_SCIF_CONSOLE is not set
1278# CONFIG_MORE_COMPILE_OPTIONS is not set
1279 1266
1280# 1267#
1281# Security options 1268# Security options
@@ -1385,3 +1372,4 @@ CONFIG_HAS_IOMEM=y
1385CONFIG_HAS_IOPORT=y 1372CONFIG_HAS_IOPORT=y
1386CONFIG_HAS_DMA=y 1373CONFIG_HAS_DMA=y
1387CONFIG_NLATTR=y 1374CONFIG_NLATTR=y
1375CONFIG_GENERIC_ATOMIC64=y
diff --git a/arch/sh/configs/sh03_defconfig b/arch/sh/configs/sh03_defconfig
index f9c6e51dc0b0..7fedaaee861d 100644
--- a/arch/sh/configs/sh03_defconfig
+++ b/arch/sh/configs/sh03_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.30-rc3 3# Linux kernel version: 2.6.30
4# Mon Apr 27 13:07:56 2009 4# Thu Jun 18 13:04:41 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -17,9 +17,11 @@ CONFIG_GENERIC_IRQ_PROBE=y
17# CONFIG_GENERIC_GPIO is not set 17# CONFIG_GENERIC_GPIO is not set
18CONFIG_GENERIC_TIME=y 18CONFIG_GENERIC_TIME=y
19CONFIG_GENERIC_CLOCKEVENTS=y 19CONFIG_GENERIC_CLOCKEVENTS=y
20CONFIG_GENERIC_CMOS_UPDATE=y
20# CONFIG_ARCH_SUSPEND_POSSIBLE is not set 21# CONFIG_ARCH_SUSPEND_POSSIBLE is not set
21CONFIG_ARCH_HIBERNATION_POSSIBLE=y 22CONFIG_ARCH_HIBERNATION_POSSIBLE=y
22CONFIG_SYS_SUPPORTS_PCI=y 23CONFIG_SYS_SUPPORTS_PCI=y
24CONFIG_SYS_SUPPORTS_TMU=y
23CONFIG_STACKTRACE_SUPPORT=y 25CONFIG_STACKTRACE_SUPPORT=y
24CONFIG_LOCKDEP_SUPPORT=y 26CONFIG_LOCKDEP_SUPPORT=y
25CONFIG_HAVE_LATENCYTOP_SUPPORT=y 27CONFIG_HAVE_LATENCYTOP_SUPPORT=y
@@ -77,7 +79,6 @@ CONFIG_UID16=y
77# CONFIG_SYSCTL_SYSCALL is not set 79# CONFIG_SYSCTL_SYSCALL is not set
78CONFIG_KALLSYMS=y 80CONFIG_KALLSYMS=y
79# CONFIG_KALLSYMS_EXTRA_PASS is not set 81# CONFIG_KALLSYMS_EXTRA_PASS is not set
80# CONFIG_STRIP_ASM_SYMS is not set
81CONFIG_HOTPLUG=y 82CONFIG_HOTPLUG=y
82CONFIG_PRINTK=y 83CONFIG_PRINTK=y
83CONFIG_BUG=y 84CONFIG_BUG=y
@@ -90,15 +91,20 @@ CONFIG_TIMERFD=y
90CONFIG_EVENTFD=y 91CONFIG_EVENTFD=y
91CONFIG_SHMEM=y 92CONFIG_SHMEM=y
92CONFIG_AIO=y 93CONFIG_AIO=y
94
95#
96# Performance Counters
97#
93CONFIG_VM_EVENT_COUNTERS=y 98CONFIG_VM_EVENT_COUNTERS=y
94CONFIG_PCI_QUIRKS=y 99CONFIG_PCI_QUIRKS=y
100# CONFIG_STRIP_ASM_SYMS is not set
95CONFIG_COMPAT_BRK=y 101CONFIG_COMPAT_BRK=y
96CONFIG_SLAB=y 102CONFIG_SLAB=y
97# CONFIG_SLUB is not set 103# CONFIG_SLUB is not set
98# CONFIG_SLOB is not set 104# CONFIG_SLOB is not set
99CONFIG_PROFILING=y 105CONFIG_PROFILING=y
100CONFIG_TRACEPOINTS=y 106CONFIG_TRACEPOINTS=y
101# CONFIG_MARKERS is not set 107CONFIG_MARKERS=y
102CONFIG_OPROFILE=m 108CONFIG_OPROFILE=m
103CONFIG_HAVE_OPROFILE=y 109CONFIG_HAVE_OPROFILE=y
104# CONFIG_KPROBES is not set 110# CONFIG_KPROBES is not set
@@ -183,6 +189,7 @@ CONFIG_CPU_SUBTYPE_SH7751=y
183CONFIG_QUICKLIST=y 189CONFIG_QUICKLIST=y
184CONFIG_MMU=y 190CONFIG_MMU=y
185CONFIG_PAGE_OFFSET=0x80000000 191CONFIG_PAGE_OFFSET=0x80000000
192CONFIG_FORCE_MAX_ZONEORDER=11
186CONFIG_MEMORY_START=0x08000000 193CONFIG_MEMORY_START=0x08000000
187CONFIG_MEMORY_SIZE=0x08000000 194CONFIG_MEMORY_SIZE=0x08000000
188CONFIG_29BIT=y 195CONFIG_29BIT=y
@@ -197,7 +204,6 @@ CONFIG_PAGE_SIZE_4KB=y
197# CONFIG_PAGE_SIZE_8KB is not set 204# CONFIG_PAGE_SIZE_8KB is not set
198# CONFIG_PAGE_SIZE_16KB is not set 205# CONFIG_PAGE_SIZE_16KB is not set
199# CONFIG_PAGE_SIZE_64KB is not set 206# CONFIG_PAGE_SIZE_64KB is not set
200CONFIG_ENTRY_OFFSET=0x00001000
201CONFIG_SELECT_MEMORY_MODEL=y 207CONFIG_SELECT_MEMORY_MODEL=y
202CONFIG_FLATMEM_MANUAL=y 208CONFIG_FLATMEM_MANUAL=y
203# CONFIG_DISCONTIGMEM_MANUAL is not set 209# CONFIG_DISCONTIGMEM_MANUAL is not set
@@ -210,9 +216,9 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
210# CONFIG_PHYS_ADDR_T_64BIT is not set 216# CONFIG_PHYS_ADDR_T_64BIT is not set
211CONFIG_ZONE_DMA_FLAG=0 217CONFIG_ZONE_DMA_FLAG=0
212CONFIG_NR_QUICK=2 218CONFIG_NR_QUICK=2
213CONFIG_UNEVICTABLE_LRU=y
214CONFIG_HAVE_MLOCK=y 219CONFIG_HAVE_MLOCK=y
215CONFIG_HAVE_MLOCKED_PAGE_BIT=y 220CONFIG_HAVE_MLOCKED_PAGE_BIT=y
221CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
216 222
217# 223#
218# Cache configuration 224# Cache configuration
@@ -231,7 +237,6 @@ CONFIG_SH_FPU=y
231CONFIG_CPU_HAS_INTEVT=y 237CONFIG_CPU_HAS_INTEVT=y
232CONFIG_CPU_HAS_IPR_IRQ=y 238CONFIG_CPU_HAS_IPR_IRQ=y
233CONFIG_CPU_HAS_SR_RB=y 239CONFIG_CPU_HAS_SR_RB=y
234CONFIG_CPU_HAS_PTEA=y
235CONFIG_CPU_HAS_FPU=y 240CONFIG_CPU_HAS_FPU=y
236 241
237# 242#
@@ -243,9 +248,10 @@ CONFIG_SH_SH03=y
243# 248#
244# Timer and clock configuration 249# Timer and clock configuration
245# 250#
246CONFIG_SH_TMU=y 251CONFIG_SH_TIMER_TMU=y
247CONFIG_SH_TIMER_IRQ=16
248CONFIG_SH_PCLK_FREQ=60000000 252CONFIG_SH_PCLK_FREQ=60000000
253CONFIG_SH_CLK_CPG=y
254CONFIG_SH_CLK_CPG_LEGACY=y
249# CONFIG_NO_HZ is not set 255# CONFIG_NO_HZ is not set
250# CONFIG_HIGH_RES_TIMERS is not set 256# CONFIG_HIGH_RES_TIMERS is not set
251CONFIG_GENERIC_CLOCKEVENTS_BUILD=y 257CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
@@ -287,12 +293,14 @@ CONFIG_HZ=250
287CONFIG_PREEMPT=y 293CONFIG_PREEMPT=y
288CONFIG_GUSA=y 294CONFIG_GUSA=y
289# CONFIG_GUSA_RB is not set 295# CONFIG_GUSA_RB is not set
296# CONFIG_SPARSE_IRQ is not set
290 297
291# 298#
292# Boot options 299# Boot options
293# 300#
294CONFIG_ZERO_PAGE_OFFSET=0x00004000 301CONFIG_ZERO_PAGE_OFFSET=0x00004000
295CONFIG_BOOT_LINK_OFFSET=0x00800000 302CONFIG_BOOT_LINK_OFFSET=0x00800000
303CONFIG_ENTRY_OFFSET=0x00001000
296# CONFIG_UBC_WAKEUP is not set 304# CONFIG_UBC_WAKEUP is not set
297CONFIG_CMDLINE_BOOL=y 305CONFIG_CMDLINE_BOOL=y
298CONFIG_CMDLINE="console=ttySC1,115200 mem=64M root=/dev/nfs" 306CONFIG_CMDLINE="console=ttySC1,115200 mem=64M root=/dev/nfs"
@@ -388,6 +396,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
388# CONFIG_ECONET is not set 396# CONFIG_ECONET is not set
389# CONFIG_WAN_ROUTER is not set 397# CONFIG_WAN_ROUTER is not set
390# CONFIG_PHONET is not set 398# CONFIG_PHONET is not set
399# CONFIG_IEEE802154 is not set
391# CONFIG_NET_SCHED is not set 400# CONFIG_NET_SCHED is not set
392# CONFIG_DCB is not set 401# CONFIG_DCB is not set
393 402
@@ -406,7 +415,11 @@ CONFIG_WIRELESS=y
406# CONFIG_WIRELESS_OLD_REGULATORY is not set 415# CONFIG_WIRELESS_OLD_REGULATORY is not set
407# CONFIG_WIRELESS_EXT is not set 416# CONFIG_WIRELESS_EXT is not set
408# CONFIG_LIB80211 is not set 417# CONFIG_LIB80211 is not set
409# CONFIG_MAC80211 is not set 418
419#
420# CFG80211 needs to be enabled for MAC80211
421#
422CONFIG_MAC80211_DEFAULT_PS_VALUE=0
410# CONFIG_WIMAX is not set 423# CONFIG_WIMAX is not set
411# CONFIG_RFKILL is not set 424# CONFIG_RFKILL is not set
412# CONFIG_NET_9P is not set 425# CONFIG_NET_9P is not set
@@ -454,6 +467,7 @@ CONFIG_MISC_DEVICES=y
454# EEPROM support 467# EEPROM support
455# 468#
456# CONFIG_EEPROM_93CX6 is not set 469# CONFIG_EEPROM_93CX6 is not set
470# CONFIG_CB710_CORE is not set
457CONFIG_HAVE_IDE=y 471CONFIG_HAVE_IDE=y
458CONFIG_IDE=y 472CONFIG_IDE=y
459 473
@@ -526,10 +540,6 @@ CONFIG_BLK_DEV_SR=m
526CONFIG_BLK_DEV_SR_VENDOR=y 540CONFIG_BLK_DEV_SR_VENDOR=y
527CONFIG_CHR_DEV_SG=m 541CONFIG_CHR_DEV_SG=m
528# CONFIG_CHR_DEV_SCH is not set 542# CONFIG_CHR_DEV_SCH is not set
529
530#
531# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
532#
533# CONFIG_SCSI_MULTI_LUN is not set 543# CONFIG_SCSI_MULTI_LUN is not set
534# CONFIG_SCSI_CONSTANTS is not set 544# CONFIG_SCSI_CONSTANTS is not set
535# CONFIG_SCSI_LOGGING is not set 545# CONFIG_SCSI_LOGGING is not set
@@ -547,6 +557,7 @@ CONFIG_SCSI_WAIT_SCAN=m
547CONFIG_SCSI_LOWLEVEL=y 557CONFIG_SCSI_LOWLEVEL=y
548# CONFIG_ISCSI_TCP is not set 558# CONFIG_ISCSI_TCP is not set
549# CONFIG_SCSI_CXGB3_ISCSI is not set 559# CONFIG_SCSI_CXGB3_ISCSI is not set
560# CONFIG_SCSI_BNX2_ISCSI is not set
550# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 561# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
551# CONFIG_SCSI_3W_9XXX is not set 562# CONFIG_SCSI_3W_9XXX is not set
552# CONFIG_SCSI_ACARD is not set 563# CONFIG_SCSI_ACARD is not set
@@ -555,6 +566,7 @@ CONFIG_SCSI_LOWLEVEL=y
555# CONFIG_SCSI_AIC7XXX_OLD is not set 566# CONFIG_SCSI_AIC7XXX_OLD is not set
556# CONFIG_SCSI_AIC79XX is not set 567# CONFIG_SCSI_AIC79XX is not set
557# CONFIG_SCSI_AIC94XX is not set 568# CONFIG_SCSI_AIC94XX is not set
569# CONFIG_SCSI_MVSAS is not set
558# CONFIG_SCSI_ARCMSR is not set 570# CONFIG_SCSI_ARCMSR is not set
559# CONFIG_MEGARAID_NEWGEN is not set 571# CONFIG_MEGARAID_NEWGEN is not set
560# CONFIG_MEGARAID_LEGACY is not set 572# CONFIG_MEGARAID_LEGACY is not set
@@ -569,7 +581,6 @@ CONFIG_SCSI_LOWLEVEL=y
569# CONFIG_SCSI_IPS is not set 581# CONFIG_SCSI_IPS is not set
570# CONFIG_SCSI_INITIO is not set 582# CONFIG_SCSI_INITIO is not set
571# CONFIG_SCSI_INIA100 is not set 583# CONFIG_SCSI_INIA100 is not set
572# CONFIG_SCSI_MVSAS is not set
573# CONFIG_SCSI_STEX is not set 584# CONFIG_SCSI_STEX is not set
574# CONFIG_SCSI_SYM53C8XX_2 is not set 585# CONFIG_SCSI_SYM53C8XX_2 is not set
575# CONFIG_SCSI_QLOGIC_1280 is not set 586# CONFIG_SCSI_QLOGIC_1280 is not set
@@ -598,7 +609,6 @@ CONFIG_SCSI_LOWLEVEL=y
598# CONFIG_IEEE1394 is not set 609# CONFIG_IEEE1394 is not set
599# CONFIG_I2O is not set 610# CONFIG_I2O is not set
600CONFIG_NETDEVICES=y 611CONFIG_NETDEVICES=y
601CONFIG_COMPAT_NET_DEV_OPS=y
602# CONFIG_DUMMY is not set 612# CONFIG_DUMMY is not set
603# CONFIG_BONDING is not set 613# CONFIG_BONDING is not set
604# CONFIG_MACVLAN is not set 614# CONFIG_MACVLAN is not set
@@ -647,6 +657,7 @@ CONFIG_8139CP=y
647# CONFIG_SMSC9420 is not set 657# CONFIG_SMSC9420 is not set
648# CONFIG_SUNDANCE is not set 658# CONFIG_SUNDANCE is not set
649# CONFIG_TLAN is not set 659# CONFIG_TLAN is not set
660# CONFIG_KS8842 is not set
650# CONFIG_VIA_RHINE is not set 661# CONFIG_VIA_RHINE is not set
651# CONFIG_SC92031 is not set 662# CONFIG_SC92031 is not set
652# CONFIG_ATL2 is not set 663# CONFIG_ATL2 is not set
@@ -845,22 +856,7 @@ CONFIG_SSB_POSSIBLE=y
845# CONFIG_HTC_PASIC3 is not set 856# CONFIG_HTC_PASIC3 is not set
846# CONFIG_MFD_TMIO is not set 857# CONFIG_MFD_TMIO is not set
847# CONFIG_REGULATOR is not set 858# CONFIG_REGULATOR is not set
848 859# CONFIG_MEDIA_SUPPORT is not set
849#
850# Multimedia devices
851#
852
853#
854# Multimedia core support
855#
856# CONFIG_VIDEO_DEV is not set
857# CONFIG_DVB_CORE is not set
858# CONFIG_VIDEO_MEDIA is not set
859
860#
861# Multimedia drivers
862#
863# CONFIG_DAB is not set
864 860
865# 861#
866# Graphics support 862# Graphics support
@@ -916,10 +912,15 @@ CONFIG_USB_ARCH_HAS_EHCI=y
916# CONFIG_NEW_LEDS is not set 912# CONFIG_NEW_LEDS is not set
917# CONFIG_ACCESSIBILITY is not set 913# CONFIG_ACCESSIBILITY is not set
918# CONFIG_INFINIBAND is not set 914# CONFIG_INFINIBAND is not set
915CONFIG_RTC_LIB=y
919# CONFIG_RTC_CLASS is not set 916# CONFIG_RTC_CLASS is not set
920# CONFIG_DMADEVICES is not set 917# CONFIG_DMADEVICES is not set
921# CONFIG_AUXDISPLAY is not set 918# CONFIG_AUXDISPLAY is not set
922# CONFIG_UIO is not set 919# CONFIG_UIO is not set
920
921#
922# TI VLYNQ
923#
923# CONFIG_STAGING is not set 924# CONFIG_STAGING is not set
924 925
925# 926#
@@ -942,10 +943,11 @@ CONFIG_FS_MBCACHE=y
942# CONFIG_REISERFS_FS is not set 943# CONFIG_REISERFS_FS is not set
943# CONFIG_JFS_FS is not set 944# CONFIG_JFS_FS is not set
944CONFIG_FS_POSIX_ACL=y 945CONFIG_FS_POSIX_ACL=y
945CONFIG_FILE_LOCKING=y
946# CONFIG_XFS_FS is not set 946# CONFIG_XFS_FS is not set
947# CONFIG_OCFS2_FS is not set 947# CONFIG_OCFS2_FS is not set
948# CONFIG_BTRFS_FS is not set 948# CONFIG_BTRFS_FS is not set
949CONFIG_FILE_LOCKING=y
950CONFIG_FSNOTIFY=y
949CONFIG_DNOTIFY=y 951CONFIG_DNOTIFY=y
950CONFIG_INOTIFY=y 952CONFIG_INOTIFY=y
951CONFIG_INOTIFY_USER=y 953CONFIG_INOTIFY_USER=y
@@ -1120,25 +1122,11 @@ CONFIG_HAVE_FUNCTION_TRACER=y
1120CONFIG_HAVE_DYNAMIC_FTRACE=y 1122CONFIG_HAVE_DYNAMIC_FTRACE=y
1121CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 1123CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1122CONFIG_RING_BUFFER=y 1124CONFIG_RING_BUFFER=y
1125CONFIG_EVENT_TRACING=y
1126CONFIG_CONTEXT_SWITCH_TRACER=y
1123CONFIG_TRACING=y 1127CONFIG_TRACING=y
1124CONFIG_TRACING_SUPPORT=y 1128CONFIG_TRACING_SUPPORT=y
1125 1129# CONFIG_FTRACE is not set
1126#
1127# Tracers
1128#
1129# CONFIG_FUNCTION_TRACER is not set
1130# CONFIG_IRQSOFF_TRACER is not set
1131# CONFIG_PREEMPT_TRACER is not set
1132# CONFIG_SCHED_TRACER is not set
1133# CONFIG_CONTEXT_SWITCH_TRACER is not set
1134# CONFIG_EVENT_TRACER is not set
1135# CONFIG_BOOT_TRACER is not set
1136# CONFIG_TRACE_BRANCH_PROFILING is not set
1137# CONFIG_STACK_TRACER is not set
1138# CONFIG_KMEMTRACE is not set
1139# CONFIG_WORKQUEUE_TRACER is not set
1140# CONFIG_BLK_DEV_IO_TRACE is not set
1141# CONFIG_FTRACE_STARTUP_TEST is not set
1142# CONFIG_DYNAMIC_DEBUG is not set 1130# CONFIG_DYNAMIC_DEBUG is not set
1143# CONFIG_DMA_API_DEBUG is not set 1131# CONFIG_DMA_API_DEBUG is not set
1144# CONFIG_SAMPLES is not set 1132# CONFIG_SAMPLES is not set
@@ -1146,7 +1134,6 @@ CONFIG_HAVE_ARCH_KGDB=y
1146CONFIG_SH_STANDARD_BIOS=y 1134CONFIG_SH_STANDARD_BIOS=y
1147# CONFIG_EARLY_SCIF_CONSOLE is not set 1135# CONFIG_EARLY_SCIF_CONSOLE is not set
1148# CONFIG_EARLY_PRINTK is not set 1136# CONFIG_EARLY_PRINTK is not set
1149# CONFIG_MORE_COMPILE_OPTIONS is not set
1150 1137
1151# 1138#
1152# Security options 1139# Security options
@@ -1273,3 +1260,4 @@ CONFIG_HAS_IOMEM=y
1273CONFIG_HAS_IOPORT=y 1260CONFIG_HAS_IOPORT=y
1274CONFIG_HAS_DMA=y 1261CONFIG_HAS_DMA=y
1275CONFIG_NLATTR=y 1262CONFIG_NLATTR=y
1263CONFIG_GENERIC_ATOMIC64=y
diff --git a/arch/sh/configs/sh7710voipgw_defconfig b/arch/sh/configs/sh7710voipgw_defconfig
index 48b58098cf84..c296ca5d95cb 100644
--- a/arch/sh/configs/sh7710voipgw_defconfig
+++ b/arch/sh/configs/sh7710voipgw_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.30-rc3 3# Linux kernel version: 2.6.30
4# Mon Apr 27 13:09:16 2009 4# Thu Jun 18 13:06:13 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -19,6 +19,7 @@ CONFIG_GENERIC_TIME=y
19CONFIG_GENERIC_CLOCKEVENTS=y 19CONFIG_GENERIC_CLOCKEVENTS=y
20# CONFIG_ARCH_SUSPEND_POSSIBLE is not set 20# CONFIG_ARCH_SUSPEND_POSSIBLE is not set
21CONFIG_ARCH_HIBERNATION_POSSIBLE=y 21CONFIG_ARCH_HIBERNATION_POSSIBLE=y
22CONFIG_SYS_SUPPORTS_TMU=y
22CONFIG_STACKTRACE_SUPPORT=y 23CONFIG_STACKTRACE_SUPPORT=y
23CONFIG_LOCKDEP_SUPPORT=y 24CONFIG_LOCKDEP_SUPPORT=y
24CONFIG_HAVE_LATENCYTOP_SUPPORT=y 25CONFIG_HAVE_LATENCYTOP_SUPPORT=y
@@ -74,7 +75,6 @@ CONFIG_UID16=y
74# CONFIG_SYSCTL_SYSCALL is not set 75# CONFIG_SYSCTL_SYSCALL is not set
75CONFIG_KALLSYMS=y 76CONFIG_KALLSYMS=y
76# CONFIG_KALLSYMS_EXTRA_PASS is not set 77# CONFIG_KALLSYMS_EXTRA_PASS is not set
77# CONFIG_STRIP_ASM_SYMS is not set
78CONFIG_HOTPLUG=y 78CONFIG_HOTPLUG=y
79CONFIG_PRINTK=y 79CONFIG_PRINTK=y
80CONFIG_BUG=y 80CONFIG_BUG=y
@@ -87,7 +87,12 @@ CONFIG_TIMERFD=y
87CONFIG_EVENTFD=y 87CONFIG_EVENTFD=y
88# CONFIG_SHMEM is not set 88# CONFIG_SHMEM is not set
89CONFIG_AIO=y 89CONFIG_AIO=y
90
91#
92# Performance Counters
93#
90CONFIG_VM_EVENT_COUNTERS=y 94CONFIG_VM_EVENT_COUNTERS=y
95# CONFIG_STRIP_ASM_SYMS is not set
91CONFIG_COMPAT_BRK=y 96CONFIG_COMPAT_BRK=y
92CONFIG_SLAB=y 97CONFIG_SLAB=y
93# CONFIG_SLUB is not set 98# CONFIG_SLUB is not set
@@ -176,6 +181,7 @@ CONFIG_CPU_SUBTYPE_SH7710=y
176CONFIG_QUICKLIST=y 181CONFIG_QUICKLIST=y
177CONFIG_MMU=y 182CONFIG_MMU=y
178CONFIG_PAGE_OFFSET=0x80000000 183CONFIG_PAGE_OFFSET=0x80000000
184CONFIG_FORCE_MAX_ZONEORDER=11
179CONFIG_MEMORY_START=0x0c000000 185CONFIG_MEMORY_START=0x0c000000
180CONFIG_MEMORY_SIZE=0x00800000 186CONFIG_MEMORY_SIZE=0x00800000
181CONFIG_29BIT=y 187CONFIG_29BIT=y
@@ -190,7 +196,6 @@ CONFIG_PAGE_SIZE_4KB=y
190# CONFIG_PAGE_SIZE_8KB is not set 196# CONFIG_PAGE_SIZE_8KB is not set
191# CONFIG_PAGE_SIZE_16KB is not set 197# CONFIG_PAGE_SIZE_16KB is not set
192# CONFIG_PAGE_SIZE_64KB is not set 198# CONFIG_PAGE_SIZE_64KB is not set
193CONFIG_ENTRY_OFFSET=0x00001000
194CONFIG_SELECT_MEMORY_MODEL=y 199CONFIG_SELECT_MEMORY_MODEL=y
195CONFIG_FLATMEM_MANUAL=y 200CONFIG_FLATMEM_MANUAL=y
196# CONFIG_DISCONTIGMEM_MANUAL is not set 201# CONFIG_DISCONTIGMEM_MANUAL is not set
@@ -203,9 +208,9 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
203# CONFIG_PHYS_ADDR_T_64BIT is not set 208# CONFIG_PHYS_ADDR_T_64BIT is not set
204CONFIG_ZONE_DMA_FLAG=0 209CONFIG_ZONE_DMA_FLAG=0
205CONFIG_NR_QUICK=2 210CONFIG_NR_QUICK=2
206CONFIG_UNEVICTABLE_LRU=y
207CONFIG_HAVE_MLOCK=y 211CONFIG_HAVE_MLOCK=y
208CONFIG_HAVE_MLOCKED_PAGE_BIT=y 212CONFIG_HAVE_MLOCKED_PAGE_BIT=y
213CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
209 214
210# 215#
211# Cache configuration 216# Cache configuration
@@ -234,9 +239,10 @@ CONFIG_CPU_HAS_DSP=y
234# 239#
235# Timer and clock configuration 240# Timer and clock configuration
236# 241#
237CONFIG_SH_TMU=y 242CONFIG_SH_TIMER_TMU=y
238CONFIG_SH_TIMER_IRQ=16
239CONFIG_SH_PCLK_FREQ=32768000 243CONFIG_SH_PCLK_FREQ=32768000
244CONFIG_SH_CLK_CPG=y
245CONFIG_SH_CLK_CPG_LEGACY=y
240# CONFIG_NO_HZ is not set 246# CONFIG_NO_HZ is not set
241# CONFIG_HIGH_RES_TIMERS is not set 247# CONFIG_HIGH_RES_TIMERS is not set
242CONFIG_GENERIC_CLOCKEVENTS_BUILD=y 248CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
@@ -278,12 +284,14 @@ CONFIG_PREEMPT_NONE=y
278# CONFIG_PREEMPT is not set 284# CONFIG_PREEMPT is not set
279CONFIG_GUSA=y 285CONFIG_GUSA=y
280# CONFIG_GUSA_RB is not set 286# CONFIG_GUSA_RB is not set
287# CONFIG_SPARSE_IRQ is not set
281 288
282# 289#
283# Boot options 290# Boot options
284# 291#
285CONFIG_ZERO_PAGE_OFFSET=0x00001000 292CONFIG_ZERO_PAGE_OFFSET=0x00001000
286CONFIG_BOOT_LINK_OFFSET=0x00800000 293CONFIG_BOOT_LINK_OFFSET=0x00800000
294CONFIG_ENTRY_OFFSET=0x00001000
287# CONFIG_CMDLINE_BOOL is not set 295# CONFIG_CMDLINE_BOOL is not set
288 296
289# 297#
@@ -380,6 +388,7 @@ CONFIG_NETFILTER_ADVANCED=y
380# CONFIG_ECONET is not set 388# CONFIG_ECONET is not set
381# CONFIG_WAN_ROUTER is not set 389# CONFIG_WAN_ROUTER is not set
382# CONFIG_PHONET is not set 390# CONFIG_PHONET is not set
391# CONFIG_IEEE802154 is not set
383CONFIG_NET_SCHED=y 392CONFIG_NET_SCHED=y
384 393
385# 394#
@@ -434,7 +443,11 @@ CONFIG_WIRELESS=y
434# CONFIG_WIRELESS_OLD_REGULATORY is not set 443# CONFIG_WIRELESS_OLD_REGULATORY is not set
435# CONFIG_WIRELESS_EXT is not set 444# CONFIG_WIRELESS_EXT is not set
436# CONFIG_LIB80211 is not set 445# CONFIG_LIB80211 is not set
437# CONFIG_MAC80211 is not set 446
447#
448# CFG80211 needs to be enabled for MAC80211
449#
450CONFIG_MAC80211_DEFAULT_PS_VALUE=0
438# CONFIG_WIMAX is not set 451# CONFIG_WIMAX is not set
439# CONFIG_RFKILL is not set 452# CONFIG_RFKILL is not set
440# CONFIG_NET_9P is not set 453# CONFIG_NET_9P is not set
@@ -564,7 +577,6 @@ CONFIG_HAVE_IDE=y
564# CONFIG_ATA is not set 577# CONFIG_ATA is not set
565# CONFIG_MD is not set 578# CONFIG_MD is not set
566CONFIG_NETDEVICES=y 579CONFIG_NETDEVICES=y
567CONFIG_COMPAT_NET_DEV_OPS=y
568# CONFIG_DUMMY is not set 580# CONFIG_DUMMY is not set
569# CONFIG_BONDING is not set 581# CONFIG_BONDING is not set
570# CONFIG_MACVLAN is not set 582# CONFIG_MACVLAN is not set
@@ -590,6 +602,7 @@ CONFIG_NET_ETHERNET=y
590# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set 602# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
591# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set 603# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
592# CONFIG_B44 is not set 604# CONFIG_B44 is not set
605# CONFIG_KS8842 is not set
593CONFIG_NETDEV_1000=y 606CONFIG_NETDEV_1000=y
594CONFIG_NETDEV_10000=y 607CONFIG_NETDEV_10000=y
595 608
@@ -693,22 +706,7 @@ CONFIG_SSB_POSSIBLE=y
693# CONFIG_HTC_PASIC3 is not set 706# CONFIG_HTC_PASIC3 is not set
694# CONFIG_MFD_TMIO is not set 707# CONFIG_MFD_TMIO is not set
695# CONFIG_REGULATOR is not set 708# CONFIG_REGULATOR is not set
696 709# CONFIG_MEDIA_SUPPORT is not set
697#
698# Multimedia devices
699#
700
701#
702# Multimedia core support
703#
704# CONFIG_VIDEO_DEV is not set
705# CONFIG_DVB_CORE is not set
706# CONFIG_VIDEO_MEDIA is not set
707
708#
709# Multimedia drivers
710#
711# CONFIG_DAB is not set
712 710
713# 711#
714# Graphics support 712# Graphics support
@@ -756,10 +754,15 @@ CONFIG_USB_ARCH_HAS_HCD=y
756# CONFIG_MEMSTICK is not set 754# CONFIG_MEMSTICK is not set
757# CONFIG_NEW_LEDS is not set 755# CONFIG_NEW_LEDS is not set
758# CONFIG_ACCESSIBILITY is not set 756# CONFIG_ACCESSIBILITY is not set
757CONFIG_RTC_LIB=y
759# CONFIG_RTC_CLASS is not set 758# CONFIG_RTC_CLASS is not set
760# CONFIG_DMADEVICES is not set 759# CONFIG_DMADEVICES is not set
761# CONFIG_AUXDISPLAY is not set 760# CONFIG_AUXDISPLAY is not set
762# CONFIG_UIO is not set 761# CONFIG_UIO is not set
762
763#
764# TI VLYNQ
765#
763# CONFIG_STAGING is not set 766# CONFIG_STAGING is not set
764 767
765# 768#
@@ -771,12 +774,14 @@ CONFIG_USB_ARCH_HAS_HCD=y
771# CONFIG_REISERFS_FS is not set 774# CONFIG_REISERFS_FS is not set
772# CONFIG_JFS_FS is not set 775# CONFIG_JFS_FS is not set
773# CONFIG_FS_POSIX_ACL is not set 776# CONFIG_FS_POSIX_ACL is not set
774CONFIG_FILE_LOCKING=y
775# CONFIG_XFS_FS is not set 777# CONFIG_XFS_FS is not set
776# CONFIG_OCFS2_FS is not set 778# CONFIG_OCFS2_FS is not set
777# CONFIG_BTRFS_FS is not set 779# CONFIG_BTRFS_FS is not set
780CONFIG_FILE_LOCKING=y
781CONFIG_FSNOTIFY=y
778# CONFIG_DNOTIFY is not set 782# CONFIG_DNOTIFY is not set
779# CONFIG_INOTIFY is not set 783# CONFIG_INOTIFY is not set
784CONFIG_INOTIFY_USER=y
780# CONFIG_QUOTA is not set 785# CONFIG_QUOTA is not set
781# CONFIG_AUTOFS_FS is not set 786# CONFIG_AUTOFS_FS is not set
782# CONFIG_AUTOFS4_FS is not set 787# CONFIG_AUTOFS4_FS is not set
@@ -881,28 +886,13 @@ CONFIG_HAVE_FUNCTION_TRACER=y
881CONFIG_HAVE_DYNAMIC_FTRACE=y 886CONFIG_HAVE_DYNAMIC_FTRACE=y
882CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 887CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
883CONFIG_TRACING_SUPPORT=y 888CONFIG_TRACING_SUPPORT=y
884 889# CONFIG_FTRACE is not set
885#
886# Tracers
887#
888# CONFIG_FUNCTION_TRACER is not set
889# CONFIG_IRQSOFF_TRACER is not set
890# CONFIG_SCHED_TRACER is not set
891# CONFIG_CONTEXT_SWITCH_TRACER is not set
892# CONFIG_EVENT_TRACER is not set
893# CONFIG_BOOT_TRACER is not set
894# CONFIG_TRACE_BRANCH_PROFILING is not set
895# CONFIG_STACK_TRACER is not set
896# CONFIG_KMEMTRACE is not set
897# CONFIG_WORKQUEUE_TRACER is not set
898# CONFIG_BLK_DEV_IO_TRACE is not set
899# CONFIG_DYNAMIC_DEBUG is not set 890# CONFIG_DYNAMIC_DEBUG is not set
900# CONFIG_DMA_API_DEBUG is not set 891# CONFIG_DMA_API_DEBUG is not set
901# CONFIG_SAMPLES is not set 892# CONFIG_SAMPLES is not set
902CONFIG_HAVE_ARCH_KGDB=y 893CONFIG_HAVE_ARCH_KGDB=y
903# CONFIG_SH_STANDARD_BIOS is not set 894# CONFIG_SH_STANDARD_BIOS is not set
904# CONFIG_EARLY_SCIF_CONSOLE is not set 895# CONFIG_EARLY_SCIF_CONSOLE is not set
905# CONFIG_MORE_COMPILE_OPTIONS is not set
906 896
907# 897#
908# Security options 898# Security options
@@ -1017,3 +1007,4 @@ CONFIG_HAS_IOMEM=y
1017CONFIG_HAS_IOPORT=y 1007CONFIG_HAS_IOPORT=y
1018CONFIG_HAS_DMA=y 1008CONFIG_HAS_DMA=y
1019CONFIG_NLATTR=y 1009CONFIG_NLATTR=y
1010CONFIG_GENERIC_ATOMIC64=y
diff --git a/arch/sh/configs/sh7724_generic_defconfig b/arch/sh/configs/sh7724_generic_defconfig
index ec8f18c7684c..ba26be1b4134 100644
--- a/arch/sh/configs/sh7724_generic_defconfig
+++ b/arch/sh/configs/sh7724_generic_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.30-rc3 3# Linux kernel version: 2.6.30
4# Mon Apr 27 13:09:47 2009 4# Thu Jun 18 13:06:48 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -20,6 +20,7 @@ CONFIG_GENERIC_CLOCKEVENTS=y
20CONFIG_ARCH_SUSPEND_POSSIBLE=y 20CONFIG_ARCH_SUSPEND_POSSIBLE=y
21CONFIG_ARCH_HIBERNATION_POSSIBLE=y 21CONFIG_ARCH_HIBERNATION_POSSIBLE=y
22CONFIG_SYS_SUPPORTS_CMT=y 22CONFIG_SYS_SUPPORTS_CMT=y
23CONFIG_SYS_SUPPORTS_TMU=y
23CONFIG_STACKTRACE_SUPPORT=y 24CONFIG_STACKTRACE_SUPPORT=y
24CONFIG_LOCKDEP_SUPPORT=y 25CONFIG_LOCKDEP_SUPPORT=y
25CONFIG_HAVE_LATENCYTOP_SUPPORT=y 26CONFIG_HAVE_LATENCYTOP_SUPPORT=y
@@ -79,7 +80,6 @@ CONFIG_EMBEDDED=y
79CONFIG_SYSCTL_SYSCALL=y 80CONFIG_SYSCTL_SYSCALL=y
80CONFIG_KALLSYMS=y 81CONFIG_KALLSYMS=y
81# CONFIG_KALLSYMS_EXTRA_PASS is not set 82# CONFIG_KALLSYMS_EXTRA_PASS is not set
82# CONFIG_STRIP_ASM_SYMS is not set
83CONFIG_HOTPLUG=y 83CONFIG_HOTPLUG=y
84CONFIG_PRINTK=y 84CONFIG_PRINTK=y
85CONFIG_BUG=y 85CONFIG_BUG=y
@@ -92,14 +92,19 @@ CONFIG_TIMERFD=y
92CONFIG_EVENTFD=y 92CONFIG_EVENTFD=y
93CONFIG_SHMEM=y 93CONFIG_SHMEM=y
94CONFIG_AIO=y 94CONFIG_AIO=y
95
96#
97# Performance Counters
98#
95CONFIG_VM_EVENT_COUNTERS=y 99CONFIG_VM_EVENT_COUNTERS=y
100# CONFIG_STRIP_ASM_SYMS is not set
96# CONFIG_COMPAT_BRK is not set 101# CONFIG_COMPAT_BRK is not set
97# CONFIG_SLAB is not set 102# CONFIG_SLAB is not set
98CONFIG_SLUB=y 103CONFIG_SLUB=y
99# CONFIG_SLOB is not set 104# CONFIG_SLOB is not set
100CONFIG_PROFILING=y 105CONFIG_PROFILING=y
101CONFIG_TRACEPOINTS=y 106CONFIG_TRACEPOINTS=y
102# CONFIG_MARKERS is not set 107CONFIG_MARKERS=y
103CONFIG_OPROFILE=y 108CONFIG_OPROFILE=y
104CONFIG_HAVE_OPROFILE=y 109CONFIG_HAVE_OPROFILE=y
105CONFIG_HAVE_IOREMAP_PROT=y 110CONFIG_HAVE_IOREMAP_PROT=y
@@ -180,6 +185,7 @@ CONFIG_CPU_SUBTYPE_SH7724=y
180CONFIG_QUICKLIST=y 185CONFIG_QUICKLIST=y
181CONFIG_MMU=y 186CONFIG_MMU=y
182CONFIG_PAGE_OFFSET=0x80000000 187CONFIG_PAGE_OFFSET=0x80000000
188CONFIG_FORCE_MAX_ZONEORDER=11
183CONFIG_MEMORY_START=0x08000000 189CONFIG_MEMORY_START=0x08000000
184CONFIG_MEMORY_SIZE=0x04000000 190CONFIG_MEMORY_SIZE=0x04000000
185CONFIG_29BIT=y 191CONFIG_29BIT=y
@@ -197,7 +203,6 @@ CONFIG_PAGE_SIZE_4KB=y
197# CONFIG_PAGE_SIZE_8KB is not set 203# CONFIG_PAGE_SIZE_8KB is not set
198# CONFIG_PAGE_SIZE_16KB is not set 204# CONFIG_PAGE_SIZE_16KB is not set
199# CONFIG_PAGE_SIZE_64KB is not set 205# CONFIG_PAGE_SIZE_64KB is not set
200CONFIG_ENTRY_OFFSET=0x00001000
201CONFIG_SELECT_MEMORY_MODEL=y 206CONFIG_SELECT_MEMORY_MODEL=y
202# CONFIG_FLATMEM_MANUAL is not set 207# CONFIG_FLATMEM_MANUAL is not set
203# CONFIG_DISCONTIGMEM_MANUAL is not set 208# CONFIG_DISCONTIGMEM_MANUAL is not set
@@ -215,9 +220,9 @@ CONFIG_MIGRATION=y
215# CONFIG_PHYS_ADDR_T_64BIT is not set 220# CONFIG_PHYS_ADDR_T_64BIT is not set
216CONFIG_ZONE_DMA_FLAG=0 221CONFIG_ZONE_DMA_FLAG=0
217CONFIG_NR_QUICK=2 222CONFIG_NR_QUICK=2
218CONFIG_UNEVICTABLE_LRU=y
219CONFIG_HAVE_MLOCK=y 223CONFIG_HAVE_MLOCK=y
220CONFIG_HAVE_MLOCKED_PAGE_BIT=y 224CONFIG_HAVE_MLOCKED_PAGE_BIT=y
225CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
221 226
222# 227#
223# Cache configuration 228# Cache configuration
@@ -235,20 +240,20 @@ CONFIG_SH_FPU=y
235# CONFIG_SH_STORE_QUEUES is not set 240# CONFIG_SH_STORE_QUEUES is not set
236CONFIG_CPU_HAS_INTEVT=y 241CONFIG_CPU_HAS_INTEVT=y
237CONFIG_CPU_HAS_SR_RB=y 242CONFIG_CPU_HAS_SR_RB=y
238CONFIG_CPU_HAS_PTEA=y
239CONFIG_CPU_HAS_FPU=y 243CONFIG_CPU_HAS_FPU=y
240 244
241# 245#
242# Board support 246# Board support
243# 247#
248# CONFIG_SH_7724_SOLUTION_ENGINE is not set
244 249
245# 250#
246# Timer and clock configuration 251# Timer and clock configuration
247# 252#
248CONFIG_SH_TMU=y 253CONFIG_SH_TIMER_TMU=y
249CONFIG_SH_TIMER_CMT=y 254CONFIG_SH_TIMER_CMT=y
250CONFIG_SH_TIMER_IRQ=16
251CONFIG_SH_PCLK_FREQ=41666666 255CONFIG_SH_PCLK_FREQ=41666666
256CONFIG_SH_CLK_CPG=y
252CONFIG_TICK_ONESHOT=y 257CONFIG_TICK_ONESHOT=y
253CONFIG_NO_HZ=y 258CONFIG_NO_HZ=y
254CONFIG_HIGH_RES_TIMERS=y 259CONFIG_HIGH_RES_TIMERS=y
@@ -305,12 +310,14 @@ CONFIG_PREEMPT_NONE=y
305# CONFIG_PREEMPT_VOLUNTARY is not set 310# CONFIG_PREEMPT_VOLUNTARY is not set
306# CONFIG_PREEMPT is not set 311# CONFIG_PREEMPT is not set
307CONFIG_GUSA=y 312CONFIG_GUSA=y
313# CONFIG_SPARSE_IRQ is not set
308 314
309# 315#
310# Boot options 316# Boot options
311# 317#
312CONFIG_ZERO_PAGE_OFFSET=0x00001000 318CONFIG_ZERO_PAGE_OFFSET=0x00001000
313CONFIG_BOOT_LINK_OFFSET=0x00800000 319CONFIG_BOOT_LINK_OFFSET=0x00800000
320CONFIG_ENTRY_OFFSET=0x00001000
314# CONFIG_CMDLINE_BOOL is not set 321# CONFIG_CMDLINE_BOOL is not set
315 322
316# 323#
@@ -335,6 +342,7 @@ CONFIG_PM=y
335CONFIG_PM_SLEEP=y 342CONFIG_PM_SLEEP=y
336CONFIG_SUSPEND=y 343CONFIG_SUSPEND=y
337CONFIG_SUSPEND_FREEZER=y 344CONFIG_SUSPEND_FREEZER=y
345CONFIG_HIBERNATION_NVS=y
338CONFIG_HIBERNATION=y 346CONFIG_HIBERNATION=y
339CONFIG_PM_STD_PARTITION="" 347CONFIG_PM_STD_PARTITION=""
340CONFIG_CPU_IDLE=y 348CONFIG_CPU_IDLE=y
@@ -451,7 +459,6 @@ CONFIG_I2C_SH_MOBILE=y
451# CONFIG_SENSORS_PCF8574 is not set 459# CONFIG_SENSORS_PCF8574 is not set
452# CONFIG_PCF8575 is not set 460# CONFIG_PCF8575 is not set
453# CONFIG_SENSORS_PCA9539 is not set 461# CONFIG_SENSORS_PCA9539 is not set
454# CONFIG_SENSORS_MAX6875 is not set
455# CONFIG_SENSORS_TSL2550 is not set 462# CONFIG_SENSORS_TSL2550 is not set
456# CONFIG_I2C_DEBUG_CORE is not set 463# CONFIG_I2C_DEBUG_CORE is not set
457# CONFIG_I2C_DEBUG_ALGO is not set 464# CONFIG_I2C_DEBUG_ALGO is not set
@@ -484,21 +491,7 @@ CONFIG_SSB_POSSIBLE=y
484# CONFIG_MFD_WM8350_I2C is not set 491# CONFIG_MFD_WM8350_I2C is not set
485# CONFIG_MFD_PCF50633 is not set 492# CONFIG_MFD_PCF50633 is not set
486# CONFIG_REGULATOR is not set 493# CONFIG_REGULATOR is not set
487 494# CONFIG_MEDIA_SUPPORT is not set
488#
489# Multimedia devices
490#
491
492#
493# Multimedia core support
494#
495# CONFIG_VIDEO_DEV is not set
496# CONFIG_VIDEO_MEDIA is not set
497
498#
499# Multimedia drivers
500#
501# CONFIG_DAB is not set
502 495
503# 496#
504# Graphics support 497# Graphics support
@@ -570,6 +563,7 @@ CONFIG_RTC_INTF_DEV=y
570# on-CPU RTC drivers 563# on-CPU RTC drivers
571# 564#
572CONFIG_RTC_DRV_SH=y 565CONFIG_RTC_DRV_SH=y
566# CONFIG_RTC_DRV_GENERIC is not set
573# CONFIG_DMADEVICES is not set 567# CONFIG_DMADEVICES is not set
574# CONFIG_AUXDISPLAY is not set 568# CONFIG_AUXDISPLAY is not set
575CONFIG_UIO=y 569CONFIG_UIO=y
@@ -577,6 +571,10 @@ CONFIG_UIO=y
577CONFIG_UIO_PDRV_GENIRQ=y 571CONFIG_UIO_PDRV_GENIRQ=y
578# CONFIG_UIO_SMX is not set 572# CONFIG_UIO_SMX is not set
579# CONFIG_UIO_SERCOS3 is not set 573# CONFIG_UIO_SERCOS3 is not set
574
575#
576# TI VLYNQ
577#
580# CONFIG_STAGING is not set 578# CONFIG_STAGING is not set
581 579
582# 580#
@@ -588,11 +586,13 @@ CONFIG_UIO_PDRV_GENIRQ=y
588# CONFIG_REISERFS_FS is not set 586# CONFIG_REISERFS_FS is not set
589# CONFIG_JFS_FS is not set 587# CONFIG_JFS_FS is not set
590# CONFIG_FS_POSIX_ACL is not set 588# CONFIG_FS_POSIX_ACL is not set
591CONFIG_FILE_LOCKING=y
592# CONFIG_XFS_FS is not set 589# CONFIG_XFS_FS is not set
593# CONFIG_BTRFS_FS is not set 590# CONFIG_BTRFS_FS is not set
591CONFIG_FILE_LOCKING=y
592CONFIG_FSNOTIFY=y
594# CONFIG_DNOTIFY is not set 593# CONFIG_DNOTIFY is not set
595# CONFIG_INOTIFY is not set 594# CONFIG_INOTIFY is not set
595CONFIG_INOTIFY_USER=y
596# CONFIG_QUOTA is not set 596# CONFIG_QUOTA is not set
597# CONFIG_AUTOFS_FS is not set 597# CONFIG_AUTOFS_FS is not set
598# CONFIG_AUTOFS4_FS is not set 598# CONFIG_AUTOFS4_FS is not set
@@ -657,30 +657,17 @@ CONFIG_HAVE_FUNCTION_TRACER=y
657CONFIG_HAVE_DYNAMIC_FTRACE=y 657CONFIG_HAVE_DYNAMIC_FTRACE=y
658CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 658CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
659CONFIG_RING_BUFFER=y 659CONFIG_RING_BUFFER=y
660CONFIG_EVENT_TRACING=y
661CONFIG_CONTEXT_SWITCH_TRACER=y
660CONFIG_TRACING=y 662CONFIG_TRACING=y
661CONFIG_TRACING_SUPPORT=y 663CONFIG_TRACING_SUPPORT=y
662 664# CONFIG_FTRACE is not set
663#
664# Tracers
665#
666# CONFIG_FUNCTION_TRACER is not set
667# CONFIG_IRQSOFF_TRACER is not set
668# CONFIG_SCHED_TRACER is not set
669# CONFIG_CONTEXT_SWITCH_TRACER is not set
670# CONFIG_EVENT_TRACER is not set
671# CONFIG_BOOT_TRACER is not set
672# CONFIG_TRACE_BRANCH_PROFILING is not set
673# CONFIG_STACK_TRACER is not set
674# CONFIG_KMEMTRACE is not set
675# CONFIG_WORKQUEUE_TRACER is not set
676# CONFIG_FTRACE_STARTUP_TEST is not set
677# CONFIG_DYNAMIC_DEBUG is not set 665# CONFIG_DYNAMIC_DEBUG is not set
678# CONFIG_DMA_API_DEBUG is not set 666# CONFIG_DMA_API_DEBUG is not set
679# CONFIG_SAMPLES is not set 667# CONFIG_SAMPLES is not set
680CONFIG_HAVE_ARCH_KGDB=y 668CONFIG_HAVE_ARCH_KGDB=y
681# CONFIG_SH_STANDARD_BIOS is not set 669# CONFIG_SH_STANDARD_BIOS is not set
682# CONFIG_EARLY_SCIF_CONSOLE is not set 670# CONFIG_EARLY_SCIF_CONSOLE is not set
683# CONFIG_MORE_COMPILE_OPTIONS is not set
684 671
685# 672#
686# Security options 673# Security options
@@ -705,3 +692,4 @@ CONFIG_GENERIC_FIND_LAST_BIT=y
705CONFIG_HAS_IOMEM=y 692CONFIG_HAS_IOMEM=y
706CONFIG_HAS_IOPORT=y 693CONFIG_HAS_IOPORT=y
707CONFIG_HAS_DMA=y 694CONFIG_HAS_DMA=y
695CONFIG_GENERIC_ATOMIC64=y
diff --git a/arch/sh/configs/sh7763rdp_defconfig b/arch/sh/configs/sh7763rdp_defconfig
index f77bc7998d2f..b1d9b2311e3c 100644
--- a/arch/sh/configs/sh7763rdp_defconfig
+++ b/arch/sh/configs/sh7763rdp_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.30-rc3 3# Linux kernel version: 2.6.30
4# Mon Apr 27 13:10:12 2009 4# Thu Jun 18 13:07:15 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -19,6 +19,7 @@ CONFIG_GENERIC_TIME=y
19CONFIG_GENERIC_CLOCKEVENTS=y 19CONFIG_GENERIC_CLOCKEVENTS=y
20# CONFIG_ARCH_SUSPEND_POSSIBLE is not set 20# CONFIG_ARCH_SUSPEND_POSSIBLE is not set
21CONFIG_ARCH_HIBERNATION_POSSIBLE=y 21CONFIG_ARCH_HIBERNATION_POSSIBLE=y
22CONFIG_SYS_SUPPORTS_TMU=y
22CONFIG_STACKTRACE_SUPPORT=y 23CONFIG_STACKTRACE_SUPPORT=y
23CONFIG_LOCKDEP_SUPPORT=y 24CONFIG_LOCKDEP_SUPPORT=y
24CONFIG_HAVE_LATENCYTOP_SUPPORT=y 25CONFIG_HAVE_LATENCYTOP_SUPPORT=y
@@ -79,7 +80,6 @@ CONFIG_UID16=y
79# CONFIG_SYSCTL_SYSCALL is not set 80# CONFIG_SYSCTL_SYSCALL is not set
80CONFIG_KALLSYMS=y 81CONFIG_KALLSYMS=y
81# CONFIG_KALLSYMS_EXTRA_PASS is not set 82# CONFIG_KALLSYMS_EXTRA_PASS is not set
82# CONFIG_STRIP_ASM_SYMS is not set
83CONFIG_HOTPLUG=y 83CONFIG_HOTPLUG=y
84CONFIG_PRINTK=y 84CONFIG_PRINTK=y
85CONFIG_BUG=y 85CONFIG_BUG=y
@@ -92,14 +92,19 @@ CONFIG_TIMERFD=y
92CONFIG_EVENTFD=y 92CONFIG_EVENTFD=y
93CONFIG_SHMEM=y 93CONFIG_SHMEM=y
94CONFIG_AIO=y 94CONFIG_AIO=y
95
96#
97# Performance Counters
98#
95CONFIG_VM_EVENT_COUNTERS=y 99CONFIG_VM_EVENT_COUNTERS=y
100# CONFIG_STRIP_ASM_SYMS is not set
96CONFIG_COMPAT_BRK=y 101CONFIG_COMPAT_BRK=y
97CONFIG_SLAB=y 102CONFIG_SLAB=y
98# CONFIG_SLUB is not set 103# CONFIG_SLUB is not set
99# CONFIG_SLOB is not set 104# CONFIG_SLOB is not set
100CONFIG_PROFILING=y 105CONFIG_PROFILING=y
101CONFIG_TRACEPOINTS=y 106CONFIG_TRACEPOINTS=y
102# CONFIG_MARKERS is not set 107CONFIG_MARKERS=y
103CONFIG_OPROFILE=y 108CONFIG_OPROFILE=y
104CONFIG_HAVE_OPROFILE=y 109CONFIG_HAVE_OPROFILE=y
105# CONFIG_KPROBES is not set 110# CONFIG_KPROBES is not set
@@ -184,6 +189,7 @@ CONFIG_CPU_SUBTYPE_SH7763=y
184CONFIG_QUICKLIST=y 189CONFIG_QUICKLIST=y
185CONFIG_MMU=y 190CONFIG_MMU=y
186CONFIG_PAGE_OFFSET=0x80000000 191CONFIG_PAGE_OFFSET=0x80000000
192CONFIG_FORCE_MAX_ZONEORDER=11
187CONFIG_MEMORY_START=0x0c000000 193CONFIG_MEMORY_START=0x0c000000
188CONFIG_MEMORY_SIZE=0x04000000 194CONFIG_MEMORY_SIZE=0x04000000
189CONFIG_29BIT=y 195CONFIG_29BIT=y
@@ -200,7 +206,6 @@ CONFIG_PAGE_SIZE_4KB=y
200# CONFIG_PAGE_SIZE_8KB is not set 206# CONFIG_PAGE_SIZE_8KB is not set
201# CONFIG_PAGE_SIZE_16KB is not set 207# CONFIG_PAGE_SIZE_16KB is not set
202# CONFIG_PAGE_SIZE_64KB is not set 208# CONFIG_PAGE_SIZE_64KB is not set
203CONFIG_ENTRY_OFFSET=0x00001000
204CONFIG_SELECT_MEMORY_MODEL=y 209CONFIG_SELECT_MEMORY_MODEL=y
205# CONFIG_FLATMEM_MANUAL is not set 210# CONFIG_FLATMEM_MANUAL is not set
206# CONFIG_DISCONTIGMEM_MANUAL is not set 211# CONFIG_DISCONTIGMEM_MANUAL is not set
@@ -215,9 +220,9 @@ CONFIG_MIGRATION=y
215# CONFIG_PHYS_ADDR_T_64BIT is not set 220# CONFIG_PHYS_ADDR_T_64BIT is not set
216CONFIG_ZONE_DMA_FLAG=0 221CONFIG_ZONE_DMA_FLAG=0
217CONFIG_NR_QUICK=2 222CONFIG_NR_QUICK=2
218CONFIG_UNEVICTABLE_LRU=y
219CONFIG_HAVE_MLOCK=y 223CONFIG_HAVE_MLOCK=y
220CONFIG_HAVE_MLOCKED_PAGE_BIT=y 224CONFIG_HAVE_MLOCKED_PAGE_BIT=y
225CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
221 226
222# 227#
223# Cache configuration 228# Cache configuration
@@ -246,9 +251,10 @@ CONFIG_SH_SH7763RDP=y
246# 251#
247# Timer and clock configuration 252# Timer and clock configuration
248# 253#
249CONFIG_SH_TMU=y 254CONFIG_SH_TIMER_TMU=y
250CONFIG_SH_TIMER_IRQ=28
251CONFIG_SH_PCLK_FREQ=66666666 255CONFIG_SH_PCLK_FREQ=66666666
256CONFIG_SH_CLK_CPG=y
257CONFIG_SH_CLK_CPG_LEGACY=y
252# CONFIG_NO_HZ is not set 258# CONFIG_NO_HZ is not set
253# CONFIG_HIGH_RES_TIMERS is not set 259# CONFIG_HIGH_RES_TIMERS is not set
254CONFIG_GENERIC_CLOCKEVENTS_BUILD=y 260CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
@@ -289,12 +295,14 @@ CONFIG_PREEMPT_NONE=y
289# CONFIG_PREEMPT_VOLUNTARY is not set 295# CONFIG_PREEMPT_VOLUNTARY is not set
290# CONFIG_PREEMPT is not set 296# CONFIG_PREEMPT is not set
291CONFIG_GUSA=y 297CONFIG_GUSA=y
298# CONFIG_SPARSE_IRQ is not set
292 299
293# 300#
294# Boot options 301# Boot options
295# 302#
296CONFIG_ZERO_PAGE_OFFSET=0x00001000 303CONFIG_ZERO_PAGE_OFFSET=0x00001000
297CONFIG_BOOT_LINK_OFFSET=0x00800000 304CONFIG_BOOT_LINK_OFFSET=0x00800000
305CONFIG_ENTRY_OFFSET=0x00001000
298CONFIG_CMDLINE_BOOL=y 306CONFIG_CMDLINE_BOOL=y
299CONFIG_CMDLINE="console=ttySC2,115200 root=/dev/sda1 rootdelay=10" 307CONFIG_CMDLINE="console=ttySC2,115200 root=/dev/sda1 rootdelay=10"
300 308
@@ -377,6 +385,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
377# CONFIG_ECONET is not set 385# CONFIG_ECONET is not set
378# CONFIG_WAN_ROUTER is not set 386# CONFIG_WAN_ROUTER is not set
379# CONFIG_PHONET is not set 387# CONFIG_PHONET is not set
388# CONFIG_IEEE802154 is not set
380# CONFIG_NET_SCHED is not set 389# CONFIG_NET_SCHED is not set
381# CONFIG_DCB is not set 390# CONFIG_DCB is not set
382 391
@@ -396,7 +405,11 @@ CONFIG_WIRELESS=y
396CONFIG_WIRELESS_EXT=y 405CONFIG_WIRELESS_EXT=y
397CONFIG_WIRELESS_EXT_SYSFS=y 406CONFIG_WIRELESS_EXT_SYSFS=y
398# CONFIG_LIB80211 is not set 407# CONFIG_LIB80211 is not set
399# CONFIG_MAC80211 is not set 408
409#
410# CFG80211 needs to be enabled for MAC80211
411#
412CONFIG_MAC80211_DEFAULT_PS_VALUE=0
400# CONFIG_WIMAX is not set 413# CONFIG_WIMAX is not set
401# CONFIG_RFKILL is not set 414# CONFIG_RFKILL is not set
402# CONFIG_NET_9P is not set 415# CONFIG_NET_9P is not set
@@ -536,10 +549,6 @@ CONFIG_BLK_DEV_SD=y
536# CONFIG_BLK_DEV_SR is not set 549# CONFIG_BLK_DEV_SR is not set
537# CONFIG_CHR_DEV_SG is not set 550# CONFIG_CHR_DEV_SG is not set
538# CONFIG_CHR_DEV_SCH is not set 551# CONFIG_CHR_DEV_SCH is not set
539
540#
541# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
542#
543# CONFIG_SCSI_MULTI_LUN is not set 552# CONFIG_SCSI_MULTI_LUN is not set
544# CONFIG_SCSI_CONSTANTS is not set 553# CONFIG_SCSI_CONSTANTS is not set
545# CONFIG_SCSI_LOGGING is not set 554# CONFIG_SCSI_LOGGING is not set
@@ -556,6 +565,7 @@ CONFIG_SCSI_WAIT_SCAN=m
556# CONFIG_SCSI_SRP_ATTRS is not set 565# CONFIG_SCSI_SRP_ATTRS is not set
557CONFIG_SCSI_LOWLEVEL=y 566CONFIG_SCSI_LOWLEVEL=y
558# CONFIG_ISCSI_TCP is not set 567# CONFIG_ISCSI_TCP is not set
568# CONFIG_SCSI_BNX2_ISCSI is not set
559# CONFIG_LIBFC is not set 569# CONFIG_LIBFC is not set
560# CONFIG_LIBFCOE is not set 570# CONFIG_LIBFCOE is not set
561# CONFIG_SCSI_DEBUG is not set 571# CONFIG_SCSI_DEBUG is not set
@@ -564,7 +574,6 @@ CONFIG_SCSI_LOWLEVEL=y
564# CONFIG_ATA is not set 574# CONFIG_ATA is not set
565# CONFIG_MD is not set 575# CONFIG_MD is not set
566CONFIG_NETDEVICES=y 576CONFIG_NETDEVICES=y
567CONFIG_COMPAT_NET_DEV_OPS=y
568# CONFIG_DUMMY is not set 577# CONFIG_DUMMY is not set
569# CONFIG_BONDING is not set 578# CONFIG_BONDING is not set
570# CONFIG_MACVLAN is not set 579# CONFIG_MACVLAN is not set
@@ -609,6 +618,7 @@ CONFIG_SH_ETH=y
609# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set 618# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
610# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set 619# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
611# CONFIG_B44 is not set 620# CONFIG_B44 is not set
621# CONFIG_KS8842 is not set
612# CONFIG_NETDEV_1000 is not set 622# CONFIG_NETDEV_1000 is not set
613# CONFIG_NETDEV_10000 is not set 623# CONFIG_NETDEV_10000 is not set
614 624
@@ -727,22 +737,7 @@ CONFIG_SSB_POSSIBLE=y
727# CONFIG_HTC_PASIC3 is not set 737# CONFIG_HTC_PASIC3 is not set
728# CONFIG_MFD_TMIO is not set 738# CONFIG_MFD_TMIO is not set
729# CONFIG_REGULATOR is not set 739# CONFIG_REGULATOR is not set
730 740# CONFIG_MEDIA_SUPPORT is not set
731#
732# Multimedia devices
733#
734
735#
736# Multimedia core support
737#
738# CONFIG_VIDEO_DEV is not set
739# CONFIG_DVB_CORE is not set
740# CONFIG_VIDEO_MEDIA is not set
741
742#
743# Multimedia drivers
744#
745# CONFIG_DAB is not set
746 741
747# 742#
748# Graphics support 743# Graphics support
@@ -931,10 +926,15 @@ CONFIG_MMC_BLOCK_BOUNCE=y
931# CONFIG_MEMSTICK is not set 926# CONFIG_MEMSTICK is not set
932# CONFIG_NEW_LEDS is not set 927# CONFIG_NEW_LEDS is not set
933# CONFIG_ACCESSIBILITY is not set 928# CONFIG_ACCESSIBILITY is not set
929CONFIG_RTC_LIB=y
934# CONFIG_RTC_CLASS is not set 930# CONFIG_RTC_CLASS is not set
935# CONFIG_DMADEVICES is not set 931# CONFIG_DMADEVICES is not set
936# CONFIG_AUXDISPLAY is not set 932# CONFIG_AUXDISPLAY is not set
937# CONFIG_UIO is not set 933# CONFIG_UIO is not set
934
935#
936# TI VLYNQ
937#
938# CONFIG_STAGING is not set 938# CONFIG_STAGING is not set
939 939
940# 940#
@@ -955,10 +955,11 @@ CONFIG_FS_MBCACHE=y
955# CONFIG_REISERFS_FS is not set 955# CONFIG_REISERFS_FS is not set
956# CONFIG_JFS_FS is not set 956# CONFIG_JFS_FS is not set
957CONFIG_FS_POSIX_ACL=y 957CONFIG_FS_POSIX_ACL=y
958CONFIG_FILE_LOCKING=y
959# CONFIG_XFS_FS is not set 958# CONFIG_XFS_FS is not set
960# CONFIG_OCFS2_FS is not set 959# CONFIG_OCFS2_FS is not set
961# CONFIG_BTRFS_FS is not set 960# CONFIG_BTRFS_FS is not set
961CONFIG_FILE_LOCKING=y
962CONFIG_FSNOTIFY=y
962CONFIG_DNOTIFY=y 963CONFIG_DNOTIFY=y
963CONFIG_INOTIFY=y 964CONFIG_INOTIFY=y
964CONFIG_INOTIFY_USER=y 965CONFIG_INOTIFY_USER=y
@@ -1109,31 +1110,17 @@ CONFIG_HAVE_FUNCTION_TRACER=y
1109CONFIG_HAVE_DYNAMIC_FTRACE=y 1110CONFIG_HAVE_DYNAMIC_FTRACE=y
1110CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 1111CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1111CONFIG_RING_BUFFER=y 1112CONFIG_RING_BUFFER=y
1113CONFIG_EVENT_TRACING=y
1114CONFIG_CONTEXT_SWITCH_TRACER=y
1112CONFIG_TRACING=y 1115CONFIG_TRACING=y
1113CONFIG_TRACING_SUPPORT=y 1116CONFIG_TRACING_SUPPORT=y
1114 1117# CONFIG_FTRACE is not set
1115#
1116# Tracers
1117#
1118# CONFIG_FUNCTION_TRACER is not set
1119# CONFIG_IRQSOFF_TRACER is not set
1120# CONFIG_SCHED_TRACER is not set
1121# CONFIG_CONTEXT_SWITCH_TRACER is not set
1122# CONFIG_EVENT_TRACER is not set
1123# CONFIG_BOOT_TRACER is not set
1124# CONFIG_TRACE_BRANCH_PROFILING is not set
1125# CONFIG_STACK_TRACER is not set
1126# CONFIG_KMEMTRACE is not set
1127# CONFIG_WORKQUEUE_TRACER is not set
1128# CONFIG_BLK_DEV_IO_TRACE is not set
1129# CONFIG_FTRACE_STARTUP_TEST is not set
1130# CONFIG_DYNAMIC_DEBUG is not set 1118# CONFIG_DYNAMIC_DEBUG is not set
1131# CONFIG_DMA_API_DEBUG is not set 1119# CONFIG_DMA_API_DEBUG is not set
1132# CONFIG_SAMPLES is not set 1120# CONFIG_SAMPLES is not set
1133CONFIG_HAVE_ARCH_KGDB=y 1121CONFIG_HAVE_ARCH_KGDB=y
1134# CONFIG_SH_STANDARD_BIOS is not set 1122# CONFIG_SH_STANDARD_BIOS is not set
1135# CONFIG_EARLY_SCIF_CONSOLE is not set 1123# CONFIG_EARLY_SCIF_CONSOLE is not set
1136# CONFIG_MORE_COMPILE_OPTIONS is not set
1137 1124
1138# 1125#
1139# Security options 1126# Security options
@@ -1246,3 +1233,4 @@ CONFIG_HAS_IOMEM=y
1246CONFIG_HAS_IOPORT=y 1233CONFIG_HAS_IOPORT=y
1247CONFIG_HAS_DMA=y 1234CONFIG_HAS_DMA=y
1248CONFIG_NLATTR=y 1235CONFIG_NLATTR=y
1236CONFIG_GENERIC_ATOMIC64=y
diff --git a/arch/sh/configs/sh7770_generic_defconfig b/arch/sh/configs/sh7770_generic_defconfig
index d6489b46ca5b..426a88f7a23b 100644
--- a/arch/sh/configs/sh7770_generic_defconfig
+++ b/arch/sh/configs/sh7770_generic_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.30-rc4 3# Linux kernel version: 2.6.30
4# Tue May 12 14:48:21 2009 4# Thu Jun 18 13:08:05 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -79,7 +79,6 @@ CONFIG_EMBEDDED=y
79CONFIG_SYSCTL_SYSCALL=y 79CONFIG_SYSCTL_SYSCALL=y
80CONFIG_KALLSYMS=y 80CONFIG_KALLSYMS=y
81# CONFIG_KALLSYMS_EXTRA_PASS is not set 81# CONFIG_KALLSYMS_EXTRA_PASS is not set
82# CONFIG_STRIP_ASM_SYMS is not set
83CONFIG_HOTPLUG=y 82CONFIG_HOTPLUG=y
84CONFIG_PRINTK=y 83CONFIG_PRINTK=y
85CONFIG_BUG=y 84CONFIG_BUG=y
@@ -92,14 +91,19 @@ CONFIG_TIMERFD=y
92CONFIG_EVENTFD=y 91CONFIG_EVENTFD=y
93CONFIG_SHMEM=y 92CONFIG_SHMEM=y
94CONFIG_AIO=y 93CONFIG_AIO=y
94
95#
96# Performance Counters
97#
95CONFIG_VM_EVENT_COUNTERS=y 98CONFIG_VM_EVENT_COUNTERS=y
99# CONFIG_STRIP_ASM_SYMS is not set
96# CONFIG_COMPAT_BRK is not set 100# CONFIG_COMPAT_BRK is not set
97# CONFIG_SLAB is not set 101# CONFIG_SLAB is not set
98CONFIG_SLUB=y 102CONFIG_SLUB=y
99# CONFIG_SLOB is not set 103# CONFIG_SLOB is not set
100CONFIG_PROFILING=y 104CONFIG_PROFILING=y
101CONFIG_TRACEPOINTS=y 105CONFIG_TRACEPOINTS=y
102# CONFIG_MARKERS is not set 106CONFIG_MARKERS=y
103CONFIG_OPROFILE=y 107CONFIG_OPROFILE=y
104CONFIG_HAVE_OPROFILE=y 108CONFIG_HAVE_OPROFILE=y
105CONFIG_HAVE_IOREMAP_PROT=y 109CONFIG_HAVE_IOREMAP_PROT=y
@@ -178,6 +182,7 @@ CONFIG_CPU_SUBTYPE_SH7770=y
178CONFIG_QUICKLIST=y 182CONFIG_QUICKLIST=y
179CONFIG_MMU=y 183CONFIG_MMU=y
180CONFIG_PAGE_OFFSET=0x80000000 184CONFIG_PAGE_OFFSET=0x80000000
185CONFIG_FORCE_MAX_ZONEORDER=11
181CONFIG_MEMORY_START=0x08000000 186CONFIG_MEMORY_START=0x08000000
182CONFIG_MEMORY_SIZE=0x04000000 187CONFIG_MEMORY_SIZE=0x04000000
183CONFIG_29BIT=y 188CONFIG_29BIT=y
@@ -211,9 +216,9 @@ CONFIG_MIGRATION=y
211# CONFIG_PHYS_ADDR_T_64BIT is not set 216# CONFIG_PHYS_ADDR_T_64BIT is not set
212CONFIG_ZONE_DMA_FLAG=0 217CONFIG_ZONE_DMA_FLAG=0
213CONFIG_NR_QUICK=2 218CONFIG_NR_QUICK=2
214CONFIG_UNEVICTABLE_LRU=y
215CONFIG_HAVE_MLOCK=y 219CONFIG_HAVE_MLOCK=y
216CONFIG_HAVE_MLOCKED_PAGE_BIT=y 220CONFIG_HAVE_MLOCKED_PAGE_BIT=y
221CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
217 222
218# 223#
219# Cache configuration 224# Cache configuration
@@ -240,9 +245,10 @@ CONFIG_CPU_HAS_FPU=y
240# 245#
241# Timer and clock configuration 246# Timer and clock configuration
242# 247#
243CONFIG_SH_TMU=y 248CONFIG_SH_TIMER_TMU=y
244CONFIG_SH_TIMER_IRQ=16
245CONFIG_SH_PCLK_FREQ=41666666 249CONFIG_SH_PCLK_FREQ=41666666
250CONFIG_SH_CLK_CPG=y
251CONFIG_SH_CLK_CPG_LEGACY=y
246CONFIG_TICK_ONESHOT=y 252CONFIG_TICK_ONESHOT=y
247CONFIG_NO_HZ=y 253CONFIG_NO_HZ=y
248CONFIG_HIGH_RES_TIMERS=y 254CONFIG_HIGH_RES_TIMERS=y
@@ -299,6 +305,7 @@ CONFIG_PREEMPT_NONE=y
299# CONFIG_PREEMPT_VOLUNTARY is not set 305# CONFIG_PREEMPT_VOLUNTARY is not set
300# CONFIG_PREEMPT is not set 306# CONFIG_PREEMPT is not set
301CONFIG_GUSA=y 307CONFIG_GUSA=y
308# CONFIG_SPARSE_IRQ is not set
302 309
303# 310#
304# Boot options 311# Boot options
@@ -328,6 +335,7 @@ CONFIG_BINFMT_ELF=y
328CONFIG_PM=y 335CONFIG_PM=y
329# CONFIG_PM_DEBUG is not set 336# CONFIG_PM_DEBUG is not set
330CONFIG_PM_SLEEP=y 337CONFIG_PM_SLEEP=y
338CONFIG_HIBERNATION_NVS=y
331CONFIG_HIBERNATION=y 339CONFIG_HIBERNATION=y
332CONFIG_PM_STD_PARTITION="" 340CONFIG_PM_STD_PARTITION=""
333CONFIG_CPU_IDLE=y 341CONFIG_CPU_IDLE=y
@@ -444,7 +452,6 @@ CONFIG_I2C_SH_MOBILE=y
444# CONFIG_SENSORS_PCF8574 is not set 452# CONFIG_SENSORS_PCF8574 is not set
445# CONFIG_PCF8575 is not set 453# CONFIG_PCF8575 is not set
446# CONFIG_SENSORS_PCA9539 is not set 454# CONFIG_SENSORS_PCA9539 is not set
447# CONFIG_SENSORS_MAX6875 is not set
448# CONFIG_SENSORS_TSL2550 is not set 455# CONFIG_SENSORS_TSL2550 is not set
449# CONFIG_I2C_DEBUG_CORE is not set 456# CONFIG_I2C_DEBUG_CORE is not set
450# CONFIG_I2C_DEBUG_ALGO is not set 457# CONFIG_I2C_DEBUG_ALGO is not set
@@ -477,21 +484,7 @@ CONFIG_SSB_POSSIBLE=y
477# CONFIG_MFD_WM8350_I2C is not set 484# CONFIG_MFD_WM8350_I2C is not set
478# CONFIG_MFD_PCF50633 is not set 485# CONFIG_MFD_PCF50633 is not set
479# CONFIG_REGULATOR is not set 486# CONFIG_REGULATOR is not set
480 487# CONFIG_MEDIA_SUPPORT is not set
481#
482# Multimedia devices
483#
484
485#
486# Multimedia core support
487#
488# CONFIG_VIDEO_DEV is not set
489# CONFIG_VIDEO_MEDIA is not set
490
491#
492# Multimedia drivers
493#
494# CONFIG_DAB is not set
495 488
496# 489#
497# Graphics support 490# Graphics support
@@ -571,6 +564,10 @@ CONFIG_UIO=y
571CONFIG_UIO_PDRV_GENIRQ=y 564CONFIG_UIO_PDRV_GENIRQ=y
572# CONFIG_UIO_SMX is not set 565# CONFIG_UIO_SMX is not set
573# CONFIG_UIO_SERCOS3 is not set 566# CONFIG_UIO_SERCOS3 is not set
567
568#
569# TI VLYNQ
570#
574# CONFIG_STAGING is not set 571# CONFIG_STAGING is not set
575 572
576# 573#
@@ -582,11 +579,13 @@ CONFIG_UIO_PDRV_GENIRQ=y
582# CONFIG_REISERFS_FS is not set 579# CONFIG_REISERFS_FS is not set
583# CONFIG_JFS_FS is not set 580# CONFIG_JFS_FS is not set
584# CONFIG_FS_POSIX_ACL is not set 581# CONFIG_FS_POSIX_ACL is not set
585CONFIG_FILE_LOCKING=y
586# CONFIG_XFS_FS is not set 582# CONFIG_XFS_FS is not set
587# CONFIG_BTRFS_FS is not set 583# CONFIG_BTRFS_FS is not set
584CONFIG_FILE_LOCKING=y
585CONFIG_FSNOTIFY=y
588# CONFIG_DNOTIFY is not set 586# CONFIG_DNOTIFY is not set
589# CONFIG_INOTIFY is not set 587# CONFIG_INOTIFY is not set
588CONFIG_INOTIFY_USER=y
590# CONFIG_QUOTA is not set 589# CONFIG_QUOTA is not set
591# CONFIG_AUTOFS_FS is not set 590# CONFIG_AUTOFS_FS is not set
592# CONFIG_AUTOFS4_FS is not set 591# CONFIG_AUTOFS4_FS is not set
@@ -651,23 +650,11 @@ CONFIG_HAVE_FUNCTION_TRACER=y
651CONFIG_HAVE_DYNAMIC_FTRACE=y 650CONFIG_HAVE_DYNAMIC_FTRACE=y
652CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 651CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
653CONFIG_RING_BUFFER=y 652CONFIG_RING_BUFFER=y
653CONFIG_EVENT_TRACING=y
654CONFIG_CONTEXT_SWITCH_TRACER=y
654CONFIG_TRACING=y 655CONFIG_TRACING=y
655CONFIG_TRACING_SUPPORT=y 656CONFIG_TRACING_SUPPORT=y
656 657# CONFIG_FTRACE is not set
657#
658# Tracers
659#
660# CONFIG_FUNCTION_TRACER is not set
661# CONFIG_IRQSOFF_TRACER is not set
662# CONFIG_SCHED_TRACER is not set
663# CONFIG_CONTEXT_SWITCH_TRACER is not set
664# CONFIG_EVENT_TRACER is not set
665# CONFIG_BOOT_TRACER is not set
666# CONFIG_TRACE_BRANCH_PROFILING is not set
667# CONFIG_STACK_TRACER is not set
668# CONFIG_KMEMTRACE is not set
669# CONFIG_WORKQUEUE_TRACER is not set
670# CONFIG_FTRACE_STARTUP_TEST is not set
671# CONFIG_DYNAMIC_DEBUG is not set 658# CONFIG_DYNAMIC_DEBUG is not set
672# CONFIG_DMA_API_DEBUG is not set 659# CONFIG_DMA_API_DEBUG is not set
673# CONFIG_SAMPLES is not set 660# CONFIG_SAMPLES is not set
@@ -698,3 +685,4 @@ CONFIG_GENERIC_FIND_LAST_BIT=y
698CONFIG_HAS_IOMEM=y 685CONFIG_HAS_IOMEM=y
699CONFIG_HAS_IOPORT=y 686CONFIG_HAS_IOPORT=y
700CONFIG_HAS_DMA=y 687CONFIG_HAS_DMA=y
688CONFIG_GENERIC_ATOMIC64=y
diff --git a/arch/sh/configs/sh7785lcr_32bit_defconfig b/arch/sh/configs/sh7785lcr_32bit_defconfig
index 1c55b800d124..ed316f602db6 100644
--- a/arch/sh/configs/sh7785lcr_32bit_defconfig
+++ b/arch/sh/configs/sh7785lcr_32bit_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.30-rc3 3# Linux kernel version: 2.6.30
4# Mon Apr 27 13:10:53 2009 4# Thu Jun 18 13:08:29 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -21,6 +21,7 @@ CONFIG_GENERIC_CLOCKEVENTS=y
21CONFIG_ARCH_HIBERNATION_POSSIBLE=y 21CONFIG_ARCH_HIBERNATION_POSSIBLE=y
22CONFIG_SYS_SUPPORTS_NUMA=y 22CONFIG_SYS_SUPPORTS_NUMA=y
23CONFIG_SYS_SUPPORTS_PCI=y 23CONFIG_SYS_SUPPORTS_PCI=y
24CONFIG_SYS_SUPPORTS_TMU=y
24CONFIG_STACKTRACE_SUPPORT=y 25CONFIG_STACKTRACE_SUPPORT=y
25CONFIG_LOCKDEP_SUPPORT=y 26CONFIG_LOCKDEP_SUPPORT=y
26CONFIG_HAVE_LATENCYTOP_SUPPORT=y 27CONFIG_HAVE_LATENCYTOP_SUPPORT=y
@@ -80,7 +81,6 @@ CONFIG_SYSCTL_SYSCALL=y
80CONFIG_KALLSYMS=y 81CONFIG_KALLSYMS=y
81# CONFIG_KALLSYMS_ALL is not set 82# CONFIG_KALLSYMS_ALL is not set
82# CONFIG_KALLSYMS_EXTRA_PASS is not set 83# CONFIG_KALLSYMS_EXTRA_PASS is not set
83# CONFIG_STRIP_ASM_SYMS is not set
84CONFIG_HOTPLUG=y 84CONFIG_HOTPLUG=y
85CONFIG_PRINTK=y 85CONFIG_PRINTK=y
86CONFIG_BUG=y 86CONFIG_BUG=y
@@ -93,8 +93,13 @@ CONFIG_TIMERFD=y
93CONFIG_EVENTFD=y 93CONFIG_EVENTFD=y
94CONFIG_SHMEM=y 94CONFIG_SHMEM=y
95CONFIG_AIO=y 95CONFIG_AIO=y
96
97#
98# Performance Counters
99#
96CONFIG_VM_EVENT_COUNTERS=y 100CONFIG_VM_EVENT_COUNTERS=y
97CONFIG_PCI_QUIRKS=y 101CONFIG_PCI_QUIRKS=y
102# CONFIG_STRIP_ASM_SYMS is not set
98CONFIG_COMPAT_BRK=y 103CONFIG_COMPAT_BRK=y
99CONFIG_SLAB=y 104CONFIG_SLAB=y
100# CONFIG_SLUB is not set 105# CONFIG_SLUB is not set
@@ -187,6 +192,7 @@ CONFIG_CPU_SUBTYPE_SH7785=y
187CONFIG_QUICKLIST=y 192CONFIG_QUICKLIST=y
188CONFIG_MMU=y 193CONFIG_MMU=y
189CONFIG_PAGE_OFFSET=0x80000000 194CONFIG_PAGE_OFFSET=0x80000000
195CONFIG_FORCE_MAX_ZONEORDER=11
190CONFIG_MEMORY_START=0x40000000 196CONFIG_MEMORY_START=0x40000000
191CONFIG_MEMORY_SIZE=0x20000000 197CONFIG_MEMORY_SIZE=0x20000000
192# CONFIG_29BIT is not set 198# CONFIG_29BIT is not set
@@ -209,7 +215,6 @@ CONFIG_PAGE_SIZE_4KB=y
209# CONFIG_PAGE_SIZE_8KB is not set 215# CONFIG_PAGE_SIZE_8KB is not set
210# CONFIG_PAGE_SIZE_16KB is not set 216# CONFIG_PAGE_SIZE_16KB is not set
211# CONFIG_PAGE_SIZE_64KB is not set 217# CONFIG_PAGE_SIZE_64KB is not set
212CONFIG_ENTRY_OFFSET=0x00001000
213CONFIG_SELECT_MEMORY_MODEL=y 218CONFIG_SELECT_MEMORY_MODEL=y
214# CONFIG_FLATMEM_MANUAL is not set 219# CONFIG_FLATMEM_MANUAL is not set
215# CONFIG_DISCONTIGMEM_MANUAL is not set 220# CONFIG_DISCONTIGMEM_MANUAL is not set
@@ -224,9 +229,9 @@ CONFIG_MIGRATION=y
224# CONFIG_PHYS_ADDR_T_64BIT is not set 229# CONFIG_PHYS_ADDR_T_64BIT is not set
225CONFIG_ZONE_DMA_FLAG=0 230CONFIG_ZONE_DMA_FLAG=0
226CONFIG_NR_QUICK=2 231CONFIG_NR_QUICK=2
227CONFIG_UNEVICTABLE_LRU=y
228CONFIG_HAVE_MLOCK=y 232CONFIG_HAVE_MLOCK=y
229CONFIG_HAVE_MLOCKED_PAGE_BIT=y 233CONFIG_HAVE_MLOCKED_PAGE_BIT=y
234CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
230 235
231# 236#
232# Cache configuration 237# Cache configuration
@@ -244,7 +249,6 @@ CONFIG_SH_FPU=y
244CONFIG_SH_STORE_QUEUES=y 249CONFIG_SH_STORE_QUEUES=y
245CONFIG_CPU_HAS_INTEVT=y 250CONFIG_CPU_HAS_INTEVT=y
246CONFIG_CPU_HAS_SR_RB=y 251CONFIG_CPU_HAS_SR_RB=y
247CONFIG_CPU_HAS_PTEA=y
248CONFIG_CPU_HAS_FPU=y 252CONFIG_CPU_HAS_FPU=y
249 253
250# 254#
@@ -256,9 +260,9 @@ CONFIG_SH_SH7785LCR=y
256# 260#
257# Timer and clock configuration 261# Timer and clock configuration
258# 262#
259CONFIG_SH_TMU=y 263CONFIG_SH_TIMER_TMU=y
260CONFIG_SH_TIMER_IRQ=28
261CONFIG_SH_PCLK_FREQ=50000000 264CONFIG_SH_PCLK_FREQ=50000000
265CONFIG_SH_CLK_CPG=y
262CONFIG_TICK_ONESHOT=y 266CONFIG_TICK_ONESHOT=y
263# CONFIG_NO_HZ is not set 267# CONFIG_NO_HZ is not set
264CONFIG_HIGH_RES_TIMERS=y 268CONFIG_HIGH_RES_TIMERS=y
@@ -300,12 +304,14 @@ CONFIG_KEXEC=y
300# CONFIG_PREEMPT_VOLUNTARY is not set 304# CONFIG_PREEMPT_VOLUNTARY is not set
301CONFIG_PREEMPT=y 305CONFIG_PREEMPT=y
302CONFIG_GUSA=y 306CONFIG_GUSA=y
307# CONFIG_SPARSE_IRQ is not set
303 308
304# 309#
305# Boot options 310# Boot options
306# 311#
307CONFIG_ZERO_PAGE_OFFSET=0x00001000 312CONFIG_ZERO_PAGE_OFFSET=0x00001000
308CONFIG_BOOT_LINK_OFFSET=0x00800000 313CONFIG_BOOT_LINK_OFFSET=0x00800000
314CONFIG_ENTRY_OFFSET=0x00001000
309# CONFIG_CMDLINE_BOOL is not set 315# CONFIG_CMDLINE_BOOL is not set
310 316
311# 317#
@@ -400,6 +406,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
400# CONFIG_ECONET is not set 406# CONFIG_ECONET is not set
401# CONFIG_WAN_ROUTER is not set 407# CONFIG_WAN_ROUTER is not set
402# CONFIG_PHONET is not set 408# CONFIG_PHONET is not set
409# CONFIG_IEEE802154 is not set
403# CONFIG_NET_SCHED is not set 410# CONFIG_NET_SCHED is not set
404# CONFIG_DCB is not set 411# CONFIG_DCB is not set
405 412
@@ -418,7 +425,11 @@ CONFIG_WIRELESS=y
418CONFIG_WIRELESS_EXT=y 425CONFIG_WIRELESS_EXT=y
419CONFIG_WIRELESS_EXT_SYSFS=y 426CONFIG_WIRELESS_EXT_SYSFS=y
420# CONFIG_LIB80211 is not set 427# CONFIG_LIB80211 is not set
421# CONFIG_MAC80211 is not set 428
429#
430# CFG80211 needs to be enabled for MAC80211
431#
432CONFIG_MAC80211_DEFAULT_PS_VALUE=0
422# CONFIG_WIMAX is not set 433# CONFIG_WIMAX is not set
423# CONFIG_RFKILL is not set 434# CONFIG_RFKILL is not set
424# CONFIG_NET_9P is not set 435# CONFIG_NET_9P is not set
@@ -561,10 +572,6 @@ CONFIG_BLK_DEV_SD=y
561# CONFIG_BLK_DEV_SR is not set 572# CONFIG_BLK_DEV_SR is not set
562# CONFIG_CHR_DEV_SG is not set 573# CONFIG_CHR_DEV_SG is not set
563# CONFIG_CHR_DEV_SCH is not set 574# CONFIG_CHR_DEV_SCH is not set
564
565#
566# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
567#
568# CONFIG_SCSI_MULTI_LUN is not set 575# CONFIG_SCSI_MULTI_LUN is not set
569# CONFIG_SCSI_CONSTANTS is not set 576# CONFIG_SCSI_CONSTANTS is not set
570# CONFIG_SCSI_LOGGING is not set 577# CONFIG_SCSI_LOGGING is not set
@@ -656,7 +663,6 @@ CONFIG_SATA_SIL=y
656# CONFIG_IEEE1394 is not set 663# CONFIG_IEEE1394 is not set
657# CONFIG_I2O is not set 664# CONFIG_I2O is not set
658CONFIG_NETDEVICES=y 665CONFIG_NETDEVICES=y
659CONFIG_COMPAT_NET_DEV_OPS=y
660# CONFIG_DUMMY is not set 666# CONFIG_DUMMY is not set
661# CONFIG_BONDING is not set 667# CONFIG_BONDING is not set
662# CONFIG_MACVLAN is not set 668# CONFIG_MACVLAN is not set
@@ -861,7 +867,6 @@ CONFIG_I2C_PCA_PLATFORM=y
861# CONFIG_SENSORS_PCF8574 is not set 867# CONFIG_SENSORS_PCF8574 is not set
862# CONFIG_PCF8575 is not set 868# CONFIG_PCF8575 is not set
863# CONFIG_SENSORS_PCA9539 is not set 869# CONFIG_SENSORS_PCA9539 is not set
864# CONFIG_SENSORS_MAX6875 is not set
865# CONFIG_SENSORS_TSL2550 is not set 870# CONFIG_SENSORS_TSL2550 is not set
866# CONFIG_I2C_DEBUG_CORE is not set 871# CONFIG_I2C_DEBUG_CORE is not set
867# CONFIG_I2C_DEBUG_ALGO is not set 872# CONFIG_I2C_DEBUG_ALGO is not set
@@ -894,22 +899,7 @@ CONFIG_MFD_SM501=y
894# CONFIG_MFD_WM8350_I2C is not set 899# CONFIG_MFD_WM8350_I2C is not set
895# CONFIG_MFD_PCF50633 is not set 900# CONFIG_MFD_PCF50633 is not set
896# CONFIG_REGULATOR is not set 901# CONFIG_REGULATOR is not set
897 902# CONFIG_MEDIA_SUPPORT is not set
898#
899# Multimedia devices
900#
901
902#
903# Multimedia core support
904#
905# CONFIG_VIDEO_DEV is not set
906# CONFIG_DVB_CORE is not set
907# CONFIG_VIDEO_MEDIA is not set
908
909#
910# Multimedia drivers
911#
912# CONFIG_DAB is not set
913 903
914# 904#
915# Graphics support 905# Graphics support
@@ -1017,7 +1007,7 @@ CONFIG_HID_BELKIN=y
1017CONFIG_HID_CHERRY=y 1007CONFIG_HID_CHERRY=y
1018CONFIG_HID_CHICONY=y 1008CONFIG_HID_CHICONY=y
1019CONFIG_HID_CYPRESS=y 1009CONFIG_HID_CYPRESS=y
1020# CONFIG_DRAGONRISE_FF is not set 1010# CONFIG_HID_DRAGONRISE is not set
1021CONFIG_HID_EZKEY=y 1011CONFIG_HID_EZKEY=y
1022# CONFIG_HID_KYE is not set 1012# CONFIG_HID_KYE is not set
1023CONFIG_HID_GYRATION=y 1013CONFIG_HID_GYRATION=y
@@ -1034,10 +1024,11 @@ CONFIG_HID_PETALYNX=y
1034CONFIG_HID_SAMSUNG=y 1024CONFIG_HID_SAMSUNG=y
1035CONFIG_HID_SONY=y 1025CONFIG_HID_SONY=y
1036CONFIG_HID_SUNPLUS=y 1026CONFIG_HID_SUNPLUS=y
1037# CONFIG_GREENASIA_FF is not set 1027# CONFIG_HID_GREENASIA is not set
1028# CONFIG_HID_SMARTJOYPLUS is not set
1038# CONFIG_HID_TOPSEED is not set 1029# CONFIG_HID_TOPSEED is not set
1039CONFIG_THRUSTMASTER_FF=m 1030# CONFIG_HID_THRUSTMASTER is not set
1040CONFIG_ZEROPLUS_FF=m 1031# CONFIG_HID_ZEROPLUS is not set
1041CONFIG_USB_SUPPORT=y 1032CONFIG_USB_SUPPORT=y
1042CONFIG_USB_ARCH_HAS_HCD=y 1033CONFIG_USB_ARCH_HAS_HCD=y
1043CONFIG_USB_ARCH_HAS_OHCI=y 1034CONFIG_USB_ARCH_HAS_OHCI=y
@@ -1063,6 +1054,7 @@ CONFIG_USB_MON=y
1063# USB Host Controller Drivers 1054# USB Host Controller Drivers
1064# 1055#
1065# CONFIG_USB_C67X00_HCD is not set 1056# CONFIG_USB_C67X00_HCD is not set
1057# CONFIG_USB_XHCI_HCD is not set
1066CONFIG_USB_EHCI_HCD=m 1058CONFIG_USB_EHCI_HCD=m
1067# CONFIG_USB_EHCI_ROOT_HUB_TT is not set 1059# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
1068# CONFIG_USB_EHCI_TT_NEWSCHED is not set 1060# CONFIG_USB_EHCI_TT_NEWSCHED is not set
@@ -1210,9 +1202,14 @@ CONFIG_RTC_DRV_RS5C372=y
1210# on-CPU RTC drivers 1202# on-CPU RTC drivers
1211# 1203#
1212# CONFIG_RTC_DRV_SH is not set 1204# CONFIG_RTC_DRV_SH is not set
1205# CONFIG_RTC_DRV_GENERIC is not set
1213# CONFIG_DMADEVICES is not set 1206# CONFIG_DMADEVICES is not set
1214# CONFIG_AUXDISPLAY is not set 1207# CONFIG_AUXDISPLAY is not set
1215# CONFIG_UIO is not set 1208# CONFIG_UIO is not set
1209
1210#
1211# TI VLYNQ
1212#
1216# CONFIG_STAGING is not set 1213# CONFIG_STAGING is not set
1217 1214
1218# 1215#
@@ -1232,10 +1229,11 @@ CONFIG_FS_MBCACHE=y
1232# CONFIG_REISERFS_FS is not set 1229# CONFIG_REISERFS_FS is not set
1233# CONFIG_JFS_FS is not set 1230# CONFIG_JFS_FS is not set
1234CONFIG_FS_POSIX_ACL=y 1231CONFIG_FS_POSIX_ACL=y
1235CONFIG_FILE_LOCKING=y
1236# CONFIG_XFS_FS is not set 1232# CONFIG_XFS_FS is not set
1237# CONFIG_OCFS2_FS is not set 1233# CONFIG_OCFS2_FS is not set
1238# CONFIG_BTRFS_FS is not set 1234# CONFIG_BTRFS_FS is not set
1235CONFIG_FILE_LOCKING=y
1236CONFIG_FSNOTIFY=y
1239CONFIG_DNOTIFY=y 1237CONFIG_DNOTIFY=y
1240CONFIG_INOTIFY=y 1238CONFIG_INOTIFY=y
1241CONFIG_INOTIFY_USER=y 1239CONFIG_INOTIFY_USER=y
@@ -1428,18 +1426,16 @@ CONFIG_HAVE_FUNCTION_TRACER=y
1428CONFIG_HAVE_DYNAMIC_FTRACE=y 1426CONFIG_HAVE_DYNAMIC_FTRACE=y
1429CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 1427CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1430CONFIG_TRACING_SUPPORT=y 1428CONFIG_TRACING_SUPPORT=y
1431 1429CONFIG_FTRACE=y
1432#
1433# Tracers
1434#
1435# CONFIG_FUNCTION_TRACER is not set 1430# CONFIG_FUNCTION_TRACER is not set
1436# CONFIG_IRQSOFF_TRACER is not set 1431# CONFIG_IRQSOFF_TRACER is not set
1437# CONFIG_PREEMPT_TRACER is not set 1432# CONFIG_PREEMPT_TRACER is not set
1438# CONFIG_SCHED_TRACER is not set 1433# CONFIG_SCHED_TRACER is not set
1439# CONFIG_CONTEXT_SWITCH_TRACER is not set 1434# CONFIG_ENABLE_DEFAULT_TRACERS is not set
1440# CONFIG_EVENT_TRACER is not set
1441# CONFIG_BOOT_TRACER is not set 1435# CONFIG_BOOT_TRACER is not set
1442# CONFIG_TRACE_BRANCH_PROFILING is not set 1436CONFIG_BRANCH_PROFILE_NONE=y
1437# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
1438# CONFIG_PROFILE_ALL_BRANCHES is not set
1443# CONFIG_STACK_TRACER is not set 1439# CONFIG_STACK_TRACER is not set
1444# CONFIG_KMEMTRACE is not set 1440# CONFIG_KMEMTRACE is not set
1445# CONFIG_WORKQUEUE_TRACER is not set 1441# CONFIG_WORKQUEUE_TRACER is not set
@@ -1454,10 +1450,8 @@ CONFIG_HAVE_ARCH_KGDB=y
1454# CONFIG_DEBUG_STACKOVERFLOW is not set 1450# CONFIG_DEBUG_STACKOVERFLOW is not set
1455# CONFIG_DEBUG_STACK_USAGE is not set 1451# CONFIG_DEBUG_STACK_USAGE is not set
1456# CONFIG_4KSTACKS is not set 1452# CONFIG_4KSTACKS is not set
1457# CONFIG_IRQSTACKS is not set
1458# CONFIG_DUMP_CODE is not set 1453# CONFIG_DUMP_CODE is not set
1459# CONFIG_SH_NO_BSS_INIT is not set 1454# CONFIG_SH_NO_BSS_INIT is not set
1460# CONFIG_MORE_COMPILE_OPTIONS is not set
1461 1455
1462# 1456#
1463# Security options 1457# Security options
@@ -1580,3 +1574,4 @@ CONFIG_HAS_IOMEM=y
1580CONFIG_HAS_IOPORT=y 1574CONFIG_HAS_IOPORT=y
1581CONFIG_HAS_DMA=y 1575CONFIG_HAS_DMA=y
1582CONFIG_NLATTR=y 1576CONFIG_NLATTR=y
1577CONFIG_GENERIC_ATOMIC64=y
diff --git a/arch/sh/configs/sh7785lcr_defconfig b/arch/sh/configs/sh7785lcr_defconfig
index 4385fe97a780..004e6f5e8a68 100644
--- a/arch/sh/configs/sh7785lcr_defconfig
+++ b/arch/sh/configs/sh7785lcr_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.30-rc3 3# Linux kernel version: 2.6.30
4# Mon Apr 27 13:11:48 2009 4# Thu Jun 18 13:09:34 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -21,6 +21,7 @@ CONFIG_GENERIC_CLOCKEVENTS=y
21CONFIG_ARCH_HIBERNATION_POSSIBLE=y 21CONFIG_ARCH_HIBERNATION_POSSIBLE=y
22CONFIG_SYS_SUPPORTS_NUMA=y 22CONFIG_SYS_SUPPORTS_NUMA=y
23CONFIG_SYS_SUPPORTS_PCI=y 23CONFIG_SYS_SUPPORTS_PCI=y
24CONFIG_SYS_SUPPORTS_TMU=y
24CONFIG_STACKTRACE_SUPPORT=y 25CONFIG_STACKTRACE_SUPPORT=y
25CONFIG_LOCKDEP_SUPPORT=y 26CONFIG_LOCKDEP_SUPPORT=y
26CONFIG_HAVE_LATENCYTOP_SUPPORT=y 27CONFIG_HAVE_LATENCYTOP_SUPPORT=y
@@ -80,7 +81,6 @@ CONFIG_SYSCTL_SYSCALL=y
80CONFIG_KALLSYMS=y 81CONFIG_KALLSYMS=y
81# CONFIG_KALLSYMS_ALL is not set 82# CONFIG_KALLSYMS_ALL is not set
82# CONFIG_KALLSYMS_EXTRA_PASS is not set 83# CONFIG_KALLSYMS_EXTRA_PASS is not set
83# CONFIG_STRIP_ASM_SYMS is not set
84CONFIG_HOTPLUG=y 84CONFIG_HOTPLUG=y
85CONFIG_PRINTK=y 85CONFIG_PRINTK=y
86CONFIG_BUG=y 86CONFIG_BUG=y
@@ -93,8 +93,13 @@ CONFIG_TIMERFD=y
93CONFIG_EVENTFD=y 93CONFIG_EVENTFD=y
94CONFIG_SHMEM=y 94CONFIG_SHMEM=y
95CONFIG_AIO=y 95CONFIG_AIO=y
96
97#
98# Performance Counters
99#
96CONFIG_VM_EVENT_COUNTERS=y 100CONFIG_VM_EVENT_COUNTERS=y
97CONFIG_PCI_QUIRKS=y 101CONFIG_PCI_QUIRKS=y
102# CONFIG_STRIP_ASM_SYMS is not set
98CONFIG_COMPAT_BRK=y 103CONFIG_COMPAT_BRK=y
99CONFIG_SLAB=y 104CONFIG_SLAB=y
100# CONFIG_SLUB is not set 105# CONFIG_SLUB is not set
@@ -187,6 +192,7 @@ CONFIG_CPU_SUBTYPE_SH7785=y
187CONFIG_QUICKLIST=y 192CONFIG_QUICKLIST=y
188CONFIG_MMU=y 193CONFIG_MMU=y
189CONFIG_PAGE_OFFSET=0x80000000 194CONFIG_PAGE_OFFSET=0x80000000
195CONFIG_FORCE_MAX_ZONEORDER=11
190CONFIG_MEMORY_START=0x08000000 196CONFIG_MEMORY_START=0x08000000
191CONFIG_MEMORY_SIZE=0x08000000 197CONFIG_MEMORY_SIZE=0x08000000
192CONFIG_29BIT=y 198CONFIG_29BIT=y
@@ -204,7 +210,6 @@ CONFIG_PAGE_SIZE_4KB=y
204# CONFIG_PAGE_SIZE_8KB is not set 210# CONFIG_PAGE_SIZE_8KB is not set
205# CONFIG_PAGE_SIZE_16KB is not set 211# CONFIG_PAGE_SIZE_16KB is not set
206# CONFIG_PAGE_SIZE_64KB is not set 212# CONFIG_PAGE_SIZE_64KB is not set
207CONFIG_ENTRY_OFFSET=0x00001000
208CONFIG_SELECT_MEMORY_MODEL=y 213CONFIG_SELECT_MEMORY_MODEL=y
209CONFIG_FLATMEM_MANUAL=y 214CONFIG_FLATMEM_MANUAL=y
210# CONFIG_DISCONTIGMEM_MANUAL is not set 215# CONFIG_DISCONTIGMEM_MANUAL is not set
@@ -217,9 +222,9 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
217# CONFIG_PHYS_ADDR_T_64BIT is not set 222# CONFIG_PHYS_ADDR_T_64BIT is not set
218CONFIG_ZONE_DMA_FLAG=0 223CONFIG_ZONE_DMA_FLAG=0
219CONFIG_NR_QUICK=2 224CONFIG_NR_QUICK=2
220CONFIG_UNEVICTABLE_LRU=y
221CONFIG_HAVE_MLOCK=y 225CONFIG_HAVE_MLOCK=y
222CONFIG_HAVE_MLOCKED_PAGE_BIT=y 226CONFIG_HAVE_MLOCKED_PAGE_BIT=y
227CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
223 228
224# 229#
225# Cache configuration 230# Cache configuration
@@ -237,7 +242,6 @@ CONFIG_SH_FPU=y
237CONFIG_SH_STORE_QUEUES=y 242CONFIG_SH_STORE_QUEUES=y
238CONFIG_CPU_HAS_INTEVT=y 243CONFIG_CPU_HAS_INTEVT=y
239CONFIG_CPU_HAS_SR_RB=y 244CONFIG_CPU_HAS_SR_RB=y
240CONFIG_CPU_HAS_PTEA=y
241CONFIG_CPU_HAS_FPU=y 245CONFIG_CPU_HAS_FPU=y
242 246
243# 247#
@@ -250,9 +254,9 @@ CONFIG_SH_SH7785LCR_29BIT_PHYSMAPS=y
250# 254#
251# Timer and clock configuration 255# Timer and clock configuration
252# 256#
253CONFIG_SH_TMU=y 257CONFIG_SH_TIMER_TMU=y
254CONFIG_SH_TIMER_IRQ=28
255CONFIG_SH_PCLK_FREQ=50000000 258CONFIG_SH_PCLK_FREQ=50000000
259CONFIG_SH_CLK_CPG=y
256CONFIG_TICK_ONESHOT=y 260CONFIG_TICK_ONESHOT=y
257# CONFIG_NO_HZ is not set 261# CONFIG_NO_HZ is not set
258CONFIG_HIGH_RES_TIMERS=y 262CONFIG_HIGH_RES_TIMERS=y
@@ -294,12 +298,14 @@ CONFIG_KEXEC=y
294# CONFIG_PREEMPT_VOLUNTARY is not set 298# CONFIG_PREEMPT_VOLUNTARY is not set
295CONFIG_PREEMPT=y 299CONFIG_PREEMPT=y
296CONFIG_GUSA=y 300CONFIG_GUSA=y
301# CONFIG_SPARSE_IRQ is not set
297 302
298# 303#
299# Boot options 304# Boot options
300# 305#
301CONFIG_ZERO_PAGE_OFFSET=0x00001000 306CONFIG_ZERO_PAGE_OFFSET=0x00001000
302CONFIG_BOOT_LINK_OFFSET=0x00800000 307CONFIG_BOOT_LINK_OFFSET=0x00800000
308CONFIG_ENTRY_OFFSET=0x00001000
303# CONFIG_CMDLINE_BOOL is not set 309# CONFIG_CMDLINE_BOOL is not set
304 310
305# 311#
@@ -394,6 +400,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
394# CONFIG_ECONET is not set 400# CONFIG_ECONET is not set
395# CONFIG_WAN_ROUTER is not set 401# CONFIG_WAN_ROUTER is not set
396# CONFIG_PHONET is not set 402# CONFIG_PHONET is not set
403# CONFIG_IEEE802154 is not set
397# CONFIG_NET_SCHED is not set 404# CONFIG_NET_SCHED is not set
398# CONFIG_DCB is not set 405# CONFIG_DCB is not set
399 406
@@ -412,7 +419,11 @@ CONFIG_WIRELESS=y
412CONFIG_WIRELESS_EXT=y 419CONFIG_WIRELESS_EXT=y
413CONFIG_WIRELESS_EXT_SYSFS=y 420CONFIG_WIRELESS_EXT_SYSFS=y
414# CONFIG_LIB80211 is not set 421# CONFIG_LIB80211 is not set
415# CONFIG_MAC80211 is not set 422
423#
424# CFG80211 needs to be enabled for MAC80211
425#
426CONFIG_MAC80211_DEFAULT_PS_VALUE=0
416# CONFIG_WIMAX is not set 427# CONFIG_WIMAX is not set
417# CONFIG_RFKILL is not set 428# CONFIG_RFKILL is not set
418# CONFIG_NET_9P is not set 429# CONFIG_NET_9P is not set
@@ -555,10 +566,6 @@ CONFIG_BLK_DEV_SD=y
555# CONFIG_BLK_DEV_SR is not set 566# CONFIG_BLK_DEV_SR is not set
556# CONFIG_CHR_DEV_SG is not set 567# CONFIG_CHR_DEV_SG is not set
557# CONFIG_CHR_DEV_SCH is not set 568# CONFIG_CHR_DEV_SCH is not set
558
559#
560# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
561#
562# CONFIG_SCSI_MULTI_LUN is not set 569# CONFIG_SCSI_MULTI_LUN is not set
563# CONFIG_SCSI_CONSTANTS is not set 570# CONFIG_SCSI_CONSTANTS is not set
564# CONFIG_SCSI_LOGGING is not set 571# CONFIG_SCSI_LOGGING is not set
@@ -650,7 +657,6 @@ CONFIG_SATA_SIL=y
650# CONFIG_IEEE1394 is not set 657# CONFIG_IEEE1394 is not set
651# CONFIG_I2O is not set 658# CONFIG_I2O is not set
652CONFIG_NETDEVICES=y 659CONFIG_NETDEVICES=y
653CONFIG_COMPAT_NET_DEV_OPS=y
654# CONFIG_DUMMY is not set 660# CONFIG_DUMMY is not set
655# CONFIG_BONDING is not set 661# CONFIG_BONDING is not set
656# CONFIG_MACVLAN is not set 662# CONFIG_MACVLAN is not set
@@ -855,7 +861,6 @@ CONFIG_I2C_PCA_PLATFORM=y
855# CONFIG_SENSORS_PCF8574 is not set 861# CONFIG_SENSORS_PCF8574 is not set
856# CONFIG_PCF8575 is not set 862# CONFIG_PCF8575 is not set
857# CONFIG_SENSORS_PCA9539 is not set 863# CONFIG_SENSORS_PCA9539 is not set
858# CONFIG_SENSORS_MAX6875 is not set
859# CONFIG_SENSORS_TSL2550 is not set 864# CONFIG_SENSORS_TSL2550 is not set
860# CONFIG_I2C_DEBUG_CORE is not set 865# CONFIG_I2C_DEBUG_CORE is not set
861# CONFIG_I2C_DEBUG_ALGO is not set 866# CONFIG_I2C_DEBUG_ALGO is not set
@@ -888,22 +893,7 @@ CONFIG_MFD_SM501=y
888# CONFIG_MFD_WM8350_I2C is not set 893# CONFIG_MFD_WM8350_I2C is not set
889# CONFIG_MFD_PCF50633 is not set 894# CONFIG_MFD_PCF50633 is not set
890# CONFIG_REGULATOR is not set 895# CONFIG_REGULATOR is not set
891 896# CONFIG_MEDIA_SUPPORT is not set
892#
893# Multimedia devices
894#
895
896#
897# Multimedia core support
898#
899# CONFIG_VIDEO_DEV is not set
900# CONFIG_DVB_CORE is not set
901# CONFIG_VIDEO_MEDIA is not set
902
903#
904# Multimedia drivers
905#
906# CONFIG_DAB is not set
907 897
908# 898#
909# Graphics support 899# Graphics support
@@ -1011,7 +1001,7 @@ CONFIG_HID_BELKIN=y
1011CONFIG_HID_CHERRY=y 1001CONFIG_HID_CHERRY=y
1012CONFIG_HID_CHICONY=y 1002CONFIG_HID_CHICONY=y
1013CONFIG_HID_CYPRESS=y 1003CONFIG_HID_CYPRESS=y
1014# CONFIG_DRAGONRISE_FF is not set 1004# CONFIG_HID_DRAGONRISE is not set
1015CONFIG_HID_EZKEY=y 1005CONFIG_HID_EZKEY=y
1016# CONFIG_HID_KYE is not set 1006# CONFIG_HID_KYE is not set
1017CONFIG_HID_GYRATION=y 1007CONFIG_HID_GYRATION=y
@@ -1028,10 +1018,11 @@ CONFIG_HID_PETALYNX=y
1028CONFIG_HID_SAMSUNG=y 1018CONFIG_HID_SAMSUNG=y
1029CONFIG_HID_SONY=y 1019CONFIG_HID_SONY=y
1030CONFIG_HID_SUNPLUS=y 1020CONFIG_HID_SUNPLUS=y
1031# CONFIG_GREENASIA_FF is not set 1021# CONFIG_HID_GREENASIA is not set
1022# CONFIG_HID_SMARTJOYPLUS is not set
1032# CONFIG_HID_TOPSEED is not set 1023# CONFIG_HID_TOPSEED is not set
1033CONFIG_THRUSTMASTER_FF=m 1024# CONFIG_HID_THRUSTMASTER is not set
1034CONFIG_ZEROPLUS_FF=m 1025# CONFIG_HID_ZEROPLUS is not set
1035CONFIG_USB_SUPPORT=y 1026CONFIG_USB_SUPPORT=y
1036CONFIG_USB_ARCH_HAS_HCD=y 1027CONFIG_USB_ARCH_HAS_HCD=y
1037CONFIG_USB_ARCH_HAS_OHCI=y 1028CONFIG_USB_ARCH_HAS_OHCI=y
@@ -1057,6 +1048,7 @@ CONFIG_USB_MON=y
1057# USB Host Controller Drivers 1048# USB Host Controller Drivers
1058# 1049#
1059# CONFIG_USB_C67X00_HCD is not set 1050# CONFIG_USB_C67X00_HCD is not set
1051# CONFIG_USB_XHCI_HCD is not set
1060CONFIG_USB_EHCI_HCD=m 1052CONFIG_USB_EHCI_HCD=m
1061# CONFIG_USB_EHCI_ROOT_HUB_TT is not set 1053# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
1062# CONFIG_USB_EHCI_TT_NEWSCHED is not set 1054# CONFIG_USB_EHCI_TT_NEWSCHED is not set
@@ -1204,9 +1196,14 @@ CONFIG_RTC_DRV_RS5C372=y
1204# on-CPU RTC drivers 1196# on-CPU RTC drivers
1205# 1197#
1206# CONFIG_RTC_DRV_SH is not set 1198# CONFIG_RTC_DRV_SH is not set
1199# CONFIG_RTC_DRV_GENERIC is not set
1207# CONFIG_DMADEVICES is not set 1200# CONFIG_DMADEVICES is not set
1208# CONFIG_AUXDISPLAY is not set 1201# CONFIG_AUXDISPLAY is not set
1209# CONFIG_UIO is not set 1202# CONFIG_UIO is not set
1203
1204#
1205# TI VLYNQ
1206#
1210# CONFIG_STAGING is not set 1207# CONFIG_STAGING is not set
1211 1208
1212# 1209#
@@ -1226,10 +1223,11 @@ CONFIG_FS_MBCACHE=y
1226# CONFIG_REISERFS_FS is not set 1223# CONFIG_REISERFS_FS is not set
1227# CONFIG_JFS_FS is not set 1224# CONFIG_JFS_FS is not set
1228CONFIG_FS_POSIX_ACL=y 1225CONFIG_FS_POSIX_ACL=y
1229CONFIG_FILE_LOCKING=y
1230# CONFIG_XFS_FS is not set 1226# CONFIG_XFS_FS is not set
1231# CONFIG_OCFS2_FS is not set 1227# CONFIG_OCFS2_FS is not set
1232# CONFIG_BTRFS_FS is not set 1228# CONFIG_BTRFS_FS is not set
1229CONFIG_FILE_LOCKING=y
1230CONFIG_FSNOTIFY=y
1233CONFIG_DNOTIFY=y 1231CONFIG_DNOTIFY=y
1234CONFIG_INOTIFY=y 1232CONFIG_INOTIFY=y
1235CONFIG_INOTIFY_USER=y 1233CONFIG_INOTIFY_USER=y
@@ -1422,18 +1420,16 @@ CONFIG_HAVE_FUNCTION_TRACER=y
1422CONFIG_HAVE_DYNAMIC_FTRACE=y 1420CONFIG_HAVE_DYNAMIC_FTRACE=y
1423CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 1421CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1424CONFIG_TRACING_SUPPORT=y 1422CONFIG_TRACING_SUPPORT=y
1425 1423CONFIG_FTRACE=y
1426#
1427# Tracers
1428#
1429# CONFIG_FUNCTION_TRACER is not set 1424# CONFIG_FUNCTION_TRACER is not set
1430# CONFIG_IRQSOFF_TRACER is not set 1425# CONFIG_IRQSOFF_TRACER is not set
1431# CONFIG_PREEMPT_TRACER is not set 1426# CONFIG_PREEMPT_TRACER is not set
1432# CONFIG_SCHED_TRACER is not set 1427# CONFIG_SCHED_TRACER is not set
1433# CONFIG_CONTEXT_SWITCH_TRACER is not set 1428# CONFIG_ENABLE_DEFAULT_TRACERS is not set
1434# CONFIG_EVENT_TRACER is not set
1435# CONFIG_BOOT_TRACER is not set 1429# CONFIG_BOOT_TRACER is not set
1436# CONFIG_TRACE_BRANCH_PROFILING is not set 1430CONFIG_BRANCH_PROFILE_NONE=y
1431# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
1432# CONFIG_PROFILE_ALL_BRANCHES is not set
1437# CONFIG_STACK_TRACER is not set 1433# CONFIG_STACK_TRACER is not set
1438# CONFIG_KMEMTRACE is not set 1434# CONFIG_KMEMTRACE is not set
1439# CONFIG_WORKQUEUE_TRACER is not set 1435# CONFIG_WORKQUEUE_TRACER is not set
@@ -1448,10 +1444,8 @@ CONFIG_HAVE_ARCH_KGDB=y
1448# CONFIG_DEBUG_STACKOVERFLOW is not set 1444# CONFIG_DEBUG_STACKOVERFLOW is not set
1449# CONFIG_DEBUG_STACK_USAGE is not set 1445# CONFIG_DEBUG_STACK_USAGE is not set
1450# CONFIG_4KSTACKS is not set 1446# CONFIG_4KSTACKS is not set
1451# CONFIG_IRQSTACKS is not set
1452# CONFIG_DUMP_CODE is not set 1447# CONFIG_DUMP_CODE is not set
1453# CONFIG_SH_NO_BSS_INIT is not set 1448# CONFIG_SH_NO_BSS_INIT is not set
1454# CONFIG_MORE_COMPILE_OPTIONS is not set
1455 1449
1456# 1450#
1457# Security options 1451# Security options
@@ -1574,3 +1568,4 @@ CONFIG_HAS_IOMEM=y
1574CONFIG_HAS_IOPORT=y 1568CONFIG_HAS_IOPORT=y
1575CONFIG_HAS_DMA=y 1569CONFIG_HAS_DMA=y
1576CONFIG_NLATTR=y 1570CONFIG_NLATTR=y
1571CONFIG_GENERIC_ATOMIC64=y
diff --git a/arch/sh/configs/shmin_defconfig b/arch/sh/configs/shmin_defconfig
index 4e120256ec63..ad7d60972fcf 100644
--- a/arch/sh/configs/shmin_defconfig
+++ b/arch/sh/configs/shmin_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.30-rc3 3# Linux kernel version: 2.6.30
4# Mon Apr 27 13:12:41 2009 4# Thu Jun 18 13:10:33 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -18,6 +18,7 @@ CONFIG_GENERIC_TIME=y
18CONFIG_GENERIC_CLOCKEVENTS=y 18CONFIG_GENERIC_CLOCKEVENTS=y
19# CONFIG_ARCH_SUSPEND_POSSIBLE is not set 19# CONFIG_ARCH_SUSPEND_POSSIBLE is not set
20CONFIG_ARCH_HIBERNATION_POSSIBLE=y 20CONFIG_ARCH_HIBERNATION_POSSIBLE=y
21CONFIG_SYS_SUPPORTS_TMU=y
21CONFIG_STACKTRACE_SUPPORT=y 22CONFIG_STACKTRACE_SUPPORT=y
22CONFIG_LOCKDEP_SUPPORT=y 23CONFIG_LOCKDEP_SUPPORT=y
23CONFIG_HAVE_LATENCYTOP_SUPPORT=y 24CONFIG_HAVE_LATENCYTOP_SUPPORT=y
@@ -64,7 +65,6 @@ CONFIG_EMBEDDED=y
64# CONFIG_UID16 is not set 65# CONFIG_UID16 is not set
65# CONFIG_SYSCTL_SYSCALL is not set 66# CONFIG_SYSCTL_SYSCALL is not set
66# CONFIG_KALLSYMS is not set 67# CONFIG_KALLSYMS is not set
67# CONFIG_STRIP_ASM_SYMS is not set
68# CONFIG_HOTPLUG is not set 68# CONFIG_HOTPLUG is not set
69CONFIG_PRINTK=y 69CONFIG_PRINTK=y
70# CONFIG_BUG is not set 70# CONFIG_BUG is not set
@@ -77,7 +77,12 @@ CONFIG_TIMERFD=y
77CONFIG_EVENTFD=y 77CONFIG_EVENTFD=y
78# CONFIG_SHMEM is not set 78# CONFIG_SHMEM is not set
79CONFIG_AIO=y 79CONFIG_AIO=y
80
81#
82# Performance Counters
83#
80CONFIG_VM_EVENT_COUNTERS=y 84CONFIG_VM_EVENT_COUNTERS=y
85# CONFIG_STRIP_ASM_SYMS is not set
81CONFIG_COMPAT_BRK=y 86CONFIG_COMPAT_BRK=y
82# CONFIG_SLAB is not set 87# CONFIG_SLAB is not set
83# CONFIG_SLUB is not set 88# CONFIG_SLUB is not set
@@ -159,6 +164,7 @@ CONFIG_CPU_SUBTYPE_SH7706=y
159CONFIG_QUICKLIST=y 164CONFIG_QUICKLIST=y
160CONFIG_MMU=y 165CONFIG_MMU=y
161CONFIG_PAGE_OFFSET=0x80000000 166CONFIG_PAGE_OFFSET=0x80000000
167CONFIG_FORCE_MAX_ZONEORDER=11
162CONFIG_MEMORY_START=0x0c000000 168CONFIG_MEMORY_START=0x0c000000
163CONFIG_MEMORY_SIZE=0x00800000 169CONFIG_MEMORY_SIZE=0x00800000
164CONFIG_29BIT=y 170CONFIG_29BIT=y
@@ -173,7 +179,6 @@ CONFIG_PAGE_SIZE_4KB=y
173# CONFIG_PAGE_SIZE_8KB is not set 179# CONFIG_PAGE_SIZE_8KB is not set
174# CONFIG_PAGE_SIZE_16KB is not set 180# CONFIG_PAGE_SIZE_16KB is not set
175# CONFIG_PAGE_SIZE_64KB is not set 181# CONFIG_PAGE_SIZE_64KB is not set
176CONFIG_ENTRY_OFFSET=0x00001000
177CONFIG_SELECT_MEMORY_MODEL=y 182CONFIG_SELECT_MEMORY_MODEL=y
178CONFIG_FLATMEM_MANUAL=y 183CONFIG_FLATMEM_MANUAL=y
179# CONFIG_DISCONTIGMEM_MANUAL is not set 184# CONFIG_DISCONTIGMEM_MANUAL is not set
@@ -186,9 +191,9 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
186# CONFIG_PHYS_ADDR_T_64BIT is not set 191# CONFIG_PHYS_ADDR_T_64BIT is not set
187CONFIG_ZONE_DMA_FLAG=0 192CONFIG_ZONE_DMA_FLAG=0
188CONFIG_NR_QUICK=2 193CONFIG_NR_QUICK=2
189CONFIG_UNEVICTABLE_LRU=y
190CONFIG_HAVE_MLOCK=y 194CONFIG_HAVE_MLOCK=y
191CONFIG_HAVE_MLOCKED_PAGE_BIT=y 195CONFIG_HAVE_MLOCKED_PAGE_BIT=y
196CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
192 197
193# 198#
194# Cache configuration 199# Cache configuration
@@ -216,9 +221,10 @@ CONFIG_SH_SHMIN=y
216# 221#
217# Timer and clock configuration 222# Timer and clock configuration
218# 223#
219CONFIG_SH_TMU=y 224CONFIG_SH_TIMER_TMU=y
220CONFIG_SH_TIMER_IRQ=16
221CONFIG_SH_PCLK_FREQ=32000000 225CONFIG_SH_PCLK_FREQ=32000000
226CONFIG_SH_CLK_CPG=y
227CONFIG_SH_CLK_CPG_LEGACY=y
222# CONFIG_NO_HZ is not set 228# CONFIG_NO_HZ is not set
223# CONFIG_HIGH_RES_TIMERS is not set 229# CONFIG_HIGH_RES_TIMERS is not set
224CONFIG_GENERIC_CLOCKEVENTS_BUILD=y 230CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
@@ -260,12 +266,14 @@ CONFIG_PREEMPT_NONE=y
260# CONFIG_PREEMPT is not set 266# CONFIG_PREEMPT is not set
261CONFIG_GUSA=y 267CONFIG_GUSA=y
262# CONFIG_GUSA_RB is not set 268# CONFIG_GUSA_RB is not set
269# CONFIG_SPARSE_IRQ is not set
263 270
264# 271#
265# Boot options 272# Boot options
266# 273#
267CONFIG_ZERO_PAGE_OFFSET=0x00001000 274CONFIG_ZERO_PAGE_OFFSET=0x00001000
268CONFIG_BOOT_LINK_OFFSET=0x00210000 275CONFIG_BOOT_LINK_OFFSET=0x00210000
276CONFIG_ENTRY_OFFSET=0x00001000
269CONFIG_CMDLINE_BOOL=y 277CONFIG_CMDLINE_BOOL=y
270CONFIG_CMDLINE="console=ttySC1,115200 root=1f01 mtdparts=phys_mapped_flash:64k(firm)ro,-(sys) netdev=34,0x300,eth0 " 278CONFIG_CMDLINE="console=ttySC1,115200 root=1f01 mtdparts=phys_mapped_flash:64k(firm)ro,-(sys) netdev=34,0x300,eth0 "
271 279
@@ -345,6 +353,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
345# CONFIG_ECONET is not set 353# CONFIG_ECONET is not set
346# CONFIG_WAN_ROUTER is not set 354# CONFIG_WAN_ROUTER is not set
347# CONFIG_PHONET is not set 355# CONFIG_PHONET is not set
356# CONFIG_IEEE802154 is not set
348# CONFIG_NET_SCHED is not set 357# CONFIG_NET_SCHED is not set
349# CONFIG_DCB is not set 358# CONFIG_DCB is not set
350 359
@@ -362,7 +371,11 @@ CONFIG_WIRELESS=y
362# CONFIG_WIRELESS_OLD_REGULATORY is not set 371# CONFIG_WIRELESS_OLD_REGULATORY is not set
363# CONFIG_WIRELESS_EXT is not set 372# CONFIG_WIRELESS_EXT is not set
364# CONFIG_LIB80211 is not set 373# CONFIG_LIB80211 is not set
365# CONFIG_MAC80211 is not set 374
375#
376# CFG80211 needs to be enabled for MAC80211
377#
378CONFIG_MAC80211_DEFAULT_PS_VALUE=0
366# CONFIG_WIMAX is not set 379# CONFIG_WIMAX is not set
367# CONFIG_RFKILL is not set 380# CONFIG_RFKILL is not set
368# CONFIG_NET_9P is not set 381# CONFIG_NET_9P is not set
@@ -489,7 +502,6 @@ CONFIG_HAVE_IDE=y
489# CONFIG_ATA is not set 502# CONFIG_ATA is not set
490# CONFIG_MD is not set 503# CONFIG_MD is not set
491CONFIG_NETDEVICES=y 504CONFIG_NETDEVICES=y
492CONFIG_COMPAT_NET_DEV_OPS=y
493# CONFIG_DUMMY is not set 505# CONFIG_DUMMY is not set
494# CONFIG_BONDING is not set 506# CONFIG_BONDING is not set
495# CONFIG_MACVLAN is not set 507# CONFIG_MACVLAN is not set
@@ -514,6 +526,7 @@ CONFIG_NET_ETHERNET=y
514# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set 526# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
515# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set 527# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
516# CONFIG_B44 is not set 528# CONFIG_B44 is not set
529# CONFIG_KS8842 is not set
517CONFIG_NETDEV_1000=y 530CONFIG_NETDEV_1000=y
518CONFIG_NETDEV_10000=y 531CONFIG_NETDEV_10000=y
519 532
@@ -599,22 +612,7 @@ CONFIG_SSB_POSSIBLE=y
599# CONFIG_HTC_PASIC3 is not set 612# CONFIG_HTC_PASIC3 is not set
600# CONFIG_MFD_TMIO is not set 613# CONFIG_MFD_TMIO is not set
601# CONFIG_REGULATOR is not set 614# CONFIG_REGULATOR is not set
602 615# CONFIG_MEDIA_SUPPORT is not set
603#
604# Multimedia devices
605#
606
607#
608# Multimedia core support
609#
610# CONFIG_VIDEO_DEV is not set
611# CONFIG_DVB_CORE is not set
612# CONFIG_VIDEO_MEDIA is not set
613
614#
615# Multimedia drivers
616#
617# CONFIG_DAB is not set
618 616
619# 617#
620# Graphics support 618# Graphics support
@@ -653,10 +651,15 @@ CONFIG_USB_ARCH_HAS_HCD=y
653# CONFIG_MEMSTICK is not set 651# CONFIG_MEMSTICK is not set
654# CONFIG_NEW_LEDS is not set 652# CONFIG_NEW_LEDS is not set
655# CONFIG_ACCESSIBILITY is not set 653# CONFIG_ACCESSIBILITY is not set
654CONFIG_RTC_LIB=y
656# CONFIG_RTC_CLASS is not set 655# CONFIG_RTC_CLASS is not set
657# CONFIG_DMADEVICES is not set 656# CONFIG_DMADEVICES is not set
658# CONFIG_AUXDISPLAY is not set 657# CONFIG_AUXDISPLAY is not set
659# CONFIG_UIO is not set 658# CONFIG_UIO is not set
659
660#
661# TI VLYNQ
662#
660# CONFIG_STAGING is not set 663# CONFIG_STAGING is not set
661 664
662# 665#
@@ -668,11 +671,13 @@ CONFIG_USB_ARCH_HAS_HCD=y
668# CONFIG_REISERFS_FS is not set 671# CONFIG_REISERFS_FS is not set
669# CONFIG_JFS_FS is not set 672# CONFIG_JFS_FS is not set
670# CONFIG_FS_POSIX_ACL is not set 673# CONFIG_FS_POSIX_ACL is not set
671CONFIG_FILE_LOCKING=y
672# CONFIG_XFS_FS is not set 674# CONFIG_XFS_FS is not set
673# CONFIG_BTRFS_FS is not set 675# CONFIG_BTRFS_FS is not set
676CONFIG_FILE_LOCKING=y
677CONFIG_FSNOTIFY=y
674# CONFIG_DNOTIFY is not set 678# CONFIG_DNOTIFY is not set
675# CONFIG_INOTIFY is not set 679# CONFIG_INOTIFY is not set
680CONFIG_INOTIFY_USER=y
676# CONFIG_QUOTA is not set 681# CONFIG_QUOTA is not set
677# CONFIG_AUTOFS_FS is not set 682# CONFIG_AUTOFS_FS is not set
678# CONFIG_AUTOFS4_FS is not set 683# CONFIG_AUTOFS4_FS is not set
@@ -773,27 +778,13 @@ CONFIG_HAVE_FUNCTION_TRACER=y
773CONFIG_HAVE_DYNAMIC_FTRACE=y 778CONFIG_HAVE_DYNAMIC_FTRACE=y
774CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 779CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
775CONFIG_TRACING_SUPPORT=y 780CONFIG_TRACING_SUPPORT=y
776 781# CONFIG_FTRACE is not set
777#
778# Tracers
779#
780# CONFIG_FUNCTION_TRACER is not set
781# CONFIG_IRQSOFF_TRACER is not set
782# CONFIG_SCHED_TRACER is not set
783# CONFIG_CONTEXT_SWITCH_TRACER is not set
784# CONFIG_EVENT_TRACER is not set
785# CONFIG_BOOT_TRACER is not set
786# CONFIG_TRACE_BRANCH_PROFILING is not set
787# CONFIG_STACK_TRACER is not set
788# CONFIG_KMEMTRACE is not set
789# CONFIG_WORKQUEUE_TRACER is not set
790# CONFIG_DMA_API_DEBUG is not set 782# CONFIG_DMA_API_DEBUG is not set
791# CONFIG_SAMPLES is not set 783# CONFIG_SAMPLES is not set
792CONFIG_HAVE_ARCH_KGDB=y 784CONFIG_HAVE_ARCH_KGDB=y
793CONFIG_SH_STANDARD_BIOS=y 785CONFIG_SH_STANDARD_BIOS=y
794# CONFIG_EARLY_SCIF_CONSOLE is not set 786# CONFIG_EARLY_SCIF_CONSOLE is not set
795CONFIG_EARLY_PRINTK=y 787CONFIG_EARLY_PRINTK=y
796# CONFIG_MORE_COMPILE_OPTIONS is not set
797 788
798# 789#
799# Security options 790# Security options
@@ -905,3 +896,4 @@ CONFIG_HAS_IOMEM=y
905CONFIG_HAS_IOPORT=y 896CONFIG_HAS_IOPORT=y
906CONFIG_HAS_DMA=y 897CONFIG_HAS_DMA=y
907CONFIG_NLATTR=y 898CONFIG_NLATTR=y
899CONFIG_GENERIC_ATOMIC64=y
diff --git a/arch/sh/configs/shx3_defconfig b/arch/sh/configs/shx3_defconfig
index c088144925fa..207b0c9a8cdf 100644
--- a/arch/sh/configs/shx3_defconfig
+++ b/arch/sh/configs/shx3_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.30-rc3 3# Linux kernel version: 2.6.30
4# Mon Apr 27 13:13:12 2009 4# Thu Jun 18 13:11:03 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -23,6 +23,7 @@ CONFIG_GENERIC_LOCKBREAK=y
23CONFIG_ARCH_HIBERNATION_POSSIBLE=y 23CONFIG_ARCH_HIBERNATION_POSSIBLE=y
24CONFIG_SYS_SUPPORTS_SMP=y 24CONFIG_SYS_SUPPORTS_SMP=y
25CONFIG_SYS_SUPPORTS_NUMA=y 25CONFIG_SYS_SUPPORTS_NUMA=y
26CONFIG_SYS_SUPPORTS_TMU=y
26CONFIG_STACKTRACE_SUPPORT=y 27CONFIG_STACKTRACE_SUPPORT=y
27CONFIG_LOCKDEP_SUPPORT=y 28CONFIG_LOCKDEP_SUPPORT=y
28# CONFIG_ARCH_HAS_ILOG2_U32 is not set 29# CONFIG_ARCH_HAS_ILOG2_U32 is not set
@@ -98,7 +99,6 @@ CONFIG_SYSCTL_SYSCALL=y
98CONFIG_KALLSYMS=y 99CONFIG_KALLSYMS=y
99CONFIG_KALLSYMS_ALL=y 100CONFIG_KALLSYMS_ALL=y
100# CONFIG_KALLSYMS_EXTRA_PASS is not set 101# CONFIG_KALLSYMS_EXTRA_PASS is not set
101# CONFIG_STRIP_ASM_SYMS is not set
102CONFIG_HOTPLUG=y 102CONFIG_HOTPLUG=y
103CONFIG_PRINTK=y 103CONFIG_PRINTK=y
104CONFIG_BUG=y 104CONFIG_BUG=y
@@ -111,14 +111,19 @@ CONFIG_TIMERFD=y
111CONFIG_EVENTFD=y 111CONFIG_EVENTFD=y
112CONFIG_SHMEM=y 112CONFIG_SHMEM=y
113CONFIG_AIO=y 113CONFIG_AIO=y
114
115#
116# Performance Counters
117#
114CONFIG_VM_EVENT_COUNTERS=y 118CONFIG_VM_EVENT_COUNTERS=y
119# CONFIG_STRIP_ASM_SYMS is not set
115CONFIG_COMPAT_BRK=y 120CONFIG_COMPAT_BRK=y
116# CONFIG_SLAB is not set 121# CONFIG_SLAB is not set
117# CONFIG_SLUB is not set 122# CONFIG_SLUB is not set
118CONFIG_SLOB=y 123CONFIG_SLOB=y
119CONFIG_PROFILING=y 124CONFIG_PROFILING=y
120CONFIG_TRACEPOINTS=y 125CONFIG_TRACEPOINTS=y
121# CONFIG_MARKERS is not set 126CONFIG_MARKERS=y
122CONFIG_OPROFILE=y 127CONFIG_OPROFILE=y
123CONFIG_HAVE_OPROFILE=y 128CONFIG_HAVE_OPROFILE=y
124CONFIG_KPROBES=y 129CONFIG_KPROBES=y
@@ -207,6 +212,7 @@ CONFIG_CPU_SUBTYPE_SHX3=y
207CONFIG_QUICKLIST=y 212CONFIG_QUICKLIST=y
208CONFIG_MMU=y 213CONFIG_MMU=y
209CONFIG_PAGE_OFFSET=0x80000000 214CONFIG_PAGE_OFFSET=0x80000000
215CONFIG_FORCE_MAX_ZONEORDER=7
210CONFIG_MEMORY_START=0x0c000000 216CONFIG_MEMORY_START=0x0c000000
211CONFIG_MEMORY_SIZE=0x04000000 217CONFIG_MEMORY_SIZE=0x04000000
212CONFIG_29BIT=y 218CONFIG_29BIT=y
@@ -226,7 +232,6 @@ CONFIG_ARCH_MEMORY_PROBE=y
226# CONFIG_PAGE_SIZE_8KB is not set 232# CONFIG_PAGE_SIZE_8KB is not set
227# CONFIG_PAGE_SIZE_16KB is not set 233# CONFIG_PAGE_SIZE_16KB is not set
228CONFIG_PAGE_SIZE_64KB=y 234CONFIG_PAGE_SIZE_64KB=y
229CONFIG_ENTRY_OFFSET=0x00010000
230# CONFIG_HUGETLB_PAGE_SIZE_64K is not set 235# CONFIG_HUGETLB_PAGE_SIZE_64K is not set
231# CONFIG_HUGETLB_PAGE_SIZE_256K is not set 236# CONFIG_HUGETLB_PAGE_SIZE_256K is not set
232CONFIG_HUGETLB_PAGE_SIZE_1MB=y 237CONFIG_HUGETLB_PAGE_SIZE_1MB=y
@@ -249,9 +254,9 @@ CONFIG_MIGRATION=y
249# CONFIG_PHYS_ADDR_T_64BIT is not set 254# CONFIG_PHYS_ADDR_T_64BIT is not set
250CONFIG_ZONE_DMA_FLAG=0 255CONFIG_ZONE_DMA_FLAG=0
251CONFIG_NR_QUICK=2 256CONFIG_NR_QUICK=2
252CONFIG_UNEVICTABLE_LRU=y
253CONFIG_HAVE_MLOCK=y 257CONFIG_HAVE_MLOCK=y
254CONFIG_HAVE_MLOCKED_PAGE_BIT=y 258CONFIG_HAVE_MLOCKED_PAGE_BIT=y
259CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
255 260
256# 261#
257# Cache configuration 262# Cache configuration
@@ -279,9 +284,10 @@ CONFIG_SH_X3PROTO=y
279# 284#
280# Timer and clock configuration 285# Timer and clock configuration
281# 286#
282CONFIG_SH_TMU=y 287CONFIG_SH_TIMER_TMU=y
283CONFIG_SH_TIMER_IRQ=16
284CONFIG_SH_PCLK_FREQ=50000000 288CONFIG_SH_PCLK_FREQ=50000000
289CONFIG_SH_CLK_CPG=y
290CONFIG_SH_CLK_CPG_LEGACY=y
285CONFIG_TICK_ONESHOT=y 291CONFIG_TICK_ONESHOT=y
286CONFIG_NO_HZ=y 292CONFIG_NO_HZ=y
287CONFIG_HIGH_RES_TIMERS=y 293CONFIG_HIGH_RES_TIMERS=y
@@ -339,12 +345,14 @@ CONFIG_NR_CPUS=4
339# CONFIG_PREEMPT_NONE is not set 345# CONFIG_PREEMPT_NONE is not set
340# CONFIG_PREEMPT_VOLUNTARY is not set 346# CONFIG_PREEMPT_VOLUNTARY is not set
341CONFIG_PREEMPT=y 347CONFIG_PREEMPT=y
348# CONFIG_SPARSE_IRQ is not set
342 349
343# 350#
344# Boot options 351# Boot options
345# 352#
346CONFIG_ZERO_PAGE_OFFSET=0x00001000 353CONFIG_ZERO_PAGE_OFFSET=0x00010000
347CONFIG_BOOT_LINK_OFFSET=0x00800000 354CONFIG_BOOT_LINK_OFFSET=0x00800000
355CONFIG_ENTRY_OFFSET=0x00010000
348CONFIG_CMDLINE_BOOL=y 356CONFIG_CMDLINE_BOOL=y
349CONFIG_CMDLINE="console=ttySC0,115200 earlyprintk=bios ignore_loglevel" 357CONFIG_CMDLINE="console=ttySC0,115200 earlyprintk=bios ignore_loglevel"
350 358
@@ -444,6 +452,7 @@ CONFIG_IPV6_NDISC_NODETYPE=y
444# CONFIG_ECONET is not set 452# CONFIG_ECONET is not set
445# CONFIG_WAN_ROUTER is not set 453# CONFIG_WAN_ROUTER is not set
446# CONFIG_PHONET is not set 454# CONFIG_PHONET is not set
455# CONFIG_IEEE802154 is not set
447# CONFIG_NET_SCHED is not set 456# CONFIG_NET_SCHED is not set
448# CONFIG_DCB is not set 457# CONFIG_DCB is not set
449 458
@@ -462,6 +471,7 @@ CONFIG_CAN_BCM=m
462# CAN Device Drivers 471# CAN Device Drivers
463# 472#
464CONFIG_CAN_VCAN=m 473CONFIG_CAN_VCAN=m
474# CONFIG_CAN_DEV is not set
465# CONFIG_CAN_DEBUG_DEVICES is not set 475# CONFIG_CAN_DEBUG_DEVICES is not set
466# CONFIG_IRDA is not set 476# CONFIG_IRDA is not set
467# CONFIG_BT is not set 477# CONFIG_BT is not set
@@ -512,6 +522,7 @@ CONFIG_MISC_DEVICES=y
512# CONFIG_EEPROM_AT24 is not set 522# CONFIG_EEPROM_AT24 is not set
513# CONFIG_EEPROM_AT25 is not set 523# CONFIG_EEPROM_AT25 is not set
514# CONFIG_EEPROM_LEGACY is not set 524# CONFIG_EEPROM_LEGACY is not set
525# CONFIG_EEPROM_MAX6875 is not set
515# CONFIG_EEPROM_93CX6 is not set 526# CONFIG_EEPROM_93CX6 is not set
516CONFIG_HAVE_IDE=y 527CONFIG_HAVE_IDE=y
517# CONFIG_IDE is not set 528# CONFIG_IDE is not set
@@ -535,10 +546,6 @@ CONFIG_BLK_DEV_SD=y
535# CONFIG_BLK_DEV_SR is not set 546# CONFIG_BLK_DEV_SR is not set
536# CONFIG_CHR_DEV_SG is not set 547# CONFIG_CHR_DEV_SG is not set
537# CONFIG_CHR_DEV_SCH is not set 548# CONFIG_CHR_DEV_SCH is not set
538
539#
540# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
541#
542# CONFIG_SCSI_MULTI_LUN is not set 549# CONFIG_SCSI_MULTI_LUN is not set
543# CONFIG_SCSI_CONSTANTS is not set 550# CONFIG_SCSI_CONSTANTS is not set
544# CONFIG_SCSI_LOGGING is not set 551# CONFIG_SCSI_LOGGING is not set
@@ -555,6 +562,7 @@ CONFIG_SCSI_WAIT_SCAN=m
555# CONFIG_SCSI_SRP_ATTRS is not set 562# CONFIG_SCSI_SRP_ATTRS is not set
556CONFIG_SCSI_LOWLEVEL=y 563CONFIG_SCSI_LOWLEVEL=y
557# CONFIG_ISCSI_TCP is not set 564# CONFIG_ISCSI_TCP is not set
565# CONFIG_SCSI_BNX2_ISCSI is not set
558# CONFIG_LIBFC is not set 566# CONFIG_LIBFC is not set
559# CONFIG_LIBFCOE is not set 567# CONFIG_LIBFCOE is not set
560# CONFIG_SCSI_DEBUG is not set 568# CONFIG_SCSI_DEBUG is not set
@@ -568,7 +576,6 @@ CONFIG_ATA_SFF=y
568CONFIG_PATA_PLATFORM=y 576CONFIG_PATA_PLATFORM=y
569# CONFIG_MD is not set 577# CONFIG_MD is not set
570CONFIG_NETDEVICES=y 578CONFIG_NETDEVICES=y
571CONFIG_COMPAT_NET_DEV_OPS=y
572# CONFIG_DUMMY is not set 579# CONFIG_DUMMY is not set
573# CONFIG_BONDING is not set 580# CONFIG_BONDING is not set
574# CONFIG_MACVLAN is not set 581# CONFIG_MACVLAN is not set
@@ -594,6 +601,7 @@ CONFIG_SMC91X=y
594# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set 601# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
595# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set 602# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
596# CONFIG_B44 is not set 603# CONFIG_B44 is not set
604# CONFIG_KS8842 is not set
597# CONFIG_NETDEV_1000 is not set 605# CONFIG_NETDEV_1000 is not set
598# CONFIG_NETDEV_10000 is not set 606# CONFIG_NETDEV_10000 is not set
599 607
@@ -701,7 +709,6 @@ CONFIG_I2C_HELPER_AUTO=y
701# CONFIG_SENSORS_PCF8574 is not set 709# CONFIG_SENSORS_PCF8574 is not set
702# CONFIG_PCF8575 is not set 710# CONFIG_PCF8575 is not set
703# CONFIG_SENSORS_PCA9539 is not set 711# CONFIG_SENSORS_PCA9539 is not set
704# CONFIG_SENSORS_MAX6875 is not set
705# CONFIG_SENSORS_TSL2550 is not set 712# CONFIG_SENSORS_TSL2550 is not set
706# CONFIG_I2C_DEBUG_CORE is not set 713# CONFIG_I2C_DEBUG_CORE is not set
707# CONFIG_I2C_DEBUG_ALGO is not set 714# CONFIG_I2C_DEBUG_ALGO is not set
@@ -758,22 +765,7 @@ CONFIG_SSB_POSSIBLE=y
758# CONFIG_MFD_WM8350_I2C is not set 765# CONFIG_MFD_WM8350_I2C is not set
759# CONFIG_MFD_PCF50633 is not set 766# CONFIG_MFD_PCF50633 is not set
760# CONFIG_REGULATOR is not set 767# CONFIG_REGULATOR is not set
761 768# CONFIG_MEDIA_SUPPORT is not set
762#
763# Multimedia devices
764#
765
766#
767# Multimedia core support
768#
769# CONFIG_VIDEO_DEV is not set
770# CONFIG_DVB_CORE is not set
771# CONFIG_VIDEO_MEDIA is not set
772
773#
774# Multimedia drivers
775#
776# CONFIG_DAB is not set
777 769
778# 770#
779# Graphics support 771# Graphics support
@@ -885,6 +877,7 @@ CONFIG_USB_GADGET_SELECTED=y
885# CONFIG_USB_GADGET_OMAP is not set 877# CONFIG_USB_GADGET_OMAP is not set
886# CONFIG_USB_GADGET_PXA25X is not set 878# CONFIG_USB_GADGET_PXA25X is not set
887# CONFIG_USB_GADGET_PXA27X is not set 879# CONFIG_USB_GADGET_PXA27X is not set
880# CONFIG_USB_GADGET_S3C_HSOTG is not set
888# CONFIG_USB_GADGET_S3C2410 is not set 881# CONFIG_USB_GADGET_S3C2410 is not set
889# CONFIG_USB_GADGET_IMX is not set 882# CONFIG_USB_GADGET_IMX is not set
890CONFIG_USB_GADGET_M66592=y 883CONFIG_USB_GADGET_M66592=y
@@ -894,9 +887,11 @@ CONFIG_USB_M66592=y
894# CONFIG_USB_GADGET_CI13XXX is not set 887# CONFIG_USB_GADGET_CI13XXX is not set
895# CONFIG_USB_GADGET_NET2280 is not set 888# CONFIG_USB_GADGET_NET2280 is not set
896# CONFIG_USB_GADGET_GOKU is not set 889# CONFIG_USB_GADGET_GOKU is not set
890# CONFIG_USB_GADGET_LANGWELL is not set
897# CONFIG_USB_GADGET_DUMMY_HCD is not set 891# CONFIG_USB_GADGET_DUMMY_HCD is not set
898CONFIG_USB_GADGET_DUALSPEED=y 892CONFIG_USB_GADGET_DUALSPEED=y
899# CONFIG_USB_ZERO is not set 893# CONFIG_USB_ZERO is not set
894# CONFIG_USB_AUDIO is not set
900# CONFIG_USB_ETH is not set 895# CONFIG_USB_ETH is not set
901# CONFIG_USB_GADGETFS is not set 896# CONFIG_USB_GADGETFS is not set
902# CONFIG_USB_FILE_STORAGE is not set 897# CONFIG_USB_FILE_STORAGE is not set
@@ -974,6 +969,7 @@ CONFIG_RTC_INTF_DEV=y
974# on-CPU RTC drivers 969# on-CPU RTC drivers
975# 970#
976CONFIG_RTC_DRV_SH=y 971CONFIG_RTC_DRV_SH=y
972# CONFIG_RTC_DRV_GENERIC is not set
977# CONFIG_DMADEVICES is not set 973# CONFIG_DMADEVICES is not set
978# CONFIG_AUXDISPLAY is not set 974# CONFIG_AUXDISPLAY is not set
979CONFIG_UIO=m 975CONFIG_UIO=m
@@ -981,6 +977,10 @@ CONFIG_UIO=m
981# CONFIG_UIO_PDRV_GENIRQ is not set 977# CONFIG_UIO_PDRV_GENIRQ is not set
982# CONFIG_UIO_SMX is not set 978# CONFIG_UIO_SMX is not set
983# CONFIG_UIO_SERCOS3 is not set 979# CONFIG_UIO_SERCOS3 is not set
980
981#
982# TI VLYNQ
983#
984# CONFIG_STAGING is not set 984# CONFIG_STAGING is not set
985 985
986# 986#
@@ -1001,10 +1001,11 @@ CONFIG_FS_MBCACHE=y
1001# CONFIG_REISERFS_FS is not set 1001# CONFIG_REISERFS_FS is not set
1002# CONFIG_JFS_FS is not set 1002# CONFIG_JFS_FS is not set
1003# CONFIG_FS_POSIX_ACL is not set 1003# CONFIG_FS_POSIX_ACL is not set
1004CONFIG_FILE_LOCKING=y
1005# CONFIG_XFS_FS is not set 1004# CONFIG_XFS_FS is not set
1006# CONFIG_OCFS2_FS is not set 1005# CONFIG_OCFS2_FS is not set
1007# CONFIG_BTRFS_FS is not set 1006# CONFIG_BTRFS_FS is not set
1007CONFIG_FILE_LOCKING=y
1008CONFIG_FSNOTIFY=y
1008CONFIG_DNOTIFY=y 1009CONFIG_DNOTIFY=y
1009CONFIG_INOTIFY=y 1010CONFIG_INOTIFY=y
1010CONFIG_INOTIFY_USER=y 1011CONFIG_INOTIFY_USER=y
@@ -1077,7 +1078,46 @@ CONFIG_NETWORK_FILESYSTEMS=y
1077# 1078#
1078# CONFIG_PARTITION_ADVANCED is not set 1079# CONFIG_PARTITION_ADVANCED is not set
1079CONFIG_MSDOS_PARTITION=y 1080CONFIG_MSDOS_PARTITION=y
1080# CONFIG_NLS is not set 1081CONFIG_NLS=y
1082CONFIG_NLS_DEFAULT="iso8859-1"
1083# CONFIG_NLS_CODEPAGE_437 is not set
1084# CONFIG_NLS_CODEPAGE_737 is not set
1085# CONFIG_NLS_CODEPAGE_775 is not set
1086# CONFIG_NLS_CODEPAGE_850 is not set
1087# CONFIG_NLS_CODEPAGE_852 is not set
1088# CONFIG_NLS_CODEPAGE_855 is not set
1089# CONFIG_NLS_CODEPAGE_857 is not set
1090# CONFIG_NLS_CODEPAGE_860 is not set
1091# CONFIG_NLS_CODEPAGE_861 is not set
1092# CONFIG_NLS_CODEPAGE_862 is not set
1093# CONFIG_NLS_CODEPAGE_863 is not set
1094# CONFIG_NLS_CODEPAGE_864 is not set
1095# CONFIG_NLS_CODEPAGE_865 is not set
1096# CONFIG_NLS_CODEPAGE_866 is not set
1097# CONFIG_NLS_CODEPAGE_869 is not set
1098# CONFIG_NLS_CODEPAGE_936 is not set
1099# CONFIG_NLS_CODEPAGE_950 is not set
1100# CONFIG_NLS_CODEPAGE_932 is not set
1101# CONFIG_NLS_CODEPAGE_949 is not set
1102# CONFIG_NLS_CODEPAGE_874 is not set
1103# CONFIG_NLS_ISO8859_8 is not set
1104# CONFIG_NLS_CODEPAGE_1250 is not set
1105# CONFIG_NLS_CODEPAGE_1251 is not set
1106# CONFIG_NLS_ASCII is not set
1107# CONFIG_NLS_ISO8859_1 is not set
1108# CONFIG_NLS_ISO8859_2 is not set
1109# CONFIG_NLS_ISO8859_3 is not set
1110# CONFIG_NLS_ISO8859_4 is not set
1111# CONFIG_NLS_ISO8859_5 is not set
1112# CONFIG_NLS_ISO8859_6 is not set
1113# CONFIG_NLS_ISO8859_7 is not set
1114# CONFIG_NLS_ISO8859_9 is not set
1115# CONFIG_NLS_ISO8859_13 is not set
1116# CONFIG_NLS_ISO8859_14 is not set
1117# CONFIG_NLS_ISO8859_15 is not set
1118# CONFIG_NLS_KOI8_R is not set
1119# CONFIG_NLS_KOI8_U is not set
1120# CONFIG_NLS_UTF8 is not set
1081# CONFIG_DLM is not set 1121# CONFIG_DLM is not set
1082 1122
1083# 1123#
@@ -1138,25 +1178,25 @@ CONFIG_HAVE_FUNCTION_TRACER=y
1138CONFIG_HAVE_DYNAMIC_FTRACE=y 1178CONFIG_HAVE_DYNAMIC_FTRACE=y
1139CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 1179CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1140CONFIG_RING_BUFFER=y 1180CONFIG_RING_BUFFER=y
1181CONFIG_EVENT_TRACING=y
1182CONFIG_CONTEXT_SWITCH_TRACER=y
1141CONFIG_TRACING=y 1183CONFIG_TRACING=y
1142CONFIG_TRACING_SUPPORT=y 1184CONFIG_TRACING_SUPPORT=y
1143 1185CONFIG_FTRACE=y
1144#
1145# Tracers
1146#
1147# CONFIG_FUNCTION_TRACER is not set 1186# CONFIG_FUNCTION_TRACER is not set
1148# CONFIG_IRQSOFF_TRACER is not set 1187# CONFIG_IRQSOFF_TRACER is not set
1149# CONFIG_PREEMPT_TRACER is not set 1188# CONFIG_PREEMPT_TRACER is not set
1150# CONFIG_SCHED_TRACER is not set 1189# CONFIG_SCHED_TRACER is not set
1151# CONFIG_CONTEXT_SWITCH_TRACER is not set 1190# CONFIG_ENABLE_DEFAULT_TRACERS is not set
1152# CONFIG_EVENT_TRACER is not set
1153# CONFIG_BOOT_TRACER is not set 1191# CONFIG_BOOT_TRACER is not set
1154# CONFIG_TRACE_BRANCH_PROFILING is not set 1192CONFIG_BRANCH_PROFILE_NONE=y
1193# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
1194# CONFIG_PROFILE_ALL_BRANCHES is not set
1155# CONFIG_STACK_TRACER is not set 1195# CONFIG_STACK_TRACER is not set
1156# CONFIG_KMEMTRACE is not set 1196# CONFIG_KMEMTRACE is not set
1157# CONFIG_WORKQUEUE_TRACER is not set 1197# CONFIG_WORKQUEUE_TRACER is not set
1158# CONFIG_BLK_DEV_IO_TRACE is not set 1198# CONFIG_BLK_DEV_IO_TRACE is not set
1159# CONFIG_FTRACE_STARTUP_TEST is not set 1199# CONFIG_RING_BUFFER_BENCHMARK is not set
1160# CONFIG_DYNAMIC_DEBUG is not set 1200# CONFIG_DYNAMIC_DEBUG is not set
1161# CONFIG_DMA_API_DEBUG is not set 1201# CONFIG_DMA_API_DEBUG is not set
1162# CONFIG_SAMPLES is not set 1202# CONFIG_SAMPLES is not set
@@ -1168,10 +1208,8 @@ CONFIG_EARLY_PRINTK=y
1168# CONFIG_DEBUG_BOOTMEM is not set 1208# CONFIG_DEBUG_BOOTMEM is not set
1169CONFIG_DEBUG_STACKOVERFLOW=y 1209CONFIG_DEBUG_STACKOVERFLOW=y
1170CONFIG_DEBUG_STACK_USAGE=y 1210CONFIG_DEBUG_STACK_USAGE=y
1171# CONFIG_IRQSTACKS is not set
1172CONFIG_DUMP_CODE=y 1211CONFIG_DUMP_CODE=y
1173# CONFIG_SH_NO_BSS_INIT is not set 1212# CONFIG_SH_NO_BSS_INIT is not set
1174# CONFIG_MORE_COMPILE_OPTIONS is not set
1175 1213
1176# 1214#
1177# Security options 1215# Security options
@@ -1285,3 +1323,4 @@ CONFIG_HAS_IOMEM=y
1285CONFIG_HAS_IOPORT=y 1323CONFIG_HAS_IOPORT=y
1286CONFIG_HAS_DMA=y 1324CONFIG_HAS_DMA=y
1287CONFIG_NLATTR=y 1325CONFIG_NLATTR=y
1326CONFIG_GENERIC_ATOMIC64=y
diff --git a/arch/sh/configs/snapgear_defconfig b/arch/sh/configs/snapgear_defconfig
index 54a7a3c41f34..ca3c88a88021 100644
--- a/arch/sh/configs/snapgear_defconfig
+++ b/arch/sh/configs/snapgear_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.30-rc3 3# Linux kernel version: 2.6.30
4# Mon Apr 27 13:14:00 2009 4# Thu Jun 18 13:11:58 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -20,6 +20,7 @@ CONFIG_GENERIC_CLOCKEVENTS=y
20# CONFIG_ARCH_SUSPEND_POSSIBLE is not set 20# CONFIG_ARCH_SUSPEND_POSSIBLE is not set
21CONFIG_ARCH_HIBERNATION_POSSIBLE=y 21CONFIG_ARCH_HIBERNATION_POSSIBLE=y
22CONFIG_SYS_SUPPORTS_PCI=y 22CONFIG_SYS_SUPPORTS_PCI=y
23CONFIG_SYS_SUPPORTS_TMU=y
23CONFIG_STACKTRACE_SUPPORT=y 24CONFIG_STACKTRACE_SUPPORT=y
24CONFIG_LOCKDEP_SUPPORT=y 25CONFIG_LOCKDEP_SUPPORT=y
25CONFIG_HAVE_LATENCYTOP_SUPPORT=y 26CONFIG_HAVE_LATENCYTOP_SUPPORT=y
@@ -73,7 +74,6 @@ CONFIG_UID16=y
73# CONFIG_SYSCTL_SYSCALL is not set 74# CONFIG_SYSCTL_SYSCALL is not set
74CONFIG_KALLSYMS=y 75CONFIG_KALLSYMS=y
75# CONFIG_KALLSYMS_EXTRA_PASS is not set 76# CONFIG_KALLSYMS_EXTRA_PASS is not set
76# CONFIG_STRIP_ASM_SYMS is not set
77# CONFIG_HOTPLUG is not set 77# CONFIG_HOTPLUG is not set
78CONFIG_PRINTK=y 78CONFIG_PRINTK=y
79CONFIG_BUG=y 79CONFIG_BUG=y
@@ -86,8 +86,13 @@ CONFIG_TIMERFD=y
86CONFIG_EVENTFD=y 86CONFIG_EVENTFD=y
87CONFIG_SHMEM=y 87CONFIG_SHMEM=y
88CONFIG_AIO=y 88CONFIG_AIO=y
89
90#
91# Performance Counters
92#
89CONFIG_VM_EVENT_COUNTERS=y 93CONFIG_VM_EVENT_COUNTERS=y
90CONFIG_PCI_QUIRKS=y 94CONFIG_PCI_QUIRKS=y
95# CONFIG_STRIP_ASM_SYMS is not set
91CONFIG_COMPAT_BRK=y 96CONFIG_COMPAT_BRK=y
92CONFIG_SLAB=y 97CONFIG_SLAB=y
93# CONFIG_SLUB is not set 98# CONFIG_SLUB is not set
@@ -171,6 +176,7 @@ CONFIG_CPU_SUBTYPE_SH7751R=y
171CONFIG_QUICKLIST=y 176CONFIG_QUICKLIST=y
172CONFIG_MMU=y 177CONFIG_MMU=y
173CONFIG_PAGE_OFFSET=0x80000000 178CONFIG_PAGE_OFFSET=0x80000000
179CONFIG_FORCE_MAX_ZONEORDER=11
174CONFIG_MEMORY_START=0x08000000 180CONFIG_MEMORY_START=0x08000000
175CONFIG_MEMORY_SIZE=0x01000000 181CONFIG_MEMORY_SIZE=0x01000000
176CONFIG_29BIT=y 182CONFIG_29BIT=y
@@ -185,7 +191,6 @@ CONFIG_PAGE_SIZE_4KB=y
185# CONFIG_PAGE_SIZE_8KB is not set 191# CONFIG_PAGE_SIZE_8KB is not set
186# CONFIG_PAGE_SIZE_16KB is not set 192# CONFIG_PAGE_SIZE_16KB is not set
187# CONFIG_PAGE_SIZE_64KB is not set 193# CONFIG_PAGE_SIZE_64KB is not set
188CONFIG_ENTRY_OFFSET=0x00001000
189CONFIG_SELECT_MEMORY_MODEL=y 194CONFIG_SELECT_MEMORY_MODEL=y
190CONFIG_FLATMEM_MANUAL=y 195CONFIG_FLATMEM_MANUAL=y
191# CONFIG_DISCONTIGMEM_MANUAL is not set 196# CONFIG_DISCONTIGMEM_MANUAL is not set
@@ -198,9 +203,9 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
198# CONFIG_PHYS_ADDR_T_64BIT is not set 203# CONFIG_PHYS_ADDR_T_64BIT is not set
199CONFIG_ZONE_DMA_FLAG=0 204CONFIG_ZONE_DMA_FLAG=0
200CONFIG_NR_QUICK=2 205CONFIG_NR_QUICK=2
201CONFIG_UNEVICTABLE_LRU=y
202CONFIG_HAVE_MLOCK=y 206CONFIG_HAVE_MLOCK=y
203CONFIG_HAVE_MLOCKED_PAGE_BIT=y 207CONFIG_HAVE_MLOCKED_PAGE_BIT=y
208CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
204 209
205# 210#
206# Cache configuration 211# Cache configuration
@@ -219,7 +224,6 @@ CONFIG_SH_FPU=y
219CONFIG_CPU_HAS_INTEVT=y 224CONFIG_CPU_HAS_INTEVT=y
220CONFIG_CPU_HAS_IPR_IRQ=y 225CONFIG_CPU_HAS_IPR_IRQ=y
221CONFIG_CPU_HAS_SR_RB=y 226CONFIG_CPU_HAS_SR_RB=y
222CONFIG_CPU_HAS_PTEA=y
223CONFIG_CPU_HAS_FPU=y 227CONFIG_CPU_HAS_FPU=y
224 228
225# 229#
@@ -235,9 +239,10 @@ CONFIG_SH_SECUREEDGE5410=y
235# 239#
236# Timer and clock configuration 240# Timer and clock configuration
237# 241#
238CONFIG_SH_TMU=y 242CONFIG_SH_TIMER_TMU=y
239CONFIG_SH_TIMER_IRQ=16
240CONFIG_SH_PCLK_FREQ=60000000 243CONFIG_SH_PCLK_FREQ=60000000
244CONFIG_SH_CLK_CPG=y
245CONFIG_SH_CLK_CPG_LEGACY=y
241# CONFIG_NO_HZ is not set 246# CONFIG_NO_HZ is not set
242# CONFIG_HIGH_RES_TIMERS is not set 247# CONFIG_HIGH_RES_TIMERS is not set
243CONFIG_GENERIC_CLOCKEVENTS_BUILD=y 248CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
@@ -283,12 +288,14 @@ CONFIG_PREEMPT_NONE=y
283# CONFIG_PREEMPT is not set 288# CONFIG_PREEMPT is not set
284CONFIG_GUSA=y 289CONFIG_GUSA=y
285# CONFIG_GUSA_RB is not set 290# CONFIG_GUSA_RB is not set
291# CONFIG_SPARSE_IRQ is not set
286 292
287# 293#
288# Boot options 294# Boot options
289# 295#
290CONFIG_ZERO_PAGE_OFFSET=0x00001000 296CONFIG_ZERO_PAGE_OFFSET=0x00001000
291CONFIG_BOOT_LINK_OFFSET=0x00800000 297CONFIG_BOOT_LINK_OFFSET=0x00800000
298CONFIG_ENTRY_OFFSET=0x00001000
292# CONFIG_UBC_WAKEUP is not set 299# CONFIG_UBC_WAKEUP is not set
293# CONFIG_CMDLINE_BOOL is not set 300# CONFIG_CMDLINE_BOOL is not set
294 301
@@ -366,6 +373,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
366# CONFIG_ECONET is not set 373# CONFIG_ECONET is not set
367# CONFIG_WAN_ROUTER is not set 374# CONFIG_WAN_ROUTER is not set
368# CONFIG_PHONET is not set 375# CONFIG_PHONET is not set
376# CONFIG_IEEE802154 is not set
369# CONFIG_NET_SCHED is not set 377# CONFIG_NET_SCHED is not set
370# CONFIG_DCB is not set 378# CONFIG_DCB is not set
371 379
@@ -383,7 +391,11 @@ CONFIG_WIRELESS=y
383# CONFIG_WIRELESS_OLD_REGULATORY is not set 391# CONFIG_WIRELESS_OLD_REGULATORY is not set
384# CONFIG_WIRELESS_EXT is not set 392# CONFIG_WIRELESS_EXT is not set
385# CONFIG_LIB80211 is not set 393# CONFIG_LIB80211 is not set
386# CONFIG_MAC80211 is not set 394
395#
396# CFG80211 needs to be enabled for MAC80211
397#
398CONFIG_MAC80211_DEFAULT_PS_VALUE=0
387# CONFIG_WIMAX is not set 399# CONFIG_WIMAX is not set
388# CONFIG_RFKILL is not set 400# CONFIG_RFKILL is not set
389# CONFIG_NET_9P is not set 401# CONFIG_NET_9P is not set
@@ -528,7 +540,6 @@ CONFIG_HAVE_IDE=y
528# CONFIG_IEEE1394 is not set 540# CONFIG_IEEE1394 is not set
529# CONFIG_I2O is not set 541# CONFIG_I2O is not set
530CONFIG_NETDEVICES=y 542CONFIG_NETDEVICES=y
531CONFIG_COMPAT_NET_DEV_OPS=y
532# CONFIG_DUMMY is not set 543# CONFIG_DUMMY is not set
533# CONFIG_BONDING is not set 544# CONFIG_BONDING is not set
534# CONFIG_MACVLAN is not set 545# CONFIG_MACVLAN is not set
@@ -581,6 +592,7 @@ CONFIG_8139TOO_PIO=y
581# CONFIG_SMSC9420 is not set 592# CONFIG_SMSC9420 is not set
582# CONFIG_SUNDANCE is not set 593# CONFIG_SUNDANCE is not set
583# CONFIG_TLAN is not set 594# CONFIG_TLAN is not set
595# CONFIG_KS8842 is not set
584# CONFIG_VIA_RHINE is not set 596# CONFIG_VIA_RHINE is not set
585# CONFIG_SC92031 is not set 597# CONFIG_SC92031 is not set
586# CONFIG_ATL2 is not set 598# CONFIG_ATL2 is not set
@@ -695,22 +707,7 @@ CONFIG_SSB_POSSIBLE=y
695# CONFIG_HTC_PASIC3 is not set 707# CONFIG_HTC_PASIC3 is not set
696# CONFIG_MFD_TMIO is not set 708# CONFIG_MFD_TMIO is not set
697# CONFIG_REGULATOR is not set 709# CONFIG_REGULATOR is not set
698 710# CONFIG_MEDIA_SUPPORT is not set
699#
700# Multimedia devices
701#
702
703#
704# Multimedia core support
705#
706# CONFIG_VIDEO_DEV is not set
707# CONFIG_DVB_CORE is not set
708# CONFIG_VIDEO_MEDIA is not set
709
710#
711# Multimedia drivers
712#
713# CONFIG_DAB is not set
714 711
715# 712#
716# Graphics support 713# Graphics support
@@ -734,10 +731,15 @@ CONFIG_SSB_POSSIBLE=y
734# CONFIG_NEW_LEDS is not set 731# CONFIG_NEW_LEDS is not set
735# CONFIG_ACCESSIBILITY is not set 732# CONFIG_ACCESSIBILITY is not set
736# CONFIG_INFINIBAND is not set 733# CONFIG_INFINIBAND is not set
734CONFIG_RTC_LIB=y
737# CONFIG_RTC_CLASS is not set 735# CONFIG_RTC_CLASS is not set
738# CONFIG_DMADEVICES is not set 736# CONFIG_DMADEVICES is not set
739# CONFIG_AUXDISPLAY is not set 737# CONFIG_AUXDISPLAY is not set
740# CONFIG_UIO is not set 738# CONFIG_UIO is not set
739
740#
741# TI VLYNQ
742#
741# CONFIG_STAGING is not set 743# CONFIG_STAGING is not set
742 744
743# 745#
@@ -751,12 +753,14 @@ CONFIG_EXT2_FS=y
751# CONFIG_REISERFS_FS is not set 753# CONFIG_REISERFS_FS is not set
752# CONFIG_JFS_FS is not set 754# CONFIG_JFS_FS is not set
753# CONFIG_FS_POSIX_ACL is not set 755# CONFIG_FS_POSIX_ACL is not set
754CONFIG_FILE_LOCKING=y
755# CONFIG_XFS_FS is not set 756# CONFIG_XFS_FS is not set
756# CONFIG_OCFS2_FS is not set 757# CONFIG_OCFS2_FS is not set
757# CONFIG_BTRFS_FS is not set 758# CONFIG_BTRFS_FS is not set
759CONFIG_FILE_LOCKING=y
760CONFIG_FSNOTIFY=y
758# CONFIG_DNOTIFY is not set 761# CONFIG_DNOTIFY is not set
759# CONFIG_INOTIFY is not set 762# CONFIG_INOTIFY is not set
763CONFIG_INOTIFY_USER=y
760# CONFIG_QUOTA is not set 764# CONFIG_QUOTA is not set
761# CONFIG_AUTOFS_FS is not set 765# CONFIG_AUTOFS_FS is not set
762# CONFIG_AUTOFS4_FS is not set 766# CONFIG_AUTOFS4_FS is not set
@@ -855,27 +859,12 @@ CONFIG_HAVE_FUNCTION_TRACER=y
855CONFIG_HAVE_DYNAMIC_FTRACE=y 859CONFIG_HAVE_DYNAMIC_FTRACE=y
856CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 860CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
857CONFIG_TRACING_SUPPORT=y 861CONFIG_TRACING_SUPPORT=y
858 862# CONFIG_FTRACE is not set
859#
860# Tracers
861#
862# CONFIG_FUNCTION_TRACER is not set
863# CONFIG_IRQSOFF_TRACER is not set
864# CONFIG_SCHED_TRACER is not set
865# CONFIG_CONTEXT_SWITCH_TRACER is not set
866# CONFIG_EVENT_TRACER is not set
867# CONFIG_BOOT_TRACER is not set
868# CONFIG_TRACE_BRANCH_PROFILING is not set
869# CONFIG_STACK_TRACER is not set
870# CONFIG_KMEMTRACE is not set
871# CONFIG_WORKQUEUE_TRACER is not set
872# CONFIG_BLK_DEV_IO_TRACE is not set
873# CONFIG_DMA_API_DEBUG is not set 863# CONFIG_DMA_API_DEBUG is not set
874# CONFIG_SAMPLES is not set 864# CONFIG_SAMPLES is not set
875CONFIG_HAVE_ARCH_KGDB=y 865CONFIG_HAVE_ARCH_KGDB=y
876# CONFIG_SH_STANDARD_BIOS is not set 866# CONFIG_SH_STANDARD_BIOS is not set
877# CONFIG_EARLY_SCIF_CONSOLE is not set 867# CONFIG_EARLY_SCIF_CONSOLE is not set
878# CONFIG_MORE_COMPILE_OPTIONS is not set
879 868
880# 869#
881# Security options 870# Security options
@@ -905,3 +894,4 @@ CONFIG_HAS_IOMEM=y
905CONFIG_HAS_IOPORT=y 894CONFIG_HAS_IOPORT=y
906CONFIG_HAS_DMA=y 895CONFIG_HAS_DMA=y
907CONFIG_NLATTR=y 896CONFIG_NLATTR=y
897CONFIG_GENERIC_ATOMIC64=y
diff --git a/arch/sh/configs/systemh_defconfig b/arch/sh/configs/systemh_defconfig
index dbe7e546f0bb..5d970263c096 100644
--- a/arch/sh/configs/systemh_defconfig
+++ b/arch/sh/configs/systemh_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.30-rc3 3# Linux kernel version: 2.6.30
4# Mon Apr 27 13:14:33 2009 4# Thu Jun 18 13:12:28 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -19,6 +19,7 @@ CONFIG_GENERIC_TIME=y
19CONFIG_GENERIC_CLOCKEVENTS=y 19CONFIG_GENERIC_CLOCKEVENTS=y
20# CONFIG_ARCH_SUSPEND_POSSIBLE is not set 20# CONFIG_ARCH_SUSPEND_POSSIBLE is not set
21CONFIG_ARCH_HIBERNATION_POSSIBLE=y 21CONFIG_ARCH_HIBERNATION_POSSIBLE=y
22CONFIG_SYS_SUPPORTS_TMU=y
22CONFIG_STACKTRACE_SUPPORT=y 23CONFIG_STACKTRACE_SUPPORT=y
23CONFIG_LOCKDEP_SUPPORT=y 24CONFIG_LOCKDEP_SUPPORT=y
24CONFIG_HAVE_LATENCYTOP_SUPPORT=y 25CONFIG_HAVE_LATENCYTOP_SUPPORT=y
@@ -70,7 +71,6 @@ CONFIG_UID16=y
70# CONFIG_SYSCTL_SYSCALL is not set 71# CONFIG_SYSCTL_SYSCALL is not set
71CONFIG_KALLSYMS=y 72CONFIG_KALLSYMS=y
72# CONFIG_KALLSYMS_EXTRA_PASS is not set 73# CONFIG_KALLSYMS_EXTRA_PASS is not set
73# CONFIG_STRIP_ASM_SYMS is not set
74# CONFIG_HOTPLUG is not set 74# CONFIG_HOTPLUG is not set
75CONFIG_PRINTK=y 75CONFIG_PRINTK=y
76CONFIG_BUG=y 76CONFIG_BUG=y
@@ -83,7 +83,12 @@ CONFIG_TIMERFD=y
83CONFIG_EVENTFD=y 83CONFIG_EVENTFD=y
84CONFIG_SHMEM=y 84CONFIG_SHMEM=y
85CONFIG_AIO=y 85CONFIG_AIO=y
86
87#
88# Performance Counters
89#
86CONFIG_VM_EVENT_COUNTERS=y 90CONFIG_VM_EVENT_COUNTERS=y
91# CONFIG_STRIP_ASM_SYMS is not set
87CONFIG_COMPAT_BRK=y 92CONFIG_COMPAT_BRK=y
88CONFIG_SLAB=y 93CONFIG_SLAB=y
89# CONFIG_SLUB is not set 94# CONFIG_SLUB is not set
@@ -173,6 +178,7 @@ CONFIG_CPU_SUBTYPE_SH7751R=y
173CONFIG_QUICKLIST=y 178CONFIG_QUICKLIST=y
174CONFIG_MMU=y 179CONFIG_MMU=y
175CONFIG_PAGE_OFFSET=0x80000000 180CONFIG_PAGE_OFFSET=0x80000000
181CONFIG_FORCE_MAX_ZONEORDER=11
176CONFIG_MEMORY_START=0x0c000000 182CONFIG_MEMORY_START=0x0c000000
177CONFIG_MEMORY_SIZE=0x00400000 183CONFIG_MEMORY_SIZE=0x00400000
178CONFIG_29BIT=y 184CONFIG_29BIT=y
@@ -187,7 +193,6 @@ CONFIG_PAGE_SIZE_4KB=y
187# CONFIG_PAGE_SIZE_8KB is not set 193# CONFIG_PAGE_SIZE_8KB is not set
188# CONFIG_PAGE_SIZE_16KB is not set 194# CONFIG_PAGE_SIZE_16KB is not set
189# CONFIG_PAGE_SIZE_64KB is not set 195# CONFIG_PAGE_SIZE_64KB is not set
190CONFIG_ENTRY_OFFSET=0x00001000
191CONFIG_SELECT_MEMORY_MODEL=y 196CONFIG_SELECT_MEMORY_MODEL=y
192CONFIG_FLATMEM_MANUAL=y 197CONFIG_FLATMEM_MANUAL=y
193# CONFIG_DISCONTIGMEM_MANUAL is not set 198# CONFIG_DISCONTIGMEM_MANUAL is not set
@@ -200,9 +205,9 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
200# CONFIG_PHYS_ADDR_T_64BIT is not set 205# CONFIG_PHYS_ADDR_T_64BIT is not set
201CONFIG_ZONE_DMA_FLAG=0 206CONFIG_ZONE_DMA_FLAG=0
202CONFIG_NR_QUICK=2 207CONFIG_NR_QUICK=2
203CONFIG_UNEVICTABLE_LRU=y
204CONFIG_HAVE_MLOCK=y 208CONFIG_HAVE_MLOCK=y
205CONFIG_HAVE_MLOCKED_PAGE_BIT=y 209CONFIG_HAVE_MLOCKED_PAGE_BIT=y
210CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
206 211
207# 212#
208# Cache configuration 213# Cache configuration
@@ -220,7 +225,6 @@ CONFIG_SH_FPU=y
220# CONFIG_SH_STORE_QUEUES is not set 225# CONFIG_SH_STORE_QUEUES is not set
221CONFIG_CPU_HAS_INTEVT=y 226CONFIG_CPU_HAS_INTEVT=y
222CONFIG_CPU_HAS_SR_RB=y 227CONFIG_CPU_HAS_SR_RB=y
223CONFIG_CPU_HAS_PTEA=y
224CONFIG_CPU_HAS_FPU=y 228CONFIG_CPU_HAS_FPU=y
225 229
226# 230#
@@ -236,9 +240,10 @@ CONFIG_SH_7751_SYSTEMH=y
236# 240#
237# Timer and clock configuration 241# Timer and clock configuration
238# 242#
239CONFIG_SH_TMU=y 243CONFIG_SH_TIMER_TMU=y
240CONFIG_SH_TIMER_IRQ=16
241CONFIG_SH_PCLK_FREQ=60000000 244CONFIG_SH_PCLK_FREQ=60000000
245CONFIG_SH_CLK_CPG=y
246CONFIG_SH_CLK_CPG_LEGACY=y
242# CONFIG_NO_HZ is not set 247# CONFIG_NO_HZ is not set
243# CONFIG_HIGH_RES_TIMERS is not set 248# CONFIG_HIGH_RES_TIMERS is not set
244CONFIG_GENERIC_CLOCKEVENTS_BUILD=y 249CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
@@ -280,12 +285,14 @@ CONFIG_HZ=250
280CONFIG_PREEMPT=y 285CONFIG_PREEMPT=y
281CONFIG_GUSA=y 286CONFIG_GUSA=y
282# CONFIG_GUSA_RB is not set 287# CONFIG_GUSA_RB is not set
288# CONFIG_SPARSE_IRQ is not set
283 289
284# 290#
285# Boot options 291# Boot options
286# 292#
287CONFIG_ZERO_PAGE_OFFSET=0x00001000 293CONFIG_ZERO_PAGE_OFFSET=0x00001000
288CONFIG_BOOT_LINK_OFFSET=0x00800000 294CONFIG_BOOT_LINK_OFFSET=0x00800000
295CONFIG_ENTRY_OFFSET=0x00001000
289# CONFIG_UBC_WAKEUP is not set 296# CONFIG_UBC_WAKEUP is not set
290# CONFIG_CMDLINE_BOOL is not set 297# CONFIG_CMDLINE_BOOL is not set
291 298
@@ -428,21 +435,7 @@ CONFIG_SSB_POSSIBLE=y
428# CONFIG_HTC_PASIC3 is not set 435# CONFIG_HTC_PASIC3 is not set
429# CONFIG_MFD_TMIO is not set 436# CONFIG_MFD_TMIO is not set
430# CONFIG_REGULATOR is not set 437# CONFIG_REGULATOR is not set
431 438# CONFIG_MEDIA_SUPPORT is not set
432#
433# Multimedia devices
434#
435
436#
437# Multimedia core support
438#
439# CONFIG_VIDEO_DEV is not set
440# CONFIG_VIDEO_MEDIA is not set
441
442#
443# Multimedia drivers
444#
445# CONFIG_DAB is not set
446 439
447# 440#
448# Graphics support 441# Graphics support
@@ -481,10 +474,15 @@ CONFIG_USB_ARCH_HAS_HCD=y
481# CONFIG_MEMSTICK is not set 474# CONFIG_MEMSTICK is not set
482# CONFIG_NEW_LEDS is not set 475# CONFIG_NEW_LEDS is not set
483# CONFIG_ACCESSIBILITY is not set 476# CONFIG_ACCESSIBILITY is not set
477CONFIG_RTC_LIB=y
484# CONFIG_RTC_CLASS is not set 478# CONFIG_RTC_CLASS is not set
485# CONFIG_DMADEVICES is not set 479# CONFIG_DMADEVICES is not set
486# CONFIG_AUXDISPLAY is not set 480# CONFIG_AUXDISPLAY is not set
487# CONFIG_UIO is not set 481# CONFIG_UIO is not set
482
483#
484# TI VLYNQ
485#
488# CONFIG_STAGING is not set 486# CONFIG_STAGING is not set
489 487
490# 488#
@@ -496,9 +494,10 @@ CONFIG_USB_ARCH_HAS_HCD=y
496# CONFIG_REISERFS_FS is not set 494# CONFIG_REISERFS_FS is not set
497# CONFIG_JFS_FS is not set 495# CONFIG_JFS_FS is not set
498# CONFIG_FS_POSIX_ACL is not set 496# CONFIG_FS_POSIX_ACL is not set
499CONFIG_FILE_LOCKING=y
500# CONFIG_XFS_FS is not set 497# CONFIG_XFS_FS is not set
501# CONFIG_BTRFS_FS is not set 498# CONFIG_BTRFS_FS is not set
499CONFIG_FILE_LOCKING=y
500CONFIG_FSNOTIFY=y
502CONFIG_DNOTIFY=y 501CONFIG_DNOTIFY=y
503CONFIG_INOTIFY=y 502CONFIG_INOTIFY=y
504CONFIG_INOTIFY_USER=y 503CONFIG_INOTIFY_USER=y
@@ -590,28 +589,12 @@ CONFIG_HAVE_FUNCTION_TRACER=y
590CONFIG_HAVE_DYNAMIC_FTRACE=y 589CONFIG_HAVE_DYNAMIC_FTRACE=y
591CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 590CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
592CONFIG_TRACING_SUPPORT=y 591CONFIG_TRACING_SUPPORT=y
593 592# CONFIG_FTRACE is not set
594#
595# Tracers
596#
597# CONFIG_FUNCTION_TRACER is not set
598# CONFIG_IRQSOFF_TRACER is not set
599# CONFIG_PREEMPT_TRACER is not set
600# CONFIG_SCHED_TRACER is not set
601# CONFIG_CONTEXT_SWITCH_TRACER is not set
602# CONFIG_EVENT_TRACER is not set
603# CONFIG_BOOT_TRACER is not set
604# CONFIG_TRACE_BRANCH_PROFILING is not set
605# CONFIG_STACK_TRACER is not set
606# CONFIG_KMEMTRACE is not set
607# CONFIG_WORKQUEUE_TRACER is not set
608# CONFIG_BLK_DEV_IO_TRACE is not set
609# CONFIG_DMA_API_DEBUG is not set 593# CONFIG_DMA_API_DEBUG is not set
610# CONFIG_SAMPLES is not set 594# CONFIG_SAMPLES is not set
611CONFIG_HAVE_ARCH_KGDB=y 595CONFIG_HAVE_ARCH_KGDB=y
612# CONFIG_SH_STANDARD_BIOS is not set 596# CONFIG_SH_STANDARD_BIOS is not set
613# CONFIG_EARLY_SCIF_CONSOLE is not set 597# CONFIG_EARLY_SCIF_CONSOLE is not set
614# CONFIG_MORE_COMPILE_OPTIONS is not set
615 598
616# 599#
617# Security options 600# Security options
@@ -640,3 +623,4 @@ CONFIG_DECOMPRESS_GZIP=y
640CONFIG_HAS_IOMEM=y 623CONFIG_HAS_IOMEM=y
641CONFIG_HAS_IOPORT=y 624CONFIG_HAS_IOPORT=y
642CONFIG_HAS_DMA=y 625CONFIG_HAS_DMA=y
626CONFIG_GENERIC_ATOMIC64=y
diff --git a/arch/sh/configs/titan_defconfig b/arch/sh/configs/titan_defconfig
index 8ca94ef74278..7ad080e820ce 100644
--- a/arch/sh/configs/titan_defconfig
+++ b/arch/sh/configs/titan_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.30-rc3 3# Linux kernel version: 2.6.30
4# Mon Apr 27 13:14:55 2009 4# Thu Jun 18 13:12:54 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -20,6 +20,7 @@ CONFIG_GENERIC_CLOCKEVENTS=y
20# CONFIG_ARCH_SUSPEND_POSSIBLE is not set 20# CONFIG_ARCH_SUSPEND_POSSIBLE is not set
21CONFIG_ARCH_HIBERNATION_POSSIBLE=y 21CONFIG_ARCH_HIBERNATION_POSSIBLE=y
22CONFIG_SYS_SUPPORTS_PCI=y 22CONFIG_SYS_SUPPORTS_PCI=y
23CONFIG_SYS_SUPPORTS_TMU=y
23CONFIG_STACKTRACE_SUPPORT=y 24CONFIG_STACKTRACE_SUPPORT=y
24CONFIG_LOCKDEP_SUPPORT=y 25CONFIG_LOCKDEP_SUPPORT=y
25CONFIG_HAVE_LATENCYTOP_SUPPORT=y 26CONFIG_HAVE_LATENCYTOP_SUPPORT=y
@@ -77,7 +78,6 @@ CONFIG_UID16=y
77CONFIG_KALLSYMS=y 78CONFIG_KALLSYMS=y
78# CONFIG_KALLSYMS_ALL is not set 79# CONFIG_KALLSYMS_ALL is not set
79# CONFIG_KALLSYMS_EXTRA_PASS is not set 80# CONFIG_KALLSYMS_EXTRA_PASS is not set
80# CONFIG_STRIP_ASM_SYMS is not set
81CONFIG_HOTPLUG=y 81CONFIG_HOTPLUG=y
82CONFIG_PRINTK=y 82CONFIG_PRINTK=y
83CONFIG_BUG=y 83CONFIG_BUG=y
@@ -90,8 +90,13 @@ CONFIG_TIMERFD=y
90CONFIG_EVENTFD=y 90CONFIG_EVENTFD=y
91CONFIG_SHMEM=y 91CONFIG_SHMEM=y
92CONFIG_AIO=y 92CONFIG_AIO=y
93
94#
95# Performance Counters
96#
93CONFIG_VM_EVENT_COUNTERS=y 97CONFIG_VM_EVENT_COUNTERS=y
94CONFIG_PCI_QUIRKS=y 98CONFIG_PCI_QUIRKS=y
99# CONFIG_STRIP_ASM_SYMS is not set
95CONFIG_COMPAT_BRK=y 100CONFIG_COMPAT_BRK=y
96CONFIG_SLAB=y 101CONFIG_SLAB=y
97# CONFIG_SLUB is not set 102# CONFIG_SLUB is not set
@@ -181,6 +186,7 @@ CONFIG_CPU_SUBTYPE_SH7751R=y
181CONFIG_QUICKLIST=y 186CONFIG_QUICKLIST=y
182CONFIG_MMU=y 187CONFIG_MMU=y
183CONFIG_PAGE_OFFSET=0x80000000 188CONFIG_PAGE_OFFSET=0x80000000
189CONFIG_FORCE_MAX_ZONEORDER=11
184CONFIG_MEMORY_START=0x08030000 190CONFIG_MEMORY_START=0x08030000
185CONFIG_MEMORY_SIZE=0x7fd0000 191CONFIG_MEMORY_SIZE=0x7fd0000
186CONFIG_29BIT=y 192CONFIG_29BIT=y
@@ -195,7 +201,6 @@ CONFIG_PAGE_SIZE_4KB=y
195# CONFIG_PAGE_SIZE_8KB is not set 201# CONFIG_PAGE_SIZE_8KB is not set
196# CONFIG_PAGE_SIZE_16KB is not set 202# CONFIG_PAGE_SIZE_16KB is not set
197# CONFIG_PAGE_SIZE_64KB is not set 203# CONFIG_PAGE_SIZE_64KB is not set
198CONFIG_ENTRY_OFFSET=0x00001000
199CONFIG_SELECT_MEMORY_MODEL=y 204CONFIG_SELECT_MEMORY_MODEL=y
200CONFIG_FLATMEM_MANUAL=y 205CONFIG_FLATMEM_MANUAL=y
201# CONFIG_DISCONTIGMEM_MANUAL is not set 206# CONFIG_DISCONTIGMEM_MANUAL is not set
@@ -208,9 +213,9 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
208# CONFIG_PHYS_ADDR_T_64BIT is not set 213# CONFIG_PHYS_ADDR_T_64BIT is not set
209CONFIG_ZONE_DMA_FLAG=0 214CONFIG_ZONE_DMA_FLAG=0
210CONFIG_NR_QUICK=2 215CONFIG_NR_QUICK=2
211CONFIG_UNEVICTABLE_LRU=y
212CONFIG_HAVE_MLOCK=y 216CONFIG_HAVE_MLOCK=y
213CONFIG_HAVE_MLOCKED_PAGE_BIT=y 217CONFIG_HAVE_MLOCKED_PAGE_BIT=y
218CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
214 219
215# 220#
216# Cache configuration 221# Cache configuration
@@ -229,7 +234,6 @@ CONFIG_SH_FPU=y
229CONFIG_CPU_HAS_INTEVT=y 234CONFIG_CPU_HAS_INTEVT=y
230CONFIG_CPU_HAS_IPR_IRQ=y 235CONFIG_CPU_HAS_IPR_IRQ=y
231CONFIG_CPU_HAS_SR_RB=y 236CONFIG_CPU_HAS_SR_RB=y
232CONFIG_CPU_HAS_PTEA=y
233CONFIG_CPU_HAS_FPU=y 237CONFIG_CPU_HAS_FPU=y
234 238
235# 239#
@@ -245,9 +249,10 @@ CONFIG_SH_TITAN=y
245# 249#
246# Timer and clock configuration 250# Timer and clock configuration
247# 251#
248CONFIG_SH_TMU=y 252CONFIG_SH_TIMER_TMU=y
249CONFIG_SH_TIMER_IRQ=16
250CONFIG_SH_PCLK_FREQ=30000000 253CONFIG_SH_PCLK_FREQ=30000000
254CONFIG_SH_CLK_CPG=y
255CONFIG_SH_CLK_CPG_LEGACY=y
251# CONFIG_NO_HZ is not set 256# CONFIG_NO_HZ is not set
252# CONFIG_HIGH_RES_TIMERS is not set 257# CONFIG_HIGH_RES_TIMERS is not set
253CONFIG_GENERIC_CLOCKEVENTS_BUILD=y 258CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
@@ -293,12 +298,14 @@ CONFIG_PREEMPT_VOLUNTARY=y
293# CONFIG_PREEMPT is not set 298# CONFIG_PREEMPT is not set
294CONFIG_GUSA=y 299CONFIG_GUSA=y
295# CONFIG_GUSA_RB is not set 300# CONFIG_GUSA_RB is not set
301# CONFIG_SPARSE_IRQ is not set
296 302
297# 303#
298# Boot options 304# Boot options
299# 305#
300CONFIG_ZERO_PAGE_OFFSET=0x00001000 306CONFIG_ZERO_PAGE_OFFSET=0x00001000
301CONFIG_BOOT_LINK_OFFSET=0x009e0000 307CONFIG_BOOT_LINK_OFFSET=0x009e0000
308CONFIG_ENTRY_OFFSET=0x00001000
302# CONFIG_UBC_WAKEUP is not set 309# CONFIG_UBC_WAKEUP is not set
303CONFIG_CMDLINE_BOOL=y 310CONFIG_CMDLINE_BOOL=y
304CONFIG_CMDLINE="console=ttySC1,38400N81 root=/dev/nfs ip=:::::eth1:autoconf rw" 311CONFIG_CMDLINE="console=ttySC1,38400N81 root=/dev/nfs ip=:::::eth1:autoconf rw"
@@ -417,6 +424,7 @@ CONFIG_NETFILTER_NETLINK=m
417CONFIG_NETFILTER_NETLINK_QUEUE=m 424CONFIG_NETFILTER_NETLINK_QUEUE=m
418CONFIG_NETFILTER_NETLINK_LOG=m 425CONFIG_NETFILTER_NETLINK_LOG=m
419# CONFIG_NF_CONNTRACK is not set 426# CONFIG_NF_CONNTRACK is not set
427# CONFIG_NETFILTER_TPROXY is not set
420CONFIG_NETFILTER_XTABLES=m 428CONFIG_NETFILTER_XTABLES=m
421CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 429CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
422# CONFIG_NETFILTER_XT_TARGET_DSCP is not set 430# CONFIG_NETFILTER_XT_TARGET_DSCP is not set
@@ -454,6 +462,7 @@ CONFIG_NETFILTER_XT_MATCH_STRING=m
454CONFIG_NETFILTER_XT_MATCH_TCPMSS=m 462CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
455# CONFIG_NETFILTER_XT_MATCH_TIME is not set 463# CONFIG_NETFILTER_XT_MATCH_TIME is not set
456# CONFIG_NETFILTER_XT_MATCH_U32 is not set 464# CONFIG_NETFILTER_XT_MATCH_U32 is not set
465# CONFIG_NETFILTER_XT_MATCH_OSF is not set
457# CONFIG_IP_VS is not set 466# CONFIG_IP_VS is not set
458 467
459# 468#
@@ -517,6 +526,7 @@ CONFIG_LLC=y
517# CONFIG_ECONET is not set 526# CONFIG_ECONET is not set
518# CONFIG_WAN_ROUTER is not set 527# CONFIG_WAN_ROUTER is not set
519# CONFIG_PHONET is not set 528# CONFIG_PHONET is not set
529# CONFIG_IEEE802154 is not set
520CONFIG_NET_SCHED=y 530CONFIG_NET_SCHED=y
521 531
522# 532#
@@ -589,7 +599,11 @@ CONFIG_WIRELESS=y
589CONFIG_WIRELESS_EXT=y 599CONFIG_WIRELESS_EXT=y
590CONFIG_WIRELESS_EXT_SYSFS=y 600CONFIG_WIRELESS_EXT_SYSFS=y
591# CONFIG_LIB80211 is not set 601# CONFIG_LIB80211 is not set
592# CONFIG_MAC80211 is not set 602
603#
604# CFG80211 needs to be enabled for MAC80211
605#
606CONFIG_MAC80211_DEFAULT_PS_VALUE=0
593# CONFIG_WIMAX is not set 607# CONFIG_WIMAX is not set
594# CONFIG_RFKILL is not set 608# CONFIG_RFKILL is not set
595# CONFIG_NET_9P is not set 609# CONFIG_NET_9P is not set
@@ -731,6 +745,7 @@ CONFIG_MISC_DEVICES=y
731# EEPROM support 745# EEPROM support
732# 746#
733# CONFIG_EEPROM_93CX6 is not set 747# CONFIG_EEPROM_93CX6 is not set
748# CONFIG_CB710_CORE is not set
734CONFIG_HAVE_IDE=y 749CONFIG_HAVE_IDE=y
735# CONFIG_IDE is not set 750# CONFIG_IDE is not set
736 751
@@ -754,10 +769,6 @@ CONFIG_BLK_DEV_SR=m
754# CONFIG_BLK_DEV_SR_VENDOR is not set 769# CONFIG_BLK_DEV_SR_VENDOR is not set
755CONFIG_CHR_DEV_SG=m 770CONFIG_CHR_DEV_SG=m
756# CONFIG_CHR_DEV_SCH is not set 771# CONFIG_CHR_DEV_SCH is not set
757
758#
759# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
760#
761# CONFIG_SCSI_MULTI_LUN is not set 772# CONFIG_SCSI_MULTI_LUN is not set
762# CONFIG_SCSI_CONSTANTS is not set 773# CONFIG_SCSI_CONSTANTS is not set
763# CONFIG_SCSI_LOGGING is not set 774# CONFIG_SCSI_LOGGING is not set
@@ -775,6 +786,7 @@ CONFIG_SCSI_WAIT_SCAN=m
775CONFIG_SCSI_LOWLEVEL=y 786CONFIG_SCSI_LOWLEVEL=y
776# CONFIG_ISCSI_TCP is not set 787# CONFIG_ISCSI_TCP is not set
777# CONFIG_SCSI_CXGB3_ISCSI is not set 788# CONFIG_SCSI_CXGB3_ISCSI is not set
789# CONFIG_SCSI_BNX2_ISCSI is not set
778# CONFIG_BLK_DEV_3W_XXXX_RAID is not set 790# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
779# CONFIG_SCSI_3W_9XXX is not set 791# CONFIG_SCSI_3W_9XXX is not set
780# CONFIG_SCSI_ACARD is not set 792# CONFIG_SCSI_ACARD is not set
@@ -783,6 +795,7 @@ CONFIG_SCSI_LOWLEVEL=y
783# CONFIG_SCSI_AIC7XXX_OLD is not set 795# CONFIG_SCSI_AIC7XXX_OLD is not set
784# CONFIG_SCSI_AIC79XX is not set 796# CONFIG_SCSI_AIC79XX is not set
785# CONFIG_SCSI_AIC94XX is not set 797# CONFIG_SCSI_AIC94XX is not set
798# CONFIG_SCSI_MVSAS is not set
786# CONFIG_SCSI_ARCMSR is not set 799# CONFIG_SCSI_ARCMSR is not set
787# CONFIG_MEGARAID_NEWGEN is not set 800# CONFIG_MEGARAID_NEWGEN is not set
788# CONFIG_MEGARAID_LEGACY is not set 801# CONFIG_MEGARAID_LEGACY is not set
@@ -797,7 +810,6 @@ CONFIG_SCSI_LOWLEVEL=y
797# CONFIG_SCSI_IPS is not set 810# CONFIG_SCSI_IPS is not set
798# CONFIG_SCSI_INITIO is not set 811# CONFIG_SCSI_INITIO is not set
799# CONFIG_SCSI_INIA100 is not set 812# CONFIG_SCSI_INIA100 is not set
800# CONFIG_SCSI_MVSAS is not set
801# CONFIG_SCSI_STEX is not set 813# CONFIG_SCSI_STEX is not set
802# CONFIG_SCSI_SYM53C8XX_2 is not set 814# CONFIG_SCSI_SYM53C8XX_2 is not set
803# CONFIG_SCSI_QLOGIC_1280 is not set 815# CONFIG_SCSI_QLOGIC_1280 is not set
@@ -826,7 +838,6 @@ CONFIG_SCSI_LOWLEVEL=y
826# CONFIG_IEEE1394 is not set 838# CONFIG_IEEE1394 is not set
827# CONFIG_I2O is not set 839# CONFIG_I2O is not set
828CONFIG_NETDEVICES=y 840CONFIG_NETDEVICES=y
829CONFIG_COMPAT_NET_DEV_OPS=y
830# CONFIG_IFB is not set 841# CONFIG_IFB is not set
831# CONFIG_DUMMY is not set 842# CONFIG_DUMMY is not set
832# CONFIG_BONDING is not set 843# CONFIG_BONDING is not set
@@ -898,6 +909,7 @@ CONFIG_8139_OLD_RX_RESET=y
898# CONFIG_SMSC9420 is not set 909# CONFIG_SMSC9420 is not set
899# CONFIG_SUNDANCE is not set 910# CONFIG_SUNDANCE is not set
900# CONFIG_TLAN is not set 911# CONFIG_TLAN is not set
912# CONFIG_KS8842 is not set
901# CONFIG_VIA_RHINE is not set 913# CONFIG_VIA_RHINE is not set
902# CONFIG_SC92031 is not set 914# CONFIG_SC92031 is not set
903# CONFIG_ATL2 is not set 915# CONFIG_ATL2 is not set
@@ -965,6 +977,7 @@ CONFIG_USB_RTL8150=m
965CONFIG_USB_USBNET=m 977CONFIG_USB_USBNET=m
966CONFIG_USB_NET_AX8817X=m 978CONFIG_USB_NET_AX8817X=m
967CONFIG_USB_NET_CDCETHER=m 979CONFIG_USB_NET_CDCETHER=m
980# CONFIG_USB_NET_CDC_EEM is not set
968# CONFIG_USB_NET_DM9601 is not set 981# CONFIG_USB_NET_DM9601 is not set
969# CONFIG_USB_NET_SMSC95XX is not set 982# CONFIG_USB_NET_SMSC95XX is not set
970# CONFIG_USB_NET_GL620A is not set 983# CONFIG_USB_NET_GL620A is not set
@@ -974,6 +987,7 @@ CONFIG_USB_NET_PLUSB=m
974# CONFIG_USB_NET_RNDIS_HOST is not set 987# CONFIG_USB_NET_RNDIS_HOST is not set
975# CONFIG_USB_NET_CDC_SUBSET is not set 988# CONFIG_USB_NET_CDC_SUBSET is not set
976CONFIG_USB_NET_ZAURUS=m 989CONFIG_USB_NET_ZAURUS=m
990# CONFIG_USB_NET_INT51X1 is not set
977# CONFIG_WAN is not set 991# CONFIG_WAN is not set
978# CONFIG_FDDI is not set 992# CONFIG_FDDI is not set
979# CONFIG_HIPPI is not set 993# CONFIG_HIPPI is not set
@@ -1130,22 +1144,7 @@ CONFIG_SSB_POSSIBLE=y
1130# CONFIG_HTC_PASIC3 is not set 1144# CONFIG_HTC_PASIC3 is not set
1131# CONFIG_MFD_TMIO is not set 1145# CONFIG_MFD_TMIO is not set
1132# CONFIG_REGULATOR is not set 1146# CONFIG_REGULATOR is not set
1133 1147# CONFIG_MEDIA_SUPPORT is not set
1134#
1135# Multimedia devices
1136#
1137
1138#
1139# Multimedia core support
1140#
1141# CONFIG_VIDEO_DEV is not set
1142# CONFIG_DVB_CORE is not set
1143# CONFIG_VIDEO_MEDIA is not set
1144
1145#
1146# Multimedia drivers
1147#
1148# CONFIG_DAB is not set
1149 1148
1150# 1149#
1151# Graphics support 1150# Graphics support
@@ -1211,6 +1210,7 @@ CONFIG_USB_MON=y
1211# USB Host Controller Drivers 1210# USB Host Controller Drivers
1212# 1211#
1213# CONFIG_USB_C67X00_HCD is not set 1212# CONFIG_USB_C67X00_HCD is not set
1213# CONFIG_USB_XHCI_HCD is not set
1214CONFIG_USB_EHCI_HCD=y 1214CONFIG_USB_EHCI_HCD=y
1215CONFIG_USB_EHCI_ROOT_HUB_TT=y 1215CONFIG_USB_EHCI_ROOT_HUB_TT=y
1216CONFIG_USB_EHCI_TT_NEWSCHED=y 1216CONFIG_USB_EHCI_TT_NEWSCHED=y
@@ -1350,7 +1350,7 @@ CONFIG_USB_SERIAL_PL2303=m
1350# CONFIG_NEW_LEDS is not set 1350# CONFIG_NEW_LEDS is not set
1351# CONFIG_ACCESSIBILITY is not set 1351# CONFIG_ACCESSIBILITY is not set
1352# CONFIG_INFINIBAND is not set 1352# CONFIG_INFINIBAND is not set
1353CONFIG_RTC_LIB=m 1353CONFIG_RTC_LIB=y
1354CONFIG_RTC_CLASS=m 1354CONFIG_RTC_CLASS=m
1355 1355
1356# 1356#
@@ -1384,9 +1384,14 @@ CONFIG_RTC_INTF_DEV=y
1384# on-CPU RTC drivers 1384# on-CPU RTC drivers
1385# 1385#
1386CONFIG_RTC_DRV_SH=m 1386CONFIG_RTC_DRV_SH=m
1387# CONFIG_RTC_DRV_GENERIC is not set
1387# CONFIG_DMADEVICES is not set 1388# CONFIG_DMADEVICES is not set
1388# CONFIG_AUXDISPLAY is not set 1389# CONFIG_AUXDISPLAY is not set
1389# CONFIG_UIO is not set 1390# CONFIG_UIO is not set
1391
1392#
1393# TI VLYNQ
1394#
1390# CONFIG_STAGING is not set 1395# CONFIG_STAGING is not set
1391 1396
1392# 1397#
@@ -1406,7 +1411,6 @@ CONFIG_REISERFS_FS=m
1406# CONFIG_REISERFS_FS_XATTR is not set 1411# CONFIG_REISERFS_FS_XATTR is not set
1407# CONFIG_JFS_FS is not set 1412# CONFIG_JFS_FS is not set
1408# CONFIG_FS_POSIX_ACL is not set 1413# CONFIG_FS_POSIX_ACL is not set
1409CONFIG_FILE_LOCKING=y
1410CONFIG_XFS_FS=m 1414CONFIG_XFS_FS=m
1411# CONFIG_XFS_QUOTA is not set 1415# CONFIG_XFS_QUOTA is not set
1412# CONFIG_XFS_POSIX_ACL is not set 1416# CONFIG_XFS_POSIX_ACL is not set
@@ -1414,6 +1418,8 @@ CONFIG_XFS_FS=m
1414# CONFIG_XFS_DEBUG is not set 1418# CONFIG_XFS_DEBUG is not set
1415# CONFIG_OCFS2_FS is not set 1419# CONFIG_OCFS2_FS is not set
1416# CONFIG_BTRFS_FS is not set 1420# CONFIG_BTRFS_FS is not set
1421CONFIG_FILE_LOCKING=y
1422CONFIG_FSNOTIFY=y
1417CONFIG_DNOTIFY=y 1423CONFIG_DNOTIFY=y
1418CONFIG_INOTIFY=y 1424CONFIG_INOTIFY=y
1419CONFIG_INOTIFY_USER=y 1425CONFIG_INOTIFY_USER=y
@@ -1421,6 +1427,7 @@ CONFIG_INOTIFY_USER=y
1421# CONFIG_AUTOFS_FS is not set 1427# CONFIG_AUTOFS_FS is not set
1422# CONFIG_AUTOFS4_FS is not set 1428# CONFIG_AUTOFS4_FS is not set
1423CONFIG_FUSE_FS=m 1429CONFIG_FUSE_FS=m
1430# CONFIG_CUSE is not set
1424 1431
1425# 1432#
1426# Caches 1433# Caches
@@ -1533,7 +1540,7 @@ CONFIG_MSDOS_PARTITION=y
1533# CONFIG_KARMA_PARTITION is not set 1540# CONFIG_KARMA_PARTITION is not set
1534# CONFIG_EFI_PARTITION is not set 1541# CONFIG_EFI_PARTITION is not set
1535# CONFIG_SYSV68_PARTITION is not set 1542# CONFIG_SYSV68_PARTITION is not set
1536CONFIG_NLS=m 1543CONFIG_NLS=y
1537CONFIG_NLS_DEFAULT="iso8859-1" 1544CONFIG_NLS_DEFAULT="iso8859-1"
1538CONFIG_NLS_CODEPAGE_437=m 1545CONFIG_NLS_CODEPAGE_437=m
1539# CONFIG_NLS_CODEPAGE_737 is not set 1546# CONFIG_NLS_CODEPAGE_737 is not set
@@ -1626,17 +1633,15 @@ CONFIG_HAVE_FUNCTION_TRACER=y
1626CONFIG_HAVE_DYNAMIC_FTRACE=y 1633CONFIG_HAVE_DYNAMIC_FTRACE=y
1627CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 1634CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1628CONFIG_TRACING_SUPPORT=y 1635CONFIG_TRACING_SUPPORT=y
1629 1636CONFIG_FTRACE=y
1630#
1631# Tracers
1632#
1633# CONFIG_FUNCTION_TRACER is not set 1637# CONFIG_FUNCTION_TRACER is not set
1634# CONFIG_IRQSOFF_TRACER is not set 1638# CONFIG_IRQSOFF_TRACER is not set
1635# CONFIG_SCHED_TRACER is not set 1639# CONFIG_SCHED_TRACER is not set
1636# CONFIG_CONTEXT_SWITCH_TRACER is not set 1640# CONFIG_ENABLE_DEFAULT_TRACERS is not set
1637# CONFIG_EVENT_TRACER is not set
1638# CONFIG_BOOT_TRACER is not set 1641# CONFIG_BOOT_TRACER is not set
1639# CONFIG_TRACE_BRANCH_PROFILING is not set 1642CONFIG_BRANCH_PROFILE_NONE=y
1643# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
1644# CONFIG_PROFILE_ALL_BRANCHES is not set
1640# CONFIG_STACK_TRACER is not set 1645# CONFIG_STACK_TRACER is not set
1641# CONFIG_KMEMTRACE is not set 1646# CONFIG_KMEMTRACE is not set
1642# CONFIG_WORKQUEUE_TRACER is not set 1647# CONFIG_WORKQUEUE_TRACER is not set
@@ -1645,16 +1650,15 @@ CONFIG_TRACING_SUPPORT=y
1645# CONFIG_SAMPLES is not set 1650# CONFIG_SAMPLES is not set
1646CONFIG_HAVE_ARCH_KGDB=y 1651CONFIG_HAVE_ARCH_KGDB=y
1647# CONFIG_KGDB is not set 1652# CONFIG_KGDB is not set
1653# CONFIG_KMEMCHECK is not set
1648# CONFIG_SH_STANDARD_BIOS is not set 1654# CONFIG_SH_STANDARD_BIOS is not set
1649# CONFIG_EARLY_SCIF_CONSOLE is not set 1655# CONFIG_EARLY_SCIF_CONSOLE is not set
1650# CONFIG_DEBUG_BOOTMEM is not set 1656# CONFIG_DEBUG_BOOTMEM is not set
1651# CONFIG_DEBUG_STACKOVERFLOW is not set 1657# CONFIG_DEBUG_STACKOVERFLOW is not set
1652# CONFIG_DEBUG_STACK_USAGE is not set 1658# CONFIG_DEBUG_STACK_USAGE is not set
1653# CONFIG_4KSTACKS is not set 1659# CONFIG_4KSTACKS is not set
1654# CONFIG_IRQSTACKS is not set
1655# CONFIG_DUMP_CODE is not set 1660# CONFIG_DUMP_CODE is not set
1656# CONFIG_SH_NO_BSS_INIT is not set 1661# CONFIG_SH_NO_BSS_INIT is not set
1657# CONFIG_MORE_COMPILE_OPTIONS is not set
1658 1662
1659# 1663#
1660# Security options 1664# Security options
@@ -1787,3 +1791,4 @@ CONFIG_HAS_IOMEM=y
1787CONFIG_HAS_IOPORT=y 1791CONFIG_HAS_IOPORT=y
1788CONFIG_HAS_DMA=y 1792CONFIG_HAS_DMA=y
1789CONFIG_NLATTR=y 1793CONFIG_NLATTR=y
1794CONFIG_GENERIC_ATOMIC64=y
diff --git a/arch/sh/configs/ul2_defconfig b/arch/sh/configs/ul2_defconfig
index bfb4d9806892..608fe563614c 100644
--- a/arch/sh/configs/ul2_defconfig
+++ b/arch/sh/configs/ul2_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.30-rc3 3# Linux kernel version: 2.6.30
4# Mon Apr 27 13:17:05 2009 4# Thu Jun 18 13:14:36 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -21,6 +21,7 @@ CONFIG_ARCH_SUSPEND_POSSIBLE=y
21CONFIG_ARCH_HIBERNATION_POSSIBLE=y 21CONFIG_ARCH_HIBERNATION_POSSIBLE=y
22CONFIG_SYS_SUPPORTS_NUMA=y 22CONFIG_SYS_SUPPORTS_NUMA=y
23CONFIG_SYS_SUPPORTS_CMT=y 23CONFIG_SYS_SUPPORTS_CMT=y
24CONFIG_SYS_SUPPORTS_TMU=y
24CONFIG_STACKTRACE_SUPPORT=y 25CONFIG_STACKTRACE_SUPPORT=y
25CONFIG_LOCKDEP_SUPPORT=y 26CONFIG_LOCKDEP_SUPPORT=y
26CONFIG_HAVE_LATENCYTOP_SUPPORT=y 27CONFIG_HAVE_LATENCYTOP_SUPPORT=y
@@ -78,7 +79,6 @@ CONFIG_UID16=y
78CONFIG_SYSCTL_SYSCALL=y 79CONFIG_SYSCTL_SYSCALL=y
79CONFIG_KALLSYMS=y 80CONFIG_KALLSYMS=y
80# CONFIG_KALLSYMS_EXTRA_PASS is not set 81# CONFIG_KALLSYMS_EXTRA_PASS is not set
81# CONFIG_STRIP_ASM_SYMS is not set
82CONFIG_HOTPLUG=y 82CONFIG_HOTPLUG=y
83CONFIG_PRINTK=y 83CONFIG_PRINTK=y
84CONFIG_BUG=y 84CONFIG_BUG=y
@@ -91,8 +91,13 @@ CONFIG_TIMERFD=y
91CONFIG_EVENTFD=y 91CONFIG_EVENTFD=y
92CONFIG_SHMEM=y 92CONFIG_SHMEM=y
93CONFIG_AIO=y 93CONFIG_AIO=y
94
95#
96# Performance Counters
97#
94CONFIG_VM_EVENT_COUNTERS=y 98CONFIG_VM_EVENT_COUNTERS=y
95CONFIG_SLUB_DEBUG=y 99CONFIG_SLUB_DEBUG=y
100# CONFIG_STRIP_ASM_SYMS is not set
96CONFIG_COMPAT_BRK=y 101CONFIG_COMPAT_BRK=y
97# CONFIG_SLAB is not set 102# CONFIG_SLAB is not set
98CONFIG_SLUB=y 103CONFIG_SLUB=y
@@ -187,6 +192,7 @@ CONFIG_CPU_SUBTYPE_SH7366=y
187CONFIG_QUICKLIST=y 192CONFIG_QUICKLIST=y
188CONFIG_MMU=y 193CONFIG_MMU=y
189CONFIG_PAGE_OFFSET=0x80000000 194CONFIG_PAGE_OFFSET=0x80000000
195CONFIG_FORCE_MAX_ZONEORDER=11
190CONFIG_MEMORY_START=0x08000000 196CONFIG_MEMORY_START=0x08000000
191CONFIG_MEMORY_SIZE=0x01f00000 197CONFIG_MEMORY_SIZE=0x01f00000
192CONFIG_29BIT=y 198CONFIG_29BIT=y
@@ -205,7 +211,6 @@ CONFIG_PAGE_SIZE_4KB=y
205# CONFIG_PAGE_SIZE_8KB is not set 211# CONFIG_PAGE_SIZE_8KB is not set
206# CONFIG_PAGE_SIZE_16KB is not set 212# CONFIG_PAGE_SIZE_16KB is not set
207# CONFIG_PAGE_SIZE_64KB is not set 213# CONFIG_PAGE_SIZE_64KB is not set
208CONFIG_ENTRY_OFFSET=0x00001000
209CONFIG_HUGETLB_PAGE_SIZE_64K=y 214CONFIG_HUGETLB_PAGE_SIZE_64K=y
210# CONFIG_HUGETLB_PAGE_SIZE_256K is not set 215# CONFIG_HUGETLB_PAGE_SIZE_256K is not set
211# CONFIG_HUGETLB_PAGE_SIZE_1MB is not set 216# CONFIG_HUGETLB_PAGE_SIZE_1MB is not set
@@ -226,9 +231,9 @@ CONFIG_SPLIT_PTLOCK_CPUS=4
226# CONFIG_PHYS_ADDR_T_64BIT is not set 231# CONFIG_PHYS_ADDR_T_64BIT is not set
227CONFIG_ZONE_DMA_FLAG=0 232CONFIG_ZONE_DMA_FLAG=0
228CONFIG_NR_QUICK=2 233CONFIG_NR_QUICK=2
229CONFIG_UNEVICTABLE_LRU=y
230CONFIG_HAVE_MLOCK=y 234CONFIG_HAVE_MLOCK=y
231CONFIG_HAVE_MLOCKED_PAGE_BIT=y 235CONFIG_HAVE_MLOCKED_PAGE_BIT=y
236CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
232 237
233# 238#
234# Cache configuration 239# Cache configuration
@@ -247,7 +252,6 @@ CONFIG_CPU_LITTLE_ENDIAN=y
247# CONFIG_SH_STORE_QUEUES is not set 252# CONFIG_SH_STORE_QUEUES is not set
248CONFIG_CPU_HAS_INTEVT=y 253CONFIG_CPU_HAS_INTEVT=y
249CONFIG_CPU_HAS_SR_RB=y 254CONFIG_CPU_HAS_SR_RB=y
250CONFIG_CPU_HAS_PTEA=y
251CONFIG_CPU_HAS_DSP=y 255CONFIG_CPU_HAS_DSP=y
252 256
253# 257#
@@ -257,10 +261,10 @@ CONFIG_CPU_HAS_DSP=y
257# 261#
258# Timer and clock configuration 262# Timer and clock configuration
259# 263#
260CONFIG_SH_TMU=y 264CONFIG_SH_TIMER_TMU=y
261# CONFIG_SH_TIMER_CMT is not set 265# CONFIG_SH_TIMER_CMT is not set
262CONFIG_SH_TIMER_IRQ=16
263CONFIG_SH_PCLK_FREQ=33333333 266CONFIG_SH_PCLK_FREQ=33333333
267CONFIG_SH_CLK_CPG=y
264CONFIG_TICK_ONESHOT=y 268CONFIG_TICK_ONESHOT=y
265# CONFIG_NO_HZ is not set 269# CONFIG_NO_HZ is not set
266CONFIG_HIGH_RES_TIMERS=y 270CONFIG_HIGH_RES_TIMERS=y
@@ -302,12 +306,14 @@ CONFIG_KEXEC=y
302# CONFIG_PREEMPT_VOLUNTARY is not set 306# CONFIG_PREEMPT_VOLUNTARY is not set
303CONFIG_PREEMPT=y 307CONFIG_PREEMPT=y
304CONFIG_GUSA=y 308CONFIG_GUSA=y
309# CONFIG_SPARSE_IRQ is not set
305 310
306# 311#
307# Boot options 312# Boot options
308# 313#
309CONFIG_ZERO_PAGE_OFFSET=0x00001000 314CONFIG_ZERO_PAGE_OFFSET=0x00001000
310CONFIG_BOOT_LINK_OFFSET=0x00800000 315CONFIG_BOOT_LINK_OFFSET=0x00800000
316CONFIG_ENTRY_OFFSET=0x00001000
311CONFIG_CMDLINE_BOOL=y 317CONFIG_CMDLINE_BOOL=y
312CONFIG_CMDLINE="console=ttySC0,115200 root=/dev/nfs ip=dhcp" 318CONFIG_CMDLINE="console=ttySC0,115200 root=/dev/nfs ip=dhcp"
313 319
@@ -390,6 +396,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
390# CONFIG_ECONET is not set 396# CONFIG_ECONET is not set
391# CONFIG_WAN_ROUTER is not set 397# CONFIG_WAN_ROUTER is not set
392# CONFIG_PHONET is not set 398# CONFIG_PHONET is not set
399# CONFIG_IEEE802154 is not set
393# CONFIG_NET_SCHED is not set 400# CONFIG_NET_SCHED is not set
394# CONFIG_DCB is not set 401# CONFIG_DCB is not set
395 402
@@ -411,6 +418,8 @@ CONFIG_WIRELESS_EXT_SYSFS=y
411CONFIG_LIB80211=m 418CONFIG_LIB80211=m
412# CONFIG_LIB80211_DEBUG is not set 419# CONFIG_LIB80211_DEBUG is not set
413CONFIG_MAC80211=y 420CONFIG_MAC80211=y
421CONFIG_MAC80211_DEFAULT_PS=y
422CONFIG_MAC80211_DEFAULT_PS_VALUE=1
414 423
415# 424#
416# Rate control algorithm selection 425# Rate control algorithm selection
@@ -565,10 +574,6 @@ CONFIG_BLK_DEV_SD=y
565# CONFIG_BLK_DEV_SR is not set 574# CONFIG_BLK_DEV_SR is not set
566# CONFIG_CHR_DEV_SG is not set 575# CONFIG_CHR_DEV_SG is not set
567# CONFIG_CHR_DEV_SCH is not set 576# CONFIG_CHR_DEV_SCH is not set
568
569#
570# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
571#
572# CONFIG_SCSI_MULTI_LUN is not set 577# CONFIG_SCSI_MULTI_LUN is not set
573# CONFIG_SCSI_CONSTANTS is not set 578# CONFIG_SCSI_CONSTANTS is not set
574# CONFIG_SCSI_LOGGING is not set 579# CONFIG_SCSI_LOGGING is not set
@@ -585,6 +590,7 @@ CONFIG_SCSI_WAIT_SCAN=m
585# CONFIG_SCSI_SRP_ATTRS is not set 590# CONFIG_SCSI_SRP_ATTRS is not set
586CONFIG_SCSI_LOWLEVEL=y 591CONFIG_SCSI_LOWLEVEL=y
587# CONFIG_ISCSI_TCP is not set 592# CONFIG_ISCSI_TCP is not set
593# CONFIG_SCSI_BNX2_ISCSI is not set
588# CONFIG_LIBFC is not set 594# CONFIG_LIBFC is not set
589# CONFIG_LIBFCOE is not set 595# CONFIG_LIBFCOE is not set
590# CONFIG_SCSI_DEBUG is not set 596# CONFIG_SCSI_DEBUG is not set
@@ -598,7 +604,6 @@ CONFIG_ATA_SFF=y
598CONFIG_PATA_PLATFORM=y 604CONFIG_PATA_PLATFORM=y
599# CONFIG_MD is not set 605# CONFIG_MD is not set
600CONFIG_NETDEVICES=y 606CONFIG_NETDEVICES=y
601CONFIG_COMPAT_NET_DEV_OPS=y
602# CONFIG_DUMMY is not set 607# CONFIG_DUMMY is not set
603# CONFIG_BONDING is not set 608# CONFIG_BONDING is not set
604# CONFIG_MACVLAN is not set 609# CONFIG_MACVLAN is not set
@@ -623,6 +628,7 @@ CONFIG_MII=y
623# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set 628# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
624# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set 629# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
625# CONFIG_B44 is not set 630# CONFIG_B44 is not set
631# CONFIG_KS8842 is not set
626# CONFIG_NETDEV_1000 is not set 632# CONFIG_NETDEV_1000 is not set
627# CONFIG_NETDEV_10000 is not set 633# CONFIG_NETDEV_10000 is not set
628 634
@@ -648,6 +654,7 @@ CONFIG_LIBERTAS_DEBUG=y
648# CONFIG_B43LEGACY is not set 654# CONFIG_B43LEGACY is not set
649# CONFIG_ZD1211RW is not set 655# CONFIG_ZD1211RW is not set
650# CONFIG_RT2X00 is not set 656# CONFIG_RT2X00 is not set
657# CONFIG_IWM is not set
651 658
652# 659#
653# Enable WiMAX (Networking options) to see the WiMAX drivers 660# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -663,6 +670,7 @@ CONFIG_LIBERTAS_DEBUG=y
663CONFIG_USB_USBNET=y 670CONFIG_USB_USBNET=y
664CONFIG_USB_NET_AX8817X=y 671CONFIG_USB_NET_AX8817X=y
665CONFIG_USB_NET_CDCETHER=y 672CONFIG_USB_NET_CDCETHER=y
673# CONFIG_USB_NET_CDC_EEM is not set
666# CONFIG_USB_NET_DM9601 is not set 674# CONFIG_USB_NET_DM9601 is not set
667# CONFIG_USB_NET_SMSC95XX is not set 675# CONFIG_USB_NET_SMSC95XX is not set
668# CONFIG_USB_NET_GL620A is not set 676# CONFIG_USB_NET_GL620A is not set
@@ -672,6 +680,7 @@ CONFIG_USB_NET_CDCETHER=y
672# CONFIG_USB_NET_RNDIS_HOST is not set 680# CONFIG_USB_NET_RNDIS_HOST is not set
673# CONFIG_USB_NET_CDC_SUBSET is not set 681# CONFIG_USB_NET_CDC_SUBSET is not set
674# CONFIG_USB_NET_ZAURUS is not set 682# CONFIG_USB_NET_ZAURUS is not set
683# CONFIG_USB_NET_INT51X1 is not set
675# CONFIG_WAN is not set 684# CONFIG_WAN is not set
676# CONFIG_PPP is not set 685# CONFIG_PPP is not set
677# CONFIG_SLIP is not set 686# CONFIG_SLIP is not set
@@ -774,22 +783,7 @@ CONFIG_SSB_POSSIBLE=y
774# CONFIG_HTC_PASIC3 is not set 783# CONFIG_HTC_PASIC3 is not set
775# CONFIG_MFD_TMIO is not set 784# CONFIG_MFD_TMIO is not set
776# CONFIG_REGULATOR is not set 785# CONFIG_REGULATOR is not set
777 786# CONFIG_MEDIA_SUPPORT is not set
778#
779# Multimedia devices
780#
781
782#
783# Multimedia core support
784#
785# CONFIG_VIDEO_DEV is not set
786# CONFIG_DVB_CORE is not set
787# CONFIG_VIDEO_MEDIA is not set
788
789#
790# Multimedia drivers
791#
792# CONFIG_DAB is not set
793 787
794# 788#
795# Graphics support 789# Graphics support
@@ -926,10 +920,15 @@ CONFIG_MMC_BLOCK_BOUNCE=y
926# CONFIG_MEMSTICK is not set 920# CONFIG_MEMSTICK is not set
927# CONFIG_NEW_LEDS is not set 921# CONFIG_NEW_LEDS is not set
928# CONFIG_ACCESSIBILITY is not set 922# CONFIG_ACCESSIBILITY is not set
923CONFIG_RTC_LIB=y
929# CONFIG_RTC_CLASS is not set 924# CONFIG_RTC_CLASS is not set
930# CONFIG_DMADEVICES is not set 925# CONFIG_DMADEVICES is not set
931# CONFIG_AUXDISPLAY is not set 926# CONFIG_AUXDISPLAY is not set
932# CONFIG_UIO is not set 927# CONFIG_UIO is not set
928
929#
930# TI VLYNQ
931#
933# CONFIG_STAGING is not set 932# CONFIG_STAGING is not set
934 933
935# 934#
@@ -949,10 +948,11 @@ CONFIG_FS_MBCACHE=y
949# CONFIG_REISERFS_FS is not set 948# CONFIG_REISERFS_FS is not set
950# CONFIG_JFS_FS is not set 949# CONFIG_JFS_FS is not set
951# CONFIG_FS_POSIX_ACL is not set 950# CONFIG_FS_POSIX_ACL is not set
952CONFIG_FILE_LOCKING=y
953# CONFIG_XFS_FS is not set 951# CONFIG_XFS_FS is not set
954# CONFIG_OCFS2_FS is not set 952# CONFIG_OCFS2_FS is not set
955# CONFIG_BTRFS_FS is not set 953# CONFIG_BTRFS_FS is not set
954CONFIG_FILE_LOCKING=y
955CONFIG_FSNOTIFY=y
956CONFIG_DNOTIFY=y 956CONFIG_DNOTIFY=y
957CONFIG_INOTIFY=y 957CONFIG_INOTIFY=y
958CONFIG_INOTIFY_USER=y 958CONFIG_INOTIFY_USER=y
@@ -1106,28 +1106,12 @@ CONFIG_HAVE_FUNCTION_TRACER=y
1106CONFIG_HAVE_DYNAMIC_FTRACE=y 1106CONFIG_HAVE_DYNAMIC_FTRACE=y
1107CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 1107CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1108CONFIG_TRACING_SUPPORT=y 1108CONFIG_TRACING_SUPPORT=y
1109 1109# CONFIG_FTRACE is not set
1110#
1111# Tracers
1112#
1113# CONFIG_FUNCTION_TRACER is not set
1114# CONFIG_IRQSOFF_TRACER is not set
1115# CONFIG_PREEMPT_TRACER is not set
1116# CONFIG_SCHED_TRACER is not set
1117# CONFIG_CONTEXT_SWITCH_TRACER is not set
1118# CONFIG_EVENT_TRACER is not set
1119# CONFIG_BOOT_TRACER is not set
1120# CONFIG_TRACE_BRANCH_PROFILING is not set
1121# CONFIG_STACK_TRACER is not set
1122# CONFIG_KMEMTRACE is not set
1123# CONFIG_WORKQUEUE_TRACER is not set
1124# CONFIG_BLK_DEV_IO_TRACE is not set
1125# CONFIG_DMA_API_DEBUG is not set 1110# CONFIG_DMA_API_DEBUG is not set
1126# CONFIG_SAMPLES is not set 1111# CONFIG_SAMPLES is not set
1127CONFIG_HAVE_ARCH_KGDB=y 1112CONFIG_HAVE_ARCH_KGDB=y
1128# CONFIG_SH_STANDARD_BIOS is not set 1113# CONFIG_SH_STANDARD_BIOS is not set
1129# CONFIG_EARLY_SCIF_CONSOLE is not set 1114# CONFIG_EARLY_SCIF_CONSOLE is not set
1130# CONFIG_MORE_COMPILE_OPTIONS is not set
1131 1115
1132# 1116#
1133# Security options 1117# Security options
@@ -1252,3 +1236,4 @@ CONFIG_HAS_IOMEM=y
1252CONFIG_HAS_IOPORT=y 1236CONFIG_HAS_IOPORT=y
1253CONFIG_HAS_DMA=y 1237CONFIG_HAS_DMA=y
1254CONFIG_NLATTR=y 1238CONFIG_NLATTR=y
1239CONFIG_GENERIC_ATOMIC64=y
diff --git a/arch/sh/configs/urquell_defconfig b/arch/sh/configs/urquell_defconfig
index 512664fed66c..ee1987e6cc59 100644
--- a/arch/sh/configs/urquell_defconfig
+++ b/arch/sh/configs/urquell_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.30-rc3 3# Linux kernel version: 2.6.30
4# Mon Apr 27 14:02:55 2009 4# Thu Jun 18 13:15:28 2009
5# 5#
6CONFIG_SUPERH=y 6CONFIG_SUPERH=y
7CONFIG_SUPERH32=y 7CONFIG_SUPERH32=y
@@ -20,6 +20,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y
20# CONFIG_ARCH_SUSPEND_POSSIBLE is not set 20# CONFIG_ARCH_SUSPEND_POSSIBLE is not set
21CONFIG_ARCH_HIBERNATION_POSSIBLE=y 21CONFIG_ARCH_HIBERNATION_POSSIBLE=y
22CONFIG_SYS_SUPPORTS_NUMA=y 22CONFIG_SYS_SUPPORTS_NUMA=y
23CONFIG_SYS_SUPPORTS_PCI=y
24CONFIG_SYS_SUPPORTS_TMU=y
23CONFIG_STACKTRACE_SUPPORT=y 25CONFIG_STACKTRACE_SUPPORT=y
24CONFIG_LOCKDEP_SUPPORT=y 26CONFIG_LOCKDEP_SUPPORT=y
25CONFIG_HAVE_LATENCYTOP_SUPPORT=y 27CONFIG_HAVE_LATENCYTOP_SUPPORT=y
@@ -34,25 +36,30 @@ CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
34# 36#
35CONFIG_EXPERIMENTAL=y 37CONFIG_EXPERIMENTAL=y
36CONFIG_BROKEN_ON_SMP=y 38CONFIG_BROKEN_ON_SMP=y
37CONFIG_LOCK_KERNEL=y
38CONFIG_INIT_ENV_ARG_LIMIT=32 39CONFIG_INIT_ENV_ARG_LIMIT=32
39CONFIG_LOCALVERSION="" 40CONFIG_LOCALVERSION=""
40CONFIG_LOCALVERSION_AUTO=y 41CONFIG_LOCALVERSION_AUTO=y
41CONFIG_SWAP=y 42CONFIG_SWAP=y
42CONFIG_SYSVIPC=y 43CONFIG_SYSVIPC=y
43CONFIG_SYSVIPC_SYSCTL=y 44CONFIG_SYSVIPC_SYSCTL=y
44# CONFIG_POSIX_MQUEUE is not set 45CONFIG_POSIX_MQUEUE=y
46CONFIG_POSIX_MQUEUE_SYSCTL=y
45CONFIG_BSD_PROCESS_ACCT=y 47CONFIG_BSD_PROCESS_ACCT=y
46# CONFIG_BSD_PROCESS_ACCT_V3 is not set 48# CONFIG_BSD_PROCESS_ACCT_V3 is not set
47# CONFIG_TASKSTATS is not set 49# CONFIG_TASKSTATS is not set
48# CONFIG_AUDIT is not set 50CONFIG_AUDIT=y
51CONFIG_AUDITSYSCALL=y
52CONFIG_AUDIT_TREE=y
49 53
50# 54#
51# RCU Subsystem 55# RCU Subsystem
52# 56#
53CONFIG_CLASSIC_RCU=y 57# CONFIG_CLASSIC_RCU is not set
54# CONFIG_TREE_RCU is not set 58CONFIG_TREE_RCU=y
55# CONFIG_PREEMPT_RCU is not set 59# CONFIG_PREEMPT_RCU is not set
60# CONFIG_RCU_TRACE is not set
61CONFIG_RCU_FANOUT=32
62# CONFIG_RCU_FANOUT_EXACT is not set
56# CONFIG_TREE_RCU_TRACE is not set 63# CONFIG_TREE_RCU_TRACE is not set
57# CONFIG_PREEMPT_RCU_TRACE is not set 64# CONFIG_PREEMPT_RCU_TRACE is not set
58CONFIG_IKCONFIG=y 65CONFIG_IKCONFIG=y
@@ -60,15 +67,29 @@ CONFIG_IKCONFIG_PROC=y
60CONFIG_LOG_BUF_SHIFT=14 67CONFIG_LOG_BUF_SHIFT=14
61CONFIG_GROUP_SCHED=y 68CONFIG_GROUP_SCHED=y
62CONFIG_FAIR_GROUP_SCHED=y 69CONFIG_FAIR_GROUP_SCHED=y
63# CONFIG_RT_GROUP_SCHED is not set 70CONFIG_RT_GROUP_SCHED=y
64CONFIG_USER_SCHED=y 71# CONFIG_USER_SCHED is not set
65# CONFIG_CGROUP_SCHED is not set 72CONFIG_CGROUP_SCHED=y
66# CONFIG_CGROUPS is not set 73CONFIG_CGROUPS=y
67CONFIG_SYSFS_DEPRECATED=y 74CONFIG_CGROUP_DEBUG=y
68CONFIG_SYSFS_DEPRECATED_V2=y 75CONFIG_CGROUP_NS=y
76CONFIG_CGROUP_FREEZER=y
77CONFIG_CGROUP_DEVICE=y
78CONFIG_CPUSETS=y
79# CONFIG_PROC_PID_CPUSET is not set
80CONFIG_CGROUP_CPUACCT=y
81CONFIG_RESOURCE_COUNTERS=y
82CONFIG_CGROUP_MEM_RES_CTLR=y
83CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
84CONFIG_MM_OWNER=y
85# CONFIG_SYSFS_DEPRECATED_V2 is not set
69# CONFIG_RELAY is not set 86# CONFIG_RELAY is not set
70# CONFIG_NAMESPACES is not set 87# CONFIG_NAMESPACES is not set
71# CONFIG_BLK_DEV_INITRD is not set 88CONFIG_BLK_DEV_INITRD=y
89CONFIG_INITRAMFS_SOURCE=""
90CONFIG_RD_GZIP=y
91# CONFIG_RD_BZIP2 is not set
92# CONFIG_RD_LZMA is not set
72CONFIG_CC_OPTIMIZE_FOR_SIZE=y 93CONFIG_CC_OPTIMIZE_FOR_SIZE=y
73CONFIG_SYSCTL=y 94CONFIG_SYSCTL=y
74CONFIG_ANON_INODES=y 95CONFIG_ANON_INODES=y
@@ -76,8 +97,8 @@ CONFIG_EMBEDDED=y
76CONFIG_UID16=y 97CONFIG_UID16=y
77CONFIG_SYSCTL_SYSCALL=y 98CONFIG_SYSCTL_SYSCALL=y
78CONFIG_KALLSYMS=y 99CONFIG_KALLSYMS=y
100# CONFIG_KALLSYMS_ALL is not set
79# CONFIG_KALLSYMS_EXTRA_PASS is not set 101# CONFIG_KALLSYMS_EXTRA_PASS is not set
80# CONFIG_STRIP_ASM_SYMS is not set
81CONFIG_HOTPLUG=y 102CONFIG_HOTPLUG=y
82CONFIG_PRINTK=y 103CONFIG_PRINTK=y
83CONFIG_BUG=y 104CONFIG_BUG=y
@@ -90,13 +111,20 @@ CONFIG_TIMERFD=y
90CONFIG_EVENTFD=y 111CONFIG_EVENTFD=y
91CONFIG_SHMEM=y 112CONFIG_SHMEM=y
92CONFIG_AIO=y 113CONFIG_AIO=y
114
115#
116# Performance Counters
117#
93CONFIG_VM_EVENT_COUNTERS=y 118CONFIG_VM_EVENT_COUNTERS=y
119CONFIG_PCI_QUIRKS=y
120# CONFIG_STRIP_ASM_SYMS is not set
94CONFIG_COMPAT_BRK=y 121CONFIG_COMPAT_BRK=y
95CONFIG_SLAB=y 122CONFIG_SLAB=y
96# CONFIG_SLUB is not set 123# CONFIG_SLUB is not set
97# CONFIG_SLOB is not set 124# CONFIG_SLOB is not set
98CONFIG_PROFILING=y 125CONFIG_PROFILING=y
99# CONFIG_MARKERS is not set 126CONFIG_TRACEPOINTS=y
127CONFIG_MARKERS=y
100# CONFIG_OPROFILE is not set 128# CONFIG_OPROFILE is not set
101CONFIG_HAVE_OPROFILE=y 129CONFIG_HAVE_OPROFILE=y
102# CONFIG_KPROBES is not set 130# CONFIG_KPROBES is not set
@@ -129,12 +157,12 @@ CONFIG_IOSCHED_NOOP=y
129CONFIG_IOSCHED_AS=y 157CONFIG_IOSCHED_AS=y
130CONFIG_IOSCHED_DEADLINE=y 158CONFIG_IOSCHED_DEADLINE=y
131CONFIG_IOSCHED_CFQ=y 159CONFIG_IOSCHED_CFQ=y
132# CONFIG_DEFAULT_AS is not set 160CONFIG_DEFAULT_AS=y
133# CONFIG_DEFAULT_DEADLINE is not set 161# CONFIG_DEFAULT_DEADLINE is not set
134CONFIG_DEFAULT_CFQ=y 162# CONFIG_DEFAULT_CFQ is not set
135# CONFIG_DEFAULT_NOOP is not set 163# CONFIG_DEFAULT_NOOP is not set
136CONFIG_DEFAULT_IOSCHED="cfq" 164CONFIG_DEFAULT_IOSCHED="anticipatory"
137# CONFIG_FREEZER is not set 165CONFIG_FREEZER=y
138 166
139# 167#
140# System type 168# System type
@@ -183,6 +211,7 @@ CONFIG_CPU_SUBTYPE_SH7786=y
183CONFIG_QUICKLIST=y 211CONFIG_QUICKLIST=y
184CONFIG_MMU=y 212CONFIG_MMU=y
185CONFIG_PAGE_OFFSET=0x80000000 213CONFIG_PAGE_OFFSET=0x80000000
214CONFIG_FORCE_MAX_ZONEORDER=11
186CONFIG_MEMORY_START=0x08000000 215CONFIG_MEMORY_START=0x08000000
187CONFIG_MEMORY_SIZE=0x08000000 216CONFIG_MEMORY_SIZE=0x08000000
188CONFIG_29BIT=y 217CONFIG_29BIT=y
@@ -201,7 +230,12 @@ CONFIG_PAGE_SIZE_4KB=y
201# CONFIG_PAGE_SIZE_8KB is not set 230# CONFIG_PAGE_SIZE_8KB is not set
202# CONFIG_PAGE_SIZE_16KB is not set 231# CONFIG_PAGE_SIZE_16KB is not set
203# CONFIG_PAGE_SIZE_64KB is not set 232# CONFIG_PAGE_SIZE_64KB is not set
204CONFIG_ENTRY_OFFSET=0x00001000 233CONFIG_HUGETLB_PAGE_SIZE_64K=y
234# CONFIG_HUGETLB_PAGE_SIZE_256K is not set
235# CONFIG_HUGETLB_PAGE_SIZE_1MB is not set
236# CONFIG_HUGETLB_PAGE_SIZE_4MB is not set
237# CONFIG_HUGETLB_PAGE_SIZE_64MB is not set
238# CONFIG_HUGETLB_PAGE_SIZE_512MB is not set
205CONFIG_SELECT_MEMORY_MODEL=y 239CONFIG_SELECT_MEMORY_MODEL=y
206# CONFIG_FLATMEM_MANUAL is not set 240# CONFIG_FLATMEM_MANUAL is not set
207# CONFIG_DISCONTIGMEM_MANUAL is not set 241# CONFIG_DISCONTIGMEM_MANUAL is not set
@@ -216,9 +250,9 @@ CONFIG_MIGRATION=y
216# CONFIG_PHYS_ADDR_T_64BIT is not set 250# CONFIG_PHYS_ADDR_T_64BIT is not set
217CONFIG_ZONE_DMA_FLAG=0 251CONFIG_ZONE_DMA_FLAG=0
218CONFIG_NR_QUICK=2 252CONFIG_NR_QUICK=2
219CONFIG_UNEVICTABLE_LRU=y
220CONFIG_HAVE_MLOCK=y 253CONFIG_HAVE_MLOCK=y
221CONFIG_HAVE_MLOCKED_PAGE_BIT=y 254CONFIG_HAVE_MLOCKED_PAGE_BIT=y
255CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
222 256
223# 257#
224# Cache configuration 258# Cache configuration
@@ -247,9 +281,10 @@ CONFIG_SH_URQUELL=y
247# 281#
248# Timer and clock configuration 282# Timer and clock configuration
249# 283#
250CONFIG_SH_TMU=y 284CONFIG_SH_TIMER_TMU=y
251CONFIG_SH_TIMER_IRQ=16
252CONFIG_SH_PCLK_FREQ=33333333 285CONFIG_SH_PCLK_FREQ=33333333
286CONFIG_SH_CLK_CPG=y
287CONFIG_SH_CLK_CPG_LEGACY=y
253CONFIG_TICK_ONESHOT=y 288CONFIG_TICK_ONESHOT=y
254# CONFIG_NO_HZ is not set 289# CONFIG_NO_HZ is not set
255CONFIG_HIGH_RES_TIMERS=y 290CONFIG_HIGH_RES_TIMERS=y
@@ -286,25 +321,37 @@ CONFIG_HZ=250
286CONFIG_SCHED_HRTICK=y 321CONFIG_SCHED_HRTICK=y
287CONFIG_KEXEC=y 322CONFIG_KEXEC=y
288# CONFIG_CRASH_DUMP is not set 323# CONFIG_CRASH_DUMP is not set
289# CONFIG_SECCOMP is not set 324CONFIG_SECCOMP=y
290# CONFIG_PREEMPT_NONE is not set 325CONFIG_PREEMPT_NONE=y
291# CONFIG_PREEMPT_VOLUNTARY is not set 326# CONFIG_PREEMPT_VOLUNTARY is not set
292CONFIG_PREEMPT=y 327# CONFIG_PREEMPT is not set
293CONFIG_GUSA=y 328CONFIG_GUSA=y
329CONFIG_SPARSE_IRQ=y
294 330
295# 331#
296# Boot options 332# Boot options
297# 333#
298CONFIG_ZERO_PAGE_OFFSET=0x00001000 334CONFIG_ZERO_PAGE_OFFSET=0x00001000
299CONFIG_BOOT_LINK_OFFSET=0x00800000 335CONFIG_BOOT_LINK_OFFSET=0x00800000
300CONFIG_CMDLINE_BOOL=y 336CONFIG_ENTRY_OFFSET=0x00001000
301CONFIG_CMDLINE="console=ttySC1, 38400 earlyprintk=serial ip=on ignore_loglevel root=/dev/nfs ip=dhcp memchunk.vpu=4m" 337# CONFIG_CMDLINE_BOOL is not set
302 338
303# 339#
304# Bus options 340# Bus options
305# 341#
342CONFIG_PCI=y
343# CONFIG_SH_PCIDMA_NONCOHERENT is not set
344CONFIG_PCIEPORTBUS=y
345CONFIG_PCIEAER=y
346CONFIG_PCIEASPM=y
347CONFIG_PCIEASPM_DEBUG=y
306# CONFIG_ARCH_SUPPORTS_MSI is not set 348# CONFIG_ARCH_SUPPORTS_MSI is not set
349# CONFIG_PCI_LEGACY is not set
350CONFIG_PCI_DEBUG=y
351# CONFIG_PCI_STUB is not set
352# CONFIG_PCI_IOV is not set
307# CONFIG_PCCARD is not set 353# CONFIG_PCCARD is not set
354# CONFIG_HOTPLUG_PCI is not set
308 355
309# 356#
310# Executable file formats 357# Executable file formats
@@ -312,13 +359,16 @@ CONFIG_CMDLINE="console=ttySC1, 38400 earlyprintk=serial ip=on ignore_loglevel r
312CONFIG_BINFMT_ELF=y 359CONFIG_BINFMT_ELF=y
313# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set 360# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
314# CONFIG_HAVE_AOUT is not set 361# CONFIG_HAVE_AOUT is not set
315# CONFIG_BINFMT_MISC is not set 362CONFIG_BINFMT_MISC=y
316 363
317# 364#
318# Power management options (EXPERIMENTAL) 365# Power management options (EXPERIMENTAL)
319# 366#
320# CONFIG_PM is not set 367CONFIG_PM=y
321# CONFIG_CPU_IDLE is not set 368# CONFIG_PM_DEBUG is not set
369# CONFIG_HIBERNATION is not set
370CONFIG_CPU_IDLE=y
371CONFIG_CPU_IDLE_GOV_LADDER=y
322CONFIG_NET=y 372CONFIG_NET=y
323 373
324# 374#
@@ -384,6 +434,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
384# CONFIG_ECONET is not set 434# CONFIG_ECONET is not set
385# CONFIG_WAN_ROUTER is not set 435# CONFIG_WAN_ROUTER is not set
386# CONFIG_PHONET is not set 436# CONFIG_PHONET is not set
437# CONFIG_IEEE802154 is not set
387# CONFIG_NET_SCHED is not set 438# CONFIG_NET_SCHED is not set
388# CONFIG_DCB is not set 439# CONFIG_DCB is not set
389 440
@@ -391,6 +442,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
391# Network testing 442# Network testing
392# 443#
393# CONFIG_NET_PKTGEN is not set 444# CONFIG_NET_PKTGEN is not set
445# CONFIG_NET_DROP_MONITOR is not set
394# CONFIG_HAMRADIO is not set 446# CONFIG_HAMRADIO is not set
395# CONFIG_CAN is not set 447# CONFIG_CAN is not set
396# CONFIG_IRDA is not set 448# CONFIG_IRDA is not set
@@ -402,7 +454,11 @@ CONFIG_WIRELESS=y
402CONFIG_WIRELESS_EXT=y 454CONFIG_WIRELESS_EXT=y
403CONFIG_WIRELESS_EXT_SYSFS=y 455CONFIG_WIRELESS_EXT_SYSFS=y
404# CONFIG_LIB80211 is not set 456# CONFIG_LIB80211 is not set
405# CONFIG_MAC80211 is not set 457
458#
459# CFG80211 needs to be enabled for MAC80211
460#
461CONFIG_MAC80211_DEFAULT_PS_VALUE=0
406# CONFIG_WIMAX is not set 462# CONFIG_WIMAX is not set
407# CONFIG_RFKILL is not set 463# CONFIG_RFKILL is not set
408# CONFIG_NET_9P is not set 464# CONFIG_NET_9P is not set
@@ -418,6 +474,8 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
418CONFIG_STANDALONE=y 474CONFIG_STANDALONE=y
419CONFIG_PREVENT_FIRMWARE_BUILD=y 475CONFIG_PREVENT_FIRMWARE_BUILD=y
420# CONFIG_FW_LOADER is not set 476# CONFIG_FW_LOADER is not set
477# CONFIG_DEBUG_DRIVER is not set
478# CONFIG_DEBUG_DEVRES is not set
421# CONFIG_SYS_HYPERVISOR is not set 479# CONFIG_SYS_HYPERVISOR is not set
422# CONFIG_CONNECTOR is not set 480# CONFIG_CONNECTOR is not set
423CONFIG_MTD=y 481CONFIG_MTD=y
@@ -473,11 +531,13 @@ CONFIG_MTD_CFI_UTIL=y
473# CONFIG_MTD_COMPLEX_MAPPINGS is not set 531# CONFIG_MTD_COMPLEX_MAPPINGS is not set
474CONFIG_MTD_PHYSMAP=y 532CONFIG_MTD_PHYSMAP=y
475# CONFIG_MTD_PHYSMAP_COMPAT is not set 533# CONFIG_MTD_PHYSMAP_COMPAT is not set
534# CONFIG_MTD_INTEL_VR_NOR is not set
476# CONFIG_MTD_PLATRAM is not set 535# CONFIG_MTD_PLATRAM is not set
477 536
478# 537#
479# Self-contained MTD device drivers 538# Self-contained MTD device drivers
480# 539#
540# CONFIG_MTD_PMC551 is not set
481# CONFIG_MTD_SLRAM is not set 541# CONFIG_MTD_SLRAM is not set
482# CONFIG_MTD_PHRAM is not set 542# CONFIG_MTD_PHRAM is not set
483# CONFIG_MTD_MTDRAM is not set 543# CONFIG_MTD_MTDRAM is not set
@@ -503,9 +563,13 @@ CONFIG_MTD_PHYSMAP=y
503# CONFIG_MTD_UBI is not set 563# CONFIG_MTD_UBI is not set
504# CONFIG_PARPORT is not set 564# CONFIG_PARPORT is not set
505CONFIG_BLK_DEV=y 565CONFIG_BLK_DEV=y
566# CONFIG_BLK_CPQ_CISS_DA is not set
567# CONFIG_BLK_DEV_DAC960 is not set
568# CONFIG_BLK_DEV_UMEM is not set
506# CONFIG_BLK_DEV_COW_COMMON is not set 569# CONFIG_BLK_DEV_COW_COMMON is not set
507# CONFIG_BLK_DEV_LOOP is not set 570# CONFIG_BLK_DEV_LOOP is not set
508# CONFIG_BLK_DEV_NBD is not set 571# CONFIG_BLK_DEV_NBD is not set
572# CONFIG_BLK_DEV_SX8 is not set
509# CONFIG_BLK_DEV_UB is not set 573# CONFIG_BLK_DEV_UB is not set
510CONFIG_BLK_DEV_RAM=y 574CONFIG_BLK_DEV_RAM=y
511CONFIG_BLK_DEV_RAM_COUNT=16 575CONFIG_BLK_DEV_RAM_COUNT=16
@@ -537,10 +601,6 @@ CONFIG_BLK_DEV_SD=y
537# CONFIG_BLK_DEV_SR is not set 601# CONFIG_BLK_DEV_SR is not set
538# CONFIG_CHR_DEV_SG is not set 602# CONFIG_CHR_DEV_SG is not set
539# CONFIG_CHR_DEV_SCH is not set 603# CONFIG_CHR_DEV_SCH is not set
540
541#
542# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
543#
544# CONFIG_SCSI_MULTI_LUN is not set 604# CONFIG_SCSI_MULTI_LUN is not set
545# CONFIG_SCSI_CONSTANTS is not set 605# CONFIG_SCSI_CONSTANTS is not set
546# CONFIG_SCSI_LOGGING is not set 606# CONFIG_SCSI_LOGGING is not set
@@ -561,24 +621,90 @@ CONFIG_SCSI_WAIT_SCAN=m
561CONFIG_ATA=y 621CONFIG_ATA=y
562# CONFIG_ATA_NONSTANDARD is not set 622# CONFIG_ATA_NONSTANDARD is not set
563CONFIG_SATA_PMP=y 623CONFIG_SATA_PMP=y
624# CONFIG_SATA_AHCI is not set
625CONFIG_SATA_SIL24=y
564CONFIG_ATA_SFF=y 626CONFIG_ATA_SFF=y
627# CONFIG_SATA_SVW is not set
628# CONFIG_ATA_PIIX is not set
565# CONFIG_SATA_MV is not set 629# CONFIG_SATA_MV is not set
630# CONFIG_SATA_NV is not set
631# CONFIG_PDC_ADMA is not set
632# CONFIG_SATA_QSTOR is not set
633# CONFIG_SATA_PROMISE is not set
634# CONFIG_SATA_SX4 is not set
635# CONFIG_SATA_SIL is not set
636# CONFIG_SATA_SIS is not set
637# CONFIG_SATA_ULI is not set
638# CONFIG_SATA_VIA is not set
639# CONFIG_SATA_VITESSE is not set
640# CONFIG_SATA_INIC162X is not set
641# CONFIG_PATA_ALI is not set
642# CONFIG_PATA_AMD is not set
643# CONFIG_PATA_ARTOP is not set
644# CONFIG_PATA_ATIIXP is not set
645# CONFIG_PATA_CMD640_PCI is not set
646# CONFIG_PATA_CMD64X is not set
647# CONFIG_PATA_CS5520 is not set
648# CONFIG_PATA_CS5530 is not set
649# CONFIG_PATA_CYPRESS is not set
650# CONFIG_PATA_EFAR is not set
651# CONFIG_ATA_GENERIC is not set
652# CONFIG_PATA_HPT366 is not set
653# CONFIG_PATA_HPT37X is not set
654# CONFIG_PATA_HPT3X2N is not set
655# CONFIG_PATA_HPT3X3 is not set
656# CONFIG_PATA_IT821X is not set
657# CONFIG_PATA_IT8213 is not set
658# CONFIG_PATA_JMICRON is not set
659# CONFIG_PATA_TRIFLEX is not set
660# CONFIG_PATA_MARVELL is not set
661# CONFIG_PATA_MPIIX is not set
662# CONFIG_PATA_OLDPIIX is not set
663# CONFIG_PATA_NETCELL is not set
664# CONFIG_PATA_NINJA32 is not set
665# CONFIG_PATA_NS87410 is not set
666# CONFIG_PATA_NS87415 is not set
667# CONFIG_PATA_OPTI is not set
668# CONFIG_PATA_OPTIDMA is not set
669# CONFIG_PATA_PDC_OLD is not set
670# CONFIG_PATA_RADISYS is not set
671# CONFIG_PATA_RZ1000 is not set
672# CONFIG_PATA_SC1200 is not set
673# CONFIG_PATA_SERVERWORKS is not set
674# CONFIG_PATA_PDC2027X is not set
675# CONFIG_PATA_SIL680 is not set
676# CONFIG_PATA_SIS is not set
677# CONFIG_PATA_VIA is not set
678# CONFIG_PATA_WINBOND is not set
566# CONFIG_PATA_PLATFORM is not set 679# CONFIG_PATA_PLATFORM is not set
680# CONFIG_PATA_SCH is not set
567# CONFIG_MD is not set 681# CONFIG_MD is not set
682# CONFIG_FUSION is not set
683
684#
685# IEEE 1394 (FireWire) support
686#
687
688#
689# Enable only one of the two stacks, unless you know what you are doing
690#
691# CONFIG_FIREWIRE is not set
692# CONFIG_IEEE1394 is not set
693# CONFIG_I2O is not set
568CONFIG_NETDEVICES=y 694CONFIG_NETDEVICES=y
569CONFIG_COMPAT_NET_DEV_OPS=y
570# CONFIG_DUMMY is not set 695# CONFIG_DUMMY is not set
571# CONFIG_BONDING is not set 696# CONFIG_BONDING is not set
572# CONFIG_MACVLAN is not set 697# CONFIG_MACVLAN is not set
573# CONFIG_EQUALIZER is not set 698# CONFIG_EQUALIZER is not set
574# CONFIG_TUN is not set 699# CONFIG_TUN is not set
575# CONFIG_VETH is not set 700# CONFIG_VETH is not set
701# CONFIG_ARCNET is not set
576CONFIG_PHYLIB=y 702CONFIG_PHYLIB=y
577 703
578# 704#
579# MII PHY device drivers 705# MII PHY device drivers
580# 706#
581# CONFIG_MARVELL_PHY is not set 707CONFIG_MARVELL_PHY=y
582# CONFIG_DAVICOM_PHY is not set 708# CONFIG_DAVICOM_PHY is not set
583# CONFIG_QSEMI_PHY is not set 709# CONFIG_QSEMI_PHY is not set
584# CONFIG_LXT_PHY is not set 710# CONFIG_LXT_PHY is not set
@@ -597,11 +723,17 @@ CONFIG_NET_ETHERNET=y
597CONFIG_MII=y 723CONFIG_MII=y
598# CONFIG_AX88796 is not set 724# CONFIG_AX88796 is not set
599# CONFIG_STNIC is not set 725# CONFIG_STNIC is not set
726# CONFIG_HAPPYMEAL is not set
727# CONFIG_SUNGEM is not set
728# CONFIG_CASSINI is not set
729# CONFIG_NET_VENDOR_3COM is not set
600CONFIG_SMC91X=y 730CONFIG_SMC91X=y
601# CONFIG_ETHOC is not set 731# CONFIG_ETHOC is not set
602# CONFIG_SMC911X is not set 732# CONFIG_SMC911X is not set
603# CONFIG_SMSC911X is not set 733# CONFIG_SMSC911X is not set
604# CONFIG_DNET is not set 734# CONFIG_DNET is not set
735# CONFIG_NET_TULIP is not set
736# CONFIG_HP100 is not set
605# CONFIG_IBM_NEW_EMAC_ZMII is not set 737# CONFIG_IBM_NEW_EMAC_ZMII is not set
606# CONFIG_IBM_NEW_EMAC_RGMII is not set 738# CONFIG_IBM_NEW_EMAC_RGMII is not set
607# CONFIG_IBM_NEW_EMAC_TAH is not set 739# CONFIG_IBM_NEW_EMAC_TAH is not set
@@ -609,9 +741,54 @@ CONFIG_SMC91X=y
609# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set 741# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
610# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set 742# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
611# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set 743# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
744CONFIG_NET_PCI=y
745# CONFIG_PCNET32 is not set
746# CONFIG_AMD8111_ETH is not set
747# CONFIG_ADAPTEC_STARFIRE is not set
612# CONFIG_B44 is not set 748# CONFIG_B44 is not set
613# CONFIG_NETDEV_1000 is not set 749# CONFIG_FORCEDETH is not set
750# CONFIG_E100 is not set
751# CONFIG_FEALNX is not set
752# CONFIG_NATSEMI is not set
753# CONFIG_NE2K_PCI is not set
754CONFIG_8139CP=y
755# CONFIG_8139TOO is not set
756# CONFIG_R6040 is not set
757# CONFIG_SIS900 is not set
758# CONFIG_EPIC100 is not set
759# CONFIG_SMSC9420 is not set
760# CONFIG_SUNDANCE is not set
761# CONFIG_TLAN is not set
762# CONFIG_KS8842 is not set
763# CONFIG_VIA_RHINE is not set
764# CONFIG_SC92031 is not set
765# CONFIG_ATL2 is not set
766CONFIG_NETDEV_1000=y
767# CONFIG_ACENIC is not set
768# CONFIG_DL2K is not set
769# CONFIG_E1000 is not set
770# CONFIG_E1000E is not set
771# CONFIG_IP1000 is not set
772# CONFIG_IGB is not set
773# CONFIG_IGBVF is not set
774# CONFIG_NS83820 is not set
775# CONFIG_HAMACHI is not set
776# CONFIG_YELLOWFIN is not set
777# CONFIG_R8169 is not set
778# CONFIG_SIS190 is not set
779# CONFIG_SKGE is not set
780CONFIG_SKY2=y
781CONFIG_SKY2_DEBUG=y
782# CONFIG_VIA_VELOCITY is not set
783# CONFIG_TIGON3 is not set
784# CONFIG_BNX2 is not set
785# CONFIG_QLA3XXX is not set
786# CONFIG_ATL1 is not set
787# CONFIG_ATL1E is not set
788# CONFIG_ATL1C is not set
789# CONFIG_JME is not set
614# CONFIG_NETDEV_10000 is not set 790# CONFIG_NETDEV_10000 is not set
791# CONFIG_TR is not set
615 792
616# 793#
617# Wireless LAN 794# Wireless LAN
@@ -632,8 +809,11 @@ CONFIG_SMC91X=y
632# CONFIG_USB_RTL8150 is not set 809# CONFIG_USB_RTL8150 is not set
633# CONFIG_USB_USBNET is not set 810# CONFIG_USB_USBNET is not set
634# CONFIG_WAN is not set 811# CONFIG_WAN is not set
812# CONFIG_FDDI is not set
813# CONFIG_HIPPI is not set
635# CONFIG_PPP is not set 814# CONFIG_PPP is not set
636# CONFIG_SLIP is not set 815# CONFIG_SLIP is not set
816# CONFIG_NET_FC is not set
637# CONFIG_NETCONSOLE is not set 817# CONFIG_NETCONSOLE is not set
638# CONFIG_NETPOLL is not set 818# CONFIG_NETPOLL is not set
639# CONFIG_NET_POLL_CONTROLLER is not set 819# CONFIG_NET_POLL_CONTROLLER is not set
@@ -692,6 +872,7 @@ CONFIG_HW_CONSOLE=y
692CONFIG_VT_HW_CONSOLE_BINDING=y 872CONFIG_VT_HW_CONSOLE_BINDING=y
693CONFIG_DEVKMEM=y 873CONFIG_DEVKMEM=y
694# CONFIG_SERIAL_NONSTANDARD is not set 874# CONFIG_SERIAL_NONSTANDARD is not set
875# CONFIG_NOZOMI is not set
695 876
696# 877#
697# Serial drivers 878# Serial drivers
@@ -706,6 +887,7 @@ CONFIG_SERIAL_SH_SCI_NR_UARTS=6
706CONFIG_SERIAL_SH_SCI_CONSOLE=y 887CONFIG_SERIAL_SH_SCI_CONSOLE=y
707CONFIG_SERIAL_CORE=y 888CONFIG_SERIAL_CORE=y
708CONFIG_SERIAL_CORE_CONSOLE=y 889CONFIG_SERIAL_CORE_CONSOLE=y
890# CONFIG_SERIAL_JSM is not set
709CONFIG_UNIX98_PTYS=y 891CONFIG_UNIX98_PTYS=y
710# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set 892# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
711CONFIG_LEGACY_PTYS=y 893CONFIG_LEGACY_PTYS=y
@@ -714,8 +896,10 @@ CONFIG_LEGACY_PTY_COUNT=256
714CONFIG_HW_RANDOM=y 896CONFIG_HW_RANDOM=y
715# CONFIG_HW_RANDOM_TIMERIOMEM is not set 897# CONFIG_HW_RANDOM_TIMERIOMEM is not set
716# CONFIG_R3964 is not set 898# CONFIG_R3964 is not set
899# CONFIG_APPLICOM is not set
717# CONFIG_RAW_DRIVER is not set 900# CONFIG_RAW_DRIVER is not set
718# CONFIG_TCG_TPM is not set 901# CONFIG_TCG_TPM is not set
902CONFIG_DEVPORT=y
719CONFIG_I2C=y 903CONFIG_I2C=y
720CONFIG_I2C_BOARDINFO=y 904CONFIG_I2C_BOARDINFO=y
721# CONFIG_I2C_CHARDEV is not set 905# CONFIG_I2C_CHARDEV is not set
@@ -727,6 +911,24 @@ CONFIG_I2C_ALGOPCA=y
727# 911#
728 912
729# 913#
914# PC SMBus host controller drivers
915#
916# CONFIG_I2C_ALI1535 is not set
917# CONFIG_I2C_ALI1563 is not set
918# CONFIG_I2C_ALI15X3 is not set
919# CONFIG_I2C_AMD756 is not set
920# CONFIG_I2C_AMD8111 is not set
921# CONFIG_I2C_I801 is not set
922# CONFIG_I2C_ISCH is not set
923# CONFIG_I2C_PIIX4 is not set
924# CONFIG_I2C_NFORCE2 is not set
925# CONFIG_I2C_SIS5595 is not set
926# CONFIG_I2C_SIS630 is not set
927# CONFIG_I2C_SIS96X is not set
928# CONFIG_I2C_VIA is not set
929# CONFIG_I2C_VIAPRO is not set
930
931#
730# I2C system bus drivers (mostly embedded / system-on-chip) 932# I2C system bus drivers (mostly embedded / system-on-chip)
731# 933#
732# CONFIG_I2C_GPIO is not set 934# CONFIG_I2C_GPIO is not set
@@ -742,6 +944,11 @@ CONFIG_I2C_ALGOPCA=y
742# CONFIG_I2C_TINY_USB is not set 944# CONFIG_I2C_TINY_USB is not set
743 945
744# 946#
947# Graphics adapter I2C/DDC channel drivers
948#
949# CONFIG_I2C_VOODOO3 is not set
950
951#
745# Other I2C/SMBus bus drivers 952# Other I2C/SMBus bus drivers
746# 953#
747CONFIG_I2C_PCA_PLATFORM=y 954CONFIG_I2C_PCA_PLATFORM=y
@@ -754,7 +961,6 @@ CONFIG_I2C_PCA_PLATFORM=y
754# CONFIG_SENSORS_PCF8574 is not set 961# CONFIG_SENSORS_PCF8574 is not set
755# CONFIG_PCF8575 is not set 962# CONFIG_PCF8575 is not set
756# CONFIG_SENSORS_PCA9539 is not set 963# CONFIG_SENSORS_PCA9539 is not set
757# CONFIG_SENSORS_MAX6875 is not set
758# CONFIG_SENSORS_TSL2550 is not set 964# CONFIG_SENSORS_TSL2550 is not set
759# CONFIG_I2C_DEBUG_CORE is not set 965# CONFIG_I2C_DEBUG_CORE is not set
760# CONFIG_I2C_DEBUG_ALGO is not set 966# CONFIG_I2C_DEBUG_ALGO is not set
@@ -763,6 +969,7 @@ CONFIG_I2C_PCA_PLATFORM=y
763# CONFIG_SPI is not set 969# CONFIG_SPI is not set
764CONFIG_ARCH_REQUIRE_GPIOLIB=y 970CONFIG_ARCH_REQUIRE_GPIOLIB=y
765CONFIG_GPIOLIB=y 971CONFIG_GPIOLIB=y
972# CONFIG_DEBUG_GPIO is not set
766# CONFIG_GPIO_SYSFS is not set 973# CONFIG_GPIO_SYSFS is not set
767 974
768# 975#
@@ -779,15 +986,79 @@ CONFIG_GPIOLIB=y
779# 986#
780# PCI GPIO expanders: 987# PCI GPIO expanders:
781# 988#
989# CONFIG_GPIO_BT8XX is not set
782 990
783# 991#
784# SPI GPIO expanders: 992# SPI GPIO expanders:
785# 993#
786# CONFIG_W1 is not set 994# CONFIG_W1 is not set
787# CONFIG_POWER_SUPPLY is not set 995# CONFIG_POWER_SUPPLY is not set
788# CONFIG_HWMON is not set 996CONFIG_HWMON=y
997# CONFIG_HWMON_VID is not set
998# CONFIG_SENSORS_AD7414 is not set
999# CONFIG_SENSORS_AD7418 is not set
1000# CONFIG_SENSORS_ADM1021 is not set
1001# CONFIG_SENSORS_ADM1025 is not set
1002# CONFIG_SENSORS_ADM1026 is not set
1003# CONFIG_SENSORS_ADM1029 is not set
1004# CONFIG_SENSORS_ADM1031 is not set
1005# CONFIG_SENSORS_ADM9240 is not set
1006# CONFIG_SENSORS_ADT7462 is not set
1007# CONFIG_SENSORS_ADT7470 is not set
1008# CONFIG_SENSORS_ADT7473 is not set
1009# CONFIG_SENSORS_ADT7475 is not set
1010# CONFIG_SENSORS_ATXP1 is not set
1011# CONFIG_SENSORS_DS1621 is not set
1012# CONFIG_SENSORS_I5K_AMB is not set
1013# CONFIG_SENSORS_F71805F is not set
1014# CONFIG_SENSORS_F71882FG is not set
1015# CONFIG_SENSORS_F75375S is not set
1016# CONFIG_SENSORS_G760A is not set
1017# CONFIG_SENSORS_GL518SM is not set
1018# CONFIG_SENSORS_GL520SM is not set
1019# CONFIG_SENSORS_IT87 is not set
1020# CONFIG_SENSORS_LM63 is not set
1021# CONFIG_SENSORS_LM75 is not set
1022# CONFIG_SENSORS_LM77 is not set
1023# CONFIG_SENSORS_LM78 is not set
1024# CONFIG_SENSORS_LM80 is not set
1025# CONFIG_SENSORS_LM83 is not set
1026# CONFIG_SENSORS_LM85 is not set
1027# CONFIG_SENSORS_LM87 is not set
1028# CONFIG_SENSORS_LM90 is not set
1029# CONFIG_SENSORS_LM92 is not set
1030# CONFIG_SENSORS_LM93 is not set
1031# CONFIG_SENSORS_LTC4215 is not set
1032# CONFIG_SENSORS_LTC4245 is not set
1033# CONFIG_SENSORS_LM95241 is not set
1034# CONFIG_SENSORS_MAX1619 is not set
1035# CONFIG_SENSORS_MAX6650 is not set
1036# CONFIG_SENSORS_PC87360 is not set
1037# CONFIG_SENSORS_PC87427 is not set
1038# CONFIG_SENSORS_PCF8591 is not set
1039# CONFIG_SENSORS_SHT15 is not set
1040# CONFIG_SENSORS_SIS5595 is not set
1041# CONFIG_SENSORS_DME1737 is not set
1042# CONFIG_SENSORS_SMSC47M1 is not set
1043# CONFIG_SENSORS_SMSC47M192 is not set
1044# CONFIG_SENSORS_SMSC47B397 is not set
1045# CONFIG_SENSORS_ADS7828 is not set
1046# CONFIG_SENSORS_THMC50 is not set
1047# CONFIG_SENSORS_TMP401 is not set
1048# CONFIG_SENSORS_VIA686A is not set
1049# CONFIG_SENSORS_VT1211 is not set
1050# CONFIG_SENSORS_VT8231 is not set
1051# CONFIG_SENSORS_W83781D is not set
1052# CONFIG_SENSORS_W83791D is not set
1053# CONFIG_SENSORS_W83792D is not set
1054# CONFIG_SENSORS_W83793 is not set
1055# CONFIG_SENSORS_W83L785TS is not set
1056# CONFIG_SENSORS_W83L786NG is not set
1057# CONFIG_SENSORS_W83627HF is not set
1058# CONFIG_SENSORS_W83627EHF is not set
1059# CONFIG_HWMON_DEBUG_CHIP is not set
789# CONFIG_THERMAL is not set 1060# CONFIG_THERMAL is not set
790# CONFIG_THERMAL_HWMON is not set 1061CONFIG_THERMAL_HWMON=y
791# CONFIG_WATCHDOG is not set 1062# CONFIG_WATCHDOG is not set
792CONFIG_SSB_POSSIBLE=y 1063CONFIG_SSB_POSSIBLE=y
793 1064
@@ -811,10 +1082,7 @@ CONFIG_MFD_SM501=y
811# CONFIG_MFD_WM8350_I2C is not set 1082# CONFIG_MFD_WM8350_I2C is not set
812# CONFIG_MFD_PCF50633 is not set 1083# CONFIG_MFD_PCF50633 is not set
813# CONFIG_REGULATOR is not set 1084# CONFIG_REGULATOR is not set
814 1085CONFIG_MEDIA_SUPPORT=y
815#
816# Multimedia devices
817#
818 1086
819# 1087#
820# Multimedia core support 1088# Multimedia core support
@@ -831,6 +1099,7 @@ CONFIG_MFD_SM501=y
831# 1099#
832# Graphics support 1100# Graphics support
833# 1101#
1102# CONFIG_DRM is not set
834# CONFIG_VGASTATE is not set 1103# CONFIG_VGASTATE is not set
835# CONFIG_VIDEO_OUTPUT_CONTROL is not set 1104# CONFIG_VIDEO_OUTPUT_CONTROL is not set
836CONFIG_FB=y 1105CONFIG_FB=y
@@ -856,7 +1125,31 @@ CONFIG_FB_DEFERRED_IO=y
856# 1125#
857# Frame buffer hardware drivers 1126# Frame buffer hardware drivers
858# 1127#
1128# CONFIG_FB_CIRRUS is not set
1129# CONFIG_FB_PM2 is not set
1130# CONFIG_FB_CYBER2000 is not set
1131# CONFIG_FB_ASILIANT is not set
1132# CONFIG_FB_IMSTT is not set
859# CONFIG_FB_S1D13XXX is not set 1133# CONFIG_FB_S1D13XXX is not set
1134# CONFIG_FB_NVIDIA is not set
1135# CONFIG_FB_RIVA is not set
1136# CONFIG_FB_MATROX is not set
1137# CONFIG_FB_RADEON is not set
1138# CONFIG_FB_ATY128 is not set
1139# CONFIG_FB_ATY is not set
1140# CONFIG_FB_S3 is not set
1141# CONFIG_FB_SAVAGE is not set
1142# CONFIG_FB_SIS is not set
1143# CONFIG_FB_VIA is not set
1144# CONFIG_FB_NEOMAGIC is not set
1145# CONFIG_FB_KYRO is not set
1146# CONFIG_FB_3DFX is not set
1147# CONFIG_FB_VOODOO1 is not set
1148# CONFIG_FB_VT8623 is not set
1149# CONFIG_FB_TRIDENT is not set
1150# CONFIG_FB_ARK is not set
1151# CONFIG_FB_PM3 is not set
1152# CONFIG_FB_CARMINE is not set
860CONFIG_FB_SH_MOBILE_LCDC=m 1153CONFIG_FB_SH_MOBILE_LCDC=m
861CONFIG_FB_SM501=y 1154CONFIG_FB_SM501=y
862# CONFIG_FB_VIRTUAL is not set 1155# CONFIG_FB_VIRTUAL is not set
@@ -909,7 +1202,7 @@ CONFIG_HID_BELKIN=y
909CONFIG_HID_CHERRY=y 1202CONFIG_HID_CHERRY=y
910CONFIG_HID_CHICONY=y 1203CONFIG_HID_CHICONY=y
911CONFIG_HID_CYPRESS=y 1204CONFIG_HID_CYPRESS=y
912# CONFIG_DRAGONRISE_FF is not set 1205# CONFIG_HID_DRAGONRISE is not set
913CONFIG_HID_EZKEY=y 1206CONFIG_HID_EZKEY=y
914# CONFIG_HID_KYE is not set 1207# CONFIG_HID_KYE is not set
915CONFIG_HID_GYRATION=y 1208CONFIG_HID_GYRATION=y
@@ -926,14 +1219,15 @@ CONFIG_HID_PETALYNX=y
926CONFIG_HID_SAMSUNG=y 1219CONFIG_HID_SAMSUNG=y
927CONFIG_HID_SONY=y 1220CONFIG_HID_SONY=y
928CONFIG_HID_SUNPLUS=y 1221CONFIG_HID_SUNPLUS=y
929# CONFIG_GREENASIA_FF is not set 1222# CONFIG_HID_GREENASIA is not set
1223# CONFIG_HID_SMARTJOYPLUS is not set
930# CONFIG_HID_TOPSEED is not set 1224# CONFIG_HID_TOPSEED is not set
931CONFIG_THRUSTMASTER_FF=m 1225# CONFIG_HID_THRUSTMASTER is not set
932CONFIG_ZEROPLUS_FF=m 1226# CONFIG_HID_ZEROPLUS is not set
933CONFIG_USB_SUPPORT=y 1227CONFIG_USB_SUPPORT=y
934CONFIG_USB_ARCH_HAS_HCD=y 1228CONFIG_USB_ARCH_HAS_HCD=y
935CONFIG_USB_ARCH_HAS_OHCI=y 1229CONFIG_USB_ARCH_HAS_OHCI=y
936# CONFIG_USB_ARCH_HAS_EHCI is not set 1230CONFIG_USB_ARCH_HAS_EHCI=y
937CONFIG_USB=y 1231CONFIG_USB=y
938# CONFIG_USB_DEBUG is not set 1232# CONFIG_USB_DEBUG is not set
939CONFIG_USB_ANNOUNCE_NEW_DEVICES=y 1233CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
@@ -944,6 +1238,7 @@ CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
944CONFIG_USB_DEVICEFS=y 1238CONFIG_USB_DEVICEFS=y
945CONFIG_USB_DEVICE_CLASS=y 1239CONFIG_USB_DEVICE_CLASS=y
946# CONFIG_USB_DYNAMIC_MINORS is not set 1240# CONFIG_USB_DYNAMIC_MINORS is not set
1241# CONFIG_USB_SUSPEND is not set
947# CONFIG_USB_OTG is not set 1242# CONFIG_USB_OTG is not set
948# CONFIG_USB_OTG_WHITELIST is not set 1243# CONFIG_USB_OTG_WHITELIST is not set
949# CONFIG_USB_OTG_BLACKLIST_HUB is not set 1244# CONFIG_USB_OTG_BLACKLIST_HUB is not set
@@ -955,12 +1250,19 @@ CONFIG_USB_MON=y
955# USB Host Controller Drivers 1250# USB Host Controller Drivers
956# 1251#
957# CONFIG_USB_C67X00_HCD is not set 1252# CONFIG_USB_C67X00_HCD is not set
1253# CONFIG_USB_XHCI_HCD is not set
1254# CONFIG_USB_EHCI_HCD is not set
958# CONFIG_USB_OXU210HP_HCD is not set 1255# CONFIG_USB_OXU210HP_HCD is not set
959# CONFIG_USB_ISP116X_HCD is not set 1256# CONFIG_USB_ISP116X_HCD is not set
960# CONFIG_USB_ISP1760_HCD is not set 1257# CONFIG_USB_ISP1760_HCD is not set
961# CONFIG_USB_OHCI_HCD is not set 1258CONFIG_USB_OHCI_HCD=y
1259# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
1260# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
1261CONFIG_USB_OHCI_LITTLE_ENDIAN=y
1262# CONFIG_USB_UHCI_HCD is not set
962# CONFIG_USB_SL811_HCD is not set 1263# CONFIG_USB_SL811_HCD is not set
963# CONFIG_USB_R8A66597_HCD is not set 1264# CONFIG_USB_R8A66597_HCD is not set
1265# CONFIG_USB_WHCI_HCD is not set
964# CONFIG_USB_HWA_HCD is not set 1266# CONFIG_USB_HWA_HCD is not set
965 1267
966# 1268#
@@ -1034,14 +1336,74 @@ CONFIG_USB_STORAGE=y
1034# 1336#
1035# CONFIG_USB_GPIO_VBUS is not set 1337# CONFIG_USB_GPIO_VBUS is not set
1036# CONFIG_NOP_USB_XCEIV is not set 1338# CONFIG_NOP_USB_XCEIV is not set
1339# CONFIG_UWB is not set
1037# CONFIG_MMC is not set 1340# CONFIG_MMC is not set
1038# CONFIG_MEMSTICK is not set 1341# CONFIG_MEMSTICK is not set
1039# CONFIG_NEW_LEDS is not set 1342# CONFIG_NEW_LEDS is not set
1040# CONFIG_ACCESSIBILITY is not set 1343# CONFIG_ACCESSIBILITY is not set
1041# CONFIG_RTC_CLASS is not set 1344# CONFIG_INFINIBAND is not set
1345CONFIG_RTC_LIB=y
1346CONFIG_RTC_CLASS=y
1347CONFIG_RTC_HCTOSYS=y
1348CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
1349# CONFIG_RTC_DEBUG is not set
1350
1351#
1352# RTC interfaces
1353#
1354CONFIG_RTC_INTF_SYSFS=y
1355CONFIG_RTC_INTF_PROC=y
1356CONFIG_RTC_INTF_DEV=y
1357# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
1358# CONFIG_RTC_DRV_TEST is not set
1359
1360#
1361# I2C RTC drivers
1362#
1363# CONFIG_RTC_DRV_DS1307 is not set
1364# CONFIG_RTC_DRV_DS1374 is not set
1365# CONFIG_RTC_DRV_DS1672 is not set
1366# CONFIG_RTC_DRV_MAX6900 is not set
1367# CONFIG_RTC_DRV_RS5C372 is not set
1368# CONFIG_RTC_DRV_ISL1208 is not set
1369# CONFIG_RTC_DRV_X1205 is not set
1370# CONFIG_RTC_DRV_PCF8563 is not set
1371# CONFIG_RTC_DRV_PCF8583 is not set
1372# CONFIG_RTC_DRV_M41T80 is not set
1373# CONFIG_RTC_DRV_S35390A is not set
1374# CONFIG_RTC_DRV_FM3130 is not set
1375# CONFIG_RTC_DRV_RX8581 is not set
1376
1377#
1378# SPI RTC drivers
1379#
1380
1381#
1382# Platform RTC drivers
1383#
1384# CONFIG_RTC_DRV_DS1286 is not set
1385# CONFIG_RTC_DRV_DS1511 is not set
1386# CONFIG_RTC_DRV_DS1553 is not set
1387# CONFIG_RTC_DRV_DS1742 is not set
1388# CONFIG_RTC_DRV_STK17TA8 is not set
1389# CONFIG_RTC_DRV_M48T86 is not set
1390# CONFIG_RTC_DRV_M48T35 is not set
1391# CONFIG_RTC_DRV_M48T59 is not set
1392# CONFIG_RTC_DRV_BQ4802 is not set
1393# CONFIG_RTC_DRV_V3020 is not set
1394
1395#
1396# on-CPU RTC drivers
1397#
1398CONFIG_RTC_DRV_SH=y
1399CONFIG_RTC_DRV_GENERIC=y
1042# CONFIG_DMADEVICES is not set 1400# CONFIG_DMADEVICES is not set
1043# CONFIG_AUXDISPLAY is not set 1401# CONFIG_AUXDISPLAY is not set
1044# CONFIG_UIO is not set 1402# CONFIG_UIO is not set
1403
1404#
1405# TI VLYNQ
1406#
1045# CONFIG_STAGING is not set 1407# CONFIG_STAGING is not set
1046 1408
1047# 1409#
@@ -1055,16 +1417,25 @@ CONFIG_EXT3_FS=y
1055CONFIG_EXT3_FS_XATTR=y 1417CONFIG_EXT3_FS_XATTR=y
1056# CONFIG_EXT3_FS_POSIX_ACL is not set 1418# CONFIG_EXT3_FS_POSIX_ACL is not set
1057# CONFIG_EXT3_FS_SECURITY is not set 1419# CONFIG_EXT3_FS_SECURITY is not set
1058# CONFIG_EXT4_FS is not set 1420CONFIG_EXT4_FS=y
1421# CONFIG_EXT4DEV_COMPAT is not set
1422CONFIG_EXT4_FS_XATTR=y
1423# CONFIG_EXT4_FS_POSIX_ACL is not set
1424# CONFIG_EXT4_FS_SECURITY is not set
1059CONFIG_JBD=y 1425CONFIG_JBD=y
1426# CONFIG_JBD_DEBUG is not set
1427CONFIG_JBD2=y
1428# CONFIG_JBD2_DEBUG is not set
1060CONFIG_FS_MBCACHE=y 1429CONFIG_FS_MBCACHE=y
1061# CONFIG_REISERFS_FS is not set 1430# CONFIG_REISERFS_FS is not set
1062# CONFIG_JFS_FS is not set 1431# CONFIG_JFS_FS is not set
1063CONFIG_FS_POSIX_ACL=y 1432# CONFIG_FS_POSIX_ACL is not set
1064CONFIG_FILE_LOCKING=y
1065# CONFIG_XFS_FS is not set 1433# CONFIG_XFS_FS is not set
1066# CONFIG_OCFS2_FS is not set 1434# CONFIG_OCFS2_FS is not set
1067# CONFIG_BTRFS_FS is not set 1435CONFIG_BTRFS_FS=y
1436# CONFIG_BTRFS_FS_POSIX_ACL is not set
1437CONFIG_FILE_LOCKING=y
1438CONFIG_FSNOTIFY=y
1068CONFIG_DNOTIFY=y 1439CONFIG_DNOTIFY=y
1069CONFIG_INOTIFY=y 1440CONFIG_INOTIFY=y
1070CONFIG_INOTIFY_USER=y 1441CONFIG_INOTIFY_USER=y
@@ -1106,9 +1477,9 @@ CONFIG_PROC_PAGE_MONITOR=y
1106CONFIG_SYSFS=y 1477CONFIG_SYSFS=y
1107CONFIG_TMPFS=y 1478CONFIG_TMPFS=y
1108# CONFIG_TMPFS_POSIX_ACL is not set 1479# CONFIG_TMPFS_POSIX_ACL is not set
1109# CONFIG_HUGETLBFS is not set 1480CONFIG_HUGETLBFS=y
1110# CONFIG_HUGETLB_PAGE is not set 1481CONFIG_HUGETLB_PAGE=y
1111# CONFIG_CONFIGFS_FS is not set 1482CONFIG_CONFIGFS_FS=y
1112CONFIG_MISC_FILESYSTEMS=y 1483CONFIG_MISC_FILESYSTEMS=y
1113# CONFIG_ADFS_FS is not set 1484# CONFIG_ADFS_FS is not set
1114# CONFIG_AFFS_FS is not set 1485# CONFIG_AFFS_FS is not set
@@ -1121,7 +1492,7 @@ CONFIG_MISC_FILESYSTEMS=y
1121# CONFIG_CRAMFS is not set 1492# CONFIG_CRAMFS is not set
1122# CONFIG_SQUASHFS is not set 1493# CONFIG_SQUASHFS is not set
1123# CONFIG_VXFS_FS is not set 1494# CONFIG_VXFS_FS is not set
1124CONFIG_MINIX_FS=y 1495# CONFIG_MINIX_FS is not set
1125# CONFIG_OMFS_FS is not set 1496# CONFIG_OMFS_FS is not set
1126# CONFIG_HPFS_FS is not set 1497# CONFIG_HPFS_FS is not set
1127# CONFIG_QNX4FS_FS is not set 1498# CONFIG_QNX4FS_FS is not set
@@ -1135,13 +1506,9 @@ CONFIG_NFS_V3=y
1135# CONFIG_NFS_V3_ACL is not set 1506# CONFIG_NFS_V3_ACL is not set
1136CONFIG_NFS_V4=y 1507CONFIG_NFS_V4=y
1137CONFIG_ROOT_NFS=y 1508CONFIG_ROOT_NFS=y
1138CONFIG_NFSD=y 1509# CONFIG_NFSD is not set
1139CONFIG_NFSD_V3=y
1140# CONFIG_NFSD_V3_ACL is not set
1141CONFIG_NFSD_V4=y
1142CONFIG_LOCKD=y 1510CONFIG_LOCKD=y
1143CONFIG_LOCKD_V4=y 1511CONFIG_LOCKD_V4=y
1144CONFIG_EXPORTFS=y
1145CONFIG_NFS_COMMON=y 1512CONFIG_NFS_COMMON=y
1146CONFIG_SUNRPC=y 1513CONFIG_SUNRPC=y
1147CONFIG_SUNRPC_GSS=y 1514CONFIG_SUNRPC_GSS=y
@@ -1204,46 +1571,74 @@ CONFIG_NLS_ISO8859_1=y
1204# Kernel hacking 1571# Kernel hacking
1205# 1572#
1206CONFIG_TRACE_IRQFLAGS_SUPPORT=y 1573CONFIG_TRACE_IRQFLAGS_SUPPORT=y
1207# CONFIG_PRINTK_TIME is not set 1574CONFIG_PRINTK_TIME=y
1208# CONFIG_ENABLE_WARN_DEPRECATED is not set 1575# CONFIG_ENABLE_WARN_DEPRECATED is not set
1209# CONFIG_ENABLE_MUST_CHECK is not set 1576# CONFIG_ENABLE_MUST_CHECK is not set
1210CONFIG_FRAME_WARN=1024 1577CONFIG_FRAME_WARN=1024
1211# CONFIG_MAGIC_SYSRQ is not set 1578# CONFIG_MAGIC_SYSRQ is not set
1212# CONFIG_UNUSED_SYMBOLS is not set 1579# CONFIG_UNUSED_SYMBOLS is not set
1213# CONFIG_DEBUG_FS is not set 1580CONFIG_DEBUG_FS=y
1214# CONFIG_HEADERS_CHECK is not set 1581# CONFIG_HEADERS_CHECK is not set
1215# CONFIG_DEBUG_KERNEL is not set 1582CONFIG_DEBUG_KERNEL=y
1216# CONFIG_DEBUG_BUGVERBOSE is not set 1583# CONFIG_DEBUG_SHIRQ is not set
1584CONFIG_DETECT_SOFTLOCKUP=y
1585# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
1586CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
1587CONFIG_DETECT_HUNG_TASK=y
1588# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
1589CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
1590CONFIG_SCHED_DEBUG=y
1591# CONFIG_SCHEDSTATS is not set
1592# CONFIG_TIMER_STATS is not set
1593# CONFIG_DEBUG_OBJECTS is not set
1594# CONFIG_DEBUG_SLAB is not set
1595# CONFIG_DEBUG_RT_MUTEXES is not set
1596# CONFIG_RT_MUTEX_TESTER is not set
1597# CONFIG_DEBUG_SPINLOCK is not set
1598# CONFIG_DEBUG_MUTEXES is not set
1599# CONFIG_DEBUG_LOCK_ALLOC is not set
1600# CONFIG_PROVE_LOCKING is not set
1601# CONFIG_LOCK_STAT is not set
1602# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
1603# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
1604# CONFIG_DEBUG_KOBJECT is not set
1605CONFIG_DEBUG_BUGVERBOSE=y
1606CONFIG_DEBUG_INFO=y
1607# CONFIG_DEBUG_VM is not set
1608# CONFIG_DEBUG_WRITECOUNT is not set
1217# CONFIG_DEBUG_MEMORY_INIT is not set 1609# CONFIG_DEBUG_MEMORY_INIT is not set
1610# CONFIG_DEBUG_LIST is not set
1611# CONFIG_DEBUG_SG is not set
1612# CONFIG_DEBUG_NOTIFIERS is not set
1613CONFIG_FRAME_POINTER=y
1614# CONFIG_RCU_TORTURE_TEST is not set
1218# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1615# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1616# CONFIG_BACKTRACE_SELF_TEST is not set
1617# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
1618# CONFIG_FAULT_INJECTION is not set
1219# CONFIG_LATENCYTOP is not set 1619# CONFIG_LATENCYTOP is not set
1220CONFIG_SYSCTL_SYSCALL_CHECK=y 1620CONFIG_SYSCTL_SYSCALL_CHECK=y
1621# CONFIG_PAGE_POISONING is not set
1221CONFIG_HAVE_FUNCTION_TRACER=y 1622CONFIG_HAVE_FUNCTION_TRACER=y
1222CONFIG_HAVE_DYNAMIC_FTRACE=y 1623CONFIG_HAVE_DYNAMIC_FTRACE=y
1223CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 1624CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1224CONFIG_TRACING_SUPPORT=y 1625CONFIG_TRACING_SUPPORT=y
1225 1626# CONFIG_FTRACE is not set
1226# 1627# CONFIG_DYNAMIC_DEBUG is not set
1227# Tracers
1228#
1229# CONFIG_FUNCTION_TRACER is not set
1230# CONFIG_IRQSOFF_TRACER is not set
1231# CONFIG_PREEMPT_TRACER is not set
1232# CONFIG_SCHED_TRACER is not set
1233# CONFIG_CONTEXT_SWITCH_TRACER is not set
1234# CONFIG_EVENT_TRACER is not set
1235# CONFIG_BOOT_TRACER is not set
1236# CONFIG_TRACE_BRANCH_PROFILING is not set
1237# CONFIG_STACK_TRACER is not set
1238# CONFIG_KMEMTRACE is not set
1239# CONFIG_WORKQUEUE_TRACER is not set
1240# CONFIG_BLK_DEV_IO_TRACE is not set
1241# CONFIG_DMA_API_DEBUG is not set 1628# CONFIG_DMA_API_DEBUG is not set
1242# CONFIG_SAMPLES is not set 1629# CONFIG_SAMPLES is not set
1243CONFIG_HAVE_ARCH_KGDB=y 1630CONFIG_HAVE_ARCH_KGDB=y
1631# CONFIG_KGDB is not set
1244# CONFIG_SH_STANDARD_BIOS is not set 1632# CONFIG_SH_STANDARD_BIOS is not set
1245# CONFIG_EARLY_SCIF_CONSOLE is not set 1633CONFIG_EARLY_SCIF_CONSOLE=y
1246# CONFIG_MORE_COMPILE_OPTIONS is not set 1634CONFIG_EARLY_SCIF_CONSOLE_PORT=0xffeb0000
1635CONFIG_EARLY_PRINTK=y
1636# CONFIG_DEBUG_BOOTMEM is not set
1637# CONFIG_DEBUG_STACKOVERFLOW is not set
1638# CONFIG_DEBUG_STACK_USAGE is not set
1639# CONFIG_4KSTACKS is not set
1640# CONFIG_DUMP_CODE is not set
1641# CONFIG_SH_NO_BSS_INIT is not set
1247 1642
1248# 1643#
1249# Security options 1644# Security options
@@ -1303,7 +1698,7 @@ CONFIG_CRYPTO_HMAC=y
1303# 1698#
1304# Digest 1699# Digest
1305# 1700#
1306# CONFIG_CRYPTO_CRC32C is not set 1701CONFIG_CRYPTO_CRC32C=y
1307# CONFIG_CRYPTO_MD4 is not set 1702# CONFIG_CRYPTO_MD4 is not set
1308CONFIG_CRYPTO_MD5=y 1703CONFIG_CRYPTO_MD5=y
1309# CONFIG_CRYPTO_MICHAEL_MIC is not set 1704# CONFIG_CRYPTO_MICHAEL_MIC is not set
@@ -1356,13 +1751,18 @@ CONFIG_CRYPTO_DES=y
1356CONFIG_BITREVERSE=y 1751CONFIG_BITREVERSE=y
1357CONFIG_GENERIC_FIND_LAST_BIT=y 1752CONFIG_GENERIC_FIND_LAST_BIT=y
1358# CONFIG_CRC_CCITT is not set 1753# CONFIG_CRC_CCITT is not set
1359# CONFIG_CRC16 is not set 1754CONFIG_CRC16=y
1360# CONFIG_CRC_T10DIF is not set 1755# CONFIG_CRC_T10DIF is not set
1361# CONFIG_CRC_ITU_T is not set 1756# CONFIG_CRC_ITU_T is not set
1362CONFIG_CRC32=y 1757CONFIG_CRC32=y
1363# CONFIG_CRC7 is not set 1758# CONFIG_CRC7 is not set
1364# CONFIG_LIBCRC32C is not set 1759CONFIG_LIBCRC32C=y
1760CONFIG_AUDIT_GENERIC=y
1761CONFIG_ZLIB_INFLATE=y
1762CONFIG_ZLIB_DEFLATE=y
1763CONFIG_DECOMPRESS_GZIP=y
1365CONFIG_HAS_IOMEM=y 1764CONFIG_HAS_IOMEM=y
1366CONFIG_HAS_IOPORT=y 1765CONFIG_HAS_IOPORT=y
1367CONFIG_HAS_DMA=y 1766CONFIG_HAS_DMA=y
1368CONFIG_NLATTR=y 1767CONFIG_NLATTR=y
1768CONFIG_GENERIC_ATOMIC64=y
diff --git a/arch/sh/drivers/pci/Makefile b/arch/sh/drivers/pci/Makefile
index d2ffc477549a..08af1f459756 100644
--- a/arch/sh/drivers/pci/Makefile
+++ b/arch/sh/drivers/pci/Makefile
@@ -8,6 +8,7 @@ obj-$(CONFIG_CPU_SUBTYPE_SH7751R) += pci-sh7751.o ops-sh4.o
8obj-$(CONFIG_CPU_SUBTYPE_SH7763) += pci-sh7780.o ops-sh4.o 8obj-$(CONFIG_CPU_SUBTYPE_SH7763) += pci-sh7780.o ops-sh4.o
9obj-$(CONFIG_CPU_SUBTYPE_SH7780) += pci-sh7780.o ops-sh4.o 9obj-$(CONFIG_CPU_SUBTYPE_SH7780) += pci-sh7780.o ops-sh4.o
10obj-$(CONFIG_CPU_SUBTYPE_SH7785) += pci-sh7780.o ops-sh4.o 10obj-$(CONFIG_CPU_SUBTYPE_SH7785) += pci-sh7780.o ops-sh4.o
11obj-$(CONFIG_CPU_SUBTYPE_SH7786) += ops-sh7786.o
11obj-$(CONFIG_CPU_SH5) += pci-sh5.o ops-sh5.o 12obj-$(CONFIG_CPU_SH5) += pci-sh5.o ops-sh5.o
12 13
13obj-$(CONFIG_SH_DREAMCAST) += ops-dreamcast.o fixups-dreamcast.o \ 14obj-$(CONFIG_SH_DREAMCAST) += ops-dreamcast.o fixups-dreamcast.o \
@@ -24,3 +25,4 @@ obj-$(CONFIG_SH_TITAN) += fixups-titan.o
24obj-$(CONFIG_SH_LANDISK) += fixups-landisk.o 25obj-$(CONFIG_SH_LANDISK) += fixups-landisk.o
25obj-$(CONFIG_SH_LBOX_RE2) += fixups-rts7751r2d.o 26obj-$(CONFIG_SH_LBOX_RE2) += fixups-rts7751r2d.o
26obj-$(CONFIG_SH_CAYMAN) += fixups-cayman.o 27obj-$(CONFIG_SH_CAYMAN) += fixups-cayman.o
28obj-$(CONFIG_SH_URQUELL) += pcie-sh7786.o
diff --git a/arch/sh/drivers/pci/ops-dreamcast.c b/arch/sh/drivers/pci/ops-dreamcast.c
index e83d0d3aabe2..16e0a1baad88 100644
--- a/arch/sh/drivers/pci/ops-dreamcast.c
+++ b/arch/sh/drivers/pci/ops-dreamcast.c
@@ -18,7 +18,6 @@
18#include <linux/pci.h> 18#include <linux/pci.h>
19#include <linux/module.h> 19#include <linux/module.h>
20#include <linux/io.h> 20#include <linux/io.h>
21#include <linux/irq.h>
22#include <mach/pci.h> 21#include <mach/pci.h>
23 22
24/* 23/*
diff --git a/arch/sh/drivers/pci/ops-sh7786.c b/arch/sh/drivers/pci/ops-sh7786.c
new file mode 100644
index 000000000000..48f594b9582b
--- /dev/null
+++ b/arch/sh/drivers/pci/ops-sh7786.c
@@ -0,0 +1,134 @@
1/*
2 * Generic SH7786 PCI-Express operations.
3 *
4 * Copyright (C) 2009 Paul Mundt
5 *
6 * This file is subject to the terms and conditions of the GNU General Public
7 * License v2. See the file "COPYING" in the main directory of this archive
8 * for more details.
9 */
10#include <linux/kernel.h>
11#include <linux/init.h>
12#include <linux/pci.h>
13#include <linux/io.h>
14#include <linux/spinlock.h>
15#include "pcie-sh7786.h"
16
17enum {
18 PCI_ACCESS_READ,
19 PCI_ACCESS_WRITE,
20};
21
22static DEFINE_SPINLOCK(sh7786_pcie_lock);
23
24static int sh7786_pcie_config_access(unsigned char access_type,
25 struct pci_bus *bus, unsigned int devfn, int where, u32 *data)
26{
27 struct pci_channel *chan = bus->sysdata;
28 int dev, func;
29
30 dev = PCI_SLOT(devfn);
31 func = PCI_FUNC(devfn);
32
33 if (bus->number > 255 || dev > 31 || func > 7)
34 return PCIBIOS_FUNC_NOT_SUPPORTED;
35 if (devfn)
36 return PCIBIOS_DEVICE_NOT_FOUND;
37
38 /* Set the PIO address */
39 pci_write_reg(chan, (bus->number << 24) | (dev << 19) |
40 (func << 16) | (where & ~3), SH4A_PCIEPAR);
41
42 /* Enable the configuration access */
43 pci_write_reg(chan, (1 << 31), SH4A_PCIEPCTLR);
44
45 if (access_type == PCI_ACCESS_READ)
46 *data = pci_read_reg(chan, SH4A_PCIEPDR);
47 else
48 pci_write_reg(chan, *data, SH4A_PCIEPDR);
49
50 /* Check for master and target aborts */
51 if (pci_read_reg(chan, SH4A_PCIEPCICONF1) & ((1 << 29) | (1 << 28)))
52 return PCIBIOS_DEVICE_NOT_FOUND;
53
54 return PCIBIOS_SUCCESSFUL;
55}
56
57static int sh7786_pcie_read(struct pci_bus *bus, unsigned int devfn,
58 int where, int size, u32 *val)
59{
60 unsigned long flags;
61 int ret;
62 u32 data;
63
64 if ((size == 2) && (where & 1))
65 return PCIBIOS_BAD_REGISTER_NUMBER;
66 else if ((size == 4) && (where & 3))
67 return PCIBIOS_BAD_REGISTER_NUMBER;
68
69 spin_lock_irqsave(&sh7786_pcie_lock, flags);
70 ret = sh7786_pcie_config_access(PCI_ACCESS_READ, bus,
71 devfn, where, &data);
72 if (ret != PCIBIOS_SUCCESSFUL)
73 goto out;
74
75 if (size == 1)
76 *val = (data >> ((where & 3) << 3)) & 0xff;
77 else if (size == 2)
78 *val = (data >> ((where & 2) << 3)) & 0xffff;
79 else
80 *val = data;
81
82 dev_dbg(&bus->dev, "pcie-config-read: bus=%3d devfn=0x%04x "
83 "where=0x%04x size=%d val=0x%08lx\n", bus->number,
84 devfn, where, size, (unsigned long)*val);
85
86out:
87 spin_unlock_irqrestore(&sh7786_pcie_lock, flags);
88 return ret;
89}
90
91static int sh7786_pcie_write(struct pci_bus *bus, unsigned int devfn,
92 int where, int size, u32 val)
93{
94 unsigned long flags;
95 int shift, ret;
96 u32 data;
97
98 if ((size == 2) && (where & 1))
99 return PCIBIOS_BAD_REGISTER_NUMBER;
100 else if ((size == 4) && (where & 3))
101 return PCIBIOS_BAD_REGISTER_NUMBER;
102
103 spin_lock_irqsave(&sh7786_pcie_lock, flags);
104 ret = sh7786_pcie_config_access(PCI_ACCESS_READ, bus,
105 devfn, where, &data);
106 if (ret != PCIBIOS_SUCCESSFUL)
107 goto out;
108
109 dev_dbg(&bus->dev, "pcie-config-write: bus=%3d devfn=0x%04x "
110 "where=0x%04x size=%d val=%08lx\n", bus->number,
111 devfn, where, size, (unsigned long)val);
112
113 if (size == 1) {
114 shift = (where & 3) << 3;
115 data &= ~(0xff << shift);
116 data |= ((val & 0xff) << shift);
117 } else if (size == 2) {
118 shift = (where & 2) << 3;
119 data &= ~(0xffff << shift);
120 data |= ((val & 0xffff) << shift);
121 } else
122 data = val;
123
124 ret = sh7786_pcie_config_access(PCI_ACCESS_WRITE, bus,
125 devfn, where, &data);
126out:
127 spin_unlock_irqrestore(&sh7786_pcie_lock, flags);
128 return ret;
129}
130
131struct pci_ops sh7786_pci_ops = {
132 .read = sh7786_pcie_read,
133 .write = sh7786_pcie_write,
134};
diff --git a/arch/sh/drivers/pci/pci.c b/arch/sh/drivers/pci/pci.c
index 54d77cbb8b39..9a1c423ad167 100644
--- a/arch/sh/drivers/pci/pci.c
+++ b/arch/sh/drivers/pci/pci.c
@@ -53,12 +53,8 @@ static DEFINE_MUTEX(pci_scan_mutex);
53 53
54void __devinit register_pci_controller(struct pci_channel *hose) 54void __devinit register_pci_controller(struct pci_channel *hose)
55{ 55{
56 if (request_resource(&iomem_resource, hose->mem_resource) < 0) 56 request_resource(&iomem_resource, hose->mem_resource);
57 goto out; 57 request_resource(&ioport_resource, hose->io_resource);
58 if (request_resource(&ioport_resource, hose->io_resource) < 0) {
59 release_resource(hose->mem_resource);
60 goto out;
61 }
62 58
63 *hose_tail = hose; 59 *hose_tail = hose;
64 hose_tail = &hose->next; 60 hose_tail = &hose->next;
@@ -80,12 +76,6 @@ void __devinit register_pci_controller(struct pci_channel *hose)
80 pcibios_scanbus(hose); 76 pcibios_scanbus(hose);
81 mutex_unlock(&pci_scan_mutex); 77 mutex_unlock(&pci_scan_mutex);
82 } 78 }
83
84 return;
85
86out:
87 printk(KERN_WARNING
88 "Skipping PCI bus scan due to resource conflict\n");
89} 79}
90 80
91static int __init pcibios_init(void) 81static int __init pcibios_init(void)
diff --git a/arch/sh/drivers/pci/pcie-sh7786.c b/arch/sh/drivers/pci/pcie-sh7786.c
new file mode 100644
index 000000000000..ac37ee879bab
--- /dev/null
+++ b/arch/sh/drivers/pci/pcie-sh7786.c
@@ -0,0 +1,355 @@
1/*
2 * Low-Level PCI Express Support for the SH7786
3 *
4 * Copyright (C) 2009 Paul Mundt
5 *
6 * This file is subject to the terms and conditions of the GNU General Public
7 * License. See the file "COPYING" in the main directory of this archive
8 * for more details.
9 */
10#include <linux/pci.h>
11#include <linux/init.h>
12#include <linux/kernel.h>
13#include <linux/io.h>
14#include <linux/delay.h>
15#include "pcie-sh7786.h"
16#include <asm/sizes.h>
17
18struct sh7786_pcie_port {
19 struct pci_channel *hose;
20 unsigned int index;
21 int endpoint;
22 int link;
23};
24
25static struct sh7786_pcie_port *sh7786_pcie_ports;
26static unsigned int nr_ports;
27
28static struct sh7786_pcie_hwops {
29 int (*core_init)(void);
30 int (*port_init_hw)(struct sh7786_pcie_port *port);
31} *sh7786_pcie_hwops;
32
33static struct resource sh7786_pci_32bit_mem_resources[] = {
34 {
35 .name = "pci0_mem",
36 .start = SH4A_PCIMEM_BASEA,
37 .end = SH4A_PCIMEM_BASEA + SZ_64M - 1,
38 .flags = IORESOURCE_MEM,
39 }, {
40 .name = "pci1_mem",
41 .start = SH4A_PCIMEM_BASEA1,
42 .end = SH4A_PCIMEM_BASEA1 + SZ_64M - 1,
43 .flags = IORESOURCE_MEM,
44 }, {
45 .name = "pci2_mem",
46 .start = SH4A_PCIMEM_BASEA2,
47 .end = SH4A_PCIMEM_BASEA2 + SZ_64M - 1,
48 .flags = IORESOURCE_MEM,
49 },
50};
51
52static struct resource sh7786_pci_29bit_mem_resource = {
53 .start = SH4A_PCIMEM_BASE,
54 .end = SH4A_PCIMEM_BASE + SZ_64M - 1,
55 .flags = IORESOURCE_MEM,
56};
57
58static struct resource sh7786_pci_io_resources[] = {
59 {
60 .name = "pci0_io",
61 .start = SH4A_PCIIO_BASE,
62 .end = SH4A_PCIIO_BASE + SZ_8M - 1,
63 .flags = IORESOURCE_IO,
64 }, {
65 .name = "pci1_io",
66 .start = SH4A_PCIIO_BASE1,
67 .end = SH4A_PCIIO_BASE1 + SZ_8M - 1,
68 .flags = IORESOURCE_IO,
69 }, {
70 .name = "pci2_io",
71 .start = SH4A_PCIIO_BASE2,
72 .end = SH4A_PCIIO_BASE2 + SZ_4M - 1,
73 .flags = IORESOURCE_IO,
74 },
75};
76
77extern struct pci_ops sh7786_pci_ops;
78
79#define DEFINE_CONTROLLER(start, idx) \
80{ \
81 .pci_ops = &sh7786_pci_ops, \
82 .reg_base = start, \
83 /* mem_resource filled in at probe time */ \
84 .mem_offset = 0, \
85 .io_resource = &sh7786_pci_io_resources[idx], \
86 .io_offset = 0, \
87}
88
89static struct pci_channel sh7786_pci_channels[] = {
90 DEFINE_CONTROLLER(0xfe000000, 0),
91 DEFINE_CONTROLLER(0xfe200000, 1),
92 DEFINE_CONTROLLER(0xfcc00000, 2),
93};
94
95static int phy_wait_for_ack(struct pci_channel *chan)
96{
97 unsigned int timeout = 100;
98
99 while (timeout--) {
100 if (pci_read_reg(chan, SH4A_PCIEPHYADRR) & (1 << BITS_ACK))
101 return 0;
102
103 udelay(100);
104 }
105
106 return -ETIMEDOUT;
107}
108
109static int pci_wait_for_irq(struct pci_channel *chan, unsigned int mask)
110{
111 unsigned int timeout = 100;
112
113 while (timeout--) {
114 if ((pci_read_reg(chan, SH4A_PCIEINTR) & mask) == mask)
115 return 0;
116
117 udelay(100);
118 }
119
120 return -ETIMEDOUT;
121}
122
123static void phy_write_reg(struct pci_channel *chan, unsigned int addr,
124 unsigned int lane, unsigned int data)
125{
126 unsigned long phyaddr, ctrl;
127
128 phyaddr = (1 << BITS_CMD) + ((lane & 0xf) << BITS_LANE) +
129 ((addr & 0xff) << BITS_ADR);
130
131 /* Enable clock */
132 ctrl = pci_read_reg(chan, SH4A_PCIEPHYCTLR);
133 ctrl |= (1 << BITS_CKE);
134 pci_write_reg(chan, ctrl, SH4A_PCIEPHYCTLR);
135
136 /* Set write data */
137 pci_write_reg(chan, data, SH4A_PCIEPHYDOUTR);
138 pci_write_reg(chan, phyaddr, SH4A_PCIEPHYADRR);
139
140 phy_wait_for_ack(chan);
141
142 /* Clear command */
143 pci_write_reg(chan, 0, SH4A_PCIEPHYADRR);
144
145 phy_wait_for_ack(chan);
146
147 /* Disable clock */
148 ctrl = pci_read_reg(chan, SH4A_PCIEPHYCTLR);
149 ctrl &= ~(1 << BITS_CKE);
150 pci_write_reg(chan, ctrl, SH4A_PCIEPHYCTLR);
151}
152
153static int phy_init(struct pci_channel *chan)
154{
155 unsigned int timeout = 100;
156
157 /* Initialize the phy */
158 phy_write_reg(chan, 0x60, 0xf, 0x004b008b);
159 phy_write_reg(chan, 0x61, 0xf, 0x00007b41);
160 phy_write_reg(chan, 0x64, 0xf, 0x00ff4f00);
161 phy_write_reg(chan, 0x65, 0xf, 0x09070907);
162 phy_write_reg(chan, 0x66, 0xf, 0x00000010);
163 phy_write_reg(chan, 0x74, 0xf, 0x0007001c);
164 phy_write_reg(chan, 0x79, 0xf, 0x01fc000d);
165
166 /* Deassert Standby */
167 phy_write_reg(chan, 0x67, 0xf, 0x00000400);
168
169 while (timeout--) {
170 if (pci_read_reg(chan, SH4A_PCIEPHYSR))
171 return 0;
172
173 udelay(100);
174 }
175
176 return -ETIMEDOUT;
177}
178
179static int pcie_init(struct sh7786_pcie_port *port)
180{
181 struct pci_channel *chan = port->hose;
182 unsigned int data;
183 int ret;
184
185 /* Begin initialization */
186 pci_write_reg(chan, 0, SH4A_PCIETCTLR);
187
188 /* Initialize as type1. */
189 data = pci_read_reg(chan, SH4A_PCIEPCICONF3);
190 data &= ~(0x7f << 16);
191 data |= PCI_HEADER_TYPE_BRIDGE << 16;
192 pci_write_reg(chan, data, SH4A_PCIEPCICONF3);
193
194 /* Initialize default capabilities. */
195 data = pci_read_reg(chan, SH4A_PCIEEXPCAP0);
196 data &= ~(PCI_EXP_FLAGS_TYPE << 16);
197
198 if (port->endpoint)
199 data |= PCI_EXP_TYPE_ENDPOINT << 20;
200 else
201 data |= PCI_EXP_TYPE_ROOT_PORT << 20;
202
203 data |= PCI_CAP_ID_EXP;
204 pci_write_reg(chan, data, SH4A_PCIEEXPCAP0);
205
206 /* Enable x4 link width and extended sync. */
207 data = pci_read_reg(chan, SH4A_PCIEEXPCAP4);
208 data &= ~(PCI_EXP_LNKSTA_NLW << 16);
209 data |= (1 << 22) | PCI_EXP_LNKCTL_ES;
210 pci_write_reg(chan, data, SH4A_PCIEEXPCAP4);
211
212 /* Set the completion timer timeout to the maximum 32ms. */
213 data = pci_read_reg(chan, SH4A_PCIETLCTLR);
214 data &= ~0xffff;
215 data |= 0x32 << 8;
216 pci_write_reg(chan, data, SH4A_PCIETLCTLR);
217
218 /*
219 * Set fast training sequences to the maximum 255,
220 * and enable MAC data scrambling.
221 */
222 data = pci_read_reg(chan, SH4A_PCIEMACCTLR);
223 data &= ~PCIEMACCTLR_SCR_DIS;
224 data |= (0xff << 16);
225 pci_write_reg(chan, data, SH4A_PCIEMACCTLR);
226
227 /* Finish initialization */
228 data = pci_read_reg(chan, SH4A_PCIETCTLR);
229 data |= 0x1;
230 pci_write_reg(chan, data, SH4A_PCIETCTLR);
231
232 /* Enable DL_Active Interrupt generation */
233 data = pci_read_reg(chan, SH4A_PCIEDLINTENR);
234 data |= PCIEDLINTENR_DLL_ACT_ENABLE;
235 pci_write_reg(chan, data, SH4A_PCIEDLINTENR);
236
237 /* Disable MAC data scrambling. */
238 data = pci_read_reg(chan, SH4A_PCIEMACCTLR);
239 data |= PCIEMACCTLR_SCR_DIS | (0xff << 16);
240 pci_write_reg(chan, data, SH4A_PCIEMACCTLR);
241
242 ret = pci_wait_for_irq(chan, MASK_INT_TX_CTRL);
243 if (unlikely(ret != 0))
244 return -ENODEV;
245
246 pci_write_reg(chan, 0x00100007, SH4A_PCIEPCICONF1);
247 pci_write_reg(chan, 0x80888000, SH4A_PCIETXVC0DCTLR);
248 pci_write_reg(chan, 0x00222000, SH4A_PCIERXVC0DCTLR);
249 pci_write_reg(chan, 0x000050A0, SH4A_PCIEEXPCAP2);
250
251 wmb();
252
253 data = pci_read_reg(chan, SH4A_PCIEMACSR);
254 printk(KERN_NOTICE "PCI: PCIe#%d link width %d\n",
255 port->index, (data >> 20) & 0x3f);
256
257 pci_write_reg(chan, 0x007c0000, SH4A_PCIEPAMR0);
258 pci_write_reg(chan, 0x00000000, SH4A_PCIEPARH0);
259 pci_write_reg(chan, 0x00000000, SH4A_PCIEPARL0);
260 pci_write_reg(chan, 0x80000100, SH4A_PCIEPTCTLR0);
261
262 pci_write_reg(chan, 0x03fc0000, SH4A_PCIEPAMR2);
263 pci_write_reg(chan, 0x00000000, SH4A_PCIEPARH2);
264 pci_write_reg(chan, 0x00000000, SH4A_PCIEPARL2);
265 pci_write_reg(chan, 0x80000000, SH4A_PCIEPTCTLR2);
266
267 return 0;
268}
269
270int __init pcibios_map_platform_irq(struct pci_dev *pdev, u8 slot, u8 pin)
271{
272 return 71;
273}
274
275static int sh7786_pcie_core_init(void)
276{
277 /* Return the number of ports */
278 return test_mode_pin(MODE_PIN12) ? 3 : 2;
279}
280
281static int __devinit sh7786_pcie_init_hw(struct sh7786_pcie_port *port)
282{
283 int ret;
284
285 ret = phy_init(port->hose);
286 if (unlikely(ret < 0))
287 return ret;
288
289 /*
290 * Check if we are configured in endpoint or root complex mode,
291 * this is a fixed pin setting that applies to all PCIe ports.
292 */
293 port->endpoint = test_mode_pin(MODE_PIN11);
294
295 ret = pcie_init(port);
296 if (unlikely(ret < 0))
297 return ret;
298
299 register_pci_controller(port->hose);
300
301 return 0;
302}
303
304static struct sh7786_pcie_hwops sh7786_65nm_pcie_hwops __initdata = {
305 .core_init = sh7786_pcie_core_init,
306 .port_init_hw = sh7786_pcie_init_hw,
307};
308
309static int __init sh7786_pcie_init(void)
310{
311 int ret = 0, i;
312
313 printk(KERN_NOTICE "PCI: Starting intialization.\n");
314
315 sh7786_pcie_hwops = &sh7786_65nm_pcie_hwops;
316
317 nr_ports = sh7786_pcie_hwops->core_init();
318 BUG_ON(nr_ports > ARRAY_SIZE(sh7786_pci_channels));
319
320 if (unlikely(nr_ports == 0))
321 return -ENODEV;
322
323 sh7786_pcie_ports = kzalloc(nr_ports * sizeof(struct sh7786_pcie_port),
324 GFP_KERNEL);
325 if (unlikely(!sh7786_pcie_ports))
326 return -ENOMEM;
327
328 printk(KERN_NOTICE "PCI: probing %d ports.\n", nr_ports);
329
330 for (i = 0; i < nr_ports; i++) {
331 struct sh7786_pcie_port *port = sh7786_pcie_ports + i;
332
333 port->index = i;
334 port->hose = sh7786_pci_channels + i;
335 port->hose->io_map_base = port->hose->io_resource->start;
336
337 /*
338 * Check if we are booting in 29 or 32-bit mode
339 *
340 * 32-bit mode provides each controller with its own
341 * memory window, while 29-bit mode uses a shared one.
342 */
343 port->hose->mem_resource = test_mode_pin(MODE_PIN10) ?
344 &sh7786_pci_32bit_mem_resources[i] :
345 &sh7786_pci_29bit_mem_resource;
346
347 ret |= sh7786_pcie_hwops->port_init_hw(port);
348 }
349
350 if (unlikely(ret))
351 return ret;
352
353 return 0;
354}
355arch_initcall(sh7786_pcie_init);
diff --git a/arch/sh/drivers/pci/pcie-sh7786.h b/arch/sh/drivers/pci/pcie-sh7786.h
new file mode 100644
index 000000000000..c655290a7750
--- /dev/null
+++ b/arch/sh/drivers/pci/pcie-sh7786.h
@@ -0,0 +1,589 @@
1/*
2 * SH7786 PCI-Express controller definitions.
3 *
4 * Copyright (C) 2008, 2009 Renesas Technology Corp.
5 * All rights reserved.
6 *
7 * This file is subject to the terms and conditions of the GNU General Public
8 * License. See the file "COPYING" in the main directory of this archive
9 * for more details.
10 */
11#ifndef __PCI_SH7786_H
12#define __PCI_SH7786_H
13
14/* PCIe bus-0(x4) on SH7786 */ // Rev1.171
15#define SH4A_PCIE_SPW_BASE 0xFE000000 /* spw config address for controller 0 */
16#define SH4A_PCIE_SPW_BASE1 0xFE200000 /* spw config address for controller 1 (Rev1.14)*/
17#define SH4A_PCIE_SPW_BASE2 0xFCC00000 /* spw config address for controller 2 (Rev1.171)*/
18#define SH4A_PCIE_SPW_BASE_LEN 0x00080000
19
20#define SH4A_PCI_CNFG_BASE 0xFE040000 /* pci config address for controller 0 */
21#define SH4A_PCI_CNFG_BASE1 0xFE240000 /* pci config address for controller 1 (Rev1.14)*/
22#define SH4A_PCI_CNFG_BASE2 0xFCC40000 /* pci config address for controller 2 (Rev1.171)*/
23#define SH4A_PCI_CNFG_BASE_LEN 0x00040000
24
25#define SH4A_PCIPIO_ADDR_OFFSET 0x000001c0 /* offset to pci config_address */
26#define SH4A_PCIPIO_DATA_OFFSET 0x00000220 /* offset to pci config_data */
27
28/*
29 * for PEX8111(Max Payload Size=128B,PCIIO_SIZE=64K),
30 * for other(Max Payload Size=4096B,PCIIO_SIZE=8M)
31 */
32
33/* PCI0-0: PCI I/O space */
34#define SH4A_PCIIO_BASE 0xFD000000 /* PCI I/O for controller 0 */
35#define SH4A_PCIIO_BASE1 0xFD800000 /* PCI I/O for controller 1 (Rev1.14)*/
36#define SH4A_PCIIO_BASE2 0xFC800000 /* PCI I/O for controller 2 (Rev1.171)*/
37
38#define SH4A_PCIIO_SIZE64 0x00010000 /* PLX allows only 64K */
39#define SH4A_PCIIO_SIZE 0x00800000 /* 8M */
40#define SH4A_PCIIO_SIZE2 0x00400000 /* 4M (Rev1.171)*/
41
42/* PCI0-1: PCI memory space 29-bit address */
43#define SH4A_PCIMEM_BASE 0x10000000
44#define SH4A_PCIMEM_SIZE 0x04000000 /* 64M */
45
46/* PCI0-2: PCI memory space 32-bit address */
47#define SH4A_PCIMEM_BASEA 0xC0000000 /* for controller 0 */
48#define SH4A_PCIMEM_BASEA1 0xA0000000 /* for controller 1 (Rev1.14)*/
49#define SH4A_PCIMEM_BASEA2 0x80000000 /* for controller 2 (Rev1.171)*/
50#define SH4A_PCIMEM_SIZEA 0x20000000 /* 512M */
51
52/* PCI0: PCI memory target transfer 32-bit address translation value(Rev1.11T)*/
53#define SH4A_PCIBMSTR_TRANSLATION 0x20000000
54
55#define SH4A_PCI_DEVICE_ID 0x0002
56#define SH4A_PCI_VENDOR_ID 0x1912
57
58// PCI compatible 000-03f
59#define PCI_CMD 0x004
60#define PCI_RID 0x008
61#define PCI_IBAR 0x010
62#define PCI_MBAR0 0x014
63#define PCI_MBAR1 0x018
64
65/* PCI power management/MSI/capablity 040-0ff */
66/* PCIE extended 100-fff */
67
68/* SH7786 device identification */ // Rev1.171
69#define SH4A_PVR (0xFF000030)
70#define SH4A_PVR_SHX3 (0x10400000)
71#define SH4A_PRR (0xFF000044)
72#define SH4A_PRR_SH7786 (0x00000400) // Rev1.171
73
74/* SPVCR0 */
75#define SH4A_PCIEVCR0 (0x000000) /* R - 0x0000 0000 32 */
76#define BITS_TOP_MB (24)
77#define MASK_TOP_MB (0xff<<BITS_TOP_MB)
78#define BITS_BOT_MB (16)
79#define MASK_BOT_MB (0xff<<BITS_BOT_MB)
80#define BITS_VC_ID (0)
81#define MASK_VC_ID (0xffff<<BITS_VC_ID)
82
83/* SPVCR1 */
84#define SH4A_PCIEVCR1 (0x000004) /* R - 0x0000 0000 32*/
85#define BITS_BADOPC (5) /* 5 BADOPC 0 R/W */
86#define MASK_BADOPC (1<<BITS_BADOPC)
87#define BITS_BADDEST (4) /*4 BADDEST 0 R/W */
88#define MASK_BADDEST (1<<BITS_BADDEST)
89#define BITS_UNSOLRESP (3) /* 3 UNSOLRESP 0 R/W */
90#define MASK_UNSOLRESP (1<<BITS_UNSOLRESP)
91#define BITS_ERRSNT (1) /* 1 ERRSNT 0 */
92#define MASK_ERRSNT (1<<BITS_ERRSNT)
93#define BITS_ERRRCV (0) /* 0 ERRRCV 0 */
94#define MASK_ERRRCV (1<<BITS_ERRRCV)
95
96/* PCIEECR */
97#define SH4A_PCIEECR (0x000008) /* R/W - 0x0000 0000 32 */
98#define BITS_ENBL (0) /* 0 ENBL 0 R/W */
99#define MASK_ENBL (1<<BITS_ENBL)
100
101/* PCIEPAR */
102#define SH4A_PCIEPAR (0x000010) /* R/W - 0x0000 0000 32 */
103#define BITS_BN (24)
104#define MASK_BN (0xff<<BITS_BN)
105#define BITS_DN (19)
106#define MASK_DN (0x1f<<BITS_DN)
107#define BITS_FN (16)
108#define MASK_FN (0x7<<BITS_FN)
109#define BITS_EREGNO (8)
110#define MASK_EREGNO (0xff<<BITS_EREGNO)
111#define BITS_REGNO (2)
112#define MASK_REGNO (0x3f<<BITS_REGNO)
113
114/* PCIEPCTLR */
115#define SH4A_PCIEPCTLR (0x000018) /* R/W - 0x0000 0000 32 */
116#define BITS_CCIE (31) /* 31 CCIE */
117#define MASK_CCIE (1<<BITS_CCIE)
118#define BITS_TYPE (8)
119#define MASK_TYPE (1<<BITS_TYPE)
120#define BITS_C_VC (0)
121#define MASK_C_VC (1<<BITS_C_VC)
122
123/* PCIEPDR */
124#define SH4A_PCIEPDR (0x000020) /* R/W - 0x0000 0000 32 */
125#define BITS_PDR (0)
126#define MASK_PDR (0xffffffff<<BITS_PDR)
127
128/* PCIEMSGALR */
129#define SH4A_PCIEMSGALR (0x000030) /* R/W - 0x0000 0000 32 */
130#define BITS_MSGADRL (0)
131#define MASK_MSGADRL (0xffffffff<<BITS_MSGADRL)
132
133/* PCIEMSGAHR */
134#define SH4A_PCIEMSGAHR (0x000034) /* R/W - 0x0000 0000 32 */
135#define BITS_MSGADRH (0)
136#define MASK_MSGADRH (0xffffffff<<BITS_MSGADRH)
137
138/* PCIEMSGCTLR */
139#define SH4A_PCIEMSGCTLR (0x000038) /* R/W - 0x0000 0000 32 */
140#define BITS_MSGIE (31)
141#define MASK_MSGIE (1<<BITS_MSGIE)
142#define BITS_MROUTE (16)
143#define MASK_MROUTE (0x7<<BITS_MROUTE)
144#define BITS_MCODE (8)
145#define MASK_MCODE (0xff<<BITS_MCODE)
146#define BITS_M_VC (0)
147#define MASK_M_VC (1<<BITS_M_VC)
148
149/* PCIEMSG */
150#define SH4A_PCIEMSG (0x000040) /* W - - 32 */
151#define BITS_MDATA (0)
152#define MASK_MDATA (0xffffffff<<BITS_MDATA)
153
154/* PCIEPHYCTLR */
155#define SH4A_PCIEPHYCTLR (0x010000) /* R/W - 0x0000 0000 32 */
156#define BITS_CKE (0)
157#define MASK_CKE (1<<BITS_CKE)
158
159/* PCIERMSGIER */
160#define SH4A_PCIERMSGIER (0x004040) /* R/W - 0x0000 0000 32 */
161
162/* PCIEPHYADRR */
163#define SH4A_PCIEPHYADRR (0x010004) /* R/W - 0x0000 0000 32 */
164#define BITS_ACK (24) // Rev1.171
165#define MASK_ACK (1<<BITS_ACK) // Rev1.171
166#define BITS_CMD (16) // Rev1.171
167#define MASK_CMD (0x03<<BITS_CMD) // Rev1.171
168#define BITS_LANE (8)
169#define MASK_LANE (0x0f<<BITS_LANE)
170#define BITS_ADR (0)
171#define MASK_ADR (0xff<<BITS_ADR)
172
173/* PCIEPHYDINR */ // Rev1.171 start.
174#define SH4A_PCIEPHYDINR (0x010008) /* R/W - 0x0000 0000 32 */
175
176/* PCIEPHYDOUTR */
177#define SH4A_PCIEPHYDOUTR (0x01000C) /* R/W - 0x0000 0000 32 */
178
179/* PCIEPHYSR */
180#define SH4A_PCIEPHYSR (0x010010) /* R/W - 0x0000 0000 32 */ // Rev1.171 end.
181
182/* PCIEPHYDATAR */
183#define SH4A_PCIEPHYDATAR (0x00008) /* R/W - 0xxxxx xxxx 32 */
184#define BITS_DATA (0)
185#define MASK_DATA (0xffffffff<<BITS_DATA)
186
187/* PCIETCTLR */
188#define SH4A_PCIETCTLR (0x020000) /* R/W R/W 0x0000 0000 32 */
189#define BITS_CFINT (0)
190#define MASK_CFINT (1<<BITS_CFINT)
191
192/* PCIETSTR */
193#define SH4A_PCIETSTR (0x020004) /* R/W R/W 0x0000 0000 32 */
194
195/* PCIEINTR */
196#define SH4A_PCIEINTR (0x020008) /* R/W R/W 0x0000 0000 32 */
197#define BITS_INT_RX_ERP (31)
198#define MASK_INT_RX_ERP (1<<BITS_INT_RX_ERP)
199#define BITS_INT_RX_VCX_Posted (30)
200#define MASK_INT_RX_VCX_Posted (1<<BITS_INT_RX_VCX_Posted)
201#define BITS_INT_RX_VCX_NonPosted (29)
202#define MASK_INT_RX_VCX_NonPosted (1<<BITS_INT_RX_VCX_NonPosted)
203#define BITS_INT_RX_VCX_CPL (28)
204#define MASK_INT_RX_VCX_CPL (1<<BITS_INT_RX_VCX_CPL)
205#define BITS_INT_TX_VCX_Posted (26)
206#define MASK_INT_TX_VCX_Posted (1<<BITS_INT_TX_VCX_Posted)
207#define BITS_INT_TX_VCX_NonPosted (25)
208#define MASK_INT_TX_VCX_NonPosted (1<<BITS_INT_TX_VCX_NonPosted)
209#define BITS_INT_TX_VCX_CPL (24)
210#define MASK_INT_TX_VCX_CPL (1<<BITS_INT_TX_VCX_CPL)
211#define BITS_INT_RX_VC0_Posted (22)
212#define MASK_INT_RX_VC0_Posted (1<<BITS_INT_RX_VC0_Posted)
213#define BITS_INT_RX_VC0_NonPosted (21)
214#define MASK_INT_RX_VC0_NonPosted (1<<BITS_INT_RX_VC0_NonPosted)
215#define BITS_INT_RX_VC0_CPL (20)
216#define MASK_INT_RX_VC0_CPL (1<<BITS_INT_RX_VC0_CPL)
217#define BITS_INT_TX_VC0_Posted (18)
218#define MASK_INT_TX_VC0_Posted (1<<BITS_INT_TX_VC0_Posted)
219#define BITS_INT_TX_VC0_NonPosted (17)
220#define MASK_INT_TX_VC0_NonPosted (1<<BITS_INT_TX_VC0_NonPosted)
221#define BITS_INT_TX_VC0_CPL (16)
222#define MASK_INT_TX_VC0_CPL (1<<BITS_INT_TX_VC0_CPL)
223#define BITS_INT_RX_CTRL (15)
224#define MASK_INT_RX_CTRL (1<<BITS_INT_RX_CTRL)
225#define BITS_INT_TX_CTRL (14)
226#define MASK_INT_TX_CTRL (1<<BITS_INT_TX_CTRL)
227#define BITS_INTTL (11)
228#define MASK_INTTL (1<<BITS_INTTL)
229#define BITS_INTDL (10)
230#define MASK_INTDL (1<<BITS_INTDL)
231#define BITS_INTMAC (9)
232#define MASK_INTMAC (1<<BITS_INTMAC)
233#define BITS_INTPM (8)
234#define MASK_INTPM (1<<BITS_INTPM)
235
236/* PCIEINTER */
237#define SH4A_PCIEINTER (0x02000C) /* R/W R/W 0x0000 0000 32 */
238#define BITS_INT_RX_ERP (31)
239#define MASK_INT_RX_ERP (1<<BITS_INT_RX_ERP)
240#define BITS_INT_RX_VCX_Posted (30)
241#define MASK_INT_RX_VCX_Posted (1<<BITS_INT_RX_VCX_Posted)
242#define BITS_INT_RX_VCX_NonPosted (29)
243#define MASK_INT_RX_VCX_NonPosted (1<<BITS_INT_RX_VCX_NonPosted)
244#define BITS_INT_RX_VCX_CPL (28)
245#define MASK_INT_RX_VCX_CPL (1<<BITS_INT_RX_VCX_CPL)
246#define BITS_INT_TX_VCX_Posted (26)
247#define MASK_INT_TX_VCX_Posted (1<<BITS_INT_TX_VCX_Posted)
248#define BITS_INT_TX_VCX_NonPosted (25)
249#define MASK_INT_TX_VCX_NonPosted (1<<BITS_INT_TX_VCX_NonPosted)
250#define BITS_INT_TX_VCX_CPL (24)
251#define MASK_INT_TX_VCX_CPL (1<<BITS_INT_TX_VCX_CPL)
252#define BITS_INT_RX_VC0_Posted (22)
253#define MASK_INT_RX_VC0_Posted (1<<BITS_INT_RX_VC0_Posted)
254#define BITS_INT_RX_VC0_NonPosted (21)
255#define MASK_INT_RX_VC0_NonPosted (1<<BITS_INT_RX_VC0_NonPosted)
256#define BITS_INT_RX_VC0_CPL (20)
257#define MASK_INT_RX_VC0_CPL (1<<BITS_INT_RX_VC0_CPL)
258#define BITS_INT_TX_VC0_Posted (18)
259#define MASK_INT_TX_VC0_Posted (1<<BITS_INT_TX_VC0_Posted)
260#define BITS_INT_TX_VC0_NonPosted (17)
261#define MASK_INT_TX_VC0_NonPosted (1<<BITS_INT_TX_VC0_NonPosted)
262#define BITS_INT_TX_VC0_CPL (16)
263#define MASK_INT_TX_VC0_CPL (1<<BITS_INT_TX_VC0_CPL)
264#define BITS_INT_RX_CTRL (15)
265#define MASK_INT_RX_CTRL (1<<BITS_INT_RX_CTRL)
266#define BITS_INT_TX_CTRL (14)
267#define MASK_INT_TX_CTRL (1<<BITS_INT_TX_CTRL)
268#define BITS_INTTL (11)
269#define MASK_INTTL (1<<BITS_INTTL)
270#define BITS_INTDL (10)
271#define MASK_INTDL (1<<BITS_INTDL)
272#define BITS_INTMAC (9)
273#define MASK_INTMAC (1<<BITS_INTMAC)
274#define BITS_INTPM (8)
275#define MASK_INTPM (1<<BITS_INTPM)
276
277/* PCIEAIR */
278#define SH4A_PCIEAIR (SH4A_PCIE_BASE + 0x020010) /* R/W R/W 0xxxxx xxxx 32 */
279
280/* PCIECIR */
281#define SH4A_PCIECIR (SH4A_PCIE_BASE) /* R/W R/W 0xxxxx xxxx 32 */
282
283/* PCIEERRFR */ // Rev1.18
284#define SH4A_PCIEERRFR (0x020020) /* R/W R/W 0xxxxx xxxx 32 */ // Rev1.18
285 // Rev1.18
286/* PCIELAR0 */
287#define SH4A_PCIELAR0 (0x020200) /* R/W R/W 0x0000 0000 32 */
288#define BITS_LARn (20)
289#define MASK_LARn (0xfff<<BITS_LARn)
290
291#define SH4A_PCIE_020204 (0x020204) /* R/W R/W 0x0000 0000 32 */
292
293/* PCIELAMR0 */
294#define SH4A_PCIELAMR0 (0x020208) /* R/W R/W 0x0000 0000 32 */
295#define BITS_LAMRn (20)
296#define MASK_LAMRn (0x1ff<<BITS_LAMRn)
297#define BITS_LAREn (0)
298#define MASK_LAREn (0x1<<BITS_LAREn)
299
300/* PCIECSCR0 */
301#define SH4A_PCIECSCR0 (0x020210) /* R/W R/W 0x0000 0000 32 */
302#define BITS_RANGE (2)
303#define MASK_RANGE (0x7<<BITS_RANGE)
304#define BITS_SNPMD (0)
305#define MASK_SNPMD (0x3<<BITS_SNPMD)
306
307/* PCIECSAR0 */
308#define SH4A_PCIECSAR0 (0x020214) /* R/W R/W 0x0000 0000 32 */
309#define BITS_CSADR (0)
310#define MASK_CSADR (0xffffffff<<BITS_CSADR)
311
312/* PCIESTCTLR0 */
313#define SH4A_PCIESTCTLR0 (0x020218) /* R/W R/W 0x0000 0000 32 */
314#define BITS_SHPRI (8)
315#define MASK_SHPRI (0x0f<<BITS_SHPRI)
316
317#define SH4A_PCIE_020224 (0x020224) /* R/W R/W 0x0000 0000 32 */
318
319#define SH4A_PCIELAR1 (0x020220) /* R/W R/W 0x0000 0000 32 */
320#define SH4A_PCIELAMR1 (0x020228) /* R/W R/W 0x0000 0000 32 */
321#define SH4A_PCIECSCR1 (0x020230) /* R/W R/W 0x0000 0000 32 */
322#define SH4A_PCIECSAR1 (0x020234) /* R/W R/W 0x0000 0000 32 */
323#define SH4A_PCIESTCTLR1 (0x020238) /* R/W R/W 0x0000 0000 32 */
324
325#define SH4A_PCIELAR2 (0x020240) /* R/W R/W 0x0000 0000 32 */
326#define SH4A_PCIE_020244 (0x020244) /* R/W R/W 0x0000 0000 32 */
327#define SH4A_PCIELAMR2 (0x020248) /* R/W R/W 0x0000 0000 32 */
328#define SH4A_PCIECSCR2 (0x020250) /* R/W R/W 0x0000 0000 32 */
329#define SH4A_PCIECSAR2 (0x020254) /* R/W R/W 0x0000 0000 32 */
330#define SH4A_PCIESTCTLR2 (0x020258) /* R/W R/W 0x0000 0000 32 */
331
332#define SH4A_PCIELAR3 (0x020260) /* R/W R/W 0x0000 0000 32 */
333#define SH4A_PCIE_020264 (0x020264) /* R/W R/W 0x0000 0000 32 */
334#define SH4A_PCIELAMR3 (0x020268) /* R/W R/W 0x0000 0000 32 */
335#define SH4A_PCIECSCR3 (0x020270) /* R/W R/W 0x0000 0000 32 */
336#define SH4A_PCIECSAR3 (0x020274) /* R/W R/W 0x0000 0000 32 */
337#define SH4A_PCIESTCTLR3 (0x020278) /* R/W R/W 0x0000 0000 32 */
338
339#define SH4A_PCIELAR4 (0x020280) /* R/W R/W 0x0000 0000 32 */
340#define SH4A_PCIE_020284 (0x020284) /* R/W R/W 0x0000 0000 32 */
341#define SH4A_PCIELAMR4 (0x020288) /* R/W R/W 0x0000 0000 32 */
342#define SH4A_PCIECSCR4 (0x020290) /* R/W R/W 0x0000 0000 32 */
343#define SH4A_PCIECSAR4 (0x020294) /* R/W R/W 0x0000 0000 32 */
344#define SH4A_PCIESTCTLR4 (0x020298) /* R/W R/W 0x0000 0000 32 */
345
346#define SH4A_PCIELAR5 (0x0202A0) /* R/W R/W 0x0000 0000 32 */
347#define SH4A_PCIE_0202A4 (0x0202A4) /* R/W R/W 0x0000 0000 32 */
348#define SH4A_PCIELAMR5 (0x0202A8) /* R/W R/W 0x0000 0000 32 */
349#define SH4A_PCIECSCR5 (0x0202B0) /* R/W R/W 0x0000 0000 32 */
350#define SH4A_PCIECSAR5 (0x0202B4) /* R/W R/W 0x0000 0000 32 */
351#define SH4A_PCIESTCTLR5 (0x0202B8) /* R/W R/W 0x0000 0000 32 */
352
353/* PCIEPARL0 */
354#define SH4A_PCIEPARL0 (0x020400) /* R/W R/W 0x0000 0000 32 */
355#define BITS_PAL (18)
356#define MASK_PAL (0x3fff<<BITS_PAL)
357
358/* PCIEPARH0 */
359#define SH4A_PCIEPARH0 (0x020404) /* R/W R/W 0x0000 0000 32 */
360#define BITS_PAH (0)
361#define MASK_PAH (0xffffffff<<BITS_PAH)
362
363/* PCIEPAMR0 */
364#define SH4A_PCIEPAMR0 (0x020408) /* R/W R/W 0x0000 0000 32 */
365#define BITS_PAM (18)
366#define MASK_PAM (0x3fff<<BITS_PAM)
367
368/* PCIEPTCTLR0 */
369#define SH4A_PCIEPTCTLR0 (0x02040C) /* R/W R/W 0x0000 0000 32 */
370#define BITS_PARE (31)
371#define MASK_PARE (0x1<<BITS_PARE)
372#define BITS_TC (20)
373#define MASK_TC (0x7<<BITS_TC)
374#define BITS_T_VC (16)
375#define MASK_T_VC (0x1<<BITS_T_VC)
376#define BITS_LOCK (12)
377#define MASK_LOCK (0x1<<BITS_LOCK)
378#define BITS_SPC (8)
379#define MASK_SPC (0x1<<BITS_SPC)
380
381#define SH4A_PCIEPARL1 (0x020420) /* R/W R/W 0x0000 0000 32 */
382#define SH4A_PCIEPARH1 (0x020424) /* R/W R/W 0x0000 0000 32 */
383#define SH4A_PCIEPAMR1 (0x020428) /* R/W R/W 0x0000 0000 32 */
384#define SH4A_PCIEPTCTLR1 (0x02042C) /* R/W R/W 0x0000 0000 32 */
385#define SH4A_PCIEPARL2 (0x020440) /* R/W R/W 0x0000 0000 32 */
386#define SH4A_PCIEPARH2 (0x020444) /* R/W R/W 0x0000 0000 32 */
387#define SH4A_PCIEPAMR2 (0x020448) /* R/W R/W 0x0000 0000 32 */
388#define SH4A_PCIEPTCTLR2 (0x02044C) /* R/W R/W 0x0000 0000 32 */
389#define SH4A_PCIEPARL3 (0x020460) /* R/W R/W 0x0000 0000 32 */
390#define SH4A_PCIEPARH3 (0x020464) /* R/W R/W 0x0000 0000 32 */
391#define SH4A_PCIEPAMR3 (0x020468) /* R/W R/W 0x0000 0000 32 */
392#define SH4A_PCIEPTCTLR3 (0x02046C) /* R/W R/W 0x0000 0000 32 */
393#define SH4A_PCIEPARL4 (0x020480) /* R/W R/W 0x0000 0000 32 */
394#define SH4A_PCIEPARH4 (0x020484) /* R/W R/W 0x0000 0000 32 */
395#define SH4A_PCIEPAMR4 (0x020488) /* R/W R/W 0x0000 0000 32 */
396#define SH4A_PCIEPTCTLR4 (0x02048C) /* R/W R/W 0x0000 0000 32 */
397#define SH4A_PCIEPARL5 (0x0204A0) /* R/W R/W 0x0000 0000 32 */
398#define SH4A_PCIEPARH5 (0x0204A4) /* R/W R/W 0x0000 0000 32 */
399#define SH4A_PCIEPAMR5 (0x0204A8) /* R/W R/W 0x0000 0000 32 */
400#define SH4A_PCIEPTCTLR5 (0x0204AC) /* R/W R/W 0x0000 0000 32 */
401#define SH4A_PCIEDMAOR (0x021000) /* R/W R/W 0x0000 0000 32 */
402#define SH4A_PCIEDMSAR0 (0x021100) /* R/W R/W 0x0000 0000 32 */
403#define SH4A_PCIEDMSAHR0 (0x021104) /* R/W R/W 0x0000 0000 32 */
404#define SH4A_PCIEDMDAR0 (0x021108) /* R/W R/W 0x0000 0000 32 */
405#define SH4A_PCIEDMDAHR0 (0x02110C) /* R/W R/W 0x0000 0000 32 */
406#define SH4A_PCIEDMBCNTR0 (0x021110) /* R/W R/W 0x0000 0000 32 */
407#define SH4A_PCIEDMSBCNTR0 (0x021114) /* R/W R/W 0x0000 0000 32 */
408#define SH4A_PCIEDMSTRR0 (0x021118) /* R/W R/W 0x0000 0000 32 */
409#define SH4A_PCIEDMCCAR0 (0x02111C) /* R/W R/W 0x0000 0000 32 */
410#define SH4A_PCIEDMCCR0 (0x021120) /* R/W R/W 0x0000 0000 32 */
411#define SH4A_PCIEDMCC2R0 (0x021124) /* R/W R/W 0x0000 0000 - */
412#define SH4A_PCIEDMCCCR0 (0x021128) /* R/W R/W 0x0000 0000 32 */
413#define SH4A_PCIEDMSAR1 (0x021140) /* R/W R/W 0x0000 0000 32 */
414#define SH4A_PCIEDMSAHR1 (0x021144) /* R/W R/W 0x0000 0000 32 */
415#define SH4A_PCIEDMDAR1 (0x021148) /* R/W R/W 0x0000 0000 32 */
416#define SH4A_PCIEDMDAHR1 (0x02114C) /* R/W R/W 0x0000 0000 32 */
417#define SH4A_PCIEDMBCNTR1 (0x021150) /* R/W R/W 0x0000 0000 32 */
418#define SH4A_PCIEDMSBCNTR1 (0x021154) /* R/W R/W 0x0000 0000 32 */
419#define SH4A_PCIEDMSTRR1 (0x021158) /* R/W R/W 0x0000 0000 32 */
420#define SH4A_PCIEDMCCAR1 (0x02115C) /* R/W R/W 0x0000 0000 32 */
421#define SH4A_PCIEDMCCR1 (0x021160) /* R/W R/W 0x0000 0000 32 */
422#define SH4A_PCIEDMCC2R1 (0x021164) /* R/W R/W 0x0000 0000 - */
423#define SH4A_PCIEDMCCCR1 (0x021168) /* R/W R/W 0x0000 0000 32 */
424#define SH4A_PCIEDMSAR2 (0x021180) /* R/W R/W 0x0000 0000 32 */
425#define SH4A_PCIEDMSAHR2 (0x021184) /* R/W R/W 0x0000 0000 32 */
426#define SH4A_PCIEDMDAR2 (0x021188) /* R/W R/W 0x0000 0000 32 */
427#define SH4A_PCIEDMDAHR2 (0x02118C) /* R/W R/W 0x0000 0000 32 */
428#define SH4A_PCIEDMBCNTR2 (0x021190) /* R/W R/W 0x0000 0000 32 */
429#define SH4A_PCIEDMSBCNTR2 (0x021194) /* R/W R/W 0x0000 0000 32 */
430#define SH4A_PCIEDMSTRR2 (0x021198) /* R/W R/W 0x0000 0000 32 */
431#define SH4A_PCIEDMCCAR2 (0x02119C) /* R/W R/W 0x0000 0000 32 */
432#define SH4A_PCIEDMCCR2 (0x0211A0) /* R/W R/W 0x0000 0000 32 */
433#define SH4A_PCIEDMCC2R2 (0x0211A4) /* R/W R/W 0x0000 0000 - */
434#define SH4A_PCIEDMCCCR2 (0x0211A8) /* R/W R/W 0x0000 0000 32 */
435#define SH4A_PCIEDMSAR3 (0x0211C0) /* R/W R/W 0x0000 0000 32 */
436#define SH4A_PCIEDMSAHR3 (0x0211C4) /* R/W R/W 0x0000 0000 32 */
437#define SH4A_PCIEDMDAR3 (0x0211C8) /* R/W R/W 0x0000 0000 32 */
438#define SH4A_PCIEDMDAHR3 (0x0211CC) /* R/W R/W 0x0000 0000 32 */
439#define SH4A_PCIEDMBCNTR3 (0x0211D0) /* R/W R/W 0x0000 0000 32 */
440#define SH4A_PCIEDMSBCNTR3 (0x0211D4) /* R/W R/W 0x0000 0000 32 */
441#define SH4A_PCIEDMSTRR3 (0x0211D8) /* R/W R/W 0x0000 0000 32 */
442#define SH4A_PCIEDMCCAR3 (0x0211DC) /* R/W R/W 0x0000 0000 32 */
443#define SH4A_PCIEDMCCR3 (0x0211E0) /* R/W R/W 0x0000 0000 32 */
444#define SH4A_PCIEDMCC2R3 (0x0211E4) /* R/W R/W 0x0000 0000 - */
445#define SH4A_PCIEDMCCCR3 (0x0211E8) /* R/W R/W 0x0000 0000 32 */
446#define SH4A_PCIEPCICONF0 (0x040000) /* R R - 8/16/32 */
447#define SH4A_PCIEPCICONF1 (0x040004) /* R/W R/W 0x0008 0000 8/16/32 */
448#define SH4A_PCIEPCICONF2 (0x040008) /* R/W R/W 0xFF00 0000 8/16/32 */
449#define SH4A_PCIEPCICONF3 (0x04000C) /* R/W R/W 0x0000 0000 8/16/32 */
450#define SH4A_PCIEPCICONF4 (0x040010) /* - R/W - 8/16/32 */
451#define SH4A_PCIEPCICONF5 (0x040014) /* - R/W - 8/16/32 */
452#define SH4A_PCIEPCICONF6 (0x040018) /* - R/W - 8/16/32 */
453#define SH4A_PCIEPCICONF7 (0x04001C) /* - R/W - 8/16/32 */
454#define SH4A_PCIEPCICONF8 (0x040020) /* - R/W - 8/16/32 */
455#define SH4A_PCIEPCICONF9 (0x040024) /* - R/W - 8/16/32 */
456#define SH4A_PCIEPCICONF10 (0x040028) /* R/W R/W 0x0000 0000 8/16/32 */
457#define SH4A_PCIEPCICONF11 (0x04002C) /* R/W R/W 0x0000 0000 8/16/32 */
458#define SH4A_PCIEPCICONF12 (0x040030) /* R/W R/W 0x0000 0000 8/16/32 */
459#define SH4A_PCIEPCICONF13 (0x040034) /* R/W R/W 0x0000 0040 8/16/32 */
460#define SH4A_PCIEPCICONF14 (0x040038) /* R/W R/W 0x0000 0000 8/16/32 */
461#define SH4A_PCIEPCICONF15 (0x04003C) /* R/W R/W 0x0000 00FF 8/16/32 */
462#define SH4A_PCIEPMCAP0 (0x040040) /* R/W R 0x0003 5001 8/16/32 */
463#define SH4A_PCIEPMCAP1 (0x040044) /* R/W R/W 0x0000 0000 8/16/32 */
464#define SH4A_PCIEMSICAP0 (0x040050) /* R/W R/W 0x0180 7005 8/16/32 */
465#define SH4A_PCIEMSICAP1 (0x040054) /* R/W R/W 0x0000 0000 8/16/32 */
466#define SH4A_PCIEMSICAP2 (0x040058) /* R/W R/W 0x0000 0000 8/16/32 */
467#define SH4A_PCIEMSICAP3 (0x04005C) /* R/W R/W 0x0000 0000 8/16/32 */
468#define SH4A_PCIEMSICAP4 (0x040060) /* R/W R/W 0x0000 0000 8/16/32 */
469#define SH4A_PCIEMSICAP5 (0x040064) /* R/W R/W 0x0000 0000 8/16/32 */
470#define SH4A_PCIEEXPCAP0 (0x040070) /* R/W R/W 0x0001 0010 8/16/32 */
471#define SH4A_PCIEEXPCAP1 (0x040074) /* R/W R 0x0000 0005 8/16/32 */
472#define SH4A_PCIEEXPCAP2 (0x040078) /* R/W R/W 0x0000 0801 8/16/32 */
473#define SH4A_PCIEEXPCAP3 (0x04007C) /* R/W R 0x0003 F421 8/16/32 */
474#define SH4A_PCIEEXPCAP4 (0x040080) /* R/W R/W 0x0041 0000 8/16/32 */
475#define SH4A_PCIEEXPCAP5 (0x040084) /* R/W R/W 0x0000 0000 8/16/32 */
476#define SH4A_PCIEEXPCAP6 (0x040088) /* R/W R/W 0x0000 03C0 8/16/32 */
477#define SH4A_PCIEEXPCAP7 (0x04008C) /* R/W R/W 0x0000 0000 8/16/32 */
478#define SH4A_PCIEEXPCAP8 (0x040090) /* R/W R/W 0x0000 0000 8/16/32 */
479#define SH4A_PCIEVCCAP0 (0x040100) /* R/W R 0x1B01 0002 8/16/32 */
480#define SH4A_PCIEVCCAP1 (0x040104) /* R R 0x0000 0001 8/16/32 */
481#define SH4A_PCIEVCCAP2 (0x040108) /* R R 0x0000 0000 8/16/32 */
482#define SH4A_PCIEVCCAP3 (0x04010C) /* R R/W 0x0000 0000 8/16/32 */
483#define SH4A_PCIEVCCAP4 (0x040110) /* R/W R/W 0x0000 0000 8/16/32 */
484#define SH4A_PCIEVCCAP5 (0x040114) /* R/W R/W 0x8000 00FF 8/16/32 */
485#define SH4A_PCIEVCCAP6 (0x040118) /* R/W R 0x0002 0000 8/16/32 */
486#define SH4A_PCIEVCCAP7 (0x04011C) /* R/W R/W 0x0000 0000 8/16/32 */
487#define SH4A_PCIEVCCAP8 (0x040120) /* R/W R/W 0x0000 0000 8/16/32 */
488#define SH4A_PCIEVCCAP9 (0x040124) /* R/W R 0x0002 0000 8/16/32 */
489#define SH4A_PCIENUMCAP0 (0x0001B0) /* RW R 0x0001 0003 8/16/32 */
490#define SH4A_PCIENUMCAP1 (0x0001B4) /* R R 0x0000 0000 8/16/32 */
491#define SH4A_PCIENUMCAP2 (0x0001B8) /* R R 0x0000 0000 8/16/32 */
492#define SH4A_PCIEIDSETR0 (0x041000) /* R/W R 0x0000 FFFF 16/32 */
493#define SH4A_PCIEIDSETR1 (0x041004) /* R/W R 0xFF00 0000 16/32 */
494#define SH4A_PCIEBAR0SETR (0x041008) /* R/W R 0x0000 0000 16/32 */
495#define SH4A_PCIEBAR1SETR (0x04100C) /* R/W R 0x0000 0000 16/32 */
496#define SH4A_PCIEBAR2SETR (0x041010) /* R/W R 0x0000 0000 16/32 */
497#define SH4A_PCIEBAR3SETR (0x041014) /* R/W R 0x0000 0000 16/32 */
498#define SH4A_PCIEBAR4SETR (0x041018) /* R/W R 0x0000 0000 16/32 */
499#define SH4A_PCIEBAR5SETR (0x04101C) /* R/W R 0x0000 0000 16/32 */
500#define SH4A_PCIECISSETR (0x041020) /* R/W R 0x0000 0000 16/32 */
501#define SH4A_PCIEIDSETR2 (0x041024) /* R/W R 0x0000 0000 16/32 */
502#define SH4A_PCIEEROMSETR (0x041028) /* R/W R 0x0000 0000 16/32 */
503#define SH4A_PCIEDSERSETR0 (0x04102C) /* R/W R 0x0000 0000 16/32 */
504#define SH4A_PCIEDSERSETR1 (0x041030) /* R/W R 0x0000 0000 16/32 */
505#define SH4A_PCIECTLR (0x041040) /* R/W R 0x0000 0000 16/32 */
506#define SH4A_PCIETLSR (0x041044) /* R/W1C R 0x0000 0000 16/32 */
507#define SH4A_PCIETLCTLR (0x041048) /* R/W R 0x0000 0000 16/32 */
508#define SH4A_PCIEDLSR (0x04104C) /* R/W1C R 0x4003 0000 16/32 */
509#define SH4A_PCIEDLCTLR (0x041050) /* R R 0x0000 0000 16/32 */
510#define SH4A_PCIEMACSR (0x041054) /* R/W1C R 0x0041 0000 16/32 */
511#define SH4A_PCIEMACCTLR (0x041058) /* R/W R 0x0000 0000 16/32 */
512#define PCIEMACCTLR_SCR_DIS (1 << 27) /* scramble disable */
513#define SH4A_PCIEPMSTR (0x04105C) /* R/W1C R 0x0000 0000 16/32 */
514#define SH4A_PCIEPMCTLR (0x041060) /* R/W R 0x0000 0000 16/32 */
515#define SH4A_PCIETLINTENR (0x041064) /* R/W R 0x0000 0000 16/32 */
516#define SH4A_PCIEDLINTENR (0x041068) /* R/W R 0x0000 0000 16/32 */
517#define PCIEDLINTENR_DLL_ACT_ENABLE (1 << 31) /* DL active irq */
518#define SH4A_PCIEMACINTENR (0x04106C) /* R/W R 0x0000 0000 16/32 */
519#define SH4A_PCIEPMINTENR (0x041070) /* R/W R 0x0000 0000 16/32 */
520#define SH4A_PCIETXDCTLR (0x044000) /* R/W - H'00000000_00000000 32/64 */
521#define SH4A_PCIETXCTLR (0x044020) /* R/W - H'00000000_00000000 32/64 */
522#define SH4A_PCIETXSR (0x044028) /* R - H'00000000_00000000 32/64 */
523#define SH4A_PCIETXVC0DCTLR (0x044100) /* R/W - H'00000000_00000000 32/64 */
524#define SH4A_PCIETXVC0SR (0x044108) /* R/W - H'00888000_00000000 32/64 */
525#define SH4A_PCIEVC0PDTXR (0x044110) /* W - H'00000000_00000000 32/64 */
526#define SH4A_PCIEVC0PHTXR (0x044118) /* W - H'00000000_00000000 32/64 */
527#define SH4A_PCIEVC0NPDTXR (0x044120) /* W - H'00000000_00000000 32/64 */
528#define SH4A_PCIEVC0NPHTXR (0x044128) /* W - H'00000000_00000000 32/64 */
529#define SH4A_PCIEVC0CDTXR (0x044130) /* W - H'00000000_00000000 32/64 */
530#define SH4A_PCIEVC0CHTXR (0x044138) /* W - H'00000000_00000000 32/64 */
531#define SH4A_PCIETXVCXDCTLR (0x044200) /* R/W - H'00000000_00000000 32/64 */
532#define SH4A_PCIETXVCXSR (0x044208) /* R/W - H'00000000_00000000 32/64 */
533#define SH4A_PCIEVCXPDTXR (0x044210) /* W - H'00000000_00000000 32/64 */
534#define SH4A_PCIEVCXPHTXR (0x044218) /* W - H'00000000_00000000 32/64 */
535#define SH4A_PCIEVCXNPDTXR (0x044220) /* W - H'00000000_00000000 32/64 */
536#define SH4A_PCIEVCXNPHTXR (0x044228) /* W - H'00000000_00000000 32/64 */
537#define SH4A_PCIEVCXCDTXR (0x044230) /* W - H'00000000_00000000 32/64 */
538#define SH4A_PCIEVCXCHTXR (0x044238) /* W - H'00000000_00000000 32/64 */
539#define SH4A_PCIERDCTLR (0x046000) /* RW - H'00000000_00000000 32/64 */
540#define SH4A_PCIEERPCTLR (0x046008) /* RW - H'00000000_00000000 32/64 */
541#define SH4A_PCIEERPHR (0x046010) /* R - H'00000000_00000000 32/64 */
542#define SH4A_PCIEERPERR (0x046018) /* R - H'00000000_00000000 32/64 */
543#define SH4A_PCIERXVC0DCTLR (0x046100) /* RW - H'00000000_00000000 32/64 */
544#define SH4A_PCIERXVC0SR (0x046108) /* RW - H'00000000_00000000 32/64 */
545#define SH4A_PCIEVC0PDRXR (0x046140) /* R - H'00000000_00000000 32/64 */
546#define SH4A_PCIEVC0PHRXR (0x046148) /* R - H'00000000_00000000 32/64 */
547#define SH4A_PCIEVC0PERR (0x046150) /* R - H'00000000_00000000 32/64 */
548#define SH4A_PCIEVC0NPDRXR (0x046158) /* R - H'00000000_00000000 32/64 */
549#define SH4A_PCIEVC0NPHRXR (0x046160) /* R - H'00000000_00000000 32/64 */
550#define SH4A_PCIEVC0NPERR (0x046168) /* R - H'00000000_00000000 32/64 */
551#define SH4A_PCIEVC0CDRXR (0x046170) /* R - H'00000000_00000000 32/64 */
552#define SH4A_PCIEVC0CHRXR (0x046178) /* R - H'00000000_00000000 32/64 */
553#define SH4A_PCIEVC0CERR (0x046180) /* R - H'00000000_00000000 32/64 */
554#define SH4A_PCIERXVCXDCTLR (0x046200) /* RW - H'00000000_00000000 32/64 */
555#define SH4A_PCIERXVCXSR (0x046208) /* RW - H'00000000_00000000 32/64 */
556#define SH4A_PCIEVCXPDRXR (0x046240) /* R - H'00000000_00000000 32/64 */
557#define SH4A_PCIEVCXPHRXR (0x046248) /* R H'00000000_00000000 32/64 */
558#define SH4A_PCIEVCXPERR (0x046250) /* R H'00000000_00000000 32/64 */
559#define SH4A_PCIEVCXNPDRXR (0x046258) /* R H'00000000_00000000 32/64 */
560#define SH4A_PCIEVCXNPHRXR (0x046260) /* R H'00000000_00000000 32/64 */
561#define SH4A_PCIEVCXNPERR (0x046268) /* R H'00000000_00000000 32/64 */
562#define SH4A_PCIEVCXCDRXR (0x046270) /* R H'00000000_00000000 32/64 */
563#define SH4A_PCIEVCXCHRXR (0x046278) /* R H'00000000_00000000 32/64 */
564#define SH4A_PCIEVCXCERR (0x046280) /* R H'00000000_00000000 32/64 */
565
566/* SSI Register Definition for MSI WORK AROUND --hamada */
567#define SH4A_PCI_SSI_BASE 0xFFE00000 /* spw config address */
568#define SH4A_PCI_SSI_BASE_LEN 0x00100000 /* 1MB */
569
570#define SH4A_SSICR0 (0x000000)
571#define SH4A_SSICR1 (0x010000)
572#define SH4A_SSICR2 (0x020000)
573#define SH4A_SSICR3 (0x030000)
574
575#define PCI_REG(x) ((x) + 0x40000)
576
577static inline void
578pci_write_reg(struct pci_channel *chan, unsigned long val, unsigned long reg)
579{
580 __raw_writel(val, chan->reg_base + reg);
581}
582
583static inline unsigned long
584pci_read_reg(struct pci_channel *chan, unsigned long reg)
585{
586 return __raw_readl(chan->reg_base + reg);
587}
588
589#endif /* __PCI_SH7786_H */
diff --git a/arch/sh/include/asm/atomic-irq.h b/arch/sh/include/asm/atomic-irq.h
index a0b348068cae..467d9415a32e 100644
--- a/arch/sh/include/asm/atomic-irq.h
+++ b/arch/sh/include/asm/atomic-irq.h
@@ -10,29 +10,29 @@ static inline void atomic_add(int i, atomic_t *v)
10{ 10{
11 unsigned long flags; 11 unsigned long flags;
12 12
13 local_irq_save(flags); 13 raw_local_irq_save(flags);
14 v->counter += i; 14 v->counter += i;
15 local_irq_restore(flags); 15 raw_local_irq_restore(flags);
16} 16}
17 17
18static inline void atomic_sub(int i, atomic_t *v) 18static inline void atomic_sub(int i, atomic_t *v)
19{ 19{
20 unsigned long flags; 20 unsigned long flags;
21 21
22 local_irq_save(flags); 22 raw_local_irq_save(flags);
23 v->counter -= i; 23 v->counter -= i;
24 local_irq_restore(flags); 24 raw_local_irq_restore(flags);
25} 25}
26 26
27static inline int atomic_add_return(int i, atomic_t *v) 27static inline int atomic_add_return(int i, atomic_t *v)
28{ 28{
29 unsigned long temp, flags; 29 unsigned long temp, flags;
30 30
31 local_irq_save(flags); 31 raw_local_irq_save(flags);
32 temp = v->counter; 32 temp = v->counter;
33 temp += i; 33 temp += i;
34 v->counter = temp; 34 v->counter = temp;
35 local_irq_restore(flags); 35 raw_local_irq_restore(flags);
36 36
37 return temp; 37 return temp;
38} 38}
@@ -41,11 +41,11 @@ static inline int atomic_sub_return(int i, atomic_t *v)
41{ 41{
42 unsigned long temp, flags; 42 unsigned long temp, flags;
43 43
44 local_irq_save(flags); 44 raw_local_irq_save(flags);
45 temp = v->counter; 45 temp = v->counter;
46 temp -= i; 46 temp -= i;
47 v->counter = temp; 47 v->counter = temp;
48 local_irq_restore(flags); 48 raw_local_irq_restore(flags);
49 49
50 return temp; 50 return temp;
51} 51}
@@ -54,18 +54,18 @@ static inline void atomic_clear_mask(unsigned int mask, atomic_t *v)
54{ 54{
55 unsigned long flags; 55 unsigned long flags;
56 56
57 local_irq_save(flags); 57 raw_local_irq_save(flags);
58 v->counter &= ~mask; 58 v->counter &= ~mask;
59 local_irq_restore(flags); 59 raw_local_irq_restore(flags);
60} 60}
61 61
62static inline void atomic_set_mask(unsigned int mask, atomic_t *v) 62static inline void atomic_set_mask(unsigned int mask, atomic_t *v)
63{ 63{
64 unsigned long flags; 64 unsigned long flags;
65 65
66 local_irq_save(flags); 66 raw_local_irq_save(flags);
67 v->counter |= mask; 67 v->counter |= mask;
68 local_irq_restore(flags); 68 raw_local_irq_restore(flags);
69} 69}
70 70
71#endif /* __ASM_SH_ATOMIC_IRQ_H */ 71#endif /* __ASM_SH_ATOMIC_IRQ_H */
diff --git a/arch/sh/include/asm/atomic.h b/arch/sh/include/asm/atomic.h
index 157c320272cb..e8e78137c6f5 100644
--- a/arch/sh/include/asm/atomic.h
+++ b/arch/sh/include/asm/atomic.h
@@ -85,4 +85,6 @@ static inline int atomic_add_unless(atomic_t *v, int a, int u)
85#define smp_mb__after_atomic_inc() barrier() 85#define smp_mb__after_atomic_inc() barrier()
86 86
87#include <asm-generic/atomic-long.h> 87#include <asm-generic/atomic-long.h>
88#include <asm-generic/atomic64.h>
89
88#endif /* __ASM_SH_ATOMIC_H */ 90#endif /* __ASM_SH_ATOMIC_H */
diff --git a/arch/sh/include/asm/checksum.h b/arch/sh/include/asm/checksum.h
index 67496ab0ef04..fc26d1f4b590 100644
--- a/arch/sh/include/asm/checksum.h
+++ b/arch/sh/include/asm/checksum.h
@@ -1,5 +1,5 @@
1#ifdef CONFIG_SUPERH32 1#ifdef CONFIG_SUPERH32
2# include "checksum_32.h" 2# include "checksum_32.h"
3#else 3#else
4# include "checksum_64.h" 4# include <asm-generic/checksum.h>
5#endif 5#endif
diff --git a/arch/sh/include/asm/checksum_64.h b/arch/sh/include/asm/checksum_64.h
deleted file mode 100644
index 9c62a031a8f5..000000000000
--- a/arch/sh/include/asm/checksum_64.h
+++ /dev/null
@@ -1,78 +0,0 @@
1#ifndef __ASM_SH_CHECKSUM_64_H
2#define __ASM_SH_CHECKSUM_64_H
3
4/*
5 * include/asm-sh/checksum_64.h
6 *
7 * Copyright (C) 2000, 2001 Paolo Alberelli
8 *
9 * This file is subject to the terms and conditions of the GNU General Public
10 * License. See the file "COPYING" in the main directory of this archive
11 * for more details.
12 */
13
14/*
15 * computes the checksum of a memory block at buff, length len,
16 * and adds in "sum" (32-bit)
17 *
18 * returns a 32-bit number suitable for feeding into itself
19 * or csum_tcpudp_magic
20 *
21 * this function must be called with even lengths, except
22 * for the last fragment, which may be odd
23 *
24 * it's best to have buff aligned on a 32-bit boundary
25 */
26asmlinkage __wsum csum_partial(const void *buff, int len, __wsum sum);
27
28/*
29 * Note: when you get a NULL pointer exception here this means someone
30 * passed in an incorrect kernel address to one of these functions.
31 *
32 * If you use these functions directly please don't forget the
33 * access_ok().
34 */
35
36
37__wsum csum_partial_copy_nocheck(const void *src, void *dst, int len,
38 __wsum sum);
39
40__wsum csum_partial_copy_from_user(const void __user *src, void *dst,
41 int len, __wsum sum, int *err_ptr);
42
43static inline __sum16 csum_fold(__wsum csum)
44{
45 u32 sum = (__force u32)csum;
46 sum = (sum & 0xffff) + (sum >> 16);
47 sum = (sum & 0xffff) + (sum >> 16);
48 return (__force __sum16)~sum;
49}
50
51__sum16 ip_fast_csum(const void *iph, unsigned int ihl);
52
53__wsum csum_tcpudp_nofold(__be32 saddr, __be32 daddr,
54 unsigned short len, unsigned short proto,
55 __wsum sum);
56
57/*
58 * computes the checksum of the TCP/UDP pseudo-header
59 * returns a 16-bit checksum, already complemented
60 */
61static inline __sum16 csum_tcpudp_magic(__be32 saddr, __be32 daddr,
62 unsigned short len,
63 unsigned short proto,
64 __wsum sum)
65{
66 return csum_fold(csum_tcpudp_nofold(saddr,daddr,len,proto,sum));
67}
68
69/*
70 * this routine is used for miscellaneous IP-like checksums, mainly
71 * in icmp.c
72 */
73static inline __sum16 ip_compute_csum(const void *buff, int len)
74{
75 return csum_fold(csum_partial(buff, len, 0));
76}
77
78#endif /* __ASM_SH_CHECKSUM_64_H */
diff --git a/arch/sh/include/asm/current.h b/arch/sh/include/asm/current.h
index 62b63880b333..4c51401b5537 100644
--- a/arch/sh/include/asm/current.h
+++ b/arch/sh/include/asm/current.h
@@ -1,20 +1 @@
1#ifndef __ASM_SH_CURRENT_H #include <asm-generic/current.h>
2#define __ASM_SH_CURRENT_H
3
4/*
5 * Copyright (C) 1999 Niibe Yutaka
6 *
7 */
8
9#include <linux/thread_info.h>
10
11struct task_struct;
12
13static __inline__ struct task_struct * get_current(void)
14{
15 return current_thread_info()->task;
16}
17
18#define current get_current()
19
20#endif /* __ASM_SH_CURRENT_H */
diff --git a/arch/sh/include/asm/dma.h b/arch/sh/include/asm/dma.h
index 6bd178473878..04ad0e1e637e 100644
--- a/arch/sh/include/asm/dma.h
+++ b/arch/sh/include/asm/dma.h
@@ -16,13 +16,7 @@
16#include <linux/sched.h> 16#include <linux/sched.h>
17#include <linux/sysdev.h> 17#include <linux/sysdev.h>
18#include <cpu/dma.h> 18#include <cpu/dma.h>
19 19#include <asm-generic/dma.h>
20/* The maximum address that we can perform a DMA transfer to on this platform */
21/* Don't define MAX_DMA_ADDRESS; it's useless on the SuperH and any
22 occurrence should be flagged as an error. */
23/* But... */
24/* XXX: This is not applicable to SuperH, just needed for alloc_bootmem */
25#define MAX_DMA_ADDRESS (PAGE_OFFSET+0x10000000)
26 20
27#ifdef CONFIG_NR_DMA_CHANNELS 21#ifdef CONFIG_NR_DMA_CHANNELS
28# define MAX_DMA_CHANNELS (CONFIG_NR_DMA_CHANNELS) 22# define MAX_DMA_CHANNELS (CONFIG_NR_DMA_CHANNELS)
@@ -137,8 +131,6 @@ extern int dma_xfer(unsigned int chan, unsigned long from,
137 131
138extern int request_dma_bycap(const char **dmac, const char **caps, 132extern int request_dma_bycap(const char **dmac, const char **caps,
139 const char *dev_id); 133 const char *dev_id);
140extern int request_dma(unsigned int chan, const char *dev_id);
141extern void free_dma(unsigned int chan);
142extern int get_dma_residue(unsigned int chan); 134extern int get_dma_residue(unsigned int chan);
143extern struct dma_info *get_dma_info(unsigned int chan); 135extern struct dma_info *get_dma_info(unsigned int chan);
144extern struct dma_channel *get_dma_channel(unsigned int chan); 136extern struct dma_channel *get_dma_channel(unsigned int chan);
diff --git a/arch/sh/include/asm/ipcbuf.h b/arch/sh/include/asm/ipcbuf.h
index 5ffc9972a7ea..84c7e51cb6d0 100644
--- a/arch/sh/include/asm/ipcbuf.h
+++ b/arch/sh/include/asm/ipcbuf.h
@@ -1,29 +1 @@
1#ifndef __ASM_SH_IPCBUF_H__ #include <asm-generic/ipcbuf.h>
2#define __ASM_SH_IPCBUF_H__
3
4/*
5 * The ipc64_perm structure for i386 architecture.
6 * Note extra padding because this structure is passed back and forth
7 * between kernel and user space.
8 *
9 * Pad space is left for:
10 * - 32-bit mode_t and seq
11 * - 2 miscellaneous 32-bit values
12 */
13
14struct ipc64_perm
15{
16 __kernel_key_t key;
17 __kernel_uid32_t uid;
18 __kernel_gid32_t gid;
19 __kernel_uid32_t cuid;
20 __kernel_gid32_t cgid;
21 __kernel_mode_t mode;
22 unsigned short __pad1;
23 unsigned short seq;
24 unsigned short __pad2;
25 unsigned long __unused1;
26 unsigned long __unused2;
27};
28
29#endif /* __ASM_SH_IPCBUF_H__ */
diff --git a/arch/sh/include/asm/irq.h b/arch/sh/include/asm/irq.h
index a2b8c99cc06f..df8e1500527c 100644
--- a/arch/sh/include/asm/irq.h
+++ b/arch/sh/include/asm/irq.h
@@ -39,7 +39,6 @@ static inline int generic_irq_demux(int irq)
39 return irq; 39 return irq;
40} 40}
41 41
42#define irq_canonicalize(irq) (irq)
43#define irq_demux(irq) sh_mv.mv_irq_demux(irq) 42#define irq_demux(irq) sh_mv.mv_irq_demux(irq)
44 43
45void init_IRQ(void); 44void init_IRQ(void);
@@ -54,6 +53,7 @@ extern void irq_ctx_exit(int cpu);
54# define irq_ctx_exit(cpu) do { } while (0) 53# define irq_ctx_exit(cpu) do { } while (0)
55#endif 54#endif
56 55
56#include <asm-generic/irq.h>
57#ifdef CONFIG_CPU_SH5 57#ifdef CONFIG_CPU_SH5
58#include <cpu/irq.h> 58#include <cpu/irq.h>
59#endif 59#endif
diff --git a/arch/sh/include/asm/mman.h b/arch/sh/include/asm/mman.h
index 7d8b72c91a5f..8eebf89f5ab1 100644
--- a/arch/sh/include/asm/mman.h
+++ b/arch/sh/include/asm/mman.h
@@ -1,17 +1 @@
1#ifndef __ASM_SH_MMAN_H #include <asm-generic/mman.h>
2#define __ASM_SH_MMAN_H
3
4#include <asm-generic/mman-common.h>
5
6#define MAP_GROWSDOWN 0x0100 /* stack-like segment */
7#define MAP_DENYWRITE 0x0800 /* ETXTBSY */
8#define MAP_EXECUTABLE 0x1000 /* mark it as an executable */
9#define MAP_LOCKED 0x2000 /* pages are locked */
10#define MAP_NORESERVE 0x4000 /* don't check for reservations */
11#define MAP_POPULATE 0x8000 /* populate (prefault) page tables */
12#define MAP_NONBLOCK 0x10000 /* do not block on IO */
13
14#define MCL_CURRENT 1 /* lock all current mappings */
15#define MCL_FUTURE 2 /* lock all future mappings */
16
17#endif /* __ASM_SH_MMAN_H */
diff --git a/arch/sh/include/asm/mmu_context.h b/arch/sh/include/asm/mmu_context.h
index 2a9c55f1a83f..67d8946db193 100644
--- a/arch/sh/include/asm/mmu_context.h
+++ b/arch/sh/include/asm/mmu_context.h
@@ -122,30 +122,30 @@ static inline void switch_mm(struct mm_struct *prev,
122 unsigned int cpu = smp_processor_id(); 122 unsigned int cpu = smp_processor_id();
123 123
124 if (likely(prev != next)) { 124 if (likely(prev != next)) {
125 cpu_set(cpu, next->cpu_vm_mask); 125 cpumask_set_cpu(cpu, mm_cpumask(next));
126 set_TTB(next->pgd); 126 set_TTB(next->pgd);
127 activate_context(next, cpu); 127 activate_context(next, cpu);
128 } else 128 } else
129 if (!cpu_test_and_set(cpu, next->cpu_vm_mask)) 129 if (!cpumask_test_and_set_cpu(cpu, mm_cpumask(next)))
130 activate_context(next, cpu); 130 activate_context(next, cpu);
131} 131}
132
133#define activate_mm(prev, next) switch_mm((prev),(next),NULL)
134#define deactivate_mm(tsk,mm) do { } while (0)
135#define enter_lazy_tlb(mm,tsk) do { } while (0)
136
132#else 137#else
133#define get_mmu_context(mm) do { } while (0) 138
134#define init_new_context(tsk,mm) (0)
135#define destroy_context(mm) do { } while (0)
136#define set_asid(asid) do { } while (0) 139#define set_asid(asid) do { } while (0)
137#define get_asid() (0) 140#define get_asid() (0)
138#define cpu_asid(cpu, mm) ({ (void)cpu; NO_CONTEXT; }) 141#define cpu_asid(cpu, mm) ({ (void)cpu; NO_CONTEXT; })
139#define switch_and_save_asid(asid) (0) 142#define switch_and_save_asid(asid) (0)
140#define set_TTB(pgd) do { } while (0) 143#define set_TTB(pgd) do { } while (0)
141#define get_TTB() (0) 144#define get_TTB() (0)
142#define activate_context(mm,cpu) do { } while (0)
143#define switch_mm(prev,next,tsk) do { } while (0)
144#endif /* CONFIG_MMU */
145 145
146#define activate_mm(prev, next) switch_mm((prev),(next),NULL) 146#include <asm-generic/mmu_context.h>
147#define deactivate_mm(tsk,mm) do { } while (0) 147
148#define enter_lazy_tlb(mm,tsk) do { } while (0) 148#endif /* CONFIG_MMU */
149 149
150#if defined(CONFIG_CPU_SH3) || defined(CONFIG_CPU_SH4) 150#if defined(CONFIG_CPU_SH3) || defined(CONFIG_CPU_SH4)
151/* 151/*
diff --git a/arch/sh/include/asm/module.h b/arch/sh/include/asm/module.h
index 46eccd331660..068bf1659750 100644
--- a/arch/sh/include/asm/module.h
+++ b/arch/sh/include/asm/module.h
@@ -1,17 +1,7 @@
1#ifndef _ASM_SH_MODULE_H 1#ifndef _ASM_SH_MODULE_H
2#define _ASM_SH_MODULE_H 2#define _ASM_SH_MODULE_H
3 3
4/* 4#include <asm-generic/module.h>
5 * This file contains the SH architecture specific module code.
6 */
7
8struct mod_arch_specific {
9 /* Nothing to see here .. */
10};
11
12#define Elf_Shdr Elf32_Shdr
13#define Elf_Sym Elf32_Sym
14#define Elf_Ehdr Elf32_Ehdr
15 5
16#ifdef CONFIG_CPU_LITTLE_ENDIAN 6#ifdef CONFIG_CPU_LITTLE_ENDIAN
17# ifdef CONFIG_CPU_SH2 7# ifdef CONFIG_CPU_SH2
diff --git a/arch/sh/include/asm/msgbuf.h b/arch/sh/include/asm/msgbuf.h
index 517432343fb5..809134c644a6 100644
--- a/arch/sh/include/asm/msgbuf.h
+++ b/arch/sh/include/asm/msgbuf.h
@@ -1,31 +1 @@
1#ifndef __ASM_SH_MSGBUF_H #include <asm-generic/msgbuf.h>
2#define __ASM_SH_MSGBUF_H
3
4/*
5 * The msqid64_ds structure for i386 architecture.
6 * Note extra padding because this structure is passed back and forth
7 * between kernel and user space.
8 *
9 * Pad space is left for:
10 * - 64-bit time_t to solve y2038 problem
11 * - 2 miscellaneous 32-bit values
12 */
13
14struct msqid64_ds {
15 struct ipc64_perm msg_perm;
16 __kernel_time_t msg_stime; /* last msgsnd time */
17 unsigned long __unused1;
18 __kernel_time_t msg_rtime; /* last msgrcv time */
19 unsigned long __unused2;
20 __kernel_time_t msg_ctime; /* last change time */
21 unsigned long __unused3;
22 unsigned long msg_cbytes; /* current number of bytes on queue */
23 unsigned long msg_qnum; /* number of messages in queue */
24 unsigned long msg_qbytes; /* max number of bytes on queue */
25 __kernel_pid_t msg_lspid; /* pid of last msgsnd */
26 __kernel_pid_t msg_lrpid; /* last receive pid */
27 unsigned long __unused4;
28 unsigned long __unused5;
29};
30
31#endif /* __ASM_SH_MSGBUF_H */
diff --git a/arch/sh/include/asm/param.h b/arch/sh/include/asm/param.h
index ae245afdfd6a..965d45427975 100644
--- a/arch/sh/include/asm/param.h
+++ b/arch/sh/include/asm/param.h
@@ -1,22 +1 @@
1#ifndef __ASM_SH_PARAM_H #include <asm-generic/param.h>
2#define __ASM_SH_PARAM_H
3
4#ifdef __KERNEL__
5# define HZ CONFIG_HZ
6# define USER_HZ 100 /* User interfaces are in "ticks" */
7# define CLOCKS_PER_SEC (USER_HZ) /* frequency at which times() counts */
8#endif
9
10#ifndef HZ
11#define HZ 100
12#endif
13
14#define EXEC_PAGESIZE 4096
15
16#ifndef NOGROUP
17#define NOGROUP (-1)
18#endif
19
20#define MAXHOSTNAMELEN 64 /* max length of hostname */
21
22#endif /* __ASM_SH_PARAM_H */
diff --git a/arch/sh/include/asm/parport.h b/arch/sh/include/asm/parport.h
index f67ba60a2acd..cf252af64590 100644
--- a/arch/sh/include/asm/parport.h
+++ b/arch/sh/include/asm/parport.h
@@ -1,16 +1 @@
1/* #include <asm-generic/parport.h>
2 * Copyright (C) 1999, 2000 Tim Waugh <tim@cyberelk.demon.co.uk>
3 *
4 * This file should only be included by drivers/parport/parport_pc.c.
5 */
6#ifndef __ASM_SH_PARPORT_H
7#define __ASM_SH_PARPORT_H
8
9static int __devinit parport_pc_find_isa_ports(int autoirq, int autodma);
10
11static int __devinit parport_pc_find_nonpci_ports(int autoirq, int autodma)
12{
13 return parport_pc_find_isa_ports(autoirq, autodma);
14}
15
16#endif /* __ASM_SH_PARPORT_H */
diff --git a/arch/sh/include/asm/perf_counter.h b/arch/sh/include/asm/perf_counter.h
new file mode 100644
index 000000000000..a8153c2aa6fa
--- /dev/null
+++ b/arch/sh/include/asm/perf_counter.h
@@ -0,0 +1,7 @@
1#ifndef __ASM_SH_PERF_COUNTER_H
2#define __ASM_SH_PERF_COUNTER_H
3
4/* SH only supports software counters through this interface. */
5#define set_perf_counter_pending() do { } while (0)
6
7#endif /* __ASM_SH_PERF_COUNTER_H */
diff --git a/arch/sh/include/asm/posix_types_32.h b/arch/sh/include/asm/posix_types_32.h
index 2172732c55c8..6a9ceaaf1aea 100644
--- a/arch/sh/include/asm/posix_types_32.h
+++ b/arch/sh/include/asm/posix_types_32.h
@@ -1,118 +1,29 @@
1#ifndef __ASM_SH_POSIX_TYPES_H 1#ifndef __ASM_SH_POSIX_TYPES_32_H
2#define __ASM_SH_POSIX_TYPES_H 2#define __ASM_SH_POSIX_TYPES_32_H
3 3
4/*
5 * This file is generally used by user-level software, so you need to
6 * be a little careful about namespace pollution etc. Also, we cannot
7 * assume GCC is being used.
8 */
9
10typedef unsigned long __kernel_ino_t;
11typedef unsigned short __kernel_mode_t; 4typedef unsigned short __kernel_mode_t;
5#define __kernel_mode_t __kernel_mode_t
12typedef unsigned short __kernel_nlink_t; 6typedef unsigned short __kernel_nlink_t;
13typedef long __kernel_off_t; 7#define __kernel_nlink_t __kernel_nlink_t
14typedef int __kernel_pid_t;
15typedef unsigned short __kernel_ipc_pid_t; 8typedef unsigned short __kernel_ipc_pid_t;
9#define __kernel_ipc_pid_t __kernel_ipc_pid_t
16typedef unsigned short __kernel_uid_t; 10typedef unsigned short __kernel_uid_t;
11#define __kernel_uid_t __kernel_uid_t
17typedef unsigned short __kernel_gid_t; 12typedef unsigned short __kernel_gid_t;
18typedef unsigned int __kernel_size_t; 13#define __kernel_gid_t __kernel_gid_t
19typedef int __kernel_ssize_t; 14
20typedef int __kernel_ptrdiff_t;
21typedef long __kernel_time_t;
22typedef long __kernel_suseconds_t;
23typedef long __kernel_clock_t;
24typedef int __kernel_timer_t;
25typedef int __kernel_clockid_t;
26typedef int __kernel_daddr_t;
27typedef char * __kernel_caddr_t;
28typedef unsigned short __kernel_uid16_t;
29typedef unsigned short __kernel_gid16_t;
30typedef unsigned int __kernel_uid32_t; 15typedef unsigned int __kernel_uid32_t;
16#define __kernel_uid32_t __kernel_uid32_t
31typedef unsigned int __kernel_gid32_t; 17typedef unsigned int __kernel_gid32_t;
18#define __kernel_gid32_t __kernel_gid32_t
32 19
33typedef unsigned short __kernel_old_uid_t; 20typedef unsigned short __kernel_old_uid_t;
21#define __kernel_old_uid_t __kernel_old_uid_t
34typedef unsigned short __kernel_old_gid_t; 22typedef unsigned short __kernel_old_gid_t;
23#define __kernel_old_gid_t __kernel_old_gid_t
35typedef unsigned short __kernel_old_dev_t; 24typedef unsigned short __kernel_old_dev_t;
25#define __kernel_old_dev_t __kernel_old_dev_t
36 26
37#ifdef __GNUC__ 27#include <asm-generic/posix_types.h>
38typedef long long __kernel_loff_t;
39#endif
40
41typedef struct {
42 int val[2];
43} __kernel_fsid_t;
44
45#if defined(__KERNEL__)
46
47#undef __FD_SET
48static __inline__ void __FD_SET(unsigned long __fd, __kernel_fd_set *__fdsetp)
49{
50 unsigned long __tmp = __fd / __NFDBITS;
51 unsigned long __rem = __fd % __NFDBITS;
52 __fdsetp->fds_bits[__tmp] |= (1UL<<__rem);
53}
54
55#undef __FD_CLR
56static __inline__ void __FD_CLR(unsigned long __fd, __kernel_fd_set *__fdsetp)
57{
58 unsigned long __tmp = __fd / __NFDBITS;
59 unsigned long __rem = __fd % __NFDBITS;
60 __fdsetp->fds_bits[__tmp] &= ~(1UL<<__rem);
61}
62
63
64#undef __FD_ISSET
65static __inline__ int __FD_ISSET(unsigned long __fd, const __kernel_fd_set *__p)
66{
67 unsigned long __tmp = __fd / __NFDBITS;
68 unsigned long __rem = __fd % __NFDBITS;
69 return (__p->fds_bits[__tmp] & (1UL<<__rem)) != 0;
70}
71
72/*
73 * This will unroll the loop for the normal constant case (8 ints,
74 * for a 256-bit fd_set)
75 */
76#undef __FD_ZERO
77static __inline__ void __FD_ZERO(__kernel_fd_set *__p)
78{
79 unsigned long *__tmp = __p->fds_bits;
80 int __i;
81
82 if (__builtin_constant_p(__FDSET_LONGS)) {
83 switch (__FDSET_LONGS) {
84 case 16:
85 __tmp[ 0] = 0; __tmp[ 1] = 0;
86 __tmp[ 2] = 0; __tmp[ 3] = 0;
87 __tmp[ 4] = 0; __tmp[ 5] = 0;
88 __tmp[ 6] = 0; __tmp[ 7] = 0;
89 __tmp[ 8] = 0; __tmp[ 9] = 0;
90 __tmp[10] = 0; __tmp[11] = 0;
91 __tmp[12] = 0; __tmp[13] = 0;
92 __tmp[14] = 0; __tmp[15] = 0;
93 return;
94
95 case 8:
96 __tmp[ 0] = 0; __tmp[ 1] = 0;
97 __tmp[ 2] = 0; __tmp[ 3] = 0;
98 __tmp[ 4] = 0; __tmp[ 5] = 0;
99 __tmp[ 6] = 0; __tmp[ 7] = 0;
100 return;
101
102 case 4:
103 __tmp[ 0] = 0; __tmp[ 1] = 0;
104 __tmp[ 2] = 0; __tmp[ 3] = 0;
105 return;
106 }
107 }
108 __i = __FDSET_LONGS;
109 while (__i) {
110 __i--;
111 *__tmp = 0;
112 __tmp++;
113 }
114}
115
116#endif /* defined(__KERNEL__) */
117 28
118#endif /* __ASM_SH_POSIX_TYPES_H */ 29#endif /* __ASM_SH_POSIX_TYPES_32_H */
diff --git a/arch/sh/include/asm/posix_types_64.h b/arch/sh/include/asm/posix_types_64.h
index f83e9bd463d8..8cd11485c06b 100644
--- a/arch/sh/include/asm/posix_types_64.h
+++ b/arch/sh/include/asm/posix_types_64.h
@@ -1,127 +1,34 @@
1#ifndef __ASM_SH64_POSIX_TYPES_H 1#ifndef __ASM_SH_POSIX_TYPES_64_H
2#define __ASM_SH64_POSIX_TYPES_H 2#define __ASM_SH_POSIX_TYPES_64_H
3 3
4/*
5 * This file is subject to the terms and conditions of the GNU General Public
6 * License. See the file "COPYING" in the main directory of this archive
7 * for more details.
8 *
9 * include/asm-sh64/posix_types.h
10 *
11 * Copyright (C) 2000, 2001 Paolo Alberelli
12 * Copyright (C) 2003 Paul Mundt
13 *
14 * This file is generally used by user-level software, so you need to
15 * be a little careful about namespace pollution etc. Also, we cannot
16 * assume GCC is being used.
17 */
18
19typedef unsigned long __kernel_ino_t;
20typedef unsigned short __kernel_mode_t; 4typedef unsigned short __kernel_mode_t;
5#define __kernel_mode_t __kernel_mode_t
21typedef unsigned short __kernel_nlink_t; 6typedef unsigned short __kernel_nlink_t;
22typedef long __kernel_off_t; 7#define __kernel_nlink_t __kernel_nlink_t
23typedef int __kernel_pid_t;
24typedef unsigned short __kernel_ipc_pid_t; 8typedef unsigned short __kernel_ipc_pid_t;
9#define __kernel_ipc_pid_t __kernel_ipc_pid_t
25typedef unsigned short __kernel_uid_t; 10typedef unsigned short __kernel_uid_t;
11#define __kernel_uid_t __kernel_uid_t
26typedef unsigned short __kernel_gid_t; 12typedef unsigned short __kernel_gid_t;
13#define __kernel_gid_t __kernel_gid_t
27typedef long unsigned int __kernel_size_t; 14typedef long unsigned int __kernel_size_t;
15#define __kernel_size_t __kernel_size_t
28typedef int __kernel_ssize_t; 16typedef int __kernel_ssize_t;
17#define __kernel_ssize_t __kernel_ssize_t
29typedef int __kernel_ptrdiff_t; 18typedef int __kernel_ptrdiff_t;
30typedef long __kernel_time_t; 19#define __kernel_ptrdiff_t __kernel_ptrdiff_t
31typedef long __kernel_suseconds_t;
32typedef long __kernel_clock_t;
33typedef int __kernel_timer_t;
34typedef int __kernel_clockid_t;
35typedef int __kernel_daddr_t;
36typedef char * __kernel_caddr_t;
37typedef unsigned short __kernel_uid16_t;
38typedef unsigned short __kernel_gid16_t;
39typedef unsigned int __kernel_uid32_t; 20typedef unsigned int __kernel_uid32_t;
21#define __kernel_uid32_t __kernel_uid32_t
40typedef unsigned int __kernel_gid32_t; 22typedef unsigned int __kernel_gid32_t;
23#define __kernel_gid32_t __kernel_gid32_t
41 24
42typedef unsigned short __kernel_old_uid_t; 25typedef unsigned short __kernel_old_uid_t;
26#define __kernel_old_uid_t __kernel_old_uid_t
43typedef unsigned short __kernel_old_gid_t; 27typedef unsigned short __kernel_old_gid_t;
28#define __kernel_old_gid_t __kernel_old_gid_t
44typedef unsigned short __kernel_old_dev_t; 29typedef unsigned short __kernel_old_dev_t;
30#define __kernel_old_dev_t __kernel_old_dev_t
45 31
46#ifdef __GNUC__ 32#include <asm-generic/posix_types.h>
47typedef long long __kernel_loff_t;
48#endif
49
50typedef struct {
51 int val[2];
52} __kernel_fsid_t;
53
54#if defined(__KERNEL__)
55
56#undef __FD_SET
57static __inline__ void __FD_SET(unsigned long __fd, __kernel_fd_set *__fdsetp)
58{
59 unsigned long __tmp = __fd / __NFDBITS;
60 unsigned long __rem = __fd % __NFDBITS;
61 __fdsetp->fds_bits[__tmp] |= (1UL<<__rem);
62}
63
64#undef __FD_CLR
65static __inline__ void __FD_CLR(unsigned long __fd, __kernel_fd_set *__fdsetp)
66{
67 unsigned long __tmp = __fd / __NFDBITS;
68 unsigned long __rem = __fd % __NFDBITS;
69 __fdsetp->fds_bits[__tmp] &= ~(1UL<<__rem);
70}
71
72
73#undef __FD_ISSET
74static __inline__ int __FD_ISSET(unsigned long __fd, const __kernel_fd_set *__p)
75{
76 unsigned long __tmp = __fd / __NFDBITS;
77 unsigned long __rem = __fd % __NFDBITS;
78 return (__p->fds_bits[__tmp] & (1UL<<__rem)) != 0;
79}
80
81/*
82 * This will unroll the loop for the normal constant case (8 ints,
83 * for a 256-bit fd_set)
84 */
85#undef __FD_ZERO
86static __inline__ void __FD_ZERO(__kernel_fd_set *__p)
87{
88 unsigned long *__tmp = __p->fds_bits;
89 int __i;
90
91 if (__builtin_constant_p(__FDSET_LONGS)) {
92 switch (__FDSET_LONGS) {
93 case 16:
94 __tmp[ 0] = 0; __tmp[ 1] = 0;
95 __tmp[ 2] = 0; __tmp[ 3] = 0;
96 __tmp[ 4] = 0; __tmp[ 5] = 0;
97 __tmp[ 6] = 0; __tmp[ 7] = 0;
98 __tmp[ 8] = 0; __tmp[ 9] = 0;
99 __tmp[10] = 0; __tmp[11] = 0;
100 __tmp[12] = 0; __tmp[13] = 0;
101 __tmp[14] = 0; __tmp[15] = 0;
102 return;
103
104 case 8:
105 __tmp[ 0] = 0; __tmp[ 1] = 0;
106 __tmp[ 2] = 0; __tmp[ 3] = 0;
107 __tmp[ 4] = 0; __tmp[ 5] = 0;
108 __tmp[ 6] = 0; __tmp[ 7] = 0;
109 return;
110
111 case 4:
112 __tmp[ 0] = 0; __tmp[ 1] = 0;
113 __tmp[ 2] = 0; __tmp[ 3] = 0;
114 return;
115 }
116 }
117 __i = __FDSET_LONGS;
118 while (__i) {
119 __i--;
120 *__tmp = 0;
121 __tmp++;
122 }
123}
124
125#endif /* defined(__KERNEL__) */
126 33
127#endif /* __ASM_SH64_POSIX_TYPES_H */ 34#endif /* __ASM_SH_POSIX_TYPES_64_H */
diff --git a/arch/sh/include/asm/scatterlist.h b/arch/sh/include/asm/scatterlist.h
index c693d268a413..327cc2e4c97b 100644
--- a/arch/sh/include/asm/scatterlist.h
+++ b/arch/sh/include/asm/scatterlist.h
@@ -1,28 +1,8 @@
1#ifndef __ASM_SH_SCATTERLIST_H 1#ifndef __ASM_SH_SCATTERLIST_H
2#define __ASM_SH_SCATTERLIST_H 2#define __ASM_SH_SCATTERLIST_H
3 3
4#include <asm/types.h>
5
6struct scatterlist {
7#ifdef CONFIG_DEBUG_SG
8 unsigned long sg_magic;
9#endif
10 unsigned long page_link;
11 unsigned int offset; /* for highmem, page offset */
12 unsigned int length;
13 dma_addr_t dma_address;
14 unsigned int dma_length;
15};
16
17#define ISA_DMA_THRESHOLD PHYS_ADDR_MASK 4#define ISA_DMA_THRESHOLD PHYS_ADDR_MASK
18 5
19/* These macros should be used after a pci_map_sg call has been done 6#include <asm-generic/scatterlist.h>
20 * to get bus addresses of each of the SG entries and their lengths.
21 * You should only work with the number of sg entries pci_map_sg
22 * returns, or alternatively stop on the first sg_dma_len(sg) which
23 * is 0.
24 */
25#define sg_dma_address(sg) ((sg)->dma_address)
26#define sg_dma_len(sg) ((sg)->length)
27 7
28#endif /* !(__ASM_SH_SCATTERLIST_H) */ 8#endif /* __ASM_SH_SCATTERLIST_H */
diff --git a/arch/sh/include/asm/sembuf.h b/arch/sh/include/asm/sembuf.h
index d79f3bd570b2..7673b83cfef7 100644
--- a/arch/sh/include/asm/sembuf.h
+++ b/arch/sh/include/asm/sembuf.h
@@ -1,25 +1 @@
1#ifndef __ASM_SH_SEMBUF_H #include <asm-generic/sembuf.h>
2#define __ASM_SH_SEMBUF_H
3
4/*
5 * The semid64_ds structure for i386 architecture.
6 * Note extra padding because this structure is passed back and forth
7 * between kernel and user space.
8 *
9 * Pad space is left for:
10 * - 64-bit time_t to solve y2038 problem
11 * - 2 miscellaneous 32-bit values
12 */
13
14struct semid64_ds {
15 struct ipc64_perm sem_perm; /* permissions .. see ipc.h */
16 __kernel_time_t sem_otime; /* last semop time */
17 unsigned long __unused1;
18 __kernel_time_t sem_ctime; /* last change time */
19 unsigned long __unused2;
20 unsigned long sem_nsems; /* no. of semaphores in array */
21 unsigned long __unused3;
22 unsigned long __unused4;
23};
24
25#endif /* __ASM_SH_SEMBUF_H */
diff --git a/arch/sh/include/asm/serial.h b/arch/sh/include/asm/serial.h
index 11f854dd1363..a0cb0caff152 100644
--- a/arch/sh/include/asm/serial.h
+++ b/arch/sh/include/asm/serial.h
@@ -1,19 +1 @@
1/* #include <asm-generic/serial.h>
2 * include/asm-sh/serial.h
3 *
4 * Configuration details for 8250, 16450, 16550, etc. serial ports
5 */
6
7#ifndef _ASM_SERIAL_H
8#define _ASM_SERIAL_H
9
10/*
11 * This assumes you have a 1.8432 MHz clock for your UART.
12 *
13 * It'd be nice if someone built a serial card with a 24.576 MHz
14 * clock, since the 16550A is capable of handling a top speed of 1.5
15 * megabits/second; but this requires the faster clock.
16 */
17#define BASE_BAUD ( 1843200 / 16 )
18
19#endif /* _ASM_SERIAL_H */
diff --git a/arch/sh/include/asm/setup.h b/arch/sh/include/asm/setup.h
index d450bcf59ee2..ce3743599b27 100644
--- a/arch/sh/include/asm/setup.h
+++ b/arch/sh/include/asm/setup.h
@@ -1,7 +1,7 @@
1#ifndef _SH_SETUP_H 1#ifndef _SH_SETUP_H
2#define _SH_SETUP_H 2#define _SH_SETUP_H
3 3
4#define COMMAND_LINE_SIZE 256 4#include <asm-generic/setup.h>
5 5
6#ifdef __KERNEL__ 6#ifdef __KERNEL__
7/* 7/*
diff --git a/arch/sh/include/asm/shmbuf.h b/arch/sh/include/asm/shmbuf.h
index b2101f490521..83c05fc2de38 100644
--- a/arch/sh/include/asm/shmbuf.h
+++ b/arch/sh/include/asm/shmbuf.h
@@ -1,42 +1 @@
1#ifndef __ASM_SH_SHMBUF_H #include <asm-generic/shmbuf.h>
2#define __ASM_SH_SHMBUF_H
3
4/*
5 * The shmid64_ds structure for i386 architecture.
6 * Note extra padding because this structure is passed back and forth
7 * between kernel and user space.
8 *
9 * Pad space is left for:
10 * - 64-bit time_t to solve y2038 problem
11 * - 2 miscellaneous 32-bit values
12 */
13
14struct shmid64_ds {
15 struct ipc64_perm shm_perm; /* operation perms */
16 size_t shm_segsz; /* size of segment (bytes) */
17 __kernel_time_t shm_atime; /* last attach time */
18 unsigned long __unused1;
19 __kernel_time_t shm_dtime; /* last detach time */
20 unsigned long __unused2;
21 __kernel_time_t shm_ctime; /* last change time */
22 unsigned long __unused3;
23 __kernel_pid_t shm_cpid; /* pid of creator */
24 __kernel_pid_t shm_lpid; /* pid of last operator */
25 unsigned long shm_nattch; /* no. of current attaches */
26 unsigned long __unused4;
27 unsigned long __unused5;
28};
29
30struct shminfo64 {
31 unsigned long shmmax;
32 unsigned long shmmin;
33 unsigned long shmmni;
34 unsigned long shmseg;
35 unsigned long shmall;
36 unsigned long __unused1;
37 unsigned long __unused2;
38 unsigned long __unused3;
39 unsigned long __unused4;
40};
41
42#endif /* __ASM_SH_SHMBUF_H */
diff --git a/arch/sh/include/asm/signal.h b/arch/sh/include/asm/signal.h
index 9cc5f0144689..9ac530a90bce 100644
--- a/arch/sh/include/asm/signal.h
+++ b/arch/sh/include/asm/signal.h
@@ -1,114 +1,10 @@
1#ifndef __ASM_SH_SIGNAL_H 1#ifndef __ASM_SH_SIGNAL_H
2#define __ASM_SH_SIGNAL_H 2#define __ASM_SH_SIGNAL_H
3 3
4#include <linux/types.h>
5
6/* Avoid too many header ordering problems. */
7struct pt_regs;
8struct siginfo;
9
10#ifdef __KERNEL__
11/* Most things should be clean enough to redefine this at will, if care
12 is taken to make libc match. */
13
14#define _NSIG 64
15#define _NSIG_BPW 32
16#define _NSIG_WORDS (_NSIG / _NSIG_BPW)
17
18typedef unsigned long old_sigset_t; /* at least 32 bits */
19
20typedef struct {
21 unsigned long sig[_NSIG_WORDS];
22} sigset_t;
23
24#else
25/* Here we must cater to libcs that poke about in kernel headers. */
26
27#define NSIG 32
28typedef unsigned long sigset_t;
29
30#endif /* __KERNEL__ */
31
32#define SIGHUP 1
33#define SIGINT 2
34#define SIGQUIT 3
35#define SIGILL 4
36#define SIGTRAP 5
37#define SIGABRT 6
38#define SIGIOT 6
39#define SIGBUS 7
40#define SIGFPE 8
41#define SIGKILL 9
42#define SIGUSR1 10
43#define SIGSEGV 11
44#define SIGUSR2 12
45#define SIGPIPE 13
46#define SIGALRM 14
47#define SIGTERM 15
48#define SIGSTKFLT 16
49#define SIGCHLD 17
50#define SIGCONT 18
51#define SIGSTOP 19
52#define SIGTSTP 20
53#define SIGTTIN 21
54#define SIGTTOU 22
55#define SIGURG 23
56#define SIGXCPU 24
57#define SIGXFSZ 25
58#define SIGVTALRM 26
59#define SIGPROF 27
60#define SIGWINCH 28
61#define SIGIO 29
62#define SIGPOLL SIGIO
63/*
64#define SIGLOST 29
65*/
66#define SIGPWR 30
67#define SIGSYS 31
68#define SIGUNUSED 31
69
70/* These should not be considered constants from userland. */
71#define SIGRTMIN 32
72#define SIGRTMAX _NSIG
73
74/*
75 * SA_FLAGS values:
76 *
77 * SA_ONSTACK indicates that a registered stack_t will be used.
78 * SA_RESTART flag to get restarting signals (which were the default long ago)
79 * SA_NOCLDSTOP flag to turn off SIGCHLD when children stop.
80 * SA_RESETHAND clears the handler when the signal is delivered.
81 * SA_NOCLDWAIT flag on SIGCHLD to inhibit zombies.
82 * SA_NODEFER prevents the current signal from being masked in the handler.
83 *
84 * SA_ONESHOT and SA_NOMASK are the historical Linux names for the Single
85 * Unix names RESETHAND and NODEFER respectively.
86 */
87#define SA_NOCLDSTOP 0x00000001
88#define SA_NOCLDWAIT 0x00000002
89#define SA_SIGINFO 0x00000004
90#define SA_ONSTACK 0x08000000
91#define SA_RESTART 0x10000000
92#define SA_NODEFER 0x40000000
93#define SA_RESETHAND 0x80000000
94
95#define SA_NOMASK SA_NODEFER
96#define SA_ONESHOT SA_RESETHAND
97
98#define SA_RESTORER 0x04000000 4#define SA_RESTORER 0x04000000
99 5
100/* 6#include <asm-generic/signal.h>
101 * sigaltstack controls
102 */
103#define SS_ONSTACK 1
104#define SS_DISABLE 2
105
106#define MINSIGSTKSZ 2048
107#define SIGSTKSZ 8192
108 7
109#include <asm-generic/signal-defs.h>
110
111#ifdef __KERNEL__
112struct old_sigaction { 8struct old_sigaction {
113 __sighandler_t sa_handler; 9 __sighandler_t sa_handler;
114 old_sigset_t sa_mask; 10 old_sigset_t sa_mask;
@@ -116,45 +12,4 @@ struct old_sigaction {
116 void (*sa_restorer)(void); 12 void (*sa_restorer)(void);
117}; 13};
118 14
119struct sigaction {
120 __sighandler_t sa_handler;
121 unsigned long sa_flags;
122 void (*sa_restorer)(void);
123 sigset_t sa_mask; /* mask last for extensibility */
124};
125
126struct k_sigaction {
127 struct sigaction sa;
128};
129#else
130/* Here we must cater to libcs that poke about in kernel headers. */
131
132struct sigaction {
133 union {
134 __sighandler_t _sa_handler;
135 void (*_sa_sigaction)(int, struct siginfo *, void *);
136 } _u;
137 sigset_t sa_mask;
138 unsigned long sa_flags;
139 void (*sa_restorer)(void);
140};
141
142#define sa_handler _u._sa_handler
143#define sa_sigaction _u._sa_sigaction
144
145#endif /* __KERNEL__ */
146
147typedef struct sigaltstack {
148 void *ss_sp;
149 int ss_flags;
150 size_t ss_size;
151} stack_t;
152
153#ifdef __KERNEL__
154#include <asm/sigcontext.h>
155
156#define ptrace_signal_deliver(regs, cookie) do { } while (0)
157
158#endif /* __KERNEL__ */
159
160#endif /* __ASM_SH_SIGNAL_H */ 15#endif /* __ASM_SH_SIGNAL_H */
diff --git a/arch/sh/include/asm/smp.h b/arch/sh/include/asm/smp.h
index c24e9c6a1736..ca64f43abe67 100644
--- a/arch/sh/include/asm/smp.h
+++ b/arch/sh/include/asm/smp.h
@@ -43,7 +43,8 @@ void plat_start_cpu(unsigned int cpu, unsigned long entry_point);
43void plat_send_ipi(unsigned int cpu, unsigned int message); 43void plat_send_ipi(unsigned int cpu, unsigned int message);
44 44
45void arch_send_call_function_single_ipi(int cpu); 45void arch_send_call_function_single_ipi(int cpu);
46void arch_send_call_function_ipi(cpumask_t mask); 46extern void arch_send_call_function_ipi_mask(const struct cpumask *mask);
47#define arch_send_call_function_ipi_mask arch_send_call_function_ipi_mask
47 48
48#else 49#else
49 50
diff --git a/arch/sh/include/asm/socket.h b/arch/sh/include/asm/socket.h
index 345653b96826..6b71384b9d8b 100644
--- a/arch/sh/include/asm/socket.h
+++ b/arch/sh/include/asm/socket.h
@@ -1,60 +1 @@
1#ifndef __ASM_SH_SOCKET_H #include <asm-generic/socket.h>
2#define __ASM_SH_SOCKET_H
3
4#include <asm/sockios.h>
5
6/* For setsockopt(2) */
7#define SOL_SOCKET 1
8
9#define SO_DEBUG 1
10#define SO_REUSEADDR 2
11#define SO_TYPE 3
12#define SO_ERROR 4
13#define SO_DONTROUTE 5
14#define SO_BROADCAST 6
15#define SO_SNDBUF 7
16#define SO_RCVBUF 8
17#define SO_RCVBUFFORCE 32
18#define SO_SNDBUFFORCE 33
19#define SO_KEEPALIVE 9
20#define SO_OOBINLINE 10
21#define SO_NO_CHECK 11
22#define SO_PRIORITY 12
23#define SO_LINGER 13
24#define SO_BSDCOMPAT 14
25/* To add :#define SO_REUSEPORT 15 */
26#define SO_PASSCRED 16
27#define SO_PEERCRED 17
28#define SO_RCVLOWAT 18
29#define SO_SNDLOWAT 19
30#define SO_RCVTIMEO 20
31#define SO_SNDTIMEO 21
32
33/* Security levels - as per NRL IPv6 - don't actually do anything */
34#define SO_SECURITY_AUTHENTICATION 22
35#define SO_SECURITY_ENCRYPTION_TRANSPORT 23
36#define SO_SECURITY_ENCRYPTION_NETWORK 24
37
38#define SO_BINDTODEVICE 25
39
40/* Socket filtering */
41#define SO_ATTACH_FILTER 26
42#define SO_DETACH_FILTER 27
43
44#define SO_PEERNAME 28
45#define SO_TIMESTAMP 29
46#define SCM_TIMESTAMP SO_TIMESTAMP
47
48#define SO_ACCEPTCONN 30
49
50#define SO_PEERSEC 31
51#define SO_PASSSEC 34
52#define SO_TIMESTAMPNS 35
53#define SCM_TIMESTAMPNS SO_TIMESTAMPNS
54
55#define SO_MARK 36
56
57#define SO_TIMESTAMPING 37
58#define SCM_TIMESTAMPING SO_TIMESTAMPING
59
60#endif /* __ASM_SH_SOCKET_H */
diff --git a/arch/sh/include/asm/swab.h b/arch/sh/include/asm/swab.h
index 0e08fe54ad71..1cd09767a7a3 100644
--- a/arch/sh/include/asm/swab.h
+++ b/arch/sh/include/asm/swab.h
@@ -7,8 +7,7 @@
7 */ 7 */
8#include <linux/compiler.h> 8#include <linux/compiler.h>
9#include <linux/types.h> 9#include <linux/types.h>
10 10#include <asm-generic/swab.h>
11#define __SWAB_64_THRU_32__
12 11
13static inline __attribute_const__ __u32 __arch_swab32(__u32 x) 12static inline __attribute_const__ __u32 __arch_swab32(__u32 x)
14{ 13{
diff --git a/arch/sh/include/asm/termbits.h b/arch/sh/include/asm/termbits.h
index 77db116948cf..3935b106de79 100644
--- a/arch/sh/include/asm/termbits.h
+++ b/arch/sh/include/asm/termbits.h
@@ -1,198 +1 @@
1#ifndef __ASM_SH_TERMBITS_H #include <asm-generic/termbits.h>
2#define __ASM_SH_TERMBITS_H
3
4#include <linux/posix_types.h>
5
6typedef unsigned char cc_t;
7typedef unsigned int speed_t;
8typedef unsigned int tcflag_t;
9
10#define NCCS 19
11struct termios {
12 tcflag_t c_iflag; /* input mode flags */
13 tcflag_t c_oflag; /* output mode flags */
14 tcflag_t c_cflag; /* control mode flags */
15 tcflag_t c_lflag; /* local mode flags */
16 cc_t c_line; /* line discipline */
17 cc_t c_cc[NCCS]; /* control characters */
18};
19
20struct termios2 {
21 tcflag_t c_iflag; /* input mode flags */
22 tcflag_t c_oflag; /* output mode flags */
23 tcflag_t c_cflag; /* control mode flags */
24 tcflag_t c_lflag; /* local mode flags */
25 cc_t c_line; /* line discipline */
26 cc_t c_cc[NCCS]; /* control characters */
27 speed_t c_ispeed; /* input speed */
28 speed_t c_ospeed; /* output speed */
29};
30
31struct ktermios {
32 tcflag_t c_iflag; /* input mode flags */
33 tcflag_t c_oflag; /* output mode flags */
34 tcflag_t c_cflag; /* control mode flags */
35 tcflag_t c_lflag; /* local mode flags */
36 cc_t c_line; /* line discipline */
37 cc_t c_cc[NCCS]; /* control characters */
38 speed_t c_ispeed; /* input speed */
39 speed_t c_ospeed; /* output speed */
40};
41
42/* c_cc characters */
43#define VINTR 0
44#define VQUIT 1
45#define VERASE 2
46#define VKILL 3
47#define VEOF 4
48#define VTIME 5
49#define VMIN 6
50#define VSWTC 7
51#define VSTART 8
52#define VSTOP 9
53#define VSUSP 10
54#define VEOL 11
55#define VREPRINT 12
56#define VDISCARD 13
57#define VWERASE 14
58#define VLNEXT 15
59#define VEOL2 16
60
61/* c_iflag bits */
62#define IGNBRK 0000001
63#define BRKINT 0000002
64#define IGNPAR 0000004
65#define PARMRK 0000010
66#define INPCK 0000020
67#define ISTRIP 0000040
68#define INLCR 0000100
69#define IGNCR 0000200
70#define ICRNL 0000400
71#define IUCLC 0001000
72#define IXON 0002000
73#define IXANY 0004000
74#define IXOFF 0010000
75#define IMAXBEL 0020000
76#define IUTF8 0040000
77
78/* c_oflag bits */
79#define OPOST 0000001
80#define OLCUC 0000002
81#define ONLCR 0000004
82#define OCRNL 0000010
83#define ONOCR 0000020
84#define ONLRET 0000040
85#define OFILL 0000100
86#define OFDEL 0000200
87#define NLDLY 0000400
88#define NL0 0000000
89#define NL1 0000400
90#define CRDLY 0003000
91#define CR0 0000000
92#define CR1 0001000
93#define CR2 0002000
94#define CR3 0003000
95#define TABDLY 0014000
96#define TAB0 0000000
97#define TAB1 0004000
98#define TAB2 0010000
99#define TAB3 0014000
100#define XTABS 0014000
101#define BSDLY 0020000
102#define BS0 0000000
103#define BS1 0020000
104#define VTDLY 0040000
105#define VT0 0000000
106#define VT1 0040000
107#define FFDLY 0100000
108#define FF0 0000000
109#define FF1 0100000
110
111/* c_cflag bit meaning */
112#define CBAUD 0010017
113#define B0 0000000 /* hang up */
114#define B50 0000001
115#define B75 0000002
116#define B110 0000003
117#define B134 0000004
118#define B150 0000005
119#define B200 0000006
120#define B300 0000007
121#define B600 0000010
122#define B1200 0000011
123#define B1800 0000012
124#define B2400 0000013
125#define B4800 0000014
126#define B9600 0000015
127#define B19200 0000016
128#define B38400 0000017
129#define EXTA B19200
130#define EXTB B38400
131#define CSIZE 0000060
132#define CS5 0000000
133#define CS6 0000020
134#define CS7 0000040
135#define CS8 0000060
136#define CSTOPB 0000100
137#define CREAD 0000200
138#define PARENB 0000400
139#define PARODD 0001000
140#define HUPCL 0002000
141#define CLOCAL 0004000
142#define CBAUDEX 0010000
143#define BOTHER 0010000
144#define B57600 0010001
145#define B115200 0010002
146#define B230400 0010003
147#define B460800 0010004
148#define B500000 0010005
149#define B576000 0010006
150#define B921600 0010007
151#define B1000000 0010010
152#define B1152000 0010011
153#define B1500000 0010012
154#define B2000000 0010013
155#define B2500000 0010014
156#define B3000000 0010015
157#define B3500000 0010016
158#define B4000000 0010017
159#define CIBAUD 002003600000 /* input baud rate */
160#define CMSPAR 010000000000 /* mark or space (stick) parity */
161#define CRTSCTS 020000000000 /* flow control */
162
163#define IBSHIFT 16 /* Shift from CBAUD to CIBAUD */
164
165/* c_lflag bits */
166#define ISIG 0000001
167#define ICANON 0000002
168#define XCASE 0000004
169#define ECHO 0000010
170#define ECHOE 0000020
171#define ECHOK 0000040
172#define ECHONL 0000100
173#define NOFLSH 0000200
174#define TOSTOP 0000400
175#define ECHOCTL 0001000
176#define ECHOPRT 0002000
177#define ECHOKE 0004000
178#define FLUSHO 0010000
179#define PENDIN 0040000
180#define IEXTEN 0100000
181
182/* tcflow() and TCXONC use these */
183#define TCOOFF 0
184#define TCOON 1
185#define TCIOFF 2
186#define TCION 3
187
188/* tcflush() and TCFLSH use these */
189#define TCIFLUSH 0
190#define TCOFLUSH 1
191#define TCIOFLUSH 2
192
193/* tcsetattr uses these */
194#define TCSANOW 0
195#define TCSADRAIN 1
196#define TCSAFLUSH 2
197
198#endif /* __ASM_SH_TERMBITS_H */
diff --git a/arch/sh/include/asm/termios.h b/arch/sh/include/asm/termios.h
index 0a8c793c76f2..280d78a9d966 100644
--- a/arch/sh/include/asm/termios.h
+++ b/arch/sh/include/asm/termios.h
@@ -1,90 +1 @@
1#ifndef __ASM_SH_TERMIOS_H #include <asm-generic/termios.h>
2#define __ASM_SH_TERMIOS_H
3
4#include <asm/termbits.h>
5#include <asm/ioctls.h>
6
7struct winsize {
8 unsigned short ws_row;
9 unsigned short ws_col;
10 unsigned short ws_xpixel;
11 unsigned short ws_ypixel;
12};
13
14#define NCC 8
15struct termio {
16 unsigned short c_iflag; /* input mode flags */
17 unsigned short c_oflag; /* output mode flags */
18 unsigned short c_cflag; /* control mode flags */
19 unsigned short c_lflag; /* local mode flags */
20 unsigned char c_line; /* line discipline */
21 unsigned char c_cc[NCC]; /* control characters */
22};
23
24/* modem lines */
25#define TIOCM_LE 0x001
26#define TIOCM_DTR 0x002
27#define TIOCM_RTS 0x004
28#define TIOCM_ST 0x008
29#define TIOCM_SR 0x010
30#define TIOCM_CTS 0x020
31#define TIOCM_CAR 0x040
32#define TIOCM_RNG 0x080
33#define TIOCM_DSR 0x100
34#define TIOCM_CD TIOCM_CAR
35#define TIOCM_RI TIOCM_RNG
36#define TIOCM_OUT1 0x2000
37#define TIOCM_OUT2 0x4000
38#define TIOCM_LOOP 0x8000
39
40/* ioctl (fd, TIOCSERGETLSR, &result) where result may be as below */
41
42#ifdef __KERNEL__
43
44/* intr=^C quit=^\ erase=del kill=^U
45 eof=^D vtime=\0 vmin=\1 sxtc=\0
46 start=^Q stop=^S susp=^Z eol=\0
47 reprint=^R discard=^U werase=^W lnext=^V
48 eol2=\0
49*/
50#define INIT_C_CC "\003\034\177\025\004\0\1\0\021\023\032\0\022\017\027\026\0"
51
52/*
53 * Translate a "termio" structure into a "termios". Ugh.
54 */
55#define SET_LOW_TERMIOS_BITS(termios, termio, x) { \
56 unsigned short __tmp; \
57 get_user(__tmp,&(termio)->x); \
58 *(unsigned short *) &(termios)->x = __tmp; \
59}
60
61#define user_termio_to_kernel_termios(termios, termio) \
62({ \
63 SET_LOW_TERMIOS_BITS(termios, termio, c_iflag); \
64 SET_LOW_TERMIOS_BITS(termios, termio, c_oflag); \
65 SET_LOW_TERMIOS_BITS(termios, termio, c_cflag); \
66 SET_LOW_TERMIOS_BITS(termios, termio, c_lflag); \
67 copy_from_user((termios)->c_cc, (termio)->c_cc, NCC); \
68})
69
70/*
71 * Translate a "termios" structure into a "termio". Ugh.
72 */
73#define kernel_termios_to_user_termio(termio, termios) \
74({ \
75 put_user((termios)->c_iflag, &(termio)->c_iflag); \
76 put_user((termios)->c_oflag, &(termio)->c_oflag); \
77 put_user((termios)->c_cflag, &(termio)->c_cflag); \
78 put_user((termios)->c_lflag, &(termio)->c_lflag); \
79 put_user((termios)->c_line, &(termio)->c_line); \
80 copy_to_user((termio)->c_cc, (termios)->c_cc, NCC); \
81})
82
83#define user_termios_to_kernel_termios(k, u) copy_from_user(k, u, sizeof(struct termios2))
84#define kernel_termios_to_user_termios(u, k) copy_to_user(u, k, sizeof(struct termios2))
85#define user_termios_to_kernel_termios_1(k, u) copy_from_user(k, u, sizeof(struct termios))
86#define kernel_termios_to_user_termios_1(u, k) copy_to_user(u, k, sizeof(struct termios))
87
88#endif /* __KERNEL__ */
89
90#endif /* __ASM_SH_TERMIOS_H */
diff --git a/arch/sh/include/asm/timex.h b/arch/sh/include/asm/timex.h
index a873e24113cf..b556d49e5f2b 100644
--- a/arch/sh/include/asm/timex.h
+++ b/arch/sh/include/asm/timex.h
@@ -8,11 +8,6 @@
8 8
9#define CLOCK_TICK_RATE (CONFIG_SH_PCLK_FREQ / 4) /* Underlying HZ */ 9#define CLOCK_TICK_RATE (CONFIG_SH_PCLK_FREQ / 4) /* Underlying HZ */
10 10
11typedef unsigned long long cycles_t; 11#include <asm-generic/timex.h>
12
13static __inline__ cycles_t get_cycles (void)
14{
15 return 0;
16}
17 12
18#endif /* __ASM_SH_TIMEX_H */ 13#endif /* __ASM_SH_TIMEX_H */
diff --git a/arch/sh/include/asm/topology.h b/arch/sh/include/asm/topology.h
index 8489a0905a87..b69ee850906d 100644
--- a/arch/sh/include/asm/topology.h
+++ b/arch/sh/include/asm/topology.h
@@ -35,9 +35,6 @@
35#define cpumask_of_node(node) ((void)node, cpu_online_mask) 35#define cpumask_of_node(node) ((void)node, cpu_online_mask)
36 36
37#define pcibus_to_node(bus) ((void)(bus), -1) 37#define pcibus_to_node(bus) ((void)(bus), -1)
38#define pcibus_to_cpumask(bus) (pcibus_to_node(bus) == -1 ? \
39 CPU_MASK_ALL : \
40 node_to_cpumask(pcibus_to_node(bus)))
41#define cpumask_of_pcibus(bus) (pcibus_to_node(bus) == -1 ? \ 38#define cpumask_of_pcibus(bus) (pcibus_to_node(bus) == -1 ? \
42 CPU_MASK_ALL_PTR : \ 39 CPU_MASK_ALL_PTR : \
43 cpumask_of_node(pcibus_to_node(bus))) 40 cpumask_of_node(pcibus_to_node(bus)))
diff --git a/arch/sh/include/asm/types.h b/arch/sh/include/asm/types.h
index b13caca62a76..c7f3c94837dd 100644
--- a/arch/sh/include/asm/types.h
+++ b/arch/sh/include/asm/types.h
@@ -1,27 +1,14 @@
1#ifndef __ASM_SH_TYPES_H 1#ifndef __ASM_SH_TYPES_H
2#define __ASM_SH_TYPES_H 2#define __ASM_SH_TYPES_H
3 3
4#include <asm-generic/int-ll64.h> 4#include <asm-generic/types.h>
5
6#ifndef __ASSEMBLY__
7
8typedef unsigned short umode_t;
9
10#endif /* __ASSEMBLY__ */
11 5
12/* 6/*
13 * These aren't exported outside the kernel to avoid name space clashes 7 * These aren't exported outside the kernel to avoid name space clashes
14 */ 8 */
15#ifdef __KERNEL__ 9#ifdef __KERNEL__
16
17#define BITS_PER_LONG 32
18
19#ifndef __ASSEMBLY__ 10#ifndef __ASSEMBLY__
20 11
21/* Dma addresses are 32-bits wide. */
22
23typedef u32 dma_addr_t;
24
25#ifdef CONFIG_SUPERH32 12#ifdef CONFIG_SUPERH32
26typedef u16 insn_size_t; 13typedef u16 insn_size_t;
27#else 14#else
@@ -29,7 +16,6 @@ typedef u32 insn_size_t;
29#endif 16#endif
30 17
31#endif /* __ASSEMBLY__ */ 18#endif /* __ASSEMBLY__ */
32
33#endif /* __KERNEL__ */ 19#endif /* __KERNEL__ */
34 20
35#endif /* __ASM_SH_TYPES_H */ 21#endif /* __ASM_SH_TYPES_H */
diff --git a/arch/sh/include/asm/ucontext.h b/arch/sh/include/asm/ucontext.h
index 202ef1d5a3c4..9bc07b9f30fb 100644
--- a/arch/sh/include/asm/ucontext.h
+++ b/arch/sh/include/asm/ucontext.h
@@ -1,12 +1 @@
1#ifndef __ASM_SH_UCONTEXT_H #include <asm-generic/ucontext.h>
2#define __ASM_SH_UCONTEXT_H
3
4struct ucontext {
5 unsigned long uc_flags;
6 struct ucontext *uc_link;
7 stack_t uc_stack;
8 struct sigcontext uc_mcontext;
9 sigset_t uc_sigmask; /* mask last for extensibility */
10};
11
12#endif /* __ASM_SH_UCONTEXT_H */
diff --git a/arch/sh/include/asm/unaligned.h b/arch/sh/include/asm/unaligned.h
index 8c0ad5e4487a..7d14e0669961 100644
--- a/arch/sh/include/asm/unaligned.h
+++ b/arch/sh/include/asm/unaligned.h
@@ -6,19 +6,7 @@
6#include <asm/unaligned-sh4a.h> 6#include <asm/unaligned-sh4a.h>
7#else 7#else
8/* Otherwise, SH can't handle unaligned accesses. */ 8/* Otherwise, SH can't handle unaligned accesses. */
9#ifdef __LITTLE_ENDIAN__ 9#include <asm-generic/unaligned.h>
10# include <linux/unaligned/le_struct.h>
11# include <linux/unaligned/be_byteshift.h>
12# include <linux/unaligned/generic.h>
13# define get_unaligned __get_unaligned_le
14# define put_unaligned __put_unaligned_le
15#else
16# include <linux/unaligned/be_struct.h>
17# include <linux/unaligned/le_byteshift.h>
18# include <linux/unaligned/generic.h>
19# define get_unaligned __get_unaligned_be
20# define put_unaligned __put_unaligned_be
21#endif
22#endif 10#endif
23 11
24#endif /* _ASM_SH_UNALIGNED_H */ 12#endif /* _ASM_SH_UNALIGNED_H */
diff --git a/arch/sh/include/asm/unistd_32.h b/arch/sh/include/asm/unistd_32.h
index 65197086a1c5..61d6ad93d786 100644
--- a/arch/sh/include/asm/unistd_32.h
+++ b/arch/sh/include/asm/unistd_32.h
@@ -344,8 +344,9 @@
344#define __NR_preadv 333 344#define __NR_preadv 333
345#define __NR_pwritev 334 345#define __NR_pwritev 334
346#define __NR_rt_tgsigqueueinfo 335 346#define __NR_rt_tgsigqueueinfo 335
347#define __NR_perf_counter_open 336
347 348
348#define NR_syscalls 336 349#define NR_syscalls 337
349 350
350#ifdef __KERNEL__ 351#ifdef __KERNEL__
351 352
diff --git a/arch/sh/include/asm/unistd_64.h b/arch/sh/include/asm/unistd_64.h
index 8014aea88ec3..a751699afda3 100644
--- a/arch/sh/include/asm/unistd_64.h
+++ b/arch/sh/include/asm/unistd_64.h
@@ -384,10 +384,11 @@
384#define __NR_preadv 361 384#define __NR_preadv 361
385#define __NR_pwritev 362 385#define __NR_pwritev 362
386#define __NR_rt_tgsigqueueinfo 363 386#define __NR_rt_tgsigqueueinfo 363
387#define __NR_perf_counter_open 364
387 388
388#ifdef __KERNEL__ 389#ifdef __KERNEL__
389 390
390#define NR_syscalls 364 391#define NR_syscalls 365
391 392
392#define __ARCH_WANT_IPC_PARSE_VERSION 393#define __ARCH_WANT_IPC_PARSE_VERSION
393#define __ARCH_WANT_OLD_READDIR 394#define __ARCH_WANT_OLD_READDIR
diff --git a/arch/sh/include/mach-common/mach/highlander.h b/arch/sh/include/mach-common/mach/highlander.h
index bd26a848cb0b..5d9d4d5154be 100644
--- a/arch/sh/include/mach-common/mach/highlander.h
+++ b/arch/sh/include/mach-common/mach/highlander.h
@@ -2,6 +2,9 @@
2#define __ASM_SH_RENESAS_R7780RP_H 2#define __ASM_SH_RENESAS_R7780RP_H
3 3
4/* Box specific addresses. */ 4/* Box specific addresses. */
5#define PA_NORFLASH_ADDR 0x00000000
6#define PA_NORFLASH_SIZE 0x04000000
7
5#if defined(CONFIG_SH_R7780MP) 8#if defined(CONFIG_SH_R7780MP)
6#define PA_BCR 0xa4000000 /* FPGA */ 9#define PA_BCR 0xa4000000 /* FPGA */
7#define PA_SDPOW (-1) 10#define PA_SDPOW (-1)
diff --git a/arch/sh/kernel/cpu/clock-cpg.c b/arch/sh/kernel/cpu/clock-cpg.c
index 275942e58e4f..6dfe2cced3fc 100644
--- a/arch/sh/kernel/cpu/clock-cpg.c
+++ b/arch/sh/kernel/cpu/clock-cpg.c
@@ -1,6 +1,6 @@
1#include <linux/clk.h> 1#include <linux/clk.h>
2#include <linux/compiler.h> 2#include <linux/compiler.h>
3#include <linux/bootmem.h> 3#include <linux/slab.h>
4#include <linux/io.h> 4#include <linux/io.h>
5#include <asm/clock.h> 5#include <asm/clock.h>
6 6
@@ -127,10 +127,11 @@ int __init sh_clk_div6_register(struct clk *clks, int nr)
127 int k; 127 int k;
128 128
129 freq_table_size *= (nr_divs + 1); 129 freq_table_size *= (nr_divs + 1);
130 130 freq_table = kzalloc(freq_table_size * nr, GFP_KERNEL);
131 freq_table = alloc_bootmem(freq_table_size * nr); 131 if (!freq_table) {
132 if (!freq_table) 132 pr_err("sh_clk_div6_register: unable to alloc memory\n");
133 return -ENOMEM; 133 return -ENOMEM;
134 }
134 135
135 for (k = 0; !ret && (k < nr); k++) { 136 for (k = 0; !ret && (k < nr); k++) {
136 clkp = clks + k; 137 clkp = clks + k;
@@ -175,10 +176,11 @@ int __init sh_clk_div4_register(struct clk *clks, int nr,
175 int k; 176 int k;
176 177
177 freq_table_size *= (nr_divs + 1); 178 freq_table_size *= (nr_divs + 1);
178 179 freq_table = kzalloc(freq_table_size * nr, GFP_KERNEL);
179 freq_table = alloc_bootmem(freq_table_size * nr); 180 if (!freq_table) {
180 if (!freq_table) 181 pr_err("sh_clk_div4_register: unable to alloc memory\n");
181 return -ENOMEM; 182 return -ENOMEM;
183 }
182 184
183 for (k = 0; !ret && (k < nr); k++) { 185 for (k = 0; !ret && (k < nr); k++) {
184 clkp = clks + k; 186 clkp = clks + k;
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7366.c b/arch/sh/kernel/cpu/sh4a/setup-sh7366.c
index 318516f6bfad..c18f7d09281b 100644
--- a/arch/sh/kernel/cpu/sh4a/setup-sh7366.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-sh7366.c
@@ -15,6 +15,7 @@
15#include <linux/serial_sci.h> 15#include <linux/serial_sci.h>
16#include <linux/uio_driver.h> 16#include <linux/uio_driver.h>
17#include <linux/sh_timer.h> 17#include <linux/sh_timer.h>
18#include <linux/usb/r8a66597.h>
18#include <asm/clock.h> 19#include <asm/clock.h>
19 20
20static struct resource iic_resources[] = { 21static struct resource iic_resources[] = {
@@ -38,18 +39,20 @@ static struct platform_device iic_device = {
38 .resource = iic_resources, 39 .resource = iic_resources,
39}; 40};
40 41
42static struct r8a66597_platdata r8a66597_data = {
43 /* This set zero to all members */
44};
45
41static struct resource usb_host_resources[] = { 46static struct resource usb_host_resources[] = {
42 [0] = { 47 [0] = {
43 .name = "r8a66597_hcd",
44 .start = 0xa4d80000, 48 .start = 0xa4d80000,
45 .end = 0xa4d800ff, 49 .end = 0xa4d800ff,
46 .flags = IORESOURCE_MEM, 50 .flags = IORESOURCE_MEM,
47 }, 51 },
48 [1] = { 52 [1] = {
49 .name = "r8a66597_hcd",
50 .start = 65, 53 .start = 65,
51 .end = 65, 54 .end = 65,
52 .flags = IORESOURCE_IRQ, 55 .flags = IORESOURCE_IRQ | IRQF_TRIGGER_LOW,
53 }, 56 },
54}; 57};
55 58
@@ -59,6 +62,7 @@ static struct platform_device usb_host_device = {
59 .dev = { 62 .dev = {
60 .dma_mask = NULL, 63 .dma_mask = NULL,
61 .coherent_dma_mask = 0xffffffff, 64 .coherent_dma_mask = 0xffffffff,
65 .platform_data = &r8a66597_data,
62 }, 66 },
63 .num_resources = ARRAY_SIZE(usb_host_resources), 67 .num_resources = ARRAY_SIZE(usb_host_resources),
64 .resource = usb_host_resources, 68 .resource = usb_host_resources,
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7723.c b/arch/sh/kernel/cpu/sh4a/setup-sh7723.c
index d8f4a13aeff9..e1bb80b2a27b 100644
--- a/arch/sh/kernel/cpu/sh4a/setup-sh7723.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-sh7723.c
@@ -13,6 +13,7 @@
13#include <linux/mm.h> 13#include <linux/mm.h>
14#include <linux/serial_sci.h> 14#include <linux/serial_sci.h>
15#include <linux/uio_driver.h> 15#include <linux/uio_driver.h>
16#include <linux/usb/r8a66597.h>
16#include <linux/sh_timer.h> 17#include <linux/sh_timer.h>
17#include <linux/io.h> 18#include <linux/io.h>
18#include <asm/clock.h> 19#include <asm/clock.h>
@@ -396,9 +397,12 @@ static struct platform_device rtc_device = {
396 .resource = rtc_resources, 397 .resource = rtc_resources,
397}; 398};
398 399
400static struct r8a66597_platdata r8a66597_data = {
401 /* This set zero to all members */
402};
403
399static struct resource sh7723_usb_host_resources[] = { 404static struct resource sh7723_usb_host_resources[] = {
400 [0] = { 405 [0] = {
401 .name = "r8a66597_hcd",
402 .start = 0xa4d80000, 406 .start = 0xa4d80000,
403 .end = 0xa4d800ff, 407 .end = 0xa4d800ff,
404 .flags = IORESOURCE_MEM, 408 .flags = IORESOURCE_MEM,
@@ -406,7 +410,7 @@ static struct resource sh7723_usb_host_resources[] = {
406 [1] = { 410 [1] = {
407 .start = 65, 411 .start = 65,
408 .end = 65, 412 .end = 65,
409 .flags = IORESOURCE_IRQ, 413 .flags = IORESOURCE_IRQ | IRQF_TRIGGER_LOW,
410 }, 414 },
411}; 415};
412 416
@@ -416,6 +420,7 @@ static struct platform_device sh7723_usb_host_device = {
416 .dev = { 420 .dev = {
417 .dma_mask = NULL, /* not use dma */ 421 .dma_mask = NULL, /* not use dma */
418 .coherent_dma_mask = 0xffffffff, 422 .coherent_dma_mask = 0xffffffff,
423 .platform_data = &r8a66597_data,
419 }, 424 },
420 .num_resources = ARRAY_SIZE(sh7723_usb_host_resources), 425 .num_resources = ARRAY_SIZE(sh7723_usb_host_resources),
421 .resource = sh7723_usb_host_resources, 426 .resource = sh7723_usb_host_resources,
diff --git a/arch/sh/kernel/cpu/sh4a/smp-shx3.c b/arch/sh/kernel/cpu/sh4a/smp-shx3.c
index b8869aa20dec..2b6b0d50c576 100644
--- a/arch/sh/kernel/cpu/sh4a/smp-shx3.c
+++ b/arch/sh/kernel/cpu/sh4a/smp-shx3.c
@@ -35,8 +35,7 @@ void __init plat_smp_setup(void)
35 unsigned int cpu = 0; 35 unsigned int cpu = 0;
36 int i, num; 36 int i, num;
37 37
38 cpus_clear(cpu_possible_map); 38 init_cpu_possible(cpumask_of(cpu));
39 cpu_set(cpu, cpu_possible_map);
40 39
41 __cpu_number_map[0] = 0; 40 __cpu_number_map[0] = 0;
42 __cpu_logical_map[0] = 0; 41 __cpu_logical_map[0] = 0;
@@ -46,7 +45,7 @@ void __init plat_smp_setup(void)
46 * for the total number of cores. 45 * for the total number of cores.
47 */ 46 */
48 for (i = 1, num = 0; i < NR_CPUS; i++) { 47 for (i = 1, num = 0; i < NR_CPUS; i++) {
49 cpu_set(i, cpu_possible_map); 48 set_cpu_possible(i, true);
50 __cpu_number_map[i] = ++num; 49 __cpu_number_map[i] = ++num;
51 __cpu_logical_map[num] = i; 50 __cpu_logical_map[num] = i;
52 } 51 }
diff --git a/arch/sh/kernel/ftrace.c b/arch/sh/kernel/ftrace.c
index 4c3247477aa3..066f37dc32a9 100644
--- a/arch/sh/kernel/ftrace.c
+++ b/arch/sh/kernel/ftrace.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (C) 2008 Matt Fleming <mjf@gentoo.org> 2 * Copyright (C) 2008 Matt Fleming <matt@console-pimps.org>
3 * Copyright (C) 2008 Paul Mundt <lethal@linux-sh.org> 3 * Copyright (C) 2008 Paul Mundt <lethal@linux-sh.org>
4 * 4 *
5 * Code for replacing ftrace calls with jumps. 5 * Code for replacing ftrace calls with jumps.
@@ -19,30 +19,37 @@
19#include <asm/ftrace.h> 19#include <asm/ftrace.h>
20#include <asm/cacheflush.h> 20#include <asm/cacheflush.h>
21 21
22static unsigned char ftrace_nop[] = {
23 0x09, 0x00, /* nop */
24 0x09, 0x00, /* nop */
25};
26
27static unsigned char ftrace_replaced_code[MCOUNT_INSN_SIZE]; 22static unsigned char ftrace_replaced_code[MCOUNT_INSN_SIZE];
28 23
29unsigned char *ftrace_nop_replace(void) 24static unsigned char ftrace_nop[4];
25/*
26 * If we're trying to nop out a call to a function, we instead
27 * place a call to the address after the memory table.
28 *
29 * 8c011060 <a>:
30 * 8c011060: 02 d1 mov.l 8c01106c <a+0xc>,r1
31 * 8c011062: 22 4f sts.l pr,@-r15
32 * 8c011064: 02 c7 mova 8c011070 <a+0x10>,r0
33 * 8c011066: 2b 41 jmp @r1
34 * 8c011068: 2a 40 lds r0,pr
35 * 8c01106a: 09 00 nop
36 * 8c01106c: 68 24 .word 0x2468 <--- ip
37 * 8c01106e: 1d 8c .word 0x8c1d
38 * 8c011070: 26 4f lds.l @r15+,pr <--- ip + MCOUNT_INSN_SIZE
39 *
40 * We write 0x8c011070 to 0x8c01106c so that on entry to a() we branch
41 * past the _mcount call and continue executing code like normal.
42 */
43static unsigned char *ftrace_nop_replace(unsigned long ip)
30{ 44{
45 __raw_writel(ip + MCOUNT_INSN_SIZE, ftrace_nop);
31 return ftrace_nop; 46 return ftrace_nop;
32} 47}
33 48
34static int is_sh_nop(unsigned char *ip) 49static unsigned char *ftrace_call_replace(unsigned long ip, unsigned long addr)
35{
36 return strncmp(ip, ftrace_nop, sizeof(ftrace_nop));
37}
38
39unsigned char *ftrace_call_replace(unsigned long ip, unsigned long addr)
40{ 50{
41 /* Place the address in the memory table. */ 51 /* Place the address in the memory table. */
42 if (addr == CALLER_ADDR) 52 __raw_writel(addr, ftrace_replaced_code);
43 __raw_writel(addr + MCOUNT_INSN_OFFSET, ftrace_replaced_code);
44 else
45 __raw_writel(addr, ftrace_replaced_code);
46 53
47 /* 54 /*
48 * No locking needed, this must be called via kstop_machine 55 * No locking needed, this must be called via kstop_machine
@@ -51,7 +58,7 @@ unsigned char *ftrace_call_replace(unsigned long ip, unsigned long addr)
51 return ftrace_replaced_code; 58 return ftrace_replaced_code;
52} 59}
53 60
54int ftrace_modify_code(unsigned long ip, unsigned char *old_code, 61static int ftrace_modify_code(unsigned long ip, unsigned char *old_code,
55 unsigned char *new_code) 62 unsigned char *new_code)
56{ 63{
57 unsigned char replaced[MCOUNT_INSN_SIZE]; 64 unsigned char replaced[MCOUNT_INSN_SIZE];
@@ -66,13 +73,6 @@ int ftrace_modify_code(unsigned long ip, unsigned char *old_code,
66 * kstop_machine, or before SMP starts. 73 * kstop_machine, or before SMP starts.
67 */ 74 */
68 75
69 /*
70 * If we're trying to nop out a call to a function, we instead
71 * place a call to the address after the memory table.
72 */
73 if (is_sh_nop(new_code) == 0)
74 __raw_writel(ip + MCOUNT_INSN_SIZE, (unsigned long)new_code);
75
76 /* read the text we want to modify */ 76 /* read the text we want to modify */
77 if (probe_kernel_read(replaced, (void *)ip, MCOUNT_INSN_SIZE)) 77 if (probe_kernel_read(replaced, (void *)ip, MCOUNT_INSN_SIZE))
78 return -EFAULT; 78 return -EFAULT;
@@ -92,13 +92,13 @@ int ftrace_modify_code(unsigned long ip, unsigned char *old_code,
92 92
93int ftrace_update_ftrace_func(ftrace_func_t func) 93int ftrace_update_ftrace_func(ftrace_func_t func)
94{ 94{
95 unsigned long ip = (unsigned long)(&ftrace_call); 95 unsigned long ip = (unsigned long)(&ftrace_call) + MCOUNT_INSN_OFFSET;
96 unsigned char old[MCOUNT_INSN_SIZE], *new; 96 unsigned char old[MCOUNT_INSN_SIZE], *new;
97 97
98 memcpy(old, (unsigned char *)(ip + MCOUNT_INSN_OFFSET), MCOUNT_INSN_SIZE); 98 memcpy(old, (unsigned char *)ip, MCOUNT_INSN_SIZE);
99 new = ftrace_call_replace(ip, (unsigned long)func); 99 new = ftrace_call_replace(ip, (unsigned long)func);
100 100
101 return ftrace_modify_code(ip + MCOUNT_INSN_OFFSET, old, new); 101 return ftrace_modify_code(ip, old, new);
102} 102}
103 103
104int ftrace_make_nop(struct module *mod, 104int ftrace_make_nop(struct module *mod,
@@ -108,7 +108,7 @@ int ftrace_make_nop(struct module *mod,
108 unsigned long ip = rec->ip; 108 unsigned long ip = rec->ip;
109 109
110 old = ftrace_call_replace(ip, addr); 110 old = ftrace_call_replace(ip, addr);
111 new = ftrace_nop_replace(); 111 new = ftrace_nop_replace(ip);
112 112
113 return ftrace_modify_code(rec->ip, old, new); 113 return ftrace_modify_code(rec->ip, old, new);
114} 114}
@@ -118,7 +118,7 @@ int ftrace_make_call(struct dyn_ftrace *rec, unsigned long addr)
118 unsigned char *new, *old; 118 unsigned char *new, *old;
119 unsigned long ip = rec->ip; 119 unsigned long ip = rec->ip;
120 120
121 old = ftrace_nop_replace(); 121 old = ftrace_nop_replace(ip);
122 new = ftrace_call_replace(ip, addr); 122 new = ftrace_call_replace(ip, addr);
123 123
124 return ftrace_modify_code(rec->ip, old, new); 124 return ftrace_modify_code(rec->ip, old, new);
diff --git a/arch/sh/kernel/process_32.c b/arch/sh/kernel/process_32.c
index 601bbc0ec74e..92d7740faab1 100644
--- a/arch/sh/kernel/process_32.c
+++ b/arch/sh/kernel/process_32.c
@@ -119,8 +119,6 @@ int kernel_thread(int (*fn)(void *), void * arg, unsigned long flags)
119 pid = do_fork(flags | CLONE_VM | CLONE_UNTRACED, 0, 119 pid = do_fork(flags | CLONE_VM | CLONE_UNTRACED, 0,
120 &regs, 0, NULL, NULL); 120 &regs, 0, NULL, NULL);
121 121
122 trace_mark(kernel_arch_kthread_create, "pid %d fn %p", pid, fn);
123
124 return pid; 122 return pid;
125} 123}
126 124
diff --git a/arch/sh/kernel/process_64.c b/arch/sh/kernel/process_64.c
index 3826773496d8..24de74214940 100644
--- a/arch/sh/kernel/process_64.c
+++ b/arch/sh/kernel/process_64.c
@@ -323,7 +323,6 @@ ATTRIB_NORET void kernel_thread_helper(void *arg, int (*fn)(void *))
323int kernel_thread(int (*fn)(void *), void * arg, unsigned long flags) 323int kernel_thread(int (*fn)(void *), void * arg, unsigned long flags)
324{ 324{
325 struct pt_regs regs; 325 struct pt_regs regs;
326 int pid;
327 326
328 memset(&regs, 0, sizeof(regs)); 327 memset(&regs, 0, sizeof(regs));
329 regs.regs[2] = (unsigned long)arg; 328 regs.regs[2] = (unsigned long)arg;
@@ -333,12 +332,8 @@ int kernel_thread(int (*fn)(void *), void * arg, unsigned long flags)
333 regs.sr = (1 << 30); 332 regs.sr = (1 << 30);
334 333
335 /* Ok, create the new process.. */ 334 /* Ok, create the new process.. */
336 pid = do_fork(flags | CLONE_VM | CLONE_UNTRACED, 0, 335 return do_fork(flags | CLONE_VM | CLONE_UNTRACED, 0,
337 &regs, 0, NULL, NULL); 336 &regs, 0, NULL, NULL);
338
339 trace_mark(kernel_arch_kthread_create, "pid %d fn %p", pid, fn);
340
341 return pid;
342} 337}
343 338
344/* 339/*
diff --git a/arch/sh/kernel/sh_ksyms_64.c b/arch/sh/kernel/sh_ksyms_64.c
index 8f54ef0cfbca..f5bd156ea504 100644
--- a/arch/sh/kernel/sh_ksyms_64.c
+++ b/arch/sh/kernel/sh_ksyms_64.c
@@ -38,13 +38,6 @@ EXPORT_SYMBOL(clear_user_page);
38EXPORT_SYMBOL(flush_dcache_page); 38EXPORT_SYMBOL(flush_dcache_page);
39#endif 39#endif
40 40
41/* Networking helper routines. */
42EXPORT_SYMBOL(csum_partial);
43EXPORT_SYMBOL(csum_partial_copy_nocheck);
44#ifdef CONFIG_IPV6
45EXPORT_SYMBOL(csum_ipv6_magic);
46#endif
47
48#ifdef CONFIG_VT 41#ifdef CONFIG_VT
49EXPORT_SYMBOL(screen_info); 42EXPORT_SYMBOL(screen_info);
50#endif 43#endif
diff --git a/arch/sh/kernel/signal_32.c b/arch/sh/kernel/signal_32.c
index 17784e19ae34..b5afbec1db59 100644
--- a/arch/sh/kernel/signal_32.c
+++ b/arch/sh/kernel/signal_32.c
@@ -332,8 +332,8 @@ get_sigframe(struct k_sigaction *ka, unsigned long sp, size_t frame_size)
332 332
333/* These symbols are defined with the addresses in the vsyscall page. 333/* These symbols are defined with the addresses in the vsyscall page.
334 See vsyscall-trapa.S. */ 334 See vsyscall-trapa.S. */
335extern void __user __kernel_sigreturn; 335extern void __kernel_sigreturn(void);
336extern void __user __kernel_rt_sigreturn; 336extern void __kernel_rt_sigreturn(void);
337 337
338static int setup_frame(int sig, struct k_sigaction *ka, 338static int setup_frame(int sig, struct k_sigaction *ka,
339 sigset_t *set, struct pt_regs *regs) 339 sigset_t *set, struct pt_regs *regs)
diff --git a/arch/sh/kernel/smp.c b/arch/sh/kernel/smp.c
index 8f4027412614..442d8d47a41e 100644
--- a/arch/sh/kernel/smp.c
+++ b/arch/sh/kernel/smp.c
@@ -47,7 +47,7 @@ void __init smp_prepare_cpus(unsigned int max_cpus)
47 plat_prepare_cpus(max_cpus); 47 plat_prepare_cpus(max_cpus);
48 48
49#ifndef CONFIG_HOTPLUG_CPU 49#ifndef CONFIG_HOTPLUG_CPU
50 cpu_present_map = cpu_possible_map; 50 init_cpu_present(&cpu_possible_map);
51#endif 51#endif
52} 52}
53 53
@@ -58,8 +58,8 @@ void __devinit smp_prepare_boot_cpu(void)
58 __cpu_number_map[0] = cpu; 58 __cpu_number_map[0] = cpu;
59 __cpu_logical_map[0] = cpu; 59 __cpu_logical_map[0] = cpu;
60 60
61 cpu_set(cpu, cpu_online_map); 61 set_cpu_online(cpu, true);
62 cpu_set(cpu, cpu_possible_map); 62 set_cpu_possible(cpu, true);
63} 63}
64 64
65asmlinkage void __cpuinit start_secondary(void) 65asmlinkage void __cpuinit start_secondary(void)
@@ -171,11 +171,11 @@ void smp_send_stop(void)
171 smp_call_function(stop_this_cpu, 0, 0); 171 smp_call_function(stop_this_cpu, 0, 0);
172} 172}
173 173
174void arch_send_call_function_ipi(cpumask_t mask) 174void arch_send_call_function_ipi_mask(const struct cpumask *mask)
175{ 175{
176 int cpu; 176 int cpu;
177 177
178 for_each_cpu_mask(cpu, mask) 178 for_each_cpu(cpu, mask)
179 plat_send_ipi(cpu, SMP_MSG_FUNCTION); 179 plat_send_ipi(cpu, SMP_MSG_FUNCTION);
180} 180}
181 181
diff --git a/arch/sh/kernel/sys_sh.c b/arch/sh/kernel/sys_sh.c
index e3a7e36639ef..90d00e47264d 100644
--- a/arch/sh/kernel/sys_sh.c
+++ b/arch/sh/kernel/sys_sh.c
@@ -88,8 +88,6 @@ asmlinkage int sys_ipc(uint call, int first, int second,
88 version = call >> 16; /* hack for backward compatibility */ 88 version = call >> 16; /* hack for backward compatibility */
89 call &= 0xffff; 89 call &= 0xffff;
90 90
91 trace_mark(kernel_arch_ipc_call, "call %u first %d", call, first);
92
93 if (call <= SEMTIMEDOP) 91 if (call <= SEMTIMEDOP)
94 switch (call) { 92 switch (call) {
95 case SEMOP: 93 case SEMOP:
diff --git a/arch/sh/kernel/syscalls_32.S b/arch/sh/kernel/syscalls_32.S
index a9fff9f731ec..f9e21fa2f592 100644
--- a/arch/sh/kernel/syscalls_32.S
+++ b/arch/sh/kernel/syscalls_32.S
@@ -352,3 +352,4 @@ ENTRY(sys_call_table)
352 .long sys_preadv 352 .long sys_preadv
353 .long sys_pwritev 353 .long sys_pwritev
354 .long sys_rt_tgsigqueueinfo /* 335 */ 354 .long sys_rt_tgsigqueueinfo /* 335 */
355 .long sys_perf_counter_open
diff --git a/arch/sh/kernel/syscalls_64.S b/arch/sh/kernel/syscalls_64.S
index 75c1889af1ed..bf420b616ae0 100644
--- a/arch/sh/kernel/syscalls_64.S
+++ b/arch/sh/kernel/syscalls_64.S
@@ -390,3 +390,4 @@ sys_call_table:
390 .long sys_preadv 390 .long sys_preadv
391 .long sys_pwritev 391 .long sys_pwritev
392 .long sys_rt_tgsigqueueinfo 392 .long sys_rt_tgsigqueueinfo
393 .long sys_perf_counter_open
diff --git a/arch/sh/kernel/time.c b/arch/sh/kernel/time.c
index 2edde32c764b..9b352a1e3fb4 100644
--- a/arch/sh/kernel/time.c
+++ b/arch/sh/kernel/time.c
@@ -91,21 +91,6 @@ module_init(rtc_generic_init);
91 91
92void (*board_time_init)(void); 92void (*board_time_init)(void);
93 93
94unsigned long long sched_clock(void)
95{
96 return (jiffies_64 - INITIAL_JIFFIES) * (NSEC_PER_SEC / HZ);
97}
98
99static void __init sh_late_time_init(void)
100{
101 /*
102 * Make sure all compiled-in early timers register themselves.
103 * Run probe() for one "earlytimer" device.
104 */
105 early_platform_driver_register_all("earlytimer");
106 early_platform_driver_probe("earlytimer", 1, 0);
107}
108
109void __init time_init(void) 94void __init time_init(void)
110{ 95{
111 if (board_time_init) 96 if (board_time_init)
@@ -121,5 +106,15 @@ void __init time_init(void)
121 local_timer_setup(smp_processor_id()); 106 local_timer_setup(smp_processor_id());
122#endif 107#endif
123 108
124 late_time_init = sh_late_time_init; 109 /*
110 * Make sure all compiled-in early timers register themselves.
111 *
112 * Run probe() for two "earlytimer" devices, these will be the
113 * clockevents and clocksource devices respectively. In the event
114 * that only a clockevents device is available, we -ENODEV on the
115 * clocksource and the jiffies clocksource is used transparently
116 * instead. No error handling is necessary here.
117 */
118 early_platform_driver_register_all("earlytimer");
119 early_platform_driver_probe("earlytimer", 2, 0);
125} 120}
diff --git a/arch/sh/kernel/traps.c b/arch/sh/kernel/traps.c
index 46348ed07cc3..b3e0067db358 100644
--- a/arch/sh/kernel/traps.c
+++ b/arch/sh/kernel/traps.c
@@ -69,6 +69,7 @@ BUILD_TRAP_HANDLER(bug)
69 insn_size_t insn = *(insn_size_t *)instruction_pointer(regs); 69 insn_size_t insn = *(insn_size_t *)instruction_pointer(regs);
70 if (insn == TRAPA_BUG_OPCODE) 70 if (insn == TRAPA_BUG_OPCODE)
71 handle_BUG(regs); 71 handle_BUG(regs);
72 return;
72 } 73 }
73#endif 74#endif
74 75
diff --git a/arch/sh/lib64/Makefile b/arch/sh/lib64/Makefile
index 4bacb9e83478..334bb2da36ea 100644
--- a/arch/sh/lib64/Makefile
+++ b/arch/sh/lib64/Makefile
@@ -10,7 +10,7 @@
10# 10#
11 11
12# Panic should really be compiled as PIC 12# Panic should really be compiled as PIC
13lib-y := udelay.o c-checksum.o dbg.o panic.o memcpy.o memset.o \ 13lib-y := udelay.o dbg.o panic.o memcpy.o memset.o \
14 copy_user_memcpy.o copy_page.o clear_page.o strcpy.o strlen.o 14 copy_user_memcpy.o copy_page.o clear_page.o strcpy.o strlen.o
15 15
16# Extracted from libgcc 16# Extracted from libgcc
diff --git a/arch/sh/lib64/c-checksum.c b/arch/sh/lib64/c-checksum.c
deleted file mode 100644
index 73c0877e3a29..000000000000
--- a/arch/sh/lib64/c-checksum.c
+++ /dev/null
@@ -1,214 +0,0 @@
1/*
2 * arch/sh/lib64/c-checksum.c
3 *
4 * This file contains network checksum routines that are better done
5 * in an architecture-specific manner due to speed..
6 */
7#include <linux/string.h>
8#include <linux/errno.h>
9#include <linux/kernel.h>
10#include <linux/module.h>
11#include <asm/byteorder.h>
12#include <asm/uaccess.h>
13
14static inline unsigned short from64to16(unsigned long long x)
15{
16 /* add up 32-bit words for 33 bits */
17 x = (x & 0xffffffff) + (x >> 32);
18 /* add up 16-bit and 17-bit words for 17+c bits */
19 x = (x & 0xffff) + (x >> 16);
20 /* add up 16-bit and 2-bit for 16+c bit */
21 x = (x & 0xffff) + (x >> 16);
22 /* add up carry.. */
23 x = (x & 0xffff) + (x >> 16);
24 return x;
25}
26
27static inline unsigned short foldto16(unsigned long x)
28{
29 /* add up 16-bit for 17 bits */
30 x = (x & 0xffff) + (x >> 16);
31 /* add up carry.. */
32 x = (x & 0xffff) + (x >> 16);
33 return x;
34}
35
36static inline unsigned short myfoldto16(unsigned long long x)
37{
38 /* Fold down to 32-bits so we don't lose in the typedef-less
39 network stack. */
40 /* 64 to 33 */
41 x = (x & 0xffffffff) + (x >> 32);
42 /* 33 to 32 */
43 x = (x & 0xffffffff) + (x >> 32);
44
45 /* add up 16-bit for 17 bits */
46 x = (x & 0xffff) + (x >> 16);
47 /* add up carry.. */
48 x = (x & 0xffff) + (x >> 16);
49 return x;
50}
51
52#define odd(x) ((x)&1)
53#define U16(x) ntohs(x)
54
55static unsigned long do_csum(const unsigned char *buff, int len)
56{
57 int odd, count;
58 unsigned long result = 0;
59
60 pr_debug("do_csum buff %p, len %d (0x%x)\n", buff, len, len);
61#ifdef DEBUG
62 for (i = 0; i < len; i++) {
63 if ((i % 26) == 0)
64 printk("\n");
65 printk("%02X ", buff[i]);
66 }
67#endif
68
69 if (len <= 0)
70 goto out;
71
72 odd = 1 & (unsigned long) buff;
73 if (odd) {
74 result = *buff << 8;
75 len--;
76 buff++;
77 }
78 count = len >> 1; /* nr of 16-bit words.. */
79 if (count) {
80 if (2 & (unsigned long) buff) {
81 result += *(unsigned short *) buff;
82 count--;
83 len -= 2;
84 buff += 2;
85 }
86 count >>= 1; /* nr of 32-bit words.. */
87 if (count) {
88 unsigned long carry = 0;
89 do {
90 unsigned long w = *(unsigned long *) buff;
91 buff += 4;
92 count--;
93 result += carry;
94 result += w;
95 carry = (w > result);
96 } while (count);
97 result += carry;
98 result = (result & 0xffff) + (result >> 16);
99 }
100 if (len & 2) {
101 result += *(unsigned short *) buff;
102 buff += 2;
103 }
104 }
105 if (len & 1)
106 result += *buff;
107 result = foldto16(result);
108 if (odd)
109 result = ((result >> 8) & 0xff) | ((result & 0xff) << 8);
110
111 pr_debug("\nCHECKSUM is 0x%lx\n", result);
112
113 out:
114 return result;
115}
116
117/* computes the checksum of a memory block at buff, length len,
118 and adds in "sum" (32-bit) */
119__wsum csum_partial(const void *buff, int len, __wsum sum)
120{
121 unsigned long long result = do_csum(buff, len);
122
123 /* add in old sum, and carry.. */
124 result += (__force u32)sum;
125 /* 32+c bits -> 32 bits */
126 result = (result & 0xffffffff) + (result >> 32);
127
128 pr_debug("csum_partial, buff %p len %d sum 0x%x result=0x%016Lx\n",
129 buff, len, sum, result);
130
131 return (__force __wsum)result;
132}
133
134/* Copy while checksumming, otherwise like csum_partial. */
135__wsum
136csum_partial_copy_nocheck(const void *src, void *dst, int len, __wsum sum)
137{
138 sum = csum_partial(src, len, sum);
139 memcpy(dst, src, len);
140
141 return sum;
142}
143
144/* Copy from userspace and compute checksum. If we catch an exception
145 then zero the rest of the buffer. */
146__wsum
147csum_partial_copy_from_user(const void __user *src, void *dst, int len,
148 __wsum sum, int *err_ptr)
149{
150 int missing;
151
152 pr_debug
153 ("csum_partial_copy_from_user src %p, dest %p, len %d, sum %08x, err_ptr %p\n",
154 src, dst, len, sum, err_ptr);
155 missing = copy_from_user(dst, src, len);
156 pr_debug(" access_ok %d\n", __access_ok((unsigned long) src, len));
157 pr_debug(" missing %d\n", missing);
158 if (missing) {
159 memset(dst + len - missing, 0, missing);
160 *err_ptr = -EFAULT;
161 }
162
163 return csum_partial(dst, len, sum);
164}
165
166/* Copy to userspace and compute checksum. */
167__wsum
168csum_partial_copy_to_user(const unsigned char *src, unsigned char *dst, int len,
169 __wsum sum, int *err_ptr)
170{
171 sum = csum_partial(src, len, sum);
172
173 if (copy_to_user(dst, src, len))
174 *err_ptr = -EFAULT;
175
176 return sum;
177}
178
179/*
180 * This is a version of ip_compute_csum() optimized for IP headers,
181 * which always checksum on 4 octet boundaries.
182 */
183__sum16 ip_fast_csum(const void *iph, unsigned int ihl)
184{
185 pr_debug("ip_fast_csum %p,%d\n", iph, ihl);
186
187 return (__force __sum16)~do_csum(iph, ihl * 4);
188}
189
190__wsum csum_tcpudp_nofold(__be32 saddr, __be32 daddr,
191 unsigned short len,
192 unsigned short proto, __wsum sum)
193{
194 unsigned long long result;
195
196 pr_debug("ntohs(0x%x)=0x%x\n", 0xdead, ntohs(0xdead));
197 pr_debug("htons(0x%x)=0x%x\n", 0xdead, htons(0xdead));
198
199 result = (__force u64) saddr + (__force u64) daddr +
200 (__force u64) sum + ((len + proto) << 8);
201
202 /* Fold down to 32-bits so we don't lose in the typedef-less
203 network stack. */
204 /* 64 to 33 */
205 result = (result & 0xffffffff) + (result >> 32);
206 /* 33 to 32 */
207 result = (result & 0xffffffff) + (result >> 32);
208
209 pr_debug("%s saddr %x daddr %x len %x proto %x sum %x result %08Lx\n",
210 __func__, saddr, daddr, len, proto, sum, result);
211
212 return (__wsum)result;
213}
214EXPORT_SYMBOL(csum_tcpudp_nofold);
diff --git a/arch/sh/mm/fault_32.c b/arch/sh/mm/fault_32.c
index 31a33ebdef6f..2c50f80fc332 100644
--- a/arch/sh/mm/fault_32.c
+++ b/arch/sh/mm/fault_32.c
@@ -249,9 +249,6 @@ static inline int notify_page_fault(struct pt_regs *regs, int trap)
249{ 249{
250 int ret = 0; 250 int ret = 0;
251 251
252 trace_mark(kernel_arch_trap_entry, "trap_id %d ip #p%ld",
253 trap >> 5, instruction_pointer(regs));
254
255#ifdef CONFIG_KPROBES 252#ifdef CONFIG_KPROBES
256 if (!user_mode(regs)) { 253 if (!user_mode(regs)) {
257 preempt_disable(); 254 preempt_disable();
@@ -327,6 +324,5 @@ asmlinkage int __kprobes __do_page_fault(struct pt_regs *regs,
327 324
328 ret = 0; 325 ret = 0;
329out: 326out:
330 trace_mark(kernel_arch_trap_exit, MARK_NOARGS);
331 return ret; 327 return ret;
332} 328}
generated by cgit v1.2.2 (git 2.25.0) at 2024-11-27 06:17:53 -0500