diff options
-rw-r--r-- | arch/mips/Makefile | 7 | ||||
-rw-r--r-- | arch/mips/au1000/common/cputable.c | 36 | ||||
-rw-r--r-- | arch/mips/au1000/common/setup.c | 13 | ||||
-rw-r--r-- | arch/mips/au1000/common/time.c | 24 | ||||
-rw-r--r-- | arch/mips/au1000/xxs1500/board_setup.c | 3 | ||||
-rw-r--r-- | arch/mips/au1000/xxs1500/irqmap.c | 2 | ||||
-rw-r--r-- | arch/mips/configs/bigsur_defconfig | 939 | ||||
-rw-r--r-- | arch/mips/kernel/i8253.c | 1 | ||||
-rw-r--r-- | arch/mips/kernel/time.c | 2 | ||||
-rw-r--r-- | arch/mips/kernel/vpe.c | 21 | ||||
-rw-r--r-- | arch/mips/mm/tlbex.c | 1 | ||||
-rw-r--r-- | arch/mips/pci/pci-bcm1480.c | 6 | ||||
-rw-r--r-- | arch/mips/pci/pci-bcm1480ht.c | 21 | ||||
-rw-r--r-- | include/asm-mips/mach-au1x00/au1000.h | 1 |
14 files changed, 654 insertions, 423 deletions
diff --git a/arch/mips/Makefile b/arch/mips/Makefile index 72097dacabd3..1c62381f5c23 100644 --- a/arch/mips/Makefile +++ b/arch/mips/Makefile | |||
@@ -482,10 +482,13 @@ endif | |||
482 | # be 16kb aligned or the handling of the current variable will break. | 482 | # be 16kb aligned or the handling of the current variable will break. |
483 | # Simplified: what IP22 does at 128MB+ in ksegN, IP28 does at 512MB+ in xkphys | 483 | # Simplified: what IP22 does at 128MB+ in ksegN, IP28 does at 512MB+ in xkphys |
484 | # | 484 | # |
485 | #core-$(CONFIG_SGI_IP28) += arch/mips/sgi-ip22/ arch/mips/arc/arc_con.o | 485 | ifdef CONFIG_SGI_IP28 |
486 | ifeq ($(call cc-option-yn,-mr10k-cache-barrier=1), n) | ||
487 | $(error gcc doesn't support needed option -mr10k-cache-barrier=1) | ||
488 | endif | ||
489 | endif | ||
486 | core-$(CONFIG_SGI_IP28) += arch/mips/sgi-ip22/ | 490 | core-$(CONFIG_SGI_IP28) += arch/mips/sgi-ip22/ |
487 | cflags-$(CONFIG_SGI_IP28) += -mr10k-cache-barrier=1 -Iinclude/asm-mips/mach-ip28 | 491 | cflags-$(CONFIG_SGI_IP28) += -mr10k-cache-barrier=1 -Iinclude/asm-mips/mach-ip28 |
488 | #cflags-$(CONFIG_SGI_IP28) += -Iinclude/asm-mips/mach-ip28 | ||
489 | load-$(CONFIG_SGI_IP28) += 0xa800000020004000 | 492 | load-$(CONFIG_SGI_IP28) += 0xa800000020004000 |
490 | 493 | ||
491 | # | 494 | # |
diff --git a/arch/mips/au1000/common/cputable.c b/arch/mips/au1000/common/cputable.c index d8df5fdb045f..5c0d35d6e22a 100644 --- a/arch/mips/au1000/common/cputable.c +++ b/arch/mips/au1000/common/cputable.c | |||
@@ -22,24 +22,24 @@ struct cpu_spec* cur_cpu_spec[NR_CPUS]; | |||
22 | /* With some thought, we can probably use the mask to reduce the | 22 | /* With some thought, we can probably use the mask to reduce the |
23 | * size of the table. | 23 | * size of the table. |
24 | */ | 24 | */ |
25 | struct cpu_spec cpu_specs[] = { | 25 | struct cpu_spec cpu_specs[] = { |
26 | { 0xffffffff, 0x00030100, "Au1000 DA", 1, 0 }, | 26 | { 0xffffffff, 0x00030100, "Au1000 DA", 1, 0, 1 }, |
27 | { 0xffffffff, 0x00030201, "Au1000 HA", 1, 0 }, | 27 | { 0xffffffff, 0x00030201, "Au1000 HA", 1, 0, 1 }, |
28 | { 0xffffffff, 0x00030202, "Au1000 HB", 1, 0 }, | 28 | { 0xffffffff, 0x00030202, "Au1000 HB", 1, 0, 1 }, |
29 | { 0xffffffff, 0x00030203, "Au1000 HC", 1, 1 }, | 29 | { 0xffffffff, 0x00030203, "Au1000 HC", 1, 1, 0 }, |
30 | { 0xffffffff, 0x00030204, "Au1000 HD", 1, 1 }, | 30 | { 0xffffffff, 0x00030204, "Au1000 HD", 1, 1, 0 }, |
31 | { 0xffffffff, 0x01030200, "Au1500 AB", 1, 1 }, | 31 | { 0xffffffff, 0x01030200, "Au1500 AB", 1, 1, 0 }, |
32 | { 0xffffffff, 0x01030201, "Au1500 AC", 0, 1 }, | 32 | { 0xffffffff, 0x01030201, "Au1500 AC", 0, 1, 0 }, |
33 | { 0xffffffff, 0x01030202, "Au1500 AD", 0, 1 }, | 33 | { 0xffffffff, 0x01030202, "Au1500 AD", 0, 1, 0 }, |
34 | { 0xffffffff, 0x02030200, "Au1100 AB", 1, 1 }, | 34 | { 0xffffffff, 0x02030200, "Au1100 AB", 1, 1, 0 }, |
35 | { 0xffffffff, 0x02030201, "Au1100 BA", 1, 1 }, | 35 | { 0xffffffff, 0x02030201, "Au1100 BA", 1, 1, 0 }, |
36 | { 0xffffffff, 0x02030202, "Au1100 BC", 1, 1 }, | 36 | { 0xffffffff, 0x02030202, "Au1100 BC", 1, 1, 0 }, |
37 | { 0xffffffff, 0x02030203, "Au1100 BD", 0, 1 }, | 37 | { 0xffffffff, 0x02030203, "Au1100 BD", 0, 1, 0 }, |
38 | { 0xffffffff, 0x02030204, "Au1100 BE", 0, 1 }, | 38 | { 0xffffffff, 0x02030204, "Au1100 BE", 0, 1, 0 }, |
39 | { 0xffffffff, 0x03030200, "Au1550 AA", 0, 1 }, | 39 | { 0xffffffff, 0x03030200, "Au1550 AA", 0, 1, 0 }, |
40 | { 0xffffffff, 0x04030200, "Au1200 AB", 0, 0 }, | 40 | { 0xffffffff, 0x04030200, "Au1200 AB", 0, 0, 0 }, |
41 | { 0xffffffff, 0x04030201, "Au1200 AC", 1, 0 }, | 41 | { 0xffffffff, 0x04030201, "Au1200 AC", 1, 0, 0 }, |
42 | { 0x00000000, 0x00000000, "Unknown Au1xxx", 1, 0 }, | 42 | { 0x00000000, 0x00000000, "Unknown Au1xxx", 1, 0, 0 } |
43 | }; | 43 | }; |
44 | 44 | ||
45 | void | 45 | void |
diff --git a/arch/mips/au1000/common/setup.c b/arch/mips/au1000/common/setup.c index d885e3848ec6..9e4ab80caab6 100644 --- a/arch/mips/au1000/common/setup.c +++ b/arch/mips/au1000/common/setup.c | |||
@@ -57,7 +57,7 @@ void __init plat_mem_setup(void) | |||
57 | { | 57 | { |
58 | struct cpu_spec *sp; | 58 | struct cpu_spec *sp; |
59 | char *argptr; | 59 | char *argptr; |
60 | unsigned long prid, cpupll, bclk = 1; | 60 | unsigned long prid, cpufreq, bclk = 1; |
61 | 61 | ||
62 | set_cpuspec(); | 62 | set_cpuspec(); |
63 | sp = cur_cpu_spec[0]; | 63 | sp = cur_cpu_spec[0]; |
@@ -65,8 +65,15 @@ void __init plat_mem_setup(void) | |||
65 | board_setup(); /* board specific setup */ | 65 | board_setup(); /* board specific setup */ |
66 | 66 | ||
67 | prid = read_c0_prid(); | 67 | prid = read_c0_prid(); |
68 | cpupll = (au_readl(0xB1900060) & 0x3F) * 12; | 68 | if (sp->cpu_pll_wo) |
69 | printk("(PRId %08lx) @ %ldMHZ\n", prid, cpupll); | 69 | #ifdef CONFIG_SOC_AU1000_FREQUENCY |
70 | cpufreq = CONFIG_SOC_AU1000_FREQUENCY / 1000000; | ||
71 | #else | ||
72 | cpufreq = 396; | ||
73 | #endif | ||
74 | else | ||
75 | cpufreq = (au_readl(SYS_CPUPLL) & 0x3F) * 12; | ||
76 | printk(KERN_INFO "(PRID %08lx) @ %ld MHz\n", prid, cpufreq); | ||
70 | 77 | ||
71 | bclk = sp->cpu_bclk; | 78 | bclk = sp->cpu_bclk; |
72 | if (bclk) | 79 | if (bclk) |
diff --git a/arch/mips/au1000/common/time.c b/arch/mips/au1000/common/time.c index f113b512d7b1..e122bbc6cd88 100644 --- a/arch/mips/au1000/common/time.c +++ b/arch/mips/au1000/common/time.c | |||
@@ -209,18 +209,22 @@ unsigned long cal_r4koff(void) | |||
209 | while (au_readl(SYS_COUNTER_CNTRL) & SYS_CNTRL_C1S); | 209 | while (au_readl(SYS_COUNTER_CNTRL) & SYS_CNTRL_C1S); |
210 | au_writel(0, SYS_TOYWRITE); | 210 | au_writel(0, SYS_TOYWRITE); |
211 | while (au_readl(SYS_COUNTER_CNTRL) & SYS_CNTRL_C1S); | 211 | while (au_readl(SYS_COUNTER_CNTRL) & SYS_CNTRL_C1S); |
212 | } else | ||
213 | no_au1xxx_32khz = 1; | ||
212 | 214 | ||
213 | cpu_speed = (au_readl(SYS_CPUPLL) & 0x0000003f) * | 215 | /* |
214 | AU1000_SRC_CLK; | 216 | * On early Au1000, sys_cpupll was write-only. Since these |
215 | } | 217 | * silicon versions of Au1000 are not sold by AMD, we don't bend |
216 | else { | 218 | * over backwards trying to determine the frequency. |
217 | /* The 32KHz oscillator isn't running, so assume there | 219 | */ |
218 | * isn't one and grab the processor speed from the PLL. | 220 | if (cur_cpu_spec[0]->cpu_pll_wo) |
219 | * NOTE: some old silicon doesn't allow reading the PLL. | 221 | #ifdef CONFIG_SOC_AU1000_FREQUENCY |
220 | */ | 222 | cpu_speed = CONFIG_SOC_AU1000_FREQUENCY; |
223 | #else | ||
224 | cpu_speed = 396000000; | ||
225 | #endif | ||
226 | else | ||
221 | cpu_speed = (au_readl(SYS_CPUPLL) & 0x0000003f) * AU1000_SRC_CLK; | 227 | cpu_speed = (au_readl(SYS_CPUPLL) & 0x0000003f) * AU1000_SRC_CLK; |
222 | no_au1xxx_32khz = 1; | ||
223 | } | ||
224 | mips_hpt_frequency = cpu_speed; | 228 | mips_hpt_frequency = cpu_speed; |
225 | // Equation: Baudrate = CPU / (SD * 2 * CLKDIV * 16) | 229 | // Equation: Baudrate = CPU / (SD * 2 * CLKDIV * 16) |
226 | set_au1x00_uart_baud_base(cpu_speed / (2 * ((int)(au_readl(SYS_POWERCTRL)&0x03) + 2) * 16)); | 230 | set_au1x00_uart_baud_base(cpu_speed / (2 * ((int)(au_readl(SYS_POWERCTRL)&0x03) + 2) * 16)); |
diff --git a/arch/mips/au1000/xxs1500/board_setup.c b/arch/mips/au1000/xxs1500/board_setup.c index a9237f41933d..b2e413e597a8 100644 --- a/arch/mips/au1000/xxs1500/board_setup.c +++ b/arch/mips/au1000/xxs1500/board_setup.c | |||
@@ -33,11 +33,10 @@ | |||
33 | #include <asm/cpu.h> | 33 | #include <asm/cpu.h> |
34 | #include <asm/bootinfo.h> | 34 | #include <asm/bootinfo.h> |
35 | #include <asm/irq.h> | 35 | #include <asm/irq.h> |
36 | #include <asm/keyboard.h> | ||
37 | #include <asm/mipsregs.h> | 36 | #include <asm/mipsregs.h> |
38 | #include <asm/reboot.h> | 37 | #include <asm/reboot.h> |
39 | #include <asm/pgtable.h> | 38 | #include <asm/pgtable.h> |
40 | #include <asm/au1000.h> | 39 | #include <asm/mach-au1x00/au1000.h> |
41 | 40 | ||
42 | void board_reset(void) | 41 | void board_reset(void) |
43 | { | 42 | { |
diff --git a/arch/mips/au1000/xxs1500/irqmap.c b/arch/mips/au1000/xxs1500/irqmap.c index 389349295d70..a343da134334 100644 --- a/arch/mips/au1000/xxs1500/irqmap.c +++ b/arch/mips/au1000/xxs1500/irqmap.c | |||
@@ -45,7 +45,7 @@ | |||
45 | #include <asm/io.h> | 45 | #include <asm/io.h> |
46 | #include <asm/mipsregs.h> | 46 | #include <asm/mipsregs.h> |
47 | #include <asm/system.h> | 47 | #include <asm/system.h> |
48 | #include <asm/au1000.h> | 48 | #include <asm/mach-au1x00/au1000.h> |
49 | 49 | ||
50 | struct au1xxx_irqmap __initdata au1xxx_irq_map[] = { | 50 | struct au1xxx_irqmap __initdata au1xxx_irq_map[] = { |
51 | { AU1500_GPIO_204, INTC_INT_HIGH_LEVEL, 0}, | 51 | { AU1500_GPIO_204, INTC_INT_HIGH_LEVEL, 0}, |
diff --git a/arch/mips/configs/bigsur_defconfig b/arch/mips/configs/bigsur_defconfig index abf70d74e9d7..3b42cea2e402 100644 --- a/arch/mips/configs/bigsur_defconfig +++ b/arch/mips/configs/bigsur_defconfig | |||
@@ -1,58 +1,48 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.20 | 3 | # Linux kernel version: 2.6.25-rc7 |
4 | # Tue Feb 20 21:47:22 2007 | 4 | # Mon Mar 31 08:11:19 2008 |
5 | # | 5 | # |
6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
7 | 7 | ||
8 | # | 8 | # |
9 | # Machine selection | 9 | # Machine selection |
10 | # | 10 | # |
11 | CONFIG_ZONE_DMA=y | 11 | # CONFIG_MACH_ALCHEMY is not set |
12 | # CONFIG_MIPS_MTX1 is not set | ||
13 | # CONFIG_MIPS_BOSPORUS is not set | ||
14 | # CONFIG_MIPS_PB1000 is not set | ||
15 | # CONFIG_MIPS_PB1100 is not set | ||
16 | # CONFIG_MIPS_PB1500 is not set | ||
17 | # CONFIG_MIPS_PB1550 is not set | ||
18 | # CONFIG_MIPS_PB1200 is not set | ||
19 | # CONFIG_MIPS_DB1000 is not set | ||
20 | # CONFIG_MIPS_DB1100 is not set | ||
21 | # CONFIG_MIPS_DB1500 is not set | ||
22 | # CONFIG_MIPS_DB1550 is not set | ||
23 | # CONFIG_MIPS_DB1200 is not set | ||
24 | # CONFIG_MIPS_MIRAGE is not set | ||
25 | # CONFIG_BASLER_EXCITE is not set | 12 | # CONFIG_BASLER_EXCITE is not set |
13 | # CONFIG_BCM47XX is not set | ||
26 | # CONFIG_MIPS_COBALT is not set | 14 | # CONFIG_MIPS_COBALT is not set |
27 | # CONFIG_MACH_DECSTATION is not set | 15 | # CONFIG_MACH_DECSTATION is not set |
28 | # CONFIG_MACH_JAZZ is not set | 16 | # CONFIG_MACH_JAZZ is not set |
17 | # CONFIG_LASAT is not set | ||
18 | # CONFIG_LEMOTE_FULONG is not set | ||
29 | # CONFIG_MIPS_ATLAS is not set | 19 | # CONFIG_MIPS_ATLAS is not set |
30 | # CONFIG_MIPS_MALTA is not set | 20 | # CONFIG_MIPS_MALTA is not set |
31 | # CONFIG_MIPS_SEAD is not set | 21 | # CONFIG_MIPS_SEAD is not set |
32 | # CONFIG_WR_PPMC is not set | ||
33 | # CONFIG_MIPS_SIM is not set | 22 | # CONFIG_MIPS_SIM is not set |
34 | # CONFIG_MOMENCO_JAGUAR_ATX is not set | 23 | # CONFIG_MARKEINS is not set |
35 | # CONFIG_MIPS_XXS1500 is not set | 24 | # CONFIG_MACH_VR41XX is not set |
36 | # CONFIG_PNX8550_JBS is not set | 25 | # CONFIG_PNX8550_JBS is not set |
37 | # CONFIG_PNX8550_STB810 is not set | 26 | # CONFIG_PNX8550_STB810 is not set |
38 | # CONFIG_MACH_VR41XX is not set | 27 | # CONFIG_PMC_MSP is not set |
39 | # CONFIG_PMC_YOSEMITE is not set | 28 | # CONFIG_PMC_YOSEMITE is not set |
40 | # CONFIG_MARKEINS is not set | ||
41 | # CONFIG_SGI_IP22 is not set | 29 | # CONFIG_SGI_IP22 is not set |
42 | # CONFIG_SGI_IP27 is not set | 30 | # CONFIG_SGI_IP27 is not set |
31 | # CONFIG_SGI_IP28 is not set | ||
43 | # CONFIG_SGI_IP32 is not set | 32 | # CONFIG_SGI_IP32 is not set |
44 | CONFIG_SIBYTE_BIGSUR=y | ||
45 | # CONFIG_SIBYTE_SWARM is not set | ||
46 | # CONFIG_SIBYTE_SENTOSA is not set | ||
47 | # CONFIG_SIBYTE_RHONE is not set | ||
48 | # CONFIG_SIBYTE_CARMEL is not set | ||
49 | # CONFIG_SIBYTE_LITTLESUR is not set | ||
50 | # CONFIG_SIBYTE_CRHINE is not set | 33 | # CONFIG_SIBYTE_CRHINE is not set |
34 | # CONFIG_SIBYTE_CARMEL is not set | ||
51 | # CONFIG_SIBYTE_CRHONE is not set | 35 | # CONFIG_SIBYTE_CRHONE is not set |
36 | # CONFIG_SIBYTE_RHONE is not set | ||
37 | # CONFIG_SIBYTE_SWARM is not set | ||
38 | # CONFIG_SIBYTE_LITTLESUR is not set | ||
39 | # CONFIG_SIBYTE_SENTOSA is not set | ||
40 | CONFIG_SIBYTE_BIGSUR=y | ||
52 | # CONFIG_SNI_RM is not set | 41 | # CONFIG_SNI_RM is not set |
53 | # CONFIG_TOSHIBA_JMR3927 is not set | 42 | # CONFIG_TOSHIBA_JMR3927 is not set |
54 | # CONFIG_TOSHIBA_RBTX4927 is not set | 43 | # CONFIG_TOSHIBA_RBTX4927 is not set |
55 | # CONFIG_TOSHIBA_RBTX4938 is not set | 44 | # CONFIG_TOSHIBA_RBTX4938 is not set |
45 | # CONFIG_WR_PPMC is not set | ||
56 | CONFIG_SIBYTE_BCM1x80=y | 46 | CONFIG_SIBYTE_BCM1x80=y |
57 | CONFIG_SIBYTE_SB1xxx_SOC=y | 47 | CONFIG_SIBYTE_SB1xxx_SOC=y |
58 | # CONFIG_CPU_SB1_PASS_1 is not set | 48 | # CONFIG_CPU_SB1_PASS_1 is not set |
@@ -68,9 +58,11 @@ CONFIG_SIBYTE_CFE=y | |||
68 | # CONFIG_SIBYTE_CFE_CONSOLE is not set | 58 | # CONFIG_SIBYTE_CFE_CONSOLE is not set |
69 | # CONFIG_SIBYTE_BUS_WATCHER is not set | 59 | # CONFIG_SIBYTE_BUS_WATCHER is not set |
70 | # CONFIG_SIBYTE_TBPROF is not set | 60 | # CONFIG_SIBYTE_TBPROF is not set |
61 | CONFIG_SIBYTE_HAS_ZBUS_PROFILING=y | ||
71 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 62 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
72 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | 63 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set |
73 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | 64 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set |
65 | CONFIG_ARCH_SUPPORTS_OPROFILE=y | ||
74 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 66 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
75 | CONFIG_GENERIC_HWEIGHT=y | 67 | CONFIG_GENERIC_HWEIGHT=y |
76 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 68 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
@@ -81,11 +73,17 @@ CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | |||
81 | # CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set | 73 | # CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set |
82 | CONFIG_CEVT_BCM1480=y | 74 | CONFIG_CEVT_BCM1480=y |
83 | CONFIG_CSRC_BCM1480=y | 75 | CONFIG_CSRC_BCM1480=y |
76 | CONFIG_CFE=y | ||
84 | CONFIG_DMA_COHERENT=y | 77 | CONFIG_DMA_COHERENT=y |
78 | CONFIG_EARLY_PRINTK=y | ||
79 | CONFIG_SYS_HAS_EARLY_PRINTK=y | ||
80 | # CONFIG_HOTPLUG_CPU is not set | ||
81 | # CONFIG_NO_IOPORT is not set | ||
85 | CONFIG_CPU_BIG_ENDIAN=y | 82 | CONFIG_CPU_BIG_ENDIAN=y |
86 | # CONFIG_CPU_LITTLE_ENDIAN is not set | 83 | # CONFIG_CPU_LITTLE_ENDIAN is not set |
87 | CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y | 84 | CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y |
88 | CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y | 85 | CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y |
86 | CONFIG_IRQ_CPU=y | ||
89 | CONFIG_SWAP_IO_SPACE=y | 87 | CONFIG_SWAP_IO_SPACE=y |
90 | CONFIG_BOOT_ELF32=y | 88 | CONFIG_BOOT_ELF32=y |
91 | CONFIG_MIPS_L1_CACHE_SHIFT=5 | 89 | CONFIG_MIPS_L1_CACHE_SHIFT=5 |
@@ -93,10 +91,6 @@ CONFIG_MIPS_L1_CACHE_SHIFT=5 | |||
93 | # | 91 | # |
94 | # CPU selection | 92 | # CPU selection |
95 | # | 93 | # |
96 | CONFIG_TICK_ONESHOT=y | ||
97 | CONFIG_NO_HZ=y | ||
98 | CONFIG_HIGH_RES_TIMERS=y | ||
99 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y | ||
100 | # CONFIG_CPU_LOONGSON2 is not set | 94 | # CONFIG_CPU_LOONGSON2 is not set |
101 | # CONFIG_CPU_MIPS32_R1 is not set | 95 | # CONFIG_CPU_MIPS32_R1 is not set |
102 | # CONFIG_CPU_MIPS32_R2 is not set | 96 | # CONFIG_CPU_MIPS32_R2 is not set |
@@ -137,14 +131,15 @@ CONFIG_PAGE_SIZE_4KB=y | |||
137 | CONFIG_MIPS_MT_DISABLED=y | 131 | CONFIG_MIPS_MT_DISABLED=y |
138 | # CONFIG_MIPS_MT_SMP is not set | 132 | # CONFIG_MIPS_MT_SMP is not set |
139 | # CONFIG_MIPS_MT_SMTC is not set | 133 | # CONFIG_MIPS_MT_SMTC is not set |
140 | # CONFIG_MIPS_VPE_LOADER is not set | ||
141 | CONFIG_CPU_HAS_LLSC=y | 134 | CONFIG_CPU_HAS_LLSC=y |
142 | CONFIG_CPU_HAS_SYNC=y | 135 | CONFIG_CPU_HAS_SYNC=y |
143 | CONFIG_GENERIC_HARDIRQS=y | 136 | CONFIG_GENERIC_HARDIRQS=y |
144 | CONFIG_GENERIC_IRQ_PROBE=y | 137 | CONFIG_GENERIC_IRQ_PROBE=y |
145 | CONFIG_IRQ_PER_CPU=y | 138 | CONFIG_IRQ_PER_CPU=y |
146 | CONFIG_CPU_SUPPORTS_HIGHMEM=y | 139 | CONFIG_CPU_SUPPORTS_HIGHMEM=y |
140 | CONFIG_SYS_SUPPORTS_HIGHMEM=y | ||
147 | CONFIG_ARCH_FLATMEM_ENABLE=y | 141 | CONFIG_ARCH_FLATMEM_ENABLE=y |
142 | CONFIG_ARCH_POPULATES_NODE_MAP=y | ||
148 | CONFIG_SELECT_MEMORY_MODEL=y | 143 | CONFIG_SELECT_MEMORY_MODEL=y |
149 | CONFIG_FLATMEM_MANUAL=y | 144 | CONFIG_FLATMEM_MANUAL=y |
150 | # CONFIG_DISCONTIGMEM_MANUAL is not set | 145 | # CONFIG_DISCONTIGMEM_MANUAL is not set |
@@ -152,13 +147,19 @@ CONFIG_FLATMEM_MANUAL=y | |||
152 | CONFIG_FLATMEM=y | 147 | CONFIG_FLATMEM=y |
153 | CONFIG_FLAT_NODE_MEM_MAP=y | 148 | CONFIG_FLAT_NODE_MEM_MAP=y |
154 | # CONFIG_SPARSEMEM_STATIC is not set | 149 | # CONFIG_SPARSEMEM_STATIC is not set |
150 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | ||
155 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 151 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
156 | CONFIG_RESOURCES_64BIT=y | 152 | CONFIG_RESOURCES_64BIT=y |
157 | CONFIG_ZONE_DMA_FLAG=1 | 153 | CONFIG_ZONE_DMA_FLAG=0 |
154 | CONFIG_VIRT_TO_BUS=y | ||
158 | CONFIG_SMP=y | 155 | CONFIG_SMP=y |
159 | CONFIG_SYS_SUPPORTS_SMP=y | 156 | CONFIG_SYS_SUPPORTS_SMP=y |
160 | CONFIG_NR_CPUS_DEFAULT_4=y | 157 | CONFIG_NR_CPUS_DEFAULT_4=y |
161 | CONFIG_NR_CPUS=4 | 158 | CONFIG_NR_CPUS=4 |
159 | CONFIG_TICK_ONESHOT=y | ||
160 | CONFIG_NO_HZ=y | ||
161 | CONFIG_HIGH_RES_TIMERS=y | ||
162 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y | ||
162 | # CONFIG_HZ_48 is not set | 163 | # CONFIG_HZ_48 is not set |
163 | # CONFIG_HZ_100 is not set | 164 | # CONFIG_HZ_100 is not set |
164 | # CONFIG_HZ_128 is not set | 165 | # CONFIG_HZ_128 is not set |
@@ -171,38 +172,45 @@ CONFIG_HZ=1000 | |||
171 | CONFIG_PREEMPT_NONE=y | 172 | CONFIG_PREEMPT_NONE=y |
172 | # CONFIG_PREEMPT_VOLUNTARY is not set | 173 | # CONFIG_PREEMPT_VOLUNTARY is not set |
173 | # CONFIG_PREEMPT is not set | 174 | # CONFIG_PREEMPT is not set |
174 | # CONFIG_PREEMPT_BKL is not set | ||
175 | # CONFIG_KEXEC is not set | 175 | # CONFIG_KEXEC is not set |
176 | CONFIG_SECCOMP=y | ||
176 | CONFIG_LOCKDEP_SUPPORT=y | 177 | CONFIG_LOCKDEP_SUPPORT=y |
177 | CONFIG_STACKTRACE_SUPPORT=y | 178 | CONFIG_STACKTRACE_SUPPORT=y |
178 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 179 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
179 | 180 | ||
180 | # | 181 | # |
181 | # Code maturity level options | 182 | # General setup |
182 | # | 183 | # |
183 | CONFIG_EXPERIMENTAL=y | 184 | CONFIG_EXPERIMENTAL=y |
184 | CONFIG_LOCK_KERNEL=y | 185 | CONFIG_LOCK_KERNEL=y |
185 | CONFIG_INIT_ENV_ARG_LIMIT=32 | 186 | CONFIG_INIT_ENV_ARG_LIMIT=32 |
186 | |||
187 | # | ||
188 | # General setup | ||
189 | # | ||
190 | CONFIG_LOCALVERSION="" | 187 | CONFIG_LOCALVERSION="" |
191 | CONFIG_LOCALVERSION_AUTO=y | 188 | CONFIG_LOCALVERSION_AUTO=y |
192 | CONFIG_SWAP=y | 189 | CONFIG_SWAP=y |
193 | CONFIG_SYSVIPC=y | 190 | CONFIG_SYSVIPC=y |
194 | # CONFIG_IPC_NS is not set | ||
195 | CONFIG_SYSVIPC_SYSCTL=y | 191 | CONFIG_SYSVIPC_SYSCTL=y |
196 | # CONFIG_POSIX_MQUEUE is not set | 192 | CONFIG_POSIX_MQUEUE=y |
197 | # CONFIG_BSD_PROCESS_ACCT is not set | 193 | CONFIG_BSD_PROCESS_ACCT=y |
198 | # CONFIG_TASKSTATS is not set | 194 | CONFIG_BSD_PROCESS_ACCT_V3=y |
199 | # CONFIG_UTS_NS is not set | 195 | CONFIG_TASKSTATS=y |
200 | # CONFIG_AUDIT is not set | 196 | CONFIG_TASK_DELAY_ACCT=y |
197 | CONFIG_TASK_XACCT=y | ||
198 | CONFIG_TASK_IO_ACCOUNTING=y | ||
199 | CONFIG_AUDIT=y | ||
201 | CONFIG_IKCONFIG=y | 200 | CONFIG_IKCONFIG=y |
202 | CONFIG_IKCONFIG_PROC=y | 201 | CONFIG_IKCONFIG_PROC=y |
203 | # CONFIG_CPUSETS is not set | 202 | CONFIG_LOG_BUF_SHIFT=16 |
203 | # CONFIG_CGROUPS is not set | ||
204 | CONFIG_GROUP_SCHED=y | ||
205 | CONFIG_FAIR_GROUP_SCHED=y | ||
206 | # CONFIG_RT_GROUP_SCHED is not set | ||
207 | CONFIG_USER_SCHED=y | ||
208 | # CONFIG_CGROUP_SCHED is not set | ||
204 | CONFIG_SYSFS_DEPRECATED=y | 209 | CONFIG_SYSFS_DEPRECATED=y |
205 | # CONFIG_RELAY is not set | 210 | CONFIG_SYSFS_DEPRECATED_V2=y |
211 | CONFIG_RELAY=y | ||
212 | # CONFIG_NAMESPACES is not set | ||
213 | CONFIG_BLK_DEV_INITRD=y | ||
206 | CONFIG_INITRAMFS_SOURCE="" | 214 | CONFIG_INITRAMFS_SOURCE="" |
207 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 215 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
208 | CONFIG_SYSCTL=y | 216 | CONFIG_SYSCTL=y |
@@ -211,24 +219,33 @@ CONFIG_EMBEDDED=y | |||
211 | CONFIG_KALLSYMS=y | 219 | CONFIG_KALLSYMS=y |
212 | # CONFIG_KALLSYMS_ALL is not set | 220 | # CONFIG_KALLSYMS_ALL is not set |
213 | # CONFIG_KALLSYMS_EXTRA_PASS is not set | 221 | # CONFIG_KALLSYMS_EXTRA_PASS is not set |
214 | # CONFIG_HOTPLUG is not set | 222 | CONFIG_HOTPLUG=y |
215 | CONFIG_PRINTK=y | 223 | CONFIG_PRINTK=y |
216 | CONFIG_BUG=y | 224 | CONFIG_BUG=y |
217 | CONFIG_ELF_CORE=y | 225 | CONFIG_ELF_CORE=y |
226 | CONFIG_COMPAT_BRK=y | ||
218 | CONFIG_BASE_FULL=y | 227 | CONFIG_BASE_FULL=y |
219 | CONFIG_FUTEX=y | 228 | CONFIG_FUTEX=y |
229 | CONFIG_ANON_INODES=y | ||
220 | CONFIG_EPOLL=y | 230 | CONFIG_EPOLL=y |
231 | CONFIG_SIGNALFD=y | ||
232 | CONFIG_TIMERFD=y | ||
233 | CONFIG_EVENTFD=y | ||
221 | CONFIG_SHMEM=y | 234 | CONFIG_SHMEM=y |
222 | CONFIG_SLAB=y | ||
223 | CONFIG_VM_EVENT_COUNTERS=y | 235 | CONFIG_VM_EVENT_COUNTERS=y |
236 | CONFIG_SLAB=y | ||
237 | # CONFIG_SLUB is not set | ||
238 | # CONFIG_SLOB is not set | ||
239 | # CONFIG_PROFILING is not set | ||
240 | # CONFIG_MARKERS is not set | ||
241 | CONFIG_HAVE_OPROFILE=y | ||
242 | # CONFIG_HAVE_KPROBES is not set | ||
243 | # CONFIG_HAVE_KRETPROBES is not set | ||
244 | CONFIG_PROC_PAGE_MONITOR=y | ||
245 | CONFIG_SLABINFO=y | ||
224 | CONFIG_RT_MUTEXES=y | 246 | CONFIG_RT_MUTEXES=y |
225 | # CONFIG_TINY_SHMEM is not set | 247 | # CONFIG_TINY_SHMEM is not set |
226 | CONFIG_BASE_SMALL=0 | 248 | CONFIG_BASE_SMALL=0 |
227 | # CONFIG_SLOB is not set | ||
228 | |||
229 | # | ||
230 | # Loadable module support | ||
231 | # | ||
232 | CONFIG_MODULES=y | 249 | CONFIG_MODULES=y |
233 | CONFIG_MODULE_UNLOAD=y | 250 | CONFIG_MODULE_UNLOAD=y |
234 | # CONFIG_MODULE_FORCE_UNLOAD is not set | 251 | # CONFIG_MODULE_FORCE_UNLOAD is not set |
@@ -236,12 +253,10 @@ CONFIG_MODVERSIONS=y | |||
236 | CONFIG_MODULE_SRCVERSION_ALL=y | 253 | CONFIG_MODULE_SRCVERSION_ALL=y |
237 | CONFIG_KMOD=y | 254 | CONFIG_KMOD=y |
238 | CONFIG_STOP_MACHINE=y | 255 | CONFIG_STOP_MACHINE=y |
239 | |||
240 | # | ||
241 | # Block layer | ||
242 | # | ||
243 | CONFIG_BLOCK=y | 256 | CONFIG_BLOCK=y |
244 | # CONFIG_BLK_DEV_IO_TRACE is not set | 257 | # CONFIG_BLK_DEV_IO_TRACE is not set |
258 | # CONFIG_BLK_DEV_BSG is not set | ||
259 | CONFIG_BLOCK_COMPAT=y | ||
245 | 260 | ||
246 | # | 261 | # |
247 | # IO Schedulers | 262 | # IO Schedulers |
@@ -255,6 +270,7 @@ CONFIG_DEFAULT_AS=y | |||
255 | # CONFIG_DEFAULT_CFQ is not set | 270 | # CONFIG_DEFAULT_CFQ is not set |
256 | # CONFIG_DEFAULT_NOOP is not set | 271 | # CONFIG_DEFAULT_NOOP is not set |
257 | CONFIG_DEFAULT_IOSCHED="anticipatory" | 272 | CONFIG_DEFAULT_IOSCHED="anticipatory" |
273 | CONFIG_CLASSIC_RCU=y | ||
258 | 274 | ||
259 | # | 275 | # |
260 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) | 276 | # Bus options (PCI, PCMCIA, EISA, ISA, TC) |
@@ -262,23 +278,19 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" | |||
262 | CONFIG_HW_HAS_PCI=y | 278 | CONFIG_HW_HAS_PCI=y |
263 | CONFIG_PCI=y | 279 | CONFIG_PCI=y |
264 | CONFIG_PCI_DOMAINS=y | 280 | CONFIG_PCI_DOMAINS=y |
281 | # CONFIG_ARCH_SUPPORTS_MSI is not set | ||
282 | CONFIG_PCI_LEGACY=y | ||
265 | CONFIG_PCI_DEBUG=y | 283 | CONFIG_PCI_DEBUG=y |
266 | CONFIG_MMU=y | 284 | CONFIG_MMU=y |
267 | 285 | CONFIG_ZONE_DMA32=y | |
268 | # | 286 | # CONFIG_PCCARD is not set |
269 | # PCCARD (PCMCIA/CardBus) support | 287 | # CONFIG_HOTPLUG_PCI is not set |
270 | # | ||
271 | |||
272 | # | ||
273 | # PCI Hotplug Support | ||
274 | # | ||
275 | 288 | ||
276 | # | 289 | # |
277 | # Executable file formats | 290 | # Executable file formats |
278 | # | 291 | # |
279 | CONFIG_BINFMT_ELF=y | 292 | CONFIG_BINFMT_ELF=y |
280 | # CONFIG_BINFMT_MISC is not set | 293 | # CONFIG_BINFMT_MISC is not set |
281 | # CONFIG_BUILD_ELF64 is not set | ||
282 | CONFIG_MIPS32_COMPAT=y | 294 | CONFIG_MIPS32_COMPAT=y |
283 | CONFIG_COMPAT=y | 295 | CONFIG_COMPAT=y |
284 | CONFIG_SYSVIPC_COMPAT=y | 296 | CONFIG_SYSVIPC_COMPAT=y |
@@ -292,7 +304,6 @@ CONFIG_BINFMT_ELF32=y | |||
292 | CONFIG_PM=y | 304 | CONFIG_PM=y |
293 | # CONFIG_PM_LEGACY is not set | 305 | # CONFIG_PM_LEGACY is not set |
294 | # CONFIG_PM_DEBUG is not set | 306 | # CONFIG_PM_DEBUG is not set |
295 | # CONFIG_PM_SYSFS_DEPRECATED is not set | ||
296 | 307 | ||
297 | # | 308 | # |
298 | # Networking | 309 | # Networking |
@@ -302,7 +313,6 @@ CONFIG_NET=y | |||
302 | # | 313 | # |
303 | # Networking options | 314 | # Networking options |
304 | # | 315 | # |
305 | # CONFIG_NETDEBUG is not set | ||
306 | CONFIG_PACKET=y | 316 | CONFIG_PACKET=y |
307 | CONFIG_PACKET_MMAP=y | 317 | CONFIG_PACKET_MMAP=y |
308 | CONFIG_UNIX=y | 318 | CONFIG_UNIX=y |
@@ -310,10 +320,11 @@ CONFIG_XFRM=y | |||
310 | CONFIG_XFRM_USER=m | 320 | CONFIG_XFRM_USER=m |
311 | # CONFIG_XFRM_SUB_POLICY is not set | 321 | # CONFIG_XFRM_SUB_POLICY is not set |
312 | CONFIG_XFRM_MIGRATE=y | 322 | CONFIG_XFRM_MIGRATE=y |
323 | # CONFIG_XFRM_STATISTICS is not set | ||
313 | CONFIG_NET_KEY=y | 324 | CONFIG_NET_KEY=y |
314 | CONFIG_NET_KEY_MIGRATE=y | 325 | CONFIG_NET_KEY_MIGRATE=y |
315 | CONFIG_INET=y | 326 | CONFIG_INET=y |
316 | # CONFIG_IP_MULTICAST is not set | 327 | CONFIG_IP_MULTICAST=y |
317 | # CONFIG_IP_ADVANCED_ROUTER is not set | 328 | # CONFIG_IP_ADVANCED_ROUTER is not set |
318 | CONFIG_IP_FIB_HASH=y | 329 | CONFIG_IP_FIB_HASH=y |
319 | CONFIG_IP_PNP=y | 330 | CONFIG_IP_PNP=y |
@@ -322,41 +333,141 @@ CONFIG_IP_PNP_BOOTP=y | |||
322 | # CONFIG_IP_PNP_RARP is not set | 333 | # CONFIG_IP_PNP_RARP is not set |
323 | # CONFIG_NET_IPIP is not set | 334 | # CONFIG_NET_IPIP is not set |
324 | # CONFIG_NET_IPGRE is not set | 335 | # CONFIG_NET_IPGRE is not set |
336 | CONFIG_IP_MROUTE=y | ||
337 | CONFIG_IP_PIMSM_V1=y | ||
338 | CONFIG_IP_PIMSM_V2=y | ||
325 | # CONFIG_ARPD is not set | 339 | # CONFIG_ARPD is not set |
326 | # CONFIG_SYN_COOKIES is not set | 340 | # CONFIG_SYN_COOKIES is not set |
327 | # CONFIG_INET_AH is not set | 341 | CONFIG_INET_AH=m |
328 | # CONFIG_INET_ESP is not set | 342 | CONFIG_INET_ESP=m |
329 | # CONFIG_INET_IPCOMP is not set | 343 | CONFIG_INET_IPCOMP=m |
330 | # CONFIG_INET_XFRM_TUNNEL is not set | 344 | CONFIG_INET_XFRM_TUNNEL=m |
331 | # CONFIG_INET_TUNNEL is not set | 345 | CONFIG_INET_TUNNEL=m |
332 | CONFIG_INET_XFRM_MODE_TRANSPORT=m | 346 | CONFIG_INET_XFRM_MODE_TRANSPORT=m |
333 | CONFIG_INET_XFRM_MODE_TUNNEL=m | 347 | CONFIG_INET_XFRM_MODE_TUNNEL=m |
334 | CONFIG_INET_XFRM_MODE_BEET=y | 348 | CONFIG_INET_XFRM_MODE_BEET=y |
349 | # CONFIG_INET_LRO is not set | ||
335 | CONFIG_INET_DIAG=y | 350 | CONFIG_INET_DIAG=y |
336 | CONFIG_INET_TCP_DIAG=y | 351 | CONFIG_INET_TCP_DIAG=y |
337 | # CONFIG_TCP_CONG_ADVANCED is not set | 352 | # CONFIG_TCP_CONG_ADVANCED is not set |
338 | CONFIG_TCP_CONG_CUBIC=y | 353 | CONFIG_TCP_CONG_CUBIC=y |
339 | CONFIG_DEFAULT_TCP_CONG="cubic" | 354 | CONFIG_DEFAULT_TCP_CONG="cubic" |
340 | CONFIG_TCP_MD5SIG=y | 355 | CONFIG_TCP_MD5SIG=y |
341 | # CONFIG_IPV6 is not set | 356 | CONFIG_IP_VS=m |
342 | # CONFIG_INET6_XFRM_TUNNEL is not set | 357 | # CONFIG_IP_VS_DEBUG is not set |
343 | # CONFIG_INET6_TUNNEL is not set | 358 | CONFIG_IP_VS_TAB_BITS=12 |
359 | |||
360 | # | ||
361 | # IPVS transport protocol load balancing support | ||
362 | # | ||
363 | CONFIG_IP_VS_PROTO_TCP=y | ||
364 | CONFIG_IP_VS_PROTO_UDP=y | ||
365 | CONFIG_IP_VS_PROTO_ESP=y | ||
366 | CONFIG_IP_VS_PROTO_AH=y | ||
367 | |||
368 | # | ||
369 | # IPVS scheduler | ||
370 | # | ||
371 | CONFIG_IP_VS_RR=m | ||
372 | CONFIG_IP_VS_WRR=m | ||
373 | CONFIG_IP_VS_LC=m | ||
374 | CONFIG_IP_VS_WLC=m | ||
375 | CONFIG_IP_VS_LBLC=m | ||
376 | CONFIG_IP_VS_LBLCR=m | ||
377 | CONFIG_IP_VS_DH=m | ||
378 | CONFIG_IP_VS_SH=m | ||
379 | CONFIG_IP_VS_SED=m | ||
380 | CONFIG_IP_VS_NQ=m | ||
381 | |||
382 | # | ||
383 | # IPVS application helper | ||
384 | # | ||
385 | CONFIG_IP_VS_FTP=m | ||
386 | CONFIG_IPV6=m | ||
387 | CONFIG_IPV6_PRIVACY=y | ||
388 | CONFIG_IPV6_ROUTER_PREF=y | ||
389 | CONFIG_IPV6_ROUTE_INFO=y | ||
390 | CONFIG_IPV6_OPTIMISTIC_DAD=y | ||
391 | CONFIG_INET6_AH=m | ||
392 | CONFIG_INET6_ESP=m | ||
393 | CONFIG_INET6_IPCOMP=m | ||
394 | CONFIG_IPV6_MIP6=m | ||
395 | CONFIG_INET6_XFRM_TUNNEL=m | ||
396 | CONFIG_INET6_TUNNEL=m | ||
397 | CONFIG_INET6_XFRM_MODE_TRANSPORT=m | ||
398 | CONFIG_INET6_XFRM_MODE_TUNNEL=m | ||
399 | CONFIG_INET6_XFRM_MODE_BEET=m | ||
400 | CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m | ||
401 | CONFIG_IPV6_SIT=m | ||
402 | CONFIG_IPV6_TUNNEL=m | ||
403 | CONFIG_IPV6_MULTIPLE_TABLES=y | ||
404 | CONFIG_IPV6_SUBTREES=y | ||
344 | CONFIG_NETWORK_SECMARK=y | 405 | CONFIG_NETWORK_SECMARK=y |
345 | # CONFIG_NETFILTER is not set | 406 | CONFIG_NETFILTER=y |
346 | 407 | # CONFIG_NETFILTER_DEBUG is not set | |
347 | # | 408 | # CONFIG_NETFILTER_ADVANCED is not set |
348 | # DCCP Configuration (EXPERIMENTAL) | 409 | |
349 | # | 410 | # |
411 | # Core Netfilter Configuration | ||
412 | # | ||
413 | CONFIG_NETFILTER_NETLINK=m | ||
414 | CONFIG_NETFILTER_NETLINK_LOG=m | ||
415 | CONFIG_NF_CONNTRACK=m | ||
416 | CONFIG_NF_CONNTRACK_SECMARK=y | ||
417 | CONFIG_NF_CONNTRACK_FTP=m | ||
418 | CONFIG_NF_CONNTRACK_IRC=m | ||
419 | CONFIG_NF_CONNTRACK_SIP=m | ||
420 | CONFIG_NF_CT_NETLINK=m | ||
421 | CONFIG_NETFILTER_XTABLES=m | ||
422 | CONFIG_NETFILTER_XT_TARGET_MARK=m | ||
423 | CONFIG_NETFILTER_XT_TARGET_NFLOG=m | ||
424 | CONFIG_NETFILTER_XT_TARGET_SECMARK=m | ||
425 | CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m | ||
426 | CONFIG_NETFILTER_XT_TARGET_TCPMSS=m | ||
427 | CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m | ||
428 | CONFIG_NETFILTER_XT_MATCH_MARK=m | ||
429 | CONFIG_NETFILTER_XT_MATCH_POLICY=m | ||
430 | CONFIG_NETFILTER_XT_MATCH_STATE=m | ||
431 | |||
432 | # | ||
433 | # IP: Netfilter Configuration | ||
434 | # | ||
435 | CONFIG_NF_CONNTRACK_IPV4=m | ||
436 | CONFIG_NF_CONNTRACK_PROC_COMPAT=y | ||
437 | CONFIG_IP_NF_IPTABLES=m | ||
438 | CONFIG_IP_NF_FILTER=m | ||
439 | CONFIG_IP_NF_TARGET_REJECT=m | ||
440 | CONFIG_IP_NF_TARGET_LOG=m | ||
441 | CONFIG_IP_NF_TARGET_ULOG=m | ||
442 | CONFIG_NF_NAT=m | ||
443 | CONFIG_NF_NAT_NEEDED=y | ||
444 | CONFIG_IP_NF_TARGET_MASQUERADE=m | ||
445 | CONFIG_NF_NAT_FTP=m | ||
446 | CONFIG_NF_NAT_IRC=m | ||
447 | # CONFIG_NF_NAT_TFTP is not set | ||
448 | # CONFIG_NF_NAT_AMANDA is not set | ||
449 | # CONFIG_NF_NAT_PPTP is not set | ||
450 | # CONFIG_NF_NAT_H323 is not set | ||
451 | CONFIG_NF_NAT_SIP=m | ||
452 | CONFIG_IP_NF_MANGLE=m | ||
453 | |||
454 | # | ||
455 | # IPv6: Netfilter Configuration | ||
456 | # | ||
457 | CONFIG_NF_CONNTRACK_IPV6=m | ||
458 | CONFIG_IP6_NF_IPTABLES=m | ||
459 | CONFIG_IP6_NF_MATCH_IPV6HEADER=m | ||
460 | CONFIG_IP6_NF_FILTER=m | ||
461 | CONFIG_IP6_NF_TARGET_LOG=m | ||
462 | CONFIG_IP6_NF_TARGET_REJECT=m | ||
463 | CONFIG_IP6_NF_MANGLE=m | ||
350 | # CONFIG_IP_DCCP is not set | 464 | # CONFIG_IP_DCCP is not set |
351 | 465 | CONFIG_IP_SCTP=m | |
352 | # | 466 | # CONFIG_SCTP_DBG_MSG is not set |
353 | # SCTP Configuration (EXPERIMENTAL) | 467 | # CONFIG_SCTP_DBG_OBJCNT is not set |
354 | # | 468 | # CONFIG_SCTP_HMAC_NONE is not set |
355 | # CONFIG_IP_SCTP is not set | 469 | # CONFIG_SCTP_HMAC_SHA1 is not set |
356 | 470 | CONFIG_SCTP_HMAC_MD5=y | |
357 | # | ||
358 | # TIPC Configuration (EXPERIMENTAL) | ||
359 | # | ||
360 | # CONFIG_TIPC is not set | 471 | # CONFIG_TIPC is not set |
361 | # CONFIG_ATM is not set | 472 | # CONFIG_ATM is not set |
362 | # CONFIG_BRIDGE is not set | 473 | # CONFIG_BRIDGE is not set |
@@ -369,10 +480,6 @@ CONFIG_NETWORK_SECMARK=y | |||
369 | # CONFIG_LAPB is not set | 480 | # CONFIG_LAPB is not set |
370 | # CONFIG_ECONET is not set | 481 | # CONFIG_ECONET is not set |
371 | # CONFIG_WAN_ROUTER is not set | 482 | # CONFIG_WAN_ROUTER is not set |
372 | |||
373 | # | ||
374 | # QoS and/or fair queueing | ||
375 | # | ||
376 | # CONFIG_NET_SCHED is not set | 483 | # CONFIG_NET_SCHED is not set |
377 | 484 | ||
378 | # | 485 | # |
@@ -380,9 +487,21 @@ CONFIG_NETWORK_SECMARK=y | |||
380 | # | 487 | # |
381 | # CONFIG_NET_PKTGEN is not set | 488 | # CONFIG_NET_PKTGEN is not set |
382 | # CONFIG_HAMRADIO is not set | 489 | # CONFIG_HAMRADIO is not set |
490 | # CONFIG_CAN is not set | ||
383 | # CONFIG_IRDA is not set | 491 | # CONFIG_IRDA is not set |
384 | # CONFIG_BT is not set | 492 | # CONFIG_BT is not set |
493 | # CONFIG_AF_RXRPC is not set | ||
494 | CONFIG_FIB_RULES=y | ||
495 | |||
496 | # | ||
497 | # Wireless | ||
498 | # | ||
499 | # CONFIG_CFG80211 is not set | ||
500 | # CONFIG_WIRELESS_EXT is not set | ||
501 | # CONFIG_MAC80211 is not set | ||
385 | # CONFIG_IEEE80211 is not set | 502 | # CONFIG_IEEE80211 is not set |
503 | # CONFIG_RFKILL is not set | ||
504 | # CONFIG_NET_9P is not set | ||
386 | 505 | ||
387 | # | 506 | # |
388 | # Device Drivers | 507 | # Device Drivers |
@@ -391,85 +510,70 @@ CONFIG_NETWORK_SECMARK=y | |||
391 | # | 510 | # |
392 | # Generic Driver Options | 511 | # Generic Driver Options |
393 | # | 512 | # |
513 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | ||
394 | CONFIG_STANDALONE=y | 514 | CONFIG_STANDALONE=y |
395 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 515 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
516 | CONFIG_FW_LOADER=m | ||
396 | # CONFIG_DEBUG_DRIVER is not set | 517 | # CONFIG_DEBUG_DRIVER is not set |
397 | # CONFIG_DEBUG_DEVRES is not set | 518 | # CONFIG_DEBUG_DEVRES is not set |
398 | # CONFIG_SYS_HYPERVISOR is not set | 519 | # CONFIG_SYS_HYPERVISOR is not set |
399 | |||
400 | # | ||
401 | # Connector - unified userspace <-> kernelspace linker | ||
402 | # | ||
403 | # CONFIG_CONNECTOR is not set | 520 | # CONFIG_CONNECTOR is not set |
404 | |||
405 | # | ||
406 | # Memory Technology Devices (MTD) | ||
407 | # | ||
408 | # CONFIG_MTD is not set | 521 | # CONFIG_MTD is not set |
409 | |||
410 | # | ||
411 | # Parallel port support | ||
412 | # | ||
413 | # CONFIG_PARPORT is not set | 522 | # CONFIG_PARPORT is not set |
414 | 523 | CONFIG_BLK_DEV=y | |
415 | # | ||
416 | # Plug and Play support | ||
417 | # | ||
418 | # CONFIG_PNPACPI is not set | ||
419 | |||
420 | # | ||
421 | # Block devices | ||
422 | # | ||
423 | # CONFIG_BLK_CPQ_DA is not set | 524 | # CONFIG_BLK_CPQ_DA is not set |
424 | # CONFIG_BLK_CPQ_CISS_DA is not set | 525 | # CONFIG_BLK_CPQ_CISS_DA is not set |
425 | # CONFIG_BLK_DEV_DAC960 is not set | 526 | # CONFIG_BLK_DEV_DAC960 is not set |
426 | # CONFIG_BLK_DEV_UMEM is not set | 527 | # CONFIG_BLK_DEV_UMEM is not set |
427 | # CONFIG_BLK_DEV_COW_COMMON is not set | 528 | # CONFIG_BLK_DEV_COW_COMMON is not set |
428 | CONFIG_BLK_DEV_LOOP=m | 529 | CONFIG_BLK_DEV_LOOP=m |
429 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set | 530 | CONFIG_BLK_DEV_CRYPTOLOOP=m |
430 | CONFIG_BLK_DEV_NBD=m | 531 | CONFIG_BLK_DEV_NBD=m |
431 | # CONFIG_BLK_DEV_SX8 is not set | 532 | # CONFIG_BLK_DEV_SX8 is not set |
432 | # CONFIG_BLK_DEV_RAM is not set | 533 | # CONFIG_BLK_DEV_RAM is not set |
433 | CONFIG_BLK_DEV_INITRD=y | ||
434 | # CONFIG_CDROM_PKTCDVD is not set | 534 | # CONFIG_CDROM_PKTCDVD is not set |
435 | # CONFIG_ATA_OVER_ETH is not set | 535 | # CONFIG_ATA_OVER_ETH is not set |
436 | 536 | CONFIG_MISC_DEVICES=y | |
437 | # | 537 | # CONFIG_PHANTOM is not set |
438 | # Misc devices | 538 | # CONFIG_EEPROM_93CX6 is not set |
439 | # | ||
440 | CONFIG_SGI_IOC4=m | 539 | CONFIG_SGI_IOC4=m |
441 | # CONFIG_TIFM_CORE is not set | 540 | # CONFIG_TIFM_CORE is not set |
442 | 541 | # CONFIG_ENCLOSURE_SERVICES is not set | |
443 | # | 542 | CONFIG_HAVE_IDE=y |
444 | # ATA/ATAPI/MFM/RLL support | ||
445 | # | ||
446 | CONFIG_IDE=y | 543 | CONFIG_IDE=y |
447 | CONFIG_IDE_MAX_HWIFS=4 | 544 | CONFIG_IDE_MAX_HWIFS=4 |
448 | CONFIG_BLK_DEV_IDE=y | 545 | CONFIG_BLK_DEV_IDE=y |
449 | 546 | ||
450 | # | 547 | # |
451 | # Please see Documentation/ide.txt for help/info on IDE drives | 548 | # Please see Documentation/ide/ide.txt for help/info on IDE drives |
452 | # | 549 | # |
453 | # CONFIG_BLK_DEV_IDE_SATA is not set | 550 | # CONFIG_BLK_DEV_IDE_SATA is not set |
454 | CONFIG_BLK_DEV_IDEDISK=y | 551 | CONFIG_BLK_DEV_IDEDISK=y |
455 | # CONFIG_IDEDISK_MULTI_MODE is not set | 552 | # CONFIG_IDEDISK_MULTI_MODE is not set |
456 | CONFIG_BLK_DEV_IDECD=y | 553 | CONFIG_BLK_DEV_IDECD=y |
554 | CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y | ||
457 | CONFIG_BLK_DEV_IDETAPE=y | 555 | CONFIG_BLK_DEV_IDETAPE=y |
458 | CONFIG_BLK_DEV_IDEFLOPPY=y | 556 | CONFIG_BLK_DEV_IDEFLOPPY=y |
557 | # CONFIG_BLK_DEV_IDESCSI is not set | ||
459 | # CONFIG_IDE_TASK_IOCTL is not set | 558 | # CONFIG_IDE_TASK_IOCTL is not set |
559 | CONFIG_IDE_PROC_FS=y | ||
460 | 560 | ||
461 | # | 561 | # |
462 | # IDE chipset support/bugfixes | 562 | # IDE chipset support/bugfixes |
463 | # | 563 | # |
464 | CONFIG_IDE_GENERIC=y | 564 | CONFIG_IDE_GENERIC=y |
565 | # CONFIG_BLK_DEV_PLATFORM is not set | ||
566 | CONFIG_BLK_DEV_IDEDMA_SFF=y | ||
567 | |||
568 | # | ||
569 | # PCI IDE chipsets support | ||
570 | # | ||
465 | CONFIG_BLK_DEV_IDEPCI=y | 571 | CONFIG_BLK_DEV_IDEPCI=y |
466 | # CONFIG_IDEPCI_SHARE_IRQ is not set | 572 | CONFIG_IDEPCI_PCIBUS_ORDER=y |
467 | # CONFIG_BLK_DEV_OFFBOARD is not set | 573 | # CONFIG_BLK_DEV_OFFBOARD is not set |
468 | CONFIG_BLK_DEV_GENERIC=y | 574 | CONFIG_BLK_DEV_GENERIC=y |
469 | # CONFIG_BLK_DEV_OPTI621 is not set | 575 | # CONFIG_BLK_DEV_OPTI621 is not set |
470 | CONFIG_BLK_DEV_IDEDMA_PCI=y | 576 | CONFIG_BLK_DEV_IDEDMA_PCI=y |
471 | # CONFIG_BLK_DEV_IDEDMA_FORCED is not set | ||
472 | # CONFIG_IDEDMA_PCI_AUTO is not set | ||
473 | # CONFIG_BLK_DEV_AEC62XX is not set | 577 | # CONFIG_BLK_DEV_AEC62XX is not set |
474 | # CONFIG_BLK_DEV_ALI15X3 is not set | 578 | # CONFIG_BLK_DEV_ALI15X3 is not set |
475 | # CONFIG_BLK_DEV_AMD74XX is not set | 579 | # CONFIG_BLK_DEV_AMD74XX is not set |
@@ -495,87 +599,196 @@ CONFIG_BLK_DEV_IT8213=m | |||
495 | # CONFIG_BLK_DEV_VIA82CXXX is not set | 599 | # CONFIG_BLK_DEV_VIA82CXXX is not set |
496 | CONFIG_BLK_DEV_TC86C001=m | 600 | CONFIG_BLK_DEV_TC86C001=m |
497 | # CONFIG_BLK_DEV_IDE_SWARM is not set | 601 | # CONFIG_BLK_DEV_IDE_SWARM is not set |
498 | # CONFIG_IDE_ARM is not set | ||
499 | CONFIG_BLK_DEV_IDEDMA=y | 602 | CONFIG_BLK_DEV_IDEDMA=y |
500 | # CONFIG_IDEDMA_IVB is not set | 603 | CONFIG_IDE_ARCH_OBSOLETE_INIT=y |
501 | # CONFIG_IDEDMA_AUTO is not set | ||
502 | # CONFIG_BLK_DEV_HD is not set | 604 | # CONFIG_BLK_DEV_HD is not set |
503 | 605 | ||
504 | # | 606 | # |
505 | # SCSI device support | 607 | # SCSI device support |
506 | # | 608 | # |
507 | # CONFIG_RAID_ATTRS is not set | 609 | # CONFIG_RAID_ATTRS is not set |
508 | # CONFIG_SCSI is not set | 610 | CONFIG_SCSI=y |
611 | CONFIG_SCSI_DMA=y | ||
612 | # CONFIG_SCSI_TGT is not set | ||
509 | # CONFIG_SCSI_NETLINK is not set | 613 | # CONFIG_SCSI_NETLINK is not set |
510 | 614 | CONFIG_SCSI_PROC_FS=y | |
511 | # | 615 | |
512 | # Serial ATA (prod) and Parallel ATA (experimental) drivers | 616 | # |
513 | # | 617 | # SCSI support type (disk, tape, CD-ROM) |
514 | # CONFIG_ATA is not set | 618 | # |
515 | 619 | CONFIG_BLK_DEV_SD=y | |
516 | # | 620 | # CONFIG_CHR_DEV_ST is not set |
517 | # Multi-device support (RAID and LVM) | 621 | # CONFIG_CHR_DEV_OSST is not set |
518 | # | 622 | # CONFIG_BLK_DEV_SR is not set |
623 | # CONFIG_CHR_DEV_SG is not set | ||
624 | # CONFIG_CHR_DEV_SCH is not set | ||
625 | |||
626 | # | ||
627 | # Some SCSI devices (e.g. CD jukebox) support multiple LUNs | ||
628 | # | ||
629 | # CONFIG_SCSI_MULTI_LUN is not set | ||
630 | # CONFIG_SCSI_CONSTANTS is not set | ||
631 | # CONFIG_SCSI_LOGGING is not set | ||
632 | # CONFIG_SCSI_SCAN_ASYNC is not set | ||
633 | CONFIG_SCSI_WAIT_SCAN=m | ||
634 | |||
635 | # | ||
636 | # SCSI Transports | ||
637 | # | ||
638 | # CONFIG_SCSI_SPI_ATTRS is not set | ||
639 | # CONFIG_SCSI_FC_ATTRS is not set | ||
640 | # CONFIG_SCSI_ISCSI_ATTRS is not set | ||
641 | # CONFIG_SCSI_SAS_LIBSAS is not set | ||
642 | # CONFIG_SCSI_SRP_ATTRS is not set | ||
643 | CONFIG_SCSI_LOWLEVEL=y | ||
644 | # CONFIG_ISCSI_TCP is not set | ||
645 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set | ||
646 | # CONFIG_SCSI_3W_9XXX is not set | ||
647 | # CONFIG_SCSI_ACARD is not set | ||
648 | # CONFIG_SCSI_AACRAID is not set | ||
649 | # CONFIG_SCSI_AIC7XXX is not set | ||
650 | # CONFIG_SCSI_AIC7XXX_OLD is not set | ||
651 | # CONFIG_SCSI_AIC79XX is not set | ||
652 | # CONFIG_SCSI_AIC94XX is not set | ||
653 | # CONFIG_SCSI_ADVANSYS is not set | ||
654 | # CONFIG_SCSI_ARCMSR is not set | ||
655 | # CONFIG_MEGARAID_NEWGEN is not set | ||
656 | # CONFIG_MEGARAID_LEGACY is not set | ||
657 | # CONFIG_MEGARAID_SAS is not set | ||
658 | # CONFIG_SCSI_HPTIOP is not set | ||
659 | # CONFIG_SCSI_DMX3191D is not set | ||
660 | # CONFIG_SCSI_FUTURE_DOMAIN is not set | ||
661 | # CONFIG_SCSI_IPS is not set | ||
662 | # CONFIG_SCSI_INITIO is not set | ||
663 | # CONFIG_SCSI_INIA100 is not set | ||
664 | # CONFIG_SCSI_MVSAS is not set | ||
665 | # CONFIG_SCSI_STEX is not set | ||
666 | # CONFIG_SCSI_SYM53C8XX_2 is not set | ||
667 | # CONFIG_SCSI_IPR is not set | ||
668 | # CONFIG_SCSI_QLOGIC_1280 is not set | ||
669 | # CONFIG_SCSI_QLA_FC is not set | ||
670 | # CONFIG_SCSI_QLA_ISCSI is not set | ||
671 | # CONFIG_SCSI_LPFC is not set | ||
672 | # CONFIG_SCSI_DC395x is not set | ||
673 | # CONFIG_SCSI_DC390T is not set | ||
674 | # CONFIG_SCSI_DEBUG is not set | ||
675 | # CONFIG_SCSI_SRP is not set | ||
676 | CONFIG_ATA=y | ||
677 | # CONFIG_ATA_NONSTANDARD is not set | ||
678 | # CONFIG_SATA_AHCI is not set | ||
679 | # CONFIG_SATA_SVW is not set | ||
680 | # CONFIG_ATA_PIIX is not set | ||
681 | # CONFIG_SATA_MV is not set | ||
682 | # CONFIG_SATA_NV is not set | ||
683 | # CONFIG_PDC_ADMA is not set | ||
684 | # CONFIG_SATA_QSTOR is not set | ||
685 | # CONFIG_SATA_PROMISE is not set | ||
686 | # CONFIG_SATA_SX4 is not set | ||
687 | # CONFIG_SATA_SIL is not set | ||
688 | CONFIG_SATA_SIL24=y | ||
689 | # CONFIG_SATA_SIS is not set | ||
690 | # CONFIG_SATA_ULI is not set | ||
691 | # CONFIG_SATA_VIA is not set | ||
692 | # CONFIG_SATA_VITESSE is not set | ||
693 | # CONFIG_SATA_INIC162X is not set | ||
694 | # CONFIG_PATA_ALI is not set | ||
695 | # CONFIG_PATA_AMD is not set | ||
696 | # CONFIG_PATA_ARTOP is not set | ||
697 | # CONFIG_PATA_ATIIXP is not set | ||
698 | # CONFIG_PATA_CMD640_PCI is not set | ||
699 | # CONFIG_PATA_CMD64X is not set | ||
700 | # CONFIG_PATA_CS5520 is not set | ||
701 | # CONFIG_PATA_CS5530 is not set | ||
702 | # CONFIG_PATA_CYPRESS is not set | ||
703 | # CONFIG_PATA_EFAR is not set | ||
704 | # CONFIG_ATA_GENERIC is not set | ||
705 | # CONFIG_PATA_HPT366 is not set | ||
706 | # CONFIG_PATA_HPT37X is not set | ||
707 | # CONFIG_PATA_HPT3X2N is not set | ||
708 | # CONFIG_PATA_HPT3X3 is not set | ||
709 | # CONFIG_PATA_IT821X is not set | ||
710 | # CONFIG_PATA_IT8213 is not set | ||
711 | # CONFIG_PATA_JMICRON is not set | ||
712 | # CONFIG_PATA_TRIFLEX is not set | ||
713 | # CONFIG_PATA_MARVELL is not set | ||
714 | # CONFIG_PATA_MPIIX is not set | ||
715 | # CONFIG_PATA_OLDPIIX is not set | ||
716 | # CONFIG_PATA_NETCELL is not set | ||
717 | # CONFIG_PATA_NINJA32 is not set | ||
718 | # CONFIG_PATA_NS87410 is not set | ||
719 | # CONFIG_PATA_NS87415 is not set | ||
720 | # CONFIG_PATA_OPTI is not set | ||
721 | # CONFIG_PATA_OPTIDMA is not set | ||
722 | # CONFIG_PATA_PDC_OLD is not set | ||
723 | # CONFIG_PATA_RADISYS is not set | ||
724 | # CONFIG_PATA_RZ1000 is not set | ||
725 | # CONFIG_PATA_SC1200 is not set | ||
726 | # CONFIG_PATA_SERVERWORKS is not set | ||
727 | # CONFIG_PATA_PDC2027X is not set | ||
728 | CONFIG_PATA_SIL680=y | ||
729 | # CONFIG_PATA_SIS is not set | ||
730 | # CONFIG_PATA_VIA is not set | ||
731 | # CONFIG_PATA_WINBOND is not set | ||
732 | # CONFIG_PATA_PLATFORM is not set | ||
519 | # CONFIG_MD is not set | 733 | # CONFIG_MD is not set |
520 | |||
521 | # | ||
522 | # Fusion MPT device support | ||
523 | # | ||
524 | # CONFIG_FUSION is not set | 734 | # CONFIG_FUSION is not set |
525 | 735 | ||
526 | # | 736 | # |
527 | # IEEE 1394 (FireWire) support | 737 | # IEEE 1394 (FireWire) support |
528 | # | 738 | # |
739 | # CONFIG_FIREWIRE is not set | ||
529 | # CONFIG_IEEE1394 is not set | 740 | # CONFIG_IEEE1394 is not set |
530 | |||
531 | # | ||
532 | # I2O device support | ||
533 | # | ||
534 | # CONFIG_I2O is not set | 741 | # CONFIG_I2O is not set |
535 | |||
536 | # | ||
537 | # Network device support | ||
538 | # | ||
539 | CONFIG_NETDEVICES=y | 742 | CONFIG_NETDEVICES=y |
743 | # CONFIG_NETDEVICES_MULTIQUEUE is not set | ||
540 | # CONFIG_DUMMY is not set | 744 | # CONFIG_DUMMY is not set |
541 | # CONFIG_BONDING is not set | 745 | # CONFIG_BONDING is not set |
746 | # CONFIG_MACVLAN is not set | ||
542 | # CONFIG_EQUALIZER is not set | 747 | # CONFIG_EQUALIZER is not set |
543 | # CONFIG_TUN is not set | 748 | # CONFIG_TUN is not set |
544 | 749 | # CONFIG_VETH is not set | |
545 | # | ||
546 | # ARCnet devices | ||
547 | # | ||
548 | # CONFIG_ARCNET is not set | 750 | # CONFIG_ARCNET is not set |
549 | 751 | CONFIG_PHYLIB=y | |
550 | # | 752 | |
551 | # PHY device support | 753 | # |
552 | # | 754 | # MII PHY device drivers |
553 | # CONFIG_PHYLIB is not set | 755 | # |
554 | 756 | # CONFIG_MARVELL_PHY is not set | |
555 | # | 757 | # CONFIG_DAVICOM_PHY is not set |
556 | # Ethernet (10 or 100Mbit) | 758 | # CONFIG_QSEMI_PHY is not set |
557 | # | 759 | # CONFIG_LXT_PHY is not set |
760 | # CONFIG_CICADA_PHY is not set | ||
761 | # CONFIG_VITESSE_PHY is not set | ||
762 | # CONFIG_SMSC_PHY is not set | ||
763 | # CONFIG_BROADCOM_PHY is not set | ||
764 | # CONFIG_ICPLUS_PHY is not set | ||
765 | # CONFIG_REALTEK_PHY is not set | ||
766 | # CONFIG_FIXED_PHY is not set | ||
767 | # CONFIG_MDIO_BITBANG is not set | ||
558 | CONFIG_NET_ETHERNET=y | 768 | CONFIG_NET_ETHERNET=y |
559 | CONFIG_MII=y | 769 | CONFIG_MII=y |
770 | # CONFIG_AX88796 is not set | ||
560 | # CONFIG_HAPPYMEAL is not set | 771 | # CONFIG_HAPPYMEAL is not set |
561 | # CONFIG_SUNGEM is not set | 772 | # CONFIG_SUNGEM is not set |
562 | # CONFIG_CASSINI is not set | 773 | # CONFIG_CASSINI is not set |
563 | # CONFIG_NET_VENDOR_3COM is not set | 774 | # CONFIG_NET_VENDOR_3COM is not set |
564 | # CONFIG_DM9000 is not set | 775 | # CONFIG_DM9000 is not set |
565 | |||
566 | # | ||
567 | # Tulip family network device support | ||
568 | # | ||
569 | # CONFIG_NET_TULIP is not set | 776 | # CONFIG_NET_TULIP is not set |
570 | # CONFIG_HP100 is not set | 777 | # CONFIG_HP100 is not set |
778 | # CONFIG_IBM_NEW_EMAC_ZMII is not set | ||
779 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | ||
780 | # CONFIG_IBM_NEW_EMAC_TAH is not set | ||
781 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | ||
571 | # CONFIG_NET_PCI is not set | 782 | # CONFIG_NET_PCI is not set |
572 | 783 | # CONFIG_B44 is not set | |
573 | # | 784 | CONFIG_NETDEV_1000=y |
574 | # Ethernet (1000 Mbit) | ||
575 | # | ||
576 | # CONFIG_ACENIC is not set | 785 | # CONFIG_ACENIC is not set |
577 | # CONFIG_DL2K is not set | 786 | # CONFIG_DL2K is not set |
578 | # CONFIG_E1000 is not set | 787 | # CONFIG_E1000 is not set |
788 | # CONFIG_E1000E is not set | ||
789 | # CONFIG_E1000E_ENABLED is not set | ||
790 | # CONFIG_IP1000 is not set | ||
791 | # CONFIG_IGB is not set | ||
579 | # CONFIG_NS83820 is not set | 792 | # CONFIG_NS83820 is not set |
580 | # CONFIG_HAMACHI is not set | 793 | # CONFIG_HAMACHI is not set |
581 | # CONFIG_YELLOWFIN is not set | 794 | # CONFIG_YELLOWFIN is not set |
@@ -585,52 +798,53 @@ CONFIG_SB1250_MAC=y | |||
585 | # CONFIG_SKGE is not set | 798 | # CONFIG_SKGE is not set |
586 | # CONFIG_SKY2 is not set | 799 | # CONFIG_SKY2 is not set |
587 | # CONFIG_SK98LIN is not set | 800 | # CONFIG_SK98LIN is not set |
801 | # CONFIG_VIA_VELOCITY is not set | ||
588 | # CONFIG_TIGON3 is not set | 802 | # CONFIG_TIGON3 is not set |
589 | # CONFIG_BNX2 is not set | 803 | # CONFIG_BNX2 is not set |
590 | # CONFIG_QLA3XXX is not set | 804 | # CONFIG_QLA3XXX is not set |
591 | # CONFIG_ATL1 is not set | 805 | # CONFIG_ATL1 is not set |
592 | 806 | CONFIG_NETDEV_10000=y | |
593 | # | ||
594 | # Ethernet (10000 Mbit) | ||
595 | # | ||
596 | # CONFIG_CHELSIO_T1 is not set | 807 | # CONFIG_CHELSIO_T1 is not set |
597 | CONFIG_CHELSIO_T3=m | 808 | CONFIG_CHELSIO_T3=m |
809 | # CONFIG_IXGBE is not set | ||
598 | # CONFIG_IXGB is not set | 810 | # CONFIG_IXGB is not set |
599 | # CONFIG_S2IO is not set | 811 | # CONFIG_S2IO is not set |
600 | # CONFIG_MYRI10GE is not set | 812 | # CONFIG_MYRI10GE is not set |
601 | CONFIG_NETXEN_NIC=m | 813 | CONFIG_NETXEN_NIC=m |
602 | 814 | # CONFIG_NIU is not set | |
603 | # | 815 | # CONFIG_MLX4_CORE is not set |
604 | # Token Ring devices | 816 | # CONFIG_TEHUTI is not set |
605 | # | 817 | # CONFIG_BNX2X is not set |
606 | # CONFIG_TR is not set | 818 | # CONFIG_TR is not set |
607 | 819 | ||
608 | # | 820 | # |
609 | # Wireless LAN (non-hamradio) | 821 | # Wireless LAN |
610 | # | ||
611 | # CONFIG_NET_RADIO is not set | ||
612 | |||
613 | # | ||
614 | # Wan interfaces | ||
615 | # | 822 | # |
823 | # CONFIG_WLAN_PRE80211 is not set | ||
824 | # CONFIG_WLAN_80211 is not set | ||
616 | # CONFIG_WAN is not set | 825 | # CONFIG_WAN is not set |
617 | # CONFIG_FDDI is not set | 826 | # CONFIG_FDDI is not set |
618 | # CONFIG_HIPPI is not set | 827 | # CONFIG_HIPPI is not set |
619 | # CONFIG_PPP is not set | 828 | CONFIG_PPP=m |
620 | # CONFIG_SLIP is not set | 829 | CONFIG_PPP_MULTILINK=y |
621 | # CONFIG_SHAPER is not set | 830 | CONFIG_PPP_FILTER=y |
831 | CONFIG_PPP_ASYNC=m | ||
832 | CONFIG_PPP_SYNC_TTY=m | ||
833 | CONFIG_PPP_DEFLATE=m | ||
834 | CONFIG_PPP_BSDCOMP=m | ||
835 | CONFIG_PPP_MPPE=m | ||
836 | CONFIG_PPPOE=m | ||
837 | CONFIG_PPPOL2TP=m | ||
838 | CONFIG_SLIP=m | ||
839 | CONFIG_SLIP_COMPRESSED=y | ||
840 | CONFIG_SLHC=m | ||
841 | CONFIG_SLIP_SMART=y | ||
842 | CONFIG_SLIP_MODE_SLIP6=y | ||
843 | # CONFIG_NET_FC is not set | ||
622 | # CONFIG_NETCONSOLE is not set | 844 | # CONFIG_NETCONSOLE is not set |
623 | # CONFIG_NETPOLL is not set | 845 | # CONFIG_NETPOLL is not set |
624 | # CONFIG_NET_POLL_CONTROLLER is not set | 846 | # CONFIG_NET_POLL_CONTROLLER is not set |
625 | |||
626 | # | ||
627 | # ISDN subsystem | ||
628 | # | ||
629 | # CONFIG_ISDN is not set | 847 | # CONFIG_ISDN is not set |
630 | |||
631 | # | ||
632 | # Telephony Support | ||
633 | # | ||
634 | # CONFIG_PHONE is not set | 848 | # CONFIG_PHONE is not set |
635 | 849 | ||
636 | # | 850 | # |
@@ -660,17 +874,16 @@ CONFIG_SERIAL_NONSTANDARD=y | |||
660 | # CONFIG_DIGIEPCA is not set | 874 | # CONFIG_DIGIEPCA is not set |
661 | # CONFIG_MOXA_INTELLIO is not set | 875 | # CONFIG_MOXA_INTELLIO is not set |
662 | # CONFIG_MOXA_SMARTIO is not set | 876 | # CONFIG_MOXA_SMARTIO is not set |
663 | CONFIG_MOXA_SMARTIO_NEW=m | ||
664 | # CONFIG_ISI is not set | 877 | # CONFIG_ISI is not set |
665 | # CONFIG_SYNCLINKMP is not set | 878 | # CONFIG_SYNCLINKMP is not set |
666 | # CONFIG_SYNCLINK_GT is not set | 879 | # CONFIG_SYNCLINK_GT is not set |
667 | # CONFIG_N_HDLC is not set | 880 | # CONFIG_N_HDLC is not set |
881 | # CONFIG_RISCOM8 is not set | ||
668 | # CONFIG_SPECIALIX is not set | 882 | # CONFIG_SPECIALIX is not set |
669 | # CONFIG_SX is not set | 883 | # CONFIG_SX is not set |
670 | # CONFIG_RIO is not set | 884 | # CONFIG_RIO is not set |
671 | # CONFIG_STALDRV is not set | 885 | # CONFIG_STALDRV is not set |
672 | CONFIG_SERIAL_SB1250_DUART=y | 886 | # CONFIG_NOZOMI is not set |
673 | CONFIG_SERIAL_SB1250_DUART_CONSOLE=y | ||
674 | 887 | ||
675 | # | 888 | # |
676 | # Serial drivers | 889 | # Serial drivers |
@@ -680,39 +893,24 @@ CONFIG_SERIAL_SB1250_DUART_CONSOLE=y | |||
680 | # | 893 | # |
681 | # Non-8250 serial port support | 894 | # Non-8250 serial port support |
682 | # | 895 | # |
896 | CONFIG_SERIAL_SB1250_DUART=y | ||
897 | CONFIG_SERIAL_SB1250_DUART_CONSOLE=y | ||
898 | CONFIG_SERIAL_CORE=y | ||
899 | CONFIG_SERIAL_CORE_CONSOLE=y | ||
683 | # CONFIG_SERIAL_JSM is not set | 900 | # CONFIG_SERIAL_JSM is not set |
684 | CONFIG_UNIX98_PTYS=y | 901 | CONFIG_UNIX98_PTYS=y |
685 | CONFIG_LEGACY_PTYS=y | 902 | CONFIG_LEGACY_PTYS=y |
686 | CONFIG_LEGACY_PTY_COUNT=256 | 903 | CONFIG_LEGACY_PTY_COUNT=256 |
687 | |||
688 | # | ||
689 | # IPMI | ||
690 | # | ||
691 | # CONFIG_IPMI_HANDLER is not set | 904 | # CONFIG_IPMI_HANDLER is not set |
692 | |||
693 | # | ||
694 | # Watchdog Cards | ||
695 | # | ||
696 | # CONFIG_WATCHDOG is not set | ||
697 | # CONFIG_HW_RANDOM is not set | 905 | # CONFIG_HW_RANDOM is not set |
698 | # CONFIG_RTC is not set | 906 | # CONFIG_RTC is not set |
699 | CONFIG_GEN_RTC=y | ||
700 | # CONFIG_GEN_RTC_X is not set | ||
701 | # CONFIG_DTLK is not set | ||
702 | # CONFIG_R3964 is not set | 907 | # CONFIG_R3964 is not set |
703 | # CONFIG_APPLICOM is not set | 908 | # CONFIG_APPLICOM is not set |
704 | # CONFIG_DRM is not set | ||
705 | # CONFIG_RAW_DRIVER is not set | 909 | # CONFIG_RAW_DRIVER is not set |
706 | |||
707 | # | ||
708 | # TPM devices | ||
709 | # | ||
710 | # CONFIG_TCG_TPM is not set | 910 | # CONFIG_TCG_TPM is not set |
711 | 911 | CONFIG_DEVPORT=y | |
712 | # | ||
713 | # I2C support | ||
714 | # | ||
715 | CONFIG_I2C=y | 912 | CONFIG_I2C=y |
913 | CONFIG_I2C_BOARDINFO=y | ||
716 | CONFIG_I2C_CHARDEV=y | 914 | CONFIG_I2C_CHARDEV=y |
717 | 915 | ||
718 | # | 916 | # |
@@ -736,29 +934,30 @@ CONFIG_I2C_CHARDEV=y | |||
736 | # CONFIG_I2C_NFORCE2 is not set | 934 | # CONFIG_I2C_NFORCE2 is not set |
737 | # CONFIG_I2C_OCORES is not set | 935 | # CONFIG_I2C_OCORES is not set |
738 | # CONFIG_I2C_PARPORT_LIGHT is not set | 936 | # CONFIG_I2C_PARPORT_LIGHT is not set |
739 | # CONFIG_I2C_PASEMI is not set | ||
740 | # CONFIG_I2C_PROSAVAGE is not set | 937 | # CONFIG_I2C_PROSAVAGE is not set |
741 | # CONFIG_I2C_SAVAGE4 is not set | 938 | # CONFIG_I2C_SAVAGE4 is not set |
742 | CONFIG_I2C_SIBYTE=y | 939 | CONFIG_I2C_SIBYTE=y |
940 | # CONFIG_I2C_SIMTEC is not set | ||
743 | # CONFIG_I2C_SIS5595 is not set | 941 | # CONFIG_I2C_SIS5595 is not set |
744 | # CONFIG_I2C_SIS630 is not set | 942 | # CONFIG_I2C_SIS630 is not set |
745 | # CONFIG_I2C_SIS96X is not set | 943 | # CONFIG_I2C_SIS96X is not set |
944 | # CONFIG_I2C_TAOS_EVM is not set | ||
746 | # CONFIG_I2C_STUB is not set | 945 | # CONFIG_I2C_STUB is not set |
747 | # CONFIG_I2C_VIA is not set | 946 | # CONFIG_I2C_VIA is not set |
748 | # CONFIG_I2C_VIAPRO is not set | 947 | # CONFIG_I2C_VIAPRO is not set |
749 | # CONFIG_I2C_VOODOO3 is not set | 948 | # CONFIG_I2C_VOODOO3 is not set |
750 | # CONFIG_I2C_PCA_ISA is not set | ||
751 | 949 | ||
752 | # | 950 | # |
753 | # Miscellaneous I2C Chip support | 951 | # Miscellaneous I2C Chip support |
754 | # | 952 | # |
755 | CONFIG_SENSORS_DS1337=y | 953 | # CONFIG_DS1682 is not set |
756 | CONFIG_SENSORS_DS1374=y | ||
757 | CONFIG_SENSORS_EEPROM=y | 954 | CONFIG_SENSORS_EEPROM=y |
758 | CONFIG_SENSORS_PCF8574=y | 955 | CONFIG_SENSORS_PCF8574=y |
759 | CONFIG_SENSORS_PCA9539=y | 956 | # CONFIG_PCF8575 is not set |
760 | CONFIG_SENSORS_PCF8591=y | 957 | CONFIG_SENSORS_PCF8591=y |
958 | # CONFIG_TPS65010 is not set | ||
761 | CONFIG_SENSORS_MAX6875=y | 959 | CONFIG_SENSORS_MAX6875=y |
960 | # CONFIG_SENSORS_TSL2550 is not set | ||
762 | CONFIG_I2C_DEBUG_CORE=y | 961 | CONFIG_I2C_DEBUG_CORE=y |
763 | CONFIG_I2C_DEBUG_ALGO=y | 962 | CONFIG_I2C_DEBUG_ALGO=y |
764 | CONFIG_I2C_DEBUG_BUS=y | 963 | CONFIG_I2C_DEBUG_BUS=y |
@@ -769,43 +968,49 @@ CONFIG_I2C_DEBUG_CHIP=y | |||
769 | # | 968 | # |
770 | # CONFIG_SPI is not set | 969 | # CONFIG_SPI is not set |
771 | # CONFIG_SPI_MASTER is not set | 970 | # CONFIG_SPI_MASTER is not set |
971 | # CONFIG_W1 is not set | ||
972 | # CONFIG_POWER_SUPPLY is not set | ||
973 | # CONFIG_HWMON is not set | ||
974 | # CONFIG_THERMAL is not set | ||
975 | # CONFIG_WATCHDOG is not set | ||
772 | 976 | ||
773 | # | 977 | # |
774 | # Dallas's 1-wire bus | 978 | # Sonics Silicon Backplane |
775 | # | 979 | # |
776 | # CONFIG_W1 is not set | 980 | CONFIG_SSB_POSSIBLE=y |
981 | # CONFIG_SSB is not set | ||
777 | 982 | ||
778 | # | 983 | # |
779 | # Hardware Monitoring support | 984 | # Multifunction device drivers |
780 | # | 985 | # |
781 | # CONFIG_HWMON is not set | 986 | # CONFIG_MFD_SM501 is not set |
782 | # CONFIG_HWMON_VID is not set | ||
783 | 987 | ||
784 | # | 988 | # |
785 | # Multimedia devices | 989 | # Multimedia devices |
786 | # | 990 | # |
787 | # CONFIG_VIDEO_DEV is not set | 991 | # CONFIG_VIDEO_DEV is not set |
788 | 992 | # CONFIG_DVB_CORE is not set | |
789 | # | 993 | # CONFIG_DAB is not set |
790 | # Digital Video Broadcasting Devices | ||
791 | # | ||
792 | # CONFIG_DVB is not set | ||
793 | 994 | ||
794 | # | 995 | # |
795 | # Graphics support | 996 | # Graphics support |
796 | # | 997 | # |
797 | # CONFIG_FIRMWARE_EDID is not set | 998 | # CONFIG_DRM is not set |
999 | # CONFIG_VGASTATE is not set | ||
1000 | # CONFIG_VIDEO_OUTPUT_CONTROL is not set | ||
798 | # CONFIG_FB is not set | 1001 | # CONFIG_FB is not set |
799 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | 1002 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set |
800 | 1003 | ||
801 | # | 1004 | # |
802 | # Sound | 1005 | # Display device support |
803 | # | 1006 | # |
804 | # CONFIG_SOUND is not set | 1007 | # CONFIG_DISPLAY_SUPPORT is not set |
805 | 1008 | ||
806 | # | 1009 | # |
807 | # USB support | 1010 | # Sound |
808 | # | 1011 | # |
1012 | # CONFIG_SOUND is not set | ||
1013 | CONFIG_USB_SUPPORT=y | ||
809 | CONFIG_USB_ARCH_HAS_HCD=y | 1014 | CONFIG_USB_ARCH_HAS_HCD=y |
810 | CONFIG_USB_ARCH_HAS_OHCI=y | 1015 | CONFIG_USB_ARCH_HAS_OHCI=y |
811 | CONFIG_USB_ARCH_HAS_EHCI=y | 1016 | CONFIG_USB_ARCH_HAS_EHCI=y |
@@ -814,104 +1019,73 @@ CONFIG_USB_ARCH_HAS_EHCI=y | |||
814 | # | 1019 | # |
815 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 1020 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
816 | # | 1021 | # |
817 | |||
818 | # | ||
819 | # USB Gadget Support | ||
820 | # | ||
821 | # CONFIG_USB_GADGET is not set | 1022 | # CONFIG_USB_GADGET is not set |
822 | |||
823 | # | ||
824 | # MMC/SD Card support | ||
825 | # | ||
826 | # CONFIG_MMC is not set | 1023 | # CONFIG_MMC is not set |
827 | 1024 | # CONFIG_MEMSTICK is not set | |
828 | # | ||
829 | # LED devices | ||
830 | # | ||
831 | # CONFIG_NEW_LEDS is not set | 1025 | # CONFIG_NEW_LEDS is not set |
832 | |||
833 | # | ||
834 | # LED drivers | ||
835 | # | ||
836 | |||
837 | # | ||
838 | # LED Triggers | ||
839 | # | ||
840 | |||
841 | # | ||
842 | # InfiniBand support | ||
843 | # | ||
844 | # CONFIG_INFINIBAND is not set | 1026 | # CONFIG_INFINIBAND is not set |
845 | 1027 | CONFIG_RTC_LIB=y | |
846 | # | ||
847 | # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) | ||
848 | # | ||
849 | |||
850 | # | ||
851 | # Real Time Clock | ||
852 | # | ||
853 | # CONFIG_RTC_CLASS is not set | 1028 | # CONFIG_RTC_CLASS is not set |
854 | 1029 | ||
855 | # | 1030 | # |
856 | # DMA Engine support | 1031 | # Userspace I/O |
857 | # | ||
858 | # CONFIG_DMA_ENGINE is not set | ||
859 | |||
860 | # | ||
861 | # DMA Clients | ||
862 | # | ||
863 | |||
864 | # | ||
865 | # DMA Devices | ||
866 | # | ||
867 | |||
868 | # | ||
869 | # Auxiliary Display support | ||
870 | # | ||
871 | |||
872 | # | ||
873 | # Virtualization | ||
874 | # | 1032 | # |
1033 | # CONFIG_UIO is not set | ||
875 | 1034 | ||
876 | # | 1035 | # |
877 | # File systems | 1036 | # File systems |
878 | # | 1037 | # |
879 | CONFIG_EXT2_FS=y | 1038 | CONFIG_EXT2_FS=m |
880 | CONFIG_EXT2_FS_XATTR=y | 1039 | CONFIG_EXT2_FS_XATTR=y |
881 | CONFIG_EXT2_FS_POSIX_ACL=y | 1040 | # CONFIG_EXT2_FS_POSIX_ACL is not set |
882 | CONFIG_EXT2_FS_SECURITY=y | 1041 | # CONFIG_EXT2_FS_SECURITY is not set |
883 | # CONFIG_EXT2_FS_XIP is not set | 1042 | # CONFIG_EXT2_FS_XIP is not set |
884 | # CONFIG_EXT3_FS is not set | 1043 | CONFIG_EXT3_FS=y |
1044 | CONFIG_EXT3_FS_XATTR=y | ||
1045 | # CONFIG_EXT3_FS_POSIX_ACL is not set | ||
1046 | # CONFIG_EXT3_FS_SECURITY is not set | ||
885 | # CONFIG_EXT4DEV_FS is not set | 1047 | # CONFIG_EXT4DEV_FS is not set |
1048 | CONFIG_JBD=y | ||
886 | CONFIG_FS_MBCACHE=y | 1049 | CONFIG_FS_MBCACHE=y |
887 | # CONFIG_REISERFS_FS is not set | 1050 | # CONFIG_REISERFS_FS is not set |
888 | # CONFIG_JFS_FS is not set | 1051 | # CONFIG_JFS_FS is not set |
889 | CONFIG_FS_POSIX_ACL=y | 1052 | # CONFIG_FS_POSIX_ACL is not set |
890 | # CONFIG_XFS_FS is not set | 1053 | # CONFIG_XFS_FS is not set |
891 | # CONFIG_GFS2_FS is not set | 1054 | # CONFIG_GFS2_FS is not set |
892 | # CONFIG_OCFS2_FS is not set | 1055 | # CONFIG_OCFS2_FS is not set |
893 | # CONFIG_MINIX_FS is not set | 1056 | CONFIG_DNOTIFY=y |
894 | # CONFIG_ROMFS_FS is not set | ||
895 | CONFIG_INOTIFY=y | 1057 | CONFIG_INOTIFY=y |
896 | CONFIG_INOTIFY_USER=y | 1058 | CONFIG_INOTIFY_USER=y |
897 | # CONFIG_QUOTA is not set | 1059 | CONFIG_QUOTA=y |
898 | CONFIG_DNOTIFY=y | 1060 | CONFIG_QUOTA_NETLINK_INTERFACE=y |
899 | # CONFIG_AUTOFS_FS is not set | 1061 | # CONFIG_PRINT_QUOTA_WARNING is not set |
900 | # CONFIG_AUTOFS4_FS is not set | 1062 | # CONFIG_QFMT_V1 is not set |
901 | # CONFIG_FUSE_FS is not set | 1063 | CONFIG_QFMT_V2=m |
1064 | CONFIG_QUOTACTL=y | ||
1065 | CONFIG_AUTOFS_FS=m | ||
1066 | CONFIG_AUTOFS4_FS=m | ||
1067 | CONFIG_FUSE_FS=m | ||
902 | 1068 | ||
903 | # | 1069 | # |
904 | # CD-ROM/DVD Filesystems | 1070 | # CD-ROM/DVD Filesystems |
905 | # | 1071 | # |
906 | # CONFIG_ISO9660_FS is not set | 1072 | CONFIG_ISO9660_FS=m |
907 | # CONFIG_UDF_FS is not set | 1073 | CONFIG_JOLIET=y |
1074 | CONFIG_ZISOFS=y | ||
1075 | CONFIG_UDF_FS=m | ||
1076 | CONFIG_UDF_NLS=y | ||
908 | 1077 | ||
909 | # | 1078 | # |
910 | # DOS/FAT/NT Filesystems | 1079 | # DOS/FAT/NT Filesystems |
911 | # | 1080 | # |
912 | # CONFIG_MSDOS_FS is not set | 1081 | CONFIG_FAT_FS=m |
913 | # CONFIG_VFAT_FS is not set | 1082 | CONFIG_MSDOS_FS=m |
914 | # CONFIG_NTFS_FS is not set | 1083 | CONFIG_VFAT_FS=m |
1084 | CONFIG_FAT_DEFAULT_CODEPAGE=437 | ||
1085 | CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | ||
1086 | CONFIG_NTFS_FS=m | ||
1087 | # CONFIG_NTFS_DEBUG is not set | ||
1088 | CONFIG_NTFS_RW=y | ||
915 | 1089 | ||
916 | # | 1090 | # |
917 | # Pseudo filesystems | 1091 | # Pseudo filesystems |
@@ -923,7 +1097,6 @@ CONFIG_SYSFS=y | |||
923 | CONFIG_TMPFS=y | 1097 | CONFIG_TMPFS=y |
924 | # CONFIG_TMPFS_POSIX_ACL is not set | 1098 | # CONFIG_TMPFS_POSIX_ACL is not set |
925 | # CONFIG_HUGETLB_PAGE is not set | 1099 | # CONFIG_HUGETLB_PAGE is not set |
926 | CONFIG_RAMFS=y | ||
927 | CONFIG_CONFIGFS_FS=m | 1100 | CONFIG_CONFIGFS_FS=m |
928 | 1101 | ||
929 | # | 1102 | # |
@@ -939,14 +1112,13 @@ CONFIG_CONFIGFS_FS=m | |||
939 | # CONFIG_EFS_FS is not set | 1112 | # CONFIG_EFS_FS is not set |
940 | # CONFIG_CRAMFS is not set | 1113 | # CONFIG_CRAMFS is not set |
941 | # CONFIG_VXFS_FS is not set | 1114 | # CONFIG_VXFS_FS is not set |
1115 | # CONFIG_MINIX_FS is not set | ||
942 | # CONFIG_HPFS_FS is not set | 1116 | # CONFIG_HPFS_FS is not set |
943 | # CONFIG_QNX4FS_FS is not set | 1117 | # CONFIG_QNX4FS_FS is not set |
1118 | # CONFIG_ROMFS_FS is not set | ||
944 | # CONFIG_SYSV_FS is not set | 1119 | # CONFIG_SYSV_FS is not set |
945 | # CONFIG_UFS_FS is not set | 1120 | # CONFIG_UFS_FS is not set |
946 | 1121 | CONFIG_NETWORK_FILESYSTEMS=y | |
947 | # | ||
948 | # Network File Systems | ||
949 | # | ||
950 | CONFIG_NFS_FS=y | 1122 | CONFIG_NFS_FS=y |
951 | CONFIG_NFS_V3=y | 1123 | CONFIG_NFS_V3=y |
952 | # CONFIG_NFS_V3_ACL is not set | 1124 | # CONFIG_NFS_V3_ACL is not set |
@@ -958,6 +1130,7 @@ CONFIG_LOCKD=y | |||
958 | CONFIG_LOCKD_V4=y | 1130 | CONFIG_LOCKD_V4=y |
959 | CONFIG_NFS_COMMON=y | 1131 | CONFIG_NFS_COMMON=y |
960 | CONFIG_SUNRPC=y | 1132 | CONFIG_SUNRPC=y |
1133 | # CONFIG_SUNRPC_BIND34 is not set | ||
961 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 1134 | # CONFIG_RPCSEC_GSS_KRB5 is not set |
962 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 1135 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
963 | # CONFIG_SMB_FS is not set | 1136 | # CONFIG_SMB_FS is not set |
@@ -965,37 +1138,61 @@ CONFIG_SUNRPC=y | |||
965 | # CONFIG_NCP_FS is not set | 1138 | # CONFIG_NCP_FS is not set |
966 | # CONFIG_CODA_FS is not set | 1139 | # CONFIG_CODA_FS is not set |
967 | # CONFIG_AFS_FS is not set | 1140 | # CONFIG_AFS_FS is not set |
968 | # CONFIG_9P_FS is not set | ||
969 | 1141 | ||
970 | # | 1142 | # |
971 | # Partition Types | 1143 | # Partition Types |
972 | # | 1144 | # |
973 | # CONFIG_PARTITION_ADVANCED is not set | 1145 | # CONFIG_PARTITION_ADVANCED is not set |
974 | CONFIG_MSDOS_PARTITION=y | 1146 | CONFIG_MSDOS_PARTITION=y |
975 | 1147 | CONFIG_NLS=m | |
976 | # | 1148 | CONFIG_NLS_DEFAULT="iso8859-1" |
977 | # Native Language Support | 1149 | CONFIG_NLS_CODEPAGE_437=m |
978 | # | 1150 | CONFIG_NLS_CODEPAGE_737=m |
979 | # CONFIG_NLS is not set | 1151 | CONFIG_NLS_CODEPAGE_775=m |
980 | 1152 | CONFIG_NLS_CODEPAGE_850=m | |
981 | # | 1153 | CONFIG_NLS_CODEPAGE_852=m |
982 | # Distributed Lock Manager | 1154 | CONFIG_NLS_CODEPAGE_855=m |
983 | # | 1155 | CONFIG_NLS_CODEPAGE_857=m |
1156 | CONFIG_NLS_CODEPAGE_860=m | ||
1157 | CONFIG_NLS_CODEPAGE_861=m | ||
1158 | CONFIG_NLS_CODEPAGE_862=m | ||
1159 | CONFIG_NLS_CODEPAGE_863=m | ||
1160 | CONFIG_NLS_CODEPAGE_864=m | ||
1161 | CONFIG_NLS_CODEPAGE_865=m | ||
1162 | CONFIG_NLS_CODEPAGE_866=m | ||
1163 | CONFIG_NLS_CODEPAGE_869=m | ||
1164 | CONFIG_NLS_CODEPAGE_936=m | ||
1165 | CONFIG_NLS_CODEPAGE_950=m | ||
1166 | CONFIG_NLS_CODEPAGE_932=m | ||
1167 | CONFIG_NLS_CODEPAGE_949=m | ||
1168 | CONFIG_NLS_CODEPAGE_874=m | ||
1169 | CONFIG_NLS_ISO8859_8=m | ||
1170 | CONFIG_NLS_CODEPAGE_1250=m | ||
1171 | CONFIG_NLS_CODEPAGE_1251=m | ||
1172 | CONFIG_NLS_ASCII=m | ||
1173 | CONFIG_NLS_ISO8859_1=m | ||
1174 | CONFIG_NLS_ISO8859_2=m | ||
1175 | CONFIG_NLS_ISO8859_3=m | ||
1176 | CONFIG_NLS_ISO8859_4=m | ||
1177 | CONFIG_NLS_ISO8859_5=m | ||
1178 | CONFIG_NLS_ISO8859_6=m | ||
1179 | CONFIG_NLS_ISO8859_7=m | ||
1180 | CONFIG_NLS_ISO8859_9=m | ||
1181 | CONFIG_NLS_ISO8859_13=m | ||
1182 | CONFIG_NLS_ISO8859_14=m | ||
1183 | CONFIG_NLS_ISO8859_15=m | ||
1184 | CONFIG_NLS_KOI8_R=m | ||
1185 | CONFIG_NLS_KOI8_U=m | ||
1186 | CONFIG_NLS_UTF8=m | ||
984 | CONFIG_DLM=m | 1187 | CONFIG_DLM=m |
985 | CONFIG_DLM_TCP=y | ||
986 | # CONFIG_DLM_SCTP is not set | ||
987 | # CONFIG_DLM_DEBUG is not set | 1188 | # CONFIG_DLM_DEBUG is not set |
988 | 1189 | ||
989 | # | 1190 | # |
990 | # Profiling support | ||
991 | # | ||
992 | # CONFIG_PROFILING is not set | ||
993 | |||
994 | # | ||
995 | # Kernel hacking | 1191 | # Kernel hacking |
996 | # | 1192 | # |
997 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | 1193 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y |
998 | # CONFIG_PRINTK_TIME is not set | 1194 | # CONFIG_PRINTK_TIME is not set |
1195 | CONFIG_ENABLE_WARN_DEPRECATED=y | ||
999 | CONFIG_ENABLE_MUST_CHECK=y | 1196 | CONFIG_ENABLE_MUST_CHECK=y |
1000 | CONFIG_MAGIC_SYSRQ=y | 1197 | CONFIG_MAGIC_SYSRQ=y |
1001 | # CONFIG_UNUSED_SYMBOLS is not set | 1198 | # CONFIG_UNUSED_SYMBOLS is not set |
@@ -1003,8 +1200,8 @@ CONFIG_MAGIC_SYSRQ=y | |||
1003 | # CONFIG_HEADERS_CHECK is not set | 1200 | # CONFIG_HEADERS_CHECK is not set |
1004 | CONFIG_DEBUG_KERNEL=y | 1201 | CONFIG_DEBUG_KERNEL=y |
1005 | # CONFIG_DEBUG_SHIRQ is not set | 1202 | # CONFIG_DEBUG_SHIRQ is not set |
1006 | CONFIG_LOG_BUF_SHIFT=16 | ||
1007 | CONFIG_DETECT_SOFTLOCKUP=y | 1203 | CONFIG_DETECT_SOFTLOCKUP=y |
1204 | CONFIG_SCHED_DEBUG=y | ||
1008 | # CONFIG_SCHEDSTATS is not set | 1205 | # CONFIG_SCHEDSTATS is not set |
1009 | # CONFIG_TIMER_STATS is not set | 1206 | # CONFIG_TIMER_STATS is not set |
1010 | # CONFIG_DEBUG_SLAB is not set | 1207 | # CONFIG_DEBUG_SLAB is not set |
@@ -1014,15 +1211,19 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
1014 | CONFIG_DEBUG_MUTEXES=y | 1211 | CONFIG_DEBUG_MUTEXES=y |
1015 | # CONFIG_DEBUG_LOCK_ALLOC is not set | 1212 | # CONFIG_DEBUG_LOCK_ALLOC is not set |
1016 | # CONFIG_PROVE_LOCKING is not set | 1213 | # CONFIG_PROVE_LOCKING is not set |
1214 | # CONFIG_LOCK_STAT is not set | ||
1017 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set | 1215 | # CONFIG_DEBUG_SPINLOCK_SLEEP is not set |
1018 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set | 1216 | # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set |
1019 | # CONFIG_DEBUG_KOBJECT is not set | 1217 | # CONFIG_DEBUG_KOBJECT is not set |
1020 | # CONFIG_DEBUG_INFO is not set | 1218 | # CONFIG_DEBUG_INFO is not set |
1021 | # CONFIG_DEBUG_VM is not set | 1219 | # CONFIG_DEBUG_VM is not set |
1022 | # CONFIG_DEBUG_LIST is not set | 1220 | # CONFIG_DEBUG_LIST is not set |
1023 | CONFIG_FORCED_INLINING=y | 1221 | # CONFIG_DEBUG_SG is not set |
1222 | # CONFIG_BOOT_PRINTK_DELAY is not set | ||
1024 | # CONFIG_RCU_TORTURE_TEST is not set | 1223 | # CONFIG_RCU_TORTURE_TEST is not set |
1025 | CONFIG_CROSSCOMPILE=y | 1224 | # CONFIG_BACKTRACE_SELF_TEST is not set |
1225 | # CONFIG_FAULT_INJECTION is not set | ||
1226 | # CONFIG_SAMPLES is not set | ||
1026 | CONFIG_CMDLINE="" | 1227 | CONFIG_CMDLINE="" |
1027 | # CONFIG_DEBUG_STACK_USAGE is not set | 1228 | # CONFIG_DEBUG_STACK_USAGE is not set |
1028 | # CONFIG_SB1XXX_CORELIS is not set | 1229 | # CONFIG_SB1XXX_CORELIS is not set |
@@ -1034,23 +1235,22 @@ CONFIG_CMDLINE="" | |||
1034 | CONFIG_KEYS=y | 1235 | CONFIG_KEYS=y |
1035 | CONFIG_KEYS_DEBUG_PROC_KEYS=y | 1236 | CONFIG_KEYS_DEBUG_PROC_KEYS=y |
1036 | # CONFIG_SECURITY is not set | 1237 | # CONFIG_SECURITY is not set |
1037 | 1238 | # CONFIG_SECURITY_FILE_CAPABILITIES is not set | |
1038 | # | ||
1039 | # Cryptographic options | ||
1040 | # | ||
1041 | CONFIG_CRYPTO=y | 1239 | CONFIG_CRYPTO=y |
1042 | CONFIG_CRYPTO_ALGAPI=y | 1240 | CONFIG_CRYPTO_ALGAPI=y |
1043 | CONFIG_CRYPTO_BLKCIPHER=m | 1241 | CONFIG_CRYPTO_AEAD=m |
1242 | CONFIG_CRYPTO_BLKCIPHER=y | ||
1243 | CONFIG_CRYPTO_SEQIV=m | ||
1044 | CONFIG_CRYPTO_HASH=y | 1244 | CONFIG_CRYPTO_HASH=y |
1045 | CONFIG_CRYPTO_MANAGER=y | 1245 | CONFIG_CRYPTO_MANAGER=y |
1046 | CONFIG_CRYPTO_HMAC=y | 1246 | CONFIG_CRYPTO_HMAC=y |
1047 | CONFIG_CRYPTO_XCBC=m | 1247 | CONFIG_CRYPTO_XCBC=m |
1048 | CONFIG_CRYPTO_NULL=y | 1248 | CONFIG_CRYPTO_NULL=y |
1049 | CONFIG_CRYPTO_MD4=y | 1249 | CONFIG_CRYPTO_MD4=m |
1050 | CONFIG_CRYPTO_MD5=y | 1250 | CONFIG_CRYPTO_MD5=y |
1051 | CONFIG_CRYPTO_SHA1=y | 1251 | CONFIG_CRYPTO_SHA1=m |
1052 | CONFIG_CRYPTO_SHA256=y | 1252 | CONFIG_CRYPTO_SHA256=m |
1053 | CONFIG_CRYPTO_SHA512=y | 1253 | CONFIG_CRYPTO_SHA512=m |
1054 | CONFIG_CRYPTO_WP512=m | 1254 | CONFIG_CRYPTO_WP512=m |
1055 | CONFIG_CRYPTO_TGR192=m | 1255 | CONFIG_CRYPTO_TGR192=m |
1056 | CONFIG_CRYPTO_GF128MUL=m | 1256 | CONFIG_CRYPTO_GF128MUL=m |
@@ -1058,39 +1258,50 @@ CONFIG_CRYPTO_ECB=m | |||
1058 | CONFIG_CRYPTO_CBC=m | 1258 | CONFIG_CRYPTO_CBC=m |
1059 | CONFIG_CRYPTO_PCBC=m | 1259 | CONFIG_CRYPTO_PCBC=m |
1060 | CONFIG_CRYPTO_LRW=m | 1260 | CONFIG_CRYPTO_LRW=m |
1061 | CONFIG_CRYPTO_DES=y | 1261 | CONFIG_CRYPTO_XTS=m |
1262 | CONFIG_CRYPTO_CTR=m | ||
1263 | CONFIG_CRYPTO_GCM=m | ||
1264 | CONFIG_CRYPTO_CCM=m | ||
1265 | # CONFIG_CRYPTO_CRYPTD is not set | ||
1266 | CONFIG_CRYPTO_DES=m | ||
1062 | CONFIG_CRYPTO_FCRYPT=m | 1267 | CONFIG_CRYPTO_FCRYPT=m |
1063 | CONFIG_CRYPTO_BLOWFISH=y | 1268 | CONFIG_CRYPTO_BLOWFISH=m |
1064 | CONFIG_CRYPTO_TWOFISH=y | 1269 | CONFIG_CRYPTO_TWOFISH=m |
1065 | CONFIG_CRYPTO_TWOFISH_COMMON=y | 1270 | CONFIG_CRYPTO_TWOFISH_COMMON=m |
1066 | CONFIG_CRYPTO_SERPENT=y | 1271 | CONFIG_CRYPTO_SERPENT=m |
1067 | CONFIG_CRYPTO_AES=m | 1272 | CONFIG_CRYPTO_AES=m |
1068 | # CONFIG_CRYPTO_CAST5 is not set | 1273 | CONFIG_CRYPTO_CAST5=m |
1069 | # CONFIG_CRYPTO_CAST6 is not set | 1274 | CONFIG_CRYPTO_CAST6=m |
1070 | CONFIG_CRYPTO_TEA=m | 1275 | CONFIG_CRYPTO_TEA=m |
1071 | # CONFIG_CRYPTO_ARC4 is not set | 1276 | CONFIG_CRYPTO_ARC4=m |
1072 | CONFIG_CRYPTO_KHAZAD=m | 1277 | CONFIG_CRYPTO_KHAZAD=m |
1073 | CONFIG_CRYPTO_ANUBIS=m | 1278 | CONFIG_CRYPTO_ANUBIS=m |
1074 | CONFIG_CRYPTO_DEFLATE=y | 1279 | CONFIG_CRYPTO_SEED=m |
1075 | CONFIG_CRYPTO_MICHAEL_MIC=y | 1280 | CONFIG_CRYPTO_SALSA20=m |
1281 | CONFIG_CRYPTO_DEFLATE=m | ||
1282 | CONFIG_CRYPTO_MICHAEL_MIC=m | ||
1076 | # CONFIG_CRYPTO_CRC32C is not set | 1283 | # CONFIG_CRYPTO_CRC32C is not set |
1077 | CONFIG_CRYPTO_CAMELLIA=m | 1284 | CONFIG_CRYPTO_CAMELLIA=m |
1078 | # CONFIG_CRYPTO_TEST is not set | 1285 | # CONFIG_CRYPTO_TEST is not set |
1079 | 1286 | CONFIG_CRYPTO_AUTHENC=m | |
1080 | # | 1287 | # CONFIG_CRYPTO_LZO is not set |
1081 | # Hardware crypto devices | 1288 | CONFIG_CRYPTO_HW=y |
1082 | # | 1289 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
1083 | 1290 | ||
1084 | # | 1291 | # |
1085 | # Library routines | 1292 | # Library routines |
1086 | # | 1293 | # |
1087 | CONFIG_BITREVERSE=y | 1294 | CONFIG_BITREVERSE=y |
1088 | # CONFIG_CRC_CCITT is not set | 1295 | CONFIG_CRC_CCITT=m |
1089 | # CONFIG_CRC16 is not set | 1296 | # CONFIG_CRC16 is not set |
1297 | # CONFIG_CRC_ITU_T is not set | ||
1090 | CONFIG_CRC32=y | 1298 | CONFIG_CRC32=y |
1091 | # CONFIG_LIBCRC32C is not set | 1299 | # CONFIG_CRC7 is not set |
1092 | CONFIG_ZLIB_INFLATE=y | 1300 | CONFIG_LIBCRC32C=m |
1093 | CONFIG_ZLIB_DEFLATE=y | 1301 | CONFIG_AUDIT_GENERIC=y |
1302 | CONFIG_ZLIB_INFLATE=m | ||
1303 | CONFIG_ZLIB_DEFLATE=m | ||
1094 | CONFIG_PLIST=y | 1304 | CONFIG_PLIST=y |
1095 | CONFIG_HAS_IOMEM=y | 1305 | CONFIG_HAS_IOMEM=y |
1096 | CONFIG_HAS_IOPORT=y | 1306 | CONFIG_HAS_IOPORT=y |
1307 | CONFIG_HAS_DMA=y | ||
diff --git a/arch/mips/kernel/i8253.c b/arch/mips/kernel/i8253.c index fc4aa07b6d35..38fa1a194bf4 100644 --- a/arch/mips/kernel/i8253.c +++ b/arch/mips/kernel/i8253.c | |||
@@ -15,6 +15,7 @@ | |||
15 | #include <asm/time.h> | 15 | #include <asm/time.h> |
16 | 16 | ||
17 | DEFINE_SPINLOCK(i8253_lock); | 17 | DEFINE_SPINLOCK(i8253_lock); |
18 | EXPORT_SYMBOL(i8253_lock); | ||
18 | 19 | ||
19 | /* | 20 | /* |
20 | * Initialize the PIT timer. | 21 | * Initialize the PIT timer. |
diff --git a/arch/mips/kernel/time.c b/arch/mips/kernel/time.c index 9f85d4cecc5b..b45a7093ca2d 100644 --- a/arch/mips/kernel/time.c +++ b/arch/mips/kernel/time.c | |||
@@ -157,6 +157,6 @@ void __init time_init(void) | |||
157 | { | 157 | { |
158 | plat_time_init(); | 158 | plat_time_init(); |
159 | 159 | ||
160 | if (mips_clockevent_init() || !cpu_has_mfc0_count_bug()) | 160 | if (!mips_clockevent_init() || !cpu_has_mfc0_count_bug()) |
161 | init_mips_clocksource(); | 161 | init_mips_clocksource(); |
162 | } | 162 | } |
diff --git a/arch/mips/kernel/vpe.c b/arch/mips/kernel/vpe.c index eed2dc4273e0..39804c584edd 100644 --- a/arch/mips/kernel/vpe.c +++ b/arch/mips/kernel/vpe.c | |||
@@ -262,13 +262,21 @@ void dump_mtregs(void) | |||
262 | /* Find some VPE program space */ | 262 | /* Find some VPE program space */ |
263 | static void *alloc_progmem(unsigned long len) | 263 | static void *alloc_progmem(unsigned long len) |
264 | { | 264 | { |
265 | void *addr; | ||
266 | |||
265 | #ifdef CONFIG_MIPS_VPE_LOADER_TOM | 267 | #ifdef CONFIG_MIPS_VPE_LOADER_TOM |
266 | /* this means you must tell linux to use less memory than you physically have */ | 268 | /* |
267 | return pfn_to_kaddr(max_pfn); | 269 | * This means you must tell Linux to use less memory than you |
270 | * physically have, for example by passing a mem= boot argument. | ||
271 | */ | ||
272 | addr = pfn_to_kaddr(max_pfn); | ||
273 | memset(addr, 0, len); | ||
268 | #else | 274 | #else |
269 | // simple grab some mem for now | 275 | /* simple grab some mem for now */ |
270 | return kmalloc(len, GFP_KERNEL); | 276 | addr = kzalloc(len, GFP_KERNEL); |
271 | #endif | 277 | #endif |
278 | |||
279 | return addr; | ||
272 | } | 280 | } |
273 | 281 | ||
274 | static void release_progmem(void *ptr) | 282 | static void release_progmem(void *ptr) |
@@ -884,9 +892,10 @@ static int vpe_elfload(struct vpe * v) | |||
884 | } | 892 | } |
885 | 893 | ||
886 | v->load_addr = alloc_progmem(mod.core_size); | 894 | v->load_addr = alloc_progmem(mod.core_size); |
887 | memset(v->load_addr, 0, mod.core_size); | 895 | if (!v->load_addr) |
896 | return -ENOMEM; | ||
888 | 897 | ||
889 | printk("VPE loader: loading to %p\n", v->load_addr); | 898 | pr_info("VPE loader: loading to %p\n", v->load_addr); |
890 | 899 | ||
891 | if (relocate) { | 900 | if (relocate) { |
892 | for (i = 0; i < hdr->e_shnum; i++) { | 901 | for (i = 0; i < hdr->e_shnum; i++) { |
diff --git a/arch/mips/mm/tlbex.c b/arch/mips/mm/tlbex.c index 3a93d4ce2703..382738ca8a0b 100644 --- a/arch/mips/mm/tlbex.c +++ b/arch/mips/mm/tlbex.c | |||
@@ -307,6 +307,7 @@ static void __cpuinit build_tlb_write_entry(u32 **p, struct uasm_label **l, | |||
307 | case CPU_R12000: | 307 | case CPU_R12000: |
308 | case CPU_R14000: | 308 | case CPU_R14000: |
309 | case CPU_4KC: | 309 | case CPU_4KC: |
310 | case CPU_4KEC: | ||
310 | case CPU_SB1: | 311 | case CPU_SB1: |
311 | case CPU_SB1A: | 312 | case CPU_SB1A: |
312 | case CPU_4KSC: | 313 | case CPU_4KSC: |
diff --git a/arch/mips/pci/pci-bcm1480.c b/arch/mips/pci/pci-bcm1480.c index ab68c4318a30..87e2c8f54e2d 100644 --- a/arch/mips/pci/pci-bcm1480.c +++ b/arch/mips/pci/pci-bcm1480.c | |||
@@ -185,8 +185,8 @@ static struct resource bcm1480_mem_resource = { | |||
185 | 185 | ||
186 | static struct resource bcm1480_io_resource = { | 186 | static struct resource bcm1480_io_resource = { |
187 | .name = "BCM1480 PCI I/O", | 187 | .name = "BCM1480 PCI I/O", |
188 | .start = 0x2c000000UL, | 188 | .start = A_BCM1480_PHYS_PCI_IO_MATCH_BYTES, |
189 | .end = 0x2dffffffUL, | 189 | .end = A_BCM1480_PHYS_PCI_IO_MATCH_BYTES + 0x1ffffffUL, |
190 | .flags = IORESOURCE_IO, | 190 | .flags = IORESOURCE_IO, |
191 | }; | 191 | }; |
192 | 192 | ||
@@ -194,6 +194,7 @@ struct pci_controller bcm1480_controller = { | |||
194 | .pci_ops = &bcm1480_pci_ops, | 194 | .pci_ops = &bcm1480_pci_ops, |
195 | .mem_resource = &bcm1480_mem_resource, | 195 | .mem_resource = &bcm1480_mem_resource, |
196 | .io_resource = &bcm1480_io_resource, | 196 | .io_resource = &bcm1480_io_resource, |
197 | .io_offset = A_BCM1480_PHYS_PCI_IO_MATCH_BYTES, | ||
197 | }; | 198 | }; |
198 | 199 | ||
199 | 200 | ||
@@ -251,6 +252,7 @@ static int __init bcm1480_pcibios_init(void) | |||
251 | 252 | ||
252 | bcm1480_controller.io_map_base = (unsigned long) | 253 | bcm1480_controller.io_map_base = (unsigned long) |
253 | ioremap(A_BCM1480_PHYS_PCI_IO_MATCH_BYTES, 65536); | 254 | ioremap(A_BCM1480_PHYS_PCI_IO_MATCH_BYTES, 65536); |
255 | bcm1480_controller.io_map_base -= bcm1480_controller.io_offset; | ||
254 | set_io_port_base(bcm1480_controller.io_map_base); | 256 | set_io_port_base(bcm1480_controller.io_map_base); |
255 | isa_slot_offset = (unsigned long) | 257 | isa_slot_offset = (unsigned long) |
256 | ioremap(A_BCM1480_PHYS_PCI_MEM_MATCH_BYTES, 1024*1024); | 258 | ioremap(A_BCM1480_PHYS_PCI_MEM_MATCH_BYTES, 1024*1024); |
diff --git a/arch/mips/pci/pci-bcm1480ht.c b/arch/mips/pci/pci-bcm1480ht.c index 005e7fecab08..f54f45412b0b 100644 --- a/arch/mips/pci/pci-bcm1480ht.c +++ b/arch/mips/pci/pci-bcm1480ht.c | |||
@@ -180,8 +180,8 @@ static struct resource bcm1480ht_mem_resource = { | |||
180 | 180 | ||
181 | static struct resource bcm1480ht_io_resource = { | 181 | static struct resource bcm1480ht_io_resource = { |
182 | .name = "BCM1480 HT I/O", | 182 | .name = "BCM1480 HT I/O", |
183 | .start = 0x00000000UL, | 183 | .start = A_BCM1480_PHYS_HT_IO_MATCH_BYTES, |
184 | .end = 0x01ffffffUL, | 184 | .end = A_BCM1480_PHYS_HT_IO_MATCH_BYTES + 0x01ffffffUL, |
185 | .flags = IORESOURCE_IO, | 185 | .flags = IORESOURCE_IO, |
186 | }; | 186 | }; |
187 | 187 | ||
@@ -191,29 +191,22 @@ struct pci_controller bcm1480ht_controller = { | |||
191 | .io_resource = &bcm1480ht_io_resource, | 191 | .io_resource = &bcm1480ht_io_resource, |
192 | .index = 1, | 192 | .index = 1, |
193 | .get_busno = bcm1480ht_pcibios_get_busno, | 193 | .get_busno = bcm1480ht_pcibios_get_busno, |
194 | .io_offset = A_BCM1480_PHYS_HT_IO_MATCH_BYTES, | ||
194 | }; | 195 | }; |
195 | 196 | ||
196 | static int __init bcm1480ht_pcibios_init(void) | 197 | static int __init bcm1480ht_pcibios_init(void) |
197 | { | 198 | { |
198 | uint32_t cmdreg; | ||
199 | |||
200 | ht_cfg_space = ioremap(A_BCM1480_PHYS_HT_CFG_MATCH_BITS, 16*1024*1024); | 199 | ht_cfg_space = ioremap(A_BCM1480_PHYS_HT_CFG_MATCH_BITS, 16*1024*1024); |
201 | 200 | ||
202 | /* | 201 | /* CFE doesn't always init all HT paths, so we always scan */ |
203 | * See if the PCI bus has been configured by the firmware. | ||
204 | */ | ||
205 | cmdreg = READCFG32(CFGOFFSET(0, PCI_DEVFN(PCI_BRIDGE_DEVICE, 0), | ||
206 | PCI_COMMAND)); | ||
207 | if (!(cmdreg & PCI_COMMAND_MASTER)) { | ||
208 | printk("HT: Skipping HT probe. Bus is not initialized.\n"); | ||
209 | iounmap(ht_cfg_space); | ||
210 | return 1; /* XXX */ | ||
211 | } | ||
212 | bcm1480ht_bus_status |= PCI_BUS_ENABLED; | 202 | bcm1480ht_bus_status |= PCI_BUS_ENABLED; |
213 | 203 | ||
214 | ht_eoi_space = (unsigned long) | 204 | ht_eoi_space = (unsigned long) |
215 | ioremap(A_BCM1480_PHYS_HT_SPECIAL_MATCH_BYTES, | 205 | ioremap(A_BCM1480_PHYS_HT_SPECIAL_MATCH_BYTES, |
216 | 4 * 1024 * 1024); | 206 | 4 * 1024 * 1024); |
207 | bcm1480ht_controller.io_map_base = (unsigned long) | ||
208 | ioremap(A_BCM1480_PHYS_HT_IO_MATCH_BYTES, 65536); | ||
209 | bcm1480ht_controller.io_map_base -= bcm1480ht_controller.io_offset; | ||
217 | 210 | ||
218 | register_pci_controller(&bcm1480ht_controller); | 211 | register_pci_controller(&bcm1480ht_controller); |
219 | 212 | ||
diff --git a/include/asm-mips/mach-au1x00/au1000.h b/include/asm-mips/mach-au1x00/au1000.h index cb18af989645..5bb57bf2b9d7 100644 --- a/include/asm-mips/mach-au1x00/au1000.h +++ b/include/asm-mips/mach-au1x00/au1000.h | |||
@@ -1786,6 +1786,7 @@ struct cpu_spec { | |||
1786 | char *cpu_name; | 1786 | char *cpu_name; |
1787 | unsigned char cpu_od; /* Set Config[OD] */ | 1787 | unsigned char cpu_od; /* Set Config[OD] */ |
1788 | unsigned char cpu_bclk; /* Enable BCLK switching */ | 1788 | unsigned char cpu_bclk; /* Enable BCLK switching */ |
1789 | unsigned char cpu_pll_wo; /* sys_cpupll reg. write-only */ | ||
1789 | }; | 1790 | }; |
1790 | 1791 | ||
1791 | extern struct cpu_spec cpu_specs[]; | 1792 | extern struct cpu_spec cpu_specs[]; |